diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 75ca2dfb9..63f79fa10 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,12 +1,48 @@
 # Contributing
 
+## Requirements
+
+Before getting started, ensure your system has access to the following tools:
+
+- [Node.js](https://nodejs.org/)
+- [Rustup](https://rustup.rs/)
+- [pnpm](https://pnpm.io/)
+
+## Getting started
+
+```sh
+# Install dependencies
+pnpm install
+
+# Install Rust toolchain and WASM targets
+rustup default stable
+rustup target add wasm32-wasip1-threads
+
+# Build the project
+pnpm build
+```
+
+## Development workflow
+
+During development, you can run tests in watch mode:
+
+```sh
+pnpm tdd
+```
+
+The `playgrounds` directory contains example projects you can use to test your changes. To start the Vite playground, use:
+
+```sh
+pnpm build && pnpm vite
+```
+
 ## Bug fixes
 
 If you've found a bug in Tailwind that you'd like to fix, [submit a pull request](https://github.com/tailwindlabs/tailwindcss/pulls) with your changes. Include a helpful description of the problem and how your changes address it, and provide tests so we can verify the fix works as expected.
 
 ## New features
 
-If there's a new feature you'd like to see added to Tailwind, [share your idea with us](https://github.com/tailwindlabs/tailwindcss/discussions/new?category=ideas) in our discussion forum to get it on our radar as something to consider for a future release.
+If there's a new feature you'd like to see added to Tailwind, [share your idea with us](https://github.com/tailwindlabs/tailwindcss/discussions/new?category=ideas) in our discussion forum to get it on our radar as something to consider for a future release before starting work on it.
 
 **Please note that we don't often accept pull requests for new features.** Adding a new feature to Tailwind requires us to think through the entire problem ourselves to make sure we agree with the proposed API, which means the feature needs to be high on our own priority list for us to be able to give it the attention it needs.
 
@@ -14,7 +50,7 @@ If you open a pull request for a new feature, we're likely to close it not becau
 
 ## Coding standards
 
-Our code formatting rules are defined in the `"prettier"` section of [package.json](https://github.com/tailwindcss/tailwindcss/blob/next/package.json). You can check your code against these standards by running:
+Our code formatting rules are defined in the `"prettier"` section of [package.json](https://github.com/tailwindlabs/tailwindcss/blob/main/package.json). You can check your code against these standards by running:
 
 ```sh
 pnpm run lint
@@ -28,10 +64,40 @@ pnpm run format
 
 ## Running tests
 
-You can run the test suite using the following commands:
+You can run the TypeScript and Rust test suites using the following command:
 
 ```sh
-pnpm build && pnpm test
+pnpm test
 ```
 
-Please ensure that the tests are passing when submitting a pull request. If you're adding new features to Tailwind, please include tests.
+To run the integration tests, use:
+
+```sh
+pnpm build && pnpm test:integrations
+```
+
+Additionally, some features require testing in browsers (i.e. to ensure CSS variable resolution works as expected). These can be run via:
+
+```sh
+pnpm build && pnpm test:ui
+```
+
+Please ensure that all tests are passing when submitting a pull request. If you're adding new features to Tailwind CSS, always include tests.
+
+After a successful build, you can also use the npm package tarballs created inside the `dist/` folder to install your build in other local projects.
+
+## Pull request process
+
+When submitting a pull request:
+
+- Ensure the pull request title and description explain the changes you made and why you made them.
+- Include a test plan section that outlines how you tested your contributions. We do not accept contributions without tests.
+- Ensure all tests pass. You can add the tag `[ci-all]` in your pull request description to run the test suites across all platforms.
+
+When a pull request is created, Tailwind CSS maintainers will be notified automatically.
+
+## Communication
+
+- **GitHub discussions**: For feature ideas and general questions
+- **GitHub issues**: For bug reports
+- **GitHub pull requests**: For code contributions
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..848c851b1
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: ['https://tailwindcss.com/sponsor']
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 000000000..1b8a310c6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: If you've already asked for help with a problem and confirmed something is broken with Tailwind CSS itself, create a bug report.
+title: ''
+labels: ''
+assignees: ''
+---
+
+<!-- Please provide all of the information requested below. We're a small team and without all of this information it's not possible for us to help and your bug report will be closed. -->
+
+**What version of Tailwind CSS are you using?**
+
+For example: v4.0.6
+
+**What build tool (or framework if it abstracts the build tool) are you using?**
+
+For example: postcss-cli 11.0.0, Next.js 15.1.7, Vite 6.1.0
+
+**What version of Node.js are you using?**
+
+For example: v20.0.0
+
+**What browser are you using?**
+
+For example: Chrome, Safari, or N/A
+
+**What operating system are you using?**
+
+For example: macOS, Windows
+
+**Reproduction URL**
+
+A Tailwind Play link or public GitHub repo that includes a minimal reproduction of the bug. **Please do not link to your actual project**, what we need instead is a _minimal_ reproduction in a fresh project without any unnecessary code. This means it doesn't matter if your real project is private/confidential, since we want a link to a separate, isolated reproduction anyways.
+
+A reproduction is **required** when filing an issue — any issue opened without a reproduction will be closed and you'll be asked to create a new issue that includes a reproduction. We're a small team and we can't keep up with the volume of issues we receive if we need to reproduce each issue from scratch ourselves.
+
+**Describe your issue**
+
+Describe the problem you're seeing, any important steps to reproduce and what behavior you expect instead.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 58166a010..10ee9a6b8 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -6,9 +6,6 @@ contact_links:
   - name: Feature Request
     url: https://github.com/tailwindlabs/tailwindcss/discussions/new?category=ideas
     about: 'Suggest any ideas you have using our discussion forums.'
-  - name: Bug Report
-    url: https://github.com/tailwindlabs/tailwindcss/issues/new?body=%3C%21--%20Please%20provide%20all%20of%20the%20information%20requested%20below.%20We%27re%20a%20small%20team%20and%20without%20all%20of%20this%20information%20it%27s%20not%20possible%20for%20us%20to%20help%20and%20your%20bug%20report%20will%20be%20closed.%20--%3E%0A%0A%2A%2AWhat%20version%20of%20Tailwind%20CSS%20are%20you%20using%3F%2A%2A%0A%0AFor%20example%3A%20v2.0.4%0A%0A%2A%2AWhat%20build%20tool%20%28or%20framework%20if%20it%20abstracts%20the%20build%20tool%29%20are%20you%20using%3F%2A%2A%0A%0AFor%20example%3A%20postcss-cli%208.3.1%2C%20Next.js%2010.0.9%2C%20webpack%205.28.0%0A%0A%2A%2AWhat%20version%20of%20Node.js%20are%20you%20using%3F%2A%2A%0A%0AFor%20example%3A%20v12.0.0%0A%0A%2A%2AWhat%20browser%20are%20you%20using%3F%2A%2A%0A%0AFor%20example%3A%20Chrome%2C%20Safari%2C%20or%20N%2FA%0A%0A%2A%2AWhat%20operating%20system%20are%20you%20using%3F%2A%2A%0A%0AFor%20example%3A%20macOS%2C%20Windows%0A%0A%2A%2AReproduction%20URL%2A%2A%0A%0AA%20Tailwind%20Play%20link%20or%20public%20GitHub%20repo%20that%20includes%20a%20minimal%20reproduction%20of%20the%20bug.%20%2A%2APlease%20do%20not%20link%20to%20your%20actual%20project%2A%2A%2C%20what%20we%20need%20instead%20is%20a%20_minimal_%20reproduction%20in%20a%20fresh%20project%20without%20any%20unnecessary%20code.%20This%20means%20it%20doesn%27t%20matter%20if%20your%20real%20project%20is%20private%2Fconfidential%2C%20since%20we%20want%20a%20link%20to%20a%20separate%2C%20isolated%20reproduction%20anyways.%0A%0AA%20reproduction%20is%20%2A%2Arequired%2A%2A%20when%20filing%20an%20issue%20%E2%80%94%20any%20issue%20opened%20without%20a%20reproduction%20will%20be%20closed%20and%20you%27ll%20be%20asked%20to%20create%20a%20new%20issue%20that%20includes%20a%20reproduction.%20We%27re%20a%20small%20team%20and%20we%20can%27t%20keep%20up%20with%20the%20volume%20of%20issues%20we%20receive%20if%20we%20need%20to%20reproduce%20each%20issue%20from%20scratch%20ourselves.%0A%0A%2A%2ADescribe%20your%20issue%2A%2A%0A%0ADescribe%20the%20problem%20you%27re%20seeing%2C%20any%20important%20steps%20to%20reproduce%20and%20what%20behavior%20you%20expect%20instead.
-    about: If you've already asked for help with a problem and confirmed something is broken with Tailwind CSS itself, create a bug report.
   - name: Documentation Issue
     url: https://github.com/tailwindlabs/tailwindcss.com
     about: 'For documentation issues, suggest changes on our documentation repository.'
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ce7fafb97..aa0793aa3 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,8 +4,26 @@
 
 **Please ask first before starting work on any significant new features.**
 
-It's never a fun experience to have your pull request declined after investing a lot of time and effort into a new feature. To avoid this from happening, we request that contributors create an issue to first discuss any significant new features. This includes things like adding new utilities, creating new at-rules, or adding new component examples to the documentation.
+It's never a fun experience to have your pull request declined after investing a lot of time and effort into a new feature. To avoid this from happening, we request that contributors create a discussion to first discuss any significant new features.
 
-https://github.com/tailwindcss/tailwindcss/blob/master/.github/CONTRIBUTING.md
+For more info, check out the contributing guide:
+
+https://github.com/tailwindlabs/tailwindcss/blob/main/.github/CONTRIBUTING.md
+
+-->
+
+## Summary
+
+<!--
+
+Provide a summary of the issue and the changes you're making. How does your change solve the problem?
+
+-->
+
+## Test plan
+
+<!--
+
+Explain how you tested your changes. Include the exact commands that you used to verify the change works and include screenshots/screen recordings of the update behavior in the browser if applicable.
 
 -->
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54512c071..5ae59e80f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,18 +2,24 @@ name: CI
 
 on:
   push:
-    branches: [next]
+    branches: [main]
   pull_request:
 
 permissions:
   contents: read
 
+env:
+  NODE_VERSION: 24
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   tests:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [20]
         runner:
           - name: Windows
             os: windows-latest
@@ -21,17 +27,19 @@ jobs:
           - name: Linux
             os: namespace-profile-default
 
+          # Playwright 1.62+ dropped WebKit support for macOS 14, and hangs
+          # instead of failing when launching WebKit on a macos-14 runner.
           - name: macOS
-            os: macos-14
+            os: macos-15
 
         # Exclude windows and macos from being built on feature branches
-        on-next-branch:
-          - ${{ github.ref == 'refs/heads/next' }}
+        run-all:
+          - ${{ github.ref == 'refs/heads/main' || contains(github.event.pull_request.body, '[ci-all]') || github.event.pull_request.user.login == 'depfu[bot]' }}
         exclude:
-          - on-next-branch: false
+          - run-all: false
             runner:
               name: Windows
-          - on-next-branch: false
+          - run-all: false
             runner:
               name: macOS
 
@@ -41,21 +49,21 @@ jobs:
     name: ${{ matrix.runner.name }}
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'pnpm'
+          persist-credentials: false
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
+
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: ${{ env.NODE_VERSION }}
 
       # Cargo already skips downloading dependencies if they already exist
       - name: Cache cargo
-        uses: actions/cache@v4
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
         with:
           path: |
-            ~/.cargo/bin/
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
@@ -64,17 +72,25 @@ jobs:
 
       # Cache the `oxide` Rust build
       - name: Cache oxide build
-        uses: actions/cache@v4
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
         with:
           path: |
-            ./target/
             ./crates/node/*.node
-            ./crates/node/index.js
+            ./crates/node/*.wasm
             ./crates/node/index.d.ts
+            ./crates/node/index.js
+            ./crates/node/browser.js
+            ./crates/node/tailwindcss-oxide.wasi-browser.js
+            ./crates/node/tailwindcss-oxide.wasi.cjs
+            ./crates/node/wasi-worker-browser.mjs
+            ./crates/node/wasi-worker.mjs
           key: ${{ runner.os }}-oxide-${{ hashFiles('./crates/**/*') }}
 
+      - name: Setup WASM target
+        run: rustup target add wasm32-wasip1-threads
+
       - name: Install dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
 
       - name: Build
         run: pnpm run build
@@ -96,9 +112,13 @@ jobs:
       - name: Run Playwright tests
         run: npm run test:ui
 
+  notify:
+    if: ${{ always() && github.ref == 'refs/heads/main' && needs.tests.result == 'failure' }}
+    needs: tests
+    runs-on: ubuntu-latest
+    steps:
       - name: Notify Discord
-        if: failure() && github.ref == 'refs/heads/next'
-        uses: discord-actions/message@v2
+        uses: discord-actions/message@5c7149c81a83146e5d01f142be1bf87a61831c4d # v2
         with:
           webhookUrl: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          message: 'The [most recent build](<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>) on the `next` branch has failed.'
+          message: 'The [most recent ${{ github.workflow }} workflow](<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>) on the `main` branch has failed.'
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index d61223ae7..457c38424 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -2,19 +2,24 @@ name: Integration Tests
 
 on:
   push:
-    branches: [next]
+    branches: [main]
   pull_request:
 
 permissions:
   contents: read
 
+env:
+  NODE_VERSION: 24
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   tests:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [20]
-
         runner:
           - name: Windows
             os: windows-latest
@@ -30,15 +35,17 @@ jobs:
           - vite
           - cli
           - postcss
+          - oxide
+          - webpack
 
         # Exclude windows and macos from being built on feature branches
-        on-next-branch:
-          - ${{ github.ref == 'refs/heads/next' }}
+        run-all:
+          - ${{ github.ref == 'refs/heads/main' || contains(github.event.pull_request.body, '[ci-all]') }}
         exclude:
-          - on-next-branch: false
+          - run-all: false
             runner:
               name: Windows
-          - on-next-branch: false
+          - run-all: false
             runner:
               name: macOS
 
@@ -48,21 +55,25 @@ jobs:
     name: ${{ matrix.runner.name }} /  ${{ matrix.integration }}
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'pnpm'
+          persist-credentials: false
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
+
+      - run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: ${{ env.NODE_VERSION }}
 
       # Cargo already skips downloading dependencies if they already exist
       - name: Cache cargo
-        uses: actions/cache@v4
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
         with:
           path: |
-            ~/.cargo/bin/
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
@@ -71,15 +82,23 @@ jobs:
 
       # Cache the `oxide` Rust build
       - name: Cache oxide build
-        uses: actions/cache@v4
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
         with:
           path: |
-            ./target/
             ./crates/node/*.node
-            ./crates/node/index.js
+            ./crates/node/*.wasm
             ./crates/node/index.d.ts
+            ./crates/node/index.js
+            ./crates/node/browser.js
+            ./crates/node/tailwindcss-oxide.wasi-browser.js
+            ./crates/node/tailwindcss-oxide.wasi.cjs
+            ./crates/node/wasi-worker-browser.mjs
+            ./crates/node/wasi-worker.mjs
           key: ${{ runner.os }}-oxide-${{ hashFiles('./crates/**/*') }}
 
+      - name: Setup WASM target
+        run: rustup target add wasm32-wasip1-threads
+
       - name: Install dependencies
         run: pnpm install
 
@@ -94,9 +113,13 @@ jobs:
         env:
           GITHUB_WORKSPACE: ${{ github.workspace }}
 
+  notify:
+    if: ${{ always() && github.ref == 'refs/heads/main' && needs.tests.result == 'failure' }}
+    needs: tests
+    runs-on: ubuntu-latest
+    steps:
       - name: Notify Discord
-        if: failure() && github.ref == 'refs/heads/next'
-        uses: discord-actions/message@v2
+        uses: discord-actions/message@5c7149c81a83146e5d01f142be1bf87a61831c4d # v2
         with:
           webhookUrl: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          message: 'The [most recent build](<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>) on the `next` branch has failed.'
+          message: 'The [most recent ${{ github.workflow }} workflow](<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>) on the `main` branch has failed.'
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 0c4979b2b..24e829afd 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -2,21 +2,306 @@ name: Prepare Release
 
 on:
   workflow_dispatch:
+    inputs:
+      dry_run:
+        description: Skip creating the draft GitHub release
+        required: false
+        default: true
+        type: boolean
+  push:
+    tags:
+      - 'v*'
 
 env:
-  CI: true
+  APP_NAME: tailwindcss-oxide
+  NODE_VERSION: 24
+  PNPM_VERSION: '11.9.0'
+  OXIDE_LOCATION: ./crates/node
 
 permissions:
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
-    runs-on: macos-12
-    timeout-minutes: 15
-
     strategy:
       matrix:
-        node-version: [16]
+        include:
+          # Windows
+          - os: windows-latest
+            target: x86_64-pc-windows-msvc
+          - os: windows-latest
+            target: aarch64-pc-windows-msvc
+          # macOS
+          - os: macos-latest
+            target: x86_64-apple-darwin
+            strip: strip -x # Must use -x on macOS. This produces larger results on linux.
+          - os: macos-latest
+            target: aarch64-apple-darwin
+            page-size: 14
+            strip: strip -x # Must use -x on macOS. This produces larger results on linux.
+          # Android
+          - os: ubuntu-latest
+            target: aarch64-linux-android
+            strip: ${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
+          - os: ubuntu-latest
+            target: armv7-linux-androideabi
+            strip: ${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
+          # Linux
+          - os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            strip: strip
+            build-flags: --use-napi-cross
+          - os: ubuntu-latest
+            target: aarch64-unknown-linux-gnu
+            strip: aarch64-linux-gnu-strip
+            build-flags: --use-napi-cross
+          - os: ubuntu-latest
+            target: armv7-unknown-linux-gnueabihf
+            strip: arm-linux-gnueabihf-strip
+            build-flags: --use-napi-cross
+          - os: ubuntu-latest
+            target: aarch64-unknown-linux-musl
+            strip-zig: true
+            build-flags: -x
+          - os: ubuntu-latest
+            target: x86_64-unknown-linux-musl
+            strip: strip
+            build-flags: -x
+
+    name: Build ${{ matrix.target }} (oxide)
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
+        with:
+          version: ${{ env.PNPM_VERSION }}
+
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          package-manager-cache: false
+
+      - name: Install gcc-arm-linux-gnueabihf
+        if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y
+
+      - name: Install binutils-aarch64-linux-gnu
+        if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install binutils-aarch64-linux-gnu -y
+
+      - uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2
+        if: ${{ contains(matrix.target, 'musl') }}
+        with:
+          version: 0.14.1
+          use-cache: false
+
+      - name: Install cargo-zigbuild
+        uses: taiki-e/install-action@65851e10cd6c377f11a60e600abc07cb08643468 # v2
+        if: ${{ contains(matrix.target, 'musl') }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          tool: cargo-zigbuild
+
+      - name: Setup rust target
+        run: rustup target add ${{ matrix.target }}
+
+      - name: Install dependencies
+        run: pnpm install --ignore-scripts --frozen-lockfile --filter=!./playgrounds/*
+
+      - name: Build release
+        run: pnpm run --filter ${{ env.OXIDE_LOCATION }} build:platform --target=${{ matrix.target }} ${{ matrix.build-flags }}
+        env:
+          RUST_TARGET: ${{ matrix.target }}
+          JEMALLOC_SYS_WITH_LG_PAGE: ${{ matrix.page-size }}
+
+      - name: Strip debug symbols # https://github.com/rust-lang/rust/issues/46034
+        if: ${{ matrix.strip || matrix.strip-zig }}
+        env:
+          STRIP_COMMAND: ${{ matrix.strip }}
+          STRIP_ZIG: ${{ matrix.strip-zig }}
+        run: |
+          if [ "$STRIP_ZIG" = "true" ]; then
+            for file in ${{ env.OXIDE_LOCATION }}/*.node; do
+              zig objcopy --strip-all "$file" "$file.stripped"
+              mv "$file.stripped" "$file"
+            done
+            exit 0
+          fi
+
+          eval "$STRIP_COMMAND ${{ env.OXIDE_LOCATION }}/*.node"
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+        with:
+          name: bindings-${{ matrix.target }}
+          path: ${{ env.OXIDE_LOCATION }}/*.node
+
+  build-freebsd:
+    name: Build x86_64-unknown-freebsd (OXIDE)
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
+      - name: Build FreeBSD
+        uses: cross-platform-actions/action@cdc9ee69ef84a5f2e59c9058335d9c57bcb4ac86 # v0.25.0
+        env:
+          DEBUG: napi:*
+          RUSTUP_HOME: /usr/local/rustup
+          CARGO_HOME: /usr/local/cargo
+          RUSTUP_IO_THREADS: 1
+          RUST_TARGET: x86_64-unknown-freebsd
+        with:
+          operating_system: freebsd
+          version: '14.0'
+          memory: 13G
+          cpu_count: 3
+          environment_variables: 'DEBUG RUSTUP_IO_THREADS'
+          shell: bash
+          run: |
+            sudo pkg install -y -f curl node libnghttp2 npm
+            sudo npm install -g pnpm@${{ env.PNPM_VERSION }} --unsafe-perm=true
+            curl -sSf https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-freebsd/rustup-init --output rustup-init
+            chmod +x rustup-init
+            ./rustup-init -y --profile minimal
+            source "$HOME/.cargo/env"
+            pnpm install --ignore-scripts --frozen-lockfile --filter=!./playgrounds/* || true
+            echo "~~~~ rustc --version ~~~~"
+            rustc --version
+            echo "~~~~ node -v ~~~~"
+            node -v
+            echo "~~~~ pnpm --version ~~~~"
+            pnpm --version
+            pnpm run --filter ${{ env.OXIDE_LOCATION }} build:platform
+            strip -x ${{ env.OXIDE_LOCATION }}/*.node
+            ls -la ${{ env.OXIDE_LOCATION }}
+      - name: Upload artifacts
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+        with:
+          name: bindings-x86_64-unknown-freebsd
+          path: ${{ env.OXIDE_LOCATION }}/*.node
+
+  prepare:
+    runs-on: macos-14
+    timeout-minutes: 15
+    name: Build and release Tailwind CSS
+
+    permissions:
+      contents: write # Required for creating releases
+
+    needs:
+      - build
+      - build-freebsd
 
     steps:
-      - run: echo "stub"
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          fetch-depth: 20
+          persist-credentials: false
+
+      - run: git fetch --tags -f
+
+      - name: Resolve version
+        id: vars
+        run: |
+          echo "TAG_NAME=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
+        with:
+          version: ${{ env.PNPM_VERSION }}
+
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          registry-url: 'https://registry.npmjs.org'
+          package-manager-cache: false
+
+      - name: Setup WASM target
+        run: rustup target add wasm32-wasip1-threads
+
+      - name: Install dependencies
+        run: pnpm --filter=!./playgrounds/* install --frozen-lockfile
+
+      - name: Download artifacts
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
+        with:
+          path: ${{ env.OXIDE_LOCATION }}
+
+      - name: Move artifacts
+        run: |
+          cd ${{ env.OXIDE_LOCATION }}
+          cp bindings-x86_64-pc-windows-msvc/* ./npm/win32-x64-msvc/
+          cp bindings-aarch64-pc-windows-msvc/* ./npm/win32-arm64-msvc/
+          cp bindings-x86_64-apple-darwin/* ./npm/darwin-x64/
+          cp bindings-aarch64-apple-darwin/* ./npm/darwin-arm64/
+          cp bindings-aarch64-linux-android/* ./npm/android-arm64/
+          cp bindings-armv7-linux-androideabi/* ./npm/android-arm-eabi/
+          cp bindings-aarch64-unknown-linux-gnu/* ./npm/linux-arm64-gnu/
+          cp bindings-aarch64-unknown-linux-musl/* ./npm/linux-arm64-musl/
+          cp bindings-armv7-unknown-linux-gnueabihf/* ./npm/linux-arm-gnueabihf/
+          cp bindings-x86_64-unknown-linux-gnu/* ./npm/linux-x64-gnu/
+          cp bindings-x86_64-unknown-linux-musl/* ./npm/linux-x64-musl/
+          cp bindings-x86_64-unknown-freebsd/* ./npm/freebsd-x64/
+
+      - name: Build Tailwind CSS
+        run: pnpm run build
+        env:
+          FEATURES_ENV: stable
+
+      - name: Run pre-publish optimizations scripts
+        run: node ./scripts/pre-publish-optimizations.mjs
+
+      - name: Lock pre-release versions
+        run: node ./scripts/lock-pre-release-versions.mjs
+
+      - name: Get release notes
+        run: |
+          RELEASE_NOTES=$(node ./scripts/release-notes.mjs)
+          echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
+          echo "$RELEASE_NOTES" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
+      - name: Upload standalone artifacts
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+        with:
+          name: tailwindcss-standalone
+          path: packages/@tailwindcss-standalone/dist/
+
+      - name: Upload npm package tarballs
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+        with:
+          name: npm-package-tarballs
+          path: dist/*.tgz
+
+      - name: Prepare GitHub Release
+        if: ${{ !inputs.dry_run }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release create "${TAG_NAME}" \
+              --draft \
+              --title "${TAG_NAME}" \
+              --notes "${RELEASE_NOTES}" \
+              packages/@tailwindcss-standalone/dist/sha256sums.txt \
+              packages/@tailwindcss-standalone/dist/tailwindcss-linux-arm64 \
+              packages/@tailwindcss-standalone/dist/tailwindcss-linux-arm64-musl \
+              packages/@tailwindcss-standalone/dist/tailwindcss-linux-x64 \
+              packages/@tailwindcss-standalone/dist/tailwindcss-linux-x64-musl \
+              packages/@tailwindcss-standalone/dist/tailwindcss-macos-arm64 \
+              packages/@tailwindcss-standalone/dist/tailwindcss-macos-x64 \
+              packages/@tailwindcss-standalone/dist/tailwindcss-windows-x64.exe
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 64abf817a..2c957d3af 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,22 +1,34 @@
 name: Release
 
 on:
+  push:
+    branches: [main]
+  release:
+    types: [published]
   workflow_dispatch:
     inputs:
-      release_channel:
-        description: 'Release channel'
-        required: false
-        default: 'next'
-        type: string
+      channel:
+        description: Release channel to publish
+        required: true
+        default: insiders
+        type: choice
+        options:
+          - insiders
+          - release
 
 permissions:
   contents: read
 
 env:
   APP_NAME: tailwindcss-oxide
-  NODE_VERSION: 20
+  NODE_VERSION: 24
+  PNPM_VERSION: '11.9.0'
   OXIDE_LOCATION: ./crates/node
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     strategy:
@@ -46,163 +58,207 @@ jobs:
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             strip: strip
-            container:
-              image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
+            build-flags: --use-napi-cross
           - os: ubuntu-latest
             target: aarch64-unknown-linux-gnu
-            strip: llvm-strip
-            container:
-              image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
+            strip: aarch64-linux-gnu-strip
+            build-flags: --use-napi-cross
           - os: ubuntu-latest
             target: armv7-unknown-linux-gnueabihf
-            strip: llvm-strip
-            container:
-              image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-zig
+            strip: arm-linux-gnueabihf-strip
+            build-flags: --use-napi-cross
           - os: ubuntu-latest
             target: aarch64-unknown-linux-musl
-            strip: aarch64-linux-musl-strip
-            download: true
-            container:
-              image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
+            strip-zig: true
+            build-flags: -x
           - os: ubuntu-latest
             target: x86_64-unknown-linux-musl
             strip: strip
-            download: true
-            container:
-              image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
+            build-flags: -x
 
-    name: Build ${{ matrix.target }} (OXIDE)
+    name: Build ${{ matrix.target }} (oxide)
     runs-on: ${{ matrix.os }}
-    container: ${{ matrix.container }}
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
+        with:
+          version: ${{ env.PNPM_VERSION }}
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: 'pnpm'
+          package-manager-cache: false
 
-      # Cargo already skips downloading dependencies if they already exist
-      - name: Cache cargo
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-${{ matrix.target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      # Cache the `oxide` Rust build
-      - name: Cache oxide build
-        uses: actions/cache@v4
-        with:
-          path: |
-            ./oxide/target/
-            ./crates/node/*.node
-            ./crates/node/index.js
-            ./crates/node/index.d.ts
-          key: ${{ runner.os }}-${{ matrix.target }}-oxide-${{ hashFiles('./crates/**/*') }}
-
-      - name: Install Node.JS
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-
-      - name: Install Rust (Stable)
-        if: ${{ matrix.download }}
+      - name: Install gcc-arm-linux-gnueabihf
+        if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }}
         run: |
-          rustup default stable
+          sudo apt-get update
+          sudo apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y
+
+      - name: Install binutils-aarch64-linux-gnu
+        if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install binutils-aarch64-linux-gnu -y
+
+      - uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2
+        if: ${{ contains(matrix.target, 'musl') }}
+        with:
+          version: 0.14.1
+          use-cache: false
+
+      - name: Install cargo-zigbuild
+        uses: taiki-e/install-action@65851e10cd6c377f11a60e600abc07cb08643468 # v2
+        if: ${{ contains(matrix.target, 'musl') }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          tool: cargo-zigbuild
 
       - name: Setup rust target
         run: rustup target add ${{ matrix.target }}
 
       - name: Install dependencies
-        run: pnpm install --ignore-scripts --filter=!./playgrounds/*
+        run: pnpm install --ignore-scripts --frozen-lockfile --filter=!./playgrounds/*
 
       - name: Build release
-        run: pnpm run --filter ${{ env.OXIDE_LOCATION }} build
+        run: pnpm run --filter ${{ env.OXIDE_LOCATION }} build:platform --target=${{ matrix.target }} ${{ matrix.build-flags }}
         env:
           RUST_TARGET: ${{ matrix.target }}
           JEMALLOC_SYS_WITH_LG_PAGE: ${{ matrix.page-size }}
 
       - name: Strip debug symbols # https://github.com/rust-lang/rust/issues/46034
-        if: ${{ matrix.strip }}
-        run: ${{ matrix.strip }} ${{ env.OXIDE_LOCATION }}/*.node
+        if: ${{ matrix.strip || matrix.strip-zig }}
+        env:
+          STRIP_COMMAND: ${{ matrix.strip }}
+          STRIP_ZIG: ${{ matrix.strip-zig }}
+        run: |
+          if [ "$STRIP_ZIG" = "true" ]; then
+            for file in ${{ env.OXIDE_LOCATION }}/*.node; do
+              zig objcopy --strip-all "$file" "$file.stripped"
+              mv "$file.stripped" "$file"
+            done
+            exit 0
+          fi
+
+          eval "$STRIP_COMMAND ${{ env.OXIDE_LOCATION }}/*.node"
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         with:
           name: bindings-${{ matrix.target }}
           path: ${{ env.OXIDE_LOCATION }}/*.node
 
+  build-freebsd:
+    name: Build x86_64-unknown-freebsd (OXIDE)
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
+      - name: Build FreeBSD
+        uses: cross-platform-actions/action@cdc9ee69ef84a5f2e59c9058335d9c57bcb4ac86 # v0.25.0
+        env:
+          DEBUG: napi:*
+          RUSTUP_HOME: /usr/local/rustup
+          CARGO_HOME: /usr/local/cargo
+          RUSTUP_IO_THREADS: 1
+          RUST_TARGET: x86_64-unknown-freebsd
+        with:
+          operating_system: freebsd
+          version: '14.0'
+          memory: 13G
+          cpu_count: 3
+          environment_variables: 'DEBUG RUSTUP_IO_THREADS'
+          shell: bash
+          run: |
+            sudo pkg install -y -f curl node libnghttp2 npm
+            sudo npm install -g pnpm@${{ env.PNPM_VERSION }} --unsafe-perm=true
+            curl -sSf https://static.rust-lang.org/rustup/archive/1.27.1/x86_64-unknown-freebsd/rustup-init --output rustup-init
+            chmod +x rustup-init
+            ./rustup-init -y --profile minimal
+            source "$HOME/.cargo/env"
+            echo "~~~~ rustc --version ~~~~"
+            rustc --version
+            echo "~~~~ node -v ~~~~"
+            node -v
+            echo "~~~~ pnpm --version ~~~~"
+            pnpm --version
+            pnpm install --ignore-scripts --frozen-lockfile --filter=!./playgrounds/* || true
+            pnpm run --filter ${{ env.OXIDE_LOCATION }} build:platform
+            strip -x ${{ env.OXIDE_LOCATION }}/*.node
+            ls -la ${{ env.OXIDE_LOCATION }}
+      - name: Upload artifacts
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+        with:
+          name: bindings-x86_64-unknown-freebsd
+          path: ${{ env.OXIDE_LOCATION }}/*.node
+
   release:
     runs-on: macos-14
     timeout-minutes: 15
-    name: Build and release Tailwind CSS
+    name: Build and publish Tailwind CSS
 
     permissions:
-      contents: write # for softprops/action-gh-release to create GitHub release
+      contents: read
       # https://docs.npmjs.com/generating-provenance-statements#publishing-packages-with-provenance-via-github-actions
       id-token: write
 
     needs:
       - build
+      - build-freebsd
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
-          fetch-tags: true
           fetch-depth: 20
+          persist-credentials: false
 
-      - run: git fetch --tags -f
-
-      - name: Resolve version
-        id: vars
-        run: |
-          echo "TAG_NAME=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
-
-      - uses: pnpm/action-setup@v4
+      - uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
+        with:
+          version: ${{ env.PNPM_VERSION }}
 
       - name: Use Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: 'pnpm'
           registry-url: 'https://registry.npmjs.org'
+          package-manager-cache: false
 
-      # Cargo already skips downloading dependencies if they already exist
-      - name: Cache cargo
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-${{ matrix.target }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      # npm trusted publishing validates the caller workflow filename, so all npm publishes live here.
+      # This workflow rebuilds the publish artifacts instead of depending on prepare-release.yml.
+      - name: Resolve release metadata
+        env:
+          INPUT_CHANNEL: ${{ github.event.inputs.channel || '' }}
+        run: |
+          if [[ "${{ github.event_name }}" == "release" || "$INPUT_CHANNEL" == "release" ]]; then
+            release_channel=$(node ./scripts/release-channel.js)
 
-      # Cache the `oxide` Rust build
-      - name: Cache oxide build
-        uses: actions/cache@v4
-        with:
-          path: |
-            ./oxide/target/
-            ./crates/node/*.node
-            ./crates/node/index.js
-            ./crates/node/index.d.ts
-          key: ${{ runner.os }}-${{ matrix.target }}-oxide-${{ hashFiles('./crates/**/*') }}
+            echo "RELEASE_KIND=release" >> $GITHUB_ENV
+            echo "RELEASE_CHANNEL=$release_channel" >> $GITHUB_ENV
+            echo "FEATURES_ENV=stable" >> $GITHUB_ENV
+          else
+            sha_short=$(git rev-parse --short HEAD)
+
+            echo "RELEASE_KIND=insiders" >> $GITHUB_ENV
+            echo "RELEASE_CHANNEL=insiders" >> $GITHUB_ENV
+            echo "SHA_SHORT=$sha_short" >> $GITHUB_ENV
+            echo "INSIDERS_VERSION=0.0.0-insiders.$sha_short" >> $GITHUB_ENV
+          fi
+
+      - name: Setup WASM target
+        run: rustup target add wasm32-wasip1-threads
 
       - name: Install dependencies
-        run: pnpm --filter=!./playgrounds/* install
+        run: pnpm --filter=!./playgrounds/* install --frozen-lockfile
 
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
         with:
           path: ${{ env.OXIDE_LOCATION }}
 
@@ -220,52 +276,83 @@ jobs:
           cp bindings-armv7-unknown-linux-gnueabihf/* ./npm/linux-arm-gnueabihf/
           cp bindings-x86_64-unknown-linux-gnu/* ./npm/linux-x64-gnu/
           cp bindings-x86_64-unknown-linux-musl/* ./npm/linux-x64-musl/
+          cp bindings-x86_64-unknown-freebsd/* ./npm/freebsd-x64/
+
+      - name: 'Version based on commit: ${{ env.INSIDERS_VERSION }}'
+        if: env.RELEASE_KIND == 'insiders'
+        run: pnpm run version-packages ${INSIDERS_VERSION}
 
       - name: Build Tailwind CSS
+        if: env.RELEASE_KIND == 'insiders'
         run: pnpm run build
 
+      - name: Build Tailwind CSS
+        if: env.RELEASE_KIND == 'release'
+        run: pnpm run build
+        env:
+          FEATURES_ENV: ${{ env.FEATURES_ENV }}
+
       - name: Run pre-publish optimizations scripts
         run: node ./scripts/pre-publish-optimizations.mjs
 
       - name: Lock pre-release versions
         run: node ./scripts/lock-pre-release-versions.mjs
 
-      - name: Get release notes
-        run: |
-          RELEASE_NOTES=$(node ./scripts/release-notes.mjs)
-          echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
-          echo "$RELEASE_NOTES" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-
-      - name: Upload Standalone Artifacts
-        uses: actions/upload-artifact@v4
+      - name: Upload npm package tarballs
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         with:
-          name: tailwindcss-standalone
-          path: packages/@tailwindcss-standalone/dist/
+          name: npm-package-tarballs
+          path: dist/*.tgz
 
       - name: Publish
-        run: pnpm --recursive publish --tag ${{ inputs.release_channel }} --no-git-checks
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: Alias packages to `latest`
-        if: ${{ inputs.release_channel == "next" }}
         run: |
-          npm dist-tag add @tailwindcss/upgrade@${{ env.TAG_NAME }} latest
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          pnpm --recursive --filter="!@tailwindcss/oxide-wasm32-wasi" publish --tag ${RELEASE_CHANNEL} --no-git-checks
+          # The wasm package needs a special npm config that isn't read when pnpm --recursive is used
+          pushd crates/node/npm/wasm32-wasi; pnpm publish --tag ${RELEASE_CHANNEL} --no-git-checks --config.node-linker=hoisted; popd;
 
-      - name: Release
-        uses: softprops/action-gh-release@v2
+      - name: Trigger Tailwind Play update
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
         with:
-          draft: true
-          tag_name: ${{ env.TAG_NAME }}
-          body: |
-            ${{ env.RELEASE_NOTES }}
-          files: |
-            packages/@tailwindcss-standalone/dist/sha256sums.txt
-            packages/@tailwindcss-standalone/dist/tailwindcss-linux-arm64
-            packages/@tailwindcss-standalone/dist/tailwindcss-linux-x64
-            packages/@tailwindcss-standalone/dist/tailwindcss-macos-arm64
-            packages/@tailwindcss-standalone/dist/tailwindcss-macos-x64
-            packages/@tailwindcss-standalone/dist/tailwindcss-windows-x64.exe
+          github-token: ${{ secrets.TAILWIND_PLAY_TOKEN }}
+          script: |
+            await github.rest.actions.createWorkflowDispatch({
+              owner: 'tailwindlabs',
+              repo: 'upgrades',
+              ref: 'main',
+              workflow_id: 'upgrade-tailwindcss.yml'
+            })
+
+  notify:
+    if: ${{ always() && (needs.build.result == 'failure' || needs.build-freebsd.result == 'failure' || needs.release.result == 'failure') }}
+    needs:
+      - build
+      - build-freebsd
+      - release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
+
+      - name: Resolve release label
+        id: release
+        env:
+          INPUT_CHANNEL: ${{ github.event.inputs.channel || '' }}
+          RELEASE_TAG: ${{ github.event.release.tag_name || '' }}
+        run: |
+          if [[ "${{ github.event_name }}" == "release" ]]; then
+            tag_name="${RELEASE_TAG:-${GITHUB_REF_NAME}}"
+            echo "label=release ${tag_name}" >> $GITHUB_OUTPUT
+          elif [[ "$INPUT_CHANNEL" == "release" ]]; then
+            version=$(node -p "require('./packages/tailwindcss/package.json').version")
+            echo "label=release v${version}" >> $GITHUB_OUTPUT
+          else
+            sha_short=$(git rev-parse --short HEAD)
+            echo "label=insiders release 0.0.0-insiders.${sha_short}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Notify Discord
+        uses: discord-actions/message@5c7149c81a83146e5d01f142be1bf87a61831c4d # v2
+        with:
+          webhookUrl: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          message: 'The [most recent ${{ github.workflow }} workflow](<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>) for `${{ steps.release.outputs.label }}` has failed.'
diff --git a/.gitignore b/.gitignore
index 9d75bba27..bbac7d227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@ playwright-report/
 blob-report/
 playwright/.cache/
 target/
-.debug
+.debug/
diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index ded82e2f6..000000000
--- a/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-auto-install-peers = true
diff --git a/.prettierignore b/.prettierignore
index 3de4530dd..4f50b932f 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -4,5 +4,6 @@ pnpm-lock.yaml
 target/
 crates/node/index.d.ts
 crates/node/index.js
+crates/ignore/
 .next
 .fingerprint
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6787ae2d..e5e6f6f89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,896 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-- Nothing yet!
+### Added
+
+- Add `@tailwindcss/turbopack` package to run Tailwind CSS with Next.js ([20367](https://github.com/tailwindlabs/tailwindcss/pull/20367))
+
+### Fixed
+
+- Ensure watch mode detects changes to symlinked `@source` files whose real paths aren't otherwise scanned ([#20356](https://github.com/tailwindlabs/tailwindcss/pull/20356))
+- Ensure custom variants using `@scope` wrap the generated utilities instead of nesting inside them ([#20369](https://github.com/tailwindlabs/tailwindcss/pull/20369))
+- Fix flattening of `@scope` at-rules ([#20369](https://github.com/tailwindlabs/tailwindcss/pull/20369))
+- Fix standalone declarations in `@scope`, wrap them in `:where(:scope)` ([#20369](https://github.com/tailwindlabs/tailwindcss/pull/20369))
+- Always emit a space for empty fallback values in CSS variables (e.g. `var(--tw-blur,)` → `var(--tw-blur, )`) ([#20373](https://github.com/tailwindlabs/tailwindcss/pull/20373))
+- Canonicalization: convert arbitrary breakpoint and container query variants to named equivalents (e.g. `max-[64rem]` → `max-lg`) ([#20380](https://github.com/tailwindlabs/tailwindcss/pull/20380))
+- Prevent `@tailwindcss/vite` from crashing on every edit under Vite's experimental `bundledDev` mode ([#20379](https://github.com/tailwindlabs/tailwindcss/pull/20379))
+- Ensure `@tailwindcss/oxide` falls back to WASM on platforms without native bindings ([#20383](https://github.com/tailwindlabs/tailwindcss/pull/20383))
+- Detect classes in Ruby percent literals using angle brackets or custom delimiters (e.g. `%w<flex>`, `%w|flex|`), including in Slim and Haml templates ([#20387](https://github.com/tailwindlabs/tailwindcss/pull/20387))
+- Preserve whitespace in `--default(…)` values in custom functional utilities (e.g. `--default(box alphabetic)` no longer becomes `boxalphabetic`) ([#20392](https://github.com/tailwindlabs/tailwindcss/pull/20392))
+- Don't scan gitignored directories (e.g. `node_modules` and `.git`) when the project uses a safelist-style `.gitignore` (e.g. `/*` followed by `!/…` negations) ([#20397](https://github.com/tailwindlabs/tailwindcss/pull/20397))
+- Ensure root `theme('…')` namespace lookups in JavaScript plugins and config files return the full namespace object instead of the value of its `DEFAULT` key ([#20399](https://github.com/tailwindlabs/tailwindcss/pull/20399))
+- Skip ignored directories entirely when computing watch globs (`scanner.globs`), instead of walking their full contents on every rebuild ([#20408](https://github.com/tailwindlabs/tailwindcss/pull/20408))
+- Oxide: drop invalid UTF-8 candidates ([#20389](https://github.com/tailwindlabs/tailwindcss/pull/20389))
+- `@tailwindcss/vite` no longer forces a full page reload for external files (e.g.: `.php` files) ([#20414](https://github.com/tailwindlabs/tailwindcss/issues/20414))
+- Canonicalization: don't merge utilities that reference different theme variables set to CSS-wide keywords like `unset` ([#20417](https://github.com/tailwindlabs/tailwindcss/pull/20417))
+- Don't generate utilities when a modifier is used that would otherwise be silently ignored (e.g. `rounded-sm/[5]`, `shadow-sm/foo`, `stroke-2/50`) ([#20419](https://github.com/tailwindlabs/tailwindcss/pull/20419))
+- Only normalize top-level `and`, `or`, and `not` keywords in `supports-[…]` variants (e.g. `selector(a: not (.foo))` → `selector(a:not(.foo))`) ([#20420](https://github.com/tailwindlabs/tailwindcss/pull/20420))
+- Don't warn about Angular's `::ng-deep` and `:host-context()` when optimizing CSS ([#20434](https://github.com/tailwindlabs/tailwindcss/pull/20434))
+- Don't generate CSS for candidates containing an empty additional modifier (e.g. `bg-red-500/50/` and `group-hover/foo//bar:flex`) ([#20466](https://github.com/tailwindlabs/tailwindcss/pull/20466))
+- Sort `min-*`, `max-*`, and container query variants with decimal values numerically (e.g. `min-[40.25rem]` before `min-[40.5rem]`) ([#20512](https://github.com/tailwindlabs/tailwindcss/pull/20512))
+- Ensure CSS comments ending with `\*/` are closed correctly instead of swallowing the CSS that follows (e.g. `/* C:\temp\*/`) ([#20508](https://github.com/tailwindlabs/tailwindcss/pull/20508))
+- Improve style invalidation performance of `group-*` and `peer-*` variants ([#20513](https://github.com/tailwindlabs/tailwindcss/pull/20513))
+
+## [4.3.3] - 2026-07-16
+
+### Fixed
+
+- Support `--watch --poll[=ms]` in `@tailwindcss/cli` when filesystem events are unreliable or unavailable ([#20297](https://github.com/tailwindlabs/tailwindcss/pull/20297))
+- Canonicalization: match arbitrary hex colors against theme colors case-insensitively (e.g. `bg-[#fff]` and `bg-[#FFF]` → `bg-white`) ([#20298](https://github.com/tailwindlabs/tailwindcss/pull/20298))
+- Prevent Preflight from overriding Firefox's native `iframe:focus-visible` outline styles ([#20292](https://github.com/tailwindlabs/tailwindcss/pull/20292))
+- Ensure `theme('colors.foo')` in JS plugins resolves correctly when both `--color-foo` and `--color-foo-bar` exist ([#20299](https://github.com/tailwindlabs/tailwindcss/pull/20299))
+- Ensure fractional opacity modifiers work with named shadow sizes like `shadow-sm/12.5`, `text-shadow-sm/12.5`, `drop-shadow-sm/12.5`, and `inset-shadow-sm/12.5` ([#20302](https://github.com/tailwindlabs/tailwindcss/pull/20302))
+- Parse selectors like `[data-foo]div` as two selectors instead of one ([#20303](https://github.com/tailwindlabs/tailwindcss/pull/20303))
+- Ensure `@tailwindcss/postcss` rebuilds when a preprocessor like Sass changes the input CSS without changing the input file on disk ([#20310](https://github.com/tailwindlabs/tailwindcss/pull/20310))
+- Ensure CSS nesting is handled even when Lightning CSS isn't run, such as in `@tailwindcss/browser` and Tailwind Play ([#20124](https://github.com/tailwindlabs/tailwindcss/pull/20124))
+- Prevent achromatic theme colors from shifting hue when mixed in polar color spaces like `oklch` ([#20314](https://github.com/tailwindlabs/tailwindcss/pull/20314))
+- Ensure `--spacing(0)` is optimized to `0px` instead of `0` so it remains a `<length>` when used in `calc(…)` ([#20319](https://github.com/tailwindlabs/tailwindcss/pull/20319))
+- Load `@parcel/watcher` only when needed in `@tailwindcss/cli --watch` mode, so one-off builds and `--watch --poll` work when `@parcel/watcher` can't be loaded ([#20325](https://github.com/tailwindlabs/tailwindcss/pull/20325))
+- Use explicit platform fonts instead of `system-ui` and `ui-sans-serif` so CJK text respects the page's `lang` attribute on Windows ([#20318](https://github.com/tailwindlabs/tailwindcss/pull/20318))
+- Prevent `@tailwindcss/upgrade` from rewriting ignored files when run from a subdirectory ([#20329](https://github.com/tailwindlabs/tailwindcss/pull/20329))
+- Ensure earlier `@source` rules pointing to nested files are scanned when later `@source` rules point to files in parent folders ([#20335](https://github.com/tailwindlabs/tailwindcss/pull/20335))
+- Prevent `@tailwindcss/vite` from triggering full page reloads when scanned files are processed by Vite but haven't been loaded as modules yet ([#20336](https://github.com/tailwindlabs/tailwindcss/pull/20336))
+
+## [4.3.2] - 2026-06-26
+
+### Fixed
+
+- Support bare spacing values for `auto-rows-*` and `auto-cols-*` utilities (e.g. `auto-rows-12` and `auto-cols-16`) ([#20229](https://github.com/tailwindlabs/tailwindcss/pull/20229))
+- Prevent `@tailwindcss/cli` in `--watch` mode from crashing on Windows when `@source` points to a directory that doesn't exist ([#20242](https://github.com/tailwindlabs/tailwindcss/pull/20242))
+- Prevent `@tailwindcss/vite` from crashing in Deno v2.8.x when `context.parentURL` is not a valid URL ([#20245](https://github.com/tailwindlabs/tailwindcss/pull/20245))
+- Ensure `@tailwindcss/cli` in `--watch` mode rebuilds when the input CSS file changes in an ignored directory ([#20246](https://github.com/tailwindlabs/tailwindcss/pull/20246))
+- Allow `@variant` rules used in `addBase(…)` to use custom variants defined later ([#20247](https://github.com/tailwindlabs/tailwindcss/pull/20247))
+- Prevent `@tailwindcss/vite` from crashing during HMR when scanned files or directories are deleted ([#20259](https://github.com/tailwindlabs/tailwindcss/pull/20259))
+- Generate `font-size` instead of `color` declarations for `text-[--spacing(…)]` ([#20260](https://github.com/tailwindlabs/tailwindcss/pull/20260))
+- Prevent `@source` patterns from scanning unrelated sibling files and folders ([#20263](https://github.com/tailwindlabs/tailwindcss/pull/20263))
+- Extract class candidates adjacent to Template Toolkit delimiters like `%]…[%` in `.tt`, `.tt2`, and `.tx` files ([#20269](https://github.com/tailwindlabs/tailwindcss/pull/20269))
+- Extract class candidates from conditional Maud syntax like `p.text-black[condition]` ([#20269](https://github.com/tailwindlabs/tailwindcss/pull/20269))
+- Prevent `@position-try` rules from triggering unknown at-rule warnings when optimizing CSS ([#20277](https://github.com/tailwindlabs/tailwindcss/pull/20277))
+- Support class suggestions for named opacity modifiers from `--opacity` theme values ([#20287](https://github.com/tailwindlabs/tailwindcss/pull/20287))
+- Prevent type errors in `@tailwindcss/postcss` when used with newer PostCSS patch releases ([#20289](https://github.com/tailwindlabs/tailwindcss/pull/20289))
+
+## [4.3.1] - 2026-06-12
+
+### Added
+
+- Add `--silent` option to suppress output in `@tailwindcss/cli` ([#20100](https://github.com/tailwindlabs/tailwindcss/pull/20100))
+
+### Fixed
+
+- Remove deprecation warnings by using `Module#registerHooks` instead of `Module#register` on Node 26+ ([#20028](https://github.com/tailwindlabs/tailwindcss/pull/20028))
+- Canonicalization: don't crash when plugin utilities throw for unsupported values ([#20052](https://github.com/tailwindlabs/tailwindcss/pull/20052))
+- Allow `@apply` to be used with CSS mixins ([#19427](https://github.com/tailwindlabs/tailwindcss/pull/19427))
+- Ensure `not-*` correctly negates `@container` queries, including `style(…)` queries ([#20059](https://github.com/tailwindlabs/tailwindcss/pull/20059))
+- Ensure `drop-shadow-*` color utilities work with custom shadow values containing `calc(…)` ([#20080](https://github.com/tailwindlabs/tailwindcss/pull/20080))
+- Fix 'Sourcemap is likely to be incorrect' warnings when using `@tailwindcss/vite` ([#20103](https://github.com/tailwindlabs/tailwindcss/pull/20103))
+- Ensure `@tailwindcss/webpack` can be installed in Rspack projects without requiring `webpack` as a peer dependency ([#20027](https://github.com/tailwindlabs/tailwindcss/pull/20027))
+- Canonicalization: don't suggest invalid `calc(…)` expressions (e.g. `px-[calc(1rem+0px)]` → `px-[calc(1rem+0)]`) ([#20127](https://github.com/tailwindlabs/tailwindcss/pull/20127))
+- Canonicalization: avoid suggesting large spacing-scale values for arbitrary lengths (e.g. `left-[99999px]` → `left-[99999px]`, not `left-24999.75`) ([#20130](https://github.com/tailwindlabs/tailwindcss/pull/20130))
+- Ensure `@tailwindcss/cli` in `--watch` mode recovers when a tracked dependency is deleted and restored ([#20137](https://github.com/tailwindlabs/tailwindcss/pull/20137))
+- Ensure standalone `@tailwindcss/cli` binaries are ignored when scanning for class candidates ([#20139](https://github.com/tailwindlabs/tailwindcss/pull/20139))
+- Ensure class candidates are extracted from Twig `addClass(…)` and `removeClass(…)` calls ([#20198](https://github.com/tailwindlabs/tailwindcss/pull/20198))
+- Don't crash in the Ruby or Vue preprocessors when scanning files containing invalid UTF-8 bytes ([#19588](https://github.com/tailwindlabs/tailwindcss/pull/19588))
+- Allow `@variant` to be used inside `addBase` ([#19480](https://github.com/tailwindlabs/tailwindcss/pull/19480))
+- Ensure `@source` globs with symlinks are preserved ([#20203](https://github.com/tailwindlabs/tailwindcss/pull/20203))
+- Ensure later `@source` rules can re-include files excluded by earlier `@source not` rules ([#20203](https://github.com/tailwindlabs/tailwindcss/pull/20203))
+- Upgrade: don't migrate empty class rules to invalid `@utility` rules ([#20205](https://github.com/tailwindlabs/tailwindcss/pull/20205))
+- Ensure transitions between `inset-shadow-none` and other inset shadows work correctly ([#20208](https://github.com/tailwindlabs/tailwindcss/pull/20208))
+- Ensure explicitly referenced `@source` directories are scanned even when ignored by git ([#20214](https://github.com/tailwindlabs/tailwindcss/pull/20214))
+- Ensure `@source` globs ending in `**/*` preserve dynamic path segments to avoid scanning too many files ([#20217](https://github.com/tailwindlabs/tailwindcss/pull/20217))
+- Canonicalization: don't fold `calc(…)` divisions when the result would require high precision (e.g. `w-[calc(100%/3.5)]` → `w-[calc(100%/3.5)]`, not `w-[28.571428571428573%]`) ([#20221](https://github.com/tailwindlabs/tailwindcss/pull/20221))
+- Serve ESM type declarations to ESM importers of `@tailwindcss/postcss` ([#20228](https://github.com/tailwindlabs/tailwindcss/pull/20228))
+
+### Changed
+
+- Generate `0` instead of `calc(var(--spacing) * 0)` for spacing utilities like `m-0` and `left-0` ([#20196](https://github.com/tailwindlabs/tailwindcss/pull/20196))
+- Generate `var(--spacing)` instead of `calc(var(--spacing) * 1)` for spacing utilities like `m-1` and `left-1` ([#20196](https://github.com/tailwindlabs/tailwindcss/pull/20196))
+
+## [4.3.0] - 2026-05-08
+
+### Added
+
+- Add `@container-size` utility ([#18901](https://github.com/tailwindlabs/tailwindcss/pull/18901))
+- Add `scrollbar-{auto,thin,none}` utilities for `scrollbar-width`, and `scrollbar-thumb-*` / `scrollbar-track-*` color utilities for `scrollbar-color` ([#19981](https://github.com/tailwindlabs/tailwindcss/pull/19981), [#20019](https://github.com/tailwindlabs/tailwindcss/pull/20019))
+- Add `scrollbar-gutter-*` utilities ([#20018](https://github.com/tailwindlabs/tailwindcss/pull/20018))
+- Add `zoom-*` utilities ([#20020](https://github.com/tailwindlabs/tailwindcss/pull/20020))
+- Add `tab-*` utilities ([#20022](https://github.com/tailwindlabs/tailwindcss/pull/20022))
+- Allow using `@variant` with stacked variants (e.g. `@variant hover:focus { … }`) ([#19996](https://github.com/tailwindlabs/tailwindcss/pull/19996))
+- Allow using `@variant` with compound variants (e.g. `@variant hover, focus { … }`) ([#19996](https://github.com/tailwindlabs/tailwindcss/pull/19996))
+- Support `--default(…)` in `--value(…)` and `--modifier(…)` for functional `@utility` definitions ([#19989](https://github.com/tailwindlabs/tailwindcss/pull/19989))
+
+### Fixed
+
+- Ensure `@plugin` resolves package JavaScript entries instead of browser CSS entries when using `@tailwindcss/vite` ([#19949](https://github.com/tailwindlabs/tailwindcss/pull/19949))
+- Fix relative `@import` and `@plugin` paths resolving from the wrong directory when using `@tailwindcss/vite` ([#19965](https://github.com/tailwindlabs/tailwindcss/pull/19965))
+- Ensure CSS files containing `@variant` are processed by `@tailwindcss/vite` ([#19966](https://github.com/tailwindlabs/tailwindcss/pull/19966))
+- Resolve imports relative to `base` when `result.opts.from` is not provided when using `@tailwindcss/postcss` ([#19980](https://github.com/tailwindlabs/tailwindcss/pull/19980))
+- Canonicalization: preserve significant `_` whitespace in arbitrary values ([#19986](https://github.com/tailwindlabs/tailwindcss/pull/19986))
+- Canonicalization: add parentheses when removing whitespace from arbitrary values would hurt readability (e.g. `w-[calc(100%---spacing(60))]` → `w-[calc(100%-(--spacing(60)))]`) ([#19986](https://github.com/tailwindlabs/tailwindcss/pull/19986))
+- Canonicalization: preserve the original unit in arbitrary values instead of normalizing to base units (e.g. `-mt-[20in]` → `mt-[-20in]`, not `mt-[-1920px]`) ([#19988](https://github.com/tailwindlabs/tailwindcss/pull/19988))
+- Canonicalization: migrate arbitrary `:has()` variants from `[&:has(…)]` to `has-[…]` ([#19991](https://github.com/tailwindlabs/tailwindcss/pull/19991))
+- Upgrade: don’t migrate inline `style` attributes (e.g. `style="flex-grow: 1"` → `style="flex-grow: 1"`, not `style="grow: 1"`) ([#19918](https://github.com/tailwindlabs/tailwindcss/pull/19918))
+- Allow multiple `@utility` definitions with the same name but different value types ([#19777](https://github.com/tailwindlabs/tailwindcss/pull/19777))
+- Export missing `PluginWithConfig` type from `tailwindcss/plugin` to fix errors when inferring plugin config types ([#19707](https://github.com/tailwindlabs/tailwindcss/pull/19707))
+- Ensure `start` and `end` legacy utilities without values do not generate CSS ([#20003](https://github.com/tailwindlabs/tailwindcss/pull/20003))
+- Ensure `--value(…)` is required in functional `@utility` definitions ([#20005](https://github.com/tailwindlabs/tailwindcss/pull/20005))
+- Canonicalization: preserve required whitespace around operators in negated arbitrary values (e.g. `-left-[(var(--a)+var(--b))]`) ([#20011](https://github.com/tailwindlabs/tailwindcss/pull/20011))
+
+## [4.2.4] - 2026-04-21
+
+### Fixed
+
+- Ensure imports in `@import` and `@plugin` still resolve correctly when using Vite aliases in `@tailwindcss/vite` ([#19947](https://github.com/tailwindlabs/tailwindcss/pull/19947))
+
+## [4.2.3] - 2026-04-20
+
+### Fixed
+
+- Canonicalization: improve canonicalization for `tracking-*` utilities by preferring non-negative utilities (e.g. `-tracking-tighter` → `tracking-wider`) ([#19827](https://github.com/tailwindlabs/tailwindcss/pull/19827))
+- Fix crash due to invalid characters in candidate (exceeding valid unicode code point range) ([#19829](https://github.com/tailwindlabs/tailwindcss/pull/19829))
+- Ensure query params in imports are considered unique resources when using `@tailwindcss/webpack` ([#19723](https://github.com/tailwindlabs/tailwindcss/pull/19723))
+- Canonicalization: collapse arbitrary values into shorthand utilities (e.g. `px-[1.2rem] py-[1.2rem]` → `p-[1.2rem]`) ([#19837](https://github.com/tailwindlabs/tailwindcss/pull/19837))
+- Canonicalization: collapse `border-{t,b}-*` into `border-y-*`, `border-{l,r}-*` into `border-x-*`, and `border-{t,r,b,l}-*` into `border-*` ([#19842](https://github.com/tailwindlabs/tailwindcss/pull/19842))
+- Canonicalization: collapse `scroll-m{t,b}-*` into `scroll-my-*`, `scroll-m{l,r}-*` into `scroll-mx-*`, and `scroll-m{t,r,b,l}-*` into `scroll-m-*` ([#19842](https://github.com/tailwindlabs/tailwindcss/pull/19842))
+- Canonicalization: collapse `scroll-p{t,b}-*` into `scroll-py-*`, `scroll-p{l,r}-*` into `scroll-px-*`, and `scroll-p{t,r,b,l}-*` into `scroll-p-*` ([#19842](https://github.com/tailwindlabs/tailwindcss/pull/19842))
+- Canonicalization: collapse `overflow-{x,y}-*` into `overflow-*` ([#19842](https://github.com/tailwindlabs/tailwindcss/pull/19842))
+- Canonicalization: collapse `overscroll-{x,y}-*` into `overscroll-*` ([#19842](https://github.com/tailwindlabs/tailwindcss/pull/19842))
+- Read from `--placeholder-color` instead of `--background-color` for `placeholder-*` utilities ([#19843](https://github.com/tailwindlabs/tailwindcss/pull/19843))
+- Upgrade: ensure files are not emptied out when killing the upgrade process while it's running ([#19846](https://github.com/tailwindlabs/tailwindcss/pull/19846))
+- Upgrade: use `config.content` when migrating from Tailwind CSS v3 to Tailwind CSS v4 ([#19846](https://github.com/tailwindlabs/tailwindcss/pull/19846))
+- Upgrade: never migrate files that are ignored by git ([#19846](https://github.com/tailwindlabs/tailwindcss/pull/19846))
+- Add `.env` and `.env.*` to default ignored content files ([#19846](https://github.com/tailwindlabs/tailwindcss/pull/19846))
+- Canonicalization: migrate `overflow-ellipsis` into `text-ellipsis` ([#19849](https://github.com/tailwindlabs/tailwindcss/pull/19849))
+- Canonicalization: migrate `start-full` → `inset-s-full`, `start-auto` → `inset-s-auto`, `start-px` → `inset-s-px`, and `start-<number>` → `inset-s-<number>` as well as negative versions ([#19849](https://github.com/tailwindlabs/tailwindcss/pull/19849))
+- Canonicalization: migrate `end-full` → `inset-e-full`, `end-auto` → `inset-e-auto`, `end-px` → `inset-e-px`, and `end-<number>` → `inset-e-<number>` as well as negative versions ([#19849](https://github.com/tailwindlabs/tailwindcss/pull/19849))
+- Canonicalization: move the `-` sign inside the arbitrary value `-left-[9rem]` → `left-[-9rem]` ([#19858](https://github.com/tailwindlabs/tailwindcss/pull/19858))
+- Canonicalization: move the `-` sign outside the arbitrary value `ml-[calc(-1*var(--width))]` → `-ml-(--width)` ([#19858](https://github.com/tailwindlabs/tailwindcss/pull/19858))
+- Improve performance when scanning JSONL / NDJSON files ([#19862](https://github.com/tailwindlabs/tailwindcss/pull/19862))
+- Support `NODE_PATH` environment variable in standalone CLI ([#19617](https://github.com/tailwindlabs/tailwindcss/pull/19617))
+
+## [4.2.2] - 2026-03-18
+
+### Fixed
+
+- Don't crash when candidates contain prototype properties like `row-constructor` ([#19725](https://github.com/tailwindlabs/tailwindcss/pull/19725))
+- Canonicalize `calc(var(--spacing)*…)` expressions into `--spacing(…)` ([#19769](https://github.com/tailwindlabs/tailwindcss/pull/19769))
+- Fix crash in canonicalization step when handling utilities containing `@property` at-rules (e.g. `shadow-sm border`) ([#19727](https://github.com/tailwindlabs/tailwindcss/pull/19727))
+- Skip full reload for server only modules scanned by client CSS when using `@tailwindcss/vite` ([#19745](https://github.com/tailwindlabs/tailwindcss/pull/19745))
+- Add support for Vite 8 in `@tailwindcss/vite` ([#19790](https://github.com/tailwindlabs/tailwindcss/pull/19790))
+- Improve canonicalization for bare values exceeding default spacing scale suggestions (e.g. `w-1234 h-1234` → `size-1234`) ([#19809](https://github.com/tailwindlabs/tailwindcss/pull/19809))
+- Fix canonicalization resulting in empty list (e.g. `w-5 h-5 size-5` → `''` instead of `size-5`) ([#19812](https://github.com/tailwindlabs/tailwindcss/pull/19812))
+- Resolve tsconfig paths to allow for `@import '@/path/to/file';` when using `@tailwindcss/vite` ([#19803](https://github.com/tailwindlabs/tailwindcss/pull/19803))
+
+## [4.2.1] - 2026-02-23
+
+### Fixed
+
+- Allow trailing dash in functional utility names for backwards compatibility ([#19696](https://github.com/tailwindlabs/tailwindcss/pull/19696))
+- Properly detect classes containing `.` characters within curly braces in MDX files ([#19711](https://github.com/tailwindlabs/tailwindcss/pull/19711))
+
+## [4.2.0] - 2026-02-18
+
+### Added
+
+- Add mauve, olive, mist, and taupe color palettes to the default theme ([#19627](https://github.com/tailwindlabs/tailwindcss/pull/19627))
+- Add `@tailwindcss/webpack` package to run Tailwind CSS as a webpack plugin ([#19610](https://github.com/tailwindlabs/tailwindcss/pull/19610))
+- Add `pbs-*` and `pbe-*` utilities for `padding-block-start` and `padding-block-end` ([#19601](https://github.com/tailwindlabs/tailwindcss/pull/19601))
+- Add `mbs-*` and `mbe-*` utilities for `margin-block-start` and `margin-block-end` ([#19601](https://github.com/tailwindlabs/tailwindcss/pull/19601))
+- Add `scroll-pbs-*` and `scroll-pbe-*` utilities for `scroll-padding-block-start` and `scroll-padding-block-end` ([#19601](https://github.com/tailwindlabs/tailwindcss/pull/19601))
+- Add `scroll-mbs-*` and `scroll-mbe-*` utilities for `scroll-margin-block-start` and `scroll-margin-block-end` ([#19601](https://github.com/tailwindlabs/tailwindcss/pull/19601))
+- Add `border-bs-*` and `border-be-*` utilities for `border-block-start` and `border-block-end` ([#19601](https://github.com/tailwindlabs/tailwindcss/pull/19601))
+- Add `inline-*`, `min-inline-*`, `max-inline-*` utilities for `inline-size`, `min-inline-size`, and `max-inline-size` ([#19612](https://github.com/tailwindlabs/tailwindcss/pull/19612))
+- Add `block-*`, `min-block-*`, `max-block-*` utilities for `block-size`, `min-block-size`, and `max-block-size` ([#19612](https://github.com/tailwindlabs/tailwindcss/pull/19612))
+- Add `inset-s-*`, `inset-e-*`, `inset-bs-*`, `inset-be-*` utilities for `inset-inline-start`, `inset-inline-end`, `inset-block-start`, and `inset-block-end` ([#19613](https://github.com/tailwindlabs/tailwindcss/pull/19613))
+- Add `font-features-*` utility for `font-feature-settings` ([#19623](https://github.com/tailwindlabs/tailwindcss/pull/19623))
+
+### Fixed
+
+- Prevent double `@supports` wrapper for `color-mix` values ([#19450](https://github.com/tailwindlabs/tailwindcss/pull/19450))
+- Allow whitespace around `@source inline()` argument ([#19461](https://github.com/tailwindlabs/tailwindcss/pull/19461))
+- Emit comment when source maps are saved to files when using `@tailwindcss/cli` ([#19447](https://github.com/tailwindlabs/tailwindcss/pull/19447))
+- Detect utilities containing capital letters followed by numbers ([#19465](https://github.com/tailwindlabs/tailwindcss/pull/19465))
+- Fix class extraction for Rails' strict locals ([#19525](https://github.com/tailwindlabs/tailwindcss/pull/19525))
+- Align `@utility` name validation with Oxide scanner rules ([#19524](https://github.com/tailwindlabs/tailwindcss/pull/19524))
+- Fix infinite loop when using `@variant` inside `@custom-variant` ([#19633](https://github.com/tailwindlabs/tailwindcss/pull/19633))
+- Allow multiples of `.25` in `aspect-*` fractions (e.g. `aspect-8.5/11`) ([#19688](https://github.com/tailwindlabs/tailwindcss/pull/19688))
+- Ensure changes to external files listed via `@source` trigger a full page reload when using `@tailwindcss/vite` ([#19670](https://github.com/tailwindlabs/tailwindcss/pull/19670))
+- Improve performance of Oxide scanner in bigger projects by reducing file system walks ([#19632](https://github.com/tailwindlabs/tailwindcss/pull/19632))
+- Ensure import aliases in Astro v5 work without crashing when using `@tailwindcss/vite` ([#19677](https://github.com/tailwindlabs/tailwindcss/issues/19677))
+- Allow escape characters in `@utility` names to improve support with formatters such as Biome ([#19626](https://github.com/tailwindlabs/tailwindcss/pull/19626))
+- Fix incorrect canonicalization results when canonicalizing multiple times ([#19675](https://github.com/tailwindlabs/tailwindcss/pull/19675))
+- Add `.jj` to default ignored content directories ([#19687](https://github.com/tailwindlabs/tailwindcss/pull/19687))
+
+### Deprecated
+
+- Deprecate `start-*` and `end-*` utilities in favor of `inset-s-*` and `inset-e-*` utilities ([#19613](https://github.com/tailwindlabs/tailwindcss/pull/19613))
+
+## [4.1.18] - 2025-12-11
+
+### Fixed
+
+- Ensure validation of `source(…)` happens relative to the file it is in ([#19274](https://github.com/tailwindlabs/tailwindcss/pull/19274))
+- Include filename and line numbers in CSS parse errors ([#19282](https://github.com/tailwindlabs/tailwindcss/pull/19282))
+- Skip comments in Ruby files when checking for class names ([#19243](https://github.com/tailwindlabs/tailwindcss/pull/19243))
+- Skip over arbitrary property utilities with a top-level `!` in the value ([#19243](https://github.com/tailwindlabs/tailwindcss/pull/19243))
+- Support environment API in `@tailwindcss/vite` ([#18970](https://github.com/tailwindlabs/tailwindcss/pull/18970))
+- Preserve case of theme keys from JS configs and plugins ([#19337](https://github.com/tailwindlabs/tailwindcss/pull/19337))
+- Write source maps correctly on the CLI when using `--watch` ([#19373](https://github.com/tailwindlabs/tailwindcss/pull/19373))
+- Handle special defaults (like `ringColor.DEFAULT`) in JS configs ([#19348](https://github.com/tailwindlabs/tailwindcss/pull/19348))
+- Improve backwards compatibility for `content` theme key from JS configs ([#19381](https://github.com/tailwindlabs/tailwindcss/pull/19381))
+- Upgrade: Handle `future` and `experimental` config keys ([#19344](https://github.com/tailwindlabs/tailwindcss/pull/19344))
+- Try to canonicalize any arbitrary utility to a bare value ([#19379](https://github.com/tailwindlabs/tailwindcss/pull/19379))
+- Validate candidates similarly to Oxide ([#19397](https://github.com/tailwindlabs/tailwindcss/pull/19397))
+- Canonicalization: combine `text-*` and `leading-*` classes ([#19396](https://github.com/tailwindlabs/tailwindcss/pull/19396))
+- Correctly handle duplicate CLI arguments ([#19416](https://github.com/tailwindlabs/tailwindcss/pull/19416))
+- Don’t emit color-mix fallback rules inside `@keyframes` ([#19419](https://github.com/tailwindlabs/tailwindcss/pull/19419))
+- CLI: Don't hang when output is `/dev/stdout` ([#19421](https://github.com/tailwindlabs/tailwindcss/pull/19421))
+
+## [3.4.19] - 2025-12-10
+
+### Fixed
+
+- Don’t break `sibling-*()` functions when used inside `calc(…)` ([#19335](https://github.com/tailwindlabs/tailwindcss/pull/19335))
+
+## [4.1.17] - 2025-11-06
+
+### Fixed
+
+- Substitute `@variant` inside legacy JS APIs ([#19263](https://github.com/tailwindlabs/tailwindcss/pull/19263))
+- Prevent occasional crash on Windows when loaded into a worker thread ([#19242](https://github.com/tailwindlabs/tailwindcss/pull/19242))
+
+## [4.1.16] - 2025-10-23
+
+### Fixed
+
+- Discard candidates with an empty data type ([#19172](https://github.com/tailwindlabs/tailwindcss/pull/19172))
+- Fix canonicalization of arbitrary variants with attribute selectors ([#19176](https://github.com/tailwindlabs/tailwindcss/pull/19176))
+- Fix invalid colors due to nested `&` ([#19184](https://github.com/tailwindlabs/tailwindcss/pull/19184))
+- Improve canonicalization for `& > :pseudo` and `& :pseudo` arbitrary variants ([#19178](https://github.com/tailwindlabs/tailwindcss/pull/19178))
+
+## [4.1.15] - 2025-10-20
+
+### Fixed
+
+- Fix Safari devtools rendering issue due to `color-mix` fallback ([#19069](https://github.com/tailwindlabs/tailwindcss/pull/19069))
+- Suppress Lightning CSS warnings about `:deep`, `:slotted`, and `:global` ([#19094](https://github.com/tailwindlabs/tailwindcss/pull/19094))
+- Fix resolving theme keys when starting with the name of another theme key in JS configs and plugins ([#19097](https://github.com/tailwindlabs/tailwindcss/pull/19097))
+- Allow named groups in combination with `not-*`, `has-*`, and `in-*` ([#19100](https://github.com/tailwindlabs/tailwindcss/pull/19100))
+- Prevent important utilities from affecting other utilities ([#19110](https://github.com/tailwindlabs/tailwindcss/pull/19110))
+- Don’t index into strings with the `theme(…)` function ([#19111](https://github.com/tailwindlabs/tailwindcss/pull/19111))
+- Fix parsing issue when `\t` is used in at-rules ([#19130](https://github.com/tailwindlabs/tailwindcss/pull/19130))
+- Upgrade: Canonicalize utilities containing `0` values ([#19095](https://github.com/tailwindlabs/tailwindcss/pull/19095))
+- Upgrade: Migrate deprecated `break-words` to `wrap-break-word` ([#19157](https://github.com/tailwindlabs/tailwindcss/pull/19157))
+
+### Changed
+
+- Remove the `postinstall` script from oxide ([#19149])(https://github.com/tailwindlabs/tailwindcss/pull/19149)
+
+## [4.1.14] - 2025-10-01
+
+### Fixed
+
+- Handle `'` syntax in ClojureScript when extracting classes ([#18888](https://github.com/tailwindlabs/tailwindcss/pull/18888))
+- Handle `@variant` inside `@custom-variant` ([#18885](https://github.com/tailwindlabs/tailwindcss/pull/18885))
+- Merge suggestions when using `@utility` ([#18900](https://github.com/tailwindlabs/tailwindcss/pull/18900))
+- Ensure that file system watchers created when using the CLI are always cleaned up ([#18905](https://github.com/tailwindlabs/tailwindcss/pull/18905))
+- Do not generate `grid-column` utilities when configuring `grid-column-start` or `grid-column-end` ([#18907](https://github.com/tailwindlabs/tailwindcss/pull/18907))
+- Do not generate `grid-row` utilities when configuring `grid-row-start` or `grid-row-end` ([#18907](https://github.com/tailwindlabs/tailwindcss/pull/18907))
+- Prevent duplicate CSS when overwriting a static utility with a theme key ([#18056](https://github.com/tailwindlabs/tailwindcss/pull/18056))
+- Show Lightning CSS warnings (if any) when optimizing/minifying ([#18918](https://github.com/tailwindlabs/tailwindcss/pull/18918))
+- Use `default` export condition for `@tailwindcss/vite` ([#18948](https://github.com/tailwindlabs/tailwindcss/pull/18948))
+- Re-throw errors from PostCSS nodes ([#18373](https://github.com/tailwindlabs/tailwindcss/pull/18373))
+- Detect classes in markdown inline directives ([#18967](https://github.com/tailwindlabs/tailwindcss/pull/18967))
+- Ensure files with only `@theme` produce no output when built ([#18979](https://github.com/tailwindlabs/tailwindcss/pull/18979))
+- Support Maud templates when extracting classes ([#18988](https://github.com/tailwindlabs/tailwindcss/pull/18988))
+- Upgrade: Do not migrate `variant = 'outline'` during upgrades ([#18922](https://github.com/tailwindlabs/tailwindcss/pull/18922))
+- Upgrade: Show version mismatch (if any) when running upgrade tool ([#19028](https://github.com/tailwindlabs/tailwindcss/pull/19028))
+- Upgrade: Ensure first class inside `className` is migrated ([#19031](https://github.com/tailwindlabs/tailwindcss/pull/19031))
+- Upgrade: Migrate classes inside `*ClassName` and `*Class` attributes ([#19031](https://github.com/tailwindlabs/tailwindcss/pull/19031))
+
+## [3.4.18] - 2025-10-01
+
+### Fixed
+
+- Improve support for raw `supports-[…]` queries in arbitrary values ([#13605](https://github.com/tailwindlabs/tailwindcss/pull/13605))
+- Fix `require.cache` error when loaded through a TypeScript file in Node 22.18+ ([#18665](https://github.com/tailwindlabs/tailwindcss/pull/18665))
+- Support `import.meta.resolve(…)` in configs for new enough Node.js versions ([#18938](https://github.com/tailwindlabs/tailwindcss/pull/18938))
+- Allow using newer versions of `postcss-load-config` for better ESM and TypeScript PostCSS config support with the CLI ([#18938](https://github.com/tailwindlabs/tailwindcss/pull/18938))
+- Remove irrelevant utility rules when matching important classes ([#19030](https://github.com/tailwindlabs/tailwindcss/pull/19030))
+
+## [4.1.13] - 2025-09-03
+
+### Changed
+
+- Drop warning from browser build ([#18731](https://github.com/tailwindlabs/tailwindcss/issues/18731))
+- Drop exact duplicate declarations when emitting CSS ([#18809](https://github.com/tailwindlabs/tailwindcss/issues/18809))
+
+### Fixed
+
+- Don't transition `visibility` when using `transition` ([#18795](https://github.com/tailwindlabs/tailwindcss/pull/18795))
+- Discard matched variants with unknown named values ([#18799](https://github.com/tailwindlabs/tailwindcss/pull/18799))
+- Discard matched variants with non-string values ([#18799](https://github.com/tailwindlabs/tailwindcss/pull/18799))
+- Show suggestions for known `matchVariant` values ([#18798](https://github.com/tailwindlabs/tailwindcss/pull/18798))
+- Replace deprecated `clip` with `clip-path` in `sr-only` ([#18769](https://github.com/tailwindlabs/tailwindcss/pull/18769))
+- Hide internal fields from completions in `matchUtilities` ([#18820](https://github.com/tailwindlabs/tailwindcss/pull/18820))
+- Ignore `.vercel` folders by default (can be overridden by `@source …` rules) ([#18855](https://github.com/tailwindlabs/tailwindcss/pull/18855))
+- Consider variants starting with `@-` to be invalid (e.g. `@-2xl:flex`) ([#18869](https://github.com/tailwindlabs/tailwindcss/pull/18869))
+- Do not allow custom variants to start or end with a `-` or `_` ([#18867](https://github.com/tailwindlabs/tailwindcss/pull/18867), [#18872](https://github.com/tailwindlabs/tailwindcss/pull/18872))
+- Upgrade: Migrate `aria` theme keys to `@custom-variant` ([#18815](https://github.com/tailwindlabs/tailwindcss/pull/18815))
+- Upgrade: Migrate `data` theme keys to `@custom-variant` ([#18816](https://github.com/tailwindlabs/tailwindcss/pull/18816))
+- Upgrade: Migrate `supports` theme keys to `@custom-variant` ([#18817](https://github.com/tailwindlabs/tailwindcss/pull/18817))
+
+## [4.1.12] - 2025-08-13
+
+### Fixed
+
+- Don't consider the global important state in `@apply` ([#18404](https://github.com/tailwindlabs/tailwindcss/pull/18404))
+- Add missing suggestions for `flex-<number>` utilities ([#18642](https://github.com/tailwindlabs/tailwindcss/pull/18642))
+- Fix trailing `)` from interfering with extraction in Clojure keywords ([#18345](https://github.com/tailwindlabs/tailwindcss/pull/18345))
+- Detect classes inside Elixir charlist, word list, and string sigils ([#18432](https://github.com/tailwindlabs/tailwindcss/pull/18432))
+- Track source locations through `@plugin` and `@config` ([#18345](https://github.com/tailwindlabs/tailwindcss/pull/18345))
+- Allow boolean values of `process.env.DEBUG` in `@tailwindcss/node` ([#18485](https://github.com/tailwindlabs/tailwindcss/pull/18485))
+- Ignore consecutive semicolons in the CSS parser ([#18532](https://github.com/tailwindlabs/tailwindcss/pull/18532))
+- Center the dropdown icon added to an input with a paired datalist by default ([#18511](https://github.com/tailwindlabs/tailwindcss/pull/18511))
+- Extract candidates in Slang templates ([#18565](https://github.com/tailwindlabs/tailwindcss/pull/18565))
+- Improve error messages when encountering invalid functional utility names ([#18568](https://github.com/tailwindlabs/tailwindcss/pull/18568))
+- Discard CSS AST objects with `false` or `undefined` properties ([#18571](https://github.com/tailwindlabs/tailwindcss/pull/18571))
+- Allow users to disable URL rebasing in `@tailwindcss/postcss` via `transformAssetUrls: false` ([#18321](https://github.com/tailwindlabs/tailwindcss/pull/18321))
+- Fix false-positive migrations in `addEventListener` and JavaScript variable names ([#18718](https://github.com/tailwindlabs/tailwindcss/pull/18718))
+- Fix Standalone CLI showing default Bun help when run via symlink on Windows ([#18723](https://github.com/tailwindlabs/tailwindcss/pull/18723))
+- Read from `--border-color-*` theme keys in `divide-*` utilities for backwards compatibility ([#18704](https://github.com/tailwindlabs/tailwindcss/pull/18704/))
+- Don't scan `.hdr` and `.exr` files for classes by default ([#18734](https://github.com/tailwindlabs/tailwindcss/pull/18734))
+
+## [4.1.11] - 2025-06-26
+
+### Fixed
+
+- Add heuristic to skip candidate migrations inside `emit(…)` ([#18330](https://github.com/tailwindlabs/tailwindcss/pull/18330))
+- Extract candidates with variants in Clojure/ClojureScript keywords ([#18338](https://github.com/tailwindlabs/tailwindcss/pull/18338))
+- Document `--watch=always` in the CLI's usage ([#18337](https://github.com/tailwindlabs/tailwindcss/pull/18337))
+- Add support for Vite 7 to `@tailwindcss/vite` ([#18384](https://github.com/tailwindlabs/tailwindcss/pull/18384))
+
+## [4.1.10] - 2025-06-11
+
+### Fixed
+
+- Fix incorrectly generated CSS when using percentages in arbitrary values with calc (e.g. `w-[calc(100%-var(--offset))]`) ([#18289](https://github.com/tailwindlabs/tailwindcss/pull/18289))
+
+## [4.1.9] - 2025-06-11
+
+### Fixed
+
+- Correctly parse custom properties with strings containing semicolons ([#18251](https://github.com/tailwindlabs/tailwindcss/pull/18251))
+- Upgrade: Migrate arbitrary modifiers without percentage signs to bare values (e.g. `/[0.16]` → `/16`) ([#18184](https://github.com/tailwindlabs/tailwindcss/pull/18184))
+- Upgrade: Migrate CSS variable shorthands where fallback value contains function call ([#18184](https://github.com/tailwindlabs/tailwindcss/pull/18184))
+- Upgrade: Migrate negative arbitrary values to negative bare values (e.g. `mb-[-32rem]` → `-mb-128`) ([#18212](https://github.com/tailwindlabs/tailwindcss/pull/18212))
+- Upgrade: Do not migrate `blur` in `wire:model.blur` ([#18216](https://github.com/tailwindlabs/tailwindcss/pull/18216))
+- Don't add spaces around CSS dashed idents when formatting math expressions ([#18220](https://github.com/tailwindlabs/tailwindcss/pull/18220))
+
+## [4.1.8] - 2025-05-27
+
+### Added
+
+- Improve error messages when `@apply` fails ([#18059](https://github.com/tailwindlabs/tailwindcss/pull/18059))
+
+### Fixed
+
+- Upgrade: Do not migrate declarations that look like candidates in `<style>` blocks ([#18057](https://github.com/tailwindlabs/tailwindcss/pull/18057), [18068](https://github.com/tailwindlabs/tailwindcss/pull/18068))
+- Upgrade: Don't error when looking for `tailwindcss` in pnpm monorepos ([#18065](https://github.com/tailwindlabs/tailwindcss/pull/18065))
+- Upgrade: Don't error when updating dependencies in pnpm monorepos ([#18065](https://github.com/tailwindlabs/tailwindcss/pull/18065))
+- Upgrade: Migrate deprecated `order-none` to `order-0` ([#18126](https://github.com/tailwindlabs/tailwindcss/pull/18126))
+- Support Leptos `class:` attributes when extracting classes ([#18093](https://github.com/tailwindlabs/tailwindcss/pull/18093))
+- Fix "Cannot read properties of undefined" crash on malformed arbitrary value ([#18133](https://github.com/tailwindlabs/tailwindcss/pull/18133))
+- Upgrade: Migrate `-mt-[0px]` to `mt-[0px]` instead of the other way around ([#18154](https://github.com/tailwindlabs/tailwindcss/pull/18154))
+- Fix Haml pre-processing crash when there is no `\n` at the end of the file ([#18155](https://github.com/tailwindlabs/tailwindcss/pull/18155))
+- Ignore `.pnpm-store` folders by default (can be overridden by `@source …` rules) ([#18163](https://github.com/tailwindlabs/tailwindcss/pull/18163))
+- Fix PostCSS crash when calling `toJSON()` ([#18083](https://github.com/tailwindlabs/tailwindcss/pull/18083))
+
+## [4.1.7] - 2025-05-15
+
+### Added
+
+- Upgrade: Migrate bare values to named values ([#18000](https://github.com/tailwindlabs/tailwindcss/pull/18000))
+- Upgrade: Added cache to improve template migration performance ([#18025](https://github.com/tailwindlabs/tailwindcss/pull/18025))
+
+### Fixed
+
+- Allow `_` before numbers during candidate extraction ([#17961](https://github.com/tailwindlabs/tailwindcss/pull/17961))
+- Prevent duplicate suggestions when using `@theme` and `@utility` together ([#17675](https://github.com/tailwindlabs/tailwindcss/pull/17675))
+- Ensure that media queries within `::before` and `::after` pseudo selectors create valid CSS rules in production builds ([#17979](https://github.com/tailwindlabs/tailwindcss/pull/17979))
+- Ensure that the standalone CLI does not leave temporary files behind ([#17981](https://github.com/tailwindlabs/tailwindcss/pull/17981))
+- Ensure `-rotate-*` utilities properly negate arbitrary values ([#18014](https://github.com/tailwindlabs/tailwindcss/pull/18014))
+- Ignore custom variants using `:merge(…)` selectors in legacy JS plugins ([#18020](https://github.com/tailwindlabs/tailwindcss/pull/18020))
+- Ensure classes containing `.` are properly extracted from Clojure files ([#18038](https://github.com/tailwindlabs/tailwindcss/pull/18038))
+- Upgrade: Fix error when using `@import … source(…)` ([#17963](https://github.com/tailwindlabs/tailwindcss/pull/17963))
+- Upgrade: Change casing of utilities with named values to kebab-case to match updated theme variables ([#18017](https://github.com/tailwindlabs/tailwindcss/pull/18017))
+- Upgrade: Don't migrate strings that match utility names in Vue attribute bindings other than `class` ([#18025](https://github.com/tailwindlabs/tailwindcss/pull/18025))
+
+## [4.1.6] - 2025-05-09
+
+### Added
+
+- Upgrade: Automatically convert arbitrary values to named values when possible (e.g. `h-[1lh]` to `h-lh`) ([#17831](https://github.com/tailwindlabs/tailwindcss/pull/17831), [#17854](https://github.com/tailwindlabs/tailwindcss/pull/17854))
+- Upgrade: Update dependencies in parallel for improved performance ([#17898](https://github.com/tailwindlabs/tailwindcss/pull/17898))
+- Add detailed logging about `@source` directives, discovered files and scanned files when using `DEBUG=*` ([#17906](https://github.com/tailwindlabs/tailwindcss/pull/17906), [#17952](https://github.com/tailwindlabs/tailwindcss/pull/17952))
+- Add support for generating source maps in development ([#17775](https://github.com/tailwindlabs/tailwindcss/pull/17775))
+
+### Fixed
+
+- Ensure negative arbitrary `scale` values generate negative values ([#17831](https://github.com/tailwindlabs/tailwindcss/pull/17831))
+- Fix HAML extraction with embedded Ruby ([#17846](https://github.com/tailwindlabs/tailwindcss/pull/17846))
+- Don't scan files for utilities when using `@reference` ([#17836](https://github.com/tailwindlabs/tailwindcss/pull/17836))
+- Fix incorrectly replacing `_` with ` ` in arbitrary modifier shorthand `bg-red-500/(--my_opacity)` ([#17889](https://github.com/tailwindlabs/tailwindcss/pull/17889))
+- Don't scan `.log` files for classes by default ([#17906](https://github.com/tailwindlabs/tailwindcss/pull/17906))
+- Ensure that custom utilities applying other custom utilities don't swallow nested `@apply` rules ([#17925](https://github.com/tailwindlabs/tailwindcss/pull/17925))
+- Download platform specific package if `optionalDependencies` are skipped ([#17929](https://github.com/tailwindlabs/tailwindcss/pull/17929))
+
+## [4.1.5] - 2025-04-30
+
+### Added
+
+- Support using `@tailwindcss/upgrade` to upgrade between versions of v4.\* ([#17717](https://github.com/tailwindlabs/tailwindcss/pull/17717))
+- Add `h-lh` / `min-h-lh` / `max-h-lh` utilities ([#17790](https://github.com/tailwindlabs/tailwindcss/pull/17790))
+- Transition `display`, `visibility`, `content-visibility`, `overlay`, and `pointer-events` when using `transition` to simplify `@starting-style` usage ([#17812](https://github.com/tailwindlabs/tailwindcss/pull/17812))
+
+### Fixed
+
+- Don't scan `.geojson` or `.db` files for classes by default ([#17700](https://github.com/tailwindlabs/tailwindcss/pull/17700), [#17711](https://github.com/tailwindlabs/tailwindcss/pull/17711))
+- Hide default shadow suggestions when missing default shadow theme keys ([#17743](https://github.com/tailwindlabs/tailwindcss/pull/17743))
+- Replace `_` with `.` in theme suggestions for `@utility` if surrounded by digits ([#17733](https://github.com/tailwindlabs/tailwindcss/pull/17733))
+- Skip `color-mix(…)` when opacity is `100%` ([#17815](https://github.com/tailwindlabs/tailwindcss/pull/17815))
+- PostCSS: Ensure that errors in imported stylesheets are recoverable ([#17754](https://github.com/tailwindlabs/tailwindcss/pull/17754))
+- Upgrade: Bump all Tailwind CSS related dependencies during upgrade ([#17763](https://github.com/tailwindlabs/tailwindcss/pull/17763))
+- Upgrade: Don't add `-` to variants starting with `@` ([#17814](https://github.com/tailwindlabs/tailwindcss/pull/17814))
+- Upgrade: Don't format stylesheets that didn't change when upgrading ([#17824](https://github.com/tailwindlabs/tailwindcss/pull/17824))
+
+### Changed
+
+- Ignore `.hg`, `.svn`, `.venv`, `venv`, `.yarn`, `.next`, `.turbo`, `.parcel-cache`, `__pycache__`, and `.svelte-kit` folders by default (can be overridden by `@source …` rules) ([#17892](https://github.com/tailwindlabs/tailwindcss/pull/17892))
+- `@source` rules that point inside `.hg`, `.svn`, `.venv`, `venv`, `.yarn`, `.next`, `.turbo`, `.parcel-cache`, `__pycache__`, and `.svelte-kit` folders no longer consider your `.gitignore` rules ([#17892](https://github.com/tailwindlabs/tailwindcss/pull/17892))
+
+## [4.1.4] - 2025-04-14
+
+### Added
+
+- Add experimental `@tailwindcss/oxide-wasm32-wasi` target for running Tailwind in browser environments like StackBlitz ([#17558](https://github.com/tailwindlabs/tailwindcss/pull/17558))
+
+### Fixed
+
+- Ensure `color-mix(…)` polyfills do not cause used CSS variables to be removed ([#17555](https://github.com/tailwindlabs/tailwindcss/pull/17555))
+- Ensure `color-mix(…)` polyfills create fallbacks for theme variables that reference other theme variables ([#17562](https://github.com/tailwindlabs/tailwindcss/pull/17562))
+- Fix brace expansion in declining ranges like `{10..0..5}` and `{0..10..-5}` ([#17591](https://github.com/tailwindlabs/tailwindcss/pull/17591))
+- Work around a Chrome rendering bug when using the `skew-*` utilities ([#17627](https://github.com/tailwindlabs/tailwindcss/pull/17627))
+- Ensure container query variant names can contain hyphens ([#17628](https://github.com/tailwindlabs/tailwindcss/pull/17628))
+- Ensure `shadow-inherit`, `inset-shadow-inherit`, `drop-shadow-inherit`, and `text-shadow-inherit` inherit the shadow color ([#17647](https://github.com/tailwindlabs/tailwindcss/pull/17647))
+- Ensure compatibility with array tuples used in `fontSize` JS theme keys ([#17630](https://github.com/tailwindlabs/tailwindcss/pull/17630))
+- Ensure folders with binary file extensions in their names are scanned for utilities ([#17595](https://github.com/tailwindlabs/tailwindcss/pull/17595))
+- Upgrade: Convert `fontSize` array tuple syntax to CSS theme variables ([#17630](https://github.com/tailwindlabs/tailwindcss/pull/17630))
+
+## [4.1.3] - 2025-04-04
+
+### Fixed
+
+- Show warning when using unsupported bare value data type in `--value(…)` ([#17464](https://github.com/tailwindlabs/tailwindcss/pull/17464))
+- PostCSS: Ensure changes to the input CSS file don't generate stale output when using Turbopack ([#17554](https://github.com/tailwindlabs/tailwindcss/pull/17554))
+- Ensure classes are detected in Ruby's `%w` syntax in Slim templates ([#17557](https://github.com/tailwindlabs/tailwindcss/pull/17557))
+
+## [4.1.2] - 2025-04-03
+
+### Fixed
+
+- Don't rely on the presence of `@layer base` to polyfill `@property` ([#17506](https://github.com/tailwindlabs/tailwindcss/pull/17506))
+- Support setting multiple inset shadows as arbitrary values ([#17523](https://github.com/tailwindlabs/tailwindcss/pull/17523))
+- Fix `drop-shadow-*` utilities that are defined with multiple shadows ([#17515](https://github.com/tailwindlabs/tailwindcss/pull/17515))
+- PostCSS: Fix race condition when two changes are queued concurrently ([#17514](https://github.com/tailwindlabs/tailwindcss/pull/17514))
+- PostCSS: Ensure files containing `@tailwind utilities` are processed ([#17514](https://github.com/tailwindlabs/tailwindcss/pull/17514))
+- Ensure the `color-mix(…)` polyfill creates fallbacks even when using colors that cannot be statically analyzed ([#17513](https://github.com/tailwindlabs/tailwindcss/pull/17513))
+- Fix slow incremental builds with `@tailwindcss/vite` and `@tailwindcss/postscss` (especially on Windows) ([#17511](https://github.com/tailwindlabs/tailwindcss/pull/17511))
+- Vite: Fix missing CSS file in Qwik setups ([#17533](https://github.com/tailwindlabs/tailwindcss/pull/17533))
+
+## [4.1.1] - 2025-04-02
+
+### Fixed
+
+- Disable padding in `@source inline(…)` brace expansion ([#17491](https://github.com/tailwindlabs/tailwindcss/pull/17491))
+- Inject polyfills after `@import` and body-less `@layer` ([#17493](https://github.com/tailwindlabs/tailwindcss/pull/17493))
+- Ensure `@tailwindcss/cli` does not contain an import for `jiti` ([#17502](https://github.com/tailwindlabs/tailwindcss/pull/17502))
+
+## [4.1.0] - 2025-04-01
+
+### Added
+
+- Add `details-content` variant ([#15319](https://github.com/tailwindlabs/tailwindcss/pull/15319))
+- Add `inverted-colors` variant ([#11693](https://github.com/tailwindlabs/tailwindcss/pull/11693))
+- Add `noscript` variant ([#11929](https://github.com/tailwindlabs/tailwindcss/pull/11929), [#17431](https://github.com/tailwindlabs/tailwindcss/pull/17431))
+- Add `items-baseline-last` and `self-baseline-last` utilities ([#13888](https://github.com/tailwindlabs/tailwindcss/pull/13888), [#17476](https://github.com/tailwindlabs/tailwindcss/pull/17476))
+- Add `pointer-none`, `pointer-coarse`, and `pointer-fine` variants ([#16946](https://github.com/tailwindlabs/tailwindcss/pull/16946))
+- Add `any-pointer-none`, `any-pointer-coarse`, and `any-pointer-fine` variants ([#16941](https://github.com/tailwindlabs/tailwindcss/pull/16941))
+- Add safe alignment utilities ([#14607](https://github.com/tailwindlabs/tailwindcss/pull/14607))
+- Add `user-valid` and `user-invalid` variants ([#12370](https://github.com/tailwindlabs/tailwindcss/pull/12370))
+- Add `wrap-anywhere`, `wrap-break-word`, and `wrap-normal` utilities ([#12128](https://github.com/tailwindlabs/tailwindcss/pull/12128))
+- Add `@source inline(…)` and `@source not inline(…)` ([#17147](https://github.com/tailwindlabs/tailwindcss/pull/17147))
+- Add `@source not "…"` ([#17255](https://github.com/tailwindlabs/tailwindcss/pull/17255))
+- Add `text-shadow-*` utilities ([#17389](https://github.com/tailwindlabs/tailwindcss/pull/17389))
+- Add `mask-*` utilities ([#17134](https://github.com/tailwindlabs/tailwindcss/pull/17134))
+- Add `bg-{position,size}-*` utilities for arbitrary values ([#17432](https://github.com/tailwindlabs/tailwindcss/pull/17432))
+- Add `shadow-*/<alpha>`, `inset-shadow-*/<alpha>`, `drop-shadow-*/<alpha>`, and `text-shadow-*/<alpha>` utilities to control shadow opacity ([#17398](https://github.com/tailwindlabs/tailwindcss/pull/17398), [#17434](https://github.com/tailwindlabs/tailwindcss/pull/17434))
+- Add `drop-shadow-<color>` utilities ([#17434](https://github.com/tailwindlabs/tailwindcss/pull/17434))
+- Improve compatibility with older versions of Safari and Firefox ([#17435](https://github.com/tailwindlabs/tailwindcss/pull/17435))
+
+### Fixed
+
+- Follow symlinks when resolving `@source` directives ([#17391](https://github.com/tailwindlabs/tailwindcss/pull/17391))
+- Don't scan ignored files for classes when changing an ignored file triggers a rebuild using `@tailwindcss/cli` ([#17255](https://github.com/tailwindlabs/tailwindcss/pull/17255))
+- Support negated `content` rules in legacy JavaScript configuration ([#17255](https://github.com/tailwindlabs/tailwindcss/pull/17255))
+- Interpret syntax like `@("@")md:…` as `@md:…` in Razor files ([#17427](https://github.com/tailwindlabs/tailwindcss/pull/17427))
+- Disallow top-level braces, top-level semicolons, and unbalanced parentheses and brackets in arbitrary values ([#17361](https://github.com/tailwindlabs/tailwindcss/pull/17361))
+- Ensure the `--theme(…)` function still resolves to the CSS variables when using legacy JS plugins ([#17458](https://github.com/tailwindlabs/tailwindcss/pull/17458))
+- Detect used theme variables in CSS module files ([#17433](https://github.com/tailwindlabs/tailwindcss/pull/17433), [#17467](https://github.com/tailwindlabs/tailwindcss/pull/17467))
+
+### Changed
+
+- Ignore `node_modules` by default (can be overridden by `@source …` rules) ([#17255](https://github.com/tailwindlabs/tailwindcss/pull/17255))
+- `@source` rules that include file extensions or point inside `node_modules/` folders no longer consider your `.gitignore` rules ([#17255](https://github.com/tailwindlabs/tailwindcss/pull/17255))
+- Deprecate `bg-{left,right}-{top,bottom}` in favor of `bg-{top,bottom}-{left,right}` utilities ([#17378](https://github.com/tailwindlabs/tailwindcss/pull/17378))
+- Deprecate `object-{left,right}-{top,bottom}` in favor of `object-{top,bottom}-{left,right}` utilities ([#17437](https://github.com/tailwindlabs/tailwindcss/pull/17437))
+
+## [4.0.17] - 2025-03-26
+
+### Fixed
+
+- Fix an issue causing the CLI to hang when processing Ruby files ([#17383](https://github.com/tailwindlabs/tailwindcss/pull/17383))
+
+## [4.0.16] - 2025-03-25
+
+### Added
+
+- Add support for literal values in `--value('…')` and `--modifier('…')` ([#17304](https://github.com/tailwindlabs/tailwindcss/pull/17304))
+
+### Fixed
+
+- Fix class extraction followed by `(` in Pug ([#17320](https://github.com/tailwindlabs/tailwindcss/pull/17320))
+- Ensure `@keyframes` for theme animations are emitted if they are referenced following a comma ([#17352](https://github.com/tailwindlabs/tailwindcss/pull/17352))
+- Vite: Ensure that updates to an imported CSS file are properly propagated after updating source files ([#17347](https://github.com/tailwindlabs/tailwindcss/pull/17347))
+- Pre process `Slim` templates embedded in Ruby files ([#17336](https://github.com/tailwindlabs/tailwindcss/pull/17336))
+- Error when input and output files resolve to the same file when using the CLI ([#17311](https://github.com/tailwindlabs/tailwindcss/pull/17311))
+- Add missing suggestions when `--spacing(--value(integer, number))` is used ([#17308](https://github.com/tailwindlabs/tailwindcss/pull/17308))
+- Add `::-webkit-details-marker` pseudo to `marker` variant ([#17362](https://github.com/tailwindlabs/tailwindcss/pull/17362))
+
+## [4.0.15] - 2025-03-20
+
+### Fixed
+
+- Fix incorrect angle in `-bg-conic-*` utilities ([#17174](https://github.com/tailwindlabs/tailwindcss/pull/17174))
+- Fix `border-[12px_4px]` being interpreted as a `border-color` instead of a `border-width` ([#17248](https://github.com/tailwindlabs/tailwindcss/pull/17248))
+- Work around a crash in Safari 16.4 and 16.5 when using the default Preflight styles ([#17306](https://github.com/tailwindlabs/tailwindcss/pull/17306))
+- Pre-process `<template lang="…">` in Vue files ([#17252](https://github.com/tailwindlabs/tailwindcss/pull/17252))
+- Ensure that all CSS variables used by Preflight are prefixed ([#17036](https://github.com/tailwindlabs/tailwindcss/pull/17036))
+- Prevent segfault when loaded in a worker thread on Linux ([#17276](https://github.com/tailwindlabs/tailwindcss/pull/17276))
+- Ensure multiple `--value(…)` or `--modifier(…)` calls don't delete subsequent declarations ([#17273](https://github.com/tailwindlabs/tailwindcss/pull/17273))
+- Fix class extraction followed by `(` in Slim ([#17278](https://github.com/tailwindlabs/tailwindcss/pull/17278))
+- Export `PluginUtils` from `tailwindcss/plugin` for compatibility with v3 ([#17299](https://github.com/tailwindlabs/tailwindcss/pull/17299))
+- Remove redundant `line-height: initial` from Preflight ([#15212](https://github.com/tailwindlabs/tailwindcss/pull/15212))
+- Increase Standalone hardware compatibility on macOS x64 builds ([#17267](https://github.com/tailwindlabs/tailwindcss/pull/17267))
+- Ensure that the CSS file rebuilds if a new CSS variable is used from templates ([#17301](https://github.com/tailwindlabs/tailwindcss/pull/17301))
+
+### Changed
+
+- The `--theme(…)` function now returns CSS variables from your theme variables unless used inside positions where CSS variables are invalid (e.g. inside `@media` queries) ([#17036](https://github.com/tailwindlabs/tailwindcss/pull/17036))
+
+## [4.0.14] - 2025-03-13
+
+### Fixed
+
+- Do not extract candidates with JS string interpolation `${` ([#17142](https://github.com/tailwindlabs/tailwindcss/pull/17142))
+- Fix extraction of variants containing `.` character ([#17153](https://github.com/tailwindlabs/tailwindcss/pull/17153))
+- Fix extracting candidates in Clojure/ClojureScript ([#17087](https://github.com/tailwindlabs/tailwindcss/pull/17087))
+
+## [4.0.13] - 2025-03-11
+
+### Fixed
+
+- Fix Haml pre-processing ([#17051](https://github.com/tailwindlabs/tailwindcss/pull/17051))
+- Ensure `.node` and `.wasm` files are not scanned for utilities ([#17123](https://github.com/tailwindlabs/tailwindcss/pull/17123))
+- Improve performance when scanning JSON files ([#17125](https://github.com/tailwindlabs/tailwindcss/pull/17125))
+- Fix extracting candidates containing dots in Haml, Pug, and Slim pre processors ([#17094](https://github.com/tailwindlabs/tailwindcss/pull/17094), [#17085](https://github.com/tailwindlabs/tailwindcss/pull/17085), [#17113](https://github.com/tailwindlabs/tailwindcss/pull/17113))
+- Don't create invalid CSS when encountering a link wrapped in square brackets ([#17129](https://github.com/tailwindlabs/tailwindcss/pull/17129))
+
+## [4.0.12] - 2025-03-07
+
+### Fixed
+
+- Vite: Fix `url(…)` rebasing in transitively imported CSS files ([#16965](https://github.com/tailwindlabs/tailwindcss/pull/16965))
+- PostCSS: Rebase `url(…)`s in imported CSS files ([#16965](https://github.com/tailwindlabs/tailwindcss/pull/16965))
+- Ensure utilities are sorted based on their actual property order ([#16995](https://github.com/tailwindlabs/tailwindcss/pull/16995))
+- Ensure strings in Pug and Slim templates are handled correctly ([#17000](https://github.com/tailwindlabs/tailwindcss/pull/17000))
+- Ensure classes between `}` and `{` are properly extracted ([#17001](https://github.com/tailwindlabs/tailwindcss/pull/17001))
+- Fix `razor`/`cshtml` pre-processing ([#17027](https://github.com/tailwindlabs/tailwindcss/pull/17027))
+- Ensure extracting candidates from JS embedded in a PHP string works as expected ([#17031](https://github.com/tailwindlabs/tailwindcss/pull/17031))
+
+## [4.0.11] - 2025-03-06
+
+### Fixed
+
+- Ensure classes containing `--` are extracted correctly ([#16972](https://github.com/tailwindlabs/tailwindcss/pull/16972))
+- Ensure classes containing numbers followed by dash or underscore are extracted correctly ([#16980](https://github.com/tailwindlabs/tailwindcss/pull/16980))
+- Ensure arbitrary container queries are extracted correctly ([#16984](https://github.com/tailwindlabs/tailwindcss/pull/16984))
+- Ensure classes ending in `[` are extracted in Slim templating language ([#16985](https://github.com/tailwindlabs/tailwindcss/pull/16985))
+- Ensure arbitrary variables with data types are extracted correctly ([#16986](https://github.com/tailwindlabs/tailwindcss/pull/16986))
+
+## [4.0.10] - 2025-03-05
+
+### Added
+
+- Add `col-<number>` and `row-<number>` utilities for `grid-column` and `grid-row` ([#15183](https://github.com/tailwindlabs/tailwindcss/pull/15183))
+
+### Fixed
+
+- Ensure `not-*` does not remove `:is(…)` from variants ([#16825](https://github.com/tailwindlabs/tailwindcss/pull/16825))
+- Ensure `@keyframes` are correctly emitted when using a prefix ([#16850](https://github.com/tailwindlabs/tailwindcss/pull/16850))
+- Don't swallow `@utility` declarations when `@apply` is used in nested rules ([#16940](https://github.com/tailwindlabs/tailwindcss/pull/16940))
+- Ensure `outline-hidden` behaves like `outline-none` outside of forced colors mode ([#16943](https://github.com/tailwindlabs/tailwindcss/pull/16943))
+- Allow `!important` on CSS variables again ([#16873](https://github.com/tailwindlabs/tailwindcss/pull/16873))
+- Vite: Do not crash when encountering an `.svg` file with `#` or `?` in the filename ([#16957](https://github.com/tailwindlabs/tailwindcss/pull/16957))
+- Ensure utilities are properly detected within square brackets ([#16306](https://github.com/tailwindlabs/tailwindcss/pull/16306))
+- Ensure utilities are properly detected using Angular's conditional class binding syntax ([#16306](https://github.com/tailwindlabs/tailwindcss/pull/16306))
+- Ensure utilities starting with numbers are properly extracted from Slim templates ([#16306](https://github.com/tailwindlabs/tailwindcss/pull/16306))
+- Discard arbitrary property candidates that have guaranteed-invalid property names ([#16306](https://github.com/tailwindlabs/tailwindcss/pull/16306))
+
+### Changed
+
+- Removed `max-w-auto` and `max-h-auto` utilities as they generate invalid CSS ([#16917](https://github.com/tailwindlabs/tailwindcss/pull/16917))
+- Replaced the existing candidate extractor with a brand new extractor to improve maintainability, correctness, and performance ([#16306](https://github.com/tailwindlabs/tailwindcss/pull/16306))
+
+## [4.0.9] - 2025-02-25
+
+### Fixed
+
+- Make JS APIs available to plugins and configs in the Standalone CLI ([#15934](https://github.com/tailwindlabs/tailwindcss/pull/15934))
+- Vite: Don't crash when importing a virtual module from JavaScript that ends in `.css` ([#16780](https://github.com/tailwindlabs/tailwindcss/pull/16780))
+- Fix an issue where `@reference "…"` would sometimes omit keyframe animations ([#16774](https://github.com/tailwindlabs/tailwindcss/pull/16774))
+- Ensure `z-*!` utilities are properly marked as `!important` ([#16795](https://github.com/tailwindlabs/tailwindcss/pull/16795))
+- Read UTF-8 CSS files that start with a byte-order mark (BOM) ([#16800](https://github.com/tailwindlabs/tailwindcss/pull/16800))
+- Ensure nested functions in selectors used with JavaScript plugins are not truncated ([#16802](https://github.com/tailwindlabs/tailwindcss/pull/16802))
+
+### Changed
+
+- Emit variable fallbacks when using `@reference "…"` instead of duplicate CSS variable declarations ([#16774](https://github.com/tailwindlabs/tailwindcss/pull/16774))
+
+## [4.0.8] - 2025-02-21
+
+### Added
+
+- Allow `@import` with `theme(…)` options for stylesheets that contain more than just `@theme` rules ([#16514](https://github.com/tailwindlabs/tailwindcss/pull/16514))
+
+### Fixed
+
+- Don't add `!important` to CSS variable declarations when using the important modifier ([#16668](https://github.com/tailwindlabs/tailwindcss/pull/16668))
+- Vite: Ignore files and directories specified in your `.gitignore` file when using automatic source detection([#16631](https://github.com/tailwindlabs/tailwindcss/pull/16631))
+- Vite: Don't rely on the module graph for detecting candidates to ensure setups with multiple Vite builds work as expected ([#16631](https://github.com/tailwindlabs/tailwindcss/pull/16631))
+- Vite: Ensure Astro production builds always contain classes used in client-only components ([#16631](https://github.com/tailwindlabs/tailwindcss/pull/16631))
+- Vite: Always scan raw file contents for utility classes before any other transforms have been applied to ensure utility classes are scanned without any additional escaping ([#16631](https://github.com/tailwindlabs/tailwindcss/pull/16631))
+- Ensure utilities with more declarations are always sorted before utilities with fewer declarations when utilities only define CSS variables ([#16715](https://github.com/tailwindlabs/tailwindcss/pull/16715))
+- Only include `translate-z-px` utilities once in compiled CSS ([#16718](https://github.com/tailwindlabs/tailwindcss/pull/16718))
+
+### Changed
+
+- Don't include theme variables that aren't used in compiled CSS ([#16211](https://github.com/tailwindlabs/tailwindcss/pull/16211), [#16676](https://github.com/tailwindlabs/tailwindcss/pull/16676))
+
+## [4.0.7] - 2025-02-18
+
+### Fixed
+
+- Export `tailwindcss/lib/util/flattenColorPalette.js` for backward compatibility ([#16411](https://github.com/tailwindlabs/tailwindcss/pull/16411))
+- Fix sorting of numeric utility suggestions when they have different magnitudes ([#16414](https://github.com/tailwindlabs/tailwindcss/pull/16414))
+- Show suggestions for fractions in IntelliSense ([#16353](https://github.com/tailwindlabs/tailwindcss/pull/16353))
+- Don’t replace `_` in suggested theme keys ([#16433](https://github.com/tailwindlabs/tailwindcss/pull/16433))
+- Ensure `--default-outline-width` can be used to change the `outline-width` value of the `outline` utility ([#16469](https://github.com/tailwindlabs/tailwindcss/pull/16469))
+- Ensure drop shadow utilities don't inherit unexpectedly ([#16471](https://github.com/tailwindlabs/tailwindcss/pull/16471))
+- Export config and plugin types from `tailwindcss/plugin` for backward compatibility ([#16505](https://github.com/tailwindlabs/tailwindcss/pull/16505))
+- Ensure JavaScript plugins that emit nested rules referencing the utility name work as expected ([#16539](https://github.com/tailwindlabs/tailwindcss/pull/16539))
+- Statically link Visual Studio redistributables in `@tailwindcss/oxide` Windows builds ([#16602](https://github.com/tailwindlabs/tailwindcss/pull/16602))
+- Ensure that Next.js splat routes are scanned for classes ([#16457](https://github.com/tailwindlabs/tailwindcss/pull/16457))
+- Pin exact version of `tailwindcss` in `@tailwindcss/*` packages ([#16623](https://github.com/tailwindlabs/tailwindcss/pull/16623))
+- Upgrade: Report errors when updating dependencies ([#16504](https://github.com/tailwindlabs/tailwindcss/pull/16504))
+- Upgrade: Ensure a `darkMode` JS config setting with block syntax converts to use `@slot` ([#16507](https://github.com/tailwindlabs/tailwindcss/pull/16507))
+- Upgrade: Ensure the latest version of `tailwindcss` and `@tailwindcss/postcss` are installed when upgrading ([#16620](https://github.com/tailwindlabs/tailwindcss/pull/16620))
+
+## [4.0.6] - 2025-02-10
+
+### Fixed
+
+- Revert change to no longer include theme variables that aren't used in compiled CSS ([#16403](https://github.com/tailwindlabs/tailwindcss/pull/16403))
+- Upgrade: Don't migrate `blur` to `blur-sm` when used with Next.js `<Image placeholder="blur" />` ([#16405](https://github.com/tailwindlabs/tailwindcss/pull/16405))
+
+## [4.0.5] - 2025-02-08
+
+### Added
+
+- Add `@theme static` option for always including theme variables in compiled CSS ([#16211](https://github.com/tailwindlabs/tailwindcss/pull/16211))
+
+### Fixed
+
+- Remove rogue `console.log` from `@tailwindcss/vite` ([#16307](https://github.com/tailwindlabs/tailwindcss/pull/16307))
+
+### Changed
+
+- Don't include theme variables that aren't used in compiled CSS ([#16211](https://github.com/tailwindlabs/tailwindcss/pull/16211))
+
+## [4.0.4] - 2025-02-06
+
+### Fixed
+
+- Fix a crash when setting JS theme values to `null` ([#16210](https://github.com/tailwindlabs/tailwindcss/pull/16210))
+- Ensure escaped underscores in CSS variables in arbitrary values are properly unescaped ([#16206](https://github.com/tailwindlabs/tailwindcss/pull/16206))
+- Ensure that the `containers` JS theme key is added to the `--container-*` namespace ([#16169](https://github.com/tailwindlabs/tailwindcss/pull/16169))
+- Ensure theme `@keyframes` are generated even if an `--animation-*` variable spans multiple lines ([#16237](https://github.com/tailwindlabs/tailwindcss/pull/16237))
+- Vite: Skip parsing stylesheets with the `?commonjs-proxy` flag ([#16238](https://github.com/tailwindlabs/tailwindcss/pull/16238))
+- Fix `order-first` and `order-last` for Firefox ([#16266](https://github.com/tailwindlabs/tailwindcss/pull/16266))
+- Fix support for older instruction sets on Linux x64 builds of the standalone CLI ([#16244](https://github.com/tailwindlabs/tailwindcss/pull/16244))
+- Ensure `NODE_PATH` is respected when resolving JavaScript and CSS files ([#16274](https://github.com/tailwindlabs/tailwindcss/pull/16274))
+- Ensure Node addons are packaged correctly with FreeBSD builds ([#16277](https://github.com/tailwindlabs/tailwindcss/pull/16277))
+- Fix an issue where `@variant` inside a referenced stylesheet could cause a stack overflow ([#16300](https://github.com/tailwindlabs/tailwindcss/pull/16300))
+
+## [4.0.3] - 2025-02-01
+
+### Fixed
+
+- Fix incorrect removal of `@import url();` ([#16144](https://github.com/tailwindlabs/tailwindcss/pull/16144))
+
+## [4.0.2] - 2025-01-31
+
+### Fixed
+
+- Only generate positive `grid-cols-*` and `grid-rows-*` utilities ([#16020](https://github.com/tailwindlabs/tailwindcss/pull/16020))
+- Ensure escaped theme variables are handled correctly ([#16064](https://github.com/tailwindlabs/tailwindcss/pull/16064))
+- Ensure we process Tailwind CSS features when only using `@reference` or `@variant` ([#16057](https://github.com/tailwindlabs/tailwindcss/pull/16057))
+- Refactor gradient implementation to work around [prettier/prettier#17058](https://github.com/prettier/prettier/issues/17058) ([#16072](https://github.com/tailwindlabs/tailwindcss/pull/16072))
+- Vite: Ensure hot-reloading works with SolidStart setups ([#16052](https://github.com/tailwindlabs/tailwindcss/pull/16052))
+- Vite: Fix a crash when starting the development server in SolidStart setups ([#16052](https://github.com/tailwindlabs/tailwindcss/pull/16052))
+- Vite: Don't rebase URLs that appear to be aliases ([#16078](https://github.com/tailwindlabs/tailwindcss/pull/16078))
+- Vite: Transform `<style>` blocks in HTML files ([#16069](https://github.com/tailwindlabs/tailwindcss/pull/16069))
+- Prevent camel-casing CSS custom properties added by JavaScript plugins ([#16103](https://github.com/tailwindlabs/tailwindcss/pull/16103))
+- Do not emit `@keyframes` in `@theme reference` ([#16120](https://github.com/tailwindlabs/tailwindcss/pull/16120))
+- Discard invalid declarations when parsing CSS ([#16093](https://github.com/tailwindlabs/tailwindcss/pull/16093))
+- Do not emit empty CSS rules and at-rules ([#16121](https://github.com/tailwindlabs/tailwindcss/pull/16121))
+- Handle `@variant` when at the top-level of a stylesheet ([#16129](https://github.com/tailwindlabs/tailwindcss/pull/16129))
+
+## [4.0.1] - 2025-01-29
+
+### Added
+
+- Include `:open` pseudo-class in existing `open` variant ([#15349](https://github.com/tailwindlabs/tailwindcss/pull/15349))
+
+### Fixed
+
+- Remove invalid `min-w/h-none` utilities ([#15845](https://github.com/tailwindlabs/tailwindcss/pull/15845))
+- Discard CSS variable shorthand utilities that don't use valid CSS variables ([#15738](https://github.com/tailwindlabs/tailwindcss/pull/15738))
+- Ensure font-size utilities with `none` modifier have a line-height set e.g. `text-sm/none` ([#15921](https://github.com/tailwindlabs/tailwindcss/pull/15921))
+- Ensure font-size utilities with unknown modifier don't generate CSS ([#15921](https://github.com/tailwindlabs/tailwindcss/pull/15921))
+- Don’t suggest font weight utilities more than once ([#15857](https://github.com/tailwindlabs/tailwindcss/pull/15857))
+- Suggest container query variants ([#15857](https://github.com/tailwindlabs/tailwindcss/pull/15857))
+- Disable bare value suggestions when not using the `--spacing` variable ([#15857](https://github.com/tailwindlabs/tailwindcss/pull/15857))
+- Ensure suggested classes are properly sorted ([#15857](https://github.com/tailwindlabs/tailwindcss/pull/15857))
+- Don’t look at .gitignore files outside initialized repos ([#15941](https://github.com/tailwindlabs/tailwindcss/pull/15941))
+- Find utilities when using the Svelte class shorthand syntax across multiple lines ([#15974](https://github.com/tailwindlabs/tailwindcss/pull/15974))
+- Find utilities when using the Angular class shorthand syntax ([#15974](https://github.com/tailwindlabs/tailwindcss/pull/15974))
+- Find utilities when using functions inside arrays ([#15974](https://github.com/tailwindlabs/tailwindcss/pull/15974))
+- Ensure that `@tailwindcss/browser` does not pollute the global namespace ([#15978](https://github.com/tailwindlabs/tailwindcss/pull/15978))
+- Ensure that `tailwind-merge` is not scanned when using the Vite plugin ([#16005](https://github.com/tailwindlabs/tailwindcss/pull/16005))
+- Ensure CSS theme variables are available within shadow roots ([#15975](https://github.com/tailwindlabs/tailwindcss/pull/15975))
+- Fix crash when project lives in the `/` directory ([#15988](https://github.com/tailwindlabs/tailwindcss/pull/15988))
+- Ensure custom variants have a non-empty selector list ([#16009](https://github.com/tailwindlabs/tailwindcss/pull/16009))
+- _Upgrade_: Ensure JavaScript config files on different drives are correctly migrated ([#15927](https://github.com/tailwindlabs/tailwindcss/pull/15927))
+- _Upgrade_: Migrate `leading-[1]` to `leading-none` ([#16004](https://github.com/tailwindlabs/tailwindcss/pull/16004))
+- _Upgrade_: Do not migrate arbitrary leading utilities to bare values ([#16004](https://github.com/tailwindlabs/tailwindcss/pull/16004))
+
+## [4.0.0] - 2025-01-21
+
+### Added
+
+- [New high-performance engine](https://tailwindcss.com/blog/tailwindcss-v4#new-high-performance-engine) — where full builds are up to 5x faster, and incremental builds are over 100x faster — and measured in microseconds.
+- [Designed for the modern web](https://tailwindcss.com/blog/tailwindcss-v4#designed-for-the-modern-web) — built on cutting-edge CSS features like cascade layers, registered custom properties with `@property`, and `color-mix()`.
+- [Simplified installation](https://tailwindcss.com/blog/tailwindcss-v4#simplified-installation) — fewer dependencies, zero configuration, and just a single line of code in your CSS file.
+- [First-party Vite plugin](https://tailwindcss.com/blog/tailwindcss-v4#first-party-vite-plugin) — tight integration for maximum performance and minimum configuration.
+- [Automatic content detection](https://tailwindcss.com/blog/tailwindcss-v4#automatic-content-detection) — all of your template files are discovered automatically, with no configuration required.
+- [Built-in import support](https://tailwindcss.com/blog/tailwindcss-v4#built-in-import-support) — no additional tooling necessary to bundle multiple CSS files.
+- [CSS-first configuration](https://tailwindcss.com/blog/tailwindcss-v4#css-first-configuration) — a reimagined developer experience where you customize and extend the framework directly in CSS instead of a JavaScript configuration file.
+- [CSS theme variables](https://tailwindcss.com/blog/tailwindcss-v4#css-theme-variables) — all of your design tokens exposed as native CSS variables so you can access them anywhere.
+- [Dynamic utility values and variants](https://tailwindcss.com/blog/tailwindcss-v4#dynamic-utility-values-and-variants) — stop guessing what values exist in your spacing scale, or extending your configuration for things like basic data attributes.
+- [Modernized P3 color palette](https://tailwindcss.com/blog/tailwindcss-v4#modernized-p3-color-palette) — a redesigned, more vivid color palette that takes full advantage of modern display technology.
+- [Container queries](https://tailwindcss.com/blog/tailwindcss-v4#container-queries) — first-class APIs for styling elements based on their container size, no plugins required.
+- [New 3D transform utilities](https://tailwindcss.com/blog/tailwindcss-v4#new-3d-transform-utilities) — transform elements in 3D space directly in your HTML.
+- [Expanded gradient APIs](https://tailwindcss.com/blog/tailwindcss-v4#expanded-gradient-apis) — radial and conic gradients, interpolation modes, and more.
+- [@starting-style support](https://tailwindcss.com/blog/tailwindcss-v4#starting-style-support) — a new variant you can use to create enter and exit transitions, without the need for JavaScript.
+- [not-\* variant](https://tailwindcss.com/blog/tailwindcss-v4#not-variant) — style an element only when it doesn't match another variant, custom selector, or media or feature query.
+- [Even more new utilities and variants](https://tailwindcss.com/blog/tailwindcss-v4#even-more-new-utilities-and-variants) — including support for `color-scheme`, `field-sizing`, complex shadows, `inert`, and more.
+
+Start using Tailwind CSS v4.0 today by [installing it in a new project](https://tailwindcss.com/docs/installation/), or playing with it directly in the browser on [Tailwind Play](https://play.tailwindcss.com/).
+
+For existing projects, we've published a comprehensive [upgrade guide](https://tailwindcss.com/docs/upgrade-guide) and built an [automated upgrade tool](https://tailwindcss.com/docs/upgrade-guide#using-the-upgrade-tool) to get you on the latest version as quickly and painlessly as possible.
+
+For a deep-dive into everything that's new, [check out the announcement post](https://tailwindcss.com/blog/tailwindcss-v4).
+
+## [4.0.0-beta.10] - 2025-01-21
+
+### Added
+
+- Add support for using `@variant` to use variants in your CSS ([#15663](https://github.com/tailwindlabs/tailwindcss/pull/15663))
+- Include `outline-color` when transitioning colors ([#15690](https://github.com/tailwindlabs/tailwindcss/pull/15690))
+
+### Fixed
+
+- Add missing `main` and `browser` fields for `@tailwindcss/browser` ([#15594](https://github.com/tailwindlabs/tailwindcss/pull/15594))
+- Support escaping `*` in theme namespace syntax (e.g.: `--color-\*: initial;`) ([#15603](https://github.com/tailwindlabs/tailwindcss/pull/15603))
+- Respect `@theme` options when resolving values in custom functional utilities ([#15623](https://github.com/tailwindlabs/tailwindcss/pull/15623))
+- Discard invalid variants (e.g. `data-checked-[selected=1]:*`) ([#15629](https://github.com/tailwindlabs/tailwindcss/pull/15629))
+- Ensure `-outline-offset-*` utilities are suggested in IntelliSense ([#15646](https://github.com/tailwindlabs/tailwindcss/pull/15646))
+- Write to `stdout` when `--output` is set to `-` or omitted with `@tailwindcss/cli` ([#15656](https://github.com/tailwindlabs/tailwindcss/pull/15656))
+- Prevent `not-*` from being used with variants that have multiple sibling rules ([#15689](https://github.com/tailwindlabs/tailwindcss/pull/15689))
+- _Upgrade (experimental)_: Pretty print `--spacing(…)` to prevent ambiguity ([#15596](https://github.com/tailwindlabs/tailwindcss/pull/15596))
+
+### Changed
+
+- Use more modern `--alpha(color / 50%)` syntax instead of `--alpha(color, 50%)` ([#15665](https://github.com/tailwindlabs/tailwindcss/pull/15665))
+- Rename `@variant` to `@custom-variant` ([#15663](https://github.com/tailwindlabs/tailwindcss/pull/15663))
+- Change `outline-hidden` to set `outline-style: none` except in forced colors mode ([#15690](https://github.com/tailwindlabs/tailwindcss/pull/15690))
+
+## [4.0.0-beta.9] - 2025-01-09
+
+### Added
+
+- Add `@tailwindcss/browser` package to run Tailwind CSS in the browser ([#15558](https://github.com/tailwindlabs/tailwindcss/pull/15558))
+- Add `@reference "…"` API as a replacement for the previous `@import "…" reference` option ([#15565](https://github.com/tailwindlabs/tailwindcss/pull/15565))
+- Add support for defining functional utilities in CSS ([#15455](https://github.com/tailwindlabs/tailwindcss/pull/15455))
+- Add new `--spacing(…)`, `--alpha(…)`, and `--theme(…)` CSS functions ([#15572](https://github.com/tailwindlabs/tailwindcss/pull/15572))
+- Add musl-based Linux builds of the standalone CLI ([#15567](https://github.com/tailwindlabs/tailwindcss/pull/15567))
+- Improve performance of internal AST manipulations ([#15529](https://github.com/tailwindlabs/tailwindcss/pull/15529))
+
+### Fixed
+
+- Use the correct property value for `place-content-between`, `place-content-around`, and `place-content-evenly` utilities ([#15440](https://github.com/tailwindlabs/tailwindcss/pull/15440))
+- Don’t detect arbitrary properties when preceded by an escape ([#15456](https://github.com/tailwindlabs/tailwindcss/pull/15456))
+- Fix incorrectly named `bg-round` and `bg-space` utilities to `bg-repeat-round` to `bg-repeat-space` ([#15462](https://github.com/tailwindlabs/tailwindcss/pull/15462))
+- Fix `inset-shadow-*` suggestions in IntelliSense ([#15471](https://github.com/tailwindlabs/tailwindcss/pull/15471))
+- Only compile arbitrary values ending in `]` ([#15503](https://github.com/tailwindlabs/tailwindcss/pull/15503))
+- Ensure `@apply` rules are processed in the correct order ([#15542](https://github.com/tailwindlabs/tailwindcss/pull/15542))
+- Allow negative utility names in `@utility` ([#15573](https://github.com/tailwindlabs/tailwindcss/pull/15573))
+- Remove all `@keyframes` contributed by JavaScript plugins when using `@reference` imports ([#15581](https://github.com/tailwindlabs/tailwindcss/pull/15581))
+- _Upgrade (experimental)_: Do not extract class names from functions (e.g. `shadow` in `filter: 'drop-shadow(…)'`) ([#15566](https://github.com/tailwindlabs/tailwindcss/pull/15566))
+- _Upgrade (experimental)_: Migrate `theme(spacing.2)` to `--spacing(2)` ([#15579](https://github.com/tailwindlabs/tailwindcss/pull/15579))
+- _Upgrade (experimental)_: Migrate `theme(…)` to `--theme(…)` ([#15579](https://github.com/tailwindlabs/tailwindcss/pull/15579))
+
+### Changed
+
+- Remove `--container-prose` in favor of a deprecated `--max-width-prose` theme variable so that `*-prose` is only available for max-width utilities and only for backward compatibility ([#15439](https://github.com/tailwindlabs/tailwindcss/pull/15439))
+- Use Vite post-processor APIs for processing Svelte `<style>` blocks ([#15436](https://github.com/tailwindlabs/tailwindcss/pull/15436))
+- Remove `@property` fallback rules for Firefox ([#15622](https://github.com/tailwindlabs/tailwindcss/pull/15622))
+
+## [4.0.0-beta.8] - 2024-12-17
+
+### Fixed
+
+- Ensure `Symbol.dispose` and `Symbol.asyncDispose` are polyfilled ([#15404](https://github.com/tailwindlabs/tailwindcss/pull/15404))
 
 ## [4.0.0-beta.7] - 2024-12-13
 
@@ -239,7 +1128,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Rename `drop-shadow` to `drop-shadow-sm` and `drop-shadow-sm` to `drop-shadow-xs` ([#14849](https://github.com/tailwindlabs/tailwindcss/pull/14849))
 - Rename `rounded` to `rounded-sm` and `rounded-sm` to `rounded-xs` ([#14849](https://github.com/tailwindlabs/tailwindcss/pull/14849))
 - Rename `blur` to `blur-sm` and `blur-sm` to `blur-xs` ([#14849](https://github.com/tailwindlabs/tailwindcss/pull/14849))
-- Remove fixed line-height theme values and derive `leading-*` utilites from `--spacing-*` scale ([#14857](https://github.com/tailwindlabs/tailwindcss/pull/14857))
+- Remove fixed line-height theme values and derive `leading-*` utilities from `--spacing-*` scale ([#14857](https://github.com/tailwindlabs/tailwindcss/pull/14857))
 - Remove `--transition-timing-function-linear` from the default theme in favor of a static `ease-linear` utility ([#14880](https://github.com/tailwindlabs/tailwindcss/pull/14880))
 - Remove default `--spacing-*` scale in favor of `--spacing` multiplier ([#14857](https://github.com/tailwindlabs/tailwindcss/pull/14857))
 - Remove `var(…)` fallbacks from theme values in utilities ([#14881](https://github.com/tailwindlabs/tailwindcss/pull/14881))
@@ -763,3 +1652,2781 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Move the CLI into a separate `@tailwindcss/cli` package ([#13095](https://github.com/tailwindlabs/tailwindcss/pull/13095))
 
 ## [4.0.0-alpha.1] - 2024-03-06
+
+- First 4.0.0-alpha.1 release
+
+## [3.4.17] - 2024-12-17
+
+### Fixed
+
+- Work around Node v22.12+ issue ([#15421](https://github.com/tailwindlabs/tailwindcss/pull/15421))
+
+## [3.4.16] - 2024-12-03
+
+### Fixed
+
+- Ensure the TypeScript types for `PluginsConfig` allow `undefined` values ([#14668](https://github.com/tailwindlabs/tailwindcss/pull/14668))
+
+# Changed
+
+- Bumped lilconfig to v3.x ([#15289](https://github.com/tailwindlabs/tailwindcss/pull/15289))
+
+## [3.4.15] - 2024-11-14
+
+- Bump versions for security vulnerabilities ([#14697](https://github.com/tailwindlabs/tailwindcss/pull/14697))
+- Ensure the TypeScript types for the `boxShadow` theme configuration allows arrays ([#14856](https://github.com/tailwindlabs/tailwindcss/pull/14856))
+- Set fallback for opacity variables to ensure setting colors with the `selection:*` variant works in Chrome 131 ([#15003](https://github.com/tailwindlabs/tailwindcss/pull/15003))
+
+## [3.4.14] - 2024-10-15
+
+### Fixed
+
+- Don't set `display: none` on elements that use `hidden="until-found"` ([#14625](https://github.com/tailwindlabs/tailwindcss/pull/14625))
+
+## [3.4.13] - 2024-09-23
+
+### Fixed
+
+- Improve source glob verification performance ([#14481](https://github.com/tailwindlabs/tailwindcss/pull/14481))
+
+## [3.4.12] - 2024-09-17
+
+### Fixed
+
+- Ensure using `@apply` with utilities that use `@defaults` works with rules defined in the base layer when using `optimizeUniversalDefaults` ([#14427](https://github.com/tailwindlabs/tailwindcss/pull/14427))
+
+## [3.4.11] - 2024-09-11
+
+### Fixed
+
+- Allow `anchor-size(…)` in arbitrary values ([#14393](https://github.com/tailwindlabs/tailwindcss/pull/14393))
+
+## [3.4.10] - 2024-08-13
+
+### Fixed
+
+- Bump versions of plugins in the Standalone CLI ([#14185](https://github.com/tailwindlabs/tailwindcss/pull/14185))
+
+## [3.4.9] - 2024-08-08
+
+### Fixed
+
+- No longer warns when broad glob patterns are detecting `vendor` folders
+
+## [3.4.8] - 2024-08-07
+
+### Fixed
+
+- Fix minification when using nested CSS ([#14105](https://github.com/tailwindlabs/tailwindcss/pull/14105))
+- Warn when broad glob patterns are used in the content configuration ([#14140](https://github.com/tailwindlabs/tailwindcss/pull/14140))
+
+## [3.4.7] - 2024-07-25
+
+### Fixed
+
+- Fix class detection in Slim templates with attached attributes and ID ([#14019](https://github.com/tailwindlabs/tailwindcss/pull/14019))
+- Ensure attribute values in `data-*` and `aria-*` modifiers are always quoted in the generated CSS ([#14037](https://github.com/tailwindlabs/tailwindcss/pull/14037))
+
+## [3.4.6] - 2024-07-16
+
+### Fixed
+
+- Fix detection of some utilities in Slim/Pug templates ([#14006](https://github.com/tailwindlabs/tailwindcss/pull/14006))
+
+### Changed
+
+- Loosen `:is()` wrapping rules when using an important selector ([#13900](https://github.com/tailwindlabs/tailwindcss/pull/13900))
+
+## [3.4.5] - 2024-07-15
+
+### Fixed
+
+- Disable automatic `var()` injection for anchor properties ([#13826](https://github.com/tailwindlabs/tailwindcss/pull/13826))
+- Use no value instead of `blur(0px)` for `backdrop-blur-none` and `blur-none` utilities ([#13830](https://github.com/tailwindlabs/tailwindcss/pull/13830))
+- Add `.mts` and `.cts` config file detection ([#13940](https://github.com/tailwindlabs/tailwindcss/pull/13940))
+- Don't generate utilities like `px-1` unnecessarily when using utilities like `px-1.5` ([#13959](https://github.com/tailwindlabs/tailwindcss/pull/13959))
+- Always generate `-webkit-backdrop-filter` for `backdrop-*` utilities ([#13997](https://github.com/tailwindlabs/tailwindcss/pull/13997))
+
+## [3.4.4] - 2024-06-05
+
+### Fixed
+
+- Make it possible to use multiple `<alpha-value>` placeholders in a single color definition ([#13740](https://github.com/tailwindlabs/tailwindcss/pull/13740))
+- Don't prefix classes in arbitrary values of `has-*`, `group-has-*`, and `peer-has-*` variants ([#13770](https://github.com/tailwindlabs/tailwindcss/pull/13770))
+- Support negative values for `{col,row}-{start,end}` utilities ([#13781](https://github.com/tailwindlabs/tailwindcss/pull/13781))
+- Update embedded browserslist database ([#13792](https://github.com/tailwindlabs/tailwindcss/pull/13792))
+
+## [3.4.3] - 2024-03-27
+
+### Fixed
+
+- Revert changes to glob handling ([#13384](https://github.com/tailwindlabs/tailwindcss/pull/13384))
+
+## [3.4.2] - 2024-03-27
+
+### Fixed
+
+- Ensure max specificity of `0,0,1` for button and input Preflight rules ([#12735](https://github.com/tailwindlabs/tailwindcss/pull/12735))
+- Improve glob handling for folders with `(`, `)`, `[` or `]` in the file path ([#12715](https://github.com/tailwindlabs/tailwindcss/pull/12715))
+- Split `:has` rules when using `experimental.optimizeUniversalDefaults` ([#12736](https://github.com/tailwindlabs/tailwindcss/pull/12736))
+- Sort arbitrary properties alphabetically across multiple class lists ([#12911](https://github.com/tailwindlabs/tailwindcss/pull/12911))
+- Add `mix-blend-plus-darker` utility ([#12923](https://github.com/tailwindlabs/tailwindcss/pull/12923))
+- Ensure dashes are allowed in variant modifiers ([#13303](https://github.com/tailwindlabs/tailwindcss/pull/13303))
+- Fix crash showing completions in Intellisense when using a custom separator ([#13306](https://github.com/tailwindlabs/tailwindcss/pull/13306))
+- Transpile `import.meta.url` in config files ([#13322](https://github.com/tailwindlabs/tailwindcss/pull/13322))
+- Reset letter spacing for form elements ([#13150](https://github.com/tailwindlabs/tailwindcss/pull/13150))
+- Fix missing `xx-large` and remove double `x-large` absolute size ([#13324](https://github.com/tailwindlabs/tailwindcss/pull/13324))
+- Don't error when encountering nested CSS unless trying to `@apply` a class that uses nesting ([#13325](https://github.com/tailwindlabs/tailwindcss/pull/13325))
+- Ensure that arbitrary properties respect `important` configuration ([#13353](https://github.com/tailwindlabs/tailwindcss/pull/13353))
+- Change dark mode selector so `@apply` works correctly with pseudo elements ([#13379](https://github.com/tailwindlabs/tailwindcss/pull/13379))
+
+## [3.4.1] - 2024-01-05
+
+### Fixed
+
+- Don't remove keyframe stops when using important utilities ([#12639](https://github.com/tailwindlabs/tailwindcss/pull/12639))
+- Don't add spaces to gradients and grid track names when followed by `calc()` ([#12704](https://github.com/tailwindlabs/tailwindcss/pull/12704))
+- Restore old behavior for `class` dark mode strategy ([#12717](https://github.com/tailwindlabs/tailwindcss/pull/12717))
+- Improve glob handling for folders with `(`, `)`, `[` or `]` in the file path ([#12715](https://github.com/tailwindlabs/tailwindcss/pull/12715))
+
+### Added
+
+- Add new `selector` and `variant` strategies for dark mode ([#12717](https://github.com/tailwindlabs/tailwindcss/pull/12717))
+
+### Changed
+
+- Support `rtl` and `ltr` variants on same element as `dir` attribute ([#12717](https://github.com/tailwindlabs/tailwindcss/pull/12717))
+
+## [3.4.0] - 2023-12-19
+
+### Added
+
+- Add `svh`, `lvh`, and `dvh` values to default `height`/`min-height`/`max-height` theme ([#11317](https://github.com/tailwindlabs/tailwindcss/pull/11317))
+- Add `has-*` variants for `:has(...)` pseudo-class ([#11318](https://github.com/tailwindlabs/tailwindcss/pull/11318))
+- Add `text-wrap` utilities including `text-balance` and `text-pretty` ([#11320](https://github.com/tailwindlabs/tailwindcss/pull/11320), [#12031](https://github.com/tailwindlabs/tailwindcss/pull/12031))
+- Extend default `opacity` scale to include all steps of 5 ([#11832](https://github.com/tailwindlabs/tailwindcss/pull/11832))
+- Update Preflight `html` styles to include shadow DOM `:host` pseudo-class ([#11200](https://github.com/tailwindlabs/tailwindcss/pull/11200))
+- Increase default values for `grid-rows-*` utilities from 1–6 to 1–12 ([#12180](https://github.com/tailwindlabs/tailwindcss/pull/12180))
+- Add `size-*` utilities ([#12287](https://github.com/tailwindlabs/tailwindcss/pull/12287))
+- Add utilities for CSS subgrid ([#12298](https://github.com/tailwindlabs/tailwindcss/pull/12298))
+- Add spacing scale to `min-w-*`, `min-h-*`, and `max-w-*` utilities ([#12300](https://github.com/tailwindlabs/tailwindcss/pull/12300))
+- Add `forced-color-adjust` utilities ([#11931](https://github.com/tailwindlabs/tailwindcss/pull/11931))
+- Add `forced-colors` variant ([#11694](https://github.com/tailwindlabs/tailwindcss/pull/11694), [#12582](https://github.com/tailwindlabs/tailwindcss/pull/12582))
+- Add `appearance-auto` utility ([#12404](https://github.com/tailwindlabs/tailwindcss/pull/12404))
+- Add logical property values for `float` and `clear` utilities ([#12480](https://github.com/tailwindlabs/tailwindcss/pull/12480))
+- Add `*` variant for targeting direct children ([#12551](https://github.com/tailwindlabs/tailwindcss/pull/12551))
+
+### Changed
+
+- Simplify the `sans` font-family stack ([#11748](https://github.com/tailwindlabs/tailwindcss/pull/11748))
+- Disable the tap highlight overlay on iOS ([#12299](https://github.com/tailwindlabs/tailwindcss/pull/12299))
+- Improve relative precedence of `rtl`, `ltr`, `forced-colors`, and `dark` variants ([#12584](https://github.com/tailwindlabs/tailwindcss/pull/12584))
+
+## [3.3.7] - 2023-12-18
+
+### Fixed
+
+- Fix support for container query utilities with arbitrary values ([#12534](https://github.com/tailwindlabs/tailwindcss/pull/12534))
+- Fix custom config loading in Standalone CLI ([#12616](https://github.com/tailwindlabs/tailwindcss/pull/12616))
+
+## [3.3.6] - 2023-12-04
+
+### Fixed
+
+- Don’t add spaces to negative numbers following a comma ([#12324](https://github.com/tailwindlabs/tailwindcss/pull/12324))
+- Don't emit `@config` in CSS when watching via the CLI ([#12327](https://github.com/tailwindlabs/tailwindcss/pull/12327))
+- Improve types for `resolveConfig` ([#12272](https://github.com/tailwindlabs/tailwindcss/pull/12272))
+- Ensure configured `font-feature-settings` for `mono` are included in Preflight ([#12342](https://github.com/tailwindlabs/tailwindcss/pull/12342))
+- Improve candidate detection in minified JS arrays (without spaces) ([#12396](https://github.com/tailwindlabs/tailwindcss/pull/12396))
+- Don't crash when given applying a variant to a negated version of a simple utility ([#12514](https://github.com/tailwindlabs/tailwindcss/pull/12514))
+- Fix support for slashes in arbitrary modifiers ([#12515](https://github.com/tailwindlabs/tailwindcss/pull/12515))
+- Fix source maps of variant utilities that come from an `@layer` rule ([#12508](https://github.com/tailwindlabs/tailwindcss/pull/12508))
+- Fix loading of built-in plugins when using an ESM or TypeScript config with the Standalone CLI ([#12506](https://github.com/tailwindlabs/tailwindcss/pull/12506))
+
+## [3.3.5] - 2023-10-25
+
+### Fixed
+
+- Fix incorrect spaces around `-` in `calc()` expression ([#12283](https://github.com/tailwindlabs/tailwindcss/pull/12283))
+
+## [3.3.4] - 2023-10-24
+
+### Fixed
+
+- Improve normalisation of `calc()`-like functions ([#11686](https://github.com/tailwindlabs/tailwindcss/pull/11686))
+- Skip `calc()` normalisation in nested `theme()` calls ([#11705](https://github.com/tailwindlabs/tailwindcss/pull/11705))
+- Fix incorrectly generated CSS when using square brackets inside arbitrary properties ([#11709](https://github.com/tailwindlabs/tailwindcss/pull/11709))
+- Make `content` optional for presets in TypeScript types ([#11730](https://github.com/tailwindlabs/tailwindcss/pull/11730))
+- Handle variable colors that have variable fallback values ([#12049](https://github.com/tailwindlabs/tailwindcss/pull/12049))
+- Batch reading content files to prevent `too many open files` error ([#12079](https://github.com/tailwindlabs/tailwindcss/pull/12079))
+- Skip over classes inside `:not(…)` when nested in an at-rule ([#12105](https://github.com/tailwindlabs/tailwindcss/pull/12105))
+- Update types to work with `Node16` module resolution ([#12097](https://github.com/tailwindlabs/tailwindcss/pull/12097))
+- Don’t crash when important and parent selectors are equal in `@apply` ([#12112](https://github.com/tailwindlabs/tailwindcss/pull/12112))
+- Eliminate irrelevant rules when applying variants ([#12113](https://github.com/tailwindlabs/tailwindcss/pull/12113))
+- Improve RegEx parser, reduce possibilities as the key for arbitrary properties ([#12121](https://github.com/tailwindlabs/tailwindcss/pull/12121))
+- Fix sorting of utilities that share multiple candidates ([#12173](https://github.com/tailwindlabs/tailwindcss/pull/12173))
+- Ensure variants with arbitrary values and a modifier are correctly matched in the RegEx based parser ([#12179](https://github.com/tailwindlabs/tailwindcss/pull/12179))
+- Fix crash when watching renamed files on FreeBSD ([#12193](https://github.com/tailwindlabs/tailwindcss/pull/12193))
+- Allow plugins from a parent document to be used in an iframe ([#12208](https://github.com/tailwindlabs/tailwindcss/pull/12208))
+- Add types for `tailwindcss/nesting` ([#12269](https://github.com/tailwindlabs/tailwindcss/pull/12269))
+- Bump `jiti`, `fast-glob`, and `browserlist` dependencies ([#11550](https://github.com/tailwindlabs/tailwindcss/pull/11550))
+- Improve automatic `var` injection for properties that accept a `<dashed-ident>` ([#12236](https://github.com/tailwindlabs/tailwindcss/pull/12236))
+
+## [3.3.3] - 2023-07-13
+
+### Fixed
+
+- Fix issue where some pseudo-element variants generated the wrong selector ([#10943](https://github.com/tailwindlabs/tailwindcss/pull/10943), [#10962](https://github.com/tailwindlabs/tailwindcss/pull/10962), [#11111](https://github.com/tailwindlabs/tailwindcss/pull/11111))
+- Make font settings propagate into buttons, inputs, etc. ([#10940](https://github.com/tailwindlabs/tailwindcss/pull/10940))
+- Fix parsing of `theme()` inside `calc()` when there are no spaces around operators ([#11157](https://github.com/tailwindlabs/tailwindcss/pull/11157))
+- Ensure `repeating-conic-gradient` is detected as an image ([#11180](https://github.com/tailwindlabs/tailwindcss/pull/11180))
+- Move unknown pseudo-elements outside of `:is` by default ([#11345](https://github.com/tailwindlabs/tailwindcss/pull/11345))
+- Escape animation names when prefixes contain special characters ([#11470](https://github.com/tailwindlabs/tailwindcss/pull/11470))
+- Don't prefix arbitrary classes in `group` and `peer` variants ([#11454](https://github.com/tailwindlabs/tailwindcss/pull/11454))
+- Sort classes using position of first matching rule ([#11504](https://github.com/tailwindlabs/tailwindcss/pull/11504))
+- Allow variant to be an at-rule without a prelude ([#11589](https://github.com/tailwindlabs/tailwindcss/pull/11589))
+- Make PostCSS plugin async to improve performance ([#11548](https://github.com/tailwindlabs/tailwindcss/pull/11548))
+- Don’t error when a config file is missing ([f97759f](https://github.com/tailwindlabs/tailwindcss/commit/f97759f808d15ace66647b1405744fcf95a392e5))
+
+### Added
+
+- Add `aria-busy` utility ([#10966](https://github.com/tailwindlabs/tailwindcss/pull/10966))
+
+### Changed
+
+- Reset padding for `<dialog>` elements in preflight ([#11069](https://github.com/tailwindlabs/tailwindcss/pull/11069))
+
+## [3.3.2] - 2023-04-25
+
+### Fixed
+
+- Don’t move unknown pseudo-elements to the end of selectors ([#10943](https://github.com/tailwindlabs/tailwindcss/pull/10943), [#10962](https://github.com/tailwindlabs/tailwindcss/pull/10962))
+- Inherit gradient stop positions when using variants ([#11002](https://github.com/tailwindlabs/tailwindcss/pull/11002))
+- Honor default `to` position of gradient when using implicit transparent colors ([#11002](https://github.com/tailwindlabs/tailwindcss/pull/11002))
+- Ensure `@tailwindcss/oxide` doesn't leak in the stable engine ([#10988](https://github.com/tailwindlabs/tailwindcss/pull/10988))
+- Ensure multiple `theme(spacing[5])` calls with bracket notation in arbitrary properties work ([#11039](https://github.com/tailwindlabs/tailwindcss/pull/11039))
+- Normalize arbitrary modifiers ([#11057](https://github.com/tailwindlabs/tailwindcss/pull/11057))
+
+### Changed
+
+- Drop support for Node.js v12 ([#11089](https://github.com/tailwindlabs/tailwindcss/pull/11089))
+
+## [3.3.1] - 2023-03-30
+
+### Fixed
+
+- Fix edge case bug when loading a TypeScript config file with webpack ([#10898](https://github.com/tailwindlabs/tailwindcss/pull/10898))
+- Fix variant, `@apply`, and `important` selectors when using `:is()` or `:has()` with pseudo-elements ([#10903](https://github.com/tailwindlabs/tailwindcss/pull/10903))
+- Fix `safelist` config types ([#10901](https://github.com/tailwindlabs/tailwindcss/pull/10901))
+- Fix build errors caused by `@tailwindcss/line-clamp` warning ([#10915](https://github.com/tailwindlabs/tailwindcss/pull/10915), [#10919](https://github.com/tailwindlabs/tailwindcss/pull/10919))
+- Fix "process is not defined" error ([#10919](https://github.com/tailwindlabs/tailwindcss/pull/10919))
+
+## [3.3.0] - 2023-03-27
+
+### Added
+
+- Support ESM and TypeScript config files ([#10785](https://github.com/tailwindlabs/tailwindcss/pull/10785))
+- Extend default color palette with new 950 shades ([#10879](https://github.com/tailwindlabs/tailwindcss/pull/10879))
+- Add `line-height` modifier support to `font-size` utilities ([#9875](https://github.com/tailwindlabs/tailwindcss/pull/9875))
+- Add support for using variables as arbitrary values without `var(...)` ([#9880](https://github.com/tailwindlabs/tailwindcss/pull/9880), [#9962](https://github.com/tailwindlabs/tailwindcss/pull/9962))
+- Add logical properties support for inline direction ([#10166](https://github.com/tailwindlabs/tailwindcss/pull/10166))
+- Add `hyphens` utilities ([#10071](https://github.com/tailwindlabs/tailwindcss/pull/10071))
+- Add `from-{position}`, `via-{position}` and `to-{position}` utilities ([#10886](https://github.com/tailwindlabs/tailwindcss/pull/10886))
+- Add `list-style-image` utilities ([#10817](https://github.com/tailwindlabs/tailwindcss/pull/10817))
+- Add `caption-side` utilities ([#10470](https://github.com/tailwindlabs/tailwindcss/pull/10470))
+- Add `line-clamp` utilities from `@tailwindcss/line-clamp` to core ([#10768](https://github.com/tailwindlabs/tailwindcss/pull/10768), [#10876](https://github.com/tailwindlabs/tailwindcss/pull/10876), [#10862](https://github.com/tailwindlabs/tailwindcss/pull/10862))
+- Add `delay-0` and `duration-0` utilities ([#10294](https://github.com/tailwindlabs/tailwindcss/pull/10294))
+- Add `justify-normal` and `justify-stretch` utilities ([#10560](https://github.com/tailwindlabs/tailwindcss/pull/10560))
+- Add `content-normal` and `content-stretch` utilities ([#10645](https://github.com/tailwindlabs/tailwindcss/pull/10645))
+- Add `whitespace-break-spaces` utility ([#10729](https://github.com/tailwindlabs/tailwindcss/pull/10729))
+- Add support for configuring default `font-variation-settings` for a `font-family` ([#10034](https://github.com/tailwindlabs/tailwindcss/pull/10034), [#10515](https://github.com/tailwindlabs/tailwindcss/pull/10515))
+
+### Fixed
+
+- Disallow using multiple selectors in arbitrary variants ([#10655](https://github.com/tailwindlabs/tailwindcss/pull/10655))
+- Sort class lists deterministically for Prettier plugin ([#10672](https://github.com/tailwindlabs/tailwindcss/pull/10672))
+- Ensure CLI builds have a non-zero exit code on failure ([#10703](https://github.com/tailwindlabs/tailwindcss/pull/10703))
+- Ensure module dependencies for value `null`, is an empty `Set` ([#10877](https://github.com/tailwindlabs/tailwindcss/pull/10877))
+- Fix format assumption when resolving module dependencies ([#10878](https://github.com/tailwindlabs/tailwindcss/pull/10878))
+
+### Changed
+
+- Mark `rtl` and `ltr` variants as stable and remove warnings ([#10764](https://github.com/tailwindlabs/tailwindcss/pull/10764))
+- Use `inset` instead of `top`, `right`, `bottom`, and `left` properties ([#10765](https://github.com/tailwindlabs/tailwindcss/pull/10765))
+- Make `dark` and `rtl`/`ltr` variants insensitive to DOM order ([#10766](https://github.com/tailwindlabs/tailwindcss/pull/10766))
+- Use `:is` to make important selector option insensitive to DOM order ([#10835](https://github.com/tailwindlabs/tailwindcss/pull/10835))
+
+## [3.2.7] - 2023-02-16
+
+### Fixed
+
+- Fix use of `:where(.btn)` when matching `!btn` ([#10601](https://github.com/tailwindlabs/tailwindcss/pull/10601))
+- Revert including `outline-color` in `transition` and `transition-colors` by default ([#10604](https://github.com/tailwindlabs/tailwindcss/pull/10604))
+
+## [3.2.6] - 2023-02-08
+
+### Fixed
+
+- Fix installation failing with yarn and pnpm by dropping `oxide-api-shim` ([add1636](https://github.com/tailwindlabs/tailwindcss/commit/add16364b4b1100e1af23ad1ca6900a0b53cbba0))
+
+## [3.2.5] - 2023-02-08
+
+### Added
+
+- Add standalone CLI build for 64-bit Windows on ARM (`node16-win-arm64`) ([#10001](https://github.com/tailwindlabs/tailwindcss/pull/10001))
+
+### Fixed
+
+- Cleanup unused `variantOrder` ([#9829](https://github.com/tailwindlabs/tailwindcss/pull/9829))
+- Fix `foo-[abc]/[def]` not being handled correctly ([#9866](https://github.com/tailwindlabs/tailwindcss/pull/9866))
+- Add container queries plugin to standalone CLI ([#9865](https://github.com/tailwindlabs/tailwindcss/pull/9865))
+- Support renaming of output files by PostCSS plugins in CLI ([#9944](https://github.com/tailwindlabs/tailwindcss/pull/9944))
+- Improve return value of `resolveConfig`, unwrap `ResolvableTo` ([#9972](https://github.com/tailwindlabs/tailwindcss/pull/9972))
+- Clip unbalanced brackets in arbitrary values ([#9973](https://github.com/tailwindlabs/tailwindcss/pull/9973))
+- Don’t reorder webkit scrollbar pseudo elements ([#9991](https://github.com/tailwindlabs/tailwindcss/pull/9991))
+- Deterministic sorting of arbitrary variants ([#10016](https://github.com/tailwindlabs/tailwindcss/pull/10016))
+- Add `data` key to theme types ([#10023](https://github.com/tailwindlabs/tailwindcss/pull/10023))
+- Prevent invalid arbitrary variant selectors from failing the build ([#10059](https://github.com/tailwindlabs/tailwindcss/pull/10059))
+- Properly handle subtraction followed by a variable ([#10074](https://github.com/tailwindlabs/tailwindcss/pull/10074))
+- Fix missing `string[]` in the `theme.dropShadow` types ([#10072](https://github.com/tailwindlabs/tailwindcss/pull/10072))
+- Update list of length units ([#10100](https://github.com/tailwindlabs/tailwindcss/pull/10100))
+- Fix not matching arbitrary properties when closely followed by square brackets ([#10212](https://github.com/tailwindlabs/tailwindcss/pull/10212))
+- Allow direct nesting in `root` or `@layer` nodes ([#10229](https://github.com/tailwindlabs/tailwindcss/pull/10229))
+- Don't prefix classes in arbitrary variants ([#10214](https://github.com/tailwindlabs/tailwindcss/pull/10214))
+- Fix perf regression when checking for changed content ([#10234](https://github.com/tailwindlabs/tailwindcss/pull/10234))
+- Fix missing `blocklist` member in the `Config` type ([#10239](https://github.com/tailwindlabs/tailwindcss/pull/10239))
+- Escape group names in selectors ([#10276](https://github.com/tailwindlabs/tailwindcss/pull/10276))
+- Consider earlier variants before sorting functions ([#10288](https://github.com/tailwindlabs/tailwindcss/pull/10288))
+- Allow variants with slashes ([#10336](https://github.com/tailwindlabs/tailwindcss/pull/10336))
+- Ensure generated CSS is always sorted in the same order for a given set of templates ([#10382](https://github.com/tailwindlabs/tailwindcss/pull/10382))
+- Handle variants when the same class appears multiple times in a selector ([#10397](https://github.com/tailwindlabs/tailwindcss/pull/10397))
+- Handle group/peer variants with quoted strings ([#10400](https://github.com/tailwindlabs/tailwindcss/pull/10400))
+- Parse alpha value from rgba/hsla colors when using variables ([#10429](https://github.com/tailwindlabs/tailwindcss/pull/10429))
+- Sort by `layer` inside `variants` layer ([#10505](https://github.com/tailwindlabs/tailwindcss/pull/10505))
+- Add `--watch=always` option to prevent exit when stdin closes ([#9966](https://github.com/tailwindlabs/tailwindcss/pull/9966))
+
+### Changed
+
+- Alphabetize `theme` keys in default config ([#9953](https://github.com/tailwindlabs/tailwindcss/pull/9953))
+- Update esbuild to v17 ([#10368](https://github.com/tailwindlabs/tailwindcss/pull/10368))
+- Include `outline-color` in `transition` and `transition-colors` utilities ([#10385](https://github.com/tailwindlabs/tailwindcss/pull/10385))
+
+## [3.2.4] - 2022-11-11
+
+### Added
+
+- Add `blocklist` option to prevent generating unwanted CSS ([#9812](https://github.com/tailwindlabs/tailwindcss/pull/9812))
+
+### Fixed
+
+- Fix watching of files on Linux when renames are involved ([#9796](https://github.com/tailwindlabs/tailwindcss/pull/9796))
+- Make sure errors are always displayed when watching for changes ([#9810](https://github.com/tailwindlabs/tailwindcss/pull/9810))
+
+## [3.2.3] - 2022-11-09
+
+### Fixed
+
+- Fixed use of `raw` content in the CLI ([#9773](https://github.com/tailwindlabs/tailwindcss/pull/9773))
+- Pick up changes from files that are both context and content deps ([#9787](https://github.com/tailwindlabs/tailwindcss/pull/9787))
+- Sort pseudo-elements ONLY after classes when using variants and `@apply` ([#9765](https://github.com/tailwindlabs/tailwindcss/pull/9765))
+- Support important utilities in the safelist (pattern must include a `!`) ([#9791](https://github.com/tailwindlabs/tailwindcss/pull/9791))
+
+## [3.2.2] - 2022-11-04
+
+### Fixed
+
+- Escape special characters in resolved content base paths ([#9650](https://github.com/tailwindlabs/tailwindcss/pull/9650))
+- Don't reuse container for array returning variant functions ([#9644](https://github.com/tailwindlabs/tailwindcss/pull/9644))
+- Exclude non-relevant selectors when generating rules with the important modifier ([#9677](https://github.com/tailwindlabs/tailwindcss/issues/9677))
+- Fix merging of arrays during config resolution ([#9706](https://github.com/tailwindlabs/tailwindcss/issues/9706))
+- Ensure configured `font-feature-settings` are included in Preflight ([#9707](https://github.com/tailwindlabs/tailwindcss/pull/9707))
+- Fix fractional values not being parsed properly inside arbitrary properties ([#9705](https://github.com/tailwindlabs/tailwindcss/pull/9705))
+- Fix incorrect selectors when using `@apply` in selectors with combinators and pseudos ([#9722](https://github.com/tailwindlabs/tailwindcss/pull/9722))
+- Fix cannot read properties of undefined (reading 'modifier') ([#9656](https://github.com/tailwindlabs/tailwindcss/pull/9656), [aa979d6](https://github.com/tailwindlabs/tailwindcss/commit/aa979d645f8bf4108c5fc938d7c0ba085b654c31))
+
+## [3.2.1] - 2022-10-21
+
+### Fixed
+
+- Fix missing `supports` in types ([#9616](https://github.com/tailwindlabs/tailwindcss/pull/9616))
+- Fix missing PostCSS dependencies in the CLI ([#9617](https://github.com/tailwindlabs/tailwindcss/pull/9617))
+- Ensure `micromatch` is a proper CLI dependency ([#9620](https://github.com/tailwindlabs/tailwindcss/pull/9620))
+- Ensure modifier values exist when using a `modifiers` object for `matchVariant` ([ba6551d](https://github.com/tailwindlabs/tailwindcss/commit/ba6551db0f2726461371b4f3c6cd4c7090888504))
+
+## [3.2.0] - 2022-10-19
+
+### Added
+
+- Add new `@config` directive ([#9405](https://github.com/tailwindlabs/tailwindcss/pull/9405))
+- Add new `relative: true` option to resolve content paths relative to the config file ([#9396](https://github.com/tailwindlabs/tailwindcss/pull/9396))
+- Add new `supports-*` variant ([#9453](https://github.com/tailwindlabs/tailwindcss/pull/9453))
+- Add new `min-*` and `max-*` variants ([#9558](https://github.com/tailwindlabs/tailwindcss/pull/9558))
+- Add new `aria-*` variants ([#9557](https://github.com/tailwindlabs/tailwindcss/pull/9557), [#9588](https://github.com/tailwindlabs/tailwindcss/pull/9588))
+- Add new `data-*` variants ([#9559](https://github.com/tailwindlabs/tailwindcss/pull/9559), [#9588](https://github.com/tailwindlabs/tailwindcss/pull/9588))
+- Add new `break-keep` utility for `word-break: keep-all` ([#9393](https://github.com/tailwindlabs/tailwindcss/pull/9393))
+- Add new `collapse` utility for `visibility: collapse` ([#9181](https://github.com/tailwindlabs/tailwindcss/pull/9181))
+- Add new `fill-none` utility for `fill: none` ([#9403](https://github.com/tailwindlabs/tailwindcss/pull/9403))
+- Add new `stroke-none` utility for `stroke: none` ([#9403](https://github.com/tailwindlabs/tailwindcss/pull/9403))
+- Add new `place-content-baseline` utility for `place-content: baseline` ([#9498](https://github.com/tailwindlabs/tailwindcss/pull/9498))
+- Add new `place-items-baseline` utility for `place-items: baseline` ([#9507](https://github.com/tailwindlabs/tailwindcss/pull/9507))
+- Add new `content-baseline` utility for `align-content: baseline` ([#9507](https://github.com/tailwindlabs/tailwindcss/pull/9507))
+- Add support for configuring default `font-feature-settings` for a font family ([#9039](https://github.com/tailwindlabs/tailwindcss/pull/9039))
+- Add standalone CLI build for 32-bit Linux on ARM (`node16-linux-armv7`) ([#9084](https://github.com/tailwindlabs/tailwindcss/pull/9084))
+- Add future flag to disable color opacity utility plugins ([#9088](https://github.com/tailwindlabs/tailwindcss/pull/9088))
+- Add negative value support for `outline-offset` ([#9136](https://github.com/tailwindlabs/tailwindcss/pull/9136))
+- Add support for modifiers to `matchUtilities` ([#9541](https://github.com/tailwindlabs/tailwindcss/pull/9541))
+- Allow negating utilities using `min`/`max`/`clamp` ([#9237](https://github.com/tailwindlabs/tailwindcss/pull/9237))
+- Implement fallback plugins when there is ambiguity between plugins when using arbitrary values ([#9376](https://github.com/tailwindlabs/tailwindcss/pull/9376))
+- Support `sort` function in `matchVariant` ([#9423](https://github.com/tailwindlabs/tailwindcss/pull/9423))
+- Upgrade to `postcss-nested` v6.0 ([#9546](https://github.com/tailwindlabs/tailwindcss/pull/9546))
+
+### Fixed
+
+- Use absolute paths when resolving changed files for resilience against working directory changes ([#9032](https://github.com/tailwindlabs/tailwindcss/pull/9032))
+- Fix ring color utility generation when using `respectDefaultRingColorOpacity` ([#9070](https://github.com/tailwindlabs/tailwindcss/pull/9070))
+- Sort tags before classes when `@apply`-ing a selector with joined classes ([#9107](https://github.com/tailwindlabs/tailwindcss/pull/9107))
+- Remove invalid `outline-hidden` utility ([#9147](https://github.com/tailwindlabs/tailwindcss/pull/9147))
+- Honor the `hidden` attribute on elements in preflight ([#9174](https://github.com/tailwindlabs/tailwindcss/pull/9174))
+- Don't stop watching atomically renamed files ([#9173](https://github.com/tailwindlabs/tailwindcss/pull/9173), [#9215](https://github.com/tailwindlabs/tailwindcss/pull/9215))
+- Fix duplicate utilities issue causing memory leaks ([#9208](https://github.com/tailwindlabs/tailwindcss/pull/9208))
+- Fix `fontFamily` config TypeScript types ([#9214](https://github.com/tailwindlabs/tailwindcss/pull/9214))
+- Handle variants on complex selector utilities ([#9262](https://github.com/tailwindlabs/tailwindcss/pull/9262))
+- Fix shared config mutation issue ([#9294](https://github.com/tailwindlabs/tailwindcss/pull/9294))
+- Fix ordering of parallel variants ([#9282](https://github.com/tailwindlabs/tailwindcss/pull/9282))
+- Handle variants in utility selectors using `:where()` and `:has()` ([#9309](https://github.com/tailwindlabs/tailwindcss/pull/9309))
+- Improve data type analysis for arbitrary values ([#9320](https://github.com/tailwindlabs/tailwindcss/pull/9320))
+- Don't emit generated utilities with invalid uses of theme functions ([#9319](https://github.com/tailwindlabs/tailwindcss/pull/9319))
+- Revert change that only listened for stdin close on TTYs ([#9331](https://github.com/tailwindlabs/tailwindcss/pull/9331))
+- Ignore unset values (like `null` or `undefined`) when resolving the classList for intellisense ([#9385](https://github.com/tailwindlabs/tailwindcss/pull/9385))
+- Improve type checking for formal syntax ([#9349](https://github.com/tailwindlabs/tailwindcss/pull/9349), [#9448](https://github.com/tailwindlabs/tailwindcss/pull/9448))
+- Fix incorrect required `content` key in custom plugin configs ([#9502](https://github.com/tailwindlabs/tailwindcss/pull/9502), [#9545](https://github.com/tailwindlabs/tailwindcss/pull/9545))
+- Fix content path detection on Windows ([#9569](https://github.com/tailwindlabs/tailwindcss/pull/9569))
+- Ensure `--content` is used in the CLI when passed ([#9587](https://github.com/tailwindlabs/tailwindcss/pull/9587))
+
+## [3.1.8] - 2022-08-05
+
+### Fixed
+
+- Don’t prefix classes within reused arbitrary variants ([#8992](https://github.com/tailwindlabs/tailwindcss/pull/8992))
+- Fix usage of alpha values inside single-named colors that are functions ([#9008](https://github.com/tailwindlabs/tailwindcss/pull/9008))
+- Fix `@apply` of user utilities when negative and non-negative versions both exist ([#9027](https://github.com/tailwindlabs/tailwindcss/pull/9027))
+
+## [3.1.7] - 2022-07-29
+
+### Fixed
+
+- Don't rewrite source maps for `@layer` rules ([#8971](https://github.com/tailwindlabs/tailwindcss/pull/8971))
+
+### Added
+
+- Added types for `resolveConfig` ([#8924](https://github.com/tailwindlabs/tailwindcss/pull/8924))
+
+## [3.1.6] - 2022-07-11
+
+### Fixed
+
+- Fix usage on Node 12.x ([b4e637e](https://github.com/tailwindlabs/tailwindcss/commit/b4e637e2e096a9d6f2210efba9541f6fd4f28e56))
+- Handle theme keys with slashes when using `theme()` in CSS ([#8831](https://github.com/tailwindlabs/tailwindcss/pull/8831))
+
+## [3.1.5] - 2022-07-07
+
+### Added
+
+- Support configuring a default `font-weight` for each font size utility ([#8763](https://github.com/tailwindlabs/tailwindcss/pull/8763))
+- Add support for alpha values in safe list ([#8774](https://github.com/tailwindlabs/tailwindcss/pull/8774))
+
+### Fixed
+
+- Improve types to support fallback values in the CSS-in-JS syntax used in plugin APIs ([#8762](https://github.com/tailwindlabs/tailwindcss/pull/8762))
+- Support including `tailwindcss` and `autoprefixer` in `postcss.config.js` in standalone CLI ([#8769](https://github.com/tailwindlabs/tailwindcss/pull/8769))
+- Fix using special-characters as prefixes ([#8772](https://github.com/tailwindlabs/tailwindcss/pull/8772))
+- Don’t prefix classes used within arbitrary variants ([#8773](https://github.com/tailwindlabs/tailwindcss/pull/8773))
+- Add more explicit types for the default theme ([#8780](https://github.com/tailwindlabs/tailwindcss/pull/8780))
+
+## [3.1.4] - 2022-06-21
+
+### Fixed
+
+- Provide default to `<alpha-value>` when using `theme()` ([#8652](https://github.com/tailwindlabs/tailwindcss/pull/8652))
+- Detect arbitrary variants with quotes ([#8687](https://github.com/tailwindlabs/tailwindcss/pull/8687))
+- Don’t add spaces around raw `/` that are preceded by numbers ([#8688](https://github.com/tailwindlabs/tailwindcss/pull/8688))
+
+## [3.1.3] - 2022-06-14
+
+### Fixed
+
+- Fix extraction of multi-word utilities with arbitrary values and quotes ([#8604](https://github.com/tailwindlabs/tailwindcss/pull/8604))
+- Fix casing of import of `corePluginList` type definition ([#8587](https://github.com/tailwindlabs/tailwindcss/pull/8587))
+- Ignore PostCSS nodes returned by `addVariant` ([#8608](https://github.com/tailwindlabs/tailwindcss/pull/8608))
+- Fix missing spaces around arithmetic operators ([#8615](https://github.com/tailwindlabs/tailwindcss/pull/8615))
+- Detect alpha value in CSS `theme()` function when using quotes ([#8625](https://github.com/tailwindlabs/tailwindcss/pull/8625))
+- Fix "Maximum call stack size exceeded" bug ([#8636](https://github.com/tailwindlabs/tailwindcss/pull/8636))
+- Allow functions returning parallel variants to mutate the container ([#8622](https://github.com/tailwindlabs/tailwindcss/pull/8622))
+- Remove text opacity CSS variables from `::marker` ([#8622](https://github.com/tailwindlabs/tailwindcss/pull/8622))
+
+## [3.1.2] - 2022-06-10
+
+### Fixed
+
+- Ensure `\` is a valid arbitrary variant token ([#8576](https://github.com/tailwindlabs/tailwindcss/pull/8576))
+- Enable `postcss-import` in the CLI by default in watch mode ([#8574](https://github.com/tailwindlabs/tailwindcss/pull/8574), [#8580](https://github.com/tailwindlabs/tailwindcss/pull/8580))
+
+## [3.1.1] - 2022-06-09
+
+### Fixed
+
+- Fix candidate extractor regression ([#8558](https://github.com/tailwindlabs/tailwindcss/pull/8558))
+- Split `::backdrop` into separate defaults group ([#8567](https://github.com/tailwindlabs/tailwindcss/pull/8567))
+- Fix postcss plugin type ([#8564](https://github.com/tailwindlabs/tailwindcss/pull/8564))
+- Fix class detection in markdown code fences and slim templates ([#8569](https://github.com/tailwindlabs/tailwindcss/pull/8569))
+
+## [3.1.0] - 2022-06-08
+
+### Fixed
+
+- Types: allow for arbitrary theme values (for 3rd party plugins) ([#7926](https://github.com/tailwindlabs/tailwindcss/pull/7926))
+- Don’t split vars with numbers in them inside arbitrary values ([#8091](https://github.com/tailwindlabs/tailwindcss/pull/8091))
+- Require matching prefix when detecting negatives ([#8121](https://github.com/tailwindlabs/tailwindcss/pull/8121))
+- Handle duplicate At Rules without children ([#8122](https://github.com/tailwindlabs/tailwindcss/pull/8122))
+- Allow arbitrary values with commas in `@apply` ([#8125](https://github.com/tailwindlabs/tailwindcss/pull/8125))
+- Fix intellisense for plugins with multiple `@apply` rules ([#8213](https://github.com/tailwindlabs/tailwindcss/pull/8213))
+- Improve type detection for arbitrary color values ([#8201](https://github.com/tailwindlabs/tailwindcss/pull/8201))
+- Support PostCSS config options in config file in CLI ([#8226](https://github.com/tailwindlabs/tailwindcss/pull/8226))
+- Remove default `[hidden]` style in preflight ([#8248](https://github.com/tailwindlabs/tailwindcss/pull/8248))
+- Only check selectors containing base apply candidates for circular dependencies ([#8222](https://github.com/tailwindlabs/tailwindcss/pull/8222))
+- Rewrite default class extractor ([#8204](https://github.com/tailwindlabs/tailwindcss/pull/8204))
+- Move `important` selector to the front when `@apply`-ing selector-modifying variants in custom utilities ([#8313](https://github.com/tailwindlabs/tailwindcss/pull/8313))
+- Error when registering an invalid custom variant ([#8345](https://github.com/tailwindlabs/tailwindcss/pull/8345))
+- Create tailwind.config.cjs file in ESM package when running init ([#8363](https://github.com/tailwindlabs/tailwindcss/pull/8363))
+- Fix `matchVariant` that use at-rules and placeholders ([#8392](https://github.com/tailwindlabs/tailwindcss/pull/8392))
+- Improve types of the `tailwindcss/plugin` ([#8400](https://github.com/tailwindlabs/tailwindcss/pull/8400))
+- Allow returning parallel variants from `addVariant` or `matchVariant` callback functions ([#8455](https://github.com/tailwindlabs/tailwindcss/pull/8455))
+- Try using local `postcss` installation first in the CLI ([#8270](https://github.com/tailwindlabs/tailwindcss/pull/8270))
+- Allow default ring color to be a function ([#7587](https://github.com/tailwindlabs/tailwindcss/pull/7587))
+- Don't inherit `to` value from parent gradients ([#8489](https://github.com/tailwindlabs/tailwindcss/pull/8489))
+- Remove process dependency from log functions ([#8530](https://github.com/tailwindlabs/tailwindcss/pull/8530))
+- Ensure we can use `@import 'tailwindcss/...'` without node_modules ([#8537](https://github.com/tailwindlabs/tailwindcss/pull/8537))
+
+### Changed
+
+- Only apply hover styles when supported (future) ([#8394](https://github.com/tailwindlabs/tailwindcss/pull/8394))
+- Respect default ring color opacity (future) ([#8448](https://github.com/tailwindlabs/tailwindcss/pull/8448), [3f4005e](https://github.com/tailwindlabs/tailwindcss/commit/3f4005e833445f7549219eb5ae89728cbb3a2630))
+
+### Added
+
+- Support PostCSS `Document` nodes ([#7291](https://github.com/tailwindlabs/tailwindcss/pull/7291))
+- Add `text-start` and `text-end` utilities ([#6656](https://github.com/tailwindlabs/tailwindcss/pull/6656))
+- Support customizing class name when using `darkMode: 'class'` ([#5800](https://github.com/tailwindlabs/tailwindcss/pull/5800))
+- Add `--poll` option to the CLI ([#7725](https://github.com/tailwindlabs/tailwindcss/pull/7725))
+- Add new `border-spacing` utilities ([#7102](https://github.com/tailwindlabs/tailwindcss/pull/7102))
+- Add `enabled` variant ([#7905](https://github.com/tailwindlabs/tailwindcss/pull/7905))
+- Add TypeScript types for the `tailwind.config.js` file ([#7891](https://github.com/tailwindlabs/tailwindcss/pull/7891))
+- Add `backdrop` variant ([#7924](https://github.com/tailwindlabs/tailwindcss/pull/7924), [#8526](https://github.com/tailwindlabs/tailwindcss/pull/8526))
+- Add `grid-flow-dense` utility ([#8193](https://github.com/tailwindlabs/tailwindcss/pull/8193))
+- Add `mix-blend-plus-lighter` utility ([#8288](https://github.com/tailwindlabs/tailwindcss/pull/8288))
+- Add arbitrary variants ([#8299](https://github.com/tailwindlabs/tailwindcss/pull/8299))
+- Add experimental `matchVariant` API ([#8310](https://github.com/tailwindlabs/tailwindcss/pull/8310), [34fd0fb8](https://github.com/tailwindlabs/tailwindcss/commit/34fd0fb82aa574cddc5c7aa3ad7d1af5e3735e5d))
+- Add `prefers-contrast` media query variants ([#8410](https://github.com/tailwindlabs/tailwindcss/pull/8410))
+- Add opacity support when referencing colors with `theme` function ([#8416](https://github.com/tailwindlabs/tailwindcss/pull/8416))
+- Add `postcss-import` support to the CLI ([#8437](https://github.com/tailwindlabs/tailwindcss/pull/8437))
+- Add `optional` variant ([#8486](https://github.com/tailwindlabs/tailwindcss/pull/8486))
+- Add `<alpha-value>` placeholder support for custom colors ([#8501](https://github.com/tailwindlabs/tailwindcss/pull/8501))
+
+## [3.0.24] - 2022-04-12
+
+### Fixed
+
+- Prevent nesting plugin from breaking other plugins ([#7563](https://github.com/tailwindlabs/tailwindcss/pull/7563))
+- Recursively collapse adjacent rules ([#7565](https://github.com/tailwindlabs/tailwindcss/pull/7565))
+- Preserve source maps for generated CSS ([#7588](https://github.com/tailwindlabs/tailwindcss/pull/7588))
+- Split box shadows on top-level commas only ([#7479](https://github.com/tailwindlabs/tailwindcss/pull/7479))
+- Use local user CSS cache for `@apply` ([#7524](https://github.com/tailwindlabs/tailwindcss/pull/7524))
+- Invalidate context when main CSS changes ([#7626](https://github.com/tailwindlabs/tailwindcss/pull/7626))
+- Only add `!` to selector class matching template candidate when using important modifier with multi-class selectors ([#7664](https://github.com/tailwindlabs/tailwindcss/pull/7664))
+- Correctly parse and prefix animation names with dots ([#7163](https://github.com/tailwindlabs/tailwindcss/pull/7163))
+- Fix extraction from template literal/function with array ([#7481](https://github.com/tailwindlabs/tailwindcss/pull/7481))
+- Don't output unparsable arbitrary values ([#7789](https://github.com/tailwindlabs/tailwindcss/pull/7789))
+- Fix generation of `div:not(.foo)` if `.foo` is never defined ([#7815](https://github.com/tailwindlabs/tailwindcss/pull/7815))
+- Allow for custom properties in `rgb`, `rgba`, `hsl` and `hsla` colors ([#7933](https://github.com/tailwindlabs/tailwindcss/pull/7933))
+- Remove autoprefixer as explicit peer-dependency to avoid invalid warnings in situations where it isn't actually needed ([#7949](https://github.com/tailwindlabs/tailwindcss/pull/7949))
+- Ensure the `percentage` data type is validated correctly ([#8015](https://github.com/tailwindlabs/tailwindcss/pull/8015))
+- Make sure `font-weight` is inherited by form controls in all browsers ([#8078](https://github.com/tailwindlabs/tailwindcss/pull/8078))
+
+### Changed
+
+- Replace `chalk` with `picocolors` ([#6039](https://github.com/tailwindlabs/tailwindcss/pull/6039))
+- Replace `cosmiconfig` with `lilconfig` ([#6039](https://github.com/tailwindlabs/tailwindcss/pull/6038))
+- Update `cssnano` to avoid removing empty variables when minifying ([#7818](https://github.com/tailwindlabs/tailwindcss/pull/7818))
+
+## [3.0.23] - 2022-02-16
+
+### Fixed
+
+- Remove opacity variables from `:visited` pseudo class ([#7458](https://github.com/tailwindlabs/tailwindcss/pull/7458))
+- Support arbitrary values + calc + theme with quotes ([#7462](https://github.com/tailwindlabs/tailwindcss/pull/7462))
+- Don't duplicate layer output when scanning content with variants + wildcards ([#7478](https://github.com/tailwindlabs/tailwindcss/pull/7478))
+- Implement `getClassOrder` instead of `sortClassList` ([#7459](https://github.com/tailwindlabs/tailwindcss/pull/7459))
+
+## [3.0.22] - 2022-02-11
+
+### Fixed
+
+- Temporarily move `postcss` to dependencies ([#7424](https://github.com/tailwindlabs/tailwindcss/pull/7424))
+
+## [3.0.21] - 2022-02-10
+
+### Fixed
+
+- Move prettier plugin to dev dependencies ([#7418](https://github.com/tailwindlabs/tailwindcss/pull/7418))
+
+## [3.0.20] - 2022-02-10
+
+### Added
+
+- Expose `context.sortClassList(classes)` ([#7412](https://github.com/tailwindlabs/tailwindcss/pull/7412))
+
+## [3.0.19] - 2022-02-07
+
+### Fixed
+
+- Fix preflight border color fallback ([#7288](https://github.com/tailwindlabs/tailwindcss/pull/7288))
+- Correctly parse shadow lengths without a leading zero ([#7289](https://github.com/tailwindlabs/tailwindcss/pull/7289))
+- Don't crash when scanning extremely long class candidates ([#7331](https://github.com/tailwindlabs/tailwindcss/pull/7331))
+- Use less hacky fix for URLs detected as custom properties ([#7275](https://github.com/tailwindlabs/tailwindcss/pull/7275))
+- Correctly generate negative utilities when dash is before the prefix ([#7295](https://github.com/tailwindlabs/tailwindcss/pull/7295))
+- Detect prefixed negative utilities in the safelist ([#7295](https://github.com/tailwindlabs/tailwindcss/pull/7295))
+
+## [3.0.18] - 2022-01-28
+
+### Fixed
+
+- Fix `@apply` order regression (in `addComponents`, `addUtilities`, ...) ([#7232](https://github.com/tailwindlabs/tailwindcss/pull/7232))
+- Quick fix for incorrect arbitrary properties when using URLs ([#7252](https://github.com/tailwindlabs/tailwindcss/pull/7252))
+
+## [3.0.17] - 2022-01-26
+
+### Fixed
+
+- Remove false positive warning in CLI when using the `--content` option ([#7220](https://github.com/tailwindlabs/tailwindcss/pull/7220))
+
+## [3.0.16] - 2022-01-24
+
+### Fixed
+
+- Ensure to transpile the PostCSS Nesting plugin (tailwindcss/nesting) ([#7080](https://github.com/tailwindlabs/tailwindcss/pull/7080))
+- Improve various warnings ([#7118](https://github.com/tailwindlabs/tailwindcss/pull/7118))
+- Fix grammatical mistake ([cca5a38](https://github.com/tailwindlabs/tailwindcss/commit/cca5a3804e1d3ee0214491921e1aec35bf62a813))
+
+## [3.0.15] - 2022-01-15
+
+### Fixed
+
+- Temporarily remove optional chaining in nesting plugin ([#7077](https://github.com/tailwindlabs/tailwindcss/pull/7077))
+
+## [3.0.14] - 2022-01-14
+
+### Added
+
+- Show warnings for invalid content config ([#7065](https://github.com/tailwindlabs/tailwindcss/pull/7065))
+
+### Fixed
+
+- Only emit utility/component variants when those layers exist ([#7066](https://github.com/tailwindlabs/tailwindcss/pull/7066))
+- Ensure nesting plugins can receive options ([#7016](https://github.com/tailwindlabs/tailwindcss/pull/7016))
+
+## [3.0.13] - 2022-01-11
+
+### Fixed
+
+- Fix consecutive builds with at apply producing different CSS ([#6999](https://github.com/tailwindlabs/tailwindcss/pull/6999))
+
+## [3.0.12] - 2022-01-07
+
+### Fixed
+
+- Allow use of falsy values in theme config ([#6917](https://github.com/tailwindlabs/tailwindcss/pull/6917))
+- Ensure we can apply classes that are grouped with non-class selectors ([#6922](https://github.com/tailwindlabs/tailwindcss/pull/6922))
+- Improve standalone CLI compatibility on Linux by switching to the `linuxstatic` build target ([#6914](https://github.com/tailwindlabs/tailwindcss/pull/6914))
+- Ensure `@apply` works consistently with or without `@layer` ([#6938](https://github.com/tailwindlabs/tailwindcss/pull/6938))
+- Only emit defaults when using base layer ([#6926](https://github.com/tailwindlabs/tailwindcss/pull/6926))
+- Emit plugin defaults regardless of usage ([#6926](https://github.com/tailwindlabs/tailwindcss/pull/6926))
+- Move default border color back to preflight ([#6926](https://github.com/tailwindlabs/tailwindcss/pull/6926))
+- Change `experimental.optimizeUniversalDefaults` to only work with `@tailwind base` ([#6926](https://github.com/tailwindlabs/tailwindcss/pull/6926))
+
+## [3.0.11] - 2022-01-05
+
+### Fixed
+
+- Preserve casing of CSS variables added by plugins ([#6888](https://github.com/tailwindlabs/tailwindcss/pull/6888))
+- Ignore content paths that are passed in but don't actually exist ([#6901](https://github.com/tailwindlabs/tailwindcss/pull/6901))
+- Revert change that applies Tailwind's defaults in isolated environments like CSS modules ([9fdc391](https://github.com/tailwindlabs/tailwindcss/commit/9fdc391d4ff93e7e350f5ce439060176b1f0162f))
+
+## [3.0.10] - 2022-01-04
+
+### Fixed
+
+- Fix `@apply` in files without `@tailwind` directives ([#6580](https://github.com/tailwindlabs/tailwindcss/pull/6580), [#6875](https://github.com/tailwindlabs/tailwindcss/pull/6875))
+- CLI: avoid unnecessary writes to output files ([#6550](https://github.com/tailwindlabs/tailwindcss/pull/6550))
+
+### Added
+
+- Allow piping data into the CLI ([#6876](https://github.com/tailwindlabs/tailwindcss/pull/6876))
+
+## [3.0.9] - 2022-01-03
+
+### Fixed
+
+- Improve `DEBUG` flag ([#6797](https://github.com/tailwindlabs/tailwindcss/pull/6797), [#6804](https://github.com/tailwindlabs/tailwindcss/pull/6804))
+- Ensure we can use `<` and `>` characters in modifiers ([#6851](https://github.com/tailwindlabs/tailwindcss/pull/6851))
+- Validate `theme()` works in arbitrary values ([#6852](https://github.com/tailwindlabs/tailwindcss/pull/6852))
+- Properly detect `theme()` value usage in arbitrary properties ([#6854](https://github.com/tailwindlabs/tailwindcss/pull/6854))
+- Improve collapsing of duplicate declarations ([#6856](https://github.com/tailwindlabs/tailwindcss/pull/6856))
+- Remove support for `TAILWIND_MODE=watch` ([#6858](https://github.com/tailwindlabs/tailwindcss/pull/6858))
+
+## [3.0.8] - 2021-12-28
+
+### Fixed
+
+- Reduce specificity of `abbr` rule in preflight ([#6671](https://github.com/tailwindlabs/tailwindcss/pull/6671))
+- Support HSL with hue units in arbitrary values ([#6726](https://github.com/tailwindlabs/tailwindcss/pull/6726))
+- Add `node16-linux-arm64` target for standalone CLI ([#6693](https://github.com/tailwindlabs/tailwindcss/pull/6693))
+
+## [3.0.7] - 2021-12-17
+
+### Fixed
+
+- Don't mutate custom color palette when overriding per-plugin colors ([#6546](https://github.com/tailwindlabs/tailwindcss/pull/6546))
+- Improve circular dependency detection when using `@apply` ([#6588](https://github.com/tailwindlabs/tailwindcss/pull/6588))
+- Only generate variants for non-`user` layers ([#6589](https://github.com/tailwindlabs/tailwindcss/pull/6589))
+- Properly extract classes with arbitrary values in arrays and classes followed by escaped quotes ([#6590](https://github.com/tailwindlabs/tailwindcss/pull/6590))
+- Improve jsx interpolation candidate matching ([#6593](https://github.com/tailwindlabs/tailwindcss/pull/6593))
+- Ensure `@apply` of a rule inside an AtRule works ([#6594](https://github.com/tailwindlabs/tailwindcss/pull/6594))
+
+## [3.0.6] - 2021-12-16
+
+### Fixed
+
+- Support square bracket notation in paths ([#6519](https://github.com/tailwindlabs/tailwindcss/pull/6519))
+- Ensure all plugins are executed for a given candidate ([#6540](https://github.com/tailwindlabs/tailwindcss/pull/6540))
+
+## [3.0.5] - 2021-12-15
+
+### Fixed
+
+- Revert: add `li` to list-style reset ([9777562d](https://github.com/tailwindlabs/tailwindcss/commit/9777562da37ee631bbf77374c0d14825f09ef9af))
+
+## [3.0.4] - 2021-12-15
+
+### Fixed
+
+- Insert always-on defaults layer in correct spot ([#6526](https://github.com/tailwindlabs/tailwindcss/pull/6526))
+
+## [3.0.3] - 2021-12-15
+
+### Added
+
+- Warn about invalid globs in `content` ([#6449](https://github.com/tailwindlabs/tailwindcss/pull/6449))
+- Add standalone tailwindcss CLI ([#6506](https://github.com/tailwindlabs/tailwindcss/pull/6506))
+- Add `li` to list-style reset ([00f60e6](https://github.com/tailwindlabs/tailwindcss/commit/00f60e61013c6e4e3419e4b699371a13eb30b75d))
+
+### Fixed
+
+- Don't output unparsable values ([#6469](https://github.com/tailwindlabs/tailwindcss/pull/6469))
+- Fix text decoration utilities from overriding the new text decoration color/style/thickness utilities when used with a modifier ([#6378](https://github.com/tailwindlabs/tailwindcss/pull/6378))
+- Move defaults to their own always-on layer ([#6500](https://github.com/tailwindlabs/tailwindcss/pull/6500))
+- Support negative values in safelist patterns ([#6480](https://github.com/tailwindlabs/tailwindcss/pull/6480))
+
+## [3.0.2] - 2021-12-13
+
+### Fixed
+
+- Temporarily disable optimize universal defaults, fixes issue with transforms/filters/rings not being `@apply`-able in CSS modules/Svelte components/Vue components ([#6461](https://github.com/tailwindlabs/tailwindcss/pull/6461))
+
+## [3.0.1] - 2021-12-10
+
+### Fixed
+
+- Ensure complex variants with multiple classes work ([#6311](https://github.com/tailwindlabs/tailwindcss/pull/6311))
+- Re-add `default` interop to public available functions ([#6348](https://github.com/tailwindlabs/tailwindcss/pull/6348))
+- Detect circular dependencies when using `@apply` ([#6365](https://github.com/tailwindlabs/tailwindcss/pull/6365))
+- Fix defaults optimization when vendor prefixes are involved ([#6369](https://github.com/tailwindlabs/tailwindcss/pull/6369))
+
+## [3.0.0] - 2021-12-09
+
+### Fixed
+
+- Enforce the order of some variants (like `before` and `after`) ([#6018](https://github.com/tailwindlabs/tailwindcss/pull/6018))
+
+### Added
+
+- Add `placeholder` variant ([#6106](https://github.com/tailwindlabs/tailwindcss/pull/6106))
+- Add composable `touch-action` utilities ([#6115](https://github.com/tailwindlabs/tailwindcss/pull/6115))
+- Add support for "arbitrary properties" ([#6161](https://github.com/tailwindlabs/tailwindcss/pull/6161))
+- Add `portrait` and `landscape` variants ([#6046](https://github.com/tailwindlabs/tailwindcss/pull/6046))
+- Add `text-decoration-style`, `text-decoration-thickness`, and `text-underline-offset` utilities ([#6004](https://github.com/tailwindlabs/tailwindcss/pull/6004))
+- Add `menu` reset to preflight ([#6213](https://github.com/tailwindlabs/tailwindcss/pull/6213))
+- Allow `0` as a valid `length` value ([#6233](https://github.com/tailwindlabs/tailwindcss/pull/6233), [#6259](https://github.com/tailwindlabs/tailwindcss/pull/6259))
+- Add CSS functions to data types ([#6258](https://github.com/tailwindlabs/tailwindcss/pull/6258))
+- Support negative values for `scale-*` utilities ([c48e629](https://github.com/tailwindlabs/tailwindcss/commit/c48e629955585ad18dadba9f470fda59cc448ab7))
+- Improve `length` data type, by validating each value individually ([#6283](https://github.com/tailwindlabs/tailwindcss/pull/6283))
+
+### Changed
+
+- Deprecate `decoration-slice` and `decoration-break` in favor `box-decoration-slice` and `box-decoration-break` _(non-breaking)_ ([#6004](https://github.com/tailwindlabs/tailwindcss/pull/6004))
+
+## [3.0.0-alpha.2] - 2021-11-08
+
+### Changed
+
+- Don't use pointer cursor on disabled buttons by default ([#5772](https://github.com/tailwindlabs/tailwindcss/pull/5772))
+- Set default content value in preflight instead of within each before/after utility ([#5820](https://github.com/tailwindlabs/tailwindcss/pull/5820))
+- Remove `prefix` as a function ([#5829](https://github.com/tailwindlabs/tailwindcss/pull/5829))
+
+### Added
+
+- Add `flex-basis` utilities ([#5671](https://github.com/tailwindlabs/tailwindcss/pull/5671))
+- Make negative values a first-class feature ([#5709](https://github.com/tailwindlabs/tailwindcss/pull/5709))
+- Add `fit-content` values for `min/max-width/height` utilities ([#5638](https://github.com/tailwindlabs/tailwindcss/pull/5638))
+- Add `min/max-content` values for `min/max-height` utilities ([#5729](https://github.com/tailwindlabs/tailwindcss/pull/5729))
+- Add all standard `cursor-*` values by default ([#5734](https://github.com/tailwindlabs/tailwindcss/pull/5734))
+- Add `grow-*` and `shrink-*` utilities, deprecate `flex-grow-*` and `flex-shrink-*` ([#5733](https://github.com/tailwindlabs/tailwindcss/pull/5733))
+- Add `text-decoration-color` utilities ([#5760](https://github.com/tailwindlabs/tailwindcss/pull/5760))
+- Add new declarative `addVariant` API ([#5809](https://github.com/tailwindlabs/tailwindcss/pull/5809))
+- Add first-class `print` variant for targeting printed media ([#5885](https://github.com/tailwindlabs/tailwindcss/pull/5885))
+- Add `outline-style`, `outline-color`, `outline-width` and `outline-offset` utilities ([#5887](https://github.com/tailwindlabs/tailwindcss/pull/5887))
+- Add full color palette for `fill-*` and `stroke-*` utilities (#5933[](https://github.com/tailwindlabs/tailwindcss/pull/5933))
+- Add composable API for colored box shadows ([#5979](https://github.com/tailwindlabs/tailwindcss/pull/5979))
+
+### Fixed
+
+- Configure chokidar's `awaitWriteFinish` setting to avoid occasional stale builds on Windows ([#5774](https://github.com/tailwindlabs/tailwindcss/pull/5774))
+- Fix CLI `--content` option ([#5775](https://github.com/tailwindlabs/tailwindcss/pull/5775))
+- Fix before/after utilities overriding custom content values at larger breakpoints ([#5820](https://github.com/tailwindlabs/tailwindcss/pull/5820))
+- Cleanup duplicate properties ([#5830](https://github.com/tailwindlabs/tailwindcss/pull/5830))
+- Allow `_` inside `url()` when using arbitrary values ([#5853](https://github.com/tailwindlabs/tailwindcss/pull/5853))
+- Prevent crashes when using comments in `@layer` AtRules ([#5854](https://github.com/tailwindlabs/tailwindcss/pull/5854))
+- Handle color transformations properly with `theme(...)` for all relevant plugins ([#4533](https://github.com/tailwindlabs/tailwindcss/pull/4533), [#5871](https://github.com/tailwindlabs/tailwindcss/pull/5871))
+- Ensure `@apply`-ing a utility with multiple definitions works ([#5870](https://github.com/tailwindlabs/tailwindcss/pull/5870))
+
+## [3.0.0-alpha.1] - 2021-10-01
+
+### Changed
+
+- Remove AOT engine, make JIT the default ([#5340](https://github.com/tailwindlabs/tailwindcss/pull/5340))
+- Throw when trying to `@apply` the `group` class ([#4666](https://github.com/tailwindlabs/tailwindcss/pull/4666))
+- Remove dependency on `modern-normalize`, inline and consolidate with Preflight ([#5358](https://github.com/tailwindlabs/tailwindcss/pull/5358))
+- Enable extended color palette by default with updated color names ([#5384](https://github.com/tailwindlabs/tailwindcss/pull/5384))
+- Move `vertical-align` values to config file instead of hard-coding ([#5487](https://github.com/tailwindlabs/tailwindcss/pull/5487))
+- Rename `overflow-clip` to `text-clip` and `overflow-ellipsis` to `text-ellipsis` ([#5630](https://github.com/tailwindlabs/tailwindcss/pull/5630))
+
+### Added
+
+- Add native `aspect-ratio` utilities ([#5359](https://github.com/tailwindlabs/tailwindcss/pull/5359))
+- Unify config callback helpers into single object ([#5382](https://github.com/tailwindlabs/tailwindcss/pull/5382))
+- Preserve original color format when adding opacity whenever possible ([#5154](https://github.com/tailwindlabs/tailwindcss/pull/5154))
+- Add `accent-color` utilities ([#5387](https://github.com/tailwindlabs/tailwindcss/pull/5387))
+- Add `scroll-behavior` utilities ([#5388](https://github.com/tailwindlabs/tailwindcss/pull/5388))
+- Add `will-change` utilities ([#5448](https://github.com/tailwindlabs/tailwindcss/pull/5448))
+- Add `text-indent` utilities ([#5449](https://github.com/tailwindlabs/tailwindcss/pull/5449))
+- Add `column` utilities ([#5457](https://github.com/tailwindlabs/tailwindcss/pull/5457))
+- Add `border-hidden` utility ([#5485](https://github.com/tailwindlabs/tailwindcss/pull/5485))
+- Add `align-sub` and `align-super` utilities by default ([#5486](https://github.com/tailwindlabs/tailwindcss/pull/5486))
+- Add `break-before`, `break-inside` and `break-after` utilities ([#5530](https://github.com/tailwindlabs/tailwindcss/pull/5530))
+- Add `file` variant for `::file-selector-button` pseudo element ([#4936](https://github.com/tailwindlabs/tailwindcss/pull/4936))
+- Add comprehensive arbitrary value support ([#5568](https://github.com/tailwindlabs/tailwindcss/pull/5568))
+- Add `touch-action` utilities ([#5603](https://github.com/tailwindlabs/tailwindcss/pull/5603))
+- Add `inherit` to default color palette ([#5597](https://github.com/tailwindlabs/tailwindcss/pull/5597))
+- Add `overflow-clip`, `overflow-x-clip` and `overflow-y-clip` utilities ([#5630](https://github.com/tailwindlabs/tailwindcss/pull/5630))
+- Add `[open]` variant ([#5627](https://github.com/tailwindlabs/tailwindcss/pull/5627))
+- Add `scroll-snap` utilities ([#5637](https://github.com/tailwindlabs/tailwindcss/pull/5637))
+- Add `border-x` and `border-y` width and color utilities ([#5639](https://github.com/tailwindlabs/tailwindcss/pull/5639))
+
+### Fixed
+
+- Fix defining colors as functions when color opacity plugins are disabled ([#5470](https://github.com/tailwindlabs/tailwindcss/pull/5470))
+- Fix using negated `content` globs ([#5625](https://github.com/tailwindlabs/tailwindcss/pull/5625))
+- Fix using backslashes in `content` globs ([#5628](https://github.com/tailwindlabs/tailwindcss/pull/5628))
+
+## [2.2.19] - 2021-10-29
+
+### Fixed
+
+- Ensure `corePlugins` order is consistent in AOT mode ([#5928](https://github.com/tailwindlabs/tailwindcss/pull/5928))
+
+## [2.2.18] - 2021-10-29
+
+### Fixed
+
+- Bump versions for security vulnerabilities ([#5924](https://github.com/tailwindlabs/tailwindcss/pull/5924))
+
+## [2.2.17] - 2021-10-13
+
+### Fixed
+
+- Configure chokidar's `awaitWriteFinish` setting to avoid occasional stale builds on Windows ([#5758](https://github.com/tailwindlabs/tailwindcss/pull/5758))
+
+## [2.2.16] - 2021-09-26
+
+### Fixed
+
+- JIT: Properly handle animations that use CSS custom properties ([#5602](https://github.com/tailwindlabs/tailwindcss/pull/5602))
+
+## [2.2.15] - 2021-09-10
+
+### Fixed
+
+- Ensure using CLI without `-i` for input file continues to work even though deprecated ([#5464](https://github.com/tailwindlabs/tailwindcss/pull/5464))
+
+## [2.2.14] - 2021-09-08
+
+### Fixed
+
+- Only use `@defaults` in JIT, switch back to `clean-css` in case there's any meaningful differences in the output ([bf248cb](https://github.com/tailwindlabs/tailwindcss/commit/bf248cb0de889d48854fbdd26536f4a492556efd))
+
+## [2.2.13] - 2021-09-08
+
+### Fixed
+
+- Replace `clean-css` with `cssnano` for CDN builds to fix minified builds ([75cc3ca](https://github.com/tailwindlabs/tailwindcss/commit/75cc3ca305aedddc8a85f3df1a420fefad3fb5c4))
+
+## [2.2.12] - 2021-09-08
+
+### Fixed
+
+- Ensure that divide utilities inject a default border color ([#5438](https://github.com/tailwindlabs/tailwindcss/pull/5438))
+
+## [2.2.11] - 2021-09-07
+
+### Fixed
+
+- Rebundle to fix missing CLI peer dependencies
+
+## [2.2.10] - 2021-09-06
+
+### Fixed
+
+- Fix build error when using `presets: []` in config file ([#4903](https://github.com/tailwindlabs/tailwindcss/pull/4903))
+
+### Added
+
+- Reintroduce universal selector optimizations under experimental `optimizeUniversalDefaults` flag ([a9e160c](https://github.com/tailwindlabs/tailwindcss/commit/a9e160cf9acb75a2bbac34f8864568b12940f89a))
+
+## [2.2.9] - 2021-08-30
+
+### Fixed
+
+- JIT: Fix `@apply`ing utilities that contain variants + the important modifier ([#4854](https://github.com/tailwindlabs/tailwindcss/pull/4854))
+- JIT: Don't strip "null" when parsing tracked file paths ([#5008](https://github.com/tailwindlabs/tailwindcss/pull/5008))
+- Pin `clean-css` to v5.1.4 to fix empty CSS variables in CDN builds ([#5338](https://github.com/tailwindlabs/tailwindcss/pull/5338))
+
+## [2.2.8] - 2021-08-27
+
+### Fixed
+
+- Improve accessibility of default link focus styles in Firefox ([#5082](https://github.com/tailwindlabs/tailwindcss/pull/5082))
+- JIT: Fix animation variants corrupting keyframes rules ([#5223](https://github.com/tailwindlabs/tailwindcss/pull/5223))
+- JIT: Ignore escaped commas when splitting selectors to apply prefixes ([#5239](https://github.com/tailwindlabs/tailwindcss/pull/5239/))
+- Nesting: Maintain PostCSS node sources when handling `@apply` ([#5249](https://github.com/tailwindlabs/tailwindcss/pull/5249))
+- JIT: Fix support for animation lists ([#5252](https://github.com/tailwindlabs/tailwindcss/pull/5252))
+- JIT: Fix arbitrary value support for `object-position` utilities ([#5245](https://github.com/tailwindlabs/tailwindcss/pull/5245))
+- CLI: Abort watcher if stdin is closed to avoid zombie processes ([#4997](https://github.com/tailwindlabs/tailwindcss/pull/4997))
+- JIT: Ignore arbitrary values with unbalanced brackets ([#5293](https://github.com/tailwindlabs/tailwindcss/pull/5293))
+
+## [2.2.7] - 2021-07-23
+
+### Fixed
+
+- Temporarily revert runtime performance optimizations introduced in v2.2.5, use universal selector again ([#5060](https://github.com/tailwindlabs/tailwindcss/pull/5060))
+
+## [2.2.6] - 2021-07-21
+
+### Fixed
+
+- Fix issue where base styles not generated for translate transforms in JIT ([#5038](https://github.com/tailwindlabs/tailwindcss/pull/5038))
+
+## [2.2.5] - 2021-07-21
+
+### Added
+
+- Added `self-baseline` utility (I know this is a patch release, no one's going to die relax) ([#5000](https://github.com/tailwindlabs/tailwindcss/pull/5000))
+
+### Changed
+
+- JIT: Optimize universal selector usage by inlining only the relevant selectors ([#4850](https://github.com/tailwindlabs/tailwindcss/pull/4850)))
+
+  This provides a very significant performance boost on pages with a huge number of DOM nodes, but there's a chance it could be a breaking change in very rare edge cases we haven't thought of. Please open an issue if anything related to shadows, rings, transforms, filters, or backdrop-filters seems to be behaving differently after upgrading.
+
+### Fixed
+
+- Fix support for `step-start` and `step-end` in animation utilities ([#4795](https://github.com/tailwindlabs/tailwindcss/pull/4795)))
+- JIT: Prevent presence of `!*` in templates from ruining everything ([#4816](https://github.com/tailwindlabs/tailwindcss/pull/4816)))
+- JIT: Improve support for quotes in arbitrary values ([#4817](https://github.com/tailwindlabs/tailwindcss/pull/4817)))
+- Fix filter/backdrop-filter/transform utilities being inserted into the wrong position if not all core plugins are enabled ([#4852](https://github.com/tailwindlabs/tailwindcss/pull/4852)))
+- JIT: Fix `@layer` rules being mistakenly inserted during incremental rebuilds ([#4853](https://github.com/tailwindlabs/tailwindcss/pull/4853)))
+- Improve build performance for projects with many small non-Tailwind stylesheets ([#4644](https://github.com/tailwindlabs/tailwindcss/pull/4644))
+- Ensure `[hidden]` works as expected on elements where we override the default `display` value in Preflight ([#4873](https://github.com/tailwindlabs/tailwindcss/pull/4873))
+- Fix variant configuration not being applied to `backdropOpacity` utilities ([#4892](https://github.com/tailwindlabs/tailwindcss/pull/4892))
+
+## [2.2.4] - 2021-06-23
+
+### Fixed
+
+- Remove `postinstall` script that was preventing people from installing the library ([1eacfb9](https://github.com/tailwindlabs/tailwindcss/commit/1eacfb98849c0d4737e0af3595ddec8c73addaac))
+
+## [2.2.3] - 2021-06-23
+
+### Added
+
+- Pass extended color palette to theme closures so it can be used without installing Tailwind when using `npx tailwindcss` ([359252c](https://github.com/tailwindlabs/tailwindcss/commit/359252c9b429e81217c28eb3ca7bab73d8f81e6d))
+
+### Fixed
+
+- JIT: Explicitly error when `-` is used as a custom separator ([#4704](https://github.com/tailwindlabs/tailwindcss/pull/4704))
+- JIT: Don't add multiple `~` when stacking `peer-*` variants ([#4757](https://github.com/tailwindlabs/tailwindcss/pull/4757))
+- Remove outdated focus style fix in Preflight ([#4780](https://github.com/tailwindlabs/tailwindcss/pull/4780))
+- Enable `purge` if provided on the CLI ([#4772](https://github.com/tailwindlabs/tailwindcss/pull/4772))
+- JIT: Fix error when not using a config file with postcss-cli ([#4773](https://github.com/tailwindlabs/tailwindcss/pull/4773))
+- Fix issue with `resolveConfig` not being importable in Next.js pages ([#4725](https://github.com/tailwindlabs/tailwindcss/pull/4725))
+
+## [2.2.2] - 2021-06-18
+
+### Fixed
+
+- JIT: Reintroduce `transform`, `filter`, and `backdrop-filter` classes purely to create stacking contexts to minimize the impact of the breaking change ([#4700](https://github.com/tailwindlabs/tailwindcss/pull/4700))
+
+## [2.2.1] - 2021-06-18
+
+### Fixed
+
+- Recover from errors gracefully in CLI watch mode ([#4693](https://github.com/tailwindlabs/tailwindcss/pull/4693))
+- Fix issue with media queries not being generated properly when using PostCSS 7 ([#4695](https://github.com/tailwindlabs/tailwindcss/pull/4695))
+
+## [2.2.0] - 2021-06-17
+
+### Changed
+
+- JIT: Use "tracking" context by default instead of "watching" context for improved reliability with most bundlers ([#4514](https://github.com/tailwindlabs/tailwindcss/pull/4514))
+
+  Depending on which tooling you use, you may need to explicitly set `TAILWIND_MODE=watch` until your build runner has been updated to support PostCSS's `dir-dependency` message type.
+
+### Added
+
+- Add `background-origin` utilities ([#4117](https://github.com/tailwindlabs/tailwindcss/pull/4117))
+- Improve `@apply` performance in projects that process many CSS sources ([#3178](https://github.com/tailwindlabs/tailwindcss/pull/3718))
+- JIT: Don't use CSS variables for color utilities if color opacity utilities are disabled ([#3984](https://github.com/tailwindlabs/tailwindcss/pull/3984))
+- JIT: Redesign `matchUtilities` API to make it more suitable for third-party use ([#4232](https://github.com/tailwindlabs/tailwindcss/pull/4232))
+- JIT: Support applying important utility variants ([#4260](https://github.com/tailwindlabs/tailwindcss/pull/4260))
+- JIT: Support coercing arbitrary values when the type isn't detectable ([#4263](https://github.com/tailwindlabs/tailwindcss/pull/4263))
+- JIT: Support for `raw` syntax in `purge` config ([#4272](https://github.com/tailwindlabs/tailwindcss/pull/4272))
+- Add `empty` variant ([#3298](https://github.com/tailwindlabs/tailwindcss/pull/3298))
+- Update `modern-normalize` to v1.1 ([#4287](https://github.com/tailwindlabs/tailwindcss/pull/4287))
+- Implement `theme` function internally, remove `postcss-functions` dependency ([#4317](https://github.com/tailwindlabs/tailwindcss/pull/4317))
+- Add `screen` function to improve nesting plugin compatibility ([#4318](https://github.com/tailwindlabs/tailwindcss/pull/4318))
+- JIT: Add universal shorthand color opacity syntax ([#4348](https://github.com/tailwindlabs/tailwindcss/pull/4348))
+- JIT: Add `@tailwind variants` directive to replace `@tailwind screens` ([#4356](https://github.com/tailwindlabs/tailwindcss/pull/4356))
+- JIT: Add support for PostCSS `dir-dependency` messages in `TAILWIND_DISABLE_TOUCH` mode ([#4388](https://github.com/tailwindlabs/tailwindcss/pull/4388))
+- JIT: Add per-side border color utilities ([#4404](https://github.com/tailwindlabs/tailwindcss/pull/4404))
+- JIT: Add support for `before` and `after` pseudo-element variants and `content` utilities ([#4461](https://github.com/tailwindlabs/tailwindcss/pull/4461))
+- Add new `transform` and `extract` APIs to simplify PurgeCSS/JIT customization ([#4469](https://github.com/tailwindlabs/tailwindcss/pull/4469))
+- JIT: Add exhaustive pseudo-class and pseudo-element variant support ([#4482](https://github.com/tailwindlabs/tailwindcss/pull/4482))
+- JIT: Add `caret-color` utilities ([#4499](https://github.com/tailwindlabs/tailwindcss/pull/4499))
+- Rename `lightBlue` to `sky`, emit console warning when using deprecated name ([#4513](https://github.com/tailwindlabs/tailwindcss/pull/4513))
+- New CLI with improved JIT support, `--watch` mode, and more ([#4526](https://github.com/tailwindlabs/tailwindcss/pull/4526), [4558](https://github.com/tailwindlabs/tailwindcss/pull/4558))
+- JIT: Add new `peer-*` variants for styling based on sibling state ([#4556](https://github.com/tailwindlabs/tailwindcss/pull/4556))
+- Expose `safelist` as a top-level option under `purge` for both JIT and classic engines ([#4580](https://github.com/tailwindlabs/tailwindcss/pull/4580))
+- JIT: Remove need for `transform` class when using classes like `scale-*`, `rotate-*`, etc. ([#4604](https://github.com/tailwindlabs/tailwindcss/pull/4604))
+- JIT: Remove need for `filter` and `backdrop-filter` classes when using classes like `contrast-*`, `backdrop-blur-*`, etc. ([#4614](https://github.com/tailwindlabs/tailwindcss/pull/4614))
+- Support passing a custom path for your PostCSS configuration in the Tailwind CLI ([#4607](https://github.com/tailwindlabs/tailwindcss/pull/4607))
+- Add `blur-none` by default with intent to deprecate `blur-0` ([#4614](https://github.com/tailwindlabs/tailwindcss/pull/4614))
+
+### Fixed
+
+- JIT: Improve support for Svelte class bindings ([#4187](https://github.com/tailwindlabs/tailwindcss/pull/4187))
+- JIT: Improve support for `calc` and `var` in arbitrary values ([#4147](https://github.com/tailwindlabs/tailwindcss/pull/4147))
+- Convert `hsl` colors to `hsla` when transforming for opacity support instead of `rgba` ([#3850](https://github.com/tailwindlabs/tailwindcss/pull/3850))
+- Fix `backdropBlur` variants not being generated ([#4188](https://github.com/tailwindlabs/tailwindcss/pull/4188))
+- Improve animation value parsing ([#4250](https://github.com/tailwindlabs/tailwindcss/pull/4250))
+- Ignore unknown object types when hashing config ([82f4eaa](https://github.com/tailwindlabs/tailwindcss/commit/82f4eaa6832ef8a4e3fd90869e7068efdf6e34f2))
+- Ensure variants are grouped properly for plugins with order-dependent utilities ([#4273](https://github.com/tailwindlabs/tailwindcss/pull/4273))
+- JIT: Fix temp file storage when node temp directories are kept on a different drive than the project itself ([#4044](https://github.com/tailwindlabs/tailwindcss/pull/4044))
+- Support border-opacity utilities alongside default `border` utility ([#4277](https://github.com/tailwindlabs/tailwindcss/pull/4277))
+- JIT: Fix source maps for expanded `@tailwind` directives ([2f15411](https://github.com/tailwindlabs/tailwindcss/commit/2f1541123dea29d8a2ab0f1411bf60c79eeb96b4))
+- JIT: Ignore whitespace when collapsing adjacent rules ([15642fb](https://github.com/tailwindlabs/tailwindcss/commit/15642fbcc885eba9cc50b7678a922b09c90d6b51))
+- JIT: Generate group parent classes correctly when using custom separator ([#4508](https://github.com/tailwindlabs/tailwindcss/pull/4508))
+- JIT: Fix incorrect stacking of multiple `group` variants ([#4551](https://github.com/tailwindlabs/tailwindcss/pull/4551))
+- JIT: Fix memory leak due to holding on to unused contexts ([#4571](https://github.com/tailwindlabs/tailwindcss/pull/4571))
+
+### Internals
+
+- Add integration tests for popular build runners ([#4354](https://github.com/tailwindlabs/tailwindcss/pull/4354))
+
+## [2.1.4] - 2021-06-02
+
+### Fixed
+
+- Skip `raw` PurgeCSS sources when registering template dependencies ([#4542](https://github.com/tailwindlabs/tailwindcss/pull/4542))
+
+## [2.1.3] - 2021-06-01
+
+### Fixed
+
+- Register PurgeCSS paths as PostCSS dependencies to guarantee proper cache-busting in webpack 5 ([#4530](https://github.com/tailwindlabs/tailwindcss/pull/4530))
+
+## [2.1.2] - 2021-04-23
+
+### Fixed
+
+- Fix issue where JIT engine would generate the wrong CSS when using PostCSS 7 ([#4078](https://github.com/tailwindlabs/tailwindcss/pull/4078))
+
+## [2.1.1] - 2021-04-05
+
+### Fixed
+
+- Fix issue where JIT engine would fail to compile when a source path isn't provided by the build runner for the current input file ([#3978](https://github.com/tailwindlabs/tailwindcss/pull/3978))
+
+## [2.1.0] - 2021-04-05
+
+### Added
+
+- Add alternate JIT engine (in preview) ([#3905](https://github.com/tailwindlabs/tailwindcss/pull/3905))
+- Add new `mix-blend-mode` and `background-blend-mode` utilities ([#3920](https://github.com/tailwindlabs/tailwindcss/pull/3920))
+- Add new `box-decoration-break` utilities ([#3911](https://github.com/tailwindlabs/tailwindcss/pull/3911))
+- Add new `isolation` utilities ([#3914](https://github.com/tailwindlabs/tailwindcss/pull/3914))
+- Add `inline-table` display utility ([#3563](https://github.com/tailwindlabs/tailwindcss/pull/3563))
+- Add `list-item` display utility ([#3929](https://github.com/tailwindlabs/tailwindcss/pull/3929))
+- Add new `filter` and `backdrop-filter` utilities ([#3923](https://github.com/tailwindlabs/tailwindcss/pull/3923))
+
+## [2.0.4] - 2021-03-17
+
+### Fixed
+
+- Pass full `var(--bg-opacity)` value as `opacityValue` when defining colors as functions
+
+## [2.0.3] - 2021-02-07
+
+### Fixed
+
+- Ensure sourcemap input is deterministic when using `@apply` in Vue components ([#3356](https://github.com/tailwindlabs/tailwindcss/pull/3356))
+- Ensure placeholder opacity is consistent across browsers ([#3308](https://github.com/tailwindlabs/tailwindcss/pull/3308))
+- Fix issue where `theme()` didn't work with colors defined as functions ([#2919](https://github.com/tailwindlabs/tailwindcss/pull/2919))
+- Enable `dark` variants by default for color opacity utilities ([#2975](https://github.com/tailwindlabs/tailwindcss/pull/2975))
+
+### Added
+
+- Add support for a `tailwind.config.cjs` file in Node ESM projects ([#3181](https://github.com/tailwindlabs/tailwindcss/pull/3181))
+- Add version comment to Preflight ([#3255](https://github.com/tailwindlabs/tailwindcss/pull/3255))
+- Add `cursor-help` by default ([#3199](https://github.com/tailwindlabs/tailwindcss/pull/3199))
+
+## [2.0.2] - 2020-12-11
+
+### Fixed
+
+- Fix issue with `@apply` not working as expected with `!important` inside an at-rule ([#2824](https://github.com/tailwindlabs/tailwindcss/pull/2824))
+- Fix issue with `@apply` not working as expected with defined classes ([#2832](https://github.com/tailwindlabs/tailwindcss/pull/2832))
+- Fix memory leak, and broken `@apply` when splitting up files ([#3032](https://github.com/tailwindlabs/tailwindcss/pull/3032))
+
+### Added
+
+- Add default values for the `ring` utility ([#2951](https://github.com/tailwindlabs/tailwindcss/pull/2951))
+
+## [2.0.1] - 2020-11-18
+
+- Nothing, just the only thing I could do when I found out npm won't let me publish the same version under two tags.
+
+## [2.0.0] - 2020-11-18
+
+### Added
+
+- Add redesigned color palette ([#2623](https://github.com/tailwindlabs/tailwindcss/pull/2623), [700866c](https://github.com/tailwindlabs/tailwindcss/commit/700866ce5e0c0b8d140be161c4d07fc6f31242bc), [#2633](https://github.com/tailwindlabs/tailwindcss/pull/2633))
+- Add dark mode support ([#2279](https://github.com/tailwindlabs/tailwindcss/pull/2279), [#2631](https://github.com/tailwindlabs/tailwindcss/pull/2631))
+- Add `overflow-ellipsis` and `overflow-clip` utilities ([#1289](https://github.com/tailwindlabs/tailwindcss/pull/1289))
+- Add `transform-gpu` to force hardware acceleration on transforms when desired ([#1380](https://github.com/tailwindlabs/tailwindcss/pull/1380))
+- Extend default spacing scale ([#2630](https://github.com/tailwindlabs/tailwindcss/pull/2630), [7f05204](https://github.com/tailwindlabs/tailwindcss/commit/7f05204ce7a5581b6845591448265c3c21afde86))
+- Add spacing scale to `inset` plugin ([#2630](https://github.com/tailwindlabs/tailwindcss/pull/2630))
+- Add percentage sizes to `translate`, `inset`, and `height` plugins ([#2630](https://github.com/tailwindlabs/tailwindcss/pull/2630), [5259560](https://github.com/tailwindlabs/tailwindcss/commit/525956065272dc53e8f8395f55f9ad13077a38d1))
+- Extend default font size scale ([#2609](https://github.com/tailwindlabs/tailwindcss/pull/2609), [#2619](https://github.com/tailwindlabs/tailwindcss/pull/2619))
+- Support using `@apply` with complex classes, including variants like `lg:hover:bg-blue-500` ([#2159](https://github.com/tailwindlabs/tailwindcss/pull/2159))
+- Add new `2xl` breakpoint at 1536px by default ([#2609](https://github.com/tailwindlabs/tailwindcss/pull/2609))
+- Add default line-height values for font-size utilities ([#2609](https://github.com/tailwindlabs/tailwindcss/pull/2609))
+- Support defining theme values using arrays for CSS properties that support comma separated values ([e13f083c4](https://github.com/tailwindlabs/tailwindcss/commit/e13f083c4bc48bf9870d27c966136a9584943127))
+- Enable `group-hover` for color plugins, `boxShadow`, and `textDecoration` by default ([28985b6](https://github.com/tailwindlabs/tailwindcss/commit/28985b6cd592e72d4849fdb9ce97eb045744e09c), [f6923b1](https://github.com/tailwindlabs/tailwindcss/commit/f6923b1))
+- Enable `focus` for z-index utilities by default ([ae5b3d3](https://github.com/tailwindlabs/tailwindcss/commit/ae5b3d312d5000ae9c2065001f3df7add72dc365))
+- Support `extend` in `variants` configuration ([#2651](https://github.com/tailwindlabs/tailwindcss/pull/2651))
+- Add `max-w-prose` class by default ([#2574](https://github.com/tailwindlabs/tailwindcss/pull/2574))
+- Support flattening deeply nested color objects ([#2148](https://github.com/tailwindlabs/tailwindcss/pull/2148))
+- Support defining presets as functions ([#2680](https://github.com/tailwindlabs/tailwindcss/pull/2680))
+- Support deep merging of objects under `extend` ([#2679](https://github.com/tailwindlabs/tailwindcss/pull/2679), [#2700](https://github.com/tailwindlabs/tailwindcss/pull/2700))
+- Enable `focus-within` for all plugins that have `focus` enabled by default ([1a21f072](https://github.com/tailwindlabs/tailwindcss/commit/1a21f0721c7368d61fa3feef33d616de3f78c7d7), [f6923b1](https://github.com/tailwindlabs/tailwindcss/commit/f6923b1))
+- Added new `ring` utilities for creating outline/focus rings using box shadows ([#2747](https://github.com/tailwindlabs/tailwindcss/pull/2747), [879f088](https://github.com/tailwindlabs/tailwindcss/commit/879f088), [e0788ef](https://github.com/tailwindlabs/tailwindcss/commit/879f088))
+- Added `5` and `95` to opacity scale ([#2747](https://github.com/tailwindlabs/tailwindcss/pull/2747))
+- Add support for default duration and timing function values whenever enabling transitions ([#2755](https://github.com/tailwindlabs/tailwindcss/pull/2755))
+
+### Changed
+
+- Completely redesign color palette ([#2623](https://github.com/tailwindlabs/tailwindcss/pull/2623), [700866c](https://github.com/tailwindlabs/tailwindcss/commit/700866ce5e0c0b8d140be161c4d07fc6f31242bc), [#2633](https://github.com/tailwindlabs/tailwindcss/pull/2633))
+- Drop support for Node 8 and 10 ([#2582](https://github.com/tailwindlabs/tailwindcss/pull/2582))
+- Removed `target` feature and dropped any compatibility with IE 11 ([#2571](https://github.com/tailwindlabs/tailwindcss/pull/2571))
+- Upgrade to PostCSS 8 (but include PostCSS 7 compatibility build) ([729b400](https://github.com/tailwindlabs/tailwindcss/commit/729b400a685973f46af73c8a68b364f20f7c5e1e), [1d8679d](https://github.com/tailwindlabs/tailwindcss/commit/1d8679d37e0eb1ba8281b2076bade5fc754f47dd), [c238ed1](https://github.com/tailwindlabs/tailwindcss/commit/c238ed15b5c02ff51978965511312018f2bc2cae))
+- Removed `shadow-outline`, `shadow-solid`, and `shadow-xs` by default in favor of new `ring` API ([#2747](https://github.com/tailwindlabs/tailwindcss/pull/2747))
+- Switch `normalize.css` to `modern-normalize` ([#2572](https://github.com/tailwindlabs/tailwindcss/pull/2572))
+- Rename `whitespace-no-wrap` to `whitespace-nowrap` ([#2664](https://github.com/tailwindlabs/tailwindcss/pull/2664))
+- Rename `flex-no-wrap` to `flex-nowrap` ([#2676](https://github.com/tailwindlabs/tailwindcss/pull/2676))
+- Remove `clearfix` utility, recommend `flow-root` instead ([#2766](https://github.com/tailwindlabs/tailwindcss/pull/2766))
+- Disable `hover` and `focus` for `fontWeight` utilities by default ([f6923b1](https://github.com/tailwindlabs/tailwindcss/commit/f6923b1))
+- Remove `grid-gap` fallbacks needed for old versions of Safari ([5ec45fa](https://github.com/tailwindlabs/tailwindcss/commit/5ec45fa))
+- Change special use of 'default' in config to 'DEFAULT' ([#2580](https://github.com/tailwindlabs/tailwindcss/pull/2580))
+- New `@apply` implementation, slight backwards incompatibilities with previous behavior ([#2159](https://github.com/tailwindlabs/tailwindcss/pull/2159))
+- Make `theme` retrieve the expected resolved value when theme value is complex ([e13f083c4](https://github.com/tailwindlabs/tailwindcss/commit/e13f083c4bc48bf9870d27c966136a9584943127))
+- Move `truncate` class to `textOverflow` core plugin ([#2562](https://github.com/tailwindlabs/tailwindcss/pull/2562))
+- Remove `scrolling-touch` and `scrolling-auto` utilities ([#2573](https://github.com/tailwindlabs/tailwindcss/pull/2573))
+- Modernize default system font stacks ([#1711](https://github.com/tailwindlabs/tailwindcss/pull/1711))
+- Upgrade to PurgeCSS 3.0 ([8e4e0a0](https://github.com/tailwindlabs/tailwindcss/commit/8e4e0a0eb8dcbf84347c7562988b4f9afd344081))
+- Change default `text-6xl` font-size to 3.75rem instead of 4rem ([#2619](https://github.com/tailwindlabs/tailwindcss/pull/2619))
+- Ignore `[hidden]` elements within `space` and `divide` utilities instead of `template` elements ([#2642](https://github.com/tailwindlabs/tailwindcss/pull/2642))
+- Automatically prefix keyframes and animation names when a prefix is configured ([#2621](https://github.com/tailwindlabs/tailwindcss/pull/2621), [#2641](https://github.com/tailwindlabs/tailwindcss/pull/2641))
+- Merge `extend` objects deeply by default ([#2679](https://github.com/tailwindlabs/tailwindcss/pull/2679))
+- Respect `preserveHtmlElements` option even when using custom PurgeCSS extractor ([#2704](https://github.com/tailwindlabs/tailwindcss/pull/2704))
+- Namespace all internal custom properties under `tw-` to avoid collisions with end-user custom properties ([#2771](https://github.com/tailwindlabs/tailwindcss/pull/2771))
+
+## [2.0.0-alpha.25] - 2020-11-17
+
+### Fixed
+
+- Fix issue where `ring-offset-0` didn't work due to unitless `0` in `calc` function ([3de0c48](https://github.com/tailwindlabs/tailwindcss/commit/3de0c48))
+
+## [2.0.0-alpha.24] - 2020-11-16
+
+### Changed
+
+- Don't override ring color when overriding ring width with a variant ([e40079a](https://github.com/tailwindlabs/tailwindcss/commit/e40079a))
+
+### Fixed
+
+- Prevent shadow/ring styles from cascading to children ([e40079a](https://github.com/tailwindlabs/tailwindcss/commit/e40079a))
+- Ensure rings have a default color even if `colors.blue.500` is not present in config ([e40079a](https://github.com/tailwindlabs/tailwindcss/commit/e40079a))
+
+## [2.0.0-alpha.23] - 2020-11-16
+
+### Added
+
+- Add scripts for generating a PostCSS 7 compatible build alongside PostCSS 8 version ([#2773](https://github.com/tailwindlabs/tailwindcss/pull/2773))
+
+### Changed
+
+- All custom properties have been internally namespaced under `tw-` to avoid collisions with end-user custom properties ([#2771](https://github.com/tailwindlabs/tailwindcss/pull/2771))
+
+## [2.0.0-alpha.22] - 2020-11-16
+
+### Changed
+
+- ~~All custom properties have been internally namespaced under `tw-` to avoid collisions with end-user custom properties ([#2771](https://github.com/tailwindlabs/tailwindcss/pull/2771))~~ I made a git boo-boo, check alpha.23 instead
+
+## [2.0.0-alpha.21] - 2020-11-15
+
+### Changed
+
+- Upgrade to PostCSS 8, Autoprefixer 10, move `postcss` and `autoprefixer` to peerDependencies ([729b400](https://github.com/tailwindlabs/tailwindcss/commit/729b400))
+
+## [2.0.0-alpha.20] - 2020-11-13
+
+### Changed
+
+- Remove `clearfix` utility, recommend `flow-root` instead ([#2766](https://github.com/tailwindlabs/tailwindcss/pull/2766))
+
+## [2.0.0-alpha.19] - 2020-11-13
+
+### Fixed
+
+- Don't crash when color palette is empty ([278c203](https://github.com/tailwindlabs/tailwindcss/commit/278c203))
+
+## [2.0.0-alpha.18] - 2020-11-13
+
+### Changed
+
+- `black` and `white` have been added to `colors.js` ([b3ed724](https://github.com/tailwindlabs/tailwindcss/commit/b3ed724))
+
+### Fixed
+
+- Add support for colors as closures to `ringColor` and `ringOffsetColor`, previously would crash build ([62a47f9](https://github.com/tailwindlabs/tailwindcss/commit/62a47f9))
+
+## [2.0.0-alpha.17] - 2020-11-13
+
+### Changed
+
+- Remove `grid-gap` fallbacks needed for old versions of Safari ([5ec45fa](https://github.com/tailwindlabs/tailwindcss/commit/5ec45fa))
+
+## [2.0.0-alpha.16] - 2020-11-12
+
+### Added
+
+- Enable `focus`, `focus-within`, and `dark` variants (when enabled) for all ring utilities by default ([e0788ef](https://github.com/tailwindlabs/tailwindcss/commit/879f088))
+
+## [2.0.0-alpha.15] - 2020-11-11
+
+### Added
+
+- Added `ring-inset` utility for rendering rings as inset shadows ([879f088](https://github.com/tailwindlabs/tailwindcss/commit/879f088))
+
+### Changed
+
+- `ringWidth` utilities always reset ring styles to ensure no accidental variable inheritance through the cascade ([879f088](https://github.com/tailwindlabs/tailwindcss/commit/879f088))
+
+## [2.0.0-alpha.14] - 2020-11-11
+
+### Added
+
+- Enable `focus-within` for `outline` utilities by default ([f6923b1](https://github.com/tailwindlabs/tailwindcss/commit/f6923b1))
+- Enable `focus-within` for `ringWidth` utilities by default ([f6923b1](https://github.com/tailwindlabs/tailwindcss/commit/f6923b1))
+- Enable `group-hover` for `boxShadow` utilities by default ([f6923b1](https://github.com/tailwindlabs/tailwindcss/commit/f6923b1))
+- Enable `group-hover` and `focus-within` for `textDecoration` utilities by default ([f6923b1](https://github.com/tailwindlabs/tailwindcss/commit/f6923b1))
+
+### Changed
+
+- Disable `hover` and `focus` for `fontWeight` utilities by default ([f6923b1](https://github.com/tailwindlabs/tailwindcss/commit/f6923b1))
+
+## [2.0.0-alpha.13] - 2020-11-11
+
+### Added
+
+- Add support for default duration and timing function values whenever enabling transitions ([#2755](https://github.com/tailwindlabs/tailwindcss/pull/2755))
+
+## [2.0.0-alpha.12] - 2020-11-10
+
+### Fixed
+
+- Prevent `boxShadow` utilities from overriding ring shadows added by components like in the custom forms plugin ([c3dd3b6](https://github.com/tailwindlabs/tailwindcss/commit/c3dd3b68454ad418833a9edf7f3409cad66fb5b0))
+
+## [2.0.0-alpha.11] - 2020-11-09
+
+### Fixed
+
+- Convert `none` to `0 0 #0000` when used for shadows to ensure compatibility with `ring` utilities ([4eecc27](https://github.com/tailwindlabs/tailwindcss/commit/4eecc2751ca0c461e8da5bd5772ae650197a2e5d))
+
+## [2.0.0-alpha.10] - 2020-11-09
+
+### Added
+
+- Added new `ring` utilities ([#2747](https://github.com/tailwindlabs/tailwindcss/pull/2747))
+- Added `5` and `95` to opacity scale ([#2747](https://github.com/tailwindlabs/tailwindcss/pull/2747))
+
+### Changed
+
+- Removed `shadow-outline`, `shadow-solid`, and `shadow-xs` in favor of new `ring` API ([#2747](https://github.com/tailwindlabs/tailwindcss/pull/2747))
+
+## [2.0.0-alpha.9] - 2020-11-07
+
+### Added
+
+- Added `shadow-solid` utility, a 2px solid shadow that uses the current text color ([369cfae](https://github.com/tailwindlabs/tailwindcss/commit/369cfae2905a577033529c46a5e8ca58c69f5623))
+- Enable `focus-within` where useful by default ([1a21f072](https://github.com/tailwindlabs/tailwindcss/commit/1a21f0721c7368d61fa3feef33d616de3f78c7d7))
+
+### Changed
+
+- Update `shadow-outline` to use the new blue ([b078238](https://github.com/tailwindlabs/tailwindcss/commit/b0782385c9832d35a10929b38b4fcaf27e055d6b))
+
+## [2.0.0-alpha.8] - 2020-11-06
+
+### Added
+
+- Add `11` to spacing scale ([7f05204](https://github.com/tailwindlabs/tailwindcss/commit/7f05204ce7a5581b6845591448265c3c21afde86))
+- Add percentage-based height values ([5259560](https://github.com/tailwindlabs/tailwindcss/commit/525956065272dc53e8f8395f55f9ad13077a38d1))
+- Add indigo to the color palette by default ([700866c](https://github.com/tailwindlabs/tailwindcss/commit/700866ce5e0c0b8d140be161c4d07fc6f31242bc))
+
+### Changed
+
+- Use `coolGray` as the default gray ([700866c](https://github.com/tailwindlabs/tailwindcss/commit/700866ce5e0c0b8d140be161c4d07fc6f31242bc))
+
+## [2.0.0-alpha.7] - 2020-11-05
+
+### Changed
+
+- Revert upgrading to PostCSS 8 lol
+
+## [2.0.0-alpha.6] - 2020-11-04
+
+### Changed
+
+- Respect `preserveHtmlElements` option even when using custom PurgeCSS extractor ([#2704](https://github.com/tailwindlabs/tailwindcss/pull/2704))
+- Set font-family and line-height to `inherit` on `body` to behave more like v1.x ([#2729](https://github.com/tailwindlabs/tailwindcss/pull/2729))
+
+## [2.0.0-alpha.5] - 2020-10-30
+
+### Changed
+
+- Upgrade to PostCSS 8 ([59aa484](https://github.com/tailwindlabs/tailwindcss/commit/59aa484dfea0607d96bff6ef41b1150c78576c37))
+
+## [2.0.0-alpha.4] - 2020-10-29
+
+### Added
+
+- Support deep merging of arrays of objects under `extend` ([#2700](https://github.com/tailwindlabs/tailwindcss/pull/2700))
+
+## [2.0.0-alpha.3] - 2020-10-27
+
+### Added
+
+- Support flattening deeply nested color objects ([#2148](https://github.com/tailwindlabs/tailwindcss/pull/2148))
+- Support defining presets as functions ([#2680](https://github.com/tailwindlabs/tailwindcss/pull/2680))
+
+### Changed
+
+- Merge `extend` objects deeply by default ([#2679](https://github.com/tailwindlabs/tailwindcss/pull/2679))
+- Rename `flex-no-wrap` to `flex-nowrap` ([#2676](https://github.com/tailwindlabs/tailwindcss/pull/2676))
+
+## [2.0.0-alpha.2] - 2020-10-25
+
+### Added
+
+- Support `extend` in `variants` configuration ([#2651](https://github.com/tailwindlabs/tailwindcss/pull/2651))
+- Add `max-w-prose` class by default ([#2574](https://github.com/tailwindlabs/tailwindcss/pull/2574))
+
+### Changed
+
+- Revert use of logical properties for `space` and `divide` utilities ([#2644](https://github.com/tailwindlabs/tailwindcss/pull/2644))
+- `space` and `divide` utilities ignore elements with `[hidden]` now instead of only ignoring `template` elements ([#2642](https://github.com/tailwindlabs/tailwindcss/pull/2642))
+- Set default font on `body`, not just `html` ([#2643](https://github.com/tailwindlabs/tailwindcss/pull/2643))
+- Automatically prefix keyframes and animation names when a prefix is configured ([#2621](https://github.com/tailwindlabs/tailwindcss/pull/2621), [#2641](https://github.com/tailwindlabs/tailwindcss/pull/2641))
+- Rename `whitespace-no-wrap` to `whitespace-nowrap` ([#2664](https://github.com/tailwindlabs/tailwindcss/pull/2664))
+
+## [1.9.6] - 2020-10-23
+
+### Changed
+
+- The `presets` feature had unexpected behavior where a preset config without its own `presets` key would not extend the default config. ([#2662](https://github.com/tailwindlabs/tailwindcss/pull/2662))
+
+  If you were depending on this unexpected behavior, just add `presets: []` to your own preset to exclude the default configuration.
+
+## [2.0.0-alpha.1] - 2020-10-20
+
+### Added
+
+- Added dark mode support ([#2279](https://github.com/tailwindlabs/tailwindcss/pull/2279), [#2631](https://github.com/tailwindlabs/tailwindcss/pull/2631))
+- Added `overflow-ellipsis` and `overflow-clip` utilities ([#1289](https://github.com/tailwindlabs/tailwindcss/pull/1289))
+- Add `transform-gpu` to force hardware acceleration on transforms when beneficial ([#1380](https://github.com/tailwindlabs/tailwindcss/pull/1380))
+- Extended spacing scale ([#2630](https://github.com/tailwindlabs/tailwindcss/pull/2630))
+- Add spacing scale to `inset` plugin ([#2630](https://github.com/tailwindlabs/tailwindcss/pull/2630))
+- Enable useful relative sizes for more plugins ([#2630](https://github.com/tailwindlabs/tailwindcss/pull/2630))
+- Extend font size scale ([#2609](https://github.com/tailwindlabs/tailwindcss/pull/2609), [#2619](https://github.com/tailwindlabs/tailwindcss/pull/2619))
+- Support using `@apply` with complex classes ([#2159](https://github.com/tailwindlabs/tailwindcss/pull/2159))
+- Add new `2xl` breakpoint ([#2609](https://github.com/tailwindlabs/tailwindcss/pull/2609))
+- Add default line-height values for font-size utilities ([#2609](https://github.com/tailwindlabs/tailwindcss/pull/2609))
+- Support defining theme values using arrays wherever it makes sense (box-shadow, transition-property, etc.) ([e13f083c4](https://github.com/tailwindlabs/tailwindcss/commit/e13f083c4bc48bf9870d27c966136a9584943127))
+- Enable `group-hover` for color utilities by default ([28985b6](https://github.com/tailwindlabs/tailwindcss/commit/28985b6cd592e72d4849fdb9ce97eb045744e09c))
+- Enable `focus` for z-index utilities by default ([ae5b3d3](https://github.com/tailwindlabs/tailwindcss/commit/ae5b3d312d5000ae9c2065001f3df7add72dc365))
+
+### Changed
+
+- New `@apply` implementation, slight backwards incompatibilities with previous behavior ([#2159](https://github.com/tailwindlabs/tailwindcss/pull/2159))
+- Move `truncate` class to `textOverflow` core plugin ([#2562](https://github.com/tailwindlabs/tailwindcss/pull/2562))
+- Removed `target` feature and dropped any compatibility with IE 11 ([#2571](https://github.com/tailwindlabs/tailwindcss/pull/2571))
+- Switch `normalize.css` to `modern-normalize` ([#2572](https://github.com/tailwindlabs/tailwindcss/pull/2572))
+- Remove `scrolling-touch` and `scrolling-auto` utilities ([#2573](https://github.com/tailwindlabs/tailwindcss/pull/2573))
+- Change special use of 'default' in config to 'DEFAULT' ([#2580](https://github.com/tailwindlabs/tailwindcss/pull/2580))
+- Drop support for Node 8 and 10 ([#2582](https://github.com/tailwindlabs/tailwindcss/pull/2582))
+- Modernize default system font stacks ([#1711](https://github.com/tailwindlabs/tailwindcss/pull/1711))
+- Upgrade to PurgeCSS 3.0
+- ~~Upgrade to PostCSS 8.0~~ Reverted for now
+- Use logical properties for `space` and `divide` utilities ([#1883](https://github.com/tailwindlabs/tailwindcss/pull/1883))
+- Make `theme` retrieve the expected resolved value when theme value is complex ([e13f083c4](https://github.com/tailwindlabs/tailwindcss/commit/e13f083c4bc48bf9870d27c966136a9584943127))
+- Adjust default font-size scale to include 60px instead of 64px ([#2619](https://github.com/tailwindlabs/tailwindcss/pull/2619))
+- Update default colors in Preflight to match new color palette ([#2633](https://github.com/tailwindlabs/tailwindcss/pull/2633))
+
+## [1.9.5] - 2020-10-19
+
+### Fixed
+
+- Fix issue where using `theme` with default line-heights did not resolve correctly
+
+## [1.9.4] - 2020-10-17
+
+### Fixed
+
+- Fix issue changing plugins defined using the `withOptions` API would not trigger rebuilds in watch processes
+
+## [1.9.3] - 2020-10-16
+
+### Fixed
+
+- Fix issue where `tailwindcss init --full` scaffolded a corrupt config file (https://github.com/tailwindlabs/tailwindcss/issues/2556)
+
+### Changed
+
+- Remove console warnings about upcoming breaking changes
+
+## [1.9.2] - 2020-10-14
+
+### Fixed
+
+- Merge plugins when merging config with preset ([#2561](https://github.com/tailwindlabs/tailwindcss/pulls/#2561)
+- Use `word-wrap` and `overflow-wrap` together, not one or the other since `word-wrap` is IE-only
+
+## [1.9.1] - 2020-10-14
+
+### Fixed
+
+- Don't import `corePlugins` in `resolveConfig` to avoid bundling browser-incompatible code ([#2548](https://github.com/tailwindlabs/tailwindcss/pull/2548))
+
+## [1.9.0] - 2020-10-12
+
+### Added
+
+- Add new `presets` config option ([#2474](https://github.com/tailwindlabs/tailwindcss/pull/2474))
+- Scaffold new `tailwind.config.js` files with available `future` flags commented out ([#2379](https://github.com/tailwindlabs/tailwindcss/pull/2379))
+- Add `col-span-full` and `row-span-full` ([#2471](https://github.com/tailwindlabs/tailwindcss/pull/2471))
+- Make `outline` configurable, `outline-none` more accessible by default, and add `outline-black` and `outline-white` ([#2460](https://github.com/tailwindlabs/tailwindcss/pull/2460))
+- Add additional small `rotate` and `skew` values ([#2528](https://github.com/tailwindlabs/tailwindcss/pull/2528))
+- Add `xl`, `2xl`, and `3xl` border radius values ([#2529](https://github.com/tailwindlabs/tailwindcss/pull/2529))
+- Add new utilities for `grid-auto-columns` and `grid-auto-rows` ([#2531](https://github.com/tailwindlabs/tailwindcss/pull/2531))
+- Promote `defaultLineHeights` and `standardFontWeights` from experimental to future
+
+### Fixed
+
+- Don't escape keyframe values ([#2432](https://github.com/tailwindlabs/tailwindcss/pull/2432))
+- Use `word-wrap` instead of `overflow-wrap` in `ie11` target mode ([#2391](https://github.com/tailwindlabs/tailwindcss/pull/2391))
+
+### Experimental
+
+- Add experimental `2xl` breakpoint ([#2468](https://github.com/tailwindlabs/tailwindcss/pull/2468))
+- Rename `{u}-max-content` and `{u}-min-content` utilities to `{u}-max` and `{u}-min` in experimental extended spacing scale ([#2532](https://github.com/tailwindlabs/tailwindcss/pull/2532))
+- Support disabling dark mode variants globally ([#2530](https://github.com/tailwindlabs/tailwindcss/pull/2530))
+
+## [1.8.13] - 2020-10-09
+
+### Fixed
+
+- Support defining colors as closures even when opacity variables are not supported ([#2536](https://github.com/tailwindlabs/tailwindcss/pull/2515))
+
+## [1.8.12] - 2020-10-07
+
+### Fixed
+
+- Reset color opacity variable in utilities generated using closure colors ([#2515](https://github.com/tailwindlabs/tailwindcss/pull/2515))
+
+## [1.8.11] - 2020-10-06
+
+- Make `tailwindcss.plugin` work in ESM environments for reasons
+
+## [1.8.10] - 2020-09-14
+
+### Fixed
+
+- Prevent new `dark` experiment from causing third-party `dark` variants to inherit stacking behavior ([#2382](https://github.com/tailwindlabs/tailwindcss/pull/2382))
+
+## [1.8.9] - 2020-09-13
+
+### Fixed
+
+- Add negative spacing values to inset plugin in the `extendedSpacingScale` experiment ([#2358](https://github.com/tailwindlabs/tailwindcss/pull/2358))
+- Fix issue where `!important` was stripped from declarations within rules that used `@apply` with `applyComplexClasses` ([#2376](https://github.com/tailwindlabs/tailwindcss/pull/2376))
+
+### Changed
+
+- Add `future` section to config stubs ([#2372](https://github.com/tailwindlabs/tailwindcss/pull/2372), [3090b98](https://github.com/tailwindlabs/tailwindcss/commit/3090b98ece766b1046abe5bbaa94204e811f7fac))
+
+## [1.8.8] - 2020-09-11
+
+### Fixed
+
+- Register dark mode plugin outside of `resolveConfig` code path ([#2368](https://github.com/tailwindlabs/tailwindcss/pull/2368))
+
+## [1.8.7] - 2020-09-10
+
+### Fixed
+
+- Fix issue where classes in escaped strings (like `class=\"block\"`) weren't extracted properly for purging ([#2364](https://github.com/tailwindlabs/tailwindcss/pull/2364))
+
+## [1.8.6] - 2020-09-09
+
+### Fixed
+
+- Fix issue where container padding not applied when using object syntax ([#2353](https://github.com/tailwindlabs/tailwindcss/pull/2353))
+
+## [1.8.5] - 2020-09-07
+
+### Fixed
+
+- Fix issue where `resolveConfig` didn't take into account configs added by feature flags ([#2347](https://github.com/tailwindlabs/tailwindcss/pull/2347))
+
+## [1.8.4] - 2020-09-06
+
+### Fixed
+
+- Fix [issue](https://github.com/tailwindlabs/tailwindcss/issues/2258) where inserting extra PurgeCSS control comments could break integrated PurgeCSS support
+- Fix issue where dark variant in 'class' mode was incompatible with 'group-hover' variant ([#2337](https://github.com/tailwindlabs/tailwindcss/pull/2337))
+- Support basic nesting structure with `@apply` when using the `applyComplexClasses` experiment ([#2271](https://github.com/tailwindlabs/tailwindcss/pull/2271))
+
+### Changed
+
+- Rename `font-hairline` and `font-thin` to `font-thin` and `font-extralight` behind `standardFontWeights` flag (experimental until v1.9.0) ([#2333](https://github.com/tailwindlabs/tailwindcss/pull/2333))
+
+## [1.8.3] - 2020-09-05
+
+### Fixed
+
+- Fix issue where `font-variant-numeric` utilities would break in combination with most CSS minifier configurations ([f3660ce](https://github.com/tailwindlabs/tailwindcss/commit/f3660ceed391cfc9390ca4ea1a729a955e64b895))
+- Only warn about `conservative` purge mode being deprecated once per process ([58781b5](https://github.com/tailwindlabs/tailwindcss/commit/58781b517daffbaf80fc5c0791d311f53b2d67d8))
+
+## [1.8.2] - 2020-09-04
+
+### Fixed
+
+- Fix bug where dark mode variants would cause an error if you had a `plugins` array in your config ([#2322](https://github.com/tailwindlabs/tailwindcss/pull/2322))
+
+## [1.8.1] - 2020-09-04
+
+### Fixed
+
+- Fix bug in the new font-variant-numeric utilities which broke the whole rule ([#2318](https://github.com/tailwindlabs/tailwindcss/pull/2318))
+- Fix bug while purging ([#2320](https://github.com/tailwindlabs/tailwindcss/pull/2320))
+
+## [1.8.0] - 2020-09-04
+
+### Added
+
+- Dark mode variant (experimental) ([#2279](https://github.com/tailwindlabs/tailwindcss/pull/2279))
+- New `preserveHtmlElements` option for `purge` ([#2283](https://github.com/tailwindlabs/tailwindcss/pull/2283))
+- New `layers` mode for `purge` ([#2288](https://github.com/tailwindlabs/tailwindcss/pull/2288))
+- New `font-variant-numeric` utilities ([#2305](https://github.com/tailwindlabs/tailwindcss/pull/2305))
+- New `place-items`, `place-content`, `place-self`, `justify-items`, and `justify-self` utilities ([#2306](https://github.com/tailwindlabs/tailwindcss/pull/2306))
+- Support configuring variants as functions ([#2309](https://github.com/tailwindlabs/tailwindcss/pull/2309))
+
+### Changed
+
+- CSS within `@layer` at-rules are now grouped with the corresponding `@tailwind` at-rule ([#2312](https://github.com/tailwindlabs/tailwindcss/pull/2312))
+
+### Deprecated
+
+- `conservative` purge mode, deprecated in favor of `layers`
+
+## [1.7.6] - 2020-08-29
+
+### Fixed
+
+- Fix bug where the new experimental `@apply` implementation broke when applying a variant class with the important option globally enabled
+
+## [1.7.5] - 2020-08-28
+
+### Changed
+
+- Update lodash to latest to silence security warnings
+
+## [1.7.4] - 2020-08-26
+
+### Added
+
+- Add new -p flag to CLI to quickly scaffold a `postcss.config.js` file
+
+### Changed
+
+- Make `@apply` insensitive to whitespace in the new `applyComplexClasses` experiment
+
+### Fixed
+
+- Fix bug where the new `applyComplexClasses` experiment didn't behave as expected with rules with multiple selectors, like `.foo, .bar { color: red }`
+
+## [1.7.3] - 2020-08-20
+
+### Changed
+
+- Log feature flag notices to stderr instead of stdout to preserve compatibility with pipe-based build systems
+- Add missing bg-none utility for disabling background images
+
+### Fixed
+
+- Fix bug that prevented defining colors as closures when the `gradientColorStops` plugin was enabled
+
+## [1.7.2] - 2020-08-19
+
+### Added
+
+- Reuse generated CSS as much as possible in long-running processes instead of needlessly recalculating
+
+## [1.7.1] - 2020-08-28
+
+### Changed
+
+- Don't issue duplicate flag notices in long-running build processes
+
+## [1.7.0] - 2020-08-28
+
+### Added
+
+- Gradients
+- New background-clip utilities
+- New `contents` display utility
+- Default letter-spacing per font-size
+- Divide border styles
+- Access entire config object from plugins
+- Define colors as closures
+- Use `@apply` with variants and other complex classes (experimental)
+- New additional color-palette (experimental)
+- Extended spacing scale (experimental)
+- Default line-heights per font-size by default (experimental)
+- Extended font size scale (experimental)
+
+### Deprecated
+
+- Deprecated gap utilities
+
+## [1.6.3] - 2020-08-18
+
+### Fixed
+
+- Fixes issue where motion-safe and motion-reduce variants didn't stack correctly with group-hover variants
+
+## [1.6.2] - 2020-08-03
+
+### Fixed
+
+- Fixes issue where `@keyframes` respecting the important option would break animations in Chrome
+
+## [1.6.1] - 2020-08-02
+
+### Fixed
+
+- Fixes an issue where animation keyframes weren't included in the build without @tailwind base (#2108)
+
+## [1.6.0] - 2020-07-28
+
+### Added
+
+- Animation support
+- New `prefers-reduced-motion` variants
+- New `overscroll-behaviour` utilities
+- Generate CSS without an input file
+
+## [1.5.2] - 2020-07-21
+
+### Fixed
+
+- Fixes issue where you could no longer use `@apply` with unprefixed class names if you had configured a prefix
+
+## [1.5.1] - 2020-07-15
+
+### Fixed
+
+- Fixes accidental breaking change where adding component variants using the old manual syntax (as recommended in the docs) stopped working
+
+## [1.5.0] - 2020-07-15
+
+### Added
+
+- Component `variants` support
+- Responsive `container` variants
+- New `focus-visible` variant
+- New `checked` variant
+
+## v0.0.0-658250a96 - 2020-07-12 [YANKED]
+
+No release notes
+
+## [1.4.6] - 2020-05-08
+
+### Changed
+
+- Explicitly error when using a class as the important config option instead of just generating the wrong CSS
+
+## [1.4.5] - 2020-05-06
+
+### Fixed
+
+- Fix bug where the `divideColor` plugin was using the wrong '' in IE11 target mode
+
+## [1.4.4] - 2020-05-01
+
+### Fixed
+
+- Fix bug where target: 'browserslist' didn't work, only `target: ['browserslist', {...}]` did
+
+## [1.4.3] - 2020-05-01
+
+### Changed
+
+- Don't generate unnecessary CSS in color plugins when color opacity utilities are disabled
+
+## [1.4.2] - 2020-05-01
+
+### Fixed
+
+- Fix issue where `purge: { enabled: false }` was ignored, add `purge: false` shorthand
+
+## [1.4.1] - 2020-04-30
+
+### Changed
+
+- Improve built-in PurgeCSS extractor to better support Haml and Slim templates
+
+## [1.4.0] - 2020-04-29
+
+### Added
+
+- New color opacity utilities
+- Built-in PurgeCSS
+- IE 11 target mode (experimental)
+
+## [1.3.5] - 2020-04-23
+
+### Removed
+
+- Drop `fs-extra` dependency to `^8.0.0` to preserve Node 8 compatibility until Tailwind 2.0
+
+### Fixed
+
+- Fix missing unit in calc bug in space plugin (`space-x-0` didn't work for example)
+
+## [1.3.4] - 2020-04-21
+
+### Fixed
+
+- Fix bug where `divide-{x/y}-0` utilities didn't work due to missing unit in `calc` call
+
+## [1.3.3] - 2020-04-21
+
+### Added
+
+- Add forgotten responsive variants for `space`, `divideWidth`, and `divideColor` utilities
+
+## [1.3.1] - 2020-04-21
+
+### Fixed
+
+- Fix bug where the `space-x` utilities were not being applied correctly due to referencing `--space-y-reverse` instead of `--space-x-reverse`
+
+## [1.3.0] - 2020-04-21
+
+### Added
+
+- New `space` and `divide` layout utilities
+- New `transition-delay` utilities
+- New `group-focus` variant
+- Support for specifying a default line-height for each font-size utility
+- Support for breakpoint-specific padding for `container` class
+- Added `current` to the default color palette
+- New `inline-grid` utility
+- New `flow-root` display utility
+- New `clear-none` utility
+
+## [1.2.0] - 2020-02-05
+
+### Added
+
+- CSS Transition support
+- CSS Transform support
+- CSS Grid support
+- Added `max-w-{screen}` utilities
+- Added `max-w-none` utility
+- Added `rounded-md` utility
+- Added `shadow-sm` utility
+- Added `shadow-xs` utility
+- Added `stroke-width` utilities
+- Added fixed line-height utilities
+- Added additional display utilities for table elements
+- Added box-sizing utilities
+- Added clear utilities
+- Config file dependencies are now watchable
+- Added new `plugin` and `plugin.withOptions` APIs
+
+### Changed
+
+- Allow plugins to extend the user's config
+
+## [1.2.0-canary.8] - 2020-02-05
+
+### Added
+
+- Add additional fixed-size line-height utilities
+
+## [1.2.0-canary.7] - 2020-02-04
+
+### Removed
+
+- Remove Inter from font-sans, plan to add later under new class
+
+## [1.2.0-canary.6] - 2020-02-03
+
+### Added
+
+- Add system-ui to default font stack
+- Add shadow-xs, increase shadow-sm alpha to 0.05
+- Support import syntax even without postcss-import
+- Alias tailwind bin to tailwindcss
+- Add fill/stroke to transition-colors
+- Add transition-shadow, add box-shadow to default transition
+- Combine gap/columnGap/rowGap
+- Add grid row utilities
+- Add skew utilities
+
+### Changed
+
+- Use font-sans as default font
+
+## [1.2.0-canary.5] - 2020-01-08
+
+### Added
+
+- Adds missing dependency `resolve` which is required for making config dependencies watchable
+
+## [1.2.0-canary.4] - 2020-01-08
+
+### Added
+
+- CSS Transition support
+- CSS Transform support
+- CSS Grid support
+- New `max-w-{screen}` utilities
+- Added `max-w-none` utility
+- Added "Inter" to the default sans-serif font stack
+- Add `rounded-md` utility
+- Add `shadow-sm` utility
+- Added stroke-width utilities
+- Added additional display utilities for table elements
+- Added box-sizing utilities
+- Added clear utilities
+- Config file dependencies are now watchable
+- Allow plugins to extend the user's config
+- Add new `plugin` and `plugin.withOptions` APIs
+
+## [v1.2.0-canary.3] - 2020-01-08 [YANKED]
+
+No release notes
+
+## [1.1.4] - 2019-11-25
+
+### Changed
+
+- Note: Although this is a bugfix it could affect your site if you were working around the bug in your own code by not prefixing the `.group` class. I'm sorry 😞
+
+### Fixed
+
+- Fixes a bug where the `.group` class was not receiving the user's configured prefix when using the `prefix` option
+
+## [1.2.0-canary.1] - 2019-10-22
+
+### Changed
+
+- Don't watch `node_modules` files for changes
+
+### Fixed
+
+- Fixes significant build performance regression in `v1.2.0-canary.0`
+
+## [1.1.3] - 2019-10-22
+
+### Fixed
+
+- Fixes an issue where in some cases function properties in the user's `theme` config didn't receive the second utils argument
+
+## [1.2.0-canary.0] - 2019-10-14
+
+### Added
+
+- Automatically watch all config file dependencies (plugins, design tokens imported from other files, etc.) for changes when build watcher is running
+- Add `justify-evenly` utility
+
+### Changed
+
+- Allow plugins to add their own config file to be resolved with the user's custom config
+
+## [1.1.2] - 2019-08-14
+
+### Fixed
+
+- Fixes a bug with horizontal rules where they were displayed with a 2px border instead of a 1px border
+- Fixes a bug with horizontal rules where they were rendered with default top/bottom margin
+
+## [1.1.1] - 2019-08-09
+
+### Fixed
+
+- Fixes issue where values like `auto` would fail to make it through the default negative margin config
+
+## [1.1.0] - 2019-08-06
+
+### Added
+
+- Added utilities for screenreader visibility
+- Added utilities for placeholder color
+- First, last, even, and odd child variants
+- Disabled variant
+- Visited variant
+- Increase utility specificity using a scope instead of !important
+- Add hover/focus variants for opacity by default
+- Added `border-double` utility
+- Support negative prefix for boxShadow and letterSpacing plugins
+- Support passing config path via object
+
+### Fixed
+
+- Placeholders no longer have a default opacity
+- Make horizontal rules visible by default
+- Generate correct negative margins when using calc
+
+## [1.0.6] - 2019-08-01
+
+### Fixed
+
+- Fixes issue where modifiers would mutate nested rules
+
+## [1.0.5] - 2019-07-11
+
+### Added
+
+- Support built-in variants for utilities that include pseudo-elements
+
+### Changed
+
+- Update several dependencies, including postcss-js which fixes an issue with using `!important` directly in Tailwind utility plugins
+
+## [1.0.4] - 2019-06-11
+
+### Changed
+
+- Increase precision of percentage width values to avoid 1px rounding issues in grid layouts
+
+## [1.0.3] - 2019-06-01
+
+### Changed
+
+- Throws an error when someone tries to use `@tailwind preflight` instead of `@tailwind base`, this is the source of many support requests
+
+## [1.0.2] - 2019-05-27
+
+### Fixed
+
+- Fixes a bug where `@screen` rules weren't bubbled properly when nested in plugins
+
+## [1.0.1] - 2019-05-13
+
+### Fixed
+
+- Fixes a bug where global variants weren't properly merged
+
+## [1.0.0] - 2019-05-13
+
+No release notes
+
+## [1.0.0-beta.10] - 2019-05-12
+
+### Changed
+
+- Use `9999` and `-9999` for `order-last` and `order-first` utilities respectively
+
+## [1.0.0-beta.9] - 2019-05-12
+
+### Added
+
+- Add `bg-repeat-round` and `bg-repeat-space` utilities
+- Add `select-all` and `select-auto` utilities
+
+### Changed
+
+- Make all utilities responsive by default
+
+## [1.0.0-beta.8] - 2019-04-28
+
+### Added
+
+- Adds `responsive` variants for the new order utilities by default, should have been there all along
+
+## [1.0.0-beta.7] - 2019-04-27
+
+### Fixed
+
+- Fixes a bug where you couldn't extend the margin config
+
+## [1.0.0-beta.6] - 2019-04-27
+
+### Added
+
+- Added support for negative inset (`-top-6`, `-right-4`) and z-index (`-z-10`) utilities, using the same negative key syntax supported by the margin plugin
+- Add missing fractions as well as x/12 fractions to width scale
+- Add `order` utilities
+- Add `cursor-text` class by default
+
+### Changed
+
+- Make it possible to access your fully merged config file in JS
+
+### Removed
+
+- Removed `negativeMargin` plugin, now the regular `margin` plugin supports generating negative classes (like `-mx-6`) by using negative keys in the config, like `-6`
+
+## [1.0.0-beta.5] - 2019-04-18
+
+### Changed
+
+- Make it possible to disable all core plugins using `corePlugins: false`
+- Make it possible to configure a single list of variants that applies to all utility plugins
+- Make it possible to safelist which core plugins should be enabled
+
+### Fixed
+
+- Fix a bug where stroke and fill plugins didn't properly handle the next object syntax for color definitions
+- Fix a bug where you couldn't have comments near `@apply` directives
+
+## [1.0.0-beta.4] - 2019-03-29
+
+### Added
+
+- Add the `container` key to the scaffolded config file when generated with `--full`
+
+### Changed
+
+- Bumps node dependency to 8.9.0 so we can keep our default config file clean, 6.9.0 is EOL next month anyways
+
+### Removed
+
+- Removes `SFMono-Regular` from the beginning of the default monospace font stack, it has no italic support and Menlo looks better anyways
+
+### Fixed
+
+- Fixes an issue where the user's config object was being mutated during processing (only affects @bradlc 😅)
+- Fixes an issue where you couldn't use a closure to define theme sections under `extend`
+
+## [1.0.0-beta.3] - 2019-03-18
+
+### Added
+
+- Support lazy evaluation in `theme.extend`
+
+### Changed
+
+- Use lighter default border color
+- Revert #745 and use `bolder` for strong tags by default instead of `fontWeight.bold`
+
+## [1.0.0-beta.2] - 2019-03-17
+
+### Changed
+
+- Closures in the `theme` section of the config file are now passed a `theme` function instead of an object
+
+### Fixed
+
+- Fix issue where `@screen` didn't work at all 🙃
+
+## [1.0.0-beta.1] - 2019-03-17
+
+### Added
+
+- New config file structure
+- New expanded default color palette
+- New default `maxWidth` scale
+- Added utilities for `list-style-type` and `list-style-position`
+- Added `break-all` utility
+
+### Changed
+
+- `object-position` utilities are now customizable under `theme.objectPosition`
+- `cursor` utilities are now customizable under `theme.cursors`
+- `flex-grow/shrink` utilities are now customizable under `theme.flexGrow/flexShrink`
+- Default variant output position can be customized
+- Extended default line-height scale
+- Extended default letter-spacing scale
+
+## [0.7.4] - 2019-01-23
+
+### Changed
+
+- Update our PostCSS related dependencies
+
+### Fixed
+
+- Fix bug where class names containing a `.`character had the responsive prefix added in the wrong place
+
+## [0.7.3] - 2018-12-03
+
+### Changed
+
+- Update Normalize to v8.0.1
+
+## [0.7.2] - 2018-11-05
+
+### Added
+
+- Add `--no-autoprefixer` option to CLI `build` command
+
+## [0.7.1] - 2018-11-05
+
+### Changed
+
+- Update autoprefixer dependency
+
+## [0.7.0] - 2018-10-31
+
+### Added
+
+- Registering new variants from plugins
+- Variant order can be customized per module
+- Added focus-within variant
+- Fancy CLI updates
+- Option to generate config without comments
+- Make configured prefix optional when using @apply
+- Improve Flexbox behavior in IE 10/11
+
+### Changed
+
+- Variant order in modules is now significant
+- Normalize.css updated to v8.0.0
+- Removed CSS fix for Chrome 62 button border radius change
+
+## [0.6.6] - 2018-09-21
+
+### Changed
+
+- Promote `shadowLookup` from experiment to official feature
+
+## [0.6.5] - 2018-08-18
+
+### Fixed
+
+- Fixes an issue where units were stripped from zero value properties
+
+## [0.6.4] - 2018-07-16
+
+### Fixed
+
+- Fixes an issue where changes to your configuration file were ignored when using `webpack --watch`
+
+## [0.6.3] - 2018-07-11
+
+### Fixed
+
+- Fixes an issue where `@tailwind utilities` generated no output
+
+## [0.6.2] - 2018-03-11
+
+### Added
+
+- Added table layout utilities for styling tables
+- Configuration can now be passed as an object
+- Registering new variants from plugins (experimental)
+- Allow `@apply`-ing classes that aren't defined but would be generated (experimental)
+
+### Changed
+
+- Default config file changes
+
+## [0.6.1] - 2018-06-22
+
+### Fixed
+
+- Fix incorrect box-shadow syntax for the `.shadow-outline` utility 🤦‍♂️
+
+## [0.6.0] - 2018-06-21
+
+### Added
+
+- Added border collapse utilities for styling tables
+- Added more axis-specific overflow utilities
+- Added `.outline-none` utility for suppressing focus styles
+- Added `.shadow-outline` utility as an alternative to default browser focus styles
+- Extended default padding, margin, negative margin, width, and height scales
+- Enable focus and hover variants for more modules by default
+
+### Changed
+
+- Removed default `outline: none !important` styles from focusable but keyboard-inaccessible elements
+- Moved screen prefix for responsive `group-hover` variants
+- Default config file changes
+
+## [0.5.3] - 2018-05-07
+
+### Changed
+
+- Improve sourcemaps for replaced styles like `preflight`
+
+### Fixed
+
+- Fix bug where informational messages were being logged to stdout during build, preventing the ability to use Tailwind's output in Unix pipelines
+
+## [0.5.2] - 2018-03-29
+
+### Fixed
+
+- Fixes an issue with a dependency that had a security vulnerability
+
+## [0.5.1] - 2018-03-13
+
+### Removed
+
+- Reverts a change that renamed the `.roman` class to `.not-italic` due to the fact that it breaks compatibility with cssnext: [postcss/postcss-selector-not#10](https://github.com/postcss/postcss-selector-not/issues/10). We'll stick with `.roman` for now with a plan to switch to `.not-italic` in another breaking version should that issue get resolved in postcss-selector-not.
+
+## [0.5.0] - 2018-03-13
+
+### Added
+
+- Plugin system
+- Added `.sticky position` utility
+- Added `.cursor-wait` and `.cursor-move` utilities
+- Added `.bg-auto` background size utility
+- Background sizes are now customizable
+- Support for active variants
+- Better postcss-import support
+- Configuration options for the `.container` component
+
+### Changed
+
+- The `.container` component is now a built-in plugin
+- State variant precedence changes
+- New config file keys
+- `.overflow-x/y-scroll` now set `overflow: scroll` instead of `overflow: auto`
+- `.roman` renamed to `.not-italic`
+
+## [0.4.3] - 2018-03-13
+
+### Changed
+
+- Use `global.Object` to avoid issues with polyfills when importing the Tailwind config into other JS
+
+## [0.4.2] - 2018-03-01
+
+### Added
+
+- Add support for using a function to define class prefixes in addition to a simple string
+
+### Changed
+
+- Improve the performance of @apply by using a lookup table instead of searching
+
+### Fixed
+
+- Fix an issue where borders couldn't be applied to `img` tags without specifying a border style
+
+## [0.4.1] - 2018-01-22
+
+### Changed
+
+- Make default sans-serif font stack more future proof and safe to use with CSS `font` shorthand
+- Replace stylefmt with Perfectionist to avoid weird stylelint conflicts
+
+## [0.4.0] - 2017-12-15
+
+### Added
+
+- `@apply`'d classes can now be made `!important` explicitly
+
+### Changed
+
+- `@apply` now strips `!important` from any mixed in classes
+- Default color palette tweaks
+
+## [0.3.0] - 2017-12-01
+
+### Added
+
+- Enable/disable modules and control which variants are generated for each
+- Focus variants
+- Group hover variants
+- New `@variants` at-rule
+- Customize the separator character
+- Missing config keys now fallback to their default values
+- New utilities
+
+### Changed
+
+- Lists now have no margins by default
+- `.pin` no longer sets width and height to 100%
+- SVG `fill` no longer defaults to currentcolor
+
+## [0.2.2] - 2017-11-19
+
+### Fixed
+
+- Fix issue with dist files not being published due to bug in latest npm
+
+## [0.2.1] - 2017-11-18
+
+### Fixed
+
+- Fix overly specific border-radius reset for Chrome 62 button styles
+
+## [0.2.0] - 2017-11-17
+
+### Added
+
+- Add a custom prefix to all utilities
+- Optionally make all utilities `!important`
+- Round element corners independently
+- Cascading border colors and styles
+
+### Changed
+
+- `auto` is no longer a hard-coded margin value
+- The `defaultConfig` function is now a separate module
+- Rounded utilities now combine position and radius size
+- Border width utilities no longer affect border color/style
+- `@apply` is now very strict about what classes can be applied
+- Add `options` key to your config
+- Spacing, radius, and border width utility declaration order changes
+
+## [0.1.6] - 2017-11-09
+
+### Fixed
+
+- Fix CDN files not being published to npm
+
+## [0.1.5] - 2017-11-08
+
+### Changed
+
+- Apply the same default placeholder styling that's applied to inputs to textareas
+
+### Fixed
+
+- Fix CLI tool not loading config files properly
+
+## [0.1.4] - 2017-11-06
+
+### Added
+
+- Autoprefix dist assets for quick hacking and prototyping
+- Add `my-auto`, `mt-auto`, and `mb-auto` margin utilities
+- Add `sans-serif` to end of default `sans` font stack
+
+### Changed
+
+- If using Webpack, it will now watch your config file changes
+- When running `tailwind init [filename]`, automatically append `.js` to filename if not present
+- Support default fallback value in `config(...)` function, ie. `config('colors.blue', #0000ff)`
+- Don't output empty media queries if Tailwind processes a file that doesn't use Tailwind
+
+### Fixed
+
+- Move list utilities earlier in stylesheet to allow overriding with spacing utilities
+
+## [0.1.3] - 2017-11-02
+
+### Added
+
+- Add new `.scrolling-touch` and `.scrolling-auto` utilities for controlling inertial scroll behavior on WebKit touch devices
+- Generate separate dist files for preflight, utilities, and tailwind for CDN usage
+
+## [0.1.2] - 2017-11-01
+
+### Changed
+
+- Target Node 6.9.0 explicitly (instead of 8.6 implicitly) to support more users
+
+### Fixed
+
+- Fix issue with config option not being respected in `tailwind build`
+
+## [0.1.1] - 2017-11-01
+
+### Fixed
+
+- Fix `tailwind build` CLI command not writing output files
+
+## [0.1.0] - 2017-11-01
+
+### Added
+
+- Everything!
+
+[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v4.3.3...HEAD
+[4.3.3]: https://github.com/tailwindlabs/tailwindcss/compare/v4.3.2...v4.3.3
+[4.3.2]: https://github.com/tailwindlabs/tailwindcss/compare/v4.3.1...v4.3.2
+[4.3.1]: https://github.com/tailwindlabs/tailwindcss/compare/v4.3.0...v4.3.1
+[4.3.0]: https://github.com/tailwindlabs/tailwindcss/compare/v4.2.4...v4.3.0
+[4.2.4]: https://github.com/tailwindlabs/tailwindcss/compare/v4.2.3...v4.2.4
+[4.2.3]: https://github.com/tailwindlabs/tailwindcss/compare/v4.2.2...v4.2.3
+[4.2.2]: https://github.com/tailwindlabs/tailwindcss/compare/v4.2.1...v4.2.2
+[4.2.1]: https://github.com/tailwindlabs/tailwindcss/compare/v4.2.0...v4.2.1
+[4.2.0]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.18...v4.2.0
+[4.1.18]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.17...v4.1.18
+[3.4.19]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.18...v3.4.19
+[4.1.17]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.16...v4.1.17
+[4.1.16]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.15...v4.1.16
+[4.1.15]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.14...v4.1.15
+[4.1.14]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.13...v4.1.14
+[3.4.18]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.17...v3.4.18
+[4.1.13]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.12...v4.1.13
+[4.1.12]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.11...v4.1.12
+[4.1.11]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.10...v4.1.11
+[4.1.10]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.9...v4.1.10
+[4.1.9]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.8...v4.1.9
+[4.1.8]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.7...v4.1.8
+[4.1.7]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.6...v4.1.7
+[4.1.6]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.5...v4.1.6
+[4.1.5]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.4...v4.1.5
+[4.1.4]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.3...v4.1.4
+[4.1.3]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.2...v4.1.3
+[4.1.2]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.1...v4.1.2
+[4.1.1]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.0...v4.1.1
+[4.1.0]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.17...v4.1.0
+[4.0.17]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.16...v4.0.17
+[4.0.16]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.15...v4.0.16
+[4.0.15]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.14...v4.0.15
+[4.0.14]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.13...v4.0.14
+[4.0.13]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.12...v4.0.13
+[4.0.12]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.11...v4.0.12
+[4.0.11]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.10...v4.0.11
+[4.0.10]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.9...v4.0.10
+[4.0.9]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.8...v4.0.9
+[4.0.8]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.7...v4.0.8
+[4.0.7]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.6...v4.0.7
+[4.0.6]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.5...v4.0.6
+[4.0.5]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.4...v4.0.5
+[4.0.4]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.3...v4.0.4
+[4.0.3]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.2...v4.0.3
+[4.0.2]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.1...v4.0.2
+[4.0.1]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0...v4.0.1
+[4.0.0]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-beta.10...v4.0.0
+[4.0.0-beta.10]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-beta.9...v4.0.0-beta.10
+[4.0.0-beta.9]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-beta.8...v4.0.0-beta.9
+[4.0.0-beta.8]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-beta.7...v4.0.0-beta.8
+[4.0.0-beta.7]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-beta.6...v4.0.0-beta.7
+[4.0.0-beta.6]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-beta.5...v4.0.0-beta.6
+[4.0.0-beta.5]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-beta.4...v4.0.0-beta.5
+[4.0.0-beta.4]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-beta.3...v4.0.0-beta.4
+[4.0.0-beta.3]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-beta.2...v4.0.0-beta.3
+[4.0.0-beta.2]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-beta.1...v4.0.0-beta.2
+[4.0.0-beta.1]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.36...v4.0.0-beta.1
+[4.0.0-alpha.36]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.35...v4.0.0-alpha.36
+[4.0.0-alpha.35]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.34...v4.0.0-alpha.35
+[4.0.0-alpha.34]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.33...v4.0.0-alpha.34
+[4.0.0-alpha.33]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.32...v4.0.0-alpha.33
+[4.0.0-alpha.32]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.31...v4.0.0-alpha.32
+[4.0.0-alpha.31]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.30...v4.0.0-alpha.31
+[4.0.0-alpha.30]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.29...v4.0.0-alpha.30
+[4.0.0-alpha.29]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.28...v4.0.0-alpha.29
+[4.0.0-alpha.28]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.27...v4.0.0-alpha.28
+[4.0.0-alpha.27]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.26...v4.0.0-alpha.27
+[4.0.0-alpha.26]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.25...v4.0.0-alpha.26
+[4.0.0-alpha.25]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.24...v4.0.0-alpha.25
+[4.0.0-alpha.24]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.23...v4.0.0-alpha.24
+[4.0.0-alpha.23]: https://github.com/tailwindlabs/tailwindcss/compare/v4.0.0-alpha.22...v4.0.0-alpha.23
+[4.0.0-alpha.22]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.17...v4.0.0-alpha.22
+[3.4.17]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.16...v3.4.17
+[3.4.16]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.15...v3.4.16
+[3.4.15]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.14...v3.4.15
+[3.4.14]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.13...v3.4.14
+[3.4.13]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.12...v3.4.13
+[3.4.12]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.11...v3.4.12
+[3.4.11]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.10...v3.4.11
+[3.4.10]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.9...v3.4.10
+[3.4.9]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.8...v3.4.9
+[3.4.8]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.7...v3.4.8
+[3.4.7]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.6...v3.4.7
+[3.4.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.5...v3.4.6
+[3.4.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.4...v3.4.5
+[3.4.4]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.3...v3.4.4
+[3.4.3]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.2...v3.4.3
+[3.4.2]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.1...v3.4.2
+[3.4.1]: https://github.com/tailwindlabs/tailwindcss/compare/v3.4.0...v3.4.1
+[3.4.0]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.7...v3.4.0
+[3.3.7]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.6...v3.3.7
+[3.3.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.5...v3.3.6
+[3.3.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.4...v3.3.5
+[3.3.4]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.3...v3.3.4
+[3.3.3]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.2...v3.3.3
+[3.3.2]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.1...v3.3.2
+[3.3.1]: https://github.com/tailwindlabs/tailwindcss/compare/v3.3.0...v3.3.1
+[3.3.0]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.7...v3.3.0
+[3.2.7]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.6...v3.2.7
+[3.2.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.5...v3.2.6
+[3.2.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.4...v3.2.5
+[3.2.4]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.3...v3.2.4
+[3.2.3]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.2...v3.2.3
+[3.2.2]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.1...v3.2.2
+[3.2.1]: https://github.com/tailwindlabs/tailwindcss/compare/v3.2.0...v3.2.1
+[3.2.0]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.8...v3.2.0
+[3.1.8]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.7...v3.1.8
+[3.1.7]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.6...v3.1.7
+[3.1.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.5...v3.1.6
+[3.1.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.4...v3.1.5
+[3.1.4]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.3...v3.1.4
+[3.1.3]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.2...v3.1.3
+[3.1.2]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.1...v3.1.2
+[3.1.1]: https://github.com/tailwindlabs/tailwindcss/compare/v3.1.0...v3.1.1
+[3.1.0]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.24...v3.1.0
+[3.0.24]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.23...v3.0.24
+[3.0.23]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.22...v3.0.23
+[3.0.22]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.21...v3.0.22
+[3.0.21]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.20...v3.0.21
+[3.0.20]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.19...v3.0.20
+[3.0.19]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.18...v3.0.19
+[3.0.18]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.17...v3.0.18
+[3.0.17]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.16...v3.0.17
+[3.0.16]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.15...v3.0.16
+[3.0.15]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.14...v3.0.15
+[3.0.14]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.13...v3.0.14
+[3.0.13]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.12...v3.0.13
+[3.0.12]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.11...v3.0.12
+[3.0.11]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.10...v3.0.11
+[3.0.10]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.9...v3.0.10
+[3.0.9]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.8...v3.0.9
+[3.0.8]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.7...v3.0.8
+[3.0.7]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.6...v3.0.7
+[3.0.6]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.5...v3.0.6
+[3.0.5]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.4...v3.0.5
+[3.0.4]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.3...v3.0.4
+[3.0.3]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.2...v3.0.3
+[3.0.2]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.1...v3.0.2
+[3.0.1]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.0...v3.0.1
+[3.0.0]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.0-alpha.2...v3.0.0
+[3.0.0-alpha.2]: https://github.com/tailwindlabs/tailwindcss/compare/v3.0.0-alpha.1...v3.0.0-alpha.2
+[3.0.0-alpha.1]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.19...v3.0.0-alpha.1
+[2.2.19]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.18...v2.2.19
+[2.2.18]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.17...v2.2.18
+[2.2.17]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.16...v2.2.17
+[2.2.16]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.15...v2.2.16
+[2.2.15]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.14...v2.2.15
+[2.2.14]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.13...v2.2.14
+[2.2.13]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.12...v2.2.13
+[2.2.12]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.11...v2.2.12
+[2.2.11]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.10...v2.2.11
+[2.2.10]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.9...v2.2.10
+[2.2.9]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.8...v2.2.9
+[2.2.8]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.7...v2.2.8
+[2.2.7]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.6...v2.2.7
+[2.2.6]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.5...v2.2.6
+[2.2.5]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.4...v2.2.5
+[2.2.4]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.3...v2.2.4
+[2.2.3]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.2...v2.2.3
+[2.2.2]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.1...v2.2.2
+[2.2.1]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.0...v2.2.1
+[2.2.0]: https://github.com/tailwindlabs/tailwindcss/compare/v2.1.4...v2.2.0
+[2.1.4]: https://github.com/tailwindlabs/tailwindcss/compare/v2.1.3...v2.1.4
+[2.1.3]: https://github.com/tailwindlabs/tailwindcss/compare/v2.1.2...v2.1.3
+[2.1.2]: https://github.com/tailwindlabs/tailwindcss/compare/v2.1.1...v2.1.2
+[2.1.1]: https://github.com/tailwindlabs/tailwindcss/compare/v2.1.0...v2.1.1
+[2.1.0]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.4...v2.1.0
+[2.0.4]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.3...v2.0.4
+[2.0.3]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.2...v2.0.3
+[2.0.2]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.1...v2.0.2
+[2.0.1]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0...v2.0.1
+[2.0.0]: https://github.com/tailwindlabs/tailwindcss/compare/v1.9.6...v2.0.0
+[2.0.0-alpha.25]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.24...v2.0.0-alpha.25
+[2.0.0-alpha.24]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.23...v2.0.0-alpha.24
+[2.0.0-alpha.23]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.22...v2.0.0-alpha.23
+[2.0.0-alpha.22]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.21...v2.0.0-alpha.22
+[2.0.0-alpha.21]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.20...v2.0.0-alpha.21
+[2.0.0-alpha.20]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.19...v2.0.0-alpha.20
+[2.0.0-alpha.19]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.18...v2.0.0-alpha.19
+[2.0.0-alpha.18]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.17...v2.0.0-alpha.18
+[2.0.0-alpha.17]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.16...v2.0.0-alpha.17
+[2.0.0-alpha.16]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.15...v2.0.0-alpha.16
+[2.0.0-alpha.15]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.14...v2.0.0-alpha.15
+[2.0.0-alpha.14]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.13...v2.0.0-alpha.14
+[2.0.0-alpha.13]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.12...v2.0.0-alpha.13
+[2.0.0-alpha.12]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.11...v2.0.0-alpha.12
+[2.0.0-alpha.11]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.10...v2.0.0-alpha.11
+[2.0.0-alpha.10]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.9...v2.0.0-alpha.10
+[2.0.0-alpha.9]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.8...v2.0.0-alpha.9
+[2.0.0-alpha.8]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.7...v2.0.0-alpha.8
+[2.0.0-alpha.7]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.6...v2.0.0-alpha.7
+[2.0.0-alpha.6]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.5...v2.0.0-alpha.6
+[2.0.0-alpha.5]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.4...v2.0.0-alpha.5
+[2.0.0-alpha.4]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.3...v2.0.0-alpha.4
+[2.0.0-alpha.3]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.2...v2.0.0-alpha.3
+[2.0.0-alpha.2]: https://github.com/tailwindlabs/tailwindcss/compare/v2.0.0-alpha.1...v2.0.0-alpha.2
+[1.9.6]: https://github.com/tailwindlabs/tailwindcss/compare/v1.9.5...v1.9.6
+[2.0.0-alpha.1]: https://github.com/tailwindlabs/tailwindcss/compare/v1.9.5...v2.0.0-alpha.1
+[1.9.5]: https://github.com/tailwindlabs/tailwindcss/compare/v1.9.4...v1.9.5
+[1.9.4]: https://github.com/tailwindlabs/tailwindcss/compare/v1.9.3...v1.9.4
+[1.9.3]: https://github.com/tailwindlabs/tailwindcss/compare/v1.9.2...v1.9.3
+[1.9.2]: https://github.com/tailwindlabs/tailwindcss/compare/v1.9.1...v1.9.2
+[1.9.1]: https://github.com/tailwindlabs/tailwindcss/compare/v1.9.0...v1.9.1
+[1.9.0]: https://github.com/tailwindlabs/tailwindcss/compare/v1.8.13...v1.9.0
+[1.8.13]: https://github.com/tailwindlabs/tailwindcss/compare/v1.8.12...v1.8.13
+[1.8.12]: https://github.com/tailwindlabs/tailwindcss/compare/v1.8.11...v1.8.12
+[1.8.11]: https://github.com/tailwindlabs/tailwindcss/compare/v1.8.10...v1.8.11
+[1.8.10]: https://github.com/tailwindlabs/tailwindcss/compare/v1.8.9...v1.8.10
+[1.8.9]: https://github.com/tailwindlabs/tailwindcss/compare/v1.8.8...v1.8.9
+[1.8.8]: https://github.com/tailwindlabs/tailwindcss/compare/v1.8.7...v1.8.8
+[1.8.7]: https://github.com/tailwindlabs/tailwindcss/compare/v1.8.6...v1.8.7
+[1.8.6]: https://github.com/tailwindlabs/tailwindcss/compare/v1.8.5...v1.8.6
+[1.8.5]: https://github.com/tailwindlabs/tailwindcss/compare/v1.8.4...v1.8.5
+[1.8.4]: https://github.com/tailwindlabs/tailwindcss/compare/v1.8.3...v1.8.4
+[1.8.3]: https://github.com/tailwindlabs/tailwindcss/compare/v1.8.2...v1.8.3
+[1.8.2]: https://github.com/tailwindlabs/tailwindcss/compare/v1.8.1...v1.8.2
+[1.8.1]: https://github.com/tailwindlabs/tailwindcss/compare/v1.8.0...v1.8.1
+[1.8.0]: https://github.com/tailwindlabs/tailwindcss/compare/v1.7.6...v1.8.0
+[1.7.6]: https://github.com/tailwindlabs/tailwindcss/compare/v1.7.5...v1.7.6
+[1.7.5]: https://github.com/tailwindlabs/tailwindcss/compare/v1.7.4...v1.7.5
+[1.7.4]: https://github.com/tailwindlabs/tailwindcss/compare/v1.7.3...v1.7.4
+[1.7.3]: https://github.com/tailwindlabs/tailwindcss/compare/v1.7.2...v1.7.3
+[1.7.2]: https://github.com/tailwindlabs/tailwindcss/compare/v1.7.1...v1.7.2
+[1.7.1]: https://github.com/tailwindlabs/tailwindcss/compare/v1.7.0...v1.7.1
+[1.7.0]: https://github.com/tailwindlabs/tailwindcss/compare/v1.6.3...v1.7.0
+[1.6.3]: https://github.com/tailwindlabs/tailwindcss/compare/v1.6.2...v1.6.3
+[1.6.2]: https://github.com/tailwindlabs/tailwindcss/compare/v1.6.1...v1.6.2
+[1.6.1]: https://github.com/tailwindlabs/tailwindcss/compare/v1.6.0...v1.6.1
+[1.6.0]: https://github.com/tailwindlabs/tailwindcss/compare/v1.5.2...v1.6.0
+[1.5.2]: https://github.com/tailwindlabs/tailwindcss/compare/v1.5.1...v1.5.2
+[1.5.1]: https://github.com/tailwindlabs/tailwindcss/compare/v1.5.0...v1.5.1
+[1.5.0]: https://github.com/tailwindlabs/tailwindcss/compare/v1.4.6...v1.5.0
+[1.4.6]: https://github.com/tailwindlabs/tailwindcss/compare/v1.4.5...v1.4.6
+[1.4.5]: https://github.com/tailwindlabs/tailwindcss/compare/v1.4.4...v1.4.5
+[1.4.4]: https://github.com/tailwindlabs/tailwindcss/compare/v1.4.3...v1.4.4
+[1.4.3]: https://github.com/tailwindlabs/tailwindcss/compare/v1.4.2...v1.4.3
+[1.4.2]: https://github.com/tailwindlabs/tailwindcss/compare/v1.4.1...v1.4.2
+[1.4.1]: https://github.com/tailwindlabs/tailwindcss/compare/v1.4.0...v1.4.1
+[1.4.0]: https://github.com/tailwindlabs/tailwindcss/compare/v1.3.5...v1.4.0
+[1.3.5]: https://github.com/tailwindlabs/tailwindcss/compare/v1.3.4...v1.3.5
+[1.3.4]: https://github.com/tailwindlabs/tailwindcss/compare/v1.3.3...v1.3.4
+[1.3.3]: https://github.com/tailwindlabs/tailwindcss/compare/v1.3.1...v1.3.3
+[1.3.1]: https://github.com/tailwindlabs/tailwindcss/compare/v1.3.0...v1.3.1
+[1.3.0]: https://github.com/tailwindlabs/tailwindcss/compare/v1.2.0...v1.3.0
+[1.2.0]: https://github.com/tailwindlabs/tailwindcss/compare/v1.1.4...v1.2.0
+[1.2.0-canary.8]: https://github.com/tailwindlabs/tailwindcss/compare/v1.2.0-canary.7...v1.2.0-canary.8
+[1.2.0-canary.7]: https://github.com/tailwindlabs/tailwindcss/compare/v1.2.0-canary.6...v1.2.0-canary.7
+[1.2.0-canary.6]: https://github.com/tailwindlabs/tailwindcss/compare/v1.2.0-canary.5...v1.2.0-canary.6
+[1.2.0-canary.5]: https://github.com/tailwindlabs/tailwindcss/compare/v1.2.0-canary.4...v1.2.0-canary.5
+[1.2.0-canary.4]: https://github.com/tailwindlabs/tailwindcss/compare/v1.2.0-canary.3...v1.2.0-canary.4
+[1.1.4]: https://github.com/tailwindlabs/tailwindcss/compare/v1.1.3...v1.1.4
+[1.2.0-canary.1]: https://github.com/tailwindlabs/tailwindcss/compare/v1.2.0-canary.0...v1.2.0-canary.1
+[1.1.3]: https://github.com/tailwindlabs/tailwindcss/compare/v1.1.2...v1.1.3
+[1.2.0-canary.0]: https://github.com/tailwindlabs/tailwindcss/compare/v1.1.2...v1.2.0-canary.0
+[1.1.2]: https://github.com/tailwindlabs/tailwindcss/compare/v1.1.1...v1.1.2
+[1.1.1]: https://github.com/tailwindlabs/tailwindcss/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.6...v1.1.0
+[1.0.6]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.5...v1.0.6
+[1.0.5]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.4...v1.0.5
+[1.0.4]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.3...v1.0.4
+[1.0.3]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.2...v1.0.3
+[1.0.2]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.1...v1.0.2
+[1.0.1]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.0-beta.10...v1.0.0
+[1.0.0-beta.10]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.0-beta.9...v1.0.0-beta.10
+[1.0.0-beta.9]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.0-beta.8...v1.0.0-beta.9
+[1.0.0-beta.8]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.0-beta.7...v1.0.0-beta.8
+[1.0.0-beta.7]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.0-beta.6...v1.0.0-beta.7
+[1.0.0-beta.6]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.0-beta.5...v1.0.0-beta.6
+[1.0.0-beta.5]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.0-beta.4...v1.0.0-beta.5
+[1.0.0-beta.4]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.0-beta.3...v1.0.0-beta.4
+[1.0.0-beta.3]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.0-beta.2...v1.0.0-beta.3
+[1.0.0-beta.2]: https://github.com/tailwindlabs/tailwindcss/compare/v1.0.0-beta.1...v1.0.0-beta.2
+[1.0.0-beta.1]: https://github.com/tailwindlabs/tailwindcss/compare/v0.7.4...v1.0.0-beta.1
+[0.7.4]: https://github.com/tailwindlabs/tailwindcss/compare/v0.7.3...v0.7.4
+[0.7.3]: https://github.com/tailwindlabs/tailwindcss/compare/v0.7.2...v0.7.3
+[0.7.2]: https://github.com/tailwindlabs/tailwindcss/compare/v0.7.1...v0.7.2
+[0.7.1]: https://github.com/tailwindlabs/tailwindcss/compare/v0.7.0...v0.7.1
+[0.7.0]: https://github.com/tailwindlabs/tailwindcss/compare/v0.6.6...v0.7.0
+[0.6.6]: https://github.com/tailwindlabs/tailwindcss/compare/v0.6.5...v0.6.6
+[0.6.5]: https://github.com/tailwindlabs/tailwindcss/compare/v0.6.4...v0.6.5
+[0.6.4]: https://github.com/tailwindlabs/tailwindcss/compare/v0.6.3...v0.6.4
+[0.6.3]: https://github.com/tailwindlabs/tailwindcss/compare/v0.6.2...v0.6.3
+[0.6.2]: https://github.com/tailwindlabs/tailwindcss/compare/v0.6.1...v0.6.2
+[0.6.1]: https://github.com/tailwindlabs/tailwindcss/compare/v0.6.0...v0.6.1
+[0.6.0]: https://github.com/tailwindlabs/tailwindcss/compare/v0.5.3...v0.6.0
+[0.5.3]: https://github.com/tailwindlabs/tailwindcss/compare/v0.5.2...v0.5.3
+[0.5.2]: https://github.com/tailwindlabs/tailwindcss/compare/v0.5.1...v0.5.2
+[0.5.1]: https://github.com/tailwindlabs/tailwindcss/compare/v0.5.0...v0.5.1
+[0.5.0]: https://github.com/tailwindlabs/tailwindcss/compare/v0.4.3...v0.5.0
+[0.4.3]: https://github.com/tailwindlabs/tailwindcss/compare/v0.4.2...v0.4.3
+[0.4.2]: https://github.com/tailwindlabs/tailwindcss/compare/v0.4.1...v0.4.2
+[0.4.1]: https://github.com/tailwindlabs/tailwindcss/compare/v0.4.0...v0.4.1
+[0.4.0]: https://github.com/tailwindlabs/tailwindcss/compare/v0.3.0...v0.4.0
+[0.3.0]: https://github.com/tailwindlabs/tailwindcss/compare/v0.2.2...v0.3.0
+[0.2.2]: https://github.com/tailwindlabs/tailwindcss/compare/v0.2.1...v0.2.2
+[0.2.1]: https://github.com/tailwindlabs/tailwindcss/compare/v0.2.0...v0.2.1
+[0.2.0]: https://github.com/tailwindlabs/tailwindcss/compare/v0.1.6...v0.2.0
+[0.1.6]: https://github.com/tailwindlabs/tailwindcss/compare/v0.1.5...v0.1.6
+[0.1.5]: https://github.com/tailwindlabs/tailwindcss/compare/v0.1.4...v0.1.5
+[0.1.4]: https://github.com/tailwindlabs/tailwindcss/compare/v0.1.3...v0.1.4
+[0.1.3]: https://github.com/tailwindlabs/tailwindcss/compare/v0.1.2...v0.1.3
+[0.1.2]: https://github.com/tailwindlabs/tailwindcss/compare/v0.1.1...v0.1.2
+[0.1.1]: https://github.com/tailwindlabs/tailwindcss/compare/v0.1.0...v0.1.1
+[0.1.0]: https://github.com/tailwindlabs/tailwindcss/releases/tag/v0.1.0
diff --git a/Cargo.lock b/Cargo.lock
index eb9602407..73fd9e995 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aho-corasick"
@@ -11,6 +11,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
 [[package]]
 name = "bexpand"
 version = "1.2.0"
@@ -29,12 +35,12 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "bstr"
-version = "1.10.0"
+version = "1.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
+checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
 dependencies = [
  "memchr",
- "regex-automata 0.4.8",
+ "regex-automata 0.4.18",
  "serde",
 ]
 
@@ -45,32 +51,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "convert_case"
-version = "0.6.0"
+name = "classification-macros"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "console"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+checksum = "4fe5f465a4f6fee88fad41b85d990f84c835335e85b5d9e6e63e0d06d28cba7c"
+dependencies = [
+ "encode_unicode",
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "affbf0190ed2caf063e3def54ff444b449371d55c58e513a95ab98eca50adb49"
 dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "crossbeam"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.13"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -94,15 +107,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.20"
@@ -111,13 +115,15 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "ctor"
-version = "0.2.1"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "990a40740adf249724a6000c0fc4bd574712f50bb17c2d6f6cec837ae2f0ee75"
-dependencies = [
- "quote",
- "syn",
-]
+checksum = "2d83cb7e7a873830708d6b02a78cd36a592c6fa14bf267b68725103b85c0d77f"
+
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 
 [[package]]
 name = "dunce"
@@ -131,6 +137,12 @@ version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
+[[package]]
+name = "encode_unicode"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+
 [[package]]
 name = "errno"
 version = "0.3.9"
@@ -141,6 +153,15 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "fast-glob"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eca69ef247d19faa15ac0156968637440824e5ff22baa5ee0cd35b2f7ea6a0f"
+dependencies = [
+ "arrayvec",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.1.1"
@@ -148,21 +169,103 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
 [[package]]
-name = "glob-match"
-version = "0.2.1"
+name = "futures"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985c9503b412198aa4197559e9a318524ebc4519c229bfa05a535828c950b9d"
+checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
+
+[[package]]
+name = "futures-task"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+
+[[package]]
+name = "futures-util"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "slab",
+]
 
 [[package]]
 name = "globset"
-version = "0.4.15"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
+checksum = "07c34a9410465b45bd9787443bc7370f37735bad04b0f0cd57ff1a3186c98988"
 dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.8",
+ "regex-automata 0.4.18",
  "regex-syntax 0.8.5",
 ]
 
@@ -173,7 +276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757"
 dependencies = [
  "bitflags",
- "ignore",
+ "ignore 0.4.23",
  "walkdir",
 ]
 
@@ -187,12 +290,41 @@ dependencies = [
  "globset",
  "log",
  "memchr",
- "regex-automata 0.4.8",
+ "regex-automata 0.4.18",
  "same-file",
  "walkdir",
  "winapi-util",
 ]
 
+[[package]]
+name = "ignore"
+version = "0.4.33"
+dependencies = [
+ "bstr",
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "dunce",
+ "globset",
+ "log",
+ "memchr",
+ "regex-automata 0.4.18",
+ "same-file",
+ "walkdir",
+ "winapi-util",
+]
+
+[[package]]
+name = "insta"
+version = "1.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86f0f8fee8c926415c58d6ae43a08523a26faccb2323f5e6b644fe7dd4ef6b82"
+dependencies = [
+ "console",
+ "once_cell",
+ "similar",
+ "tempfile",
+]
+
 [[package]]
 name = "itertools"
 version = "0.11.0"
@@ -216,12 +348,12 @@ checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 
 [[package]]
 name = "libloading"
-version = "0.8.5"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+checksum = "754ca22de805bb5744484a5b151a9e1a8e837d5dc232c2d7d8c2e3492edc8b60"
 dependencies = [
  "cfg-if",
- "windows-targets",
+ "windows-link",
 ]
 
 [[package]]
@@ -259,31 +391,33 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "napi"
-version = "2.16.11"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53575dfa17f208dd1ce3a2da2da4659aae393b256a472f2738a8586a6c4107fd"
+checksum = "de33522036981030a75c231829566bc63414e08101a6f5ff4ac6cef19c8e0941"
 dependencies = [
  "bitflags",
  "ctor",
- "napi-derive",
+ "futures",
+ "napi-build",
  "napi-sys",
- "once_cell",
+ "nohash-hasher",
+ "rustc-hash",
 ]
 
 [[package]]
 name = "napi-build"
-version = "2.0.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e"
+checksum = "c9c366d2c8c60b86fa632df75f745509b52f9128f91a6bad4c796e44abb505e1"
 
 [[package]]
 name = "napi-derive"
-version = "2.16.12"
+version = "3.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17435f7a00bfdab20b0c27d9c56f58f6499e418252253081bfff448099da31d1"
+checksum = "a49c513341a61a16a10af6efcce46b30d0822ba2d4fb197d24d33dfc199c78d5"
 dependencies = [
- "cfg-if",
  "convert_case",
+ "ctor",
  "napi-derive-backend",
  "proc-macro2",
  "quote",
@@ -292,28 +426,32 @@ dependencies = [
 
 [[package]]
 name = "napi-derive-backend"
-version = "1.0.74"
+version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "967c485e00f0bf3b1bdbe510a38a4606919cf1d34d9a37ad41f25a81aa077abe"
+checksum = "d60b5d773ad46c698c8cc2cd9fde0b283d39cbb7f71c04bee633c7bdba4423bd"
 dependencies = [
  "convert_case",
- "once_cell",
  "proc-macro2",
  "quote",
- "regex",
  "semver",
  "syn",
 ]
 
 [[package]]
 name = "napi-sys"
-version = "2.4.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427802e8ec3a734331fec1035594a210ce1ff4dc5bc1950530920ab717964ea3"
+checksum = "85fbf1fa9f1babfe396d74bbbf52b3643770243e8f5b0b46715d4caf7f0dfc9a"
 dependencies = [
  "libloading",
 ]
 
+[[package]]
+name = "nohash-hasher"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -336,9 +474,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "overload"
@@ -352,6 +490,16 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
 
+[[package]]
+name = "pretty_assertions"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
+dependencies = [
+ "diff",
+ "yansi",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.86"
@@ -363,18 +511,18 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.28"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.10.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
 dependencies = [
  "either",
  "rayon-core",
@@ -382,9 +530,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -392,13 +540,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.8.3"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.7.2",
+ "regex-automata 0.4.18",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -412,9 +561,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -427,12 +576,6 @@ version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
-[[package]]
-name = "regex-syntax"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.5"
@@ -441,9 +584,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustix"
@@ -488,6 +631,18 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "similar"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
+
+[[package]]
+name = "slab"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
 [[package]]
 name = "smallvec"
 version = "1.10.0"
@@ -496,9 +651,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 
 [[package]]
 name = "syn"
-version = "2.0.18"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -522,17 +677,21 @@ version = "0.1.0"
 dependencies = [
  "bexpand",
  "bstr",
- "crossbeam",
+ "classification-macros",
  "dunce",
- "glob-match",
+ "fast-glob",
  "globwalk",
- "ignore",
+ "ignore 0.4.33",
+ "insta",
  "log",
+ "pretty_assertions",
  "rayon",
+ "regex",
  "rustc-hash",
  "tempfile",
  "tracing",
  "tracing-subscriber",
+ "unicode-width",
  "walkdir",
 ]
 
@@ -632,6 +791,12 @@ version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -679,6 +844,12 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -697,6 +868,15 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
@@ -760,3 +940,9 @@ name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
diff --git a/README.md b/README.md
index 95ec9d87d..5f532607d 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,10 @@
 </p>
 
 <p align="center">
-    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=next" alt="Build Status"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=main" alt="Build Status"></a>
     <a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
 </p>
 
 ---
@@ -27,14 +27,10 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com).
 
 ## Community
 
-For help, discussion about best practices, or any other conversation that would benefit from being searchable:
+For help, discussion about best practices, or feature ideas:
 
-[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions)
-
-For chatting with others using the framework:
-
-[Join the Tailwind CSS Discord Server](https://discord.gg/7NF8GNe)
+[Discuss Tailwind CSS on GitHub](https://github.com/tailwindlabs/tailwindcss/discussions)
 
 ## Contributing
 
-If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindcss/tailwindcss/blob/next/.github/CONTRIBUTING.md) **before submitting a pull request**.
+If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindlabs/tailwindcss/blob/main/.github/CONTRIBUTING.md) **before submitting a pull request**.
diff --git a/crates/classification-macros/Cargo.toml b/crates/classification-macros/Cargo.toml
new file mode 100644
index 000000000..7053c893a
--- /dev/null
+++ b/crates/classification-macros/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "classification-macros"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = "2"
+quote = "1"
+proc-macro2 = "1"
diff --git a/crates/classification-macros/src/lib.rs b/crates/classification-macros/src/lib.rs
new file mode 100644
index 000000000..7bee55595
--- /dev/null
+++ b/crates/classification-macros/src/lib.rs
@@ -0,0 +1,253 @@
+use proc_macro::TokenStream;
+use quote::quote;
+use syn::{
+    parse_macro_input, punctuated::Punctuated, token::Comma, Attribute, Data, DataEnum,
+    DeriveInput, Expr, ExprLit, ExprRange, Ident, Lit, RangeLimits, Result, Variant,
+};
+
+/// A custom derive that supports:
+///
+/// - `#[bytes(…)]` for single byte literals
+/// - `#[bytes_range(…)]` for inclusive byte ranges (b'a'..=b'z')
+/// - `#[fallback]` for a variant that covers everything else
+///
+/// Example usage:
+///
+/// ```rust
+/// use classification_macros::ClassifyBytes;
+///
+/// #[derive(Clone, Copy, ClassifyBytes)]
+/// enum Class {
+///     #[bytes(b'a', b'b', b'c')]
+///     Letters,
+///
+///     #[bytes_range(b'0'..=b'9')]
+///     Digits,
+///
+///     #[fallback]
+///     Other,
+/// }
+/// ```
+/// Then call `b'a'.into()` to get `Example::SomeLetters`.
+#[proc_macro_derive(ClassifyBytes, attributes(bytes, bytes_range, fallback))]
+pub fn classify_bytes_derive(input: TokenStream) -> TokenStream {
+    let ast = parse_macro_input!(input as DeriveInput);
+
+    // This derive only works on an enum
+    let Data::Enum(DataEnum { variants, .. }) = &ast.data else {
+        return syn::Error::new_spanned(
+            &ast.ident,
+            "ClassifyBytes can only be derived on an enum.",
+        )
+        .to_compile_error()
+        .into();
+    };
+
+    let enum_name = &ast.ident;
+
+    let mut byte_map: [Option<Ident>; 256] = [const { None }; 256];
+    let mut fallback_variant: Option<Ident> = None;
+
+    // Start parsing the variants
+    for variant in variants {
+        let variant_ident = &variant.ident;
+
+        // If this variant has #[fallback], record it
+        if has_fallback_attr(variant) {
+            if fallback_variant.is_some() {
+                let err = syn::Error::new_spanned(
+                    variant_ident,
+                    "Multiple variants have #[fallback]. Only one allowed.",
+                );
+                return err.to_compile_error().into();
+            }
+            fallback_variant = Some(variant_ident.clone());
+        }
+
+        // Get #[bytes(…)]
+        let single_bytes = get_bytes_attrs(&variant.attrs);
+
+        // Get #[bytes_range(…)]
+        let range_bytes = get_bytes_range_attrs(&variant.attrs);
+
+        // Combine them
+        let all_bytes = single_bytes
+            .into_iter()
+            .chain(range_bytes)
+            .collect::<Vec<_>>();
+
+        // Mark them in the table
+        for b in all_bytes {
+            byte_map[b as usize] = Some(variant_ident.clone());
+        }
+    }
+
+    // If no fallback variant is found, default to "Other"
+    let fallback_ident = fallback_variant.expect("A variant marked with #[fallback] is missing");
+
+    // For each of the 256 byte values, fill the table
+    let fill = byte_map
+        .clone()
+        .into_iter()
+        .map(|variant_opt| match variant_opt {
+            Some(ident) => quote!(#enum_name::#ident),
+            None => quote!(#enum_name::#fallback_ident),
+        });
+
+    // Generate the final expanded code
+    let expanded = quote! {
+        impl #enum_name {
+            pub const TABLE: [#enum_name; 256] = [
+                #(#fill),*
+            ];
+        }
+
+        impl From<u8> for #enum_name {
+            fn from(byte: u8) -> Self {
+                #enum_name::TABLE[byte as usize]
+            }
+        }
+
+        impl From<&u8> for #enum_name {
+            fn from(byte: &u8) -> Self {
+                #enum_name::TABLE[*byte as usize]
+            }
+        }
+    };
+
+    TokenStream::from(expanded)
+}
+
+/// Checks if a variant has `#[fallback]`
+fn has_fallback_attr(variant: &Variant) -> bool {
+    variant
+        .attrs
+        .iter()
+        .any(|attr| attr.path().is_ident("fallback"))
+}
+
+/// Get all single byte literals from `#[bytes(…)]`
+fn get_bytes_attrs(attrs: &[Attribute]) -> Vec<u8> {
+    let mut assigned = Vec::new();
+    for attr in attrs {
+        if attr.path().is_ident("bytes") {
+            match parse_bytes_attr(attr) {
+                Ok(list) => assigned.extend(list),
+                Err(e) => panic!("Error parsing #[bytes(...)]: {}", e),
+            }
+        }
+    }
+    assigned
+}
+
+/// Parse `#[bytes(...)]` as a comma-separated list of **byte literals**, e.g. `b'a'`, `b'\n'`.
+fn parse_bytes_attr(attr: &Attribute) -> Result<Vec<u8>> {
+    // We'll parse it as a list of syn::Lit separated by commas: e.g. (b'a', b'b')
+    let items: Punctuated<Lit, Comma> = attr.parse_args_with(Punctuated::parse_terminated)?;
+    let mut out = Vec::new();
+    for lit in items {
+        match lit {
+            Lit::Byte(lb) => out.push(lb.value()),
+            _ => {
+                return Err(syn::Error::new_spanned(
+                    lit,
+                    "Expected a byte literal like b'a'",
+                ))
+            }
+        }
+    }
+    Ok(out)
+}
+
+/// Get all byte ranges from `#[bytes_range(...)]`
+fn get_bytes_range_attrs(attrs: &[Attribute]) -> Vec<u8> {
+    let mut assigned = Vec::new();
+    for attr in attrs {
+        if attr.path().is_ident("bytes_range") {
+            match parse_bytes_range_attr(attr) {
+                Ok(list) => assigned.extend(list),
+                Err(e) => panic!("Error parsing #[bytes_range(...)]: {}", e),
+            }
+        }
+    }
+    assigned
+}
+
+/// Parse `#[bytes_range(...)]` as a comma-separated list of range expressions, e.g.:
+/// `b'a'..=b'z', b'0'..=b'9'`
+fn parse_bytes_range_attr(attr: &Attribute) -> Result<Vec<u8>> {
+    // We'll parse each element as a syn::Expr, then see if it's an Expr::Range
+    let exprs: Punctuated<Expr, Comma> = attr.parse_args_with(Punctuated::parse_terminated)?;
+    let mut out = Vec::new();
+
+    for expr in exprs {
+        if let Expr::Range(ExprRange {
+            start: Some(start),
+            end: Some(end),
+            limits,
+            ..
+        }) = expr
+        {
+            let from = extract_byte_literal(&start)?;
+            let to = extract_byte_literal(&end)?;
+
+            match limits {
+                RangeLimits::Closed(_) => {
+                    // b'a'..=b'z'
+                    if from <= to {
+                        out.extend(from..=to);
+                    }
+                }
+                RangeLimits::HalfOpen(_) => {
+                    // b'a'..b'z'  => from..(to-1)
+                    if from < to {
+                        out.extend(from..to);
+                    }
+                }
+            }
+        } else {
+            return Err(syn::Error::new_spanned(
+                expr,
+                "Expected a byte range like b'a'..=b'z'",
+            ));
+        }
+    }
+
+    Ok(out)
+}
+
+/// Extract a u8 from an expression that can be:
+///
+/// - `Expr::Lit(Lit::Byte(...))`, e.g. b'a'
+/// - `Expr::Lit(Lit::Int(...))`, e.g. 0x80 or 255
+fn extract_byte_literal(expr: &Expr) -> Result<u8> {
+    if let Expr::Lit(ExprLit { lit, .. }) = expr {
+        match lit {
+            // Existing case: b'a'
+            Lit::Byte(lb) => Ok(lb.value()),
+
+            // New case: 0x80, 255, etc.
+            Lit::Int(li) => {
+                let value = li.base10_parse::<u64>()?;
+                if value <= 255 {
+                    Ok(value as u8)
+                } else {
+                    Err(syn::Error::new_spanned(
+                        li,
+                        format!("Integer literal {} out of range for a byte (0..255)", value),
+                    ))
+                }
+            }
+
+            _ => Err(syn::Error::new_spanned(
+                lit,
+                "Expected b'...' or an integer literal in range 0..=255",
+            )),
+        }
+    } else {
+        Err(syn::Error::new_spanned(
+            expr,
+            "Expected a literal expression like b'a' or 0x80",
+        ))
+    }
+}
diff --git a/crates/ignore/COPYING b/crates/ignore/COPYING
new file mode 100644
index 000000000..bb9c20a09
--- /dev/null
+++ b/crates/ignore/COPYING
@@ -0,0 +1,3 @@
+This project is dual-licensed under the Unlicense and MIT licenses.
+
+You may use this code under the terms of either license.
diff --git a/crates/ignore/Cargo.toml b/crates/ignore/Cargo.toml
new file mode 100644
index 000000000..d0af38ba9
--- /dev/null
+++ b/crates/ignore/Cargo.toml
@@ -0,0 +1,50 @@
+[package]
+name = "ignore"
+version = "0.4.33"  #:version
+authors = ["Andrew Gallant <jamslam@gmail.com>"]
+description = """
+A fast library for efficiently matching ignore files such as `.gitignore`
+against file paths.
+"""
+documentation = "https://docs.rs/ignore"
+homepage = "https://github.com/BurntSushi/ripgrep/tree/master/crates/ignore"
+repository = "https://github.com/BurntSushi/ripgrep/tree/master/crates/ignore"
+readme = "README.md"
+keywords = ["glob", "ignore", "gitignore", "pattern", "file"]
+license = "Unlicense OR MIT"
+# CHANGED: Use an explicit edition instead of `edition.workspace = true` since this crate is
+# vendored into the Tailwind CSS workspace.
+edition = "2024"
+rust-version = "1.88"
+
+[lib]
+name = "ignore"
+bench = false
+
+[dependencies]
+crossbeam-deque = "0.8.3"
+# CHANGED: Use the published globset crate instead of a path dependency.
+globset = "0.4.20"
+log = "0.4.20"
+memchr = "2.6.3"
+same-file = "1.0.6"
+walkdir = "2.4.0"
+# CHANGED: Added `dunce` to canonicalize paths without UNC prefixes on Windows.
+dunce = "1.0.5"
+
+[dependencies.regex-automata]
+version = "0.4.18"
+default-features = false
+features = ["std", "perf", "syntax", "meta", "nfa", "hybrid", "dfa-onepass"]
+
+[target.'cfg(windows)'.dependencies.winapi-util]
+version = "0.1.2"
+
+[dev-dependencies]
+bstr = { version = "1.6.2", default-features = false, features = ["std"] }
+crossbeam-channel = "0.5.15"
+
+[features]
+# DEPRECATED. It is a no-op. SIMD is done automatically through runtime
+# dispatch.
+simd-accel = []
diff --git a/crates/ignore/LICENSE-MIT b/crates/ignore/LICENSE-MIT
new file mode 100644
index 000000000..3b0a5dc09
--- /dev/null
+++ b/crates/ignore/LICENSE-MIT
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Andrew Gallant
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/crates/ignore/README.md b/crates/ignore/README.md
new file mode 100644
index 000000000..72258e6b5
--- /dev/null
+++ b/crates/ignore/README.md
@@ -0,0 +1,59 @@
+ignore
+======
+The ignore crate provides a fast recursive directory iterator that respects
+various filters such as globs, file types and `.gitignore` files. This crate
+also provides lower level direct access to gitignore and file type matchers.
+
+[![Build status](https://github.com/BurntSushi/ripgrep/workflows/ci/badge.svg)](https://github.com/BurntSushi/ripgrep/actions)
+[![](https://img.shields.io/crates/v/ignore.svg)](https://crates.io/crates/ignore)
+
+Dual-licensed under MIT or the [UNLICENSE](https://unlicense.org/).
+
+### Documentation
+
+[https://docs.rs/ignore](https://docs.rs/ignore)
+
+### Usage
+
+Add this to your `Cargo.toml`:
+
+```toml
+[dependencies]
+ignore = "0.4"
+```
+
+### Example
+
+This example shows the most basic usage of this crate. This code will
+recursively traverse the current directory while automatically filtering out
+files and directories according to ignore globs found in files like
+`.ignore` and `.gitignore`:
+
+
+```rust,no_run
+use ignore::Walk;
+
+for result in Walk::new("./") {
+    // Each item yielded by the iterator is either a directory entry or an
+    // error, so either print the path or the error.
+    match result {
+        Ok(entry) => println!("{}", entry.path().display()),
+        Err(err) => println!("ERROR: {}", err),
+    }
+}
+```
+
+### Example: advanced
+
+By default, the recursive directory iterator will ignore hidden files and
+directories. This can be disabled by building the iterator with `WalkBuilder`:
+
+```rust,no_run
+use ignore::WalkBuilder;
+
+for result in WalkBuilder::new("./").hidden(false).build() {
+    println!("{:?}", result);
+}
+```
+
+See the documentation for `WalkBuilder` for many other options.
diff --git a/crates/ignore/UNLICENSE b/crates/ignore/UNLICENSE
new file mode 100644
index 000000000..68a49daad
--- /dev/null
+++ b/crates/ignore/UNLICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org/>
diff --git a/crates/ignore/examples/walk.rs b/crates/ignore/examples/walk.rs
new file mode 100644
index 000000000..c61d0515e
--- /dev/null
+++ b/crates/ignore/examples/walk.rs
@@ -0,0 +1,64 @@
+use std::{env, io::Write, path::Path};
+
+use {bstr::ByteVec, ignore::WalkBuilder, walkdir::WalkDir};
+
+fn main() {
+    let mut path = env::args().nth(1).unwrap();
+    let mut parallel = false;
+    let mut simple = false;
+    let (tx, rx) = crossbeam_channel::bounded::<DirEntry>(100);
+    if path == "parallel" {
+        path = env::args().nth(2).unwrap();
+        parallel = true;
+    } else if path == "walkdir" {
+        path = env::args().nth(2).unwrap();
+        simple = true;
+    }
+
+    let stdout_thread = std::thread::spawn(move || {
+        let mut stdout = std::io::BufWriter::new(std::io::stdout());
+        for dent in rx {
+            stdout.write_all(&Vec::from_path_lossy(dent.path())).unwrap();
+            stdout.write_all(b"\n").unwrap();
+        }
+    });
+
+    if parallel {
+        let walker = WalkBuilder::new(path).threads(6).build_parallel();
+        walker.run(|| {
+            let tx = tx.clone();
+            Box::new(move |result| {
+                use ignore::WalkState::*;
+
+                tx.send(DirEntry::Y(result.unwrap())).unwrap();
+                Continue
+            })
+        });
+    } else if simple {
+        let walker = WalkDir::new(path);
+        for result in walker {
+            tx.send(DirEntry::X(result.unwrap())).unwrap();
+        }
+    } else {
+        let walker = WalkBuilder::new(path).build();
+        for result in walker {
+            tx.send(DirEntry::Y(result.unwrap())).unwrap();
+        }
+    }
+    drop(tx);
+    stdout_thread.join().unwrap();
+}
+
+enum DirEntry {
+    X(walkdir::DirEntry),
+    Y(ignore::DirEntry),
+}
+
+impl DirEntry {
+    fn path(&self) -> &Path {
+        match *self {
+            DirEntry::X(ref x) => x.path(),
+            DirEntry::Y(ref y) => y.path(),
+        }
+    }
+}
diff --git a/crates/ignore/src/default_types.rs b/crates/ignore/src/default_types.rs
new file mode 100644
index 000000000..6b5bba0f0
--- /dev/null
+++ b/crates/ignore/src/default_types.rs
@@ -0,0 +1,378 @@
+/// This list represents the default file types that ripgrep ships with. In
+/// general, any file format is fair game, although it should generally be
+/// limited to reasonably popular open formats. For other cases, you can add
+/// types to each invocation of ripgrep with the '--type-add' flag.
+///
+/// If you would like to add or improve this list, please file a PR:
+/// <https://github.com/BurntSushi/ripgrep>.
+///
+/// Please try to keep this list sorted lexicographically and wrapped to 79
+/// columns (inclusive).
+#[rustfmt::skip]
+pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[
+    (&["ada"], &["*.adb", "*.ads"]),
+    (&["agda"], &["*.agda", "*.lagda"]),
+    (&["aidl"], &["*.aidl"]),
+    (&["alire"], &["alire.toml"]),
+    (&["amake"], &["*.mk", "*.bp"]),
+    (&["asciidoc"], &["*.adoc", "*.asc", "*.asciidoc"]),
+    (&["asm"], &["*.asm", "*.s", "*.S"]),
+    (&["asp"], &[
+        "*.aspx", "*.aspx.cs", "*.aspx.vb", "*.ascx", "*.ascx.cs",
+        "*.ascx.vb", "*.asp"
+    ]),
+    (&["ats"], &["*.ats", "*.dats", "*.sats", "*.hats"]),
+    (&["avro"], &["*.avdl", "*.avpr", "*.avsc"]),
+    (&["awk"], &["*.awk"]),
+    (&["bat", "batch"], &["*.bat"]),
+    (&["bazel"], &[
+        "*.bazel", "*.bzl", "*.BUILD", "*.bazelrc", "BUILD", "MODULE.bazel",
+        "WORKSPACE", "WORKSPACE.bazel", "WORKSPACE.bzlmod",
+    ]),
+    (&["bitbake"], &["*.bb", "*.bbappend", "*.bbclass", "*.conf", "*.inc"]),
+    (&["boxlang"], &["*.bx", "*.bxm", "*.bxs"]),
+    (&["brotli"], &["*.br"]),
+    (&["buildstream"], &["*.bst"]),
+    (&["bzip2"], &["*.bz2", "*.tbz2"]),
+    (&["c"], &["*.[chH]", "*.[chH].in", "*.cats"]),
+    (&["cabal"], &["*.cabal"]),
+    (&["candid"], &["*.did"]),
+    (&["carp"], &["*.carp"]),
+    (&["cbor"], &["*.cbor"]),
+    (&["ceylon"], &["*.ceylon"]),
+    (&["cfml"], &["*.cfc", "*.cfm"]),
+    (&["clojure"], &["*.clj", "*.cljc", "*.cljs", "*.cljx"]),
+    (&["cmake"], &["*.cmake", "CMakeLists.txt"]),
+    (&["cmd"], &["*.bat", "*.cmd"]),
+    (&["cml"], &["*.cml"]),
+    (&["coffeescript"], &["*.coffee"]),
+    (&["config"], &["*.cfg", "*.conf", "*.config", "*.ini"]),
+    (&["container"], &["*Containerfile*", "*Dockerfile*"]),
+    (&["coq"], &["*.v"]),
+    (&["cpp"], &[
+        "*.[ChH]", "*.cc", "*.[ch]pp", "*.[ch]xx", "*.hh",  "*.inl",
+        "*.[ChH].in", "*.cc.in", "*.[ch]pp.in", "*.[ch]xx.in", "*.hh.in",
+    ]),
+    (&["creole"], &["*.creole"]),
+    (&["crystal"], &["Projectfile", "*.cr", "*.ecr", "shard.yml"]),
+    (&["cs"], &["*.cs"]),
+    (&["csharp"], &["*.cs"]),
+    (&["cshtml"], &["*.cshtml"]),
+    (&["csproj"], &["*.csproj"]),
+    (&["css"], &["*.css", "*.scss"]),
+    (&["csv"], &["*.csv"]),
+    (&["cuda"], &["*.cu", "*.cuh"]),
+    (&["cython"], &["*.pyx", "*.pxi", "*.pxd"]),
+    (&["d"], &["*.d"]),
+    (&["dart"], &["*.dart"]),
+    (&["devicetree"], &["*.dts", "*.dtsi", "*.dtso"]),
+    (&["dhall"], &["*.dhall"]),
+    (&["diff"], &["*.patch", "*.diff"]),
+    (&["dita"], &["*.dita", "*.ditamap", "*.ditaval"]),
+    (&["docker"], &["*Dockerfile*"]),
+    (&["dockercompose"], &["docker-compose.yml", "docker-compose.*.yml"]),
+    (&["dts"], &["*.dts", "*.dtsi"]),
+    (&["dvc"], &["Dvcfile", "*.dvc"]),
+    (&["ebuild"], &["*.ebuild", "*.eclass"]),
+    (&["edn"], &["*.edn"]),
+    (&["elisp"], &["*.el"]),
+    (&["elixir"], &["*.ex", "*.eex", "*.exs", "*.heex", "*.leex", "*.livemd"]),
+    (&["elm"], &["*.elm"]),
+    (&["erb"], &["*.erb"]),
+    (&["erlang"], &["*.erl", "*.hrl"]),
+    (&["fennel"], &["*.fnl"]),
+    (&["fidl"], &["*.fidl"]),
+    (&["fish"], &["*.fish"]),
+    (&["flatbuffers"], &["*.fbs"]),
+    (&["fortran"], &[
+        "*.f", "*.F", "*.f77", "*.F77", "*.pfo",
+        "*.f90", "*.F90", "*.f95", "*.F95",
+    ]),
+    (&["fsharp"], &["*.fs", "*.fsx", "*.fsi"]),
+    (&["fut"], &["*.fut"]),
+    (&["gap"], &["*.g", "*.gap", "*.gi", "*.gd", "*.tst"]),
+    (&["gdscript"], &["*.gd"]),
+    (&["gleam"], &["*.gleam"]),
+    (&["gn"], &["*.gn", "*.gni"]),
+    (&["go"], &["*.go"]),
+    (&["gprbuild"], &["*.gpr"]),
+    (&["gradle"], &[
+        "*.gradle", "*.gradle.kts", "gradle.properties", "gradle-wrapper.*",
+        "gradlew", "gradlew.bat",
+    ]),
+    (&["graphql"], &["*.graphql", "*.graphqls"]),
+    (&["groovy"], &["*.groovy", "*.gradle"]),
+    (&["gzip"], &["*.gz", "*.tgz"]),
+    (&["h"], &["*.h", "*.hh", "*.hpp"]),
+    (&["haml"], &["*.haml"]),
+    (&["hare"], &["*.ha"]),
+    (&["haskell"], &["*.hs", "*.lhs", "*.cpphs", "*.c2hs", "*.hsc"]),
+    (&["hbs"], &["*.hbs"]),
+    (&["hs"], &["*.hs", "*.lhs"]),
+    (&["html"], &["*.htm", "*.html", "*.ejs"]),
+    (&["hurl"], &["*.hurl"]),
+    (&["hy"], &["*.hy"]),
+    (&["idris"], &["*.idr", "*.lidr"]),
+    (&["janet"], &["*.janet"]),
+    (&["java"], &["*.java", "*.jsp", "*.jspx", "*.properties"]),
+    (&["jinja"], &["*.j2", "*.jinja", "*.jinja2"]),
+    (&["jl"], &["*.jl"]),
+    (&["js"], &["*.js", "*.jsx", "*.vue", "*.cjs", "*.mjs"]),
+    (&["json"], &["*.json", "composer.lock", "*.sarif"]),
+    (&["jsonl"], &["*.jsonl"]),
+    (&["julia"], &["*.jl"]),
+    (&["jupyter"], &["*.ipynb", "*.jpynb"]),
+    (&["k"], &["*.k"]),
+    (&["kconfig"], &["Kconfig", "Kconfig.*"]),
+    (&["kotlin"], &["*.kt", "*.kts"]),
+    (&["lean"], &["*.lean"]),
+    (&["less"], &["*.less"]),
+    (&["license"], &[
+        // General
+        "COPYING", "COPYING[.-]*",
+        "COPYRIGHT", "COPYRIGHT[.-]*",
+        "EULA", "EULA[.-]*",
+        "licen[cs]e", "licen[cs]e.*",
+        "LICEN[CS]E", "LICEN[CS]E[.-]*", "*[.-]LICEN[CS]E*",
+        "NOTICE", "NOTICE[.-]*",
+        "PATENTS", "PATENTS[.-]*",
+        "UNLICEN[CS]E", "UNLICEN[CS]E[.-]*",
+        // GPL (gpl.txt, etc.)
+        "agpl[.-]*",
+        "gpl[.-]*",
+        "lgpl[.-]*",
+        // Other license-specific (APACHE-2.0.txt, etc.)
+        "AGPL-*[0-9]*",
+        "APACHE-*[0-9]*",
+        "BSD-*[0-9]*",
+        "CC-BY-*",
+        "GFDL-*[0-9]*",
+        "GNU-*[0-9]*",
+        "GPL-*[0-9]*",
+        "LGPL-*[0-9]*",
+        "MIT-*[0-9]*",
+        "MPL-*[0-9]*",
+        "OFL-*[0-9]*",
+    ]),
+    (&["lilypond"], &["*.ly", "*.ily"]),
+    (&["lisp"], &["*.el", "*.jl", "*.lisp", "*.lsp", "*.sc", "*.scm"]),
+    (&["llvm"], &["*.ll"]),
+    (&["lock"], &["*.lock", "package-lock.json"]),
+    (&["log"], &["*.log"]),
+    (&["lua"], &["*.lua"]),
+    (&["lz4"], &["*.lz4"]),
+    (&["lzma"], &["*.lzma"]),
+    (&["m4"], &["*.ac", "*.m4"]),
+    (&["make"], &[
+        "[Gg][Nn][Uu]makefile", "[Mm]akefile",
+        "[Gg][Nn][Uu]makefile.am", "[Mm]akefile.am",
+        "[Gg][Nn][Uu]makefile.in", "[Mm]akefile.in",
+        "Makefile.*",
+        "*.mk", "*.mak"
+    ]),
+    (&["mako"], &["*.mako", "*.mao"]),
+    (&["man"], &["*.[0-9lnpx]", "*.[0-9][cEFMmpSx]"]),
+    (&["markdown", "md"], &[
+        "*.markdown",
+        "*.md",
+        "*.mdown",
+        "*.mdwn",
+        "*.mkd",
+        "*.mkdn",
+        "*.mdx",
+    ]),
+    (&["matlab"], &["*.m"]),
+    (&["meson"], &["meson.build", "meson_options.txt", "meson.options"]),
+    (&["minified"], &["*.min.html", "*.min.css", "*.min.js"]),
+    (&["mint"], &["*.mint"]),
+    (&["mk"], &["mkfile"]),
+    (&["ml"], &["*.ml"]),
+    (&["mojo"], &["*.mojo"]),
+    (&["motoko"], &["*.mo"]),
+    (&["msbuild"], &[
+        "*.csproj", "*.fsproj", "*.vcxproj", "*.proj", "*.props", "*.targets",
+        "*.sln", "*.slnf"
+    ]),
+    (&["nim"], &["*.nim", "*.nimf", "*.nimble", "*.nims"]),
+    (&["nix"], &["*.nix"]),
+    (&["objc"], &["*.h", "*.m"]),
+    (&["objcpp"], &["*.h", "*.mm"]),
+    (&["ocaml"], &["*.ml", "*.mli", "*.mll", "*.mly"]),
+    (&["org"], &["*.org", "*.org_archive"]),
+    (&["pants"], &["BUILD"]),
+    (&["pascal"], &["*.pas", "*.dpr", "*.lpr", "*.pp", "*.inc"]),
+    (&["pdf"], &["*.pdf"]),
+    (&["perl"], &["*.perl", "*.pl", "*.PL", "*.plh", "*.plx", "*.pm", "*.t"]),
+    (&["php"], &[
+        // note that PHP 6 doesn't exist
+        // See: https://wiki.php.net/rfc/php6
+        "*.php", "*.php3", "*.php4", "*.php5", "*.php7", "*.php8",
+        "*.pht", "*.phtml"
+    ]),
+    (&["pkgbuild"], &["PKGBUILD"]),
+    (&["po"], &["*.po"]),
+    (&["pod"], &["*.pod"]),
+    (&["postscript"], &["*.eps", "*.ps"]),
+    (&["prolog"], &["*.pl", "*.pro", "*.prolog", "*.P"]),
+    (&["proto", "protobuf"], &["*.proto"]),
+    (&["ps"], &["*.cdxml", "*.ps1", "*.ps1xml", "*.psd1", "*.psm1"]),
+    (&["puppet"], &["*.epp", "*.erb", "*.pp", "*.rb"]),
+    (&["purs"], &["*.purs"]),
+    (&["py", "python"], &["*.py", "*.pyi"]),
+    (&["qmake"], &["*.pro", "*.pri", "*.prf"]),
+    (&["qml"], &["*.qml"]),
+    (&["qrc"], &["*.qrc"]),
+    (&["qui"], &["*.ui"]),
+    (&["r"], &["*.R", "*.r", "*.Rmd", "*.rmd", "*.Rnw", "*.rnw"]),
+    (&["racket"], &["*.rkt"]),
+    (&["raku"], &[
+        "*.raku", "*.rakumod", "*.rakudoc", "*.rakutest",
+        "*.p6", "*.pl6", "*.pm6"
+    ]),
+    (&["rdoc"], &["*.rdoc"]),
+    (&["readme"], &["README*", "*README"]),
+    (&["reasonml"], &["*.re", "*.rei"]),
+    (&["red"], &["*.r", "*.red", "*.reds"]),
+    (&["rescript"], &["*.res", "*.resi"]),
+    (&["robot"], &["*.robot"]),
+    (&["rocq"], &["*.v"]),
+    (&["rst"], &["*.rst"]),
+    (&["ruby"], &[
+        // Idiomatic files
+        "config.ru", "Gemfile", ".irbrc", "Rakefile",
+        // Extensions
+        "*.gemspec", "*.rb", "*.rbw", "*.rake"
+    ]),
+    (&["rust"], &["*.rs"]),
+    (&["sass"], &["*.sass", "*.scss"]),
+    (&["scala"], &["*.scala", "*.sbt"]),
+    (&["scdoc"], &["*.scd", "*.scdoc"]),
+    (&["seed7"], &["*.sd7", "*.s7i"]),
+    (&["sh"], &[
+        // Portable/misc. init files
+        ".env", ".login", ".logout", ".profile", "profile",
+        // bash-specific init files
+        ".bash_login", "bash_login",
+        ".bash_logout", "bash_logout",
+        ".bash_profile", "bash_profile",
+        ".bashrc", "bashrc", "*.bashrc",
+        // csh-specific init files
+        ".cshrc", "*.cshrc",
+        // ksh-specific init files
+        ".kshrc", "*.kshrc",
+        // tcsh-specific init files
+        ".tcshrc",
+        // zsh-specific init files
+        ".zshenv", "zshenv",
+        ".zlogin", "zlogin",
+        ".zlogout", "zlogout",
+        ".zprofile", "zprofile",
+        ".zshrc", "zshrc",
+        // Extensions
+        "*.bash", "*.csh", "*.env", "*.ksh", "*.sh", "*.tcsh", "*.zsh",
+    ]),
+    (&["slim"], &["*.skim", "*.slim", "*.slime"]),
+    (&["smarty"], &["*.tpl"]),
+    (&["sml"], &["*.sml", "*.sig"]),
+    (&["solidity"], &["*.sol"]),
+    (&["soy"], &["*.soy"]),
+    (&["spark"], &["*.spark"]),
+    (&["spec"], &["*.spec"]),
+    (&["sql"], &["*.sql", "*.psql"]),
+    (&["ssa"], &["*.ssa"]),
+    (&["stylus"], &["*.styl"]),
+    (&["sv"], &["*.v", "*.vg", "*.sv", "*.svh", "*.h"]),
+    (&["svelte"], &["*.svelte", "*.svelte.ts"]),
+    (&["svg"], &["*.svg"]),
+    (&["swift"], &["*.swift"]),
+    (&["swig"], &["*.def", "*.i"]),
+    (&["systemd"], &[
+        "*.automount", "*.conf", "*.device", "*.link", "*.mount", "*.path",
+        "*.scope", "*.service", "*.slice", "*.socket", "*.swap", "*.target",
+        "*.timer",
+    ]),
+    (&["taskpaper"], &["*.taskpaper"]),
+    (&["tcl"], &["*.tcl"]),
+    (&["tex"], &["*.tex", "*.ltx", "*.cls", "*.sty", "*.bib", "*.dtx", "*.ins"]),
+    (&["texinfo"], &["*.texi"]),
+    (&["textile"], &["*.textile"]),
+    (&["tf"], &[
+        "*.tf", "*.tf.json", "*.tfvars", "*.tfvars.json",
+        "*.terraformrc", "terraform.rc", "*.tfrc", "*.terraform.lock.hcl",
+    ]),
+    (&["thrift"], &["*.thrift"]),
+    (&["toml"], &["*.toml", "Cargo.lock"]),
+    (&["ts", "typescript"], &["*.ts", "*.tsx", "*.cts", "*.mts"]),
+    (&["twig"], &["*.twig"]),
+    (&["txt"], &["*.txt"]),
+    (&["typoscript"], &["*.typoscript", "*.ts"]),
+    (&["typst"], &["*.typ"]),
+    (&["usd"], &["*.usd", "*.usda", "*.usdc"]),
+    (&["v"], &["*.v", "*.vsh"]),
+    (&["vala"], &["*.vala"]),
+    (&["vb"], &["*.vb"]),
+    (&["vcl"], &["*.vcl"]),
+    (&["verilog"], &["*.v", "*.vh", "*.sv", "*.svh"]),
+    (&["vhdl"], &["*.vhd", "*.vhdl"]),
+    (&["vim"], &[
+        "*.vim", ".vimrc", ".gvimrc", "vimrc", "gvimrc", "_vimrc", "_gvimrc",
+    ]),
+    (&["vimscript"], &[
+        "*.vim", ".vimrc", ".gvimrc", "vimrc", "gvimrc", "_vimrc", "_gvimrc",
+    ]),
+    (&["vue"], &["*.vue"]),
+    (&["webidl"], &["*.idl", "*.webidl", "*.widl"]),
+    (&["wgsl"], &["*.wgsl"]),
+    (&["wiki"], &["*.mediawiki", "*.wiki"]),
+    (&["xml"], &[
+        "*.xml", "*.xml.dist", "*.dtd", "*.xsl", "*.xslt", "*.xsd", "*.xjb",
+        "*.rng", "*.sch", "*.xhtml",
+    ]),
+    (&["xz"], &["*.xz", "*.txz"]),
+    (&["yacc"], &["*.y"]),
+    (&["yaml"], &["*.yaml", "*.yml"]),
+    (&["yang"], &["*.yang"]),
+    (&["z"], &["*.Z"]),
+    (&["zig"], &["*.zig"]),
+    (&["zsh"], &[
+        ".zshenv", "zshenv",
+        ".zlogin", "zlogin",
+        ".zlogout", "zlogout",
+        ".zprofile", "zprofile",
+        ".zshrc", "zshrc",
+        "*.zsh",
+    ]),
+    (&["zstd"], &["*.zst", "*.zstd"]),
+];
+
+#[cfg(test)]
+mod tests {
+    use super::DEFAULT_TYPES;
+
+    #[test]
+    fn default_types_are_sorted() {
+        let mut names = DEFAULT_TYPES.iter().map(|(aliases, _)| aliases[0]);
+        let Some(mut previous_name) = names.next() else {
+            return;
+        };
+        for name in names {
+            assert!(
+                name > previous_name,
+                r#""{}" should be sorted before "{}" in `DEFAULT_TYPES`"#,
+                name,
+                previous_name
+            );
+            previous_name = name;
+        }
+    }
+
+    #[test]
+    fn default_types_aliases_are_sorted() {
+        for (aliases, _) in DEFAULT_TYPES.iter() {
+            assert!(
+                aliases.is_sorted(),
+                "this alias list is not sorted: {aliases:?}",
+            );
+        }
+    }
+}
diff --git a/crates/ignore/src/dir.rs b/crates/ignore/src/dir.rs
new file mode 100644
index 000000000..6bee724c8
--- /dev/null
+++ b/crates/ignore/src/dir.rs
@@ -0,0 +1,1648 @@
+// This module provides a data structure, `Ignore`, that connects "directory
+// traversal" with "ignore matchers." Specifically, it knows about gitignore
+// semantics and precedence, and is organized based on directory hierarchy.
+// Namely, every matcher logically corresponds to ignore rules from a single
+// directory, and points to the matcher for its corresponding parent directory.
+// In this sense, `Ignore` is a *persistent* data structure.
+//
+// This design was specifically chosen to make it possible to use this data
+// structure in a parallel directory iterator.
+//
+// My initial intention was to expose this module as part of this crate's
+// public API, but I think the data structure's public API is too complicated
+// with non-obvious failure modes. Alas, such things haven't been documented
+// well.
+
+use std::{
+    collections::HashMap,
+    ffi::{OsStr, OsString},
+    fs::{self, File, FileType},
+    io::{self, BufRead},
+    path::{Path, PathBuf},
+    sync::{Arc, RwLock, Weak},
+};
+
+use crate::{
+    gitignore::{self, Gitignore, GitignoreBuilder},
+    overrides::{self, Override},
+    pathutil::{is_hidden_entry, strip_prefix},
+    types::{self, Types},
+    walk::DirEntry,
+    {Error, Match, PartialErrorBuilder},
+};
+
+/// IgnoreMatch represents information about where a match came from when using
+/// the `Ignore` matcher.
+#[derive(Clone, Debug)]
+#[allow(dead_code)]
+pub(crate) struct IgnoreMatch<'a>(IgnoreMatchInner<'a>);
+
+/// IgnoreMatchInner describes precisely where the match information came from.
+/// This is private to allow expansion to more matchers in the future.
+#[derive(Clone, Debug)]
+#[allow(dead_code)]
+enum IgnoreMatchInner<'a> {
+    Override(overrides::Glob<'a>),
+    Gitignore(&'a gitignore::Glob),
+    Types(types::Glob<'a>),
+    Hidden,
+}
+
+impl<'a> IgnoreMatch<'a> {
+    fn overrides(x: overrides::Glob<'a>) -> IgnoreMatch<'a> {
+        IgnoreMatch(IgnoreMatchInner::Override(x))
+    }
+
+    fn gitignore(x: &'a gitignore::Glob) -> IgnoreMatch<'a> {
+        IgnoreMatch(IgnoreMatchInner::Gitignore(x))
+    }
+
+    fn types(x: types::Glob<'a>) -> IgnoreMatch<'a> {
+        IgnoreMatch(IgnoreMatchInner::Types(x))
+    }
+
+    fn hidden() -> IgnoreMatch<'static> {
+        IgnoreMatch(IgnoreMatchInner::Hidden)
+    }
+}
+
+/// Options for the ignore matcher, shared between the matcher itself and the
+/// builder.
+#[derive(Clone, Copy, Debug)]
+struct IgnoreOptions {
+    /// Whether to ignore hidden file paths or not.
+    hidden: bool,
+    /// Whether to read .ignore files.
+    ignore: bool,
+    /// Whether to respect any ignore files in parent directories.
+    parents: bool,
+    /// Whether to read git's global gitignore file.
+    git_global: bool,
+    /// Whether to read .gitignore files.
+    git_ignore: bool,
+    /// Whether to read .git/info/exclude files.
+    git_exclude: bool,
+    /// Whether to ignore files case insensitively
+    ignore_case_insensitive: bool,
+    /// Whether a git repository must be present in order to apply any
+    /// git-related ignore rules.
+    require_git: bool,
+}
+
+/// Ignore is a matcher useful for recursively walking one or more directories.
+#[derive(Clone, Debug)]
+pub(crate) struct Ignore {
+    inner: Arc<IgnoreInner>,
+    // Parent matchers are cached independently of the path being walked, but
+    // matching them still needs the canonicalized path originally passed to
+    // `add_parents`. For example, when walking `/tmp/project/src`, parent
+    // matchers use `/tmp/project/src` to rewrite `/tmp/project/src/foo.py`
+    // before matching it against ignore files from `/tmp/project` and its
+    // ancestors.
+    //
+    // For ripgrep itself, this means that `rg pat src tests` must rewrite
+    // `src/foo` relative to `.../src`, and not whatever root was prepared
+    // first.
+    //
+    // See: https://github.com/BurntSushi/ripgrep/pull/3420
+    // See: https://github.com/BurntSushi/ripgrep/issues/3376
+    // See: https://github.com/BurntSushi/ripgrep/issues/3419
+    // See: https://github.com/BurntSushi/ripgrep/issues/3320
+    absolute_base: Option<Arc<PathBuf>>,
+}
+
+#[derive(Clone, Debug)]
+struct IgnoreInner {
+    /// A map of all existing directories that have already been
+    /// compiled into matchers.
+    ///
+    /// Note that this is never used during matching, only when adding new
+    /// parent directory matchers. This avoids needing to rebuild glob sets for
+    /// parent directories if many paths are being searched.
+    compiled: Arc<RwLock<HashMap<OsString, Weak<IgnoreInner>>>>,
+    /// The path to the directory that this matcher was built from.
+    dir: PathBuf,
+    /// An override matcher (default is empty).
+    overrides: Arc<Override>,
+    /// A file type matcher.
+    types: Arc<Types>,
+    /// The parent directory to match next.
+    ///
+    /// If this is the root directory or there are otherwise no more
+    /// directories to match, then `parent` is `None`.
+    parent: Option<Arc<IgnoreInner>>,
+    /// Whether this is an absolute parent matcher, as added by add_parent.
+    is_absolute_parent: bool,
+    /// The directory that gitignores should be interpreted relative to.
+    ///
+    /// Usually this is the directory containing the gitignore file. But in
+    /// some cases, like for global gitignores or for gitignores specified
+    /// explicitly, this should generally be set to the current working
+    /// directory. This is only used for global gitignores or "explicit"
+    /// gitignores.
+    ///
+    /// When `None`, this means the CWD could not be determined or is unknown.
+    /// In this case, global gitignore files are ignored because they otherwise
+    /// cannot be matched correctly.
+    global_gitignores_relative_to: Option<PathBuf>,
+    /// Explicit global ignore matchers specified by the caller.
+    explicit_ignores: Arc<Vec<Gitignore>>,
+    /// Ignore files used in addition to `.ignore`
+    custom_ignore_filenames: Arc<Vec<OsString>>,
+    /// The matcher for custom ignore files
+    custom_ignore_matcher: Gitignore,
+    /// The matcher for .ignore files.
+    ignore_matcher: Gitignore,
+    /// A global gitignore matcher, usually from $XDG_CONFIG_HOME/git/ignore.
+    git_global_matcher: Arc<Gitignore>,
+    /// The matcher for .gitignore files.
+    git_ignore_matcher: Gitignore,
+    /// Special matcher for `.git/info/exclude` files.
+    git_exclude_matcher: Gitignore,
+    /// Whether this directory contains a .git sub-directory.
+    has_git: bool,
+    /// Ignore config.
+    opts: IgnoreOptions,
+}
+
+impl Ignore {
+    /// Return the directory path of this matcher.
+    #[cfg(test)]
+    pub(crate) fn path(&self) -> &Path {
+        &self.inner.dir
+    }
+
+    /// Return true if this matcher has no parent.
+    pub(crate) fn is_root(&self) -> bool {
+        self.inner.parent.is_none()
+    }
+
+    /// Return this matcher's parent, if one exists.
+    pub(crate) fn parent(&self) -> Option<Ignore> {
+        self.inner.parent.as_ref().map(|parent| Ignore {
+            inner: parent.clone(),
+            absolute_base: self.absolute_base.clone(),
+        })
+    }
+
+    /// Create a new `Ignore` matcher with the parent directories of `dir`.
+    ///
+    /// Note that this can only be called on an `Ignore` matcher with no
+    /// parents (i.e., `is_root` returns `true`). This will panic otherwise.
+    pub(crate) fn add_parents<P: AsRef<Path>>(
+        &self,
+        path: P,
+    ) -> (Ignore, Option<Error>) {
+        if !self.inner.opts.parents
+            && !self.inner.opts.git_ignore
+            && !self.inner.opts.git_exclude
+            && !self.inner.opts.git_global
+        {
+            // If we never need info from parent directories, then don't do
+            // anything.
+            return (self.clone(), None);
+        }
+        if !self.is_root() {
+            panic!("Ignore::add_parents called on non-root matcher");
+        }
+        // CHANGED: Use `dunce::canonicalize` as we use it everywhere else.
+        let absolute_base = match dunce::canonicalize(path.as_ref()) {
+            Ok(path) => Arc::new(path),
+            Err(_) => {
+                // There's not much we can do here, so just return our
+                // existing matcher. We drop the error to be consistent
+                // with our general pattern of ignoring I/O errors when
+                // processing ignore files.
+                return (self.clone(), None);
+            }
+        };
+        // List of parents, from child to root.
+        let mut parents = vec![];
+        let mut path = &**absolute_base;
+        while let Some(parent) = path.parent() {
+            parents.push(parent);
+            path = parent;
+        }
+        let mut errs = PartialErrorBuilder::default();
+        let mut ig = self.clone();
+        for parent in parents.into_iter().rev() {
+            let mut compiled = self.inner.compiled.write().unwrap();
+            if let Some(weak) = compiled.get(parent.as_os_str()) {
+                if let Some(prebuilt) = weak.upgrade() {
+                    ig = Ignore {
+                        inner: prebuilt,
+                        absolute_base: Some(absolute_base.clone()),
+                    };
+                    continue;
+                }
+            }
+            let (mut igtmp, err) = ig.add_child_path(parent);
+            errs.maybe_push(err);
+            igtmp.is_absolute_parent = true;
+            igtmp.has_git =
+                if self.inner.opts.require_git && self.inner.opts.git_ignore {
+                    parent.join(".git").exists() || parent.join(".jj").exists()
+                } else {
+                    false
+                };
+            let ig_arc = Arc::new(igtmp);
+            ig = Ignore {
+                inner: ig_arc.clone(),
+                absolute_base: Some(absolute_base.clone()),
+            };
+            compiled.insert(
+                parent.as_os_str().to_os_string(),
+                Arc::downgrade(&ig_arc),
+            );
+        }
+        (ig, errs.into_error_option())
+    }
+
+    /// Create a new `Ignore` matcher for the given child directory.
+    ///
+    /// Since building the matcher may require reading from multiple
+    /// files, it's possible that this method partially succeeds. Therefore,
+    /// a matcher is always returned (which may match nothing) and an error is
+    /// returned if it exists.
+    ///
+    /// Note that all I/O errors are completely ignored.
+    pub(crate) fn add_child<P: AsRef<Path>>(
+        &self,
+        dir: P,
+    ) -> (Ignore, Option<Error>) {
+        let (ig, err) = self.add_child_path(dir.as_ref());
+        (
+            Ignore {
+                inner: Arc::new(ig),
+                absolute_base: self.absolute_base.clone(),
+            },
+            err,
+        )
+    }
+
+    /// Like add_child, but uses successful read_dir entries to reduce
+    /// probing when discovering ignore files.
+    pub(crate) fn add_child_with_entries<P: AsRef<Path>>(
+        &self,
+        dir: P,
+        entries: &[fs::DirEntry],
+    ) -> (Ignore, Option<Error>) {
+        let files = self.collect_ignore_files(entries);
+        let (ig, err) = self.add_child_path_with_found_ignore_files(
+            dir.as_ref(),
+            Some(&files),
+        );
+        (
+            Ignore {
+                inner: Arc::new(ig),
+                absolute_base: self.absolute_base.clone(),
+            },
+            err,
+        )
+    }
+
+    /// Like add_child, but takes a full path and returns an IgnoreInner.
+    fn add_child_path(&self, dir: &Path) -> (IgnoreInner, Option<Error>) {
+        self.add_child_path_with_found_ignore_files(dir, None)
+    }
+
+    fn collect_ignore_files(
+        &self,
+        entries: &[fs::DirEntry],
+    ) -> IgnoreFilesFound {
+        let custom_ignore_filenames = &self.inner.custom_ignore_filenames;
+        let mut files = IgnoreFilesFound {
+            has_ignore: false,
+            has_git_ignore: false,
+            has_git_dir: false,
+            has_jj_dir: false,
+            custom_ignore_files: vec![false; custom_ignore_filenames.len()],
+        };
+        for entry in entries {
+            let file_name = entry.file_name();
+            if file_name == OsStr::new(".ignore") {
+                files.has_ignore = true;
+            } else if file_name == OsStr::new(".gitignore") {
+                files.has_git_ignore = true;
+            } else if file_name == OsStr::new(".git") {
+                files.has_git_dir = true;
+            } else if file_name == OsStr::new(".jj") {
+                files.has_jj_dir = true;
+            }
+            for (i, name) in custom_ignore_filenames.iter().enumerate() {
+                if file_name == name.as_os_str() {
+                    files.custom_ignore_files[i] = true;
+                }
+            }
+        }
+        files
+    }
+
+    fn add_child_path_with_found_ignore_files(
+        &self,
+        dir: &Path,
+        ignore_files_list: Option<&IgnoreFilesFound>,
+    ) -> (IgnoreInner, Option<Error>) {
+        let check_vcs_dir = self.inner.opts.require_git
+            && (self.inner.opts.git_ignore || self.inner.opts.git_exclude);
+        let git_type = if check_vcs_dir
+            && ignore_files_list.is_none_or(|i| i.has_git_dir)
+        {
+            dir.join(".git").metadata().ok().map(|md| md.file_type())
+        } else {
+            None
+        };
+        let has_jj = check_vcs_dir
+            && ignore_files_list.is_none_or(|i| i.has_jj_dir)
+            && dir.join(".jj").exists();
+        let has_git = check_vcs_dir && (git_type.is_some() || has_jj);
+
+        let mut errs = PartialErrorBuilder::default();
+        let custom_ig_matcher = if self
+            .inner
+            .custom_ignore_filenames
+            .is_empty()
+        {
+            Gitignore::empty()
+        } else {
+            let custom_ignore_names: Vec<&OsString> = match ignore_files_list {
+                None => self.inner.custom_ignore_filenames.iter().collect(),
+                Some(m) => self
+                    .inner
+                    .custom_ignore_filenames
+                    .iter()
+                    .zip(m.custom_ignore_files.iter())
+                    .filter(|&(_, &matched)| matched)
+                    .map(|(name, _)| name)
+                    .collect(),
+            };
+            if custom_ignore_names.is_empty() {
+                Gitignore::empty()
+            } else {
+                let (m, err) = create_gitignore(
+                    &dir,
+                    &dir,
+                    &custom_ignore_names,
+                    self.inner.opts.ignore_case_insensitive,
+                );
+                errs.maybe_push(err);
+                m
+            }
+        };
+        let ig_matcher = if !self.inner.opts.ignore
+            || !ignore_files_list.is_none_or(|i| i.has_ignore)
+        {
+            Gitignore::empty()
+        } else {
+            let (m, err) = create_gitignore(
+                &dir,
+                &dir,
+                &[".ignore"],
+                self.inner.opts.ignore_case_insensitive,
+            );
+            errs.maybe_push(err);
+            m
+        };
+        let gi_matcher = if !self.inner.opts.git_ignore
+            || !ignore_files_list.is_none_or(|i| i.has_git_ignore)
+        {
+            Gitignore::empty()
+        } else {
+            let (m, err) = create_gitignore(
+                &dir,
+                &dir,
+                &[".gitignore"],
+                self.inner.opts.ignore_case_insensitive,
+            );
+            errs.maybe_push(err);
+            m
+        };
+
+        let gi_exclude_matcher = if !self.inner.opts.git_exclude
+            || !ignore_files_list.is_none_or(|i| i.has_git_dir)
+        {
+            Gitignore::empty()
+        } else {
+            match resolve_git_commondir(dir, git_type) {
+                Ok(git_dir) => {
+                    let (m, err) = create_gitignore(
+                        &dir,
+                        &git_dir,
+                        &["info/exclude"],
+                        self.inner.opts.ignore_case_insensitive,
+                    );
+                    errs.maybe_push(err);
+                    m
+                }
+                Err(err) => {
+                    errs.maybe_push(err);
+                    Gitignore::empty()
+                }
+            }
+        };
+        let ig = IgnoreInner {
+            compiled: self.inner.compiled.clone(),
+            dir: dir.to_path_buf(),
+            overrides: self.inner.overrides.clone(),
+            types: self.inner.types.clone(),
+            parent: Some(self.inner.clone()),
+            is_absolute_parent: false,
+            global_gitignores_relative_to: self
+                .inner
+                .global_gitignores_relative_to
+                .clone(),
+            explicit_ignores: self.inner.explicit_ignores.clone(),
+            custom_ignore_filenames: self
+                .inner
+                .custom_ignore_filenames
+                .clone(),
+            custom_ignore_matcher: custom_ig_matcher,
+            ignore_matcher: ig_matcher,
+            git_global_matcher: self.inner.git_global_matcher.clone(),
+            git_ignore_matcher: gi_matcher,
+            git_exclude_matcher: gi_exclude_matcher,
+            has_git,
+            opts: self.inner.opts,
+        };
+        (ig, errs.into_error_option())
+    }
+
+    /// Returns true if at least one type of ignore rule should be matched.
+    fn has_any_ignore_rules(&self) -> bool {
+        let opts = self.inner.opts;
+        let has_custom_ignore_files =
+            !self.inner.custom_ignore_filenames.is_empty();
+        let has_explicit_ignores = !self.inner.explicit_ignores.is_empty();
+
+        opts.ignore
+            || opts.git_global
+            || opts.git_ignore
+            || opts.git_exclude
+            || has_custom_ignore_files
+            || has_explicit_ignores
+    }
+
+    /// Like `matched`, but works with a directory entry instead.
+    pub(crate) fn matched_dir_entry<'a>(
+        &'a self,
+        dent: &DirEntry,
+    ) -> Match<IgnoreMatch<'a>> {
+        let m = self.matched(dent.path(), dent.is_dir());
+        if m.is_none() && self.inner.opts.hidden && is_hidden_entry(dent) {
+            return Match::Ignore(IgnoreMatch::hidden());
+        }
+        m
+    }
+
+    /// Returns a match indicating whether the given file path should be
+    /// ignored or not.
+    ///
+    /// The match contains information about its origin.
+    pub(crate) fn matched<'a, P: AsRef<Path>>(
+        &'a self,
+        path: P,
+        is_dir: bool,
+    ) -> Match<IgnoreMatch<'a>> {
+        // We need to be careful with our path. If it has a leading ./, then
+        // strip it because it causes nothing but trouble.
+        let mut path = path.as_ref();
+        if let Some(p) = strip_prefix("./", path) {
+            path = p;
+        }
+        // Match against the override patterns. If an override matches
+        // regardless of whether it's whitelist/ignore, then we quit and
+        // return that result immediately. Overrides have the highest
+        // precedence.
+        if !self.inner.overrides.is_empty() {
+            let mat = self
+                .inner
+                .overrides
+                .matched(path, is_dir)
+                .map(IgnoreMatch::overrides);
+            if !mat.is_none() {
+                return mat;
+            }
+        }
+        let mut whitelisted = Match::None;
+        if self.has_any_ignore_rules() {
+            let mat = self.matched_ignore(path, is_dir);
+            if mat.is_ignore() {
+                return mat;
+            } else if mat.is_whitelist() {
+                whitelisted = mat;
+            }
+        }
+        if !self.inner.types.is_empty() {
+            let mat =
+                self.inner.types.matched(path, is_dir).map(IgnoreMatch::types);
+            if mat.is_ignore() {
+                return mat;
+            } else if mat.is_whitelist() {
+                whitelisted = mat;
+            }
+        }
+        whitelisted
+    }
+
+    /// Performs matching only on the ignore files for this directory and
+    /// all parent directories.
+    pub(crate) fn matched_ignore<'a>(
+        &'a self,
+        path: &Path,
+        is_dir: bool,
+    ) -> Match<IgnoreMatch<'a>> {
+        let (
+            mut m_custom_ignore,
+            mut m_ignore,
+            mut m_gi,
+            mut m_gi_exclude,
+            mut m_explicit,
+        ) = (Match::None, Match::None, Match::None, Match::None, Match::None);
+        let any_git = !self.inner.opts.require_git
+            || self.parents().any(|ig| ig.inner.has_git);
+        let mut saw_git = false;
+        for ig in self.parents().take_while(|ig| !ig.inner.is_absolute_parent)
+        {
+            if m_custom_ignore.is_none() {
+                m_custom_ignore = ig
+                    .inner
+                    .custom_ignore_matcher
+                    .matched(path, is_dir)
+                    .map(IgnoreMatch::gitignore);
+            }
+            if m_ignore.is_none() {
+                m_ignore = ig
+                    .inner
+                    .ignore_matcher
+                    .matched(path, is_dir)
+                    .map(IgnoreMatch::gitignore);
+            }
+            if any_git && !saw_git && m_gi.is_none() {
+                m_gi = ig
+                    .inner
+                    .git_ignore_matcher
+                    .matched(path, is_dir)
+                    .map(IgnoreMatch::gitignore);
+            }
+            if any_git && !saw_git && m_gi_exclude.is_none() {
+                m_gi_exclude = ig
+                    .inner
+                    .git_exclude_matcher
+                    .matched(path, is_dir)
+                    .map(IgnoreMatch::gitignore);
+            }
+            saw_git = saw_git || ig.inner.has_git;
+        }
+        if self.inner.opts.parents {
+            if let Some(abs_parent_path) = self.absolute_base() {
+                // What we want to do here is take the absolute base path of
+                // this directory and join it with the path we're searching.
+                // The main issue we want to avoid is accidentally duplicating
+                // directory components, so we try to strip any common prefix
+                // off of `path`. Overall, this seems a little ham-fisted, but
+                // it does fix a nasty bug. It should do fine until we overhaul
+                // this crate.
+                let path = abs_parent_path.join(
+                    self.parents()
+                        .take_while(|ig| !ig.inner.is_absolute_parent)
+                        .last()
+                        .map_or(path, |ig| {
+                            // This is a weird special case when ripgrep users
+                            // search with just a `.`, as some tools do
+                            // automatically (like consult). In this case, if
+                            // we don't bail out now, the code below will strip
+                            // a leading `.` from `path`, which might mangle
+                            // a hidden file name!
+                            if ig.inner.dir.as_path() == Path::new(".") {
+                                return path;
+                            }
+                            let without_dot_slash = strip_if_is_prefix(
+                                "./",
+                                ig.inner.dir.as_path(),
+                            );
+                            let relative_base =
+                                strip_if_is_prefix(without_dot_slash, path);
+                            strip_if_is_prefix("/", relative_base)
+                        }),
+                );
+
+                for ig in self
+                    .parents()
+                    .skip_while(|ig| !ig.inner.is_absolute_parent)
+                {
+                    if m_custom_ignore.is_none() {
+                        m_custom_ignore = ig
+                            .inner
+                            .custom_ignore_matcher
+                            .matched(&path, is_dir)
+                            .map(IgnoreMatch::gitignore);
+                    }
+                    if m_ignore.is_none() {
+                        m_ignore = ig
+                            .inner
+                            .ignore_matcher
+                            .matched(&path, is_dir)
+                            .map(IgnoreMatch::gitignore);
+                    }
+                    if any_git && !saw_git && m_gi.is_none() {
+                        m_gi = ig
+                            .inner
+                            .git_ignore_matcher
+                            .matched(&path, is_dir)
+                            .map(IgnoreMatch::gitignore);
+                    }
+                    if any_git && !saw_git && m_gi_exclude.is_none() {
+                        m_gi_exclude = ig
+                            .inner
+                            .git_exclude_matcher
+                            .matched(&path, is_dir)
+                            .map(IgnoreMatch::gitignore);
+                    }
+                    saw_git = saw_git || ig.inner.has_git;
+                }
+            }
+        }
+        for gi in self.inner.explicit_ignores.iter().rev() {
+            if !m_explicit.is_none() {
+                break;
+            }
+            // CHANGED: We need to make sure that the explicit gitignore rules
+            // apply to the path
+            //
+            //     path      = Is the current file/folder we are traversing
+            //     gi.path() = Is the path of the custom gitignore file
+            //
+            // E.g.: If we have a custom rule for `/src/utils` with `**/*`, and
+            //       we are looking at just `/src`, then the `**/*` rules do
+            //       not apply to this folder, so we can ignore the current
+            //       custom gitignore file.
+            if !path.starts_with(gi.path()) {
+                continue;
+            }
+            m_explicit = gi.matched(&path, is_dir).map(IgnoreMatch::gitignore);
+        }
+        let m_global = if any_git {
+            self.inner
+                .git_global_matcher
+                .matched(&path, is_dir)
+                .map(IgnoreMatch::gitignore)
+        } else {
+            Match::None
+        };
+
+        // CHANGED: We added logic to configure an order in which the ignore
+        // files are respected. Explicitly added ignores (via
+        // `WalkBuilder::add_gitignore`) take precedence over all ignore files
+        // found on disk, and the first source with a definitive answer wins.
+        let order = [
+            // Manually added ignores
+            m_explicit,
+            // .custom-ignore
+            m_custom_ignore,
+            // .ignore
+            m_ignore,
+            // .gitignore
+            m_gi,
+            // .git/info/exclude
+            m_gi_exclude,
+            // Global gitignore
+            m_global,
+        ];
+        for check in order.into_iter() {
+            if !check.is_none() {
+                return check;
+            }
+        }
+        Match::None
+    }
+
+    /// Returns an iterator over parent ignore matchers, including this one.
+    pub(crate) fn parents(&self) -> Parents<'_> {
+        Parents(Some(IgnoreRef { inner: &self.inner }))
+    }
+
+    /// Returns the first absolute path of the first absolute parent, if
+    /// one exists.
+    fn absolute_base(&self) -> Option<&Path> {
+        self.absolute_base.as_ref().map(|p| &***p)
+    }
+}
+
+/// State for tracking what kinds of files ripgrep is interested in for a
+/// given directory.
+///
+/// This is computed over the entire set of files in a directory instead of
+/// trying to stat each file individually. If a file is present, it's only then
+/// that we stat it for more information, instead of relying on the stat to
+/// determine its existence.
+#[derive(Debug)]
+struct IgnoreFilesFound {
+    has_ignore: bool,
+    has_git_ignore: bool,
+    has_git_dir: bool,
+    has_jj_dir: bool,
+    custom_ignore_files: Vec<bool>,
+}
+
+#[derive(Clone, Copy)]
+pub(crate) struct IgnoreRef<'a> {
+    inner: &'a IgnoreInner,
+}
+
+impl IgnoreRef<'_> {
+    pub(crate) fn path(&self) -> &Path {
+        &self.inner.dir
+    }
+
+    pub(crate) fn is_absolute_parent(&self) -> bool {
+        self.inner.is_absolute_parent
+    }
+}
+
+/// An iterator over all parents of an ignore matcher, including itself.
+pub(crate) struct Parents<'a>(Option<IgnoreRef<'a>>);
+
+impl<'a> Iterator for Parents<'a> {
+    type Item = IgnoreRef<'a>;
+
+    fn next(&mut self) -> Option<IgnoreRef<'a>> {
+        match self.0.take() {
+            None => None,
+            Some(ig) => {
+                self.0 = ig
+                    .inner
+                    .parent
+                    .as_deref()
+                    .map(|inner| IgnoreRef { inner });
+                Some(ig)
+            }
+        }
+    }
+}
+
+/// A builder for creating an Ignore matcher.
+#[derive(Clone, Debug)]
+pub(crate) struct IgnoreBuilder {
+    /// The root directory path for this ignore matcher.
+    dir: PathBuf,
+    /// An override matcher (default is empty).
+    overrides: Arc<Override>,
+    /// A type matcher (default is empty).
+    types: Arc<Types>,
+    /// Explicit global ignore matchers.
+    explicit_ignores: Vec<Gitignore>,
+    /// Ignore files in addition to .ignore.
+    custom_ignore_filenames: Vec<OsString>,
+    /// The directory that gitignores should be interpreted relative to.
+    ///
+    /// Usually this is the directory containing the gitignore file. But in
+    /// some cases, like for global gitignores or for gitignores specified
+    /// explicitly, this should generally be set to the current working
+    /// directory. This is only used for global gitignores or "explicit"
+    /// gitignores.
+    ///
+    /// When `None`, global gitignores are ignored.
+    global_gitignores_relative_to: Option<PathBuf>,
+    /// Ignore config.
+    opts: IgnoreOptions,
+}
+
+impl IgnoreBuilder {
+    /// Create a new builder for an `Ignore` matcher.
+    ///
+    /// It is likely a bug to use this without also calling `current_dir()`
+    /// outside of tests. This isn't made mandatory because this is an internal
+    /// abstraction and it's annoying to update tests.
+    pub(crate) fn new() -> IgnoreBuilder {
+        IgnoreBuilder {
+            dir: Path::new("").to_path_buf(),
+            overrides: Arc::new(Override::empty()),
+            types: Arc::new(Types::empty()),
+            explicit_ignores: vec![],
+            custom_ignore_filenames: vec![],
+            global_gitignores_relative_to: None,
+            opts: IgnoreOptions {
+                hidden: true,
+                ignore: true,
+                parents: true,
+                git_global: true,
+                git_ignore: true,
+                git_exclude: true,
+                ignore_case_insensitive: false,
+                require_git: true,
+            },
+        }
+    }
+
+    /// Builds a new `Ignore` matcher.
+    ///
+    /// The matcher returned won't match anything until ignore rules from
+    /// directories are added to it.
+    pub(crate) fn build(&self) -> Ignore {
+        self.build_with_cwd(None)
+    }
+
+    /// Builds a new `Ignore` matcher using the given CWD directory.
+    ///
+    /// The matcher returned won't match anything until ignore rules from
+    /// directories are added to it.
+    pub(crate) fn build_with_cwd(&self, cwd: Option<PathBuf>) -> Ignore {
+        let global_gitignores_relative_to =
+            cwd.or_else(|| self.global_gitignores_relative_to.clone());
+        let git_global_matcher = if !self.opts.git_global {
+            Gitignore::empty()
+        } else if let Some(ref cwd) = global_gitignores_relative_to {
+            let mut builder = GitignoreBuilder::new(cwd);
+            builder
+                .case_insensitive(self.opts.ignore_case_insensitive)
+                .unwrap();
+            let (gi, err) = builder.build_global();
+            if let Some(err) = err {
+                log::debug!("{}", err);
+            }
+            gi
+        } else {
+            log::debug!(
+                "ignoring global gitignore file because CWD is not known"
+            );
+            Gitignore::empty()
+        };
+
+        Ignore {
+            inner: Arc::new(IgnoreInner {
+                compiled: Arc::new(RwLock::new(HashMap::new())),
+                dir: self.dir.clone(),
+                overrides: self.overrides.clone(),
+                types: self.types.clone(),
+                parent: None,
+                is_absolute_parent: true,
+                global_gitignores_relative_to,
+                explicit_ignores: Arc::new(self.explicit_ignores.clone()),
+                custom_ignore_filenames: Arc::new(
+                    self.custom_ignore_filenames.clone(),
+                ),
+                custom_ignore_matcher: Gitignore::empty(),
+                ignore_matcher: Gitignore::empty(),
+                git_global_matcher: Arc::new(git_global_matcher),
+                git_ignore_matcher: Gitignore::empty(),
+                git_exclude_matcher: Gitignore::empty(),
+                has_git: false,
+                opts: self.opts,
+            }),
+            absolute_base: None,
+        }
+    }
+
+    /// Set the current directory used for matching global gitignores.
+    pub(crate) fn current_dir(
+        &mut self,
+        cwd: impl Into<PathBuf>,
+    ) -> &mut IgnoreBuilder {
+        self.global_gitignores_relative_to = Some(cwd.into());
+        self
+    }
+
+    /// Add an override matcher.
+    ///
+    /// By default, no override matcher is used.
+    ///
+    /// This overrides any previous setting.
+    pub(crate) fn overrides(
+        &mut self,
+        overrides: Override,
+    ) -> &mut IgnoreBuilder {
+        self.overrides = Arc::new(overrides);
+        self
+    }
+
+    /// Add a file type matcher.
+    ///
+    /// By default, no file type matcher is used.
+    ///
+    /// This overrides any previous setting.
+    pub(crate) fn types(&mut self, types: Types) -> &mut IgnoreBuilder {
+        self.types = Arc::new(types);
+        self
+    }
+
+    /// Adds a new global ignore matcher from the ignore file path given.
+    pub(crate) fn add_ignore(&mut self, ig: Gitignore) -> &mut IgnoreBuilder {
+        self.explicit_ignores.push(ig);
+        self
+    }
+
+    /// Add a custom ignore file name
+    ///
+    /// These ignore files have higher precedence than all other ignore files.
+    ///
+    /// When specifying multiple names, earlier names have lower precedence than
+    /// later names.
+    pub(crate) fn add_custom_ignore_filename<S: AsRef<OsStr>>(
+        &mut self,
+        file_name: S,
+    ) -> &mut IgnoreBuilder {
+        self.custom_ignore_filenames.push(file_name.as_ref().to_os_string());
+        self
+    }
+
+    /// Enables ignoring hidden files.
+    ///
+    /// This is enabled by default.
+    pub(crate) fn hidden(&mut self, yes: bool) -> &mut IgnoreBuilder {
+        self.opts.hidden = yes;
+        self
+    }
+
+    /// Whether ignoring hidden files is enabled or not.
+    pub(crate) fn is_hidden(&self) -> bool {
+        self.opts.hidden
+    }
+
+    /// Enables reading `.ignore` files.
+    ///
+    /// `.ignore` files have the same semantics as `gitignore` files and are
+    /// supported by search tools such as ripgrep and The Silver Searcher.
+    ///
+    /// This is enabled by default.
+    pub(crate) fn ignore(&mut self, yes: bool) -> &mut IgnoreBuilder {
+        self.opts.ignore = yes;
+        self
+    }
+
+    /// Enables reading ignore files from parent directories.
+    ///
+    /// If this is enabled, then .gitignore files in parent directories of each
+    /// file path given are respected. Otherwise, they are ignored.
+    ///
+    /// This is enabled by default.
+    pub(crate) fn parents(&mut self, yes: bool) -> &mut IgnoreBuilder {
+        self.opts.parents = yes;
+        self
+    }
+
+    /// Add a global gitignore matcher.
+    ///
+    /// Its precedence is lower than both normal `.gitignore` files and
+    /// `.git/info/exclude` files.
+    ///
+    /// This overwrites any previous global gitignore setting.
+    ///
+    /// This is enabled by default.
+    pub(crate) fn git_global(&mut self, yes: bool) -> &mut IgnoreBuilder {
+        self.opts.git_global = yes;
+        self
+    }
+
+    /// Enables reading `.gitignore` files.
+    ///
+    /// `.gitignore` files have match semantics as described in the `gitignore`
+    /// man page.
+    ///
+    /// This is enabled by default.
+    pub(crate) fn git_ignore(&mut self, yes: bool) -> &mut IgnoreBuilder {
+        self.opts.git_ignore = yes;
+        self
+    }
+
+    /// Enables reading `.git/info/exclude` files.
+    ///
+    /// `.git/info/exclude` files have match semantics as described in the
+    /// `gitignore` man page.
+    ///
+    /// This is enabled by default.
+    pub(crate) fn git_exclude(&mut self, yes: bool) -> &mut IgnoreBuilder {
+        self.opts.git_exclude = yes;
+        self
+    }
+
+    /// Whether a git repository is required to apply git-related ignore
+    /// rules (global rules, .gitignore and local exclude rules).
+    ///
+    /// When disabled, git-related ignore rules are applied even when searching
+    /// outside a git repository.
+    pub(crate) fn require_git(&mut self, yes: bool) -> &mut IgnoreBuilder {
+        self.opts.require_git = yes;
+        self
+    }
+
+    /// Process ignore files case insensitively
+    ///
+    /// This is disabled by default.
+    pub(crate) fn ignore_case_insensitive(
+        &mut self,
+        yes: bool,
+    ) -> &mut IgnoreBuilder {
+        self.opts.ignore_case_insensitive = yes;
+        self
+    }
+}
+
+/// Creates a new gitignore matcher for the directory given.
+///
+/// The matcher is meant to match files below `dir`.
+/// Ignore globs are extracted from each of the file names relative to
+/// `dir_for_ignorefile` in the order given (earlier names have lower
+/// precedence than later names).
+///
+/// I/O errors are ignored.
+pub(crate) fn create_gitignore<T: AsRef<OsStr>>(
+    dir: &Path,
+    dir_for_ignorefile: &Path,
+    names: &[T],
+    case_insensitive: bool,
+) -> (Gitignore, Option<Error>) {
+    let mut builder = GitignoreBuilder::new(dir);
+    let mut errs = PartialErrorBuilder::default();
+    builder.case_insensitive(case_insensitive).unwrap();
+    for name in names {
+        let gipath = dir_for_ignorefile.join(name.as_ref());
+        // This check is not necessary, but is added for performance. Namely,
+        // a simple stat call checking for existence can often be just a bit
+        // quicker than actually trying to open a file. Since the number of
+        // directories without ignore files likely greatly exceeds the number
+        // with ignore files, this check generally makes sense.
+        //
+        // However, until demonstrated otherwise, we speculatively do not do
+        // this on Windows since Windows is notorious for having slow file
+        // system operations. Namely, it's not clear whether this analysis
+        // makes sense on Windows.
+        //
+        // For more details: https://github.com/BurntSushi/ripgrep/pull/1381
+        if cfg!(windows) || gipath.exists() {
+            errs.maybe_push_ignore_io(builder.add(gipath));
+        }
+    }
+    let gi = match builder.build() {
+        Ok(gi) => gi,
+        Err(err) => {
+            errs.push(err);
+            GitignoreBuilder::new(dir).build().unwrap()
+        }
+    };
+    (gi, errs.into_error_option())
+}
+
+/// Find the GIT_COMMON_DIR for the given git worktree.
+///
+/// This is the directory that may contain a private ignore file
+/// "info/exclude". Unlike git, this function does *not* read environment
+/// variables GIT_DIR and GIT_COMMON_DIR, because it is not clear how to use
+/// them when multiple repositories are searched.
+///
+/// Some I/O errors are ignored.
+fn resolve_git_commondir(
+    dir: &Path,
+    git_type: Option<FileType>,
+) -> Result<PathBuf, Option<Error>> {
+    let git_dir_path = || dir.join(".git");
+    let git_dir = git_dir_path();
+    if !git_type.map_or(false, |ft| ft.is_file()) {
+        return Ok(git_dir);
+    }
+    let file = match File::open(git_dir) {
+        Ok(file) => io::BufReader::new(file),
+        Err(err) => {
+            return Err(Some(Error::Io(err).with_path(git_dir_path())));
+        }
+    };
+    let dot_git_line = match file.lines().next() {
+        Some(Ok(line)) => line,
+        Some(Err(err)) => {
+            return Err(Some(Error::Io(err).with_path(git_dir_path())));
+        }
+        None => return Err(None),
+    };
+    if !dot_git_line.starts_with("gitdir: ") {
+        return Err(None);
+    }
+    let real_git_dir = PathBuf::from(&dot_git_line["gitdir: ".len()..]);
+    let git_commondir_file = || real_git_dir.join("commondir");
+    let file = match File::open(git_commondir_file()) {
+        Ok(file) => io::BufReader::new(file),
+        Err(_) => return Err(None),
+    };
+    let commondir_line = match file.lines().next() {
+        Some(Ok(line)) => line,
+        Some(Err(err)) => {
+            return Err(Some(Error::Io(err).with_path(git_commondir_file())));
+        }
+        None => return Err(None),
+    };
+    let commondir_abs = if commondir_line.starts_with(".") {
+        real_git_dir.join(commondir_line) // relative commondir
+    } else {
+        PathBuf::from(commondir_line)
+    };
+    Ok(commondir_abs)
+}
+
+/// Strips `prefix` from `path` if it's a prefix, otherwise returns `path`
+/// unchanged.
+fn strip_if_is_prefix<'a, P: AsRef<Path> + ?Sized>(
+    prefix: &'a P,
+    path: &'a Path,
+) -> &'a Path {
+    strip_prefix(prefix, path).map_or(path, |p| p)
+}
+
+#[cfg(test)]
+mod tests {
+    use std::{io::Write, path::Path, sync::Arc};
+
+    use crate::{
+        Error, dir::IgnoreBuilder, gitignore::Gitignore, tests::TempDir,
+    };
+
+    fn wfile<P: AsRef<Path>>(path: P, contents: &str) {
+        let mut file = std::fs::File::create(path).unwrap();
+        file.write_all(contents.as_bytes()).unwrap();
+    }
+
+    fn mkdirp<P: AsRef<Path>>(path: P) {
+        std::fs::create_dir_all(path).unwrap();
+    }
+
+    fn partial(err: Error) -> Vec<Error> {
+        match err {
+            Error::Partial(errs) => errs,
+            _ => panic!("expected partial error but got {:?}", err),
+        }
+    }
+
+    fn tmpdir() -> TempDir {
+        TempDir::new().unwrap()
+    }
+
+    #[test]
+    fn explicit_ignore() {
+        let td = tmpdir();
+        wfile(td.path().join("not-an-ignore"), "foo\n!bar");
+
+        let (gi, err) = Gitignore::new(td.path().join("not-an-ignore"));
+        assert!(err.is_none());
+        let (ig, err) =
+            IgnoreBuilder::new().add_ignore(gi).build().add_child(td.path());
+        assert!(err.is_none());
+        // CHANGED: Explicit ignores only apply to paths inside the directory
+        // of the ignore file, so we have to match against full paths.
+        assert!(ig.matched(td.path().join("foo"), false).is_ignore());
+        assert!(ig.matched(td.path().join("bar"), false).is_whitelist());
+        assert!(ig.matched(td.path().join("baz"), false).is_none());
+        assert!(ig.matched("/foo", false).is_none());
+    }
+
+    #[test]
+    fn git_exclude() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".git/info"));
+        wfile(td.path().join(".git/info/exclude"), "foo\n!bar");
+
+        let (ig, err) = IgnoreBuilder::new().build().add_child(td.path());
+        assert!(err.is_none());
+        assert!(ig.matched("foo", false).is_ignore());
+        assert!(ig.matched("bar", false).is_whitelist());
+        assert!(ig.matched("baz", false).is_none());
+    }
+
+    #[test]
+    fn gitignore() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".git"));
+        wfile(td.path().join(".gitignore"), "foo\n!bar");
+
+        let (ig, err) = IgnoreBuilder::new().build().add_child(td.path());
+        assert!(err.is_none());
+        assert!(ig.matched("foo", false).is_ignore());
+        assert!(ig.matched("bar", false).is_whitelist());
+        assert!(ig.matched("baz", false).is_none());
+    }
+
+    #[test]
+    fn gitignore_with_jj() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".jj"));
+        wfile(td.path().join(".gitignore"), "foo\n!bar");
+
+        let (ig, err) = IgnoreBuilder::new().build().add_child(td.path());
+        assert!(err.is_none());
+        assert!(ig.matched("foo", false).is_ignore());
+        assert!(ig.matched("bar", false).is_whitelist());
+        assert!(ig.matched("baz", false).is_none());
+    }
+
+    #[test]
+    fn gitignore_no_git() {
+        let td = tmpdir();
+        wfile(td.path().join(".gitignore"), "foo\n!bar");
+
+        let (ig, err) = IgnoreBuilder::new().build().add_child(td.path());
+        assert!(err.is_none());
+        assert!(ig.matched("foo", false).is_none());
+        assert!(ig.matched("bar", false).is_none());
+        assert!(ig.matched("baz", false).is_none());
+    }
+
+    #[test]
+    fn gitignore_allowed_no_git() {
+        let td = tmpdir();
+        wfile(td.path().join(".gitignore"), "foo\n!bar");
+
+        let (ig, err) = IgnoreBuilder::new()
+            .require_git(false)
+            .build()
+            .add_child(td.path());
+        assert!(err.is_none());
+        assert!(ig.matched("foo", false).is_ignore());
+        assert!(ig.matched("bar", false).is_whitelist());
+        assert!(ig.matched("baz", false).is_none());
+    }
+
+    #[test]
+    fn ignore() {
+        let td = tmpdir();
+        wfile(td.path().join(".ignore"), "foo\n!bar");
+
+        let (ig, err) = IgnoreBuilder::new().build().add_child(td.path());
+        assert!(err.is_none());
+        assert!(ig.matched("foo", false).is_ignore());
+        assert!(ig.matched("bar", false).is_whitelist());
+        assert!(ig.matched("baz", false).is_none());
+    }
+
+    #[test]
+    fn custom_ignore() {
+        let td = tmpdir();
+        let custom_ignore = ".customignore";
+        wfile(td.path().join(custom_ignore), "foo\n!bar");
+
+        let (ig, err) = IgnoreBuilder::new()
+            .add_custom_ignore_filename(custom_ignore)
+            .build()
+            .add_child(td.path());
+        assert!(err.is_none());
+        assert!(ig.matched("foo", false).is_ignore());
+        assert!(ig.matched("bar", false).is_whitelist());
+        assert!(ig.matched("baz", false).is_none());
+    }
+
+    // Tests that a custom ignore file will override an .ignore.
+    #[test]
+    fn custom_ignore_over_ignore() {
+        let td = tmpdir();
+        let custom_ignore = ".customignore";
+        wfile(td.path().join(".ignore"), "foo");
+        wfile(td.path().join(custom_ignore), "!foo");
+
+        let (ig, err) = IgnoreBuilder::new()
+            .add_custom_ignore_filename(custom_ignore)
+            .build()
+            .add_child(td.path());
+        assert!(err.is_none());
+        assert!(ig.matched("foo", false).is_whitelist());
+    }
+
+    // Tests that earlier custom ignore files have lower precedence than later.
+    #[test]
+    fn custom_ignore_precedence() {
+        let td = tmpdir();
+        let custom_ignore1 = ".customignore1";
+        let custom_ignore2 = ".customignore2";
+        wfile(td.path().join(custom_ignore1), "foo");
+        wfile(td.path().join(custom_ignore2), "!foo");
+
+        let (ig, err) = IgnoreBuilder::new()
+            .add_custom_ignore_filename(custom_ignore1)
+            .add_custom_ignore_filename(custom_ignore2)
+            .build()
+            .add_child(td.path());
+        assert!(err.is_none());
+        assert!(ig.matched("foo", false).is_whitelist());
+    }
+
+    // Tests that an .ignore will override a .gitignore.
+    #[test]
+    fn ignore_over_gitignore() {
+        let td = tmpdir();
+        wfile(td.path().join(".gitignore"), "foo");
+        wfile(td.path().join(".ignore"), "!foo");
+
+        let (ig, err) = IgnoreBuilder::new().build().add_child(td.path());
+        assert!(err.is_none());
+        assert!(ig.matched("foo", false).is_whitelist());
+    }
+
+    // Tests that exclude has lower precedent than both .ignore and .gitignore.
+    #[test]
+    fn exclude_lowest() {
+        let td = tmpdir();
+        wfile(td.path().join(".gitignore"), "!foo");
+        wfile(td.path().join(".ignore"), "!bar");
+        mkdirp(td.path().join(".git/info"));
+        wfile(td.path().join(".git/info/exclude"), "foo\nbar\nbaz");
+
+        let (ig, err) = IgnoreBuilder::new().build().add_child(td.path());
+        assert!(err.is_none());
+        assert!(ig.matched("baz", false).is_ignore());
+        assert!(ig.matched("foo", false).is_whitelist());
+        assert!(ig.matched("bar", false).is_whitelist());
+    }
+
+    #[test]
+    fn errored() {
+        let td = tmpdir();
+        wfile(td.path().join(".gitignore"), "{foo");
+
+        let (_, err) = IgnoreBuilder::new().build().add_child(td.path());
+        assert!(err.is_some());
+    }
+
+    #[test]
+    fn errored_both() {
+        let td = tmpdir();
+        wfile(td.path().join(".gitignore"), "{foo");
+        wfile(td.path().join(".ignore"), "{bar");
+
+        let (_, err) = IgnoreBuilder::new().build().add_child(td.path());
+        assert_eq!(2, partial(err.expect("an error")).len());
+    }
+
+    #[test]
+    fn errored_partial() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".git"));
+        wfile(td.path().join(".gitignore"), "{foo\nbar");
+
+        let (ig, err) = IgnoreBuilder::new().build().add_child(td.path());
+        assert!(err.is_some());
+        assert!(ig.matched("bar", false).is_ignore());
+    }
+
+    #[test]
+    fn errored_partial_and_ignore() {
+        let td = tmpdir();
+        wfile(td.path().join(".gitignore"), "{foo\nbar");
+        wfile(td.path().join(".ignore"), "!bar");
+
+        let (ig, err) = IgnoreBuilder::new().build().add_child(td.path());
+        assert!(err.is_some());
+        assert!(ig.matched("bar", false).is_whitelist());
+    }
+
+    #[test]
+    fn not_present_empty() {
+        let td = tmpdir();
+
+        let (_, err) = IgnoreBuilder::new().build().add_child(td.path());
+        assert!(err.is_none());
+    }
+
+    #[test]
+    fn stops_at_git_dir() {
+        // This tests that .gitignore files beyond a .git barrier aren't
+        // matched, but .ignore files are.
+        let td = tmpdir();
+        mkdirp(td.path().join(".git"));
+        mkdirp(td.path().join("foo/.git"));
+        wfile(td.path().join(".gitignore"), "foo");
+        wfile(td.path().join(".ignore"), "bar");
+
+        let ig0 = IgnoreBuilder::new().build();
+        let (ig1, err) = ig0.add_child(td.path());
+        assert!(err.is_none());
+        let (ig2, err) = ig1.add_child(ig1.path().join("foo"));
+        assert!(err.is_none());
+
+        assert!(ig1.matched("foo", false).is_ignore());
+        assert!(ig2.matched("foo", false).is_none());
+
+        assert!(ig1.matched("bar", false).is_ignore());
+        assert!(ig2.matched("bar", false).is_ignore());
+    }
+
+    #[test]
+    fn absolute_parent() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".git"));
+        mkdirp(td.path().join("foo"));
+        wfile(td.path().join(".gitignore"), "bar");
+
+        // First, check that the parent gitignore file isn't detected if the
+        // parent isn't added. This establishes a baseline.
+        let ig0 = IgnoreBuilder::new().build();
+        let (ig1, err) = ig0.add_child(td.path().join("foo"));
+        assert!(err.is_none());
+        assert!(ig1.matched("bar", false).is_none());
+
+        // Second, check that adding a parent directory actually works.
+        let ig0 = IgnoreBuilder::new().build();
+        let (ig1, err) = ig0.add_parents(td.path().join("foo"));
+        assert!(err.is_none());
+        let (ig2, err) = ig1.add_child(td.path().join("foo"));
+        assert!(err.is_none());
+        assert!(ig2.matched("bar", false).is_ignore());
+    }
+
+    #[test]
+    fn absolute_parent_anchored() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".git"));
+        mkdirp(td.path().join("src/llvm"));
+        wfile(td.path().join(".gitignore"), "/llvm/\nfoo");
+
+        let ig0 = IgnoreBuilder::new().build();
+        let (ig1, err) = ig0.add_parents(td.path().join("src"));
+        assert!(err.is_none());
+        let (ig2, err) = ig1.add_child("src");
+        assert!(err.is_none());
+
+        assert!(ig1.matched("llvm", true).is_none());
+        assert!(ig2.matched("llvm", true).is_none());
+        assert!(ig2.matched("src/llvm", true).is_none());
+        assert!(ig2.matched("foo", false).is_ignore());
+        assert!(ig2.matched("src/foo", false).is_ignore());
+    }
+
+    #[test]
+    fn absolute_parent_matchers_are_cached_across_roots() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".git"));
+        mkdirp(td.path().join("src/build"));
+        mkdirp(td.path().join("tests/build"));
+        wfile(td.path().join(".gitignore"), "tests/**/build/\n");
+
+        let ig0 = IgnoreBuilder::new().build();
+        let (src_parents, err) = ig0.add_parents(td.path().join("src"));
+        assert!(err.is_none());
+        let (src, err) = src_parents.add_child(td.path().join("src"));
+        assert!(err.is_none());
+        let (tests_parents, err) = ig0.add_parents(td.path().join("tests"));
+        assert!(err.is_none());
+        let (tests, err) = tests_parents.add_child(td.path().join("tests"));
+        assert!(err.is_none());
+
+        assert!(Arc::ptr_eq(&src_parents.inner, &tests_parents.inner));
+        assert!(src.matched("build", true).is_none());
+        assert!(tests.matched("build", true).is_ignore());
+    }
+
+    /// Parent matchers are shared across search roots, but path rewriting for
+    /// absolute parents must use each root's own base path. Otherwise a rule
+    /// like `src/invalid` is matched against the wrong absolute path when
+    /// `src` is searched before a sibling root (e.g. `tests`).
+    ///
+    /// Paths passed to `matched` use the same relative layout as `Walk` when
+    /// roots are given as relative directory names.
+    ///
+    /// Regression for: https://github.com/BurntSushi/ripgrep/issues/3376
+    /// and https://github.com/BurntSushi/ripgrep/issues/3419
+    #[test]
+    fn multi_root_gitignore_order_independent() {
+        let td = tmpdir();
+        let cwd = std::env::current_dir().unwrap();
+        // Use paths relative to CWD like the CLI walk does for `rg pat src tests`.
+        let root = td.path().strip_prefix(&cwd).unwrap_or(td.path());
+        let src_root = root.join("src");
+        let tests_root = root.join("tests");
+
+        mkdirp(td.path().join(".git"));
+        mkdirp(td.path().join("src"));
+        mkdirp(td.path().join("tests"));
+        wfile(td.path().join(".gitignore"), "src/invalid\n");
+        wfile(td.path().join("src/invalid"), "x");
+        wfile(td.path().join("src/valid"), "x");
+        wfile(td.path().join("tests/valid"), "x");
+
+        let ig0 = IgnoreBuilder::new().build();
+
+        // Historically buggy order: search `src` first, then `tests`.
+        let (src_parents, err) = ig0.add_parents(&src_root);
+        assert!(err.is_none());
+        let (src, err) = src_parents.add_child(&src_root);
+        assert!(err.is_none());
+        let (tests_parents, err) = ig0.add_parents(&tests_root);
+        assert!(err.is_none());
+        let (tests, err) = tests_parents.add_child(&tests_root);
+        assert!(err.is_none());
+
+        assert!(Arc::ptr_eq(&src_parents.inner, &tests_parents.inner));
+        // Each root must carry its own absolute_base even though inners are shared.
+        assert_ne!(
+            src.absolute_base.as_ref().unwrap().as_path(),
+            tests.absolute_base.as_ref().unwrap().as_path()
+        );
+        assert!(
+            src.matched(src_root.join("invalid"), false).is_ignore(),
+            "parent .gitignore must apply for the src root even when \
+             another root was prepared in the same process"
+        );
+        assert!(src.matched(src_root.join("valid"), false).is_none());
+        assert!(tests.matched(tests_root.join("valid"), false).is_none());
+
+        // Reverse order should behave the same way.
+        let ig0 = IgnoreBuilder::new().build();
+        let (tests_parents, err) = ig0.add_parents(&tests_root);
+        assert!(err.is_none());
+        let (tests, err) = tests_parents.add_child(&tests_root);
+        assert!(err.is_none());
+        let (src_parents, err) = ig0.add_parents(&src_root);
+        assert!(err.is_none());
+        let (src, err) = src_parents.add_child(&src_root);
+        assert!(err.is_none());
+
+        assert!(src.matched(src_root.join("invalid"), false).is_ignore());
+        assert!(src.matched(src_root.join("valid"), false).is_none());
+        assert!(tests.matched(tests_root.join("valid"), false).is_none());
+    }
+
+    /// Same multi-root / order issue for non-git ignore files (e.g. `.rgignore`
+    /// via custom ignore names).
+    ///
+    /// Regression for: https://github.com/BurntSushi/ripgrep/issues/3320
+    #[test]
+    fn multi_root_custom_ignore_order_independent() {
+        let td = tmpdir();
+        let cwd = std::env::current_dir().unwrap();
+        let root = td.path().strip_prefix(&cwd).unwrap_or(td.path());
+        let alpha_root = root.join("alpha");
+        let beta_root = root.join("beta");
+
+        mkdirp(td.path().join("alpha"));
+        mkdirp(td.path().join("beta"));
+        wfile(td.path().join(".rgignore"), "beta/**/*.svg\n");
+        wfile(td.path().join("alpha/a.txt"), "x");
+        wfile(td.path().join("beta/x.svg"), "x");
+
+        let ig0 = IgnoreBuilder::new()
+            .add_custom_ignore_filename(".rgignore")
+            .ignore(false)
+            .git_ignore(false)
+            .git_global(false)
+            .git_exclude(false)
+            .build();
+
+        let (alpha_parents, err) = ig0.add_parents(&alpha_root);
+        assert!(err.is_none());
+        let (alpha, err) = alpha_parents.add_child(&alpha_root);
+        assert!(err.is_none());
+        let (beta_parents, err) = ig0.add_parents(&beta_root);
+        assert!(err.is_none());
+        let (beta, err) = beta_parents.add_child(&beta_root);
+        assert!(err.is_none());
+
+        assert_ne!(
+            alpha.absolute_base.as_ref().unwrap().as_path(),
+            beta.absolute_base.as_ref().unwrap().as_path()
+        );
+        assert!(alpha.matched(alpha_root.join("a.txt"), false).is_none());
+        assert!(
+            beta.matched(beta_root.join("x.svg"), false).is_ignore(),
+            "parent .rgignore must apply for the beta root regardless of \
+             which root was set up first"
+        );
+    }
+
+    #[test]
+    fn git_info_exclude_in_linked_worktree() {
+        let td = tmpdir();
+        let git_dir = td.path().join(".git");
+        mkdirp(git_dir.join("info"));
+        wfile(git_dir.join("info/exclude"), "ignore_me");
+        mkdirp(git_dir.join("worktrees/linked-worktree"));
+        let commondir_path =
+            || git_dir.join("worktrees/linked-worktree/commondir");
+        mkdirp(td.path().join("linked-worktree"));
+        let worktree_git_dir_abs = format!(
+            "gitdir: {}",
+            git_dir.join("worktrees/linked-worktree").to_str().unwrap(),
+        );
+        wfile(td.path().join("linked-worktree/.git"), &worktree_git_dir_abs);
+
+        // relative commondir
+        wfile(commondir_path(), "../..");
+        let ib = IgnoreBuilder::new().build();
+        let (ignore, err) = ib.add_child(td.path().join("linked-worktree"));
+        assert!(err.is_none());
+        assert!(ignore.matched("ignore_me", false).is_ignore());
+
+        // absolute commondir
+        wfile(commondir_path(), git_dir.to_str().unwrap());
+        let (ignore, err) = ib.add_child(td.path().join("linked-worktree"));
+        assert!(err.is_none());
+        assert!(ignore.matched("ignore_me", false).is_ignore());
+
+        // missing commondir file
+        assert!(std::fs::remove_file(commondir_path()).is_ok());
+        let (_, err) = ib.add_child(td.path().join("linked-worktree"));
+        // We squash the error in this case, because it occurs in repositories
+        // that are not linked worktrees but have submodules.
+        assert!(err.is_none());
+
+        wfile(td.path().join("linked-worktree/.git"), "garbage");
+        let (_, err) = ib.add_child(td.path().join("linked-worktree"));
+        assert!(err.is_none());
+
+        wfile(td.path().join("linked-worktree/.git"), "gitdir: garbage");
+        let (_, err) = ib.add_child(td.path().join("linked-worktree"));
+        assert!(err.is_none());
+    }
+}
diff --git a/crates/ignore/src/gitignore.rs b/crates/ignore/src/gitignore.rs
new file mode 100644
index 000000000..8824139b5
--- /dev/null
+++ b/crates/ignore/src/gitignore.rs
@@ -0,0 +1,913 @@
+/*!
+The gitignore module provides a way to match globs from a gitignore file
+against file paths.
+
+Note that this module implements the specification as described in the
+`gitignore` man page from scratch. That is, this module does *not* shell out to
+the `git` command line tool.
+*/
+
+use std::{
+    fs::File,
+    io::{BufRead, BufReader, Read},
+    path::{Path, PathBuf},
+    sync::Arc,
+};
+
+use {
+    globset::{Candidate, GlobBuilder, GlobSet, GlobSetBuilder},
+    regex_automata::util::pool::Pool,
+};
+
+use crate::{
+    Error, Match, PartialErrorBuilder,
+    pathutil::{is_file_name, strip_prefix},
+};
+
+/// Glob represents a single glob in a gitignore file.
+///
+/// This is used to report information about the highest precedent glob that
+/// matched in one or more gitignore files.
+#[derive(Clone, Debug)]
+pub struct Glob {
+    /// The file path that this glob was extracted from.
+    from: Option<PathBuf>,
+    /// The original glob string.
+    original: String,
+    /// The actual glob string used to convert to a regex.
+    actual: String,
+    /// Whether this is a whitelisted glob or not.
+    is_whitelist: bool,
+    /// Whether this glob should only match directories or not.
+    is_only_dir: bool,
+}
+
+impl Glob {
+    /// Returns the file path that defined this glob.
+    pub fn from(&self) -> Option<&Path> {
+        self.from.as_ref().map(|p| &**p)
+    }
+
+    /// The original glob as it was defined in a gitignore file.
+    pub fn original(&self) -> &str {
+        &self.original
+    }
+
+    /// The actual glob that was compiled to respect gitignore
+    /// semantics.
+    pub fn actual(&self) -> &str {
+        &self.actual
+    }
+
+    /// Whether this was a whitelisted glob or not.
+    pub fn is_whitelist(&self) -> bool {
+        self.is_whitelist
+    }
+
+    /// Whether this glob must match a directory or not.
+    pub fn is_only_dir(&self) -> bool {
+        self.is_only_dir
+    }
+
+    /// Returns true if and only if this glob has a `**/` prefix.
+    fn has_doublestar_prefix(&self) -> bool {
+        self.actual.starts_with("**/") || self.actual == "**"
+    }
+}
+
+/// Gitignore is a matcher for the globs in one or more gitignore files
+/// in the same directory.
+#[derive(Clone, Debug)]
+pub struct Gitignore {
+    set: GlobSet,
+    root: PathBuf,
+    globs: Vec<Glob>,
+    num_ignores: u64,
+    num_whitelists: u64,
+    matches: Option<Arc<Pool<Vec<usize>>>>,
+    // CHANGED: Add a flag to have Gitignore rules that apply only to files.
+    only_on_files: bool,
+}
+
+impl Gitignore {
+    /// Creates a new gitignore matcher from the gitignore file path given.
+    ///
+    /// If it's desirable to include multiple gitignore files in a single
+    /// matcher, or read gitignore globs from a different source, then
+    /// use `GitignoreBuilder`.
+    ///
+    /// This always returns a valid matcher, even if it's empty. In particular,
+    /// a Gitignore file can be partially valid, e.g., when one glob is invalid
+    /// but the rest aren't.
+    ///
+    /// Note that I/O errors are ignored. For more granular control over
+    /// errors, use `GitignoreBuilder`.
+    pub fn new<P: AsRef<Path>>(
+        gitignore_path: P,
+    ) -> (Gitignore, Option<Error>) {
+        let path = gitignore_path.as_ref();
+        let parent = path.parent().unwrap_or(Path::new("/"));
+        let mut builder = GitignoreBuilder::new(parent);
+        let mut errs = PartialErrorBuilder::default();
+        errs.maybe_push_ignore_io(builder.add(path));
+        match builder.build() {
+            Ok(gi) => (gi, errs.into_error_option()),
+            Err(err) => {
+                errs.push(err);
+                (Gitignore::empty(), errs.into_error_option())
+            }
+        }
+    }
+
+    /// Creates a new gitignore matcher from the global ignore file, if one
+    /// exists.
+    ///
+    /// The global config file path is specified by git's `core.excludesFile`
+    /// config option.
+    ///
+    /// # Behavior
+    ///
+    /// This routine does its best to discover any global git exclude files.
+    /// This will try to parse out the `excludesFile` config option in your
+    /// global git configuration, if necessary.
+    ///
+    /// The specific things this routine tries (which are subject to change
+    /// based on how git behaves) are:
+    ///
+    ///
+    ///
+    /// Git's config file location is `$HOME/.gitconfig`. If `$HOME/.gitconfig`
+    /// does not exist or does not specify `core.excludesFile`, then
+    /// `$XDG_CONFIG_HOME/git/ignore` is read. If `$XDG_CONFIG_HOME` is not
+    /// set or is empty, then `$HOME/.config/git/ignore` is used instead.
+    pub fn global() -> (Gitignore, Option<Error>) {
+        match std::env::current_dir() {
+            Ok(cwd) => GitignoreBuilder::new(cwd).build_global(),
+            Err(err) => (Gitignore::empty(), Some(err.into())),
+        }
+    }
+
+    /// Creates a new empty gitignore matcher that never matches anything.
+    ///
+    /// Its path is empty.
+    pub fn empty() -> Gitignore {
+        Gitignore {
+            set: GlobSet::empty(),
+            root: PathBuf::from(""),
+            globs: vec![],
+            num_ignores: 0,
+            num_whitelists: 0,
+            matches: None,
+            // CHANGED: Add a flag to have Gitignore rules that apply only to
+            // files.
+            only_on_files: false,
+        }
+    }
+
+    /// Returns the directory containing this gitignore matcher.
+    ///
+    /// All matches are done relative to this path.
+    pub fn path(&self) -> &Path {
+        &*self.root
+    }
+
+    /// Returns true if and only if this gitignore has zero globs, and
+    /// therefore never matches any file path.
+    pub fn is_empty(&self) -> bool {
+        self.set.is_empty()
+    }
+
+    /// Returns the total number of globs, which should be equivalent to
+    /// `num_ignores + num_whitelists`.
+    pub fn len(&self) -> usize {
+        self.set.len()
+    }
+
+    /// Returns the total number of ignore globs.
+    pub fn num_ignores(&self) -> u64 {
+        self.num_ignores
+    }
+
+    /// Returns the total number of whitelisted globs.
+    pub fn num_whitelists(&self) -> u64 {
+        self.num_whitelists
+    }
+
+    /// Returns whether the given path (file or directory) matched a pattern in
+    /// this gitignore matcher.
+    ///
+    /// `is_dir` should be true if the path refers to a directory and false
+    /// otherwise.
+    ///
+    /// The given path is matched relative to the path given when building
+    /// the matcher. Specifically, before matching `path`, its prefix (as
+    /// determined by a common suffix of the directory containing this
+    /// gitignore) is stripped. If there is no common suffix/prefix overlap,
+    /// then `path` is assumed to be relative to this matcher.
+    pub fn matched<P: AsRef<Path>>(
+        &self,
+        path: P,
+        is_dir: bool,
+    ) -> Match<&Glob> {
+        if self.is_empty() {
+            return Match::None;
+        }
+        self.matched_stripped(self.strip(path.as_ref()), is_dir)
+    }
+
+    /// Returns whether the given path (file or directory, and expected to be
+    /// under the root) or any of its parent directories (up to the root)
+    /// matched a pattern in this gitignore matcher.
+    ///
+    /// NOTE: This method is more expensive than walking the directory hierarchy
+    /// top-to-bottom and matching the entries. But, is easier to use in cases
+    /// when a list of paths are available without a hierarchy.
+    ///
+    /// `is_dir` should be true if the path refers to a directory and false
+    /// otherwise.
+    ///
+    /// The given path is matched relative to the path given when building
+    /// the matcher. Specifically, before matching `path`, its prefix (as
+    /// determined by a common suffix of the directory containing this
+    /// gitignore) is stripped. If there is no common suffix/prefix overlap,
+    /// then `path` is assumed to be relative to this matcher.
+    ///
+    /// # Panics
+    ///
+    /// This method panics if the given file path is not under the root path
+    /// of this matcher.
+    pub fn matched_path_or_any_parents<P: AsRef<Path>>(
+        &self,
+        path: P,
+        is_dir: bool,
+    ) -> Match<&Glob> {
+        if self.is_empty() {
+            return Match::None;
+        }
+        let mut path = self.strip(path.as_ref());
+        assert!(!path.has_root(), "path is expected to be under the root");
+
+        match self.matched_stripped(path, is_dir) {
+            Match::None => (), // walk up
+            a_match => return a_match,
+        }
+        while let Some(parent) = path.parent() {
+            match self.matched_stripped(parent, /* is_dir */ true) {
+                Match::None => path = parent, // walk up
+                a_match => return a_match,
+            }
+        }
+        Match::None
+    }
+
+    /// Like matched, but takes a path that has already been stripped.
+    fn matched_stripped<P: AsRef<Path>>(
+        &self,
+        path: P,
+        is_dir: bool,
+    ) -> Match<&Glob> {
+        if self.is_empty() {
+            return Match::None;
+        }
+        // CHANGED: Rules marked as only_on_files can not match against
+        // directories.
+        if self.only_on_files && is_dir {
+            return Match::None;
+        }
+        let path = path.as_ref();
+        let mut matches = self.matches.as_ref().unwrap().get();
+        let candidate = Candidate::new(path);
+        self.set.matches_candidate_into(&candidate, &mut *matches);
+        for &i in matches.iter().rev() {
+            let glob = &self.globs[i];
+            if !glob.is_only_dir() || is_dir {
+                return if glob.is_whitelist() {
+                    Match::Whitelist(glob)
+                } else {
+                    Match::Ignore(glob)
+                };
+            }
+        }
+        Match::None
+    }
+
+    /// Strips the given path such that it's suitable for matching with this
+    /// gitignore matcher.
+    fn strip<'a, P: 'a + AsRef<Path> + ?Sized>(
+        &'a self,
+        path: &'a P,
+    ) -> &'a Path {
+        let mut path = path.as_ref();
+        // A leading ./ is completely superfluous. We also strip it from
+        // our gitignore root path, so we need to strip it from our candidate
+        // path too.
+        if let Some(p) = strip_prefix("./", path) {
+            path = p;
+        }
+        // Strip any common prefix between the candidate path and the root
+        // of the gitignore, to make sure we get relative matching right.
+        // BUT, a file name might not have any directory components to it,
+        // in which case, we don't want to accidentally strip any part of the
+        // file name.
+        //
+        // As an additional special case, if the root is just `.`, then we
+        // shouldn't try to strip anything, e.g., when path begins with a `.`.
+        if self.root != Path::new(".") && !is_file_name(path) {
+            if let Some(p) = strip_prefix(&self.root, path) {
+                path = p;
+                // If we're left with a leading slash, get rid of it.
+                if let Some(p) = strip_prefix("/", path) {
+                    path = p;
+                }
+            }
+        }
+        path
+    }
+}
+
+/// Builds a matcher for a single set of globs from a .gitignore file.
+#[derive(Clone, Debug)]
+pub struct GitignoreBuilder {
+    builder: GlobSetBuilder,
+    root: PathBuf,
+    globs: Vec<Glob>,
+    case_insensitive: bool,
+    allow_unclosed_class: bool,
+    // CHANGED: Add a flag to have Gitignore rules that apply only to files.
+    only_on_files: bool,
+}
+
+impl GitignoreBuilder {
+    /// Create a new builder for a gitignore file.
+    ///
+    /// The path given should be the path at which the globs for this gitignore
+    /// file should be matched. Note that paths are always matched relative
+    /// to the root path given here. Generally, the root path should correspond
+    /// to the *directory* containing a `.gitignore` file.
+    pub fn new<P: AsRef<Path>>(root: P) -> GitignoreBuilder {
+        let root = root.as_ref();
+        GitignoreBuilder {
+            builder: GlobSetBuilder::new(),
+            root: strip_prefix("./", root).unwrap_or(root).to_path_buf(),
+            globs: vec![],
+            case_insensitive: false,
+            allow_unclosed_class: true,
+            // CHANGED: Add a flag to have Gitignore rules that apply only to
+            // files.
+            only_on_files: false,
+        }
+    }
+
+    /// Builds a new matcher from the globs added so far.
+    ///
+    /// Once a matcher is built, no new globs can be added to it.
+    pub fn build(&self) -> Result<Gitignore, Error> {
+        let nignore = self.globs.iter().filter(|g| !g.is_whitelist()).count();
+        let nwhite = self.globs.iter().filter(|g| g.is_whitelist()).count();
+        let set = self
+            .builder
+            .build()
+            .map_err(|err| Error::Glob { glob: None, err: err.to_string() })?;
+        Ok(Gitignore {
+            set,
+            root: self.root.clone(),
+            globs: self.globs.clone(),
+            num_ignores: nignore as u64,
+            num_whitelists: nwhite as u64,
+            matches: Some(Arc::new(
+                Pool::with_available_parallelism_capacity(|| vec![]),
+            )),
+            // CHANGED: Add a flag to have Gitignore rules that apply only to
+            // files.
+            only_on_files: self.only_on_files,
+        })
+    }
+
+    /// Build a global gitignore matcher using the configuration in this
+    /// builder.
+    ///
+    /// This consumes ownership of the builder unlike `build` because it
+    /// must mutate the builder to add the global gitignore globs.
+    ///
+    /// Note that this ignores the path given to this builder's constructor
+    /// and instead derives the path automatically from git's global
+    /// configuration.
+    pub fn build_global(mut self) -> (Gitignore, Option<Error>) {
+        match gitconfig_excludes_path() {
+            None => (Gitignore::empty(), None),
+            Some(path) => {
+                if !path.is_file() {
+                    (Gitignore::empty(), None)
+                } else {
+                    let mut errs = PartialErrorBuilder::default();
+                    errs.maybe_push_ignore_io(self.add(path));
+                    match self.build() {
+                        Ok(gi) => (gi, errs.into_error_option()),
+                        Err(err) => {
+                            errs.push(err);
+                            (Gitignore::empty(), errs.into_error_option())
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /// Add each glob from the file path given.
+    ///
+    /// The file given should be formatted as a `gitignore` file.
+    ///
+    /// Note that partial errors can be returned. For example, if there was
+    /// a problem adding one glob, an error for that will be returned, but
+    /// all other valid globs will still be added.
+    pub fn add<P: AsRef<Path>>(&mut self, path: P) -> Option<Error> {
+        let path = path.as_ref();
+        let file = match File::open(path) {
+            Err(err) => return Some(Error::Io(err).with_path(path)),
+            Ok(file) => file,
+        };
+        log::debug!("opened gitignore file: {}", path.display());
+        let rdr = BufReader::new(file);
+        let mut errs = PartialErrorBuilder::default();
+        for (i, line) in rdr.lines().enumerate() {
+            let lineno = (i + 1) as u64;
+            let line = match line {
+                Ok(line) => line,
+                Err(err) => {
+                    errs.push(Error::Io(err).tagged(path, lineno));
+                    break;
+                }
+            };
+
+            // Match Git's handling of .gitignore files that begin with the Unicode BOM
+            const UTF8_BOM: &str = "\u{feff}";
+            let line =
+                if i == 0 { line.trim_start_matches(UTF8_BOM) } else { &line };
+
+            if let Err(err) = self.add_line(Some(path.to_path_buf()), &line) {
+                errs.push(err.tagged(path, lineno));
+            }
+        }
+        errs.into_error_option()
+    }
+
+    /// Add each glob line from the string given.
+    ///
+    /// If this string came from a particular `gitignore` file, then its path
+    /// should be provided here.
+    ///
+    /// The string given should be formatted as a `gitignore` file.
+    #[cfg(test)]
+    fn add_str(
+        &mut self,
+        from: Option<PathBuf>,
+        gitignore: &str,
+    ) -> Result<&mut GitignoreBuilder, Error> {
+        for line in gitignore.lines() {
+            self.add_line(from.clone(), line)?;
+        }
+        Ok(self)
+    }
+
+    /// Add a line from a gitignore file to this builder.
+    ///
+    /// If this line came from a particular `gitignore` file, then its path
+    /// should be provided here.
+    ///
+    /// If the line could not be parsed as a glob, then an error is returned.
+    pub fn add_line(
+        &mut self,
+        from: Option<PathBuf>,
+        mut line: &str,
+    ) -> Result<&mut GitignoreBuilder, Error> {
+        #![allow(deprecated)]
+
+        if line.starts_with("#") {
+            return Ok(self);
+        }
+        if !line.ends_with("\\ ") {
+            line = line.trim_right();
+        }
+        if line.is_empty() {
+            return Ok(self);
+        }
+        let mut glob = Glob {
+            from,
+            original: line.to_string(),
+            actual: String::new(),
+            is_whitelist: false,
+            is_only_dir: false,
+        };
+        let mut is_absolute = false;
+        if line.starts_with("\\!") || line.starts_with("\\#") {
+            line = &line[1..];
+            is_absolute = line.chars().nth(0) == Some('/');
+        } else {
+            if line.starts_with("!") {
+                glob.is_whitelist = true;
+                line = &line[1..];
+            }
+            if line.starts_with("/") {
+                // `man gitignore` says that if a glob starts with a slash,
+                // then the glob can only match the beginning of a path
+                // (relative to the location of gitignore). We achieve this by
+                // simply banning wildcards from matching /.
+                line = &line[1..];
+                is_absolute = true;
+            }
+        }
+        // If it ends with a slash, then this should only match directories,
+        // but the slash should otherwise not be used while globbing.
+        if line.as_bytes().last() == Some(&b'/') {
+            glob.is_only_dir = true;
+            line = &line[..line.len() - 1];
+            // If the slash was escaped, then remove the escape.
+            // See: https://github.com/BurntSushi/ripgrep/issues/2236
+            if line.as_bytes().last() == Some(&b'\\') {
+                line = &line[..line.len() - 1];
+            }
+        }
+        glob.actual = line.to_string();
+        // If there is a literal slash, then this is a glob that must match the
+        // entire path name. Otherwise, we should let it match anywhere, so use
+        // a **/ prefix.
+        if !is_absolute && !line.chars().any(|c| c == '/') {
+            // ... but only if we don't already have a **/ prefix.
+            if !glob.has_doublestar_prefix() {
+                glob.actual = format!("**/{}", glob.actual);
+            }
+        }
+        // If the glob ends with `/**`, then we should only match everything
+        // inside a directory, but not the directory itself. Standard globs
+        // will match the directory. So we add `/*` to force the issue.
+        if glob.actual.ends_with("/**") {
+            glob.actual = format!("{}/*", glob.actual);
+        }
+        let parsed = GlobBuilder::new(&glob.actual)
+            .literal_separator(true)
+            .case_insensitive(self.case_insensitive)
+            .backslash_escape(true)
+            .allow_unclosed_class(self.allow_unclosed_class)
+            .build()
+            .map_err(|err| Error::Glob {
+                glob: Some(glob.original.clone()),
+                err: err.kind().to_string(),
+            })?;
+        self.builder.add(parsed);
+        self.globs.push(glob);
+        Ok(self)
+    }
+
+    /// Toggle whether the globs should be matched case insensitively or not.
+    ///
+    /// When this option is changed, only globs added after the change will be
+    /// affected.
+    ///
+    /// This is disabled by default.
+    pub fn case_insensitive(
+        &mut self,
+        yes: bool,
+    ) -> Result<&mut GitignoreBuilder, Error> {
+        // TODO: This should not return a `Result`. Fix this in the next semver
+        // release.
+        self.case_insensitive = yes;
+        Ok(self)
+    }
+
+    /// Toggle whether unclosed character classes are allowed. When allowed,
+    /// a `[` without a matching `]` is treated literally instead of resulting
+    /// in a parse error.
+    ///
+    /// For example, if this is set then the glob `[abc` will be treated as the
+    /// literal string `[abc` instead of returning an error.
+    ///
+    /// By default, this is true in order to match established `gitignore`
+    /// semantics. Generally speaking, enabling this leads to worse failure
+    /// modes since the glob parser becomes more permissive. You might want to
+    /// enable this when compatibility (e.g., with POSIX glob implementations)
+    /// is more important than good error messages.
+    pub fn allow_unclosed_class(
+        &mut self,
+        yes: bool,
+    ) -> &mut GitignoreBuilder {
+        self.allow_unclosed_class = yes;
+        self
+    }
+
+    /// CHANGED: Add a flag to have Gitignore rules that apply only to files.
+    ///
+    /// If this is set, then the globs will only be matched against file paths.
+    /// This will ensure that ignore rules like `*.pages` will _only_ ignore
+    /// files ending in `.pages` and not folders ending in `.pages`.
+    pub fn only_on_files(&mut self, yes: bool) -> &mut GitignoreBuilder {
+        self.only_on_files = yes;
+        self
+    }
+}
+
+/// Return the file path of the current environment's global gitignore file.
+///
+/// Note that the file path returned may not exist.
+pub fn gitconfig_excludes_path() -> Option<PathBuf> {
+    // When GIT_CONFIG_GLOBAL is set, it replaces both $HOME/.gitconfig and
+    // $XDG_CONFIG_HOME/git/config (per git 2.32+). Otherwise, git supports
+    // $HOME/.gitconfig and $XDG_CONFIG_HOME/git/config simultaneously, where
+    // $HOME/.gitconfig takes precedent.
+    gitconfig_global_env_contents()
+        .and_then(|x| parse_excludes_file(&x))
+        .or_else(|| {
+            gitconfig_home_contents().and_then(|x| parse_excludes_file(&x))
+        })
+        .or_else(|| {
+            gitconfig_xdg_contents().and_then(|x| parse_excludes_file(&x))
+        })
+        // System-level config has the lowest priority for core.excludesFile.
+        // GIT_CONFIG_SYSTEM overrides the default /etc/gitconfig path.
+        .or_else(|| {
+            gitconfig_system_contents().and_then(|x| parse_excludes_file(&x))
+        })
+        .or_else(excludes_file_default)
+}
+
+/// Returns the file contents of git's global config file from the path
+/// specified by the `GIT_CONFIG_GLOBAL` environment variable.
+fn gitconfig_global_env_contents() -> Option<Vec<u8>> {
+    let path = std::env::var_os("GIT_CONFIG_GLOBAL").map(PathBuf::from)?;
+    if path.as_os_str().is_empty() {
+        return None;
+    }
+    let mut file = BufReader::new(File::open(path).ok()?);
+    let mut contents = vec![];
+    file.read_to_end(&mut contents).ok().map(|_| contents)
+}
+
+/// Returns the file contents of git's system-level config file.
+///
+/// Checks `GIT_CONFIG_SYSTEM` first, then falls back to `/etc/gitconfig`.
+fn gitconfig_system_contents() -> Option<Vec<u8>> {
+    let path = std::env::var_os("GIT_CONFIG_SYSTEM")
+        .map(PathBuf::from)
+        .filter(|x| !x.as_os_str().is_empty())
+        .unwrap_or_else(|| PathBuf::from("/etc/gitconfig"));
+    let mut file = BufReader::new(File::open(path).ok()?);
+    let mut contents = vec![];
+    file.read_to_end(&mut contents).ok().map(|_| contents)
+}
+
+/// Returns the file contents of git's global config file, if one exists, in
+/// the user's home directory.
+fn gitconfig_home_contents() -> Option<Vec<u8>> {
+    let home = home_dir()?;
+    let mut file = BufReader::new(File::open(home.join(".gitconfig")).ok()?);
+    let mut contents = vec![];
+    file.read_to_end(&mut contents).ok().map(|_| contents)
+}
+
+/// Returns the file contents of git's global config file, if one exists, in
+/// the user's XDG_CONFIG_HOME directory.
+fn gitconfig_xdg_contents() -> Option<Vec<u8>> {
+    let path = std::env::var_os("XDG_CONFIG_HOME")
+        .map(PathBuf::from)
+        .filter(|x| !x.as_os_str().is_empty())
+        .or_else(|| home_dir().map(|p| p.join(".config")))
+        .map(|x| x.join("git/config"))?;
+    let mut file = BufReader::new(File::open(path).ok()?);
+    let mut contents = vec![];
+    file.read_to_end(&mut contents).ok().map(|_| contents)
+}
+
+/// Returns the default file path for a global .gitignore file.
+///
+/// Specifically, this respects XDG_CONFIG_HOME.
+fn excludes_file_default() -> Option<PathBuf> {
+    std::env::var_os("XDG_CONFIG_HOME")
+        .map(PathBuf::from)
+        .filter(|x| !x.as_os_str().is_empty())
+        .or_else(|| home_dir().map(|p| p.join(".config")))
+        .map(|x| x.join("git/ignore"))
+}
+
+/// Extract git's `core.excludesfile` config setting from the raw file contents
+/// given.
+fn parse_excludes_file(data: &[u8]) -> Option<PathBuf> {
+    use std::sync::OnceLock;
+
+    use regex_automata::{meta::Regex, util::syntax};
+
+    // N.B. This is the lazy approach, and isn't technically correct, but
+    // probably works in more circumstances. I guess we would ideally have
+    // a full INI parser. Yuck.
+    static RE: OnceLock<Regex> = OnceLock::new();
+    let re = RE.get_or_init(|| {
+        Regex::builder()
+            .configure(Regex::config().utf8_empty(false))
+            .syntax(syntax::Config::new().utf8(false))
+            .build(r#"(?im-u)^\s*excludesfile\s*=\s*"?\s*(\S+?)\s*"?\s*$"#)
+            .unwrap()
+    });
+    // We don't care about amortizing allocs here I think. This should only
+    // be called ~once per traversal or so? (Although it's not guaranteed...)
+    let mut caps = re.create_captures();
+    re.captures(data, &mut caps);
+    let span = caps.get_group(1)?;
+    let candidate = &data[span];
+    std::str::from_utf8(candidate).ok().map(|s| PathBuf::from(expand_tilde(s)))
+}
+
+/// Expands ~ in file paths to the value of $HOME.
+fn expand_tilde(path: &str) -> String {
+    let home = match home_dir() {
+        None => return path.to_string(),
+        Some(home) => home.to_string_lossy().into_owned(),
+    };
+    path.replace("~", &home)
+}
+
+/// Returns the location of the user's home directory.
+fn home_dir() -> Option<PathBuf> {
+    // We're fine with using std::env::home_dir for now. Its bugs are, IMO,
+    // pretty minor corner cases.
+    #![allow(deprecated)]
+    std::env::home_dir()
+}
+
+#[cfg(test)]
+mod tests {
+    use std::path::Path;
+
+    use super::{Gitignore, GitignoreBuilder};
+
+    fn gi_from_str<P: AsRef<Path>>(root: P, s: &str) -> Gitignore {
+        let mut builder = GitignoreBuilder::new(root);
+        builder.add_str(None, s).unwrap();
+        builder.build().unwrap()
+    }
+
+    macro_rules! ignored {
+        ($name:ident, $root:expr, $gi:expr, $path:expr) => {
+            ignored!($name, $root, $gi, $path, false);
+        };
+        ($name:ident, $root:expr, $gi:expr, $path:expr, $is_dir:expr) => {
+            #[test]
+            fn $name() {
+                let gi = gi_from_str($root, $gi);
+                assert!(gi.matched($path, $is_dir).is_ignore());
+            }
+        };
+    }
+
+    macro_rules! not_ignored {
+        ($name:ident, $root:expr, $gi:expr, $path:expr) => {
+            not_ignored!($name, $root, $gi, $path, false);
+        };
+        ($name:ident, $root:expr, $gi:expr, $path:expr, $is_dir:expr) => {
+            #[test]
+            fn $name() {
+                let gi = gi_from_str($root, $gi);
+                assert!(!gi.matched($path, $is_dir).is_ignore());
+            }
+        };
+    }
+
+    const ROOT: &'static str = "/home/foobar/rust/rg";
+
+    ignored!(ig1, ROOT, "months", "months");
+    ignored!(ig2, ROOT, "*.lock", "Cargo.lock");
+    ignored!(ig3, ROOT, "*.rs", "src/main.rs");
+    ignored!(ig4, ROOT, "src/*.rs", "src/main.rs");
+    ignored!(ig5, ROOT, "/*.c", "cat-file.c");
+    ignored!(ig6, ROOT, "/src/*.rs", "src/main.rs");
+    ignored!(ig7, ROOT, "!src/main.rs\n*.rs", "src/main.rs");
+    ignored!(ig8, ROOT, "foo/", "foo", true);
+    ignored!(ig9, ROOT, "**/foo", "foo");
+    ignored!(ig10, ROOT, "**/foo", "src/foo");
+    ignored!(ig11, ROOT, "**/foo/**", "src/foo/bar");
+    ignored!(ig12, ROOT, "**/foo/**", "wat/src/foo/bar/baz");
+    ignored!(ig13, ROOT, "**/foo/bar", "foo/bar");
+    ignored!(ig14, ROOT, "**/foo/bar", "src/foo/bar");
+    ignored!(ig15, ROOT, "abc/**", "abc/x");
+    ignored!(ig16, ROOT, "abc/**", "abc/x/y");
+    ignored!(ig17, ROOT, "abc/**", "abc/x/y/z");
+    ignored!(ig18, ROOT, "a/**/b", "a/b");
+    ignored!(ig19, ROOT, "a/**/b", "a/x/b");
+    ignored!(ig20, ROOT, "a/**/b", "a/x/y/b");
+    ignored!(ig21, ROOT, r"\!xy", "!xy");
+    ignored!(ig22, ROOT, r"\#foo", "#foo");
+    ignored!(ig23, ROOT, "foo", "./foo");
+    ignored!(ig24, ROOT, "target", "grep/target");
+    ignored!(ig25, ROOT, "Cargo.lock", "./tabwriter-bin/Cargo.lock");
+    ignored!(ig26, ROOT, "/foo/bar/baz", "./foo/bar/baz");
+    ignored!(ig27, ROOT, "foo/", "xyz/foo", true);
+    ignored!(ig28, "./src", "/llvm/", "./src/llvm", true);
+    ignored!(ig29, ROOT, "node_modules/ ", "node_modules", true);
+    ignored!(ig30, ROOT, "**/", "foo/bar", true);
+    ignored!(ig31, ROOT, "path1/*", "path1/foo");
+    ignored!(ig32, ROOT, ".a/b", ".a/b");
+    ignored!(ig33, "./", ".a/b", ".a/b");
+    ignored!(ig34, ".", ".a/b", ".a/b");
+    ignored!(ig35, "./.", ".a/b", ".a/b");
+    ignored!(ig36, "././", ".a/b", ".a/b");
+    ignored!(ig37, "././.", ".a/b", ".a/b");
+    ignored!(ig38, ROOT, "\\[", "[");
+    ignored!(ig39, ROOT, "\\?", "?");
+    ignored!(ig40, ROOT, "\\*", "*");
+    ignored!(ig41, ROOT, "\\a", "a");
+    ignored!(ig42, ROOT, "s*.rs", "sfoo.rs");
+    ignored!(ig43, ROOT, "**", "foo.rs");
+    ignored!(ig44, ROOT, "**/**/*", "a/foo.rs");
+
+    not_ignored!(ignot1, ROOT, "amonths", "months");
+    not_ignored!(ignot2, ROOT, "monthsa", "months");
+    not_ignored!(ignot3, ROOT, "/src/*.rs", "src/grep/src/main.rs");
+    not_ignored!(ignot4, ROOT, "/*.c", "mozilla-sha1/sha1.c");
+    not_ignored!(ignot5, ROOT, "/src/*.rs", "src/grep/src/main.rs");
+    not_ignored!(ignot6, ROOT, "*.rs\n!src/main.rs", "src/main.rs");
+    not_ignored!(ignot7, ROOT, "foo/", "foo", false);
+    not_ignored!(ignot8, ROOT, "**/foo/**", "wat/src/afoo/bar/baz");
+    not_ignored!(ignot9, ROOT, "**/foo/**", "wat/src/fooa/bar/baz");
+    not_ignored!(ignot10, ROOT, "**/foo/bar", "foo/src/bar");
+    not_ignored!(ignot11, ROOT, "#foo", "#foo");
+    not_ignored!(ignot12, ROOT, "\n\n\n", "foo");
+    not_ignored!(ignot13, ROOT, "foo/**", "foo", true);
+    not_ignored!(
+        ignot14,
+        "./third_party/protobuf",
+        "m4/ltoptions.m4",
+        "./third_party/protobuf/csharp/src/packages/repositories.config"
+    );
+    not_ignored!(ignot15, ROOT, "!/bar", "foo/bar");
+    not_ignored!(ignot16, ROOT, "*\n!**/", "foo", true);
+    not_ignored!(ignot17, ROOT, "src/*.rs", "src/grep/src/main.rs");
+    not_ignored!(ignot18, ROOT, "path1/*", "path2/path1/foo");
+    not_ignored!(ignot19, ROOT, "s*.rs", "src/foo.rs");
+
+    fn bytes(s: &str) -> Vec<u8> {
+        s.to_string().into_bytes()
+    }
+
+    fn path_string<P: AsRef<Path>>(path: P) -> String {
+        path.as_ref().to_str().unwrap().to_string()
+    }
+
+    #[test]
+    fn parse_excludes_file1() {
+        let data = bytes("[core]\nexcludesFile = /foo/bar");
+        let got = super::parse_excludes_file(&data).unwrap();
+        assert_eq!(path_string(got), "/foo/bar");
+    }
+
+    #[test]
+    fn parse_excludes_file2() {
+        let data = bytes("[core]\nexcludesFile = ~/foo/bar");
+        let got = super::parse_excludes_file(&data).unwrap();
+        assert_eq!(path_string(got), super::expand_tilde("~/foo/bar"));
+    }
+
+    #[test]
+    fn parse_excludes_file3() {
+        let data = bytes("[core]\nexcludeFile = /foo/bar");
+        assert!(super::parse_excludes_file(&data).is_none());
+    }
+
+    #[test]
+    fn parse_excludes_file4() {
+        let data = bytes("[core]\nexcludesFile = \"~/foo/bar\"");
+        let got = super::parse_excludes_file(&data);
+        assert_eq!(
+            path_string(got.unwrap()),
+            super::expand_tilde("~/foo/bar")
+        );
+    }
+
+    #[test]
+    fn parse_excludes_file5() {
+        let data = bytes("[core]\nexcludesFile = \" \"~/foo/bar \" \"");
+        assert!(super::parse_excludes_file(&data).is_none());
+    }
+
+    // See: https://github.com/BurntSushi/ripgrep/issues/106
+    #[test]
+    fn regression_106() {
+        gi_from_str("/", " ");
+    }
+
+    #[test]
+    fn case_insensitive() {
+        let gi = GitignoreBuilder::new(ROOT)
+            .case_insensitive(true)
+            .unwrap()
+            .add_str(None, "*.html")
+            .unwrap()
+            .build()
+            .unwrap();
+        assert!(gi.matched("foo.html", false).is_ignore());
+        assert!(gi.matched("foo.HTML", false).is_ignore());
+        assert!(!gi.matched("foo.htm", false).is_ignore());
+        assert!(!gi.matched("foo.HTM", false).is_ignore());
+    }
+
+    ignored!(cs1, ROOT, "*.html", "foo.html");
+    not_ignored!(cs2, ROOT, "*.html", "foo.HTML");
+    not_ignored!(cs3, ROOT, "*.html", "foo.htm");
+    not_ignored!(cs4, ROOT, "*.html", "foo.HTM");
+}
diff --git a/crates/ignore/src/incremental.rs b/crates/ignore/src/incremental.rs
new file mode 100644
index 000000000..5030b0d00
--- /dev/null
+++ b/crates/ignore/src/incremental.rs
@@ -0,0 +1,1286 @@
+use std::{
+    collections::HashMap,
+    path::{Path, PathBuf},
+    sync::OnceLock,
+};
+
+use crate::{
+    Error, Match, PartialErrorBuilder, dir::Ignore, pathutil::is_hidden_path,
+};
+
+/// A cached matcher for checking paths against hierarchical ignore files.
+///
+/// An `IncrementalIgnore` is built from a [`crate::WalkBuilder`]. Unlike a
+/// recursive walk, it can check individual paths while still respecting the
+/// ignore files in every relevant parent directory. Matchers for directories
+/// are compiled on first use and then retained for later queries.
+/// Each matcher corresponds to exactly one root configured on the builder,
+/// and paths passed to it are interpreted relative to that root.
+/// A matcher for the special `-` root representing standard input is inert
+/// and always returns a non-match.
+///
+/// The matcher checks path-based filters in the same precedence order as
+/// a traversal. This includes glob overrides, `.ignore`, `.gitignore`,
+/// `.git/info/exclude`, global and explicitly added ignore files, custom
+/// ignore file names and file type selections. It does not apply filters that
+/// require a directory entry or other traversal state, such as custom entry
+/// predicates. Hidden-file detection, minimum and maximum depth limits and the
+/// maximum file size are applied.
+///
+/// A matcher is a snapshot at directory granularity. Once the ignore files in
+/// a directory have been loaded, edits to those files are not observed. Build
+/// a new matcher to reload them.
+///
+/// # Warning
+///
+/// The incremental path checking here necessarily needs to do a lot more work
+/// per path matched. Callers should _not_ use this to run directory traversal.
+/// This is intended to avoid the work of re-traversing an entire directory
+/// tree when only a few changes are detected. (For example, in response to
+/// file additions or deletions.)
+///
+/// # Example
+///
+/// ```rust,no_run
+/// use ignore::WalkBuilder;
+///
+/// let mut builder = WalkBuilder::new(".");
+/// builder.add_custom_ignore_filename(".rgignore");
+/// let mut matchers = builder.build_matchers();
+/// let matcher = &mut matchers[0];
+///
+/// if matcher.matched("src/generated.rs", false).is_ignore() {
+///     println!("ignored");
+/// }
+/// ```
+#[derive(Clone, Debug)]
+pub struct IncrementalIgnore {
+    /// The root exactly as it was given to `WalkBuilder`.
+    root: PathBuf,
+    /// The normalized root used only by the opt-in normalization routine.
+    normalized_root: OnceLock<Option<PathBuf>>,
+    /// The matcher for the configured root directory, loaded on first use.
+    ignore: RootIgnore,
+    /// Directory paths relative to `root`, excluding the root itself.
+    dirs: HashMap<PathBuf, CachedDir>,
+    /// Options for additional filtering beyond gitignore.
+    options: IncrementalIgnoreOptions,
+}
+
+/// The options for a matcher, mostly meant to duplicate as much as we can from
+/// `WalkParallel`.
+#[derive(Clone, Debug)]
+pub(crate) struct IncrementalIgnoreOptions {
+    pub(crate) min_depth: Option<usize>,
+    pub(crate) max_depth: Option<usize>,
+    pub(crate) max_filesize: Option<u64>,
+    pub(crate) hidden: bool,
+    pub(crate) follow_links: bool,
+}
+
+#[derive(Clone, Debug)]
+enum RootIgnore {
+    Unloaded(Ignore),
+    Loaded(Ignore),
+    NotDirectory,
+    Stdin,
+}
+
+/// Cached traversal state for a directory relative to the configured root.
+///
+/// The presence of an entry means that the directory and every ancestor
+/// between it and the root have already been checked.
+#[derive(Clone, Debug)]
+enum CachedDir {
+    /// The directory may be descended into. The matcher includes the ignore
+    /// rules loaded through this directory and is therefore the matcher to use
+    /// for its children.
+    Allowed(Ignore),
+    /// The directory may not be descended into because it was ignored by a
+    /// path rule or hidden-file filtering. Every descendant is consequently
+    /// ignored, and ignore files inside this directory are not loaded.
+    Ignored,
+}
+
+impl IncrementalIgnore {
+    pub(crate) fn new(
+        root: PathBuf,
+        ignore: Ignore,
+        options: IncrementalIgnoreOptions,
+    ) -> IncrementalIgnore {
+        // File traversal special cases `-` to search stdin, so we recognize
+        // it here for completeness too. In particular, we really want
+        // `WalkBuilder::build_matchers` to return a matcher for every root,
+        // even when it's a simple file (handled automatically) or when it's
+        // stdin (necessarily special cased).
+        //
+        // If callers need to search a file or directory named `-`, then they
+        // can use `./-`. As is the case for file traversal too.
+        let ignore = if root == Path::new("-") {
+            RootIgnore::Stdin
+        } else {
+            RootIgnore::Unloaded(ignore)
+        };
+        IncrementalIgnore {
+            root,
+            normalized_root: OnceLock::new(),
+            ignore,
+            dirs: HashMap::new(),
+            options,
+        }
+    }
+
+    /// Return the root that paths matched by this matcher are relative to.
+    pub fn root(&self) -> &Path {
+        &self.root
+    }
+
+    /// Normalize `path` and return it relative to this matcher's root.
+    ///
+    /// This returns `None` when `path` cannot be made absolute or
+    /// when it is known to be outside this matcher's root. Unlike
+    /// [`IncrementalIgnore::matched`], this performs absolute path conversion,
+    /// lexical normalization and allocation. It is intended as an opt-in
+    /// convenience for callers that do not already have root-relative paths.
+    ///
+    /// Note that `.` is interpreted relative to the process level current
+    /// working directory. It is _not_ interpreted relative to the root of
+    /// this matcher.
+    ///
+    /// Note also that this may reject paths that only differ in casing. For
+    /// example, if the root path for this matcher is `/FOO` but the provided
+    /// path is `/foo/bar`, then this may return `None`. Callers must ensure
+    /// casing is consistent between the path provided and the root path for
+    /// this matcher.
+    pub fn normalize<P: AsRef<Path>>(&self, path: P) -> Option<PathBuf> {
+        if matches!(self.ignore, RootIgnore::Stdin) {
+            return None;
+        }
+        let path = normalize_absolute(path.as_ref())?;
+        let root = self
+            .normalized_root
+            .get_or_init(|| normalize_absolute(&self.root))
+            .as_ref()?;
+        path.strip_prefix(root).ok().map(Path::to_path_buf)
+    }
+
+    /// Match a root-relative path against ignore files in its directory and
+    /// all relevant parent directories.
+    ///
+    /// `is_dir` should be true when `path` should be matched as a directory.
+    ///
+    /// For the return value, use [`IncrementalMatch::is_ignore`],
+    /// [`IncrementalMatch::is_whitelist`] or [`IncrementalMatch::is_none`] to
+    /// inspect it.
+    ///
+    /// Matchers for previously unseen directories are loaded and cached during
+    /// this call. Errors encountered while loading ignore files are logged. To
+    /// receive those errors, use [`IncrementalIgnore::matched_with_errors`].
+    ///
+    /// `path` must be relative to this matcher's root and must not contain a
+    /// parent directory (`..`) component. Behavior is unspecified when these
+    /// preconditions are violated. Callers with an absolute path or with a
+    /// path containing `.` or `..` may use [`IncrementalIgnore::normalize`]
+    /// to get a path satisfying these preconditions. In all cases, a relative
+    /// path is *assumed* to be relative to the root of this ignore matcher.
+    ///
+    /// In general, it is intended that callers doing recursive directory
+    /// traversal on the root of this matcher may provide relative paths to
+    /// this routine *without* calling [`IncrementalIgnore::normalize`].
+    ///
+    /// The empty path represents the explicitly configured root and also
+    /// returns non-match, consistent with recursive traversal where a root is
+    /// always treated as being at depth zero.
+    pub fn matched<P: AsRef<Path>>(
+        &mut self,
+        path: P,
+        is_dir: bool,
+    ) -> IncrementalMatch {
+        let (matched, err) = self.matched_with_errors(path, is_dir);
+        if let Some(err) = err {
+            log::debug!("error while loading ignore files: {err}");
+        }
+        matched
+    }
+
+    /// Match a root-relative path and return errors encountered while loading
+    /// ignore files.
+    ///
+    /// This is equivalent to [`IncrementalIgnore::matched`], except that
+    /// it returns any errors from newly loaded ignore files. Loading can
+    /// partially succeed, so valid rules are always applied to the returned
+    /// match even when an error is present.
+    pub fn matched_with_errors<P: AsRef<Path>>(
+        &mut self,
+        path: P,
+        is_dir: bool,
+    ) -> (IncrementalMatch, Option<Error>) {
+        let mut errs = PartialErrorBuilder::default();
+        let matched =
+            self.matched_with_errors_impl(path.as_ref(), is_dir, &mut errs);
+        (matched, errs.into_error_option())
+    }
+
+    fn matched_with_errors_impl(
+        &mut self,
+        relative: &Path,
+        is_dir: bool,
+        errs: &mut PartialErrorBuilder,
+    ) -> IncrementalMatch {
+        // We short-circuit here when our matcher corresponds to `Stdin` in
+        // order to always return a non-match. This is somewhat redundant with
+        // `root_ignore()` which does this too, but we do it here so that it
+        // always happens, e.g., before depth filtering.
+        if relative.is_absolute() || matches!(self.ignore, RootIgnore::Stdin) {
+            return IncrementalMatch::none(is_dir);
+        }
+
+        let (mut satisfies_min, mut edge_max) = (true, false);
+        if self.options.min_depth.is_some() || self.options.max_depth.is_some()
+        {
+            let depth = relative
+                .components()
+                .filter_map(|component| match component {
+                    std::path::Component::CurDir => None,
+                    component => Some(component),
+                })
+                .count();
+            satisfies_min =
+                self.options.min_depth.is_none_or(|min| depth >= min);
+            let satisfies_max =
+                self.options.max_depth.is_none_or(|max| depth <= max);
+            edge_max = self.options.max_depth.is_some_and(|max| depth == max);
+            // When we have a file that isn't past our min depth, we can give
+            // up right away.
+            if !is_dir && !satisfies_min {
+                return IncrementalMatch::ignore().not_within_depth();
+            }
+            // Same for *anything* that exceeds our max depth.
+            if !satisfies_max {
+                return IncrementalMatch::ignore().not_within_depth();
+            }
+        }
+
+        // When the path is invalid in some way, we bail out early to avoid
+        // potentially doing a stat call below.
+        let (mut mat, valid) = self
+            .matched_with_errors_ignore(relative, is_dir, errs)
+            .map(|mat| (mat, true))
+            .unwrap_or_else(|| (IncrementalMatch::none(is_dir), false));
+
+        if !is_dir
+            && !mat.is_ignore()
+            && valid
+            && let Some(max_filesize) = self.options.max_filesize
+        {
+            let path = self.root().join(relative);
+            let result = if self.options.follow_links {
+                path.metadata()
+            } else {
+                path.symlink_metadata()
+            };
+            match result {
+                Ok(md) if md.len() > max_filesize => {
+                    return IncrementalMatch::ignore();
+                }
+                Ok(_) => {}
+                Err(err) => {
+                    // Record the error but otherwise fall through
+                    let err = Error::from(err);
+                    errs.push(err.with_path(path));
+                }
+            }
+        }
+
+        // We still need to tag our `mat` if it doesn't pass the depth filter,
+        // or if it's a directory on the edge of a depth filter. This can only
+        // happen when the path is reported as a directory. Otherwise regular
+        // files are always handled above.
+        if is_dir {
+            if !satisfies_min {
+                mat = mat.not_within_depth();
+            }
+            if edge_max {
+                mat = mat.no_descent();
+            }
+        }
+        mat
+    }
+
+    fn matched_with_errors_ignore(
+        &mut self,
+        relative: &Path,
+        is_dir: bool,
+        errs: &mut PartialErrorBuilder,
+    ) -> Option<IncrementalMatch> {
+        let mut components = relative
+            .components()
+            .filter_map(|component| match component {
+                std::path::Component::CurDir => None,
+                component => Some(component),
+            })
+            .peekable();
+        components.peek()?;
+
+        // If the exact parent is cached, then all of its ancestors have
+        // already been checked. An allowed cache entry is the matcher to use
+        // for children of that directory, while an ignored cache entry is
+        // terminal for every descendant. In the usual case, this avoids both
+        // walking every component and allocating a relative directory path.
+        //
+        // Only try the fast path when the final component is a normal path
+        // component. Invalid paths are handled by the component walk below.
+        let has_normal_final_component =
+            relative.components().next_back().is_some_and(|component| {
+                matches!(component, std::path::Component::Normal(_))
+            });
+        if has_normal_final_component && let Some(parent) = relative.parent() {
+            match self.dirs.get(parent) {
+                Some(CachedDir::Allowed(ignore)) => {
+                    return Some(self.match_path(ignore, relative, is_dir));
+                }
+                Some(CachedDir::Ignored) => {
+                    return Some(IncrementalMatch::ignore());
+                }
+                None => {}
+            }
+        }
+
+        let mut ignore = self.root_ignore(errs)?;
+        let mut dir = PathBuf::new();
+        while let Some(component) = components.next() {
+            match component {
+                std::path::Component::ParentDir
+                | std::path::Component::RootDir
+                | std::path::Component::Prefix(_) => {
+                    return None;
+                }
+                std::path::Component::CurDir => continue,
+                std::path::Component::Normal(_) => {}
+            }
+            if components.peek().is_none() {
+                break;
+            }
+            dir.push(component.as_os_str());
+            match self.dirs.get(&dir) {
+                Some(CachedDir::Allowed(cached)) => {
+                    ignore = cached.clone();
+                    continue;
+                }
+                Some(CachedDir::Ignored) => {
+                    return Some(IncrementalMatch::ignore());
+                }
+                None => {}
+            }
+
+            let path = self.root.join(&dir);
+            let mat = ignore.matched(&path, true);
+            let is_hidden =
+                self.options.hidden && mat.is_none() && is_hidden_path(&path);
+            if mat.is_ignore() || is_hidden {
+                self.dirs.insert(dir.clone(), CachedDir::Ignored);
+                return Some(IncrementalMatch::ignore());
+            }
+            let (child, err) = ignore.add_child(&path);
+            errs.maybe_push(err);
+            self.dirs.insert(dir.clone(), CachedDir::Allowed(child.clone()));
+            ignore = child;
+        }
+
+        Some(self.match_path(&ignore, relative, is_dir))
+    }
+
+    fn match_path(
+        &self,
+        ignore: &Ignore,
+        relative: &Path,
+        is_dir: bool,
+    ) -> IncrementalMatch {
+        let path = self.root.join(relative);
+        let mut mat = IncrementalMatch::from_match(
+            ignore.matched(&path, is_dir).map(|_| ()),
+            is_dir,
+        );
+        // Whether a file is hidden or not has low precedence in filtering. We
+        // only check it if we haven't matched anything above. This permits
+        // callers to whitelist hidden files or directories.
+        if self.options.hidden && mat.is_none() && is_hidden_path(&path) {
+            mat = IncrementalMatch::ignore();
+        }
+        mat
+    }
+
+    fn root_ignore(
+        &mut self,
+        errs: &mut PartialErrorBuilder,
+    ) -> Option<Ignore> {
+        let ignore = match self.ignore {
+            RootIgnore::Unloaded(ref ignore) => ignore.clone(),
+            RootIgnore::Loaded(ref ignore) => return Some(ignore.clone()),
+            RootIgnore::NotDirectory | RootIgnore::Stdin => return None,
+        };
+        if !self.root.is_dir() {
+            self.ignore = RootIgnore::NotDirectory;
+            return None;
+        }
+
+        let (parents, err) = ignore.add_parents(&self.root);
+        errs.maybe_push(err);
+        let (root, err) = parents.add_child(&self.root);
+        errs.maybe_push(err);
+        self.ignore = RootIgnore::Loaded(root.clone());
+        Some(root)
+    }
+}
+
+/// The result of an incremental match.
+///
+/// This is similar to [`Match`] in that it reports whether a file path should
+/// be ignored, whitelisted or didn't match anything at all. It also has extra
+/// data, such as whether a directory matched but should not be descended into.
+///
+/// Generally speaking, callers that only care about specific files can stick
+/// to the `is_none()`, `is_ignore()` or `is_whitelist()` predicates. Directory
+/// entries are more complicated because we sometimes want to yield directories
+/// to descend into, but not actually visit (e.g., for the minimum depth
+/// filter). Or, we may want to yield a directory to visit but not descend into
+/// (e.g., for the maximum depth filter).
+#[derive(Clone, Debug)]
+pub struct IncrementalMatch {
+    mat: Match<()>,
+    should_descend: bool,
+    is_within_depth: bool,
+}
+
+impl IncrementalMatch {
+    fn none(is_dir: bool) -> IncrementalMatch {
+        IncrementalMatch {
+            mat: Match::None,
+            should_descend: is_dir,
+            is_within_depth: true,
+        }
+    }
+
+    fn ignore() -> IncrementalMatch {
+        IncrementalMatch {
+            mat: Match::Ignore(()),
+            should_descend: false,
+            is_within_depth: true,
+        }
+    }
+
+    fn from_match(mat: Match<()>, is_dir: bool) -> IncrementalMatch {
+        let should_descend = is_dir && !mat.is_ignore();
+        IncrementalMatch { mat, should_descend, is_within_depth: true }
+    }
+
+    fn no_descent(self) -> IncrementalMatch {
+        IncrementalMatch { should_descend: false, ..self }
+    }
+
+    fn not_within_depth(self) -> IncrementalMatch {
+        IncrementalMatch { is_within_depth: false, ..self }
+    }
+
+    /// Returns true if the match result didn't match anything.
+    pub fn is_none(&self) -> bool {
+        self.mat.is_none()
+    }
+
+    /// Returns true if the match result implies the path should be ignored.
+    pub fn is_ignore(&self) -> bool {
+        self.mat.is_ignore()
+    }
+
+    /// Returns true if the match result implies the path should be
+    /// whitelisted.
+    pub fn is_whitelist(&self) -> bool {
+        self.mat.is_whitelist()
+    }
+
+    /// Returns true only when this match corresponds to a directory *and*
+    /// whether the caller should look inside this directory for additional
+    /// results.
+    ///
+    /// It is possible for a match to report `false` for
+    /// [`IncrementalMatch::is_ignore`] _and_ `false` for
+    /// [`IncrementalMatch::should_descend`]. This can occur, for example, when
+    /// a maximum depth setting allows a directory through, but where none of
+    /// its children entries should be visited.
+    ///
+    /// This is always `false` for a file path that does *not* correspond to a
+    /// directory.
+    pub fn should_descend(&self) -> bool {
+        self.should_descend
+    }
+
+    /// Returns true only when this result corresponds to an entry that is
+    /// within the depth filter.
+    ///
+    /// This is `false` when a path corresponds to a directory and is less than
+    /// the minimum depth. In this case, callers should continue looking inside
+    /// that directory.
+    ///
+    /// This is always `true` for a match corresponding to a file path that
+    /// isn't a directory.
+    pub fn is_within_depth(&self) -> bool {
+        self.is_within_depth
+    }
+
+    /// Inverts the match so that `Ignore` becomes `Whitelist` and
+    /// `Whitelist` becomes `Ignore`. A non-match remains the same.
+    pub fn invert(self) -> IncrementalMatch {
+        IncrementalMatch { mat: self.mat.invert(), ..self }
+    }
+}
+
+/// Return a lexically normalized absolute representation of `path`.
+///
+/// This collapses `.` and `..`, but intentionally does not canonicalize or
+/// resolve symlinks. Ignore rules apply to the lexical path, and resolving a
+/// symlink below a root could move the result outside of that root.
+fn normalize_absolute(path: &Path) -> Option<PathBuf> {
+    let absolute = std::path::absolute(path).ok()?;
+    let mut normalized = PathBuf::new();
+    for component in absolute.components() {
+        match component {
+            std::path::Component::CurDir => {}
+            std::path::Component::ParentDir => {
+                normalized.pop();
+            }
+            _ => normalized.push(component.as_os_str()),
+        }
+    }
+    Some(normalized)
+}
+
+#[cfg(test)]
+mod tests {
+    use std::{
+        fs::{self, File},
+        io::Write,
+        path::{Path, PathBuf},
+    };
+
+    use crate::{
+        IncrementalIgnore, IncrementalMatch, WalkBuilder,
+        overrides::OverrideBuilder, tests::TempDir, types::TypesBuilder,
+    };
+
+    use super::CachedDir;
+
+    fn wfile<P: AsRef<Path>>(path: P, contents: &str) {
+        let mut file = File::create(path).unwrap();
+        file.write_all(contents.as_bytes()).unwrap();
+    }
+
+    fn mkdirp<P: AsRef<Path>>(path: P) {
+        fs::create_dir_all(path).unwrap();
+    }
+
+    fn tmpdir() -> TempDir {
+        TempDir::new().unwrap()
+    }
+
+    fn builder<P: AsRef<Path>>(path: P) -> WalkBuilder {
+        let mut builder = WalkBuilder::new(path);
+        builder.git_global(false);
+        builder
+    }
+
+    fn one_matcher(builder: &WalkBuilder) -> IncrementalIgnore {
+        let mut matchers = builder.build_matchers();
+        assert_eq!(matchers.len(), 1);
+        matchers.pop().unwrap()
+    }
+
+    fn builders<I: IntoIterator<Item = P>, P: AsRef<Path>>(
+        paths: I,
+    ) -> WalkBuilder {
+        let mut builder = WalkBuilder::from_iter(paths);
+        builder.git_global(false);
+        builder
+    }
+
+    fn matchers(builder: &WalkBuilder) -> Vec<IncrementalIgnore> {
+        builder.build_matchers()
+    }
+
+    fn matchedf<P: AsRef<Path>>(
+        matcher: &mut IncrementalIgnore,
+        path: P,
+    ) -> IncrementalMatch {
+        let (matched, err) = matcher.matched_with_errors(path, false);
+        assert!(err.is_none(), "unexpected matcher error: {err:?}");
+        matched
+    }
+
+    fn matchedd<P: AsRef<Path>>(
+        matcher: &mut IncrementalIgnore,
+        path: P,
+    ) -> IncrementalMatch {
+        let (matched, err) = matcher.matched_with_errors(path, true);
+        assert!(err.is_none(), "unexpected matcher error: {err:?}");
+        matched
+    }
+
+    // Test that multiple parent ignore files, when nested, are respected.
+    #[test]
+    fn nested_parent_gitignores() {
+        let td = tmpdir();
+        let root = td.path().join("project/work");
+        mkdirp(td.path().join(".git"));
+        mkdirp(root.join("src"));
+        wfile(td.path().join(".gitignore"), "*.tmp\n");
+        wfile(td.path().join("project/.gitignore"), "!keep.tmp\nnested.log\n");
+
+        let mut m = one_matcher(&builder(&root));
+        assert_eq!(m.root(), root);
+        assert!(matchedf(&mut m, "src/drop.tmp").is_ignore());
+        assert!(matchedf(&mut m, "src/keep.tmp").is_whitelist());
+        assert!(matchedf(&mut m, "src/nested.log").is_ignore());
+        assert!(matchedf(&mut m, "src/ok.rs").is_none());
+    }
+
+    // Test that an anchored rule in a child directory is matched relative to
+    // that directory, not relative to the configured root.
+    #[test]
+    fn anchored_child_rule_uses_child_root() {
+        let td = tmpdir();
+        let root = td.path().join("root");
+        mkdirp(root.join("a"));
+        wfile(root.join("a/.ignore"), "/foo\n");
+
+        let mut m = one_matcher(&builder(&root));
+        assert!(matchedf(&mut m, "a/foo").is_ignore());
+        assert!(matchedf(&mut m, "a/b/foo").is_none());
+    }
+
+    // Test that a leading `./` impacts how the rules are matched.
+    #[cfg(not(windows))]
+    #[test]
+    fn leading_dot_slash_impacts_matching() {
+        let td = tmpdir();
+        let root = td.path().join("root");
+        mkdirp(root.join("a"));
+        wfile(root.join(".ignore"), "/foo\n");
+        wfile(root.join("a/.ignore"), "/foo\n");
+
+        let mut m = one_matcher(&builder(&root));
+        assert!(matchedf(&mut m, "foo").is_ignore());
+        assert!(matchedf(&mut m, "./foo").is_none());
+        assert!(matchedf(&mut m, "a/allowed").is_none());
+        assert!(matchedf(&mut m, "a/foo").is_ignore());
+        assert!(matchedf(&mut m, "./a/foo").is_none());
+    }
+
+    // Test that custom ignore files are respected.
+    #[test]
+    fn parent_ignore_and_custom_ignore() {
+        let td = tmpdir();
+        let root = td.path().join("project/work");
+        mkdirp(root.join("src"));
+        wfile(td.path().join(".ignore"), "*.cache\n");
+        wfile(td.path().join(".rgignore"), "*.svg\n");
+        wfile(td.path().join("project/.ignore"), "!keep.cache\n");
+        wfile(td.path().join("project/.rgignore"), "!keep.svg\n");
+
+        let mut builder = builder(&root);
+        builder.add_custom_ignore_filename(".rgignore");
+        let mut m = one_matcher(&builder);
+        assert!(matchedf(&mut m, "src/drop.cache").is_ignore());
+        assert!(matchedf(&mut m, "src/keep.cache").is_whitelist());
+        assert!(matchedf(&mut m, "src/drop.svg").is_ignore());
+        assert!(matchedf(&mut m, "src/keep.svg").is_whitelist());
+    }
+
+    // Test that glob overrides take precedence over ignore files.
+    #[test]
+    fn glob_overrides_are_applied() {
+        let td = tmpdir();
+        wfile(td.path().join(".ignore"), "keep.rs\n!drop.rs\n");
+
+        let mut overrides = OverrideBuilder::new(td.path());
+        overrides.add("keep.rs").unwrap();
+        overrides.add("!drop.rs").unwrap();
+        let mut b = builder(td.path());
+        b.overrides(overrides.build().unwrap());
+        let mut m = one_matcher(&b);
+
+        assert!(matchedf(&mut m, "keep.rs").is_whitelist());
+        assert!(matchedf(&mut m, "drop.rs").is_ignore());
+    }
+
+    // Test that an override-ignored directory prevents matching rules below
+    // it, just as it prevents a traversal from descending into the directory.
+    #[test]
+    fn glob_overrides_apply_to_ancestors() {
+        let td = tmpdir();
+        mkdirp(td.path().join("blocked"));
+        wfile(td.path().join("blocked/.ignore"), "!keep.rs\n");
+
+        let mut overrides = OverrideBuilder::new(td.path());
+        overrides.add("!blocked/").unwrap();
+        let mut b = builder(td.path());
+        b.overrides(overrides.build().unwrap());
+        let mut m = one_matcher(&b);
+
+        assert!(matchedf(&mut m, "blocked/keep.rs").is_ignore());
+    }
+
+    // Test that file type selections are applied to files, but not
+    // directories.
+    #[test]
+    fn file_types_are_applied() {
+        let td = tmpdir();
+        mkdirp(td.path().join("src"));
+
+        let mut types = TypesBuilder::new();
+        types.add("rust", "*.rs").unwrap();
+        types.select("rust");
+        let mut b = builder(td.path());
+        b.types(types.build().unwrap());
+        let mut m = one_matcher(&b);
+
+        assert!(matchedd(&mut m, "src").is_none());
+        assert!(matchedf(&mut m, "src/lib.rs").is_whitelist());
+        assert!(matchedf(&mut m, "README.md").is_ignore());
+    }
+
+    #[test]
+    fn directly_ignored_directory_is_not_descended() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".git"));
+        mkdirp(td.path().join("blocked"));
+        wfile(td.path().join(".gitignore"), "blocked/\n");
+
+        let mut m = one_matcher(&builder(td.path()));
+        let dir = matchedd(&mut m, "blocked");
+        assert!(dir.is_ignore());
+        assert!(!dir.should_descend());
+    }
+
+    // Test that when a directory is ignored, anything below it always ignored
+    // even when there are explicit whitelist rules. This matches directory
+    // traversal semantics.
+    #[test]
+    fn ignored_ancestor_wins() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".git"));
+        mkdirp(td.path().join("blocked"));
+        mkdirp(td.path().join("open"));
+        // This is the key line: since the entire `blocked` directory is
+        // ignored, a proper file traversal won't ever descend into it. So
+        // `blocked/keep.rs` should be ignored even if there are ignore rules
+        // "beneath" it that whitelist it.
+        wfile(td.path().join(".gitignore"), "blocked/\n!blocked/keep.rs\n");
+        wfile(td.path().join("blocked/.gitignore"), "!keep.rs\n");
+
+        let mut m = one_matcher(&builder(td.path()));
+        assert!(matchedf(&mut m, "blocked/keep.rs").is_ignore());
+        assert!(matchedf(&mut m, "blocked/other.rs").is_ignore());
+        assert!(matchedf(&mut m, "open/keep.rs").is_none());
+    }
+
+    // Test that we respect git boundaries. And that we don't respect git
+    // boundaries when not configured to do so.
+    #[test]
+    fn respects_git_repository_boundaries() {
+        let td = tmpdir();
+        let root = td.path().join("repo/src");
+        mkdirp(td.path().join("repo/.git"));
+        mkdirp(&root);
+        wfile(td.path().join(".gitignore"), "outside-rule\n");
+        wfile(td.path().join(".ignore"), "tool-rule\n");
+        wfile(td.path().join("repo/.gitignore"), "inside-rule\n");
+
+        let mut m = one_matcher(&builder(&root));
+        assert!(matchedf(&mut m, "inside-rule").is_ignore());
+        assert!(matchedf(&mut m, "outside-rule").is_none());
+        assert!(matchedf(&mut m, "tool-rule").is_ignore());
+
+        let mut no_git_required = builder(&root);
+        no_git_required.require_git(false);
+        let mut m = one_matcher(&no_git_required);
+        assert!(matchedf(&mut m, "outside-rule").is_ignore());
+    }
+
+    // Test that when a gitignore matcher in a parent directory is created, we
+    // reuse that matcher from memory even if it's changed on disk.
+    #[test]
+    fn compiled_matchers_are_reused() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a"));
+        wfile(td.path().join("a/.ignore"), "*.tmp\n");
+
+        let mut m = one_matcher(&builder(td.path()));
+        assert!(matchedf(&mut m, "a/first.tmp").is_ignore());
+
+        // Below demonstrates that this new ignore file contents
+        // aren't actually picked up because it was already loaded.
+        wfile(td.path().join("a/.ignore"), "!*.tmp\n*.rs\n");
+        assert!(matchedf(&mut m, "a/first.tmp").is_ignore());
+        assert!(matchedf(&mut m, "a/second.tmp").is_ignore());
+        assert!(matchedf(&mut m, "a/keep.rs").is_none());
+        // To get the new ignore file, we need to rebuild the matcher.
+        let mut m = one_matcher(&builder(td.path()));
+        assert!(matchedf(&mut m, "a/first.tmp").is_whitelist());
+        assert!(matchedf(&mut m, "a/second.tmp").is_whitelist());
+        assert!(matchedf(&mut m, "a/keep.rs").is_ignore());
+    }
+
+    #[test]
+    fn cached_allowed_parent_matches_children() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a/b"));
+        wfile(td.path().join("a/b/.ignore"), "ignored\n");
+
+        let mut m = one_matcher(&builder(td.path()));
+        assert!(matchedf(&mut m, "a/b/allowed").is_none());
+        assert!(matches!(
+            m.dirs.get(Path::new("a/b")),
+            Some(CachedDir::Allowed(_))
+        ));
+        assert!(matchedf(&mut m, "a/b/ignored").is_ignore());
+    }
+
+    #[test]
+    fn cached_ignored_parent_matches_children() {
+        let td = tmpdir();
+        mkdirp(td.path().join("blocked"));
+        wfile(td.path().join(".ignore"), "blocked/\n");
+
+        let mut m = one_matcher(&builder(td.path()));
+        assert!(matchedf(&mut m, "blocked/first").is_ignore());
+        assert!(matches!(
+            m.dirs.get(Path::new("blocked")),
+            Some(CachedDir::Ignored)
+        ));
+        assert!(matchedf(&mut m, "blocked/second").is_ignore());
+    }
+
+    #[test]
+    fn cached_parent_matcher_is_used_for_directory() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a/b"));
+        wfile(td.path().join("a/b/.ignore"), "**\n");
+
+        let mut m = one_matcher(&builder(td.path()));
+        assert!(matchedf(&mut m, "a/b/file").is_ignore());
+        assert!(matches!(
+            m.dirs.get(Path::new("a/b")),
+            Some(CachedDir::Allowed(_))
+        ));
+        let dir = matchedd(&mut m, "a/b");
+        assert!(dir.is_none());
+        assert!(dir.should_descend());
+    }
+
+    // Like `compiled_matchers_are_reused`, but with multiple roots.
+    #[test]
+    fn compiled_multi_matchers_are_reused() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a/b/c"));
+
+        wfile(td.path().join("a/.ignore"), "*.tmp\n");
+        let mut mats = matchers(&builders([
+            td.path().join("a/b"),
+            td.path().join("a/b/c"),
+        ]));
+        assert!(matchedf(&mut mats[0], "first.tmp").is_ignore());
+        assert!(matchedf(&mut mats[0], "c/first.tmp").is_ignore());
+
+        // Even though we haven't used the second matcher, it should still
+        // reuse the `a/.ignore` above. If it didn't, then `a/b/c/first.tmp`
+        // below would be whitelisted.
+        wfile(td.path().join("a/.ignore"), "!*.tmp\n");
+        assert!(matchedf(&mut mats[1], "first.tmp").is_ignore());
+    }
+
+    #[test]
+    fn compiled_multi_child_matchers_are_not_reused() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a/b/c/d/e"));
+
+        wfile(td.path().join("a/b/c/d/e/.ignore"), "*.tmp\n");
+        let mut mats = matchers(&builders([
+            td.path().join("a/b"),
+            td.path().join("a/b/c"),
+        ]));
+        // Some sanity checking first.
+        assert!(matchedf(&mut mats[0], "c/first.tmp").is_none());
+        assert!(matchedf(&mut mats[0], "c/d/first.tmp").is_none());
+        assert!(matchedf(&mut mats[0], "c/d/e/first.tmp").is_ignore());
+
+        // Now write a new ignore file at the same location as above
+        // and check that the other matcher still uses the "stale" data.
+        wfile(td.path().join("a/b/c/d/e/.ignore"), "!*.tmp\n");
+        assert!(matchedf(&mut mats[1], "first.tmp").is_none());
+        assert!(matchedf(&mut mats[1], "d/first.tmp").is_none());
+        // This is the punch line: because we didn't load `mats[1]` before
+        // changing the ignore file, it loads it here and thus this path gets
+        // whitelisted.
+        assert!(matchedf(&mut mats[1], "d/e/first.tmp").is_whitelist());
+        // ... but `mats[0]` still uses the stale gitignore matcher cached in
+        // memory!
+        assert!(matchedf(&mut mats[0], "c/d/e/first.tmp").is_ignore());
+
+        // If we rebuilder the matcher... then we force reloading and they're
+        // now consistent with one another.
+        let mut mats = matchers(&builders([
+            td.path().join("a/b"),
+            td.path().join("a/b/c"),
+        ]));
+        assert!(matchedf(&mut mats[0], "c/d/e/first.tmp").is_whitelist());
+        assert!(matchedf(&mut mats[1], "d/e/first.tmp").is_whitelist());
+    }
+
+    // Tests that even when there is an error with a glob pattern, we still
+    // respect other glob patterns that are valid.
+    #[test]
+    fn partial_errors_keep_valid_rules() {
+        let td = tmpdir();
+        let root = td.path().join("work");
+        mkdirp(&root);
+        wfile(td.path().join(".ignore"), "{bad\n*.tmp\n");
+
+        let mut builder = builder(&root);
+        builder.git_ignore(false).git_exclude(false);
+        let mut m = one_matcher(&builder);
+        let (matched, err) = m.matched_with_errors("drop.tmp", false);
+        assert!(err.is_some());
+        assert!(matched.is_ignore());
+    }
+
+    // Tests that parent rules are not respected if the matcher is configured
+    // not to do so.
+    #[test]
+    fn parent_loading_can_be_disabled() {
+        let td = tmpdir();
+        let root = td.path().join("work");
+        mkdirp(&root);
+        wfile(td.path().join(".ignore"), "parent-rule\n");
+        wfile(root.join(".ignore"), "root-rule\n");
+
+        let mut b = builder(&root);
+        b.parents(false);
+        let mut m = one_matcher(&b);
+        assert!(matchedf(&mut m, "parent-rule").is_none());
+        assert!(matchedf(&mut m, "root-rule").is_ignore());
+
+        // Sanity check that without `parents(false)`, the parent rule is
+        // respected.
+        let mut m = one_matcher(&builder(&root));
+        assert!(matchedf(&mut m, "parent-rule").is_ignore());
+        assert!(matchedf(&mut m, "root-rule").is_ignore());
+    }
+
+    // Tests that we can normalize a file path that isn't already in "normal"
+    // relative form, and then use that to match on ignore files.
+    #[test]
+    fn paths_are_relative_to_the_root() {
+        let td = tmpdir();
+        let root = td.path().join("root");
+        let outside = td.path().join("outside");
+        mkdirp(&root);
+        mkdirp(&outside);
+        wfile(root.join(".ignore"), "file\n");
+
+        let mut m = one_matcher(&builder(&root));
+        assert!(matchedd(&mut m, "").is_none());
+        assert!(matchedd(&mut m, ".").is_none());
+        assert!(matchedf(&mut m, "file").is_ignore());
+        // Doesn't work because it isn't relative to the root. It's absolute.
+        assert!(matchedf(&mut m, root.join("file")).is_none());
+        // Also doesn't work because while it's relative, it contains `..`.
+        assert!(matchedf(&mut m, "dir/../file").is_none());
+
+        let norm = m.normalize(root.join("dir/../file")).unwrap();
+        assert_eq!(norm, Path::new("file"));
+        assert!(matchedf(&mut m, "file").is_ignore());
+
+        // Doesn't normalize because its an absolute path outside of our root.
+        assert_eq!(m.normalize(outside.join("file")), None);
+    }
+
+    // Tests that two matchers in two different directories correctly interpret
+    // the same parent gitignore file.
+    #[test]
+    fn multiple_roots_keep_their_own_context() {
+        let td = tmpdir();
+        let root_a = td.path().join("a");
+        let root_b = td.path().join("b");
+        mkdirp(td.path().join(".git"));
+        mkdirp(&root_a);
+        mkdirp(&root_b);
+        wfile(td.path().join(".gitignore"), "/a/*.tmp\n/b/*.log\n");
+
+        let mut builder =
+            builders([root_a.as_path(), Path::new("-"), root_b.as_path()]);
+        builder.git_global(false);
+        let mut ms = matchers(&builder);
+        assert_eq!(ms.len(), 3);
+        assert_eq!(ms[0].root(), root_a);
+        assert_eq!(ms[1].root(), Path::new("-"));
+        assert_eq!(ms[2].root(), root_b);
+        assert!(matchedf(&mut ms[0], "drop.tmp").is_ignore());
+        assert!(matchedf(&mut ms[0], "keep.log").is_none());
+        assert!(matchedf(&mut ms[1], "anything").is_none());
+        assert_eq!(ms[1].normalize("anything"), None);
+        assert!(matchedf(&mut ms[2], "keep.tmp").is_none());
+        assert!(matchedf(&mut ms[2], "drop.log").is_ignore());
+    }
+
+    // Tests that only the exact `-` root represents standard input.
+    #[test]
+    fn dot_dash_root_is_not_stdin() {
+        let m = one_matcher(&builder("./-"));
+        assert_eq!(m.root(), Path::new("./-"));
+        assert_eq!(m.normalize("./-/file"), Some(PathBuf::from("file")));
+    }
+
+    #[test]
+    fn stdin_is_inert_with_depth_limits() {
+        let mut b = builder("-");
+        b.min_depth(Some(2));
+        let mut m = one_matcher(&b);
+        let mat = matchedf(&mut m, "file");
+        assert!(mat.is_none());
+        assert!(mat.is_within_depth());
+
+        let mut b = builder("-");
+        b.max_depth(Some(0));
+        let mut m = one_matcher(&b);
+        let mat = matchedd(&mut m, "dir");
+        assert!(mat.is_none());
+        assert!(mat.is_within_depth());
+        assert!(mat.should_descend());
+    }
+
+    // Tests that ignore matching works lexically, and doesn't accidentally
+    // resolve symbolic links.
+    #[cfg(unix)]
+    #[test]
+    fn symlink_path_stays_under_lexical_root() {
+        use std::os::unix::fs::symlink;
+
+        let td = tmpdir();
+        let root = td.path().join("root");
+        let outside = td.path().join("outside");
+        mkdirp(&root);
+        mkdirp(&outside);
+        wfile(root.join(".ignore"), "link\n");
+        wfile(outside.join("target"), "");
+        symlink(outside.join("target"), root.join("link")).unwrap();
+
+        let mut m = one_matcher(&builder(&root));
+        assert!(matchedf(&mut m, "link").is_ignore());
+    }
+
+    #[test]
+    fn depth_limits() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a/b/c/d"));
+
+        let mut b = builder(td.path());
+        b.min_depth(Some(2)).max_depth(Some(3));
+        let mut m = one_matcher(&b);
+
+        let dir = matchedd(&mut m, "a");
+        assert!(!dir.is_within_depth());
+        assert!(dir.should_descend());
+        assert!(matchedf(&mut m, "file").is_ignore());
+
+        let dir = matchedd(&mut m, "a/b");
+        assert!(dir.is_within_depth());
+        assert!(dir.should_descend());
+        assert!(!matchedf(&mut m, "a/file").is_ignore());
+
+        let dir = matchedd(&mut m, "a/b/c");
+        assert!(dir.is_within_depth());
+        assert!(!dir.should_descend());
+        assert!(!matchedf(&mut m, "a/b/file").is_ignore());
+        assert!(matchedf(&mut m, "a/b/c/file").is_ignore());
+
+        let dir = matchedd(&mut m, "a/b/c/d");
+        assert!(dir.is_ignore());
+        assert!(!dir.is_within_depth());
+        assert!(!dir.should_descend());
+        assert!(matchedf(&mut m, "a/b/c/d/file").is_ignore());
+    }
+
+    #[test]
+    fn depth_limits_apply_to_root() {
+        let td = tmpdir();
+
+        let mut b = builder(td.path());
+        b.min_depth(Some(1));
+        let mut m = one_matcher(&b);
+        for path in ["", "."] {
+            let root = matchedd(&mut m, path);
+            assert!(root.is_none());
+            assert!(!root.is_within_depth());
+            assert!(root.should_descend());
+        }
+
+        let mut b = builder(td.path());
+        b.max_depth(Some(0));
+        let mut m = one_matcher(&b);
+        for path in ["", "."] {
+            let root = matchedd(&mut m, path);
+            assert!(root.is_none());
+            assert!(root.is_within_depth());
+            assert!(!root.should_descend());
+        }
+    }
+
+    #[test]
+    fn max_filesize() {
+        let td = tmpdir();
+        mkdirp(td.path().join("dir"));
+        wfile(td.path().join("empty"), "");
+        wfile(td.path().join("at-limit"), "12345");
+        wfile(td.path().join("over-limit"), "123456");
+
+        let mut b = builder(td.path());
+        b.max_filesize(Some(5));
+        let mut m = one_matcher(&b);
+
+        assert!(matchedf(&mut m, "empty").is_none());
+        assert!(matchedf(&mut m, "at-limit").is_none());
+        assert!(matchedf(&mut m, "over-limit").is_ignore());
+
+        let dir = matchedd(&mut m, "dir");
+        assert!(dir.is_none());
+        assert!(dir.should_descend());
+    }
+
+    #[test]
+    fn max_filesize_does_not_stat_ignored_file() {
+        let td = tmpdir();
+        wfile(td.path().join(".ignore"), "ignored\n");
+
+        let mut b = builder(td.path());
+        b.max_filesize(Some(0));
+        let mut m = one_matcher(&b);
+        let (mat, err) = m.matched_with_errors("ignored", false);
+        assert!(mat.is_ignore());
+        assert!(err.is_none(), "ignored missing file was statted: {err:?}");
+    }
+
+    #[cfg(unix)]
+    #[test]
+    fn max_filesize_respects_follow_links() {
+        use std::os::unix::fs::symlink;
+
+        let td = tmpdir();
+        wfile(
+            td.path().join("target"),
+            "target contents are much longer than the size limit",
+        );
+        symlink("target", td.path().join("link")).unwrap();
+
+        let mut b = builder(td.path());
+        b.max_filesize(Some(10));
+        let mut m = one_matcher(&b);
+        assert!(matchedf(&mut m, "link").is_none());
+
+        b.follow_links(true);
+        let mut m = one_matcher(&b);
+        assert!(matchedf(&mut m, "link").is_ignore());
+    }
+
+    #[test]
+    fn hidden_files_and_directories() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".hidden-dir"));
+        mkdirp(td.path().join("visible-dir"));
+        wfile(td.path().join(".hidden-file"), "");
+        wfile(td.path().join("visible-file"), "");
+
+        let mut m = one_matcher(&builder(td.path()));
+        assert!(matchedf(&mut m, ".hidden-file").is_ignore());
+        let dir = matchedd(&mut m, ".hidden-dir");
+        assert!(dir.is_ignore());
+        assert!(!dir.should_descend());
+        assert!(matchedf(&mut m, "visible-file").is_none());
+        let dir = matchedd(&mut m, "visible-dir");
+        assert!(dir.is_none());
+        assert!(dir.should_descend());
+
+        let mut b = builder(td.path());
+        b.hidden(false);
+        let mut m = one_matcher(&b);
+        assert!(matchedf(&mut m, ".hidden-file").is_none());
+        let dir = matchedd(&mut m, ".hidden-dir");
+        assert!(dir.is_none());
+        assert!(dir.should_descend());
+    }
+
+    #[test]
+    fn gitignore_whitelist_overrides_hidden_filter() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".git"));
+        mkdirp(td.path().join(".hidden-dir"));
+        wfile(td.path().join(".hidden-file"), "");
+        wfile(td.path().join(".gitignore"), "!.hidden-file\n!.hidden-dir/\n");
+
+        let mut m = one_matcher(&builder(td.path()));
+        assert!(matchedf(&mut m, ".hidden-file").is_whitelist());
+        let dir = matchedd(&mut m, ".hidden-dir");
+        assert!(dir.is_whitelist());
+        assert!(dir.should_descend());
+    }
+
+    #[test]
+    fn descendants_of_hidden_directories_are_ignored() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".git"));
+        mkdirp(td.path().join(".hidden/nested"));
+        mkdirp(td.path().join("visible/.hidden"));
+        wfile(td.path().join(".hidden/file"), "");
+        wfile(td.path().join(".hidden/nested/file"), "");
+        wfile(td.path().join("visible/.hidden/file"), "");
+        wfile(td.path().join(".hidden/.gitignore"), "!file\n");
+
+        let mut m = one_matcher(&builder(td.path()));
+        assert!(matchedf(&mut m, ".hidden/file").is_ignore());
+        assert!(matchedf(&mut m, ".hidden/nested/file").is_ignore());
+        assert!(matchedf(&mut m, "visible/.hidden/file").is_ignore());
+    }
+
+    #[test]
+    fn whitelisted_hidden_directory_allows_descendants() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".git"));
+        mkdirp(td.path().join(".hidden"));
+        wfile(td.path().join(".hidden/file"), "");
+        wfile(td.path().join(".gitignore"), "!.hidden/\n");
+
+        let mut m = one_matcher(&builder(td.path()));
+        let dir = matchedd(&mut m, ".hidden");
+        assert!(dir.is_whitelist());
+        assert!(dir.should_descend());
+        assert!(matchedf(&mut m, ".hidden/file").is_none());
+    }
+
+    #[test]
+    fn hidden_directories_outside_depth_limits() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a/.hidden"));
+
+        let mut b = builder(td.path());
+        b.min_depth(Some(3));
+        let mut m = one_matcher(&b);
+        let dir = matchedd(&mut m, "a/.hidden");
+        assert!(dir.is_ignore());
+        assert!(!dir.is_within_depth());
+
+        let mut b = builder(td.path());
+        b.max_depth(Some(1));
+        let mut m = one_matcher(&b);
+        let dir = matchedd(&mut m, "a/.hidden");
+        assert!(dir.is_ignore());
+        assert!(!dir.is_within_depth());
+    }
+}
diff --git a/crates/ignore/src/lib.rs b/crates/ignore/src/lib.rs
new file mode 100644
index 000000000..b9c9a3ece
--- /dev/null
+++ b/crates/ignore/src/lib.rs
@@ -0,0 +1,549 @@
+/*!
+The ignore crate provides a fast recursive directory iterator that respects
+various filters such as globs, file types and `.gitignore` files. The precise
+matching rules and precedence is explained in the documentation for
+`WalkBuilder`.
+
+Secondarily, this crate exposes gitignore and file type matchers for use cases
+that demand more fine-grained control.
+
+# Example
+
+This example shows the most basic usage of this crate. This code will
+recursively traverse the current directory while automatically filtering out
+files and directories according to ignore globs found in files like
+`.ignore` and `.gitignore`:
+
+
+```rust,no_run
+use ignore::Walk;
+
+for result in Walk::new("./") {
+    // Each item yielded by the iterator is either a directory entry or an
+    // error, so either print the path or the error.
+    match result {
+        Ok(entry) => println!("{}", entry.path().display()),
+        Err(err) => println!("ERROR: {}", err),
+    }
+}
+```
+
+# Example: advanced
+
+By default, the recursive directory iterator will ignore hidden files and
+directories. This can be disabled by building the iterator with `WalkBuilder`:
+
+```rust,no_run
+use ignore::WalkBuilder;
+
+for result in WalkBuilder::new("./").hidden(false).build() {
+    println!("{:?}", result);
+}
+```
+
+See the documentation for `WalkBuilder` for many other options.
+*/
+
+#![deny(missing_docs)]
+
+use std::path::{Path, PathBuf};
+
+pub use crate::incremental::{IncrementalIgnore, IncrementalMatch};
+pub use crate::walk::{
+    DirEntry, ParallelVisitor, ParallelVisitorBuilder, Walk, WalkBuilder,
+    WalkParallel, WalkState,
+};
+
+mod default_types;
+mod dir;
+pub mod gitignore;
+mod incremental;
+pub mod overrides;
+mod pathutil;
+pub mod types;
+mod walk;
+
+/// Represents an error that can occur when parsing a gitignore file.
+#[derive(Debug)]
+pub enum Error {
+    /// A collection of "soft" errors. These occur when adding an ignore
+    /// file partially succeeded.
+    Partial(Vec<Error>),
+    /// An error associated with a specific line number.
+    WithLineNumber {
+        /// The line number.
+        line: u64,
+        /// The underlying error.
+        err: Box<Error>,
+    },
+    /// An error associated with a particular file path.
+    WithPath {
+        /// The file path.
+        path: PathBuf,
+        /// The underlying error.
+        err: Box<Error>,
+    },
+    /// An error associated with a particular directory depth when recursively
+    /// walking a directory.
+    WithDepth {
+        /// The directory depth.
+        depth: usize,
+        /// The underlying error.
+        err: Box<Error>,
+    },
+    /// An error that occurs when a file loop is detected when traversing
+    /// symbolic links.
+    Loop {
+        /// The ancestor file path in the loop.
+        ancestor: PathBuf,
+        /// The child file path in the loop.
+        child: PathBuf,
+    },
+    /// An error that occurs when doing I/O, such as reading an ignore file.
+    Io(std::io::Error),
+    /// An error that occurs when trying to parse a glob.
+    Glob {
+        /// The original glob that caused this error. This glob, when
+        /// available, always corresponds to the glob provided by an end user.
+        /// e.g., It is the glob as written in a `.gitignore` file.
+        ///
+        /// (This glob may be distinct from the glob that is actually
+        /// compiled, after accounting for `gitignore` semantics.)
+        glob: Option<String>,
+        /// The underlying glob error as a string.
+        err: String,
+    },
+    /// A type selection for a file type that is not defined.
+    UnrecognizedFileType(String),
+    /// A user specified file type definition could not be parsed.
+    InvalidDefinition,
+}
+
+impl Clone for Error {
+    fn clone(&self) -> Error {
+        match *self {
+            Error::Partial(ref errs) => Error::Partial(errs.clone()),
+            Error::WithLineNumber { line, ref err } => {
+                Error::WithLineNumber { line, err: err.clone() }
+            }
+            Error::WithPath { ref path, ref err } => {
+                Error::WithPath { path: path.clone(), err: err.clone() }
+            }
+            Error::WithDepth { depth, ref err } => {
+                Error::WithDepth { depth, err: err.clone() }
+            }
+            Error::Loop { ref ancestor, ref child } => Error::Loop {
+                ancestor: ancestor.clone(),
+                child: child.clone(),
+            },
+            Error::Io(ref err) => match err.raw_os_error() {
+                Some(e) => Error::Io(std::io::Error::from_raw_os_error(e)),
+                None => {
+                    Error::Io(std::io::Error::new(err.kind(), err.to_string()))
+                }
+            },
+            Error::Glob { ref glob, ref err } => {
+                Error::Glob { glob: glob.clone(), err: err.clone() }
+            }
+            Error::UnrecognizedFileType(ref err) => {
+                Error::UnrecognizedFileType(err.clone())
+            }
+            Error::InvalidDefinition => Error::InvalidDefinition,
+        }
+    }
+}
+
+impl Error {
+    /// Returns true if this is a partial error.
+    ///
+    /// A partial error occurs when only some operations failed while others
+    /// may have succeeded. For example, an ignore file may contain an invalid
+    /// glob among otherwise valid globs.
+    pub fn is_partial(&self) -> bool {
+        match *self {
+            Error::Partial(_) => true,
+            Error::WithLineNumber { ref err, .. } => err.is_partial(),
+            Error::WithPath { ref err, .. } => err.is_partial(),
+            Error::WithDepth { ref err, .. } => err.is_partial(),
+            _ => false,
+        }
+    }
+
+    /// Returns true if this error is exclusively an I/O error.
+    pub fn is_io(&self) -> bool {
+        match *self {
+            Error::Partial(ref errs) => errs.len() == 1 && errs[0].is_io(),
+            Error::WithLineNumber { ref err, .. } => err.is_io(),
+            Error::WithPath { ref err, .. } => err.is_io(),
+            Error::WithDepth { ref err, .. } => err.is_io(),
+            Error::Loop { .. } => false,
+            Error::Io(_) => true,
+            Error::Glob { .. } => false,
+            Error::UnrecognizedFileType(_) => false,
+            Error::InvalidDefinition => false,
+        }
+    }
+
+    /// Inspect the original [`std::io::Error`] if there is one.
+    ///
+    /// [`None`] is returned if the [`Error`] doesn't correspond to an
+    /// [`std::io::Error`]. This might happen, for example, when the error was
+    /// produced because a cycle was found in the directory tree while
+    /// following symbolic links.
+    ///
+    /// This method returns a borrowed value that is bound to the lifetime of the [`Error`]. To
+    /// obtain an owned value, the [`into_io_error`] can be used instead.
+    ///
+    /// > This is the original [`std::io::Error`] and is _not_ the same as
+    /// > [`impl From<Error> for std::io::Error`][impl] which contains
+    /// > additional context about the error.
+    ///
+    /// [`None`]: https://doc.rust-lang.org/stable/std/option/enum.Option.html#variant.None
+    /// [`std::io::Error`]: https://doc.rust-lang.org/stable/std/io/struct.Error.html
+    /// [`From`]: https://doc.rust-lang.org/stable/std/convert/trait.From.html
+    /// [`Error`]: struct.Error.html
+    /// [`into_io_error`]: struct.Error.html#method.into_io_error
+    /// [impl]: struct.Error.html#impl-From%3CError%3E
+    pub fn io_error(&self) -> Option<&std::io::Error> {
+        match *self {
+            Error::Partial(ref errs) => {
+                if errs.len() == 1 {
+                    errs[0].io_error()
+                } else {
+                    None
+                }
+            }
+            Error::WithLineNumber { ref err, .. } => err.io_error(),
+            Error::WithPath { ref err, .. } => err.io_error(),
+            Error::WithDepth { ref err, .. } => err.io_error(),
+            Error::Loop { .. } => None,
+            Error::Io(ref err) => Some(err),
+            Error::Glob { .. } => None,
+            Error::UnrecognizedFileType(_) => None,
+            Error::InvalidDefinition => None,
+        }
+    }
+
+    /// Similar to [`io_error`] except consumes self to convert to the original
+    /// [`std::io::Error`] if one exists.
+    ///
+    /// [`io_error`]: struct.Error.html#method.io_error
+    /// [`std::io::Error`]: https://doc.rust-lang.org/stable/std/io/struct.Error.html
+    pub fn into_io_error(self) -> Option<std::io::Error> {
+        match self {
+            Error::Partial(mut errs) => {
+                if errs.len() == 1 {
+                    errs.remove(0).into_io_error()
+                } else {
+                    None
+                }
+            }
+            Error::WithLineNumber { err, .. } => err.into_io_error(),
+            Error::WithPath { err, .. } => err.into_io_error(),
+            Error::WithDepth { err, .. } => err.into_io_error(),
+            Error::Loop { .. } => None,
+            Error::Io(err) => Some(err),
+            Error::Glob { .. } => None,
+            Error::UnrecognizedFileType(_) => None,
+            Error::InvalidDefinition => None,
+        }
+    }
+
+    /// Returns a depth associated with recursively walking a directory (if
+    /// this error was generated from a recursive directory iterator).
+    pub fn depth(&self) -> Option<usize> {
+        match *self {
+            Error::WithPath { ref err, .. } => err.depth(),
+            Error::WithDepth { depth, .. } => Some(depth),
+            _ => None,
+        }
+    }
+
+    /// Turn an error into a tagged error with the given file path.
+    fn with_path<P: AsRef<Path>>(self, path: P) -> Error {
+        Error::WithPath {
+            path: path.as_ref().to_path_buf(),
+            err: Box::new(self),
+        }
+    }
+
+    /// Turn an error into a tagged error with the given depth.
+    fn with_depth(self, depth: usize) -> Error {
+        Error::WithDepth { depth, err: Box::new(self) }
+    }
+
+    /// Turn an error into a tagged error with the given file path and line
+    /// number. If path is empty, then it is omitted from the error.
+    fn tagged<P: AsRef<Path>>(self, path: P, lineno: u64) -> Error {
+        let errline =
+            Error::WithLineNumber { line: lineno, err: Box::new(self) };
+        if path.as_ref().as_os_str().is_empty() {
+            return errline;
+        }
+        errline.with_path(path)
+    }
+
+    /// Build an error from a walkdir error.
+    fn from_walkdir(err: walkdir::Error) -> Error {
+        let depth = err.depth();
+        if let (Some(anc), Some(child)) = (err.loop_ancestor(), err.path()) {
+            return Error::WithDepth {
+                depth,
+                err: Box::new(Error::Loop {
+                    ancestor: anc.to_path_buf(),
+                    child: child.to_path_buf(),
+                }),
+            };
+        }
+        let path = err.path().map(|p| p.to_path_buf());
+        let mut ig_err = Error::WithDepth {
+            depth,
+            err: Box::new(Error::Io(std::io::Error::from(err))),
+        };
+        if let Some(path) = path {
+            ig_err = Error::WithPath { path, err: Box::new(ig_err) };
+        }
+        ig_err
+    }
+}
+
+impl std::error::Error for Error {
+    #[allow(deprecated)]
+    fn description(&self) -> &str {
+        match *self {
+            Error::Partial(_) => "partial error",
+            Error::WithLineNumber { ref err, .. } => err.description(),
+            Error::WithPath { ref err, .. } => err.description(),
+            Error::WithDepth { ref err, .. } => err.description(),
+            Error::Loop { .. } => "file system loop found",
+            Error::Io(ref err) => err.description(),
+            Error::Glob { ref err, .. } => err,
+            Error::UnrecognizedFileType(_) => "unrecognized file type",
+            Error::InvalidDefinition => "invalid definition",
+        }
+    }
+}
+
+impl std::fmt::Display for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match *self {
+            Error::Partial(ref errs) => {
+                let msgs: Vec<String> =
+                    errs.iter().map(|err| err.to_string()).collect();
+                write!(f, "{}", msgs.join("\n"))
+            }
+            Error::WithLineNumber { line, ref err } => {
+                write!(f, "line {}: {}", line, err)
+            }
+            Error::WithPath { ref path, ref err } => {
+                write!(f, "{}: {}", path.display(), err)
+            }
+            Error::WithDepth { ref err, .. } => err.fmt(f),
+            Error::Loop { ref ancestor, ref child } => write!(
+                f,
+                "File system loop found: \
+                           {} points to an ancestor {}",
+                child.display(),
+                ancestor.display()
+            ),
+            Error::Io(ref err) => err.fmt(f),
+            Error::Glob { glob: None, ref err } => write!(f, "{}", err),
+            Error::Glob { glob: Some(ref glob), ref err } => {
+                write!(f, "error parsing glob '{}': {}", glob, err)
+            }
+            Error::UnrecognizedFileType(ref ty) => {
+                write!(f, "unrecognized file type: {}", ty)
+            }
+            Error::InvalidDefinition => write!(
+                f,
+                "invalid definition (format is type:glob, e.g., \
+                           html:*.html)"
+            ),
+        }
+    }
+}
+
+impl From<std::io::Error> for Error {
+    fn from(err: std::io::Error) -> Error {
+        Error::Io(err)
+    }
+}
+
+#[derive(Debug, Default)]
+struct PartialErrorBuilder(Vec<Error>);
+
+impl PartialErrorBuilder {
+    fn push(&mut self, err: Error) {
+        self.0.push(err);
+    }
+
+    fn push_ignore_io(&mut self, err: Error) {
+        if !err.is_io() {
+            self.push(err);
+        }
+    }
+
+    fn maybe_push(&mut self, err: Option<Error>) {
+        if let Some(err) = err {
+            self.push(err);
+        }
+    }
+
+    fn maybe_push_ignore_io(&mut self, err: Option<Error>) {
+        if let Some(err) = err {
+            self.push_ignore_io(err);
+        }
+    }
+
+    fn into_error_option(mut self) -> Option<Error> {
+        if self.0.is_empty() {
+            None
+        } else if self.0.len() == 1 {
+            Some(self.0.pop().unwrap())
+        } else {
+            Some(Error::Partial(self.0))
+        }
+    }
+}
+
+/// The result of a glob match.
+///
+/// The type parameter `T` typically refers to a type that provides more
+/// information about a particular match. For example, it might identify
+/// the specific gitignore file and the specific glob pattern that caused
+/// the match.
+#[derive(Clone, Debug)]
+pub enum Match<T> {
+    /// The path didn't match any glob.
+    None,
+    /// The highest precedent glob matched indicates the path should be
+    /// ignored.
+    Ignore(T),
+    /// The highest precedent glob matched indicates the path should be
+    /// whitelisted.
+    Whitelist(T),
+}
+
+impl<T> Match<T> {
+    /// Returns true if the match result didn't match any globs.
+    pub fn is_none(&self) -> bool {
+        match *self {
+            Match::None => true,
+            Match::Ignore(_) | Match::Whitelist(_) => false,
+        }
+    }
+
+    /// Returns true if the match result implies the path should be ignored.
+    pub fn is_ignore(&self) -> bool {
+        match *self {
+            Match::Ignore(_) => true,
+            Match::None | Match::Whitelist(_) => false,
+        }
+    }
+
+    /// Returns true if the match result implies the path should be
+    /// whitelisted.
+    pub fn is_whitelist(&self) -> bool {
+        match *self {
+            Match::Whitelist(_) => true,
+            Match::None | Match::Ignore(_) => false,
+        }
+    }
+
+    /// Inverts the match so that `Ignore` becomes `Whitelist` and
+    /// `Whitelist` becomes `Ignore`. A non-match remains the same.
+    pub fn invert(self) -> Match<T> {
+        match self {
+            Match::None => Match::None,
+            Match::Ignore(t) => Match::Whitelist(t),
+            Match::Whitelist(t) => Match::Ignore(t),
+        }
+    }
+
+    /// Return the value inside this match if it exists.
+    pub fn inner(&self) -> Option<&T> {
+        match *self {
+            Match::None => None,
+            Match::Ignore(ref t) => Some(t),
+            Match::Whitelist(ref t) => Some(t),
+        }
+    }
+
+    /// Apply the given function to the value inside this match.
+    ///
+    /// If the match has no value, then return the match unchanged.
+    pub fn map<U, F: FnOnce(T) -> U>(self, f: F) -> Match<U> {
+        match self {
+            Match::None => Match::None,
+            Match::Ignore(t) => Match::Ignore(f(t)),
+            Match::Whitelist(t) => Match::Whitelist(f(t)),
+        }
+    }
+
+    /// Return the match if it is not none. Otherwise, return other.
+    pub fn or(self, other: Self) -> Self {
+        if self.is_none() { other } else { self }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::{
+        env, fs,
+        path::{Path, PathBuf},
+    };
+
+    /// A convenient result type alias.
+    pub(crate) type Result<T> =
+        std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>;
+
+    macro_rules! err {
+        ($($tt:tt)*) => {
+            Box::<dyn std::error::Error + Send + Sync>::from(format!($($tt)*))
+        }
+    }
+
+    /// A simple wrapper for creating a temporary directory that is
+    /// automatically deleted when it's dropped.
+    ///
+    /// We use this in lieu of tempfile because tempfile brings in too many
+    /// dependencies.
+    #[derive(Debug)]
+    pub struct TempDir(PathBuf);
+
+    impl Drop for TempDir {
+        fn drop(&mut self) {
+            fs::remove_dir_all(&self.0).unwrap();
+        }
+    }
+
+    impl TempDir {
+        /// Create a new empty temporary directory under the system's configured
+        /// temporary directory.
+        pub fn new() -> Result<TempDir> {
+            use std::sync::atomic::{AtomicUsize, Ordering};
+
+            static TRIES: usize = 100;
+            static COUNTER: AtomicUsize = AtomicUsize::new(0);
+
+            let tmpdir = env::temp_dir();
+            for _ in 0..TRIES {
+                let count = COUNTER.fetch_add(1, Ordering::Relaxed);
+                let path = tmpdir.join("rust-ignore").join(count.to_string());
+                if path.is_dir() {
+                    continue;
+                }
+                fs::create_dir_all(&path).map_err(|e| {
+                    err!("failed to create {}: {}", path.display(), e)
+                })?;
+                return Ok(TempDir(path));
+            }
+            Err(err!("failed to create temp dir after {} tries", TRIES))
+        }
+
+        /// Return the underlying path to this temporary directory.
+        pub fn path(&self) -> &Path {
+            &self.0
+        }
+    }
+}
diff --git a/crates/ignore/src/overrides.rs b/crates/ignore/src/overrides.rs
new file mode 100644
index 000000000..005cae8f2
--- /dev/null
+++ b/crates/ignore/src/overrides.rs
@@ -0,0 +1,293 @@
+/*!
+The overrides module provides a way to specify a set of override globs.
+
+This provides functionality similar to `--include` or `--exclude` in command
+line tools.
+*/
+
+use std::path::Path;
+
+use crate::{
+    Error, Match,
+    gitignore::{self, Gitignore, GitignoreBuilder},
+};
+
+/// Glob represents a single glob in an override matcher.
+///
+/// This is used to report information about the highest precedent glob
+/// that matched.
+///
+/// Note that not all matches necessarily correspond to a specific glob. For
+/// example, if there are one or more whitelist globs and a file path doesn't
+/// match any glob in the set, then the file path is considered to be ignored.
+///
+/// The lifetime `'a` refers to the lifetime of the matcher that produced
+/// this glob.
+#[derive(Clone, Debug)]
+#[allow(dead_code)]
+pub struct Glob<'a>(GlobInner<'a>);
+
+#[derive(Clone, Debug)]
+#[allow(dead_code)]
+enum GlobInner<'a> {
+    /// No glob matched, but the file path should still be ignored.
+    UnmatchedIgnore,
+    /// A glob matched.
+    Matched(&'a gitignore::Glob),
+}
+
+impl<'a> Glob<'a> {
+    fn unmatched() -> Glob<'a> {
+        Glob(GlobInner::UnmatchedIgnore)
+    }
+}
+
+/// Manages a set of overrides provided explicitly by the end user.
+#[derive(Clone, Debug)]
+pub struct Override(Gitignore);
+
+impl Override {
+    /// Returns an empty matcher that never matches any file path.
+    pub fn empty() -> Override {
+        Override(Gitignore::empty())
+    }
+
+    /// Returns the directory of this override set.
+    ///
+    /// All matches are done relative to this path.
+    pub fn path(&self) -> &Path {
+        self.0.path()
+    }
+
+    /// Returns true if and only if this matcher is empty.
+    ///
+    /// When a matcher is empty, it will never match any file path.
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    /// Returns the total number of ignore globs.
+    pub fn num_ignores(&self) -> u64 {
+        self.0.num_whitelists()
+    }
+
+    /// Returns the total number of whitelisted globs.
+    pub fn num_whitelists(&self) -> u64 {
+        self.0.num_ignores()
+    }
+
+    /// Returns whether the given file path matched a pattern in this override
+    /// matcher.
+    ///
+    /// `is_dir` should be true if the path refers to a directory and false
+    /// otherwise.
+    ///
+    /// If there are no overrides, then this always returns `Match::None`.
+    ///
+    /// If there is at least one whitelist override and `is_dir` is false, then
+    /// this never returns `Match::None`, since non-matches are interpreted as
+    /// ignored.
+    ///
+    /// The given path is matched to the globs relative to the path given
+    /// when building the override matcher. Specifically, before matching
+    /// `path`, its prefix (as determined by a common suffix of the directory
+    /// given) is stripped. If there is no common suffix/prefix overlap, then
+    /// `path` is assumed to reside in the same directory as the root path for
+    /// this set of overrides.
+    pub fn matched<'a, P: AsRef<Path>>(
+        &'a self,
+        path: P,
+        is_dir: bool,
+    ) -> Match<Glob<'a>> {
+        if self.is_empty() {
+            return Match::None;
+        }
+        let mat = self.0.matched(path, is_dir).invert();
+        if mat.is_none() && self.num_whitelists() > 0 && !is_dir {
+            return Match::Ignore(Glob::unmatched());
+        }
+        mat.map(move |giglob| Glob(GlobInner::Matched(giglob)))
+    }
+}
+
+/// Builds a matcher for a set of glob overrides.
+#[derive(Clone, Debug)]
+pub struct OverrideBuilder {
+    builder: GitignoreBuilder,
+}
+
+impl OverrideBuilder {
+    /// Create a new override builder.
+    ///
+    /// Matching is done relative to the directory path provided.
+    pub fn new<P: AsRef<Path>>(path: P) -> OverrideBuilder {
+        let mut builder = GitignoreBuilder::new(path);
+        builder.allow_unclosed_class(false);
+        OverrideBuilder { builder }
+    }
+
+    /// Builds a new override matcher from the globs added so far.
+    ///
+    /// Once a matcher is built, no new globs can be added to it.
+    pub fn build(&self) -> Result<Override, Error> {
+        Ok(Override(self.builder.build()?))
+    }
+
+    /// Add a glob to the set of overrides.
+    ///
+    /// Globs provided here have precisely the same semantics as a single
+    /// line in a `gitignore` file, where the meaning of `!` is inverted:
+    /// namely, `!` at the beginning of a glob will ignore a file. Without `!`,
+    /// all matches of the glob provided are treated as whitelist matches.
+    pub fn add(&mut self, glob: &str) -> Result<&mut OverrideBuilder, Error> {
+        self.builder.add_line(None, glob)?;
+        Ok(self)
+    }
+
+    /// Toggle whether the globs should be matched case insensitively or not.
+    ///
+    /// When this option is changed, only globs added after the change will be
+    /// affected.
+    ///
+    /// This is disabled by default.
+    pub fn case_insensitive(
+        &mut self,
+        yes: bool,
+    ) -> Result<&mut OverrideBuilder, Error> {
+        // TODO: This should not return a `Result`. Fix this in the next semver
+        // release.
+        self.builder.case_insensitive(yes)?;
+        Ok(self)
+    }
+
+    /// Toggle whether unclosed character classes are allowed. When allowed,
+    /// a `[` without a matching `]` is treated literally instead of resulting
+    /// in a parse error.
+    ///
+    /// For example, if this is set then the glob `[abc` will be treated as the
+    /// literal string `[abc` instead of returning an error.
+    ///
+    /// By default, this is false. Generally speaking, enabling this leads to
+    /// worse failure modes since the glob parser becomes more permissive. You
+    /// might want to enable this when compatibility (e.g., with POSIX glob
+    /// implementations) is more important than good error messages.
+    ///
+    /// This default is different from the default for [`Gitignore`]. Namely,
+    /// [`Gitignore`] is intended to match git's behavior as-is. But this
+    /// abstraction for "override" globs does not necessarily conform to any
+    /// other known specification and instead prioritizes better error
+    /// messages.
+    pub fn allow_unclosed_class(&mut self, yes: bool) -> &mut OverrideBuilder {
+        self.builder.allow_unclosed_class(yes);
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{Override, OverrideBuilder};
+
+    const ROOT: &'static str = "/home/andrew/foo";
+
+    fn ov(globs: &[&str]) -> Override {
+        let mut builder = OverrideBuilder::new(ROOT);
+        for glob in globs {
+            builder.add(glob).unwrap();
+        }
+        builder.build().unwrap()
+    }
+
+    #[test]
+    fn empty() {
+        let ov = ov(&[]);
+        assert!(ov.matched("a.foo", false).is_none());
+        assert!(ov.matched("a", false).is_none());
+        assert!(ov.matched("", false).is_none());
+    }
+
+    #[test]
+    fn simple() {
+        let ov = ov(&["*.foo", "!*.bar"]);
+        assert!(ov.matched("a.foo", false).is_whitelist());
+        assert!(ov.matched("a.foo", true).is_whitelist());
+        assert!(ov.matched("a.rs", false).is_ignore());
+        assert!(ov.matched("a.rs", true).is_none());
+        assert!(ov.matched("a.bar", false).is_ignore());
+        assert!(ov.matched("a.bar", true).is_ignore());
+    }
+
+    #[test]
+    fn only_ignores() {
+        let ov = ov(&["!*.bar"]);
+        assert!(ov.matched("a.rs", false).is_none());
+        assert!(ov.matched("a.rs", true).is_none());
+        assert!(ov.matched("a.bar", false).is_ignore());
+        assert!(ov.matched("a.bar", true).is_ignore());
+    }
+
+    #[test]
+    fn precedence() {
+        let ov = ov(&["*.foo", "!*.bar.foo"]);
+        assert!(ov.matched("a.foo", false).is_whitelist());
+        assert!(ov.matched("a.baz", false).is_ignore());
+        assert!(ov.matched("a.bar.foo", false).is_ignore());
+    }
+
+    #[test]
+    fn gitignore() {
+        let ov = ov(&["/foo", "bar/*.rs", "baz/**"]);
+        assert!(ov.matched("bar/lib.rs", false).is_whitelist());
+        assert!(ov.matched("bar/wat/lib.rs", false).is_ignore());
+        assert!(ov.matched("wat/bar/lib.rs", false).is_ignore());
+        assert!(ov.matched("foo", false).is_whitelist());
+        assert!(ov.matched("wat/foo", false).is_ignore());
+        assert!(ov.matched("baz", false).is_ignore());
+        assert!(ov.matched("baz/a", false).is_whitelist());
+        assert!(ov.matched("baz/a/b", false).is_whitelist());
+    }
+
+    #[test]
+    fn allow_directories() {
+        // This tests that directories are NOT ignored when they are unmatched.
+        let ov = ov(&["*.rs"]);
+        assert!(ov.matched("foo.rs", false).is_whitelist());
+        assert!(ov.matched("foo.c", false).is_ignore());
+        assert!(ov.matched("foo", false).is_ignore());
+        assert!(ov.matched("foo", true).is_none());
+        assert!(ov.matched("src/foo.rs", false).is_whitelist());
+        assert!(ov.matched("src/foo.c", false).is_ignore());
+        assert!(ov.matched("src/foo", false).is_ignore());
+        assert!(ov.matched("src/foo", true).is_none());
+    }
+
+    #[test]
+    fn absolute_path() {
+        let ov = ov(&["!/bar"]);
+        assert!(ov.matched("./foo/bar", false).is_none());
+    }
+
+    #[test]
+    fn case_insensitive() {
+        let ov = OverrideBuilder::new(ROOT)
+            .case_insensitive(true)
+            .unwrap()
+            .add("*.html")
+            .unwrap()
+            .build()
+            .unwrap();
+        assert!(ov.matched("foo.html", false).is_whitelist());
+        assert!(ov.matched("foo.HTML", false).is_whitelist());
+        assert!(ov.matched("foo.htm", false).is_ignore());
+        assert!(ov.matched("foo.HTM", false).is_ignore());
+    }
+
+    #[test]
+    fn default_case_sensitive() {
+        let ov =
+            OverrideBuilder::new(ROOT).add("*.html").unwrap().build().unwrap();
+        assert!(ov.matched("foo.html", false).is_whitelist());
+        assert!(ov.matched("foo.HTML", false).is_ignore());
+        assert!(ov.matched("foo.htm", false).is_ignore());
+        assert!(ov.matched("foo.HTM", false).is_ignore());
+    }
+}
diff --git a/crates/ignore/src/pathutil.rs b/crates/ignore/src/pathutil.rs
new file mode 100644
index 000000000..5de8c106c
--- /dev/null
+++ b/crates/ignore/src/pathutil.rs
@@ -0,0 +1,171 @@
+use std::{ffi::OsStr, path::Path};
+
+use crate::walk::DirEntry;
+
+/// Returns true if and only if this path is considered to be hidden.
+///
+/// # Platform behavior
+///
+/// ## Windows
+///
+/// This returns true if one of the following is true:
+///
+/// * The base name of the path starts with a `.`.
+/// * The file attributes have the `HIDDEN` property set.
+///
+/// ## All other platforms
+///
+/// This only returns true if the base name of the path starts with a `.`.
+pub(crate) fn is_hidden_path(dent: &Path) -> bool {
+    #[cfg(not(windows))]
+    fn imp(path: &Path) -> bool {
+        is_hidden_path_only(path)
+    }
+
+    #[cfg(windows)]
+    fn imp(path: &Path) -> bool {
+        use std::os::windows::fs::MetadataExt;
+        use winapi_util::file;
+
+        if let Ok(md) = path.metadata() {
+            if file::is_hidden(md.file_attributes() as u64) {
+                return true;
+            }
+        }
+        is_hidden_path_only(path)
+    }
+
+    imp(dent)
+}
+
+/// Returns true if and only if this directory entry is considered to be
+/// hidden.
+///
+/// # Platform behavior
+///
+/// ## Windows
+///
+/// This returns true if one of the following is true:
+///
+/// * The base name of the path starts with a `.`.
+/// * The file attributes have the `HIDDEN` property set.
+///
+/// ## All other platforms
+///
+/// This only returns true if the base name of the path starts with a `.`.
+pub(crate) fn is_hidden_entry(dent: &DirEntry) -> bool {
+    #[cfg(not(windows))]
+    fn imp(dent: &DirEntry) -> bool {
+        is_hidden_path_only(dent.path())
+    }
+
+    #[cfg(windows)]
+    fn imp(dent: &DirEntry) -> bool {
+        use std::os::windows::fs::MetadataExt;
+        use winapi_util::file;
+
+        // This looks like we're doing an extra stat call, but on Windows, the
+        // directory traverser reuses the metadata retrieved from each directory
+        // entry and stores it on the DirEntry itself. So this is "free."
+        if let Ok(md) = dent.metadata() {
+            if file::is_hidden(md.file_attributes() as u64) {
+                return true;
+            }
+        }
+        is_hidden_path_only(dent.path())
+    }
+
+    imp(dent)
+}
+
+/// Returns true if and only if this path is considered to be hidden from only
+/// the path itself.
+///
+/// This has the same behavior on all platforms.
+fn is_hidden_path_only(path: &Path) -> bool {
+    if let Some(name) = file_name(path) {
+        name.as_encoded_bytes().starts_with(b".")
+    } else {
+        false
+    }
+}
+
+/// Strip `prefix` from the `path` and return the remainder.
+///
+/// If `path` doesn't have a prefix `prefix`, then return `None`.
+pub(crate) fn strip_prefix<'a, P: AsRef<Path> + ?Sized>(
+    prefix: &'a P,
+    path: &'a Path,
+) -> Option<&'a Path> {
+    #[cfg(unix)]
+    fn imp<'a>(prefix: &'a Path, path: &'a Path) -> Option<&'a Path> {
+        use std::os::unix::ffi::OsStrExt;
+
+        let prefix = prefix.as_os_str().as_bytes();
+        let path = path.as_os_str().as_bytes();
+        if prefix.len() > path.len() || prefix != &path[0..prefix.len()] {
+            None
+        } else {
+            Some(&Path::new(OsStr::from_bytes(&path[prefix.len()..])))
+        }
+    }
+
+    #[cfg(not(unix))]
+    fn imp<'a>(prefix: &'a Path, path: &'a Path) -> Option<&'a Path> {
+        path.strip_prefix(prefix).ok()
+    }
+
+    imp(prefix.as_ref(), path)
+}
+
+/// Returns true if this file path is just a file name. i.e., Its parent is
+/// the empty string.
+pub(crate) fn is_file_name<P: AsRef<Path>>(path: P) -> bool {
+    #[cfg(unix)]
+    {
+        memchr::memchr(b'/', path.as_ref().as_os_str().as_encoded_bytes())
+            .is_none()
+    }
+    #[cfg(not(unix))]
+    {
+        path.as_ref()
+            .parent()
+            .map(|p| p.as_os_str().is_empty())
+            .unwrap_or(false)
+    }
+}
+
+/// The final component of the path, if it is a normal file.
+///
+/// If the path terminates in `.`, `..`, or consists solely of a root of
+/// prefix, this will return `None`.
+pub(crate) fn file_name<'a, P: AsRef<Path> + ?Sized>(
+    path: &'a P,
+) -> Option<&'a OsStr> {
+    #[cfg(unix)]
+    fn imp(path: &Path) -> Option<&OsStr> {
+        use std::os::unix::ffi::OsStrExt;
+
+        use memchr::memrchr;
+
+        let path = path.as_os_str().as_bytes();
+        if path.is_empty() {
+            return None;
+        } else if path.len() == 1 && path[0] == b'.' {
+            return None;
+        } else if path.last() == Some(&b'.') {
+            return None;
+        } else if path.len() >= 2 && &path[path.len() - 2..] == &b".."[..] {
+            return None;
+        }
+        let last_slash = memrchr(b'/', path).map(|i| i + 1).unwrap_or(0);
+        Some(OsStr::from_bytes(&path[last_slash..]))
+    }
+
+    #[cfg(not(unix))]
+    fn imp(path: &Path) -> Option<&OsStr> {
+        path.file_name()
+    }
+
+    imp(path.as_ref())
+}
diff --git a/crates/ignore/src/types.rs b/crates/ignore/src/types.rs
new file mode 100644
index 000000000..313cf5c0e
--- /dev/null
+++ b/crates/ignore/src/types.rs
@@ -0,0 +1,588 @@
+/*!
+The types module provides a way of associating globs on file names to file
+types.
+
+This can be used to match specific types of files. For example, among
+the default file types provided, the Rust file type is defined to be `*.rs`
+with name `rust`. Similarly, the C file type is defined to be `*.{c,h}` with
+name `c`.
+
+Note that the set of default types may change over time.
+
+# Example
+
+This shows how to create and use a simple file type matcher using the default
+file types defined in this crate.
+
+```
+use ignore::types::TypesBuilder;
+
+let mut builder = TypesBuilder::new();
+builder.add_defaults();
+builder.select("rust");
+let matcher = builder.build().unwrap();
+
+assert!(matcher.matched("foo.rs", false).is_whitelist());
+assert!(matcher.matched("foo.c", false).is_ignore());
+```
+
+# Example: negation
+
+This is like the previous example, but shows how negating a file type works.
+That is, this will let us match file paths that *don't* correspond to a
+particular file type.
+
+```
+use ignore::types::TypesBuilder;
+
+let mut builder = TypesBuilder::new();
+builder.add_defaults();
+builder.negate("c");
+let matcher = builder.build().unwrap();
+
+assert!(matcher.matched("foo.rs", false).is_none());
+assert!(matcher.matched("foo.c", false).is_ignore());
+```
+
+# Example: custom file type definitions
+
+This shows how to extend this library default file type definitions with
+your own.
+
+```
+use ignore::types::TypesBuilder;
+
+let mut builder = TypesBuilder::new();
+builder.add_defaults();
+builder.add("foo", "*.foo");
+// Another way of adding a file type definition.
+// This is useful when accepting input from an end user.
+builder.add_def("bar:*.bar");
+// Note: we only select `foo`, not `bar`.
+builder.select("foo");
+let matcher = builder.build().unwrap();
+
+assert!(matcher.matched("x.foo", false).is_whitelist());
+// This is ignored because we only selected the `foo` file type.
+assert!(matcher.matched("x.bar", false).is_ignore());
+```
+
+We can also add file type definitions based on other definitions.
+
+```
+use ignore::types::TypesBuilder;
+
+let mut builder = TypesBuilder::new();
+builder.add_defaults();
+builder.add("foo", "*.foo");
+builder.add_def("bar:include:foo,cpp");
+builder.select("bar");
+let matcher = builder.build().unwrap();
+
+assert!(matcher.matched("x.foo", false).is_whitelist());
+assert!(matcher.matched("y.cpp", false).is_whitelist());
+```
+*/
+
+use std::{collections::HashMap, path::Path, sync::Arc};
+
+use {
+    globset::{GlobBuilder, GlobSet, GlobSetBuilder},
+    regex_automata::util::pool::Pool,
+};
+
+use crate::{Error, Match, default_types::DEFAULT_TYPES, pathutil::file_name};
+
+/// Glob represents a single glob in a set of file type definitions.
+///
+/// There may be more than one glob for a particular file type.
+///
+/// This is used to report information about the highest precedent glob
+/// that matched.
+///
+/// Note that not all matches necessarily correspond to a specific glob.
+/// For example, if there are one or more selections and a file path doesn't
+/// match any of those selections, then the file path is considered to be
+/// ignored.
+///
+/// The lifetime `'a` refers to the lifetime of the underlying file type
+/// definition, which corresponds to the lifetime of the file type matcher.
+#[derive(Clone, Debug)]
+pub struct Glob<'a>(GlobInner<'a>);
+
+#[derive(Clone, Debug)]
+enum GlobInner<'a> {
+    /// No glob matched, but the file path should still be ignored.
+    UnmatchedIgnore,
+    /// A glob matched.
+    Matched {
+        /// The file type definition which provided the glob.
+        def: &'a FileTypeDef,
+    },
+}
+
+impl<'a> Glob<'a> {
+    fn unmatched() -> Glob<'a> {
+        Glob(GlobInner::UnmatchedIgnore)
+    }
+
+    /// Return the file type definition that matched, if one exists. A file type
+    /// definition always exists when a specific definition matches a file
+    /// path.
+    pub fn file_type_def(&self) -> Option<&FileTypeDef> {
+        match self {
+            Glob(GlobInner::UnmatchedIgnore) => None,
+            Glob(GlobInner::Matched { def, .. }) => Some(def),
+        }
+    }
+}
+
+/// A single file type definition.
+///
+/// File type definitions can be retrieved in aggregate from a file type
+/// matcher. File type definitions are also reported when its responsible
+/// for a match.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct FileTypeDef {
+    name: String,
+    globs: Vec<String>,
+}
+
+impl FileTypeDef {
+    /// Return the name of this file type.
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+
+    /// Return the globs used to recognize this file type.
+    pub fn globs(&self) -> &[String] {
+        &self.globs
+    }
+}
+
+/// Types is a file type matcher.
+#[derive(Clone, Debug)]
+pub struct Types {
+    /// All of the file type definitions, sorted lexicographically by name.
+    defs: Vec<FileTypeDef>,
+    /// All of the selections made by the user.
+    selections: Vec<Selection<FileTypeDef>>,
+    /// Whether there is at least one Selection::Select in our selections.
+    /// When this is true, a Match::None is converted to Match::Ignore.
+    has_selected: bool,
+    /// A mapping from glob index in the set to two indices. The first is an
+    /// index into `selections` and the second is an index into the
+    /// corresponding file type definition's list of globs.
+    glob_to_selection: Vec<(usize, usize)>,
+    /// The set of all glob selections, used for actual matching.
+    set: GlobSet,
+    /// Temporary storage for globs that match.
+    matches: Arc<Pool<Vec<usize>>>,
+}
+
+/// Indicates the type of a selection for a particular file type.
+#[derive(Clone, Debug)]
+enum Selection<T> {
+    Select(String, T),
+    Negate(String, T),
+}
+
+impl<T> Selection<T> {
+    fn is_negated(&self) -> bool {
+        match *self {
+            Selection::Select(..) => false,
+            Selection::Negate(..) => true,
+        }
+    }
+
+    fn name(&self) -> &str {
+        match *self {
+            Selection::Select(ref name, _) => name,
+            Selection::Negate(ref name, _) => name,
+        }
+    }
+
+    fn map<U, F: FnOnce(T) -> U>(self, f: F) -> Selection<U> {
+        match self {
+            Selection::Select(name, inner) => {
+                Selection::Select(name, f(inner))
+            }
+            Selection::Negate(name, inner) => {
+                Selection::Negate(name, f(inner))
+            }
+        }
+    }
+
+    fn inner(&self) -> &T {
+        match *self {
+            Selection::Select(_, ref inner) => inner,
+            Selection::Negate(_, ref inner) => inner,
+        }
+    }
+}
+
+impl Types {
+    /// Creates a new file type matcher that never matches any path and
+    /// contains no file type definitions.
+    pub fn empty() -> Types {
+        Types {
+            defs: vec![],
+            selections: vec![],
+            has_selected: false,
+            glob_to_selection: vec![],
+            set: GlobSetBuilder::new().build().unwrap(),
+            matches: Arc::new(Pool::with_available_parallelism_capacity(
+                || vec![],
+            )),
+        }
+    }
+
+    /// Returns true if and only if this matcher has zero selections.
+    pub fn is_empty(&self) -> bool {
+        self.selections.is_empty()
+    }
+
+    /// Returns the number of selections used in this matcher.
+    pub fn len(&self) -> usize {
+        self.selections.len()
+    }
+
+    /// Return the set of current file type definitions.
+    ///
+    /// Definitions and globs are sorted.
+    pub fn definitions(&self) -> &[FileTypeDef] {
+        &self.defs
+    }
+
+    /// Returns a match for the given path against this file type matcher.
+    ///
+    /// The path is considered whitelisted if it matches a selected file type.
+    /// The path is considered ignored if it matches a negated file type.
+    /// If at least one file type is selected and `path` doesn't match, then
+    /// the path is also considered ignored.
+    pub fn matched<'a, P: AsRef<Path>>(
+        &'a self,
+        path: P,
+        is_dir: bool,
+    ) -> Match<Glob<'a>> {
+        // File types don't apply to directories, and we can't do anything
+        // if our glob set is empty.
+        if is_dir || self.set.is_empty() {
+            return Match::None;
+        }
+        // We only want to match against the file name, so extract it.
+        // If one doesn't exist, then we can't match it.
+        let name = match file_name(path.as_ref()) {
+            Some(name) => name,
+            None if self.has_selected => {
+                return Match::Ignore(Glob::unmatched());
+            }
+            None => {
+                return Match::None;
+            }
+        };
+        let mut matches = self.matches.get();
+        self.set.matches_into(name, &mut *matches);
+        // The highest precedent match is the last one.
+        if let Some(&i) = matches.last() {
+            let (isel, _) = self.glob_to_selection[i];
+            let sel = &self.selections[isel];
+            let glob = Glob(GlobInner::Matched { def: sel.inner() });
+            return if sel.is_negated() {
+                Match::Ignore(glob)
+            } else {
+                Match::Whitelist(glob)
+            };
+        }
+        if self.has_selected {
+            Match::Ignore(Glob::unmatched())
+        } else {
+            Match::None
+        }
+    }
+}
+
+/// TypesBuilder builds a type matcher from a set of file type definitions and
+/// a set of file type selections.
+pub struct TypesBuilder {
+    types: HashMap<String, FileTypeDef>,
+    selections: Vec<Selection<()>>,
+}
+
+impl TypesBuilder {
+    /// Create a new builder for a file type matcher.
+    ///
+    /// The builder contains *no* type definitions to start with. A set
+    /// of default type definitions can be added with `add_defaults`, and
+    /// additional type definitions can be added with `select` and `negate`.
+    pub fn new() -> TypesBuilder {
+        TypesBuilder { types: HashMap::new(), selections: vec![] }
+    }
+
+    /// Build the current set of file type definitions *and* selections into
+    /// a file type matcher.
+    pub fn build(&self) -> Result<Types, Error> {
+        let defs = self.definitions();
+        let has_selected = self.selections.iter().any(|s| !s.is_negated());
+
+        let mut selections = vec![];
+        let mut glob_to_selection = vec![];
+        let mut build_set = GlobSetBuilder::new();
+        for (isel, selection) in self.selections.iter().enumerate() {
+            let def = match self.types.get(selection.name()) {
+                Some(def) => def.clone(),
+                None => {
+                    let name = selection.name().to_string();
+                    return Err(Error::UnrecognizedFileType(name));
+                }
+            };
+            for (iglob, glob) in def.globs.iter().enumerate() {
+                build_set.add(
+                    GlobBuilder::new(glob)
+                        .literal_separator(true)
+                        .build()
+                        .map_err(|err| Error::Glob {
+                            glob: Some(glob.to_string()),
+                            err: err.kind().to_string(),
+                        })?,
+                );
+                glob_to_selection.push((isel, iglob));
+            }
+            selections.push(selection.clone().map(move |_| def));
+        }
+        let set = build_set
+            .build()
+            .map_err(|err| Error::Glob { glob: None, err: err.to_string() })?;
+        Ok(Types {
+            defs,
+            selections,
+            has_selected,
+            glob_to_selection,
+            set,
+            matches: Arc::new(Pool::with_available_parallelism_capacity(
+                || vec![],
+            )),
+        })
+    }
+
+    /// Return the set of current file type definitions.
+    ///
+    /// Definitions and globs are sorted.
+    pub fn definitions(&self) -> Vec<FileTypeDef> {
+        let mut defs = vec![];
+        for def in self.types.values() {
+            let mut def = def.clone();
+            def.globs.sort();
+            defs.push(def);
+        }
+        defs.sort_by(|def1, def2| def1.name().cmp(def2.name()));
+        defs
+    }
+
+    /// Select the file type given by `name`.
+    ///
+    /// If `name` is `all`, then all file types currently defined are selected.
+    pub fn select(&mut self, name: &str) -> &mut TypesBuilder {
+        if name == "all" {
+            for name in self.types.keys() {
+                self.selections.push(Selection::Select(name.to_string(), ()));
+            }
+        } else {
+            self.selections.push(Selection::Select(name.to_string(), ()));
+        }
+        self
+    }
+
+    /// Ignore the file type given by `name`.
+    ///
+    /// If `name` is `all`, then all file types currently defined are negated.
+    pub fn negate(&mut self, name: &str) -> &mut TypesBuilder {
+        if name == "all" {
+            for name in self.types.keys() {
+                self.selections.push(Selection::Negate(name.to_string(), ()));
+            }
+        } else {
+            self.selections.push(Selection::Negate(name.to_string(), ()));
+        }
+        self
+    }
+
+    /// Clear any file type definitions for the type name given.
+    pub fn clear(&mut self, name: &str) -> &mut TypesBuilder {
+        self.types.remove(name);
+        self
+    }
+
+    /// Add a new file type definition. `name` can be arbitrary and `pat`
+    /// should be a glob recognizing file paths belonging to the `name` type.
+    ///
+    /// If `name` is `all` or otherwise contains any character that is not a
+    /// Unicode letter or number, then an error is returned.
+    pub fn add(&mut self, name: &str, glob: &str) -> Result<(), Error> {
+        if name == "all" || !name.chars().all(|c| c.is_alphanumeric()) {
+            return Err(Error::InvalidDefinition);
+        }
+        let (key, glob) = (name.to_string(), glob.to_string());
+        self.types
+            .entry(key)
+            .or_insert_with(|| FileTypeDef {
+                name: name.to_string(),
+                globs: vec![],
+            })
+            .globs
+            .push(glob);
+        Ok(())
+    }
+
+    /// Add a new file type definition specified in string form. There are two
+    /// valid formats:
+    /// 1. `{name}:{glob}`.  This defines a 'root' definition that associates the
+    ///     given name with the given glob.
+    /// 2. `{name}:include:{comma-separated list of already defined names}.
+    ///     This defines an 'include' definition that associates the given name
+    ///     with the definitions of the given existing types.
+    /// Names may not include any characters that are not
+    /// Unicode letters or numbers.
+    pub fn add_def(&mut self, def: &str) -> Result<(), Error> {
+        let parts: Vec<&str> = def.split(':').collect();
+        match parts.len() {
+            2 => {
+                let name = parts[0];
+                let glob = parts[1];
+                if name.is_empty() || glob.is_empty() {
+                    return Err(Error::InvalidDefinition);
+                }
+                self.add(name, glob)
+            }
+            3 => {
+                let name = parts[0];
+                let types_string = parts[2];
+                if name.is_empty()
+                    || parts[1] != "include"
+                    || types_string.is_empty()
+                {
+                    return Err(Error::InvalidDefinition);
+                }
+                let types = types_string.split(',');
+                // Check ahead of time to ensure that all types specified are
+                // present and fail fast if not.
+                if types.clone().any(|t| !self.types.contains_key(t)) {
+                    return Err(Error::InvalidDefinition);
+                }
+                for type_name in types {
+                    let globs =
+                        self.types.get(type_name).unwrap().globs.clone();
+                    for glob in globs {
+                        self.add(name, &glob)?;
+                    }
+                }
+                Ok(())
+            }
+            _ => Err(Error::InvalidDefinition),
+        }
+    }
+
+    /// Add a set of default file type definitions.
+    pub fn add_defaults(&mut self) -> &mut TypesBuilder {
+        static MSG: &'static str = "adding a default type should never fail";
+        for &(names, exts) in DEFAULT_TYPES {
+            for name in names {
+                for ext in exts {
+                    self.add(name, ext).expect(MSG);
+                }
+            }
+        }
+        self
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::TypesBuilder;
+
+    macro_rules! matched {
+        ($name:ident, $types:expr, $sel:expr, $selnot:expr,
+         $path:expr) => {
+            matched!($name, $types, $sel, $selnot, $path, true);
+        };
+        (not, $name:ident, $types:expr, $sel:expr, $selnot:expr,
+         $path:expr) => {
+            matched!($name, $types, $sel, $selnot, $path, false);
+        };
+        ($name:ident, $types:expr, $sel:expr, $selnot:expr,
+         $path:expr, $matched:expr) => {
+            #[test]
+            fn $name() {
+                let mut btypes = TypesBuilder::new();
+                for tydef in $types {
+                    btypes.add_def(tydef).unwrap();
+                }
+                for sel in $sel {
+                    btypes.select(sel);
+                }
+                for selnot in $selnot {
+                    btypes.negate(selnot);
+                }
+                let types = btypes.build().unwrap();
+                let mat = types.matched($path, false);
+                assert_eq!($matched, !mat.is_ignore());
+            }
+        };
+    }
+
+    fn types() -> Vec<&'static str> {
+        vec![
+            "html:*.html",
+            "html:*.htm",
+            "rust:*.rs",
+            "js:*.js",
+            "py:*.py",
+            "python:*.py",
+            "foo:*.{rs,foo}",
+            "combo:include:html,rust",
+        ]
+    }
+
+    matched!(match1, types(), vec!["rust"], vec![], "lib.rs");
+    matched!(match2, types(), vec!["html"], vec![], "index.html");
+    matched!(match3, types(), vec!["html"], vec![], "index.htm");
+    matched!(match4, types(), vec!["html", "rust"], vec![], "main.rs");
+    matched!(match5, types(), vec![], vec![], "index.html");
+    matched!(match6, types(), vec![], vec!["rust"], "index.html");
+    matched!(match7, types(), vec!["foo"], vec!["rust"], "main.foo");
+    matched!(match8, types(), vec!["combo"], vec![], "index.html");
+    matched!(match9, types(), vec!["combo"], vec![], "lib.rs");
+    matched!(match10, types(), vec!["py"], vec![], "main.py");
+    matched!(match11, types(), vec!["python"], vec![], "main.py");
+
+    matched!(not, matchnot1, types(), vec!["rust"], vec![], "index.html");
+    matched!(not, matchnot2, types(), vec![], vec!["rust"], "main.rs");
+    matched!(not, matchnot3, types(), vec!["foo"], vec!["rust"], "main.rs");
+    matched!(not, matchnot4, types(), vec!["rust"], vec!["foo"], "main.rs");
+    matched!(not, matchnot5, types(), vec!["rust"], vec!["foo"], "main.foo");
+    matched!(not, matchnot6, types(), vec!["combo"], vec![], "leftpad.js");
+    matched!(not, matchnot7, types(), vec!["py"], vec![], "index.html");
+    matched!(not, matchnot8, types(), vec!["python"], vec![], "doc.md");
+
+    #[test]
+    fn test_invalid_defs() {
+        let mut btypes = TypesBuilder::new();
+        for tydef in types() {
+            btypes.add_def(tydef).unwrap();
+        }
+        // Preserve the original definitions for later comparison.
+        let original_defs = btypes.definitions();
+        let bad_defs = vec![
+            // Reference to type that does not exist
+            "combo:include:html,qwerty",
+            // Bad format
+            "combo:foobar:html,rust",
+            "",
+        ];
+        for def in bad_defs {
+            assert!(btypes.add_def(def).is_err());
+            // Ensure that nothing changed, even if some of the includes were valid.
+            assert_eq!(btypes.definitions(), original_defs);
+        }
+    }
+}
diff --git a/crates/ignore/src/walk.rs b/crates/ignore/src/walk.rs
new file mode 100644
index 000000000..2dff78852
--- /dev/null
+++ b/crates/ignore/src/walk.rs
@@ -0,0 +1,2757 @@
+use std::{
+    cmp::Ordering,
+    ffi::OsStr,
+    fs::{self, FileType, Metadata},
+    io,
+    path::{Path, PathBuf},
+    sync::atomic::{AtomicBool, AtomicUsize, Ordering as AtomicOrdering},
+    sync::{Arc, OnceLock},
+};
+
+use {
+    crossbeam_deque::{Stealer, Worker as Deque},
+    same_file::Handle,
+    walkdir::WalkDir,
+};
+
+use crate::{
+    Error, PartialErrorBuilder,
+    dir::{Ignore, IgnoreBuilder},
+    // CHANGED: Also import `Gitignore` for `WalkBuilder::add_gitignore`.
+    gitignore::{Gitignore, GitignoreBuilder},
+    incremental::{IncrementalIgnore, IncrementalIgnoreOptions},
+    overrides::Override,
+    types::Types,
+};
+
+/// A directory entry with a possible error attached.
+///
+/// The error typically refers to a problem parsing ignore files in a
+/// particular directory.
+#[derive(Clone, Debug)]
+pub struct DirEntry {
+    dent: DirEntryInner,
+    err: Option<Error>,
+}
+
+impl DirEntry {
+    /// The full path that this entry represents.
+    pub fn path(&self) -> &Path {
+        self.dent.path()
+    }
+
+    /// The full path that this entry represents.
+    /// Analogous to [`DirEntry::path`], but moves ownership of the path.
+    pub fn into_path(self) -> PathBuf {
+        self.dent.into_path()
+    }
+
+    /// Whether this entry corresponds to a symbolic link or not.
+    pub fn path_is_symlink(&self) -> bool {
+        self.dent.path_is_symlink()
+    }
+
+    /// Returns true if and only if this entry corresponds to stdin.
+    ///
+    /// i.e., The entry has depth 0 and its file name is `-`.
+    pub fn is_stdin(&self) -> bool {
+        self.dent.is_stdin()
+    }
+
+    /// Return the metadata for the file that this entry points to.
+    pub fn metadata(&self) -> Result<Metadata, Error> {
+        self.dent.metadata()
+    }
+
+    /// Return the file type for the file that this entry points to.
+    ///
+    /// This entry doesn't have a file type if it corresponds to stdin.
+    pub fn file_type(&self) -> Option<FileType> {
+        self.dent.file_type()
+    }
+
+    /// Return the file name of this entry.
+    ///
+    /// If this entry has no file name (e.g., `/`), then the full path is
+    /// returned.
+    pub fn file_name(&self) -> &OsStr {
+        self.dent.file_name()
+    }
+
+    /// Returns the depth at which this entry was created relative to the root.
+    pub fn depth(&self) -> usize {
+        self.dent.depth()
+    }
+
+    /// Returns the underlying inode number if one exists.
+    ///
+    /// If this entry doesn't have an inode number, then `None` is returned.
+    #[cfg(unix)]
+    pub fn ino(&self) -> Option<u64> {
+        self.dent.ino()
+    }
+
+    /// Returns an error, if one exists, associated with processing this entry.
+    ///
+    /// An example of an error is one that occurred while parsing an ignore
+    /// file. Errors related to traversing a directory tree itself are reported
+    /// as part of yielding the directory entry, and not with this method.
+    pub fn error(&self) -> Option<&Error> {
+        self.err.as_ref()
+    }
+
+    /// Returns true if and only if this entry points to a directory.
+    pub(crate) fn is_dir(&self) -> bool {
+        self.dent.is_dir()
+    }
+
+    fn new_stdin() -> DirEntry {
+        DirEntry { dent: DirEntryInner::Stdin, err: None }
+    }
+
+    fn new_walkdir(dent: walkdir::DirEntry, err: Option<Error>) -> DirEntry {
+        DirEntry { dent: DirEntryInner::Walkdir(dent), err }
+    }
+
+    fn new_raw(dent: DirEntryRaw, err: Option<Error>) -> DirEntry {
+        DirEntry { dent: DirEntryInner::Raw(dent), err }
+    }
+}
+
+/// DirEntryInner is the implementation of DirEntry.
+///
+/// It specifically represents three distinct sources of directory entries:
+///
+/// 1. From the walkdir crate.
+/// 2. Special entries that represent things like stdin.
+/// 3. From a path.
+///
+/// Specifically, (3) has to essentially re-create the DirEntry implementation
+/// from WalkDir.
+#[derive(Clone, Debug)]
+enum DirEntryInner {
+    Stdin,
+    Walkdir(walkdir::DirEntry),
+    Raw(DirEntryRaw),
+}
+
+impl DirEntryInner {
+    fn path(&self) -> &Path {
+        use self::DirEntryInner::*;
+        match *self {
+            Stdin => Path::new("<stdin>"),
+            Walkdir(ref x) => x.path(),
+            Raw(ref x) => x.path(),
+        }
+    }
+
+    fn into_path(self) -> PathBuf {
+        use self::DirEntryInner::*;
+        match self {
+            Stdin => PathBuf::from("<stdin>"),
+            Walkdir(x) => x.into_path(),
+            Raw(x) => x.into_path(),
+        }
+    }
+
+    fn path_is_symlink(&self) -> bool {
+        use self::DirEntryInner::*;
+        match *self {
+            Stdin => false,
+            Walkdir(ref x) => x.path_is_symlink(),
+            Raw(ref x) => x.path_is_symlink(),
+        }
+    }
+
+    fn is_stdin(&self) -> bool {
+        match *self {
+            DirEntryInner::Stdin => true,
+            _ => false,
+        }
+    }
+
+    fn metadata(&self) -> Result<Metadata, Error> {
+        use self::DirEntryInner::*;
+        match *self {
+            Stdin => {
+                let err = Error::Io(io::Error::new(
+                    io::ErrorKind::Other,
+                    "<stdin> has no metadata",
+                ));
+                Err(err.with_path("<stdin>"))
+            }
+            Walkdir(ref x) => x.metadata().map_err(|err| {
+                Error::Io(io::Error::from(err))
+                    .with_depth(x.depth())
+                    .with_path(x.path())
+            }),
+            Raw(ref x) => x.metadata(),
+        }
+    }
+
+    fn file_type(&self) -> Option<FileType> {
+        use self::DirEntryInner::*;
+        match *self {
+            Stdin => None,
+            Walkdir(ref x) => Some(x.file_type()),
+            Raw(ref x) => Some(x.file_type()),
+        }
+    }
+
+    fn file_name(&self) -> &OsStr {
+        use self::DirEntryInner::*;
+        match *self {
+            Stdin => OsStr::new("<stdin>"),
+            Walkdir(ref x) => x.file_name(),
+            Raw(ref x) => x.file_name(),
+        }
+    }
+
+    fn depth(&self) -> usize {
+        use self::DirEntryInner::*;
+        match *self {
+            Stdin => 0,
+            Walkdir(ref x) => x.depth(),
+            Raw(ref x) => x.depth(),
+        }
+    }
+
+    #[cfg(unix)]
+    fn ino(&self) -> Option<u64> {
+        use self::DirEntryInner::*;
+        use walkdir::DirEntryExt;
+        match *self {
+            Stdin => None,
+            Walkdir(ref x) => Some(x.ino()),
+            Raw(ref x) => Some(x.ino()),
+        }
+    }
+
+    /// Returns true if and only if this entry points to a directory.
+    fn is_dir(&self) -> bool {
+        self.file_type().map(|ft| ft.is_dir()).unwrap_or(false)
+    }
+}
+
+/// DirEntryRaw is essentially copied from the walkdir crate so that we can
+/// build `DirEntry`s from whole cloth in the parallel iterator.
+#[derive(Clone)]
+struct DirEntryRaw {
+    /// The path as reported by the `fs::ReadDir` iterator (even if it's a
+    /// symbolic link).
+    path: PathBuf,
+    /// The file type. Necessary for recursive iteration, so store it.
+    ty: FileType,
+    /// Is set when this entry was created from a symbolic link and the user
+    /// expects the iterator to follow symbolic links.
+    follow_link: bool,
+    /// The depth at which this entry was generated relative to the root.
+    depth: usize,
+    /// The underlying inode number (Unix only).
+    #[cfg(unix)]
+    ino: u64,
+    /// The underlying metadata (Windows only). We store this on Windows
+    /// because this comes for free while reading a directory.
+    #[cfg(windows)]
+    metadata: fs::Metadata,
+}
+
+impl std::fmt::Debug for DirEntryRaw {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        // Leaving out FileType because it doesn't have a debug impl
+        // in Rust 1.9. We could add it if we really wanted to by manually
+        // querying each possibly file type. Meh. ---AG
+        f.debug_struct("DirEntryRaw")
+            .field("path", &self.path)
+            .field("follow_link", &self.follow_link)
+            .field("depth", &self.depth)
+            .finish()
+    }
+}
+
+impl DirEntryRaw {
+    fn path(&self) -> &Path {
+        &self.path
+    }
+
+    fn into_path(self) -> PathBuf {
+        self.path
+    }
+
+    fn path_is_symlink(&self) -> bool {
+        self.ty.is_symlink() || self.follow_link
+    }
+
+    fn metadata(&self) -> Result<Metadata, Error> {
+        self.metadata_internal()
+    }
+
+    #[cfg(windows)]
+    fn metadata_internal(&self) -> Result<fs::Metadata, Error> {
+        if self.follow_link {
+            fs::metadata(&self.path)
+        } else {
+            Ok(self.metadata.clone())
+        }
+        .map_err(|err| Error::Io(io::Error::from(err)).with_path(&self.path))
+    }
+
+    #[cfg(not(windows))]
+    fn metadata_internal(&self) -> Result<fs::Metadata, Error> {
+        if self.follow_link {
+            fs::metadata(&self.path)
+        } else {
+            fs::symlink_metadata(&self.path)
+        }
+        .map_err(|err| {
+            Error::Io(err).with_depth(self.depth).with_path(&self.path)
+        })
+    }
+
+    fn file_type(&self) -> FileType {
+        self.ty
+    }
+
+    fn file_name(&self) -> &OsStr {
+        self.path.file_name().unwrap_or_else(|| self.path.as_os_str())
+    }
+
+    fn depth(&self) -> usize {
+        self.depth
+    }
+
+    #[cfg(unix)]
+    fn ino(&self) -> u64 {
+        self.ino
+    }
+
+    fn from_entry(
+        depth: usize,
+        ent: &fs::DirEntry,
+    ) -> Result<DirEntryRaw, Error> {
+        let ty = ent.file_type().map_err(|err| {
+            let err = Error::Io(err).with_depth(depth).with_path(ent.path());
+            Error::WithDepth { depth, err: Box::new(err) }
+        })?;
+        DirEntryRaw::from_entry_os(depth, ent, ty)
+    }
+
+    #[cfg(windows)]
+    fn from_entry_os(
+        depth: usize,
+        ent: &fs::DirEntry,
+        ty: fs::FileType,
+    ) -> Result<DirEntryRaw, Error> {
+        let md = ent.metadata().map_err(|err| {
+            let err = Error::Io(err).with_depth(depth).with_path(ent.path());
+            Error::WithDepth { depth, err: Box::new(err) }
+        })?;
+        Ok(DirEntryRaw {
+            path: ent.path(),
+            ty,
+            follow_link: false,
+            depth,
+            metadata: md,
+        })
+    }
+
+    #[cfg(unix)]
+    fn from_entry_os(
+        depth: usize,
+        ent: &fs::DirEntry,
+        ty: fs::FileType,
+    ) -> Result<DirEntryRaw, Error> {
+        use std::os::unix::fs::DirEntryExt;
+
+        Ok(DirEntryRaw {
+            path: ent.path(),
+            ty,
+            follow_link: false,
+            depth,
+            ino: ent.ino(),
+        })
+    }
+
+    // Placeholder implementation to allow compiling on non-standard platforms
+    // (e.g. wasm32).
+    #[cfg(not(any(windows, unix)))]
+    fn from_entry_os(
+        depth: usize,
+        ent: &fs::DirEntry,
+        ty: fs::FileType,
+    ) -> Result<DirEntryRaw, Error> {
+        Err(Error::Io(io::Error::new(
+            io::ErrorKind::Other,
+            "unsupported platform",
+        )))
+    }
+
+    #[cfg(windows)]
+    fn from_path(
+        depth: usize,
+        pb: PathBuf,
+        link: bool,
+    ) -> Result<DirEntryRaw, Error> {
+        let md = fs::metadata(&pb)
+            .map_err(|err| Error::Io(err).with_depth(depth).with_path(&pb))?;
+        Ok(DirEntryRaw {
+            path: pb,
+            ty: md.file_type(),
+            follow_link: link,
+            depth,
+            metadata: md,
+        })
+    }
+
+    #[cfg(unix)]
+    fn from_path(
+        depth: usize,
+        pb: PathBuf,
+        link: bool,
+    ) -> Result<DirEntryRaw, Error> {
+        use std::os::unix::fs::MetadataExt;
+
+        let md = fs::metadata(&pb)
+            .map_err(|err| Error::Io(err).with_depth(depth).with_path(&pb))?;
+        Ok(DirEntryRaw {
+            path: pb,
+            ty: md.file_type(),
+            follow_link: link,
+            depth,
+            ino: md.ino(),
+        })
+    }
+
+    // Placeholder implementation to allow compiling on non-standard platforms
+    // (e.g. wasm32).
+    #[cfg(not(any(windows, unix)))]
+    fn from_path(
+        depth: usize,
+        pb: PathBuf,
+        link: bool,
+    ) -> Result<DirEntryRaw, Error> {
+        Err(Error::Io(io::Error::new(
+            io::ErrorKind::Other,
+            "unsupported platform",
+        )))
+    }
+}
+
+/// WalkBuilder builds a recursive directory iterator.
+///
+/// The builder supports a large number of configurable options. This includes
+/// specific glob overrides, file type matching, toggling whether hidden
+/// files are ignored or not, and of course, support for respecting gitignore
+/// files.
+///
+/// By default, all ignore files found are respected. This includes `.ignore`,
+/// `.gitignore`, `.git/info/exclude` and even your global gitignore
+/// globs, usually found in `$XDG_CONFIG_HOME/git/ignore`.
+///
+/// Some standard recursive directory options are also supported, such as
+/// limiting the recursive depth or whether to follow symbolic links (disabled
+/// by default).
+///
+/// # Ignore rules
+///
+/// There are many rules that influence whether a particular file or directory
+/// is skipped by this iterator. Those rules are documented here. Note that
+/// the rules assume a default configuration.
+///
+/// * First, glob overrides are checked. If a path matches a glob override,
+/// then matching stops. The path is then only skipped if the glob that matched
+/// the path is an ignore glob. (An override glob is a whitelist glob unless it
+/// starts with a `!`, in which case it is an ignore glob.)
+/// * Second, ignore files are checked. Ignore files currently only come from
+/// git ignore files (`.gitignore`, `.git/info/exclude` and the configured
+/// global gitignore file), plain `.ignore` files, which have the same format
+/// as gitignore files, or explicitly added ignore files. The precedence order
+/// is: `.ignore`, `.gitignore`, `.git/info/exclude`, global gitignore and
+/// finally explicitly added ignore files. Note that precedence between
+/// different types of ignore files is not impacted by the directory hierarchy;
+/// any `.ignore` file overrides all `.gitignore` files. Within each precedence
+/// level, more nested ignore files have a higher precedence than less nested
+/// ignore files.
+/// * Third, if the previous step yields an ignore match, then all matching
+/// is stopped and the path is skipped. If it yields a whitelist match, then
+/// matching continues. A whitelist match can be overridden by a later matcher.
+/// * Fourth, unless the path is a directory, the file type matcher is run on
+/// the path. As above, if it yields an ignore match, then all matching is
+/// stopped and the path is skipped. If it yields a whitelist match, then
+/// matching continues.
+/// * Fifth, if the path hasn't been whitelisted and it is hidden, then the
+/// path is skipped.
+/// * Sixth, unless the path is a directory, the size of the file is compared
+/// against the max filesize limit. If it exceeds the limit, it is skipped.
+/// * Seventh, if the path has made it this far then it is yielded in the
+/// iterator.
+#[derive(Clone)]
+pub struct WalkBuilder {
+    paths: Vec<PathBuf>,
+    ig_builder: IgnoreBuilder,
+    max_depth: Option<usize>,
+    min_depth: Option<usize>,
+    max_filesize: Option<u64>,
+    follow_links: bool,
+    same_file_system: bool,
+    sorter: Option<Sorter>,
+    threads: usize,
+    skip: Option<Arc<Handle>>,
+    filter: Option<Filter>,
+    /// The directory that gitignores should be interpreted relative to.
+    ///
+    /// Usually this is the directory containing the gitignore file. But in
+    /// some cases, like for global gitignores or for gitignores specified
+    /// explicitly, this should generally be set to the current working
+    /// directory. This is only used for global gitignores or "explicit"
+    /// gitignores.
+    ///
+    /// When `None`, the CWD is fetched from `std::env::current_dir()`. If
+    /// that fails, then global gitignores are ignored (an error is logged).
+    global_gitignores_relative_to:
+        OnceLock<Result<PathBuf, Arc<std::io::Error>>>,
+}
+
+#[derive(Clone)]
+enum Sorter {
+    ByName(Arc<dyn Fn(&OsStr, &OsStr) -> Ordering + Send + Sync + 'static>),
+    ByPath(Arc<dyn Fn(&Path, &Path) -> Ordering + Send + Sync + 'static>),
+}
+
+#[derive(Clone)]
+struct Filter(Arc<dyn Fn(&DirEntry) -> bool + Send + Sync + 'static>);
+
+impl std::fmt::Debug for WalkBuilder {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("WalkBuilder")
+            .field("paths", &self.paths)
+            .field("ig_builder", &self.ig_builder)
+            .field("max_depth", &self.max_depth)
+            .field("min_depth", &self.min_depth)
+            .field("max_filesize", &self.max_filesize)
+            .field("follow_links", &self.follow_links)
+            .field("same_file_system", &self.same_file_system)
+            .field("sorter", &"<...>")
+            .field("threads", &self.threads)
+            .field("skip", &self.skip)
+            .field("filter", &"<...>")
+            .field(
+                "global_gitignores_relative_to",
+                &self.global_gitignores_relative_to,
+            )
+            .finish()
+    }
+}
+
+impl WalkBuilder {
+    /// Create a new builder for a recursive directory iterator for the
+    /// directory given.
+    ///
+    /// Note that if you want to traverse multiple different directories, it
+    /// is better to call `add` on this builder than to create multiple
+    /// `Walk` values.
+    pub fn new<P: AsRef<Path>>(path: P) -> WalkBuilder {
+        WalkBuilder::from_iter([path])
+    }
+
+    /// Create an empty builder to which paths can be added.
+    ///
+    /// Note that if you call `build` on this instance before calling `add`
+    /// on it, it will return exactly zero items during iteration.
+    pub fn empty() -> WalkBuilder {
+        WalkBuilder {
+            paths: vec![],
+            ig_builder: IgnoreBuilder::new(),
+            max_depth: None,
+            min_depth: None,
+            max_filesize: None,
+            follow_links: false,
+            same_file_system: false,
+            sorter: None,
+            threads: 0,
+            skip: None,
+            filter: None,
+            global_gitignores_relative_to: OnceLock::new(),
+        }
+    }
+
+    /// Create a new builder for a recursive directory iterator from the
+    /// sequence of paths.
+    ///
+    /// Note that if the iterator is empty, this is the same as
+    /// `WalkBuilder::empty`.
+    pub fn from_iter<P: AsRef<Path>, I: IntoIterator<Item = P>>(
+        paths: I,
+    ) -> WalkBuilder {
+        let mut builder = WalkBuilder::empty();
+        for path in paths.into_iter() {
+            builder.add(path);
+        }
+        builder
+    }
+
+    /// Build a new `Walk` iterator.
+    pub fn build(&self) -> Walk {
+        let follow_links = self.follow_links;
+        let max_depth = self.max_depth;
+        let min_depth = self.min_depth;
+        let sorter = self.sorter.clone();
+        let its = self
+            .paths
+            .iter()
+            .map(move |p| {
+                if p == Path::new("-") {
+                    (p.to_path_buf(), None)
+                } else {
+                    let mut wd = WalkDir::new(p);
+                    wd = wd.follow_links(follow_links || p.is_file());
+                    wd = wd.same_file_system(self.same_file_system);
+                    if let Some(max_depth) = max_depth {
+                        wd = wd.max_depth(max_depth);
+                    }
+                    if let Some(min_depth) = min_depth {
+                        wd = wd.min_depth(min_depth);
+                    }
+                    if let Some(ref sorter) = sorter {
+                        match sorter.clone() {
+                            Sorter::ByName(cmp) => {
+                                wd = wd.sort_by(move |a, b| {
+                                    cmp(a.file_name(), b.file_name())
+                                });
+                            }
+                            Sorter::ByPath(cmp) => {
+                                wd = wd.sort_by(move |a, b| {
+                                    cmp(a.path(), b.path())
+                                });
+                            }
+                        }
+                    }
+                    (p.to_path_buf(), Some(WalkEventIter::from(wd)))
+                }
+            })
+            .collect::<Vec<_>>()
+            .into_iter();
+        let ig_root = self.build_ignore();
+        Walk {
+            its,
+            it: None,
+            ig_root: ig_root.clone(),
+            ig: ig_root.clone(),
+            max_depth: self.max_depth,
+            max_filesize: self.max_filesize,
+            skip: self.skip.clone(),
+            filter: self.filter.clone(),
+        }
+    }
+
+    /// Build matchers for checking paths against ignore files without
+    /// recursively walking the configured roots.
+    ///
+    /// The returned matchers use the path-based filtering configuration
+    /// on this builder, including glob overrides, file type selections,
+    /// parent ignore files, `.ignore`, `.gitignore`, global Git
+    /// ignore files, explicitly added ignore files and custom ignore
+    /// file names. For example, ripgrep configures `.rgignore` via
+    /// [`WalkBuilder::add_custom_ignore_filename`]. Minimum and maximum depth
+    /// limits, maximum file size and hidden-file filtering are also applied.
+    /// Other options that only control traversal or require a directory entry,
+    /// such as custom entry predicates, are not applied.
+    ///
+    /// One matcher is returned for each configured path, in the same order as
+    /// the paths were added to this builder. Each matcher accepts paths
+    /// relative to its own [`IncrementalIgnore::root`]. The matcher for the
+    /// special `-` path representing standard input always returns a non-match
+    /// for all inputs.
+    ///
+    /// Ignore matchers are loaded lazily and cached by directory.
+    /// Thus, the first query may read ignore files from the root and
+    /// its parents, while later queries reuse the compiled matchers.
+    /// Errors encountered while loading ignore files are returned by
+    /// [`IncrementalIgnore::matched_with_errors`]. Once an ignore file has
+    /// been loaded, changes to it are not observed. Build new matchers to
+    /// reload changed ignore files.
+    ///
+    /// Matchers built together share the builder's base ignore configuration
+    /// and compiled parent matchers.
+    pub fn build_matchers(&self) -> Vec<IncrementalIgnore> {
+        let ignore = self.build_ignore();
+        let options = IncrementalIgnoreOptions {
+            min_depth: self.min_depth,
+            max_depth: self.max_depth,
+            max_filesize: self.max_filesize,
+            hidden: self.ig_builder.is_hidden(),
+            follow_links: self.follow_links,
+        };
+        self.paths
+            .iter()
+            .map(move |path| {
+                IncrementalIgnore::new(
+                    path.clone(),
+                    ignore.clone(),
+                    options.clone(),
+                )
+            })
+            .collect()
+    }
+
+    /// Build a new `WalkParallel` iterator.
+    ///
+    /// Note that this *doesn't* return something that implements `Iterator`.
+    /// Instead, the returned value must be run with a closure. e.g.,
+    /// `builder.build_parallel().run(|| |path| { println!("{path:?}"); WalkState::Continue })`.
+    pub fn build_parallel(&self) -> WalkParallel {
+        let ig_root = self.build_ignore();
+        WalkParallel {
+            paths: self.paths.clone().into_iter(),
+            ig_root,
+            max_depth: self.max_depth,
+            min_depth: self.min_depth,
+            max_filesize: self.max_filesize,
+            follow_links: self.follow_links,
+            same_file_system: self.same_file_system,
+            threads: self.threads,
+            skip: self.skip.clone(),
+            filter: self.filter.clone(),
+        }
+    }
+
+    /// Add a file path to the iterator.
+    ///
+    /// Each additional file path added is traversed recursively. This should
+    /// be preferred over building multiple `Walk` iterators since this
+    /// enables reusing resources across iteration.
+    pub fn add<P: AsRef<Path>>(&mut self, path: P) -> &mut WalkBuilder {
+        self.paths.push(path.as_ref().to_path_buf());
+        self
+    }
+
+    /// The maximum depth to recurse.
+    ///
+    /// The default, `None`, imposes no depth restriction.
+    pub fn max_depth(&mut self, depth: Option<usize>) -> &mut WalkBuilder {
+        self.max_depth = depth;
+        if self.min_depth.is_some()
+            && self.max_depth.is_some()
+            && self.max_depth < self.min_depth
+        {
+            self.max_depth = self.min_depth;
+        }
+        self
+    }
+
+    /// The minimum depth to recurse.
+    ///
+    /// The default, `None`, imposes no minimum depth restriction.
+    pub fn min_depth(&mut self, depth: Option<usize>) -> &mut WalkBuilder {
+        self.min_depth = depth;
+        if self.max_depth.is_some()
+            && self.min_depth.is_some()
+            && self.min_depth > self.max_depth
+        {
+            self.min_depth = self.max_depth;
+        }
+        self
+    }
+
+    /// Whether to follow symbolic links or not.
+    pub fn follow_links(&mut self, yes: bool) -> &mut WalkBuilder {
+        self.follow_links = yes;
+        self
+    }
+
+    /// Whether to ignore files above the specified limit.
+    pub fn max_filesize(&mut self, filesize: Option<u64>) -> &mut WalkBuilder {
+        self.max_filesize = filesize;
+        self
+    }
+
+    /// The number of threads to use for traversal.
+    ///
+    /// Note that this only has an effect when using `build_parallel`.
+    ///
+    /// The default setting is `0`, which chooses the number of threads
+    /// automatically using heuristics.
+    pub fn threads(&mut self, n: usize) -> &mut WalkBuilder {
+        self.threads = n;
+        self
+    }
+
+    /// Add a global ignore file to the matcher.
+    ///
+    /// This has lower precedence than all other sources of ignore rules.
+    ///
+    /// # Errors
+    ///
+    /// If there was a problem adding the ignore file, then an error is
+    /// returned. Note that the error may indicate *partial* failure. For
+    /// example, if an ignore file contains an invalid glob, all other globs
+    /// are still applied.
+    ///
+    /// An error will also occur if this walker could not get the current
+    /// working directory (and `WalkBuilder::current_dir` isn't set).
+    pub fn add_ignore<P: AsRef<Path>>(&mut self, path: P) -> Option<Error> {
+        // CHANGED: Root the ignore file at `""` instead of the current working
+        // directory. Explicit ignores are scoped to the directory of the
+        // ignore file (see `matched_ignore`), and a root of `""` makes the
+        // rules apply to every walked path regardless of the walk root. This
+        // also avoids depending on the current working directory entirely.
+        //
+        // let path = path.as_ref();
+        // let Some(cwd) = self.get_or_set_current_dir() else {
+        //     let err = std::io::Error::other(format!(
+        //         "CWD is not known, ignoring global gitignore {}",
+        //         path.display()
+        //     ));
+        //     return Some(err.into());
+        // };
+        // let mut builder = GitignoreBuilder::new(cwd);
+        let mut builder = GitignoreBuilder::new("");
+        let mut errs = PartialErrorBuilder::default();
+        errs.maybe_push(builder.add(path));
+        match builder.build() {
+            Ok(gi) => {
+                self.ig_builder.add_ignore(gi);
+            }
+            Err(err) => {
+                errs.push(err);
+            }
+        }
+        errs.into_error_option()
+    }
+
+    /// CHANGED: Add a prebuilt Gitignore to the builder.
+    ///
+    /// Like the ignore file added via `add_ignore`, these rules are matched
+    /// against the full path of each walked entry, scoped to the `Gitignore`'s
+    /// root path.
+    pub fn add_gitignore(&mut self, gi: Gitignore) {
+        self.ig_builder.add_ignore(gi);
+    }
+
+    /// Add a custom ignore file name
+    ///
+    /// These ignore files have higher precedence than all other ignore files.
+    ///
+    /// When specifying multiple names, earlier names have lower precedence than
+    /// later names.
+    pub fn add_custom_ignore_filename<S: AsRef<OsStr>>(
+        &mut self,
+        file_name: S,
+    ) -> &mut WalkBuilder {
+        self.ig_builder.add_custom_ignore_filename(file_name);
+        self
+    }
+
+    /// Add an override matcher.
+    ///
+    /// By default, no override matcher is used.
+    ///
+    /// This overrides any previous setting.
+    pub fn overrides(&mut self, overrides: Override) -> &mut WalkBuilder {
+        self.ig_builder.overrides(overrides);
+        self
+    }
+
+    /// Add a file type matcher.
+    ///
+    /// By default, no file type matcher is used.
+    ///
+    /// This overrides any previous setting.
+    pub fn types(&mut self, types: Types) -> &mut WalkBuilder {
+        self.ig_builder.types(types);
+        self
+    }
+
+    /// Enables all the standard ignore filters.
+    ///
+    /// This toggles, as a group, all the filters that are enabled by default:
+    ///
+    /// - [hidden()](#method.hidden)
+    /// - [parents()](#method.parents)
+    /// - [ignore()](#method.ignore)
+    /// - [git_ignore()](#method.git_ignore)
+    /// - [git_global()](#method.git_global)
+    /// - [git_exclude()](#method.git_exclude)
+    ///
+    /// They may still be toggled individually after calling this function.
+    ///
+    /// This is (by definition) enabled by default.
+    pub fn standard_filters(&mut self, yes: bool) -> &mut WalkBuilder {
+        self.hidden(yes)
+            .parents(yes)
+            .ignore(yes)
+            .git_ignore(yes)
+            .git_global(yes)
+            .git_exclude(yes)
+    }
+
+    /// Enables ignoring hidden files.
+    ///
+    /// This is enabled by default.
+    pub fn hidden(&mut self, yes: bool) -> &mut WalkBuilder {
+        self.ig_builder.hidden(yes);
+        self
+    }
+
+    /// Enables reading ignore files from parent directories.
+    ///
+    /// If this is enabled, then .gitignore files in parent directories of each
+    /// file path given are respected. Otherwise, they are ignored.
+    ///
+    /// This is enabled by default.
+    pub fn parents(&mut self, yes: bool) -> &mut WalkBuilder {
+        self.ig_builder.parents(yes);
+        self
+    }
+
+    /// Enables reading `.ignore` files.
+    ///
+    /// `.ignore` files have the same semantics as `gitignore` files and are
+    /// supported by search tools such as ripgrep and The Silver Searcher.
+    ///
+    /// This is enabled by default.
+    pub fn ignore(&mut self, yes: bool) -> &mut WalkBuilder {
+        self.ig_builder.ignore(yes);
+        self
+    }
+
+    /// Enables reading a global gitignore file, whose path is specified in
+    /// git's `core.excludesFile` config option.
+    ///
+    /// Git's config file location is `$HOME/.gitconfig`. If `$HOME/.gitconfig`
+    /// does not exist or does not specify `core.excludesFile`, then
+    /// `$XDG_CONFIG_HOME/git/ignore` is read. If `$XDG_CONFIG_HOME` is not
+    /// set or is empty, then `$HOME/.config/git/ignore` is used instead.
+    ///
+    /// This is enabled by default.
+    pub fn git_global(&mut self, yes: bool) -> &mut WalkBuilder {
+        self.ig_builder.git_global(yes);
+        self
+    }
+
+    /// Enables reading `.gitignore` files.
+    ///
+    /// `.gitignore` files have match semantics as described in the `gitignore`
+    /// man page.
+    ///
+    /// This is enabled by default.
+    pub fn git_ignore(&mut self, yes: bool) -> &mut WalkBuilder {
+        self.ig_builder.git_ignore(yes);
+        self
+    }
+
+    /// Enables reading `.git/info/exclude` files.
+    ///
+    /// `.git/info/exclude` files have match semantics as described in the
+    /// `gitignore` man page.
+    ///
+    /// This is enabled by default.
+    pub fn git_exclude(&mut self, yes: bool) -> &mut WalkBuilder {
+        self.ig_builder.git_exclude(yes);
+        self
+    }
+
+    /// Whether a git repository is required to apply git-related ignore
+    /// rules (global rules, .gitignore and local exclude rules).
+    ///
+    /// When disabled, git-related ignore rules are applied even when searching
+    /// outside a git repository.
+    ///
+    /// In particular, if this is `false` then `.gitignore` files will be read
+    /// from parent directories above the git root directory containing `.git`,
+    /// which is different from the git behavior.
+    pub fn require_git(&mut self, yes: bool) -> &mut WalkBuilder {
+        self.ig_builder.require_git(yes);
+        self
+    }
+
+    /// Process ignore files case insensitively
+    ///
+    /// This is disabled by default.
+    pub fn ignore_case_insensitive(&mut self, yes: bool) -> &mut WalkBuilder {
+        self.ig_builder.ignore_case_insensitive(yes);
+        self
+    }
+
+    /// Set a function for sorting directory entries by their path.
+    ///
+    /// If a compare function is set, the resulting iterator will return all
+    /// paths in sorted order. The compare function will be called to compare
+    /// entries from the same directory.
+    ///
+    /// This is like `sort_by_file_name`, except the comparator accepts
+    /// a `&Path` instead of the base file name, which permits it to sort by
+    /// more criteria.
+    ///
+    /// This method will override any previous sorter set by this method or
+    /// by `sort_by_file_name`.
+    ///
+    /// Note that this is not used in the parallel iterator.
+    pub fn sort_by_file_path<F>(&mut self, cmp: F) -> &mut WalkBuilder
+    where
+        F: Fn(&Path, &Path) -> Ordering + Send + Sync + 'static,
+    {
+        self.sorter = Some(Sorter::ByPath(Arc::new(cmp)));
+        self
+    }
+
+    /// Set a function for sorting directory entries by file name.
+    ///
+    /// If a compare function is set, the resulting iterator will return all
+    /// paths in sorted order. The compare function will be called to compare
+    /// names from entries from the same directory using only the name of the
+    /// entry.
+    ///
+    /// This method will override any previous sorter set by this method or
+    /// by `sort_by_file_path`.
+    ///
+    /// Note that this is not used in the parallel iterator.
+    pub fn sort_by_file_name<F>(&mut self, cmp: F) -> &mut WalkBuilder
+    where
+        F: Fn(&OsStr, &OsStr) -> Ordering + Send + Sync + 'static,
+    {
+        self.sorter = Some(Sorter::ByName(Arc::new(cmp)));
+        self
+    }
+
+    /// Do not cross file system boundaries.
+    ///
+    /// When this option is enabled, directory traversal will not descend into
+    /// directories that are on a different file system from the root path.
+    ///
+    /// Currently, this option is only supported on Unix and Windows. If this
+    /// option is used on an unsupported platform, then directory traversal
+    /// will immediately return an error and will not yield any entries.
+    pub fn same_file_system(&mut self, yes: bool) -> &mut WalkBuilder {
+        self.same_file_system = yes;
+        self
+    }
+
+    /// Do not yield directory entries that are believed to correspond to
+    /// stdout.
+    ///
+    /// This is useful when a command is invoked via shell redirection to a
+    /// file that is also being read. For example, `grep -r foo ./ > results`
+    /// might end up trying to search `results` even though it is also writing
+    /// to it, which could cause an unbounded feedback loop. Setting this
+    /// option prevents this from happening by skipping over the `results`
+    /// file.
+    ///
+    /// This is disabled by default.
+    pub fn skip_stdout(&mut self, yes: bool) -> &mut WalkBuilder {
+        if yes {
+            self.skip = stdout_handle().map(Arc::new);
+        } else {
+            self.skip = None;
+        }
+        self
+    }
+
+    /// Yields only entries which satisfy the given predicate and skips
+    /// descending into directories that do not satisfy the given predicate.
+    ///
+    /// The predicate is applied to all entries. If the predicate is
+    /// true, iteration carries on as normal. If the predicate is false, the
+    /// entry is ignored and if it is a directory, it is not descended into.
+    ///
+    /// Note that the errors for reading entries that may not satisfy the
+    /// predicate will still be yielded.
+    ///
+    /// Note also that only one filter predicate can be applied to a
+    /// `WalkBuilder`. Calling this subsequent times overrides previous filter
+    /// predicates.
+    pub fn filter_entry<P>(&mut self, filter: P) -> &mut WalkBuilder
+    where
+        P: Fn(&DirEntry) -> bool + Send + Sync + 'static,
+    {
+        self.filter = Some(Filter(Arc::new(filter)));
+        self
+    }
+
+    /// Set the current working directory used for matching global gitignores.
+    ///
+    /// If this is not set, then this walker will attempt to discover the
+    /// correct path from the environment's current working directory. If
+    /// that fails, then global gitignore files will be ignored.
+    ///
+    /// Global gitignore files come from things like a user's git configuration
+    /// or from gitignore files added via [`WalkBuilder::add_ignore`].
+    pub fn current_dir(
+        &mut self,
+        cwd: impl Into<PathBuf>,
+    ) -> &mut WalkBuilder {
+        let cwd = cwd.into();
+        self.ig_builder.current_dir(cwd.clone());
+        if let Err(cwd) = self.global_gitignores_relative_to.set(Ok(cwd)) {
+            // OK because `Err` from `set` implies a value exists.
+            *self.global_gitignores_relative_to.get_mut().unwrap() = cwd;
+        }
+        self
+    }
+
+    /// Gets the currently configured CWD on this walk builder.
+    ///
+    /// This is "lazy." That is, we only ask for the CWD from the environment
+    /// if `WalkBuilder::current_dir` hasn't been called yet. And we ensure
+    /// that we only do it once.
+    fn get_or_set_current_dir(&self) -> Option<&Path> {
+        let result = self.global_gitignores_relative_to.get_or_init(|| {
+            let result = std::env::current_dir().map_err(Arc::new);
+            match result {
+                Ok(ref path) => {
+                    log::trace!(
+                        "automatically discovered CWD: {}",
+                        path.display()
+                    );
+                }
+                Err(ref err) => {
+                    log::debug!(
+                        "failed to find CWD \
+                         (global gitignores will be ignored): \
+                         {err}"
+                    );
+                }
+            }
+            result
+        });
+        result.as_ref().ok().map(|path| &**path)
+    }
+
+    /// Build the root ignore matcher shared by all consumers of this builder.
+    fn build_ignore(&self) -> Ignore {
+        self.get_or_set_current_dir()
+            .map(|cwd| self.ig_builder.build_with_cwd(Some(cwd.to_path_buf())))
+            .unwrap_or_else(|| self.ig_builder.build())
+    }
+}
+
+/// Walk is a recursive directory iterator over file paths in one or more
+/// directories.
+///
+/// Only file and directory paths matching the rules are returned. By default,
+/// ignore files like `.gitignore` are respected. The precise matching rules
+/// and precedence is explained in the documentation for `WalkBuilder`.
+pub struct Walk {
+    its: std::vec::IntoIter<(PathBuf, Option<WalkEventIter>)>,
+    it: Option<WalkEventIter>,
+    ig_root: Ignore,
+    ig: Ignore,
+    max_depth: Option<usize>,
+    max_filesize: Option<u64>,
+    skip: Option<Arc<Handle>>,
+    filter: Option<Filter>,
+}
+
+impl Walk {
+    /// Creates a new recursive directory iterator for the file path given.
+    ///
+    /// Note that this uses default settings, which include respecting
+    /// `.gitignore` files. To configure the iterator, use `WalkBuilder`
+    /// instead.
+    pub fn new<P: AsRef<Path>>(path: P) -> Walk {
+        WalkBuilder::new(path).build()
+    }
+
+    /// Create a new recursive directory iterator from the sequence of paths
+    /// given.
+    ///
+    /// Note that if the provided iterator is empty, then `Walk` is guaranteed
+    /// to yield zero entries.
+    pub fn from_iter<P: AsRef<Path>, I: IntoIterator<Item = P>>(
+        paths: I,
+    ) -> Walk {
+        WalkBuilder::from_iter(paths).build()
+    }
+
+    fn skip_entry(&self, ent: &DirEntry) -> Result<bool, Error> {
+        if ent.depth() == 0 {
+            return Ok(false);
+        }
+        // We ensure that trivial skipping is done before any other potentially
+        // expensive operations (stat, filesystem other) are done. This seems
+        // like an obvious optimization but becomes critical when filesystem
+        // operations even as simple as stat can result in significant
+        // overheads; an example of this was a bespoke filesystem layer in
+        // Windows that hosted files remotely and would download them on-demand
+        // when particular filesystem operations occurred. Users of this system
+        // who ensured correct file-type filters were being used could still
+        // get unnecessary file access resulting in large downloads.
+        if should_skip_entry(&self.ig, ent) {
+            return Ok(true);
+        }
+        if let Some(ref stdout) = self.skip {
+            if path_equals(ent, stdout)? {
+                return Ok(true);
+            }
+        }
+        if self.max_filesize.is_some() && !ent.is_dir() {
+            return Ok(skip_filesize(
+                self.max_filesize.unwrap(),
+                ent.path(),
+                &ent.metadata().ok(),
+            ));
+        }
+        if let Some(Filter(filter)) = &self.filter {
+            if !filter(ent) {
+                return Ok(true);
+            }
+        }
+        Ok(false)
+    }
+}
+
+impl Iterator for Walk {
+    type Item = Result<DirEntry, Error>;
+
+    #[inline(always)]
+    fn next(&mut self) -> Option<Result<DirEntry, Error>> {
+        loop {
+            let ev = match self.it.as_mut().and_then(|it| it.next()) {
+                Some(ev) => ev,
+                None => {
+                    match self.its.next() {
+                        None => return None,
+                        Some((_, None)) => {
+                            return Some(Ok(DirEntry::new_stdin()));
+                        }
+                        Some((path, Some(it))) => {
+                            self.it = Some(it);
+                            if path.is_dir() {
+                                let (ig, err) = self.ig_root.add_parents(path);
+                                self.ig = ig;
+                                if let Some(err) = err {
+                                    return Some(Err(err));
+                                }
+                            } else {
+                                self.ig = self.ig_root.clone();
+                            }
+                        }
+                    }
+                    continue;
+                }
+            };
+            match ev {
+                Err(err) => {
+                    return Some(Err(Error::from_walkdir(err)));
+                }
+                Ok(WalkEvent::Exit) => {
+                    self.ig = self.ig.parent().unwrap();
+                }
+                Ok(WalkEvent::Dir(ent)) => {
+                    let mut ent = DirEntry::new_walkdir(ent, None);
+                    let should_skip = match self.skip_entry(&ent) {
+                        Err(err) => return Some(Err(err)),
+                        Ok(should_skip) => should_skip,
+                    };
+                    if should_skip {
+                        self.it.as_mut().unwrap().it.skip_current_dir();
+                        // Still need to push this on the stack because
+                        // we'll get a WalkEvent::Exit event for this dir.
+                        // Its ignore files cannot apply to any visited entry.
+                        let (igtmp, _) =
+                            self.ig.add_child_with_entries(ent.path(), &[]);
+                        self.ig = igtmp;
+                        continue;
+                    }
+                    let (igtmp, err) = if self.max_depth == Some(ent.depth()) {
+                        self.ig.add_child_with_entries(ent.path(), &[])
+                    } else {
+                        self.ig.add_child(ent.path())
+                    };
+                    self.ig = igtmp;
+                    ent.err = err;
+                    return Some(Ok(ent));
+                }
+                Ok(WalkEvent::File(ent)) => {
+                    let ent = DirEntry::new_walkdir(ent, None);
+                    let should_skip = match self.skip_entry(&ent) {
+                        Err(err) => return Some(Err(err)),
+                        Ok(should_skip) => should_skip,
+                    };
+                    if should_skip {
+                        continue;
+                    }
+                    return Some(Ok(ent));
+                }
+            }
+        }
+    }
+}
+
+impl std::iter::FusedIterator for Walk {}
+
+/// WalkEventIter transforms a WalkDir iterator into an iterator that more
+/// accurately describes the directory tree. Namely, it emits events that are
+/// one of three types: directory, file or "exit." An "exit" event means that
+/// the entire contents of a directory have been enumerated.
+struct WalkEventIter {
+    depth: usize,
+    it: walkdir::IntoIter,
+    next: Option<Result<walkdir::DirEntry, walkdir::Error>>,
+}
+
+#[derive(Debug)]
+enum WalkEvent {
+    Dir(walkdir::DirEntry),
+    File(walkdir::DirEntry),
+    Exit,
+}
+
+impl From<WalkDir> for WalkEventIter {
+    fn from(it: WalkDir) -> WalkEventIter {
+        WalkEventIter { depth: 0, it: it.into_iter(), next: None }
+    }
+}
+
+impl Iterator for WalkEventIter {
+    type Item = walkdir::Result<WalkEvent>;
+
+    #[inline(always)]
+    fn next(&mut self) -> Option<walkdir::Result<WalkEvent>> {
+        let dent = self.next.take().or_else(|| self.it.next());
+        let depth = match dent {
+            None => 0,
+            Some(Ok(ref dent)) => dent.depth(),
+            Some(Err(ref err)) => err.depth(),
+        };
+        if depth < self.depth {
+            self.depth -= 1;
+            self.next = dent;
+            return Some(Ok(WalkEvent::Exit));
+        }
+        self.depth = depth;
+        match dent {
+            None => None,
+            Some(Err(err)) => Some(Err(err)),
+            Some(Ok(dent)) => {
+                if walkdir_is_dir(&dent) {
+                    self.depth += 1;
+                    Some(Ok(WalkEvent::Dir(dent)))
+                } else {
+                    Some(Ok(WalkEvent::File(dent)))
+                }
+            }
+        }
+    }
+}
+
+/// WalkState is used in the parallel recursive directory iterator to indicate
+/// whether walking should continue as normal, skip descending into a
+/// particular directory or quit the walk entirely.
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub enum WalkState {
+    /// Continue walking as normal.
+    Continue,
+    /// If the directory entry given is a directory, don't descend into it.
+    /// In all other cases, this has no effect.
+    Skip,
+    /// Quit the entire iterator as soon as possible.
+    ///
+    /// Note that this is an inherently asynchronous action. It is possible
+    /// for more entries to be yielded even after instructing the iterator
+    /// to quit.
+    Quit,
+}
+
+impl WalkState {
+    fn is_continue(&self) -> bool {
+        *self == WalkState::Continue
+    }
+
+    fn is_quit(&self) -> bool {
+        *self == WalkState::Quit
+    }
+}
+
+/// A builder for constructing a visitor when using [`WalkParallel::visit`].
+/// The builder will be called for each thread started by `WalkParallel`. The
+/// visitor returned from each builder is then called for every directory
+/// entry.
+pub trait ParallelVisitorBuilder<'s> {
+    /// Create per-thread `ParallelVisitor`s for `WalkParallel`.
+    fn build(&mut self) -> Box<dyn ParallelVisitor + 's>;
+}
+
+impl<'a, 's, P: ParallelVisitorBuilder<'s>> ParallelVisitorBuilder<'s>
+    for &'a mut P
+{
+    fn build(&mut self) -> Box<dyn ParallelVisitor + 's> {
+        (**self).build()
+    }
+}
+
+/// Receives files and directories for the current thread.
+///
+/// Setup for the traversal can be implemented as part of
+/// [`ParallelVisitorBuilder::build`]. Teardown when traversal finishes can be
+/// implemented by implementing the `Drop` trait on your traversal type.
+pub trait ParallelVisitor: Send {
+    /// Receives files and directories for the current thread. This is called
+    /// once for every directory entry visited by traversal.
+    fn visit(&mut self, entry: Result<DirEntry, Error>) -> WalkState;
+}
+
+struct FnBuilder<F> {
+    builder: F,
+}
+
+impl<'s, F: FnMut() -> FnVisitor<'s>> ParallelVisitorBuilder<'s>
+    for FnBuilder<F>
+{
+    fn build(&mut self) -> Box<dyn ParallelVisitor + 's> {
+        let visitor = (self.builder)();
+        Box::new(FnVisitorImp { visitor })
+    }
+}
+
+type FnVisitor<'s> =
+    Box<dyn FnMut(Result<DirEntry, Error>) -> WalkState + Send + 's>;
+
+struct FnVisitorImp<'s> {
+    visitor: FnVisitor<'s>,
+}
+
+impl<'s> ParallelVisitor for FnVisitorImp<'s> {
+    fn visit(&mut self, entry: Result<DirEntry, Error>) -> WalkState {
+        (self.visitor)(entry)
+    }
+}
+
+/// WalkParallel is a parallel recursive directory iterator over files paths
+/// in one or more directories.
+///
+/// Only file and directory paths matching the rules are returned. By default,
+/// ignore files like `.gitignore` are respected. The precise matching rules
+/// and precedence is explained in the documentation for `WalkBuilder`.
+///
+/// Unlike `Walk`, this uses multiple threads for traversing a directory.
+pub struct WalkParallel {
+    paths: std::vec::IntoIter<PathBuf>,
+    ig_root: Ignore,
+    max_filesize: Option<u64>,
+    max_depth: Option<usize>,
+    min_depth: Option<usize>,
+    follow_links: bool,
+    same_file_system: bool,
+    threads: usize,
+    skip: Option<Arc<Handle>>,
+    filter: Option<Filter>,
+}
+
+impl WalkParallel {
+    /// Execute the parallel recursive directory iterator. `mkf` is called
+    /// for each thread used for iteration. The function produced by `mkf`
+    /// is then in turn called for each visited file path.
+    pub fn run<'s, F>(self, mkf: F)
+    where
+        F: FnMut() -> FnVisitor<'s>,
+    {
+        self.visit(&mut FnBuilder { builder: mkf })
+    }
+
+    /// Execute the parallel recursive directory iterator using a custom
+    /// visitor.
+    ///
+    /// The builder given is used to construct a visitor for every thread
+    /// used by this traversal. The visitor returned from each builder is then
+    /// called for every directory entry seen by that thread.
+    ///
+    /// Typically, creating a custom visitor is useful if you need to perform
+    /// some kind of cleanup once traversal is finished. This can be achieved
+    /// by implementing `Drop` for your builder (or for your visitor, if you
+    /// want to execute cleanup for every thread that is launched).
+    ///
+    /// For example, each visitor might build up a data structure of results
+    /// corresponding to the directory entries seen for each thread. Since each
+    /// visitor runs on only one thread, this build-up can be done without
+    /// synchronization. Then, once traversal is complete, all of the results
+    /// can be merged together into a single data structure.
+    pub fn visit(mut self, builder: &mut dyn ParallelVisitorBuilder<'_>) {
+        let threads = self.threads();
+        let mut stack = vec![];
+        {
+            let mut visitor = builder.build();
+            let mut paths = Vec::new().into_iter();
+            std::mem::swap(&mut paths, &mut self.paths);
+            // Send the initial set of root paths to the pool of workers. Note
+            // that we only send directories. For files, we send to them the
+            // callback directly.
+            for path in paths {
+                let (dent, root_device) = if path == Path::new("-") {
+                    (DirEntry::new_stdin(), None)
+                } else {
+                    let root_device = if !self.same_file_system {
+                        None
+                    } else {
+                        match device_num(&path) {
+                            Ok(root_device) => Some(root_device),
+                            Err(err) => {
+                                let err = Error::Io(err).with_path(path);
+                                if visitor.visit(Err(err)).is_quit() {
+                                    return;
+                                }
+                                continue;
+                            }
+                        }
+                    };
+                    match DirEntryRaw::from_path(0, path, false) {
+                        Ok(dent) => {
+                            (DirEntry::new_raw(dent, None), root_device)
+                        }
+                        Err(err) => {
+                            if visitor.visit(Err(err)).is_quit() {
+                                return;
+                            }
+                            continue;
+                        }
+                    }
+                };
+                stack.push(Message::Work(Work {
+                    dent,
+                    ignore: self.ig_root.clone(),
+                    root_device,
+                }));
+            }
+            // ... but there's no need to start workers if we don't need them.
+            if stack.is_empty() {
+                return;
+            }
+        }
+        // Create the workers and then wait for them to finish.
+        let quit_now = Arc::new(AtomicBool::new(false));
+        let active_workers = Arc::new(AtomicUsize::new(threads));
+        let stacks = Stack::new_for_each_thread(threads, stack);
+        // Collect all of the workers first. In the case that
+        // `builder.build()` panics, we want that to happen and
+        // propagate before we actually start to run any of the
+        // workers.
+        let workers: Vec<_> = stacks
+            .into_iter()
+            .map(|stack| Worker {
+                visitor: builder.build(),
+                stack,
+                quit_now: quit_now.clone(),
+                active_workers: active_workers.clone(),
+                max_depth: self.max_depth,
+                min_depth: self.min_depth,
+                max_filesize: self.max_filesize,
+                follow_links: self.follow_links,
+                skip: self.skip.clone(),
+                filter: self.filter.clone(),
+            })
+            .collect();
+        std::thread::scope(|s| {
+            let handles: Vec<_> = workers
+                .into_iter()
+                .map(|worker| s.spawn(|| worker.run()))
+                .collect();
+            for handle in handles {
+                handle.join().unwrap();
+            }
+        });
+    }
+
+    fn threads(&self) -> usize {
+        if self.threads == 0 {
+            std::thread::available_parallelism().map_or(1, |n| n.get()).min(12)
+        } else {
+            self.threads
+        }
+    }
+}
+
+/// Message is the set of instructions that a worker knows how to process.
+enum Message {
+    /// A work item corresponds to a directory that should be descended into.
+    /// Work items for entries that should be skipped or ignored should not
+    /// be produced.
+    Work(Work),
+    /// This instruction indicates that the worker should quit.
+    Quit,
+}
+
+/// A unit of work for each worker to process.
+///
+/// Each unit of work corresponds to a directory that should be descended
+/// into.
+struct Work {
+    /// The directory entry.
+    dent: DirEntry,
+    /// Any ignore matchers that have been built for this directory's parents.
+    ignore: Ignore,
+    /// The root device number. When present, only files with the same device
+    /// number should be considered.
+    root_device: Option<u64>,
+}
+
+#[derive(Default)]
+struct ReadDirResult {
+    entries: Vec<fs::DirEntry>,
+    errors: Vec<Error>,
+}
+
+impl Work {
+    /// Returns true if and only if this work item is a directory.
+    fn is_dir(&self) -> bool {
+        self.dent.is_dir()
+    }
+
+    /// Returns true if and only if this work item is a symlink.
+    fn is_symlink(&self) -> bool {
+        self.dent.file_type().map_or(false, |ft| ft.is_symlink())
+    }
+
+    /// Adds ignore rules for parent directories.
+    ///
+    /// Note that this only applies to entries at depth 0. On all other
+    /// entries, this is a no-op.
+    fn add_parents(&mut self) -> Option<Error> {
+        if self.dent.depth() > 0 {
+            return None;
+        }
+        // At depth 0, the path of this entry is a root path, so we can
+        // use it directly to add parent ignore rules.
+        let (ig, err) = self.ignore.add_parents(self.dent.path());
+        self.ignore = ig;
+        err
+    }
+
+    /// Adds ignore rules for this directory without reading its contents.
+    fn add_ignore(&mut self) {
+        let (ig, err) = self.ignore.add_child(self.dent.path());
+        self.ignore = ig;
+        self.dent.err = err;
+    }
+
+    /// Reads the directory contents of this work item and adds ignore
+    /// rules for this directory.
+    ///
+    /// If there was a problem with reading the directory contents, then
+    /// an error is returned. If there was a problem reading the ignore
+    /// rules for this directory, then the error is attached to this
+    /// work item's directory entry.
+    fn read_dir(&mut self) -> Result<ReadDirResult, Error> {
+        let readdir = match fs::read_dir(self.dent.path()) {
+            Ok(readdir) => readdir,
+            Err(err) => {
+                let err = Error::from(err)
+                    .with_path(self.dent.path())
+                    .with_depth(self.dent.depth());
+                return Err(err);
+            }
+        };
+        // Actually descend into the directory and read its contents
+        let mut result = ReadDirResult::default();
+        for entry in readdir {
+            match entry {
+                Ok(entry) => result.entries.push(entry),
+                Err(err) => result.errors.push(
+                    Error::from(err)
+                        .with_path(self.dent.path())
+                        .with_depth(self.dent.depth() + 1),
+                ),
+            }
+        }
+        let (ig, err) = self
+            .ignore
+            .add_child_with_entries(self.dent.path(), &result.entries);
+        self.ignore = ig;
+        self.dent.err = err;
+        Ok(result)
+    }
+}
+
+/// A work-stealing stack.
+#[derive(Debug)]
+struct Stack {
+    /// This thread's index.
+    index: usize,
+    /// The thread-local stack.
+    deque: Deque<Message>,
+    /// The work stealers.
+    stealers: Arc<[Stealer<Message>]>,
+}
+
+impl Stack {
+    /// Create a work-stealing stack for each thread. The given messages
+    /// correspond to the initial paths to start the search at. They will
+    /// be distributed automatically to each stack in a round-robin fashion.
+    fn new_for_each_thread(threads: usize, init: Vec<Message>) -> Vec<Stack> {
+        // Using new_lifo() ensures each worker operates depth-first, not
+        // breadth-first. We do depth-first because a breadth first traversal
+        // on wide directories with a lot of gitignores is disastrous (for
+        // example, searching a directory tree containing all of crates.io).
+        let deques: Vec<Deque<Message>> =
+            std::iter::repeat_with(Deque::new_lifo).take(threads).collect();
+        let stealers = Arc::<[Stealer<Message>]>::from(
+            deques.iter().map(Deque::stealer).collect::<Vec<_>>(),
+        );
+        let stacks: Vec<Stack> = deques
+            .into_iter()
+            .enumerate()
+            .map(|(index, deque)| Stack {
+                index,
+                deque,
+                stealers: stealers.clone(),
+            })
+            .collect();
+        // Distribute the initial messages, reverse the order to cancel out
+        // the other reversal caused by the inherent LIFO processing of the
+        // per-thread stacks which are filled here.
+        init.into_iter()
+            .rev()
+            .zip(stacks.iter().cycle())
+            .for_each(|(m, s)| s.push(m));
+        stacks
+    }
+
+    /// Push a message.
+    fn push(&self, msg: Message) {
+        self.deque.push(msg);
+    }
+
+    /// Pop a message.
+    fn pop(&self) -> Option<Message> {
+        self.deque.pop().or_else(|| self.steal())
+    }
+
+    /// Steal a message from another queue.
+    fn steal(&self) -> Option<Message> {
+        // For fairness, try to steal from index + 1, index + 2, ... len - 1,
+        // then wrap around to 0, 1, ... index - 1.
+        let (left, right) = self.stealers.split_at(self.index);
+        // Don't steal from ourselves
+        let right = &right[1..];
+
+        right
+            .iter()
+            .chain(left.iter())
+            .map(|s| s.steal_batch_and_pop(&self.deque))
+            .find_map(|s| s.success())
+    }
+}
+
+/// A worker is responsible for descending into directories, updating the
+/// ignore matchers, producing new work and invoking the caller's callback.
+///
+/// Note that a worker is *both* a producer and a consumer.
+struct Worker<'s> {
+    /// The caller's callback.
+    visitor: Box<dyn ParallelVisitor + 's>,
+    /// A work-stealing stack of work to do.
+    ///
+    /// We use a stack instead of a channel because a stack lets us visit
+    /// directories in depth first order. This can substantially reduce peak
+    /// memory usage by keeping both the number of file paths and gitignore
+    /// matchers in memory lower.
+    stack: Stack,
+    /// Whether all workers should terminate at the next opportunity. Note
+    /// that we need this because we don't want other `Work` to be done after
+    /// we quit. We wouldn't need this if have a priority channel.
+    quit_now: Arc<AtomicBool>,
+    /// The number of currently active workers.
+    active_workers: Arc<AtomicUsize>,
+    /// The maximum depth of directories to descend. A value of `0` means no
+    /// descension at all.
+    max_depth: Option<usize>,
+    /// The minimum depth of directories to descend.
+    min_depth: Option<usize>,
+    /// The maximum size a searched file can be (in bytes). If a file exceeds
+    /// this size it will be skipped.
+    max_filesize: Option<u64>,
+    /// Whether to follow symbolic links or not. When this is enabled, loop
+    /// detection is performed.
+    follow_links: bool,
+    /// A file handle to skip, currently is either `None` or stdout, if it's
+    /// a file and it has been requested to skip files identical to stdout.
+    skip: Option<Arc<Handle>>,
+    /// A predicate applied to dir entries. If true, the entry and all
+    /// children will be skipped.
+    filter: Option<Filter>,
+}
+
+impl<'s> Worker<'s> {
+    /// Runs this worker until there is no more work left to do.
+    ///
+    /// The worker will call the caller's callback for all entries that aren't
+    /// skipped by the ignore matcher.
+    fn run(mut self) {
+        while let Some(work) = self.get_work() {
+            if let WalkState::Quit = self.run_one(work) {
+                self.quit_now();
+            }
+        }
+    }
+
+    fn run_one(&mut self, mut work: Work) -> WalkState {
+        let should_visit = self
+            .min_depth
+            .map(|min_depth| work.dent.depth() >= min_depth)
+            .unwrap_or(true);
+
+        // If the work is not a directory, then we can just execute the
+        // caller's callback immediately and move on.
+        if work.is_symlink() || !work.is_dir() {
+            return if should_visit {
+                self.visitor.visit(Ok(work.dent))
+            } else {
+                WalkState::Continue
+            };
+        }
+        if let Some(err) = work.add_parents() {
+            let state = self.visitor.visit(Err(err));
+            if state.is_quit() {
+                return state;
+            }
+        }
+
+        let descend = if let Some(root_device) = work.root_device {
+            match is_same_file_system(root_device, work.dent.path()) {
+                Ok(true) => true,
+                Ok(false) => false,
+                Err(err) => {
+                    let state = self.visitor.visit(Err(err));
+                    if state.is_quit() {
+                        return state;
+                    }
+                    false
+                }
+            }
+        } else {
+            true
+        };
+
+        // Try to read the directory first before we transfer ownership
+        // to the provided closure. Do not unwrap it immediately, though,
+        // as we may receive an `Err` value e.g. in the case when we do not
+        // have sufficient read permissions to list the directory.
+        // In that case we still want to provide the closure with a valid
+        // entry before passing the error value.
+        let depth = work.dent.depth();
+        let readdir = if descend && self.max_depth.is_none_or(|m| depth < m) {
+            Some(work.read_dir())
+        } else {
+            work.add_ignore();
+            None
+        };
+        if should_visit {
+            let state = self.visitor.visit(Ok(work.dent));
+            if !state.is_continue() {
+                return state;
+            }
+        }
+        if !descend {
+            return WalkState::Skip;
+        }
+
+        let readdir = match readdir {
+            Some(readdir) => readdir,
+            None => return WalkState::Skip,
+        };
+        let readdir = match readdir {
+            Ok(readdir) => readdir,
+            Err(err) => {
+                return self.visitor.visit(Err(err));
+            }
+        };
+
+        for result in readdir.entries {
+            let state = self.generate_work(
+                &work.ignore,
+                depth + 1,
+                work.root_device,
+                result,
+            );
+            if state.is_quit() {
+                return state;
+            }
+        }
+        for err in readdir.errors {
+            let state = self.visitor.visit(Err(err));
+            if state.is_quit() {
+                return state;
+            }
+        }
+        WalkState::Continue
+    }
+
+    /// Decides whether to submit the given directory entry as a file to
+    /// search.
+    ///
+    /// If the entry is a path that should be ignored, then this is a no-op.
+    /// Otherwise, the entry is pushed on to the queue. (The actual execution
+    /// of the callback happens in `run_one`.)
+    ///
+    /// If an error occurs while reading the entry, then it is sent to the
+    /// caller's callback.
+    ///
+    /// `ig` is the `Ignore` matcher for the parent directory. `depth` should
+    /// be the depth of this entry. `result` should be the item yielded by
+    /// a directory iterator.
+    fn generate_work(
+        &mut self,
+        ig: &Ignore,
+        depth: usize,
+        root_device: Option<u64>,
+        fs_dent: fs::DirEntry,
+    ) -> WalkState {
+        let mut dent = match DirEntryRaw::from_entry(depth, &fs_dent) {
+            Ok(dent) => DirEntry::new_raw(dent, None),
+            Err(err) => {
+                return self.visitor.visit(Err(err));
+            }
+        };
+        let is_symlink = dent.file_type().map_or(false, |ft| ft.is_symlink());
+        if self.follow_links && is_symlink {
+            let path = dent.path().to_path_buf();
+            dent = match DirEntryRaw::from_path(depth, path, true) {
+                Ok(dent) => DirEntry::new_raw(dent, None),
+                Err(err) => {
+                    return self.visitor.visit(Err(err));
+                }
+            };
+            if dent.is_dir() {
+                if let Err(err) = check_symlink_loop(ig, dent.path(), depth) {
+                    return self.visitor.visit(Err(err));
+                }
+            }
+        }
+        // N.B. See analogous call in the single-threaded implementation about
+        // why it's important for this to come before the checks below.
+        if should_skip_entry(ig, &dent) {
+            return WalkState::Continue;
+        }
+        if let Some(ref stdout) = self.skip {
+            let is_stdout = match path_equals(&dent, stdout) {
+                Ok(is_stdout) => is_stdout,
+                Err(err) => return self.visitor.visit(Err(err)),
+            };
+            if is_stdout {
+                return WalkState::Continue;
+            }
+        }
+        let should_skip_filesize =
+            if self.max_filesize.is_some() && !dent.is_dir() {
+                skip_filesize(
+                    self.max_filesize.unwrap(),
+                    dent.path(),
+                    &dent.metadata().ok(),
+                )
+            } else {
+                false
+            };
+        let should_skip_filtered =
+            if let Some(Filter(predicate)) = &self.filter {
+                !predicate(&dent)
+            } else {
+                false
+            };
+        if !should_skip_filesize && !should_skip_filtered {
+            self.send(Work { dent, ignore: ig.clone(), root_device });
+        }
+        WalkState::Continue
+    }
+
+    /// Returns the next directory to descend into.
+    ///
+    /// If all work has been exhausted, then this returns None. The worker
+    /// should then subsequently quit.
+    fn get_work(&mut self) -> Option<Work> {
+        let mut value = self.recv();
+        loop {
+            // Simulate a priority channel: If quit_now flag is set, we can
+            // receive only quit messages.
+            if self.is_quit_now() {
+                value = Some(Message::Quit)
+            }
+            match value {
+                Some(Message::Work(work)) => {
+                    return Some(work);
+                }
+                Some(Message::Quit) => {
+                    // Repeat quit message to wake up sleeping threads, if
+                    // any. The domino effect will ensure that every thread
+                    // will quit.
+                    self.send_quit();
+                    return None;
+                }
+                None => {
+                    if self.deactivate_worker() == 0 {
+                        // If deactivate_worker() returns 0, every worker thread
+                        // is currently within the critical section between the
+                        // acquire in deactivate_worker() and the release in
+                        // activate_worker() below.  For this to happen, every
+                        // worker's local deque must be simultaneously empty,
+                        // meaning there is no more work left at all.
+                        self.send_quit();
+                        return None;
+                    }
+                    // Wait for next `Work` or `Quit` message.
+                    loop {
+                        if self.is_quit_now() {
+                            return None;
+                        }
+                        if let Some(v) = self.recv() {
+                            self.activate_worker();
+                            value = Some(v);
+                            break;
+                        }
+                        // Our stack isn't blocking. Instead of burning the
+                        // CPU waiting, we let the thread sleep for a bit. In
+                        // general, this tends to only occur once the search is
+                        // approaching termination.
+                        let dur = std::time::Duration::from_millis(1);
+                        std::thread::sleep(dur);
+                    }
+                }
+            }
+        }
+    }
+
+    /// Indicates that all workers should quit immediately.
+    fn quit_now(&self) {
+        self.quit_now.store(true, AtomicOrdering::SeqCst);
+    }
+
+    /// Returns true if this worker should quit immediately.
+    fn is_quit_now(&self) -> bool {
+        self.quit_now.load(AtomicOrdering::SeqCst)
+    }
+
+    /// Send work.
+    fn send(&self, work: Work) {
+        self.stack.push(Message::Work(work));
+    }
+
+    /// Send a quit message.
+    fn send_quit(&self) {
+        self.stack.push(Message::Quit);
+    }
+
+    /// Receive work.
+    fn recv(&self) -> Option<Message> {
+        self.stack.pop()
+    }
+
+    /// Deactivates a worker and returns the number of currently active workers.
+    fn deactivate_worker(&self) -> usize {
+        self.active_workers.fetch_sub(1, AtomicOrdering::Acquire) - 1
+    }
+
+    /// Reactivates a worker.
+    fn activate_worker(&self) {
+        self.active_workers.fetch_add(1, AtomicOrdering::Release);
+    }
+}
+
+impl<'s> Drop for Worker<'s> {
+    fn drop(&mut self) {
+        if std::thread::panicking() {
+            self.quit_now();
+        }
+    }
+}
+
+fn check_symlink_loop(
+    ig_parent: &Ignore,
+    child_path: &Path,
+    child_depth: usize,
+) -> Result<(), Error> {
+    let hchild = Handle::from_path(child_path).map_err(|err| {
+        Error::from(err).with_path(child_path).with_depth(child_depth)
+    })?;
+    for ig in ig_parent.parents().take_while(|ig| !ig.is_absolute_parent()) {
+        let h = Handle::from_path(ig.path()).map_err(|err| {
+            Error::from(err).with_path(child_path).with_depth(child_depth)
+        })?;
+        if hchild == h {
+            return Err(Error::Loop {
+                ancestor: ig.path().to_path_buf(),
+                child: child_path.to_path_buf(),
+            }
+            .with_depth(child_depth));
+        }
+    }
+    Ok(())
+}
+
+// Before calling this function, make sure that you ensure that is really
+// necessary as the arguments imply a file stat.
+fn skip_filesize(
+    max_filesize: u64,
+    path: &Path,
+    ent: &Option<Metadata>,
+) -> bool {
+    let filesize = match *ent {
+        Some(ref md) => Some(md.len()),
+        None => None,
+    };
+
+    if let Some(fs) = filesize {
+        if fs > max_filesize {
+            log::debug!("ignoring {}: {} bytes", path.display(), fs);
+            true
+        } else {
+            false
+        }
+    } else {
+        false
+    }
+}
+
+fn should_skip_entry(ig: &Ignore, dent: &DirEntry) -> bool {
+    let m = ig.matched_dir_entry(dent);
+    if m.is_ignore() {
+        log::debug!("ignoring {}: {:?}", dent.path().display(), m);
+        true
+    } else if m.is_whitelist() {
+        log::debug!("whitelisting {}: {:?}", dent.path().display(), m);
+        false
+    } else {
+        false
+    }
+}
+
+/// Returns a handle to stdout for filtering search.
+///
+/// A handle is returned if and only if stdout is being redirected to a file.
+/// The handle returned corresponds to that file.
+///
+/// This can be used to ensure that we do not attempt to search a file that we
+/// may also be writing to.
+fn stdout_handle() -> Option<Handle> {
+    let h = match Handle::stdout() {
+        Err(_) => return None,
+        Ok(h) => h,
+    };
+    let md = match h.as_file().metadata() {
+        Err(_) => return None,
+        Ok(md) => md,
+    };
+    if !md.is_file() {
+        return None;
+    }
+    Some(h)
+}
+
+/// Returns true if and only if the given directory entry is believed to be
+/// equivalent to the given handle. If there was a problem querying the path
+/// for information to determine equality, then that error is returned.
+fn path_equals(dent: &DirEntry, handle: &Handle) -> Result<bool, Error> {
+    #[cfg(unix)]
+    fn never_equal(dent: &DirEntry, handle: &Handle) -> bool {
+        dent.ino() != Some(handle.ino())
+    }
+
+    #[cfg(not(unix))]
+    fn never_equal(_: &DirEntry, _: &Handle) -> bool {
+        false
+    }
+
+    // If we know for sure that these two things aren't equal, then avoid
+    // the costly extra stat call to determine equality.
+    if dent.is_stdin() || never_equal(dent, handle) {
+        return Ok(false);
+    }
+    Handle::from_path(dent.path()).map(|h| &h == handle).map_err(|err| {
+        Error::Io(err).with_depth(dent.depth()).with_path(dent.path())
+    })
+}
+
+/// Returns true if the given walkdir entry corresponds to a directory.
+///
+/// This is normally just `dent.file_type().is_dir()`, but when we aren't
+/// following symlinks, the root directory entry may be a symlink to a
+/// directory that we *do* follow---by virtue of it being specified by the user
+/// explicitly. In that case, we need to follow the symlink and query whether
+/// it's a directory or not. But we only do this for root entries to avoid an
+/// additional stat check in most cases.
+fn walkdir_is_dir(dent: &walkdir::DirEntry) -> bool {
+    if dent.file_type().is_dir() {
+        return true;
+    }
+    if !dent.file_type().is_symlink() || dent.depth() > 0 {
+        return false;
+    }
+    dent.path().metadata().ok().map_or(false, |md| md.file_type().is_dir())
+}
+
+/// Returns true if and only if the given path is on the same device as the
+/// given root device.
+fn is_same_file_system(root_device: u64, path: &Path) -> Result<bool, Error> {
+    let dent_device =
+        device_num(path).map_err(|err| Error::Io(err).with_path(path))?;
+    Ok(root_device == dent_device)
+}
+
+#[cfg(unix)]
+fn device_num<P: AsRef<Path>>(path: P) -> io::Result<u64> {
+    use std::os::unix::fs::MetadataExt;
+
+    path.as_ref().metadata().map(|md| md.dev())
+}
+
+#[cfg(windows)]
+fn device_num<P: AsRef<Path>>(path: P) -> io::Result<u64> {
+    use winapi_util::{Handle, file};
+
+    let h = Handle::from_path_any(path)?;
+    file::information(h).map(|info| info.volume_serial_number())
+}
+
+#[cfg(not(any(unix, windows)))]
+fn device_num<P: AsRef<Path>>(_: P) -> io::Result<u64> {
+    Err(io::Error::new(
+        io::ErrorKind::Other,
+        "walkdir: same_file_system option not supported on this platform",
+    ))
+}
+
+#[cfg(test)]
+mod tests {
+    use std::ffi::OsStr;
+    use std::fs::{self, File};
+    use std::io::Write;
+    use std::path::Path;
+    use std::sync::{Arc, Mutex};
+
+    use super::{DirEntry, WalkBuilder, WalkState};
+    use crate::tests::TempDir;
+
+    fn wfile<P: AsRef<Path>>(path: P, contents: &str) {
+        let mut file = File::create(path).unwrap();
+        file.write_all(contents.as_bytes()).unwrap();
+    }
+
+    fn wfile_size<P: AsRef<Path>>(path: P, size: u64) {
+        let file = File::create(path).unwrap();
+        file.set_len(size).unwrap();
+    }
+
+    #[cfg(unix)]
+    fn symlink<P: AsRef<Path>, Q: AsRef<Path>>(src: P, dst: Q) {
+        use std::os::unix::fs::symlink;
+        symlink(src, dst).unwrap();
+    }
+
+    fn mkdirp<P: AsRef<Path>>(path: P) {
+        fs::create_dir_all(path).unwrap();
+    }
+
+    fn normal_path(unix: &str) -> String {
+        if cfg!(windows) { unix.replace("\\", "/") } else { unix.to_string() }
+    }
+
+    fn walk_collect(prefix: &Path, builder: &WalkBuilder) -> Vec<String> {
+        let mut paths = vec![];
+        for result in builder.build() {
+            let dent = match result {
+                Err(_) => continue,
+                Ok(dent) => dent,
+            };
+            let path = dent.path().strip_prefix(prefix).unwrap();
+            if path.as_os_str().is_empty() {
+                continue;
+            }
+            paths.push(normal_path(path.to_str().unwrap()));
+        }
+        paths.sort();
+        paths
+    }
+
+    fn walk_collect_parallel(
+        prefix: &Path,
+        builder: &WalkBuilder,
+    ) -> Vec<String> {
+        let mut paths = vec![];
+        for dent in walk_collect_entries_parallel(builder) {
+            let path = dent.path().strip_prefix(prefix).unwrap();
+            if path.as_os_str().is_empty() {
+                continue;
+            }
+            paths.push(normal_path(path.to_str().unwrap()));
+        }
+        paths.sort();
+        paths
+    }
+
+    fn walk_collect_entries_parallel(builder: &WalkBuilder) -> Vec<DirEntry> {
+        let dents = Arc::new(Mutex::new(vec![]));
+        builder.build_parallel().run(|| {
+            let dents = dents.clone();
+            Box::new(move |result| {
+                if let Ok(dent) = result {
+                    dents.lock().unwrap().push(dent);
+                }
+                WalkState::Continue
+            })
+        });
+
+        let dents = dents.lock().unwrap();
+        dents.to_vec()
+    }
+
+    fn mkpaths(paths: &[&str]) -> Vec<String> {
+        let mut paths: Vec<_> = paths.iter().map(|s| s.to_string()).collect();
+        paths.sort();
+        paths
+    }
+
+    fn tmpdir() -> TempDir {
+        TempDir::new().unwrap()
+    }
+
+    fn assert_paths(prefix: &Path, builder: &WalkBuilder, expected: &[&str]) {
+        let got = walk_collect(prefix, builder);
+        assert_eq!(got, mkpaths(expected), "single threaded");
+        let got = walk_collect_parallel(prefix, builder);
+        assert_eq!(got, mkpaths(expected), "parallel");
+    }
+
+    #[test]
+    fn no_ignores() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a/b/c"));
+        mkdirp(td.path().join("x/y"));
+        wfile(td.path().join("a/b/foo"), "");
+        wfile(td.path().join("x/y/foo"), "");
+
+        assert_paths(
+            td.path(),
+            &WalkBuilder::new(td.path()),
+            &["x", "x/y", "x/y/foo", "a", "a/b", "a/b/foo", "a/b/c"],
+        );
+    }
+
+    #[test]
+    fn custom_ignore() {
+        let td = tmpdir();
+        let custom_ignore = ".customignore";
+        mkdirp(td.path().join("a"));
+        wfile(td.path().join(custom_ignore), "foo");
+        wfile(td.path().join("foo"), "");
+        wfile(td.path().join("a/foo"), "");
+        wfile(td.path().join("bar"), "");
+        wfile(td.path().join("a/bar"), "");
+
+        let mut builder = WalkBuilder::new(td.path());
+        builder.add_custom_ignore_filename(&custom_ignore);
+        assert_paths(td.path(), &builder, &["bar", "a", "a/bar"]);
+    }
+
+    #[test]
+    fn custom_ignore_exclusive_use() {
+        let td = tmpdir();
+        let custom_ignore = ".customignore";
+        mkdirp(td.path().join("a"));
+        wfile(td.path().join(custom_ignore), "foo");
+        wfile(td.path().join("foo"), "");
+        wfile(td.path().join("a/foo"), "");
+        wfile(td.path().join("bar"), "");
+        wfile(td.path().join("a/bar"), "");
+
+        let mut builder = WalkBuilder::new(td.path());
+        builder.ignore(false);
+        builder.git_ignore(false);
+        builder.git_global(false);
+        builder.git_exclude(false);
+        builder.add_custom_ignore_filename(&custom_ignore);
+        assert_paths(td.path(), &builder, &["bar", "a", "a/bar"]);
+    }
+
+    #[test]
+    fn gitignore() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".git"));
+        mkdirp(td.path().join("a"));
+        wfile(td.path().join(".gitignore"), "foo");
+        wfile(td.path().join("foo"), "");
+        wfile(td.path().join("a/foo"), "");
+        wfile(td.path().join("bar"), "");
+        wfile(td.path().join("a/bar"), "");
+
+        assert_paths(
+            td.path(),
+            &WalkBuilder::new(td.path()),
+            &["bar", "a", "a/bar"],
+        );
+    }
+
+    #[test]
+    fn explicit_ignore() {
+        let td = tmpdir();
+        let igpath = td.path().join(".not-an-ignore");
+        mkdirp(td.path().join("a"));
+        wfile(&igpath, "foo");
+        wfile(td.path().join("foo"), "");
+        wfile(td.path().join("a/foo"), "");
+        wfile(td.path().join("bar"), "");
+        wfile(td.path().join("a/bar"), "");
+
+        let mut builder = WalkBuilder::new(td.path());
+        assert!(builder.add_ignore(&igpath).is_none());
+        assert_paths(td.path(), &builder, &["bar", "a", "a/bar"]);
+    }
+
+    #[test]
+    fn explicit_ignore_exclusive_use() {
+        let td = tmpdir();
+        let igpath = td.path().join(".not-an-ignore");
+        mkdirp(td.path().join("a"));
+        wfile(&igpath, "foo");
+        wfile(td.path().join("foo"), "");
+        wfile(td.path().join("a/foo"), "");
+        wfile(td.path().join("bar"), "");
+        wfile(td.path().join("a/bar"), "");
+
+        let mut builder = WalkBuilder::new(td.path());
+        builder.standard_filters(false);
+        assert!(builder.add_ignore(&igpath).is_none());
+        assert_paths(
+            td.path(),
+            &builder,
+            &[".not-an-ignore", "bar", "a", "a/bar"],
+        );
+    }
+
+    #[test]
+    fn gitignore_parent() {
+        let td = tmpdir();
+        mkdirp(td.path().join(".git"));
+        mkdirp(td.path().join("a"));
+        wfile(td.path().join(".gitignore"), "foo");
+        wfile(td.path().join("a/foo"), "");
+        wfile(td.path().join("a/bar"), "");
+
+        let root = td.path().join("a");
+        assert_paths(&root, &WalkBuilder::new(&root), &["bar"]);
+    }
+
+    #[test]
+    fn max_depth() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a/b/c"));
+        wfile(td.path().join("foo"), "");
+        wfile(td.path().join("a/foo"), "");
+        wfile(td.path().join("a/b/foo"), "");
+        wfile(td.path().join("a/b/c/foo"), "");
+
+        let mut builder = WalkBuilder::new(td.path());
+        assert_paths(
+            td.path(),
+            &builder,
+            &["a", "a/b", "a/b/c", "foo", "a/foo", "a/b/foo", "a/b/c/foo"],
+        );
+        assert_paths(td.path(), builder.max_depth(Some(0)), &[]);
+        assert_paths(td.path(), builder.max_depth(Some(1)), &["a", "foo"]);
+        assert_paths(
+            td.path(),
+            builder.max_depth(Some(2)),
+            &["a", "a/b", "foo", "a/foo"],
+        );
+    }
+
+    #[test]
+    fn max_depth_does_not_load_unreachable_ignore_files() {
+        let td = tmpdir();
+        let leaf = td.path().join("leaf");
+        mkdirp(&leaf);
+        wfile(leaf.join(".ignore"), "{invalid\n");
+
+        let mut builder = WalkBuilder::new(td.path());
+        builder.max_depth(Some(1));
+        let entry = builder
+            .build()
+            .find_map(|result| {
+                let entry = result.unwrap();
+                (entry.path() == leaf).then_some(entry)
+            })
+            .unwrap();
+
+        assert!(entry.error().is_none());
+        assert_paths(td.path(), &builder, &["leaf"]);
+    }
+
+    #[test]
+    fn min_depth() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a/b/c"));
+        wfile(td.path().join("foo"), "");
+        wfile(td.path().join("a/foo"), "");
+        wfile(td.path().join("a/b/foo"), "");
+        wfile(td.path().join("a/b/c/foo"), "");
+
+        let builder = WalkBuilder::new(td.path());
+        assert_paths(
+            td.path(),
+            &builder,
+            &["a", "a/b", "a/b/c", "foo", "a/foo", "a/b/foo", "a/b/c/foo"],
+        );
+        let mut builder = WalkBuilder::new(td.path());
+        assert_paths(
+            td.path(),
+            &builder.min_depth(Some(0)),
+            &["a", "a/b", "a/b/c", "foo", "a/foo", "a/b/foo", "a/b/c/foo"],
+        );
+        assert_paths(
+            td.path(),
+            &builder.min_depth(Some(1)),
+            &["a", "a/b", "a/b/c", "foo", "a/foo", "a/b/foo", "a/b/c/foo"],
+        );
+        assert_paths(
+            td.path(),
+            builder.min_depth(Some(2)),
+            &["a/b", "a/b/c", "a/b/c/foo", "a/b/foo", "a/foo"],
+        );
+        assert_paths(
+            td.path(),
+            builder.min_depth(Some(3)),
+            &["a/b/c", "a/b/c/foo", "a/b/foo"],
+        );
+        assert_paths(td.path(), builder.min_depth(Some(10)), &[]);
+
+        assert_paths(
+            td.path(),
+            builder.min_depth(Some(2)).max_depth(Some(1)),
+            &["a/b", "a/foo"],
+        );
+    }
+
+    #[test]
+    fn max_filesize() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a/b"));
+        wfile_size(td.path().join("foo"), 0);
+        wfile_size(td.path().join("bar"), 400);
+        wfile_size(td.path().join("baz"), 600);
+        wfile_size(td.path().join("a/foo"), 600);
+        wfile_size(td.path().join("a/bar"), 500);
+        wfile_size(td.path().join("a/baz"), 200);
+
+        let mut builder = WalkBuilder::new(td.path());
+        assert_paths(
+            td.path(),
+            &builder,
+            &["a", "a/b", "foo", "bar", "baz", "a/foo", "a/bar", "a/baz"],
+        );
+        assert_paths(
+            td.path(),
+            builder.max_filesize(Some(0)),
+            &["a", "a/b", "foo"],
+        );
+        assert_paths(
+            td.path(),
+            builder.max_filesize(Some(500)),
+            &["a", "a/b", "foo", "bar", "a/bar", "a/baz"],
+        );
+        assert_paths(
+            td.path(),
+            builder.max_filesize(Some(50000)),
+            &["a", "a/b", "foo", "bar", "baz", "a/foo", "a/bar", "a/baz"],
+        );
+    }
+
+    #[cfg(unix)] // because symlinks on windows are weird
+    #[test]
+    fn symlinks() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a/b"));
+        symlink(td.path().join("a/b"), td.path().join("z"));
+        wfile(td.path().join("a/b/foo"), "");
+
+        let mut builder = WalkBuilder::new(td.path());
+        assert_paths(td.path(), &builder, &["a", "a/b", "a/b/foo", "z"]);
+        assert_paths(
+            td.path(),
+            &builder.follow_links(true),
+            &["a", "a/b", "a/b/foo", "z", "z/foo"],
+        );
+    }
+
+    #[cfg(unix)] // because symlinks on windows are weird
+    #[test]
+    fn first_path_not_symlink() {
+        let td = tmpdir();
+        mkdirp(td.path().join("foo"));
+
+        let dents = WalkBuilder::new(td.path().join("foo"))
+            .build()
+            .into_iter()
+            .collect::<Result<Vec<_>, _>>()
+            .unwrap();
+        assert_eq!(1, dents.len());
+        assert!(!dents[0].path_is_symlink());
+
+        let dents = walk_collect_entries_parallel(&WalkBuilder::new(
+            td.path().join("foo"),
+        ));
+        assert_eq!(1, dents.len());
+        assert!(!dents[0].path_is_symlink());
+    }
+
+    #[cfg(unix)] // because symlinks on windows are weird
+    #[test]
+    fn symlink_loop() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a/b"));
+        symlink(td.path().join("a"), td.path().join("a/b/c"));
+
+        let mut builder = WalkBuilder::new(td.path());
+        assert_paths(td.path(), &builder, &["a", "a/b", "a/b/c"]);
+        assert_paths(td.path(), &builder.follow_links(true), &["a", "a/b"]);
+    }
+
+    // It's a little tricky to test the 'same_file_system' option since
+    // we need an environment with more than one file system. We adopt a
+    // heuristic where /sys is typically a distinct volume on Linux and roll
+    // with that.
+    #[test]
+    #[cfg(target_os = "linux")]
+    fn same_file_system() {
+        use super::device_num;
+
+        // If for some reason /sys doesn't exist or isn't a directory, just
+        // skip this test.
+        if !Path::new("/sys").is_dir() {
+            return;
+        }
+
+        // If our test directory actually isn't a different volume from /sys,
+        // then this test is meaningless and we shouldn't run it.
+        let td = tmpdir();
+        if device_num(td.path()).unwrap() == device_num("/sys").unwrap() {
+            return;
+        }
+
+        mkdirp(td.path().join("same_file"));
+        symlink("/sys", td.path().join("same_file").join("alink"));
+
+        // Create a symlink to sys and enable following symlinks. If the
+        // same_file_system option doesn't work, then this probably will hit a
+        // permission error. Otherwise, it should just skip over the symlink
+        // completely.
+        let mut builder = WalkBuilder::new(td.path());
+        builder.follow_links(true).same_file_system(true);
+        assert_paths(td.path(), &builder, &["same_file", "same_file/alink"]);
+    }
+
+    #[cfg(target_os = "linux")]
+    #[test]
+    fn no_read_permissions() {
+        let dir_path = Path::new("/root");
+
+        // There's no /etc/sudoers.d, skip the test.
+        if !dir_path.is_dir() {
+            return;
+        }
+        // We're the root, so the test won't check what we want it to.
+        if fs::read_dir(&dir_path).is_ok() {
+            return;
+        }
+
+        // Check that we can't descend but get an entry for the parent dir.
+        let builder = WalkBuilder::new(&dir_path);
+        assert_paths(dir_path.parent().unwrap(), &builder, &["root"]);
+    }
+
+    #[test]
+    fn filter() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a/b/c"));
+        mkdirp(td.path().join("x/y"));
+        wfile(td.path().join("a/b/foo"), "");
+        wfile(td.path().join("x/y/foo"), "");
+
+        assert_paths(
+            td.path(),
+            &WalkBuilder::new(td.path()),
+            &["x", "x/y", "x/y/foo", "a", "a/b", "a/b/foo", "a/b/c"],
+        );
+
+        assert_paths(
+            td.path(),
+            &WalkBuilder::new(td.path())
+                .filter_entry(|entry| entry.file_name() != OsStr::new("a")),
+            &["x", "x/y", "x/y/foo"],
+        );
+    }
+
+    #[test]
+    fn empty() {
+        let td = tmpdir();
+        assert_paths(td.path(), &WalkBuilder::empty(), &[]);
+
+        let empty_paths: Vec<&OsStr> = Vec::new();
+        assert_paths(td.path(), &WalkBuilder::from_iter(empty_paths), &[]);
+    }
+
+    #[test]
+    fn from_iter() {
+        let td = tmpdir();
+        mkdirp(td.path().join("a/b/c"));
+        mkdirp(td.path().join("d/e/f"));
+        mkdirp(td.path().join("x/y"));
+        wfile(td.path().join("a/b/foo"), "");
+        wfile(td.path().join("d/e/f/foo"), "");
+        wfile(td.path().join("x/y/foo"), "");
+
+        let paths = vec![
+            td.path().join("a"),
+            td.path().join("d"),
+            td.path().join("x"),
+        ];
+
+        assert_paths(
+            td.path(),
+            &WalkBuilder::from_iter(paths),
+            &[
+                "x",
+                "x/y",
+                "x/y/foo",
+                "d",
+                "d/e",
+                "d/e/f",
+                "d/e/f/foo",
+                "a",
+                "a/b",
+                "a/b/foo",
+                "a/b/c",
+            ],
+        );
+    }
+
+    // This should always panic and never hang.
+    //
+    // Ref: https://github.com/BurntSushi/ripgrep/issues/3009
+    #[test]
+    #[should_panic]
+    fn panic_in_parallel() {
+        let td = tmpdir();
+        wfile(td.path().join("foo.txt"), "");
+
+        WalkBuilder::new(td.path())
+            .threads(40)
+            .build_parallel()
+            .run(|| Box::new(|_| panic!("oops!")));
+    }
+
+    // This should always panic and never hang. The first call to the visitor
+    // builder is used while processing the root paths. Previously, a panic on
+    // the third call occurred after the first worker had already been spawned,
+    // leaving it waiting indefinitely for workers that were never created.
+    #[test]
+    #[should_panic(expected = "builder panic")]
+    fn panic_in_parallel_builder() {
+        let td = tmpdir();
+        wfile(td.path().join("foo.txt"), "");
+
+        let mut builds = 0;
+        WalkBuilder::new(td.path()).threads(2).build_parallel().run(|| {
+            builds += 1;
+            if builds == 3 {
+                panic!("builder panic");
+            }
+            Box::new(|_| WalkState::Continue)
+        });
+    }
+}
diff --git a/crates/ignore/tests/gitignore_matched_path_or_any_parents_tests.gitignore b/crates/ignore/tests/gitignore_matched_path_or_any_parents_tests.gitignore
new file mode 100644
index 000000000..ac09e12f7
--- /dev/null
+++ b/crates/ignore/tests/gitignore_matched_path_or_any_parents_tests.gitignore
@@ -0,0 +1,216 @@
+# Based on https://github.com/behnam/gitignore-test/blob/master/.gitignore
+
+### file in root
+
+# MATCH /file_root_1
+file_root_00
+
+# NO_MATCH
+file_root_01/
+
+# NO_MATCH
+file_root_02/*
+
+# NO_MATCH
+file_root_03/**
+
+
+# MATCH /file_root_10
+/file_root_10
+
+# NO_MATCH
+/file_root_11/
+
+# NO_MATCH
+/file_root_12/*
+
+# NO_MATCH
+/file_root_13/**
+
+
+# NO_MATCH
+*/file_root_20
+
+# NO_MATCH
+*/file_root_21/
+
+# NO_MATCH
+*/file_root_22/*
+
+# NO_MATCH
+*/file_root_23/**
+
+
+# MATCH /file_root_30
+**/file_root_30
+
+# NO_MATCH
+**/file_root_31/
+
+# NO_MATCH
+**/file_root_32/*
+
+# NO_MATCH
+**/file_root_33/**
+
+
+### file in sub-dir
+
+# MATCH /parent_dir/file_deep_1
+file_deep_00
+
+# NO_MATCH
+file_deep_01/
+
+# NO_MATCH
+file_deep_02/*
+
+# NO_MATCH
+file_deep_03/**
+
+
+# NO_MATCH
+/file_deep_10
+
+# NO_MATCH
+/file_deep_11/
+
+# NO_MATCH
+/file_deep_12/*
+
+# NO_MATCH
+/file_deep_13/**
+
+
+# MATCH /parent_dir/file_deep_20
+*/file_deep_20
+
+# NO_MATCH
+*/file_deep_21/
+
+# NO_MATCH
+*/file_deep_22/*
+
+# NO_MATCH
+*/file_deep_23/**
+
+
+# MATCH /parent_dir/file_deep_30
+**/file_deep_30
+
+# NO_MATCH
+**/file_deep_31/
+
+# NO_MATCH
+**/file_deep_32/*
+
+# NO_MATCH
+**/file_deep_33/**
+
+
+### dir in root
+
+# MATCH /dir_root_00
+dir_root_00
+
+# MATCH /dir_root_01
+dir_root_01/
+
+# MATCH /dir_root_02
+dir_root_02/*
+
+# MATCH /dir_root_03
+dir_root_03/**
+
+
+# MATCH /dir_root_10
+/dir_root_10
+
+# MATCH /dir_root_11
+/dir_root_11/
+
+# MATCH /dir_root_12
+/dir_root_12/*
+
+# MATCH /dir_root_13
+/dir_root_13/**
+
+
+# NO_MATCH
+*/dir_root_20
+
+# NO_MATCH
+*/dir_root_21/
+
+# NO_MATCH
+*/dir_root_22/*
+
+# NO_MATCH
+*/dir_root_23/**
+
+
+# MATCH /dir_root_30
+**/dir_root_30
+
+# MATCH /dir_root_31
+**/dir_root_31/
+
+# MATCH /dir_root_32
+**/dir_root_32/*
+
+# MATCH /dir_root_33
+**/dir_root_33/**
+
+
+### dir in sub-dir
+
+# MATCH /parent_dir/dir_deep_00
+dir_deep_00
+
+# MATCH /parent_dir/dir_deep_01
+dir_deep_01/
+
+# NO_MATCH
+dir_deep_02/*
+
+# NO_MATCH
+dir_deep_03/**
+
+
+# NO_MATCH
+/dir_deep_10
+
+# NO_MATCH
+/dir_deep_11/
+
+# NO_MATCH
+/dir_deep_12/*
+
+# NO_MATCH
+/dir_deep_13/**
+
+
+# MATCH /parent_dir/dir_deep_20
+*/dir_deep_20
+
+# MATCH /parent_dir/dir_deep_21
+*/dir_deep_21/
+
+# MATCH /parent_dir/dir_deep_22
+*/dir_deep_22/*
+
+# MATCH /parent_dir/dir_deep_23
+*/dir_deep_23/**
+
+
+# MATCH /parent_dir/dir_deep_30
+**/dir_deep_30
+
+# MATCH /parent_dir/dir_deep_31
+**/dir_deep_31/
+
+# MATCH /parent_dir/dir_deep_32
+**/dir_deep_32/*
+
+# MATCH /parent_dir/dir_deep_33
+**/dir_deep_33/**
diff --git a/crates/ignore/tests/gitignore_matched_path_or_any_parents_tests.rs b/crates/ignore/tests/gitignore_matched_path_or_any_parents_tests.rs
new file mode 100644
index 000000000..ecb7b47e3
--- /dev/null
+++ b/crates/ignore/tests/gitignore_matched_path_or_any_parents_tests.rs
@@ -0,0 +1,318 @@
+use std::path::Path;
+
+use ignore::gitignore::{Gitignore, GitignoreBuilder};
+
+const IGNORE_FILE: &'static str =
+    "tests/gitignore_matched_path_or_any_parents_tests.gitignore";
+
+fn get_gitignore() -> Gitignore {
+    let mut builder = GitignoreBuilder::new("ROOT");
+    let error = builder.add(IGNORE_FILE);
+    assert!(error.is_none(), "failed to open gitignore file");
+    builder.build().unwrap()
+}
+
+#[test]
+#[should_panic(expected = "path is expected to be under the root")]
+fn test_path_should_be_under_root() {
+    let gitignore = get_gitignore();
+    let path = "/tmp/some_file";
+    gitignore.matched_path_or_any_parents(Path::new(path), false);
+    assert!(false);
+}
+
+#[test]
+fn test_files_in_root() {
+    let gitignore = get_gitignore();
+    let m = |path: &str| {
+        gitignore.matched_path_or_any_parents(Path::new(path), false)
+    };
+
+    // 0x
+    assert!(m("ROOT/file_root_00").is_ignore());
+    assert!(m("ROOT/file_root_01").is_none());
+    assert!(m("ROOT/file_root_02").is_none());
+    assert!(m("ROOT/file_root_03").is_none());
+
+    // 1x
+    assert!(m("ROOT/file_root_10").is_ignore());
+    assert!(m("ROOT/file_root_11").is_none());
+    assert!(m("ROOT/file_root_12").is_none());
+    assert!(m("ROOT/file_root_13").is_none());
+
+    // 2x
+    assert!(m("ROOT/file_root_20").is_none());
+    assert!(m("ROOT/file_root_21").is_none());
+    assert!(m("ROOT/file_root_22").is_none());
+    assert!(m("ROOT/file_root_23").is_none());
+
+    // 3x
+    assert!(m("ROOT/file_root_30").is_ignore());
+    assert!(m("ROOT/file_root_31").is_none());
+    assert!(m("ROOT/file_root_32").is_none());
+    assert!(m("ROOT/file_root_33").is_none());
+}
+
+#[test]
+fn test_files_in_deep() {
+    let gitignore = get_gitignore();
+    let m = |path: &str| {
+        gitignore.matched_path_or_any_parents(Path::new(path), false)
+    };
+
+    // 0x
+    assert!(m("ROOT/parent_dir/file_deep_00").is_ignore());
+    assert!(m("ROOT/parent_dir/file_deep_01").is_none());
+    assert!(m("ROOT/parent_dir/file_deep_02").is_none());
+    assert!(m("ROOT/parent_dir/file_deep_03").is_none());
+
+    // 1x
+    assert!(m("ROOT/parent_dir/file_deep_10").is_none());
+    assert!(m("ROOT/parent_dir/file_deep_11").is_none());
+    assert!(m("ROOT/parent_dir/file_deep_12").is_none());
+    assert!(m("ROOT/parent_dir/file_deep_13").is_none());
+
+    // 2x
+    assert!(m("ROOT/parent_dir/file_deep_20").is_ignore());
+    assert!(m("ROOT/parent_dir/file_deep_21").is_none());
+    assert!(m("ROOT/parent_dir/file_deep_22").is_none());
+    assert!(m("ROOT/parent_dir/file_deep_23").is_none());
+
+    // 3x
+    assert!(m("ROOT/parent_dir/file_deep_30").is_ignore());
+    assert!(m("ROOT/parent_dir/file_deep_31").is_none());
+    assert!(m("ROOT/parent_dir/file_deep_32").is_none());
+    assert!(m("ROOT/parent_dir/file_deep_33").is_none());
+}
+
+#[test]
+fn test_dirs_in_root() {
+    let gitignore = get_gitignore();
+    let m = |path: &str, is_dir: bool| {
+        gitignore.matched_path_or_any_parents(Path::new(path), is_dir)
+    };
+
+    // 00
+    assert!(m("ROOT/dir_root_00", true).is_ignore());
+    assert!(m("ROOT/dir_root_00/file", false).is_ignore());
+    assert!(m("ROOT/dir_root_00/child_dir", true).is_ignore());
+    assert!(m("ROOT/dir_root_00/child_dir/file", false).is_ignore());
+
+    // 01
+    assert!(m("ROOT/dir_root_01", true).is_ignore());
+    assert!(m("ROOT/dir_root_01/file", false).is_ignore());
+    assert!(m("ROOT/dir_root_01/child_dir", true).is_ignore());
+    assert!(m("ROOT/dir_root_01/child_dir/file", false).is_ignore());
+
+    // 02
+    assert!(m("ROOT/dir_root_02", true).is_none()); // dir itself doesn't match
+    assert!(m("ROOT/dir_root_02/file", false).is_ignore());
+    assert!(m("ROOT/dir_root_02/child_dir", true).is_ignore());
+    assert!(m("ROOT/dir_root_02/child_dir/file", false).is_ignore());
+
+    // 03
+    assert!(m("ROOT/dir_root_03", true).is_none()); // dir itself doesn't match
+    assert!(m("ROOT/dir_root_03/file", false).is_ignore());
+    assert!(m("ROOT/dir_root_03/child_dir", true).is_ignore());
+    assert!(m("ROOT/dir_root_03/child_dir/file", false).is_ignore());
+
+    // 10
+    assert!(m("ROOT/dir_root_10", true).is_ignore());
+    assert!(m("ROOT/dir_root_10/file", false).is_ignore());
+    assert!(m("ROOT/dir_root_10/child_dir", true).is_ignore());
+    assert!(m("ROOT/dir_root_10/child_dir/file", false).is_ignore());
+
+    // 11
+    assert!(m("ROOT/dir_root_11", true).is_ignore());
+    assert!(m("ROOT/dir_root_11/file", false).is_ignore());
+    assert!(m("ROOT/dir_root_11/child_dir", true).is_ignore());
+    assert!(m("ROOT/dir_root_11/child_dir/file", false).is_ignore());
+
+    // 12
+    assert!(m("ROOT/dir_root_12", true).is_none()); // dir itself doesn't match
+    assert!(m("ROOT/dir_root_12/file", false).is_ignore());
+    assert!(m("ROOT/dir_root_12/child_dir", true).is_ignore());
+    assert!(m("ROOT/dir_root_12/child_dir/file", false).is_ignore());
+
+    // 13
+    assert!(m("ROOT/dir_root_13", true).is_none());
+    assert!(m("ROOT/dir_root_13/file", false).is_ignore());
+    assert!(m("ROOT/dir_root_13/child_dir", true).is_ignore());
+    assert!(m("ROOT/dir_root_13/child_dir/file", false).is_ignore());
+
+    // 20
+    assert!(m("ROOT/dir_root_20", true).is_none());
+    assert!(m("ROOT/dir_root_20/file", false).is_none());
+    assert!(m("ROOT/dir_root_20/child_dir", true).is_none());
+    assert!(m("ROOT/dir_root_20/child_dir/file", false).is_none());
+
+    // 21
+    assert!(m("ROOT/dir_root_21", true).is_none());
+    assert!(m("ROOT/dir_root_21/file", false).is_none());
+    assert!(m("ROOT/dir_root_21/child_dir", true).is_none());
+    assert!(m("ROOT/dir_root_21/child_dir/file", false).is_none());
+
+    // 22
+    assert!(m("ROOT/dir_root_22", true).is_none());
+    assert!(m("ROOT/dir_root_22/file", false).is_none());
+    assert!(m("ROOT/dir_root_22/child_dir", true).is_none());
+    assert!(m("ROOT/dir_root_22/child_dir/file", false).is_none());
+
+    // 23
+    assert!(m("ROOT/dir_root_23", true).is_none());
+    assert!(m("ROOT/dir_root_23/file", false).is_none());
+    assert!(m("ROOT/dir_root_23/child_dir", true).is_none());
+    assert!(m("ROOT/dir_root_23/child_dir/file", false).is_none());
+
+    // 30
+    assert!(m("ROOT/dir_root_30", true).is_ignore());
+    assert!(m("ROOT/dir_root_30/file", false).is_ignore());
+    assert!(m("ROOT/dir_root_30/child_dir", true).is_ignore());
+    assert!(m("ROOT/dir_root_30/child_dir/file", false).is_ignore());
+
+    // 31
+    assert!(m("ROOT/dir_root_31", true).is_ignore());
+    assert!(m("ROOT/dir_root_31/file", false).is_ignore());
+    assert!(m("ROOT/dir_root_31/child_dir", true).is_ignore());
+    assert!(m("ROOT/dir_root_31/child_dir/file", false).is_ignore());
+
+    // 32
+    assert!(m("ROOT/dir_root_32", true).is_none()); // dir itself doesn't match
+    assert!(m("ROOT/dir_root_32/file", false).is_ignore());
+    assert!(m("ROOT/dir_root_32/child_dir", true).is_ignore());
+    assert!(m("ROOT/dir_root_32/child_dir/file", false).is_ignore());
+
+    // 33
+    assert!(m("ROOT/dir_root_33", true).is_none()); // dir itself doesn't match
+    assert!(m("ROOT/dir_root_33/file", false).is_ignore());
+    assert!(m("ROOT/dir_root_33/child_dir", true).is_ignore());
+    assert!(m("ROOT/dir_root_33/child_dir/file", false).is_ignore());
+}
+
+#[test]
+fn test_dirs_in_deep() {
+    let gitignore = get_gitignore();
+    let m = |path: &str, is_dir: bool| {
+        gitignore.matched_path_or_any_parents(Path::new(path), is_dir)
+    };
+
+    // 00
+    assert!(m("ROOT/parent_dir/dir_deep_00", true).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_00/file", false).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_00/child_dir", true).is_ignore());
+    assert!(
+        m("ROOT/parent_dir/dir_deep_00/child_dir/file", false).is_ignore()
+    );
+
+    // 01
+    assert!(m("ROOT/parent_dir/dir_deep_01", true).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_01/file", false).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_01/child_dir", true).is_ignore());
+    assert!(
+        m("ROOT/parent_dir/dir_deep_01/child_dir/file", false).is_ignore()
+    );
+
+    // 02
+    assert!(m("ROOT/parent_dir/dir_deep_02", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_02/file", false).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_02/child_dir", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_02/child_dir/file", false).is_none());
+
+    // 03
+    assert!(m("ROOT/parent_dir/dir_deep_03", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_03/file", false).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_03/child_dir", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_03/child_dir/file", false).is_none());
+
+    // 10
+    assert!(m("ROOT/parent_dir/dir_deep_10", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_10/file", false).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_10/child_dir", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_10/child_dir/file", false).is_none());
+
+    // 11
+    assert!(m("ROOT/parent_dir/dir_deep_11", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_11/file", false).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_11/child_dir", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_11/child_dir/file", false).is_none());
+
+    // 12
+    assert!(m("ROOT/parent_dir/dir_deep_12", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_12/file", false).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_12/child_dir", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_12/child_dir/file", false).is_none());
+
+    // 13
+    assert!(m("ROOT/parent_dir/dir_deep_13", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_13/file", false).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_13/child_dir", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_13/child_dir/file", false).is_none());
+
+    // 20
+    assert!(m("ROOT/parent_dir/dir_deep_20", true).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_20/file", false).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_20/child_dir", true).is_ignore());
+    assert!(
+        m("ROOT/parent_dir/dir_deep_20/child_dir/file", false).is_ignore()
+    );
+
+    // 21
+    assert!(m("ROOT/parent_dir/dir_deep_21", true).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_21/file", false).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_21/child_dir", true).is_ignore());
+    assert!(
+        m("ROOT/parent_dir/dir_deep_21/child_dir/file", false).is_ignore()
+    );
+
+    // 22
+    // dir itself doesn't match
+    assert!(m("ROOT/parent_dir/dir_deep_22", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_22/file", false).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_22/child_dir", true).is_ignore());
+    assert!(
+        m("ROOT/parent_dir/dir_deep_22/child_dir/file", false).is_ignore()
+    );
+
+    // 23
+    // dir itself doesn't match
+    assert!(m("ROOT/parent_dir/dir_deep_23", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_23/file", false).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_23/child_dir", true).is_ignore());
+    assert!(
+        m("ROOT/parent_dir/dir_deep_23/child_dir/file", false).is_ignore()
+    );
+
+    // 30
+    assert!(m("ROOT/parent_dir/dir_deep_30", true).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_30/file", false).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_30/child_dir", true).is_ignore());
+    assert!(
+        m("ROOT/parent_dir/dir_deep_30/child_dir/file", false).is_ignore()
+    );
+
+    // 31
+    assert!(m("ROOT/parent_dir/dir_deep_31", true).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_31/file", false).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_31/child_dir", true).is_ignore());
+    assert!(
+        m("ROOT/parent_dir/dir_deep_31/child_dir/file", false).is_ignore()
+    );
+
+    // 32
+    // dir itself doesn't match
+    assert!(m("ROOT/parent_dir/dir_deep_32", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_32/file", false).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_32/child_dir", true).is_ignore());
+    assert!(
+        m("ROOT/parent_dir/dir_deep_32/child_dir/file", false).is_ignore()
+    );
+
+    // 33
+    // dir itself doesn't match
+    assert!(m("ROOT/parent_dir/dir_deep_33", true).is_none());
+    assert!(m("ROOT/parent_dir/dir_deep_33/file", false).is_ignore());
+    assert!(m("ROOT/parent_dir/dir_deep_33/child_dir", true).is_ignore());
+    assert!(
+        m("ROOT/parent_dir/dir_deep_33/child_dir/file", false).is_ignore()
+    );
+}
diff --git a/crates/ignore/tests/gitignore_skip_bom.gitignore b/crates/ignore/tests/gitignore_skip_bom.gitignore
new file mode 100644
index 000000000..a78c13a9b
--- /dev/null
+++ b/crates/ignore/tests/gitignore_skip_bom.gitignore
@@ -0,0 +1,2 @@
+ignore/this/path
+# This file begins with a BOM (U+FEFF)
diff --git a/crates/ignore/tests/gitignore_skip_bom.rs b/crates/ignore/tests/gitignore_skip_bom.rs
new file mode 100644
index 000000000..14d533d63
--- /dev/null
+++ b/crates/ignore/tests/gitignore_skip_bom.rs
@@ -0,0 +1,17 @@
+use ignore::gitignore::GitignoreBuilder;
+
+const IGNORE_FILE: &'static str = "tests/gitignore_skip_bom.gitignore";
+
+/// Skip a Byte-Order Mark (BOM) at the beginning of the file, matching Git's
+/// behavior.
+///
+/// Ref: <https://github.com/BurntSushi/ripgrep/issues/2177>
+#[test]
+fn gitignore_skip_bom() {
+    let mut builder = GitignoreBuilder::new("ROOT");
+    let error = builder.add(IGNORE_FILE);
+    assert!(error.is_none(), "failed to open gitignore file");
+    let g = builder.build().unwrap();
+
+    assert!(g.matched("ignore/this/path", false).is_ignore());
+}
diff --git a/crates/node/.cargo/config.toml b/crates/node/.cargo/config.toml
index 6890aa910..5196ec610 100644
--- a/crates/node/.cargo/config.toml
+++ b/crates/node/.cargo/config.toml
@@ -4,4 +4,11 @@ linker = "aarch64-linux-gnu-gcc"
 linker = "aarch64-linux-musl-gcc"
 rustflags = ["-C", "target-feature=-crt-static"]
 [target.armv7-unknown-linux-gnueabihf]
-linker = "arm-linux-gnueabihf-gcc"
\ No newline at end of file
+linker = "arm-linux-gnueabihf-gcc"
+# Statically link Visual Studio redistributables on Windows builds
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-C", "target-feature=+crt-static"]
+[target.aarch64-pc-windows-msvc]
+rustflags = ["-C", "target-feature=+crt-static"]
+[target.'cfg(target_env = "gnu")']
+rustflags = ["-C", "link-args=-Wl,-z,nodelete"]
diff --git a/crates/node/.gitignore b/crates/node/.gitignore
index 2cb3cf980..c3f2ec696 100644
--- a/crates/node/.gitignore
+++ b/crates/node/.gitignore
@@ -121,7 +121,7 @@ dist
 .AppleDouble
 .LSOverride
 
-# Icon must end with two 
+# Icon must end with two
 Icon
 
 
@@ -194,8 +194,14 @@ Cargo.lock
 !.yarn/sdks
 !.yarn/versions
 
-*.node
-
 # Generated
+*.node
+*.wasm
 index.d.ts
 index.js
+browser.js
+tailwindcss-oxide.wasi-browser.js
+tailwindcss-oxide.wasi.cjs
+tailwindcss-oxide.wasi.d.cts
+wasi-worker-browser.mjs
+wasi-worker.mjs
diff --git a/crates/node/Cargo.toml b/crates/node/Cargo.toml
index 000907693..a3df7b813 100644
--- a/crates/node/Cargo.toml
+++ b/crates/node/Cargo.toml
@@ -8,10 +8,10 @@ crate-type = ["cdylib"]
 
 [dependencies]
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
-napi = { version = "2.16.11", default-features = false, features = ["napi4"] }
-napi-derive = "2.16.12"
+napi = { version = "3.11.0", default-features = false, features = ["napi4"] }
+napi-derive = "3.6.0"
 tailwindcss-oxide = { path = "../oxide" }
-rayon = "1.5.3"
+rayon = "1.12.0"
 
 [build-dependencies]
-napi-build = "2.0.1"
+napi-build = "2.3.2"
diff --git a/crates/node/npm/android-arm-eabi/package.json b/crates/node/npm/android-arm-eabi/package.json
index bf20aa465..d46ceb237 100644
--- a/crates/node/npm/android-arm-eabi/package.json
+++ b/crates/node/npm/android-arm-eabi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/oxide-android-arm-eabi",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tailwindlabs/tailwindcss.git",
@@ -22,6 +22,6 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   }
 }
diff --git a/crates/node/npm/android-arm64/package.json b/crates/node/npm/android-arm64/package.json
index 7fce0b250..e6e9d577d 100644
--- a/crates/node/npm/android-arm64/package.json
+++ b/crates/node/npm/android-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/oxide-android-arm64",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tailwindlabs/tailwindcss.git",
@@ -22,6 +22,6 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   }
 }
diff --git a/crates/node/npm/darwin-arm64/package.json b/crates/node/npm/darwin-arm64/package.json
index 38bd21a78..1cb737c2e 100644
--- a/crates/node/npm/darwin-arm64/package.json
+++ b/crates/node/npm/darwin-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/oxide-darwin-arm64",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tailwindlabs/tailwindcss.git",
@@ -22,6 +22,6 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   }
 }
diff --git a/crates/node/npm/darwin-x64/package.json b/crates/node/npm/darwin-x64/package.json
index f8e1b7d8a..ffd75e54b 100644
--- a/crates/node/npm/darwin-x64/package.json
+++ b/crates/node/npm/darwin-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/oxide-darwin-x64",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tailwindlabs/tailwindcss.git",
@@ -22,6 +22,6 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   }
 }
diff --git a/crates/node/npm/freebsd-x64/package.json b/crates/node/npm/freebsd-x64/package.json
index d15fd2613..e248f39d1 100644
--- a/crates/node/npm/freebsd-x64/package.json
+++ b/crates/node/npm/freebsd-x64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/oxide-freebsd-x64",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tailwindlabs/tailwindcss.git",
@@ -22,6 +22,6 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   }
 }
diff --git a/crates/node/npm/linux-arm-gnueabihf/package.json b/crates/node/npm/linux-arm-gnueabihf/package.json
index 098395af6..50d2aef73 100644
--- a/crates/node/npm/linux-arm-gnueabihf/package.json
+++ b/crates/node/npm/linux-arm-gnueabihf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/oxide-linux-arm-gnueabihf",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tailwindlabs/tailwindcss.git",
@@ -22,6 +22,6 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   }
 }
diff --git a/crates/node/npm/linux-arm64-gnu/package.json b/crates/node/npm/linux-arm64-gnu/package.json
index 2d03452b6..5875213f8 100644
--- a/crates/node/npm/linux-arm64-gnu/package.json
+++ b/crates/node/npm/linux-arm64-gnu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/oxide-linux-arm64-gnu",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tailwindlabs/tailwindcss.git",
@@ -22,7 +22,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   },
   "libc": [
     "glibc"
diff --git a/crates/node/npm/linux-arm64-musl/package.json b/crates/node/npm/linux-arm64-musl/package.json
index cf84c79af..9da37f3fd 100644
--- a/crates/node/npm/linux-arm64-musl/package.json
+++ b/crates/node/npm/linux-arm64-musl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/oxide-linux-arm64-musl",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tailwindlabs/tailwindcss.git",
@@ -22,7 +22,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   },
   "libc": [
     "musl"
diff --git a/crates/node/npm/linux-x64-gnu/package.json b/crates/node/npm/linux-x64-gnu/package.json
index 621c0d9a4..d409743fa 100644
--- a/crates/node/npm/linux-x64-gnu/package.json
+++ b/crates/node/npm/linux-x64-gnu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/oxide-linux-x64-gnu",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tailwindlabs/tailwindcss.git",
@@ -22,7 +22,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   },
   "libc": [
     "glibc"
diff --git a/crates/node/npm/linux-x64-musl/package.json b/crates/node/npm/linux-x64-musl/package.json
index 615a50564..5b404fd70 100644
--- a/crates/node/npm/linux-x64-musl/package.json
+++ b/crates/node/npm/linux-x64-musl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/oxide-linux-x64-musl",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tailwindlabs/tailwindcss.git",
@@ -22,7 +22,7 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   },
   "libc": [
     "musl"
diff --git a/crates/node/npm/wasm32-wasi/.gitignore b/crates/node/npm/wasm32-wasi/.gitignore
new file mode 100644
index 000000000..c2658d7d1
--- /dev/null
+++ b/crates/node/npm/wasm32-wasi/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/crates/node/npm/wasm32-wasi/README.md b/crates/node/npm/wasm32-wasi/README.md
new file mode 100644
index 000000000..2a5368149
--- /dev/null
+++ b/crates/node/npm/wasm32-wasi/README.md
@@ -0,0 +1,3 @@
+# `@tailwindcss/oxide-wasm32-wasi`
+
+This is the **wasm32-wasip1-threads** build of `@tailwindcss/oxide`
diff --git a/crates/node/npm/wasm32-wasi/package.json b/crates/node/npm/wasm32-wasi/package.json
new file mode 100644
index 000000000..cee9fb05a
--- /dev/null
+++ b/crates/node/npm/wasm32-wasi/package.json
@@ -0,0 +1,42 @@
+{
+  "name": "@tailwindcss/oxide-wasm32-wasi",
+  "version": "4.3.3",
+  "main": "tailwindcss-oxide.wasi.cjs",
+  "files": [
+    "tailwindcss-oxide.wasm32-wasi.wasm",
+    "tailwindcss-oxide.wasi.cjs",
+    "tailwindcss-oxide.wasi-browser.js",
+    "wasi-worker.mjs",
+    "wasi-worker-browser.mjs"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": "^20.19.0 || ^22.13.0 || >=23.5.0"
+  },
+  "publishConfig": {
+    "provenance": true,
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tailwindlabs/tailwindcss.git",
+    "directory": "crates/node"
+  },
+  "browser": "tailwindcss-oxide.wasi-browser.js",
+  "dependencies": {
+    "@napi-rs/wasm-runtime": "^1.2.2",
+    "@emnapi/core": "^1.11.3",
+    "@emnapi/runtime": "^1.11.3",
+    "@tybys/wasm-util": "^0.10.3",
+    "@emnapi/wasi-threads": "^1.2.3",
+    "tslib": "^2.8.1"
+  },
+  "bundledDependencies": [
+    "@napi-rs/wasm-runtime",
+    "@emnapi/core",
+    "@emnapi/runtime",
+    "@tybys/wasm-util",
+    "@emnapi/wasi-threads",
+    "tslib"
+  ]
+}
diff --git a/crates/node/npm/win32-arm64-msvc/package.json b/crates/node/npm/win32-arm64-msvc/package.json
index af23f83d9..991727a32 100644
--- a/crates/node/npm/win32-arm64-msvc/package.json
+++ b/crates/node/npm/win32-arm64-msvc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/oxide-win32-arm64-msvc",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tailwindlabs/tailwindcss.git",
@@ -22,6 +22,6 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   }
 }
diff --git a/crates/node/npm/win32-x64-msvc/package.json b/crates/node/npm/win32-x64-msvc/package.json
index ed8967604..82d75c300 100644
--- a/crates/node/npm/win32-x64-msvc/package.json
+++ b/crates/node/npm/win32-x64-msvc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/oxide-win32-x64-msvc",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tailwindlabs/tailwindcss.git",
@@ -22,6 +22,6 @@
   },
   "license": "MIT",
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   }
 }
diff --git a/crates/node/package.json b/crates/node/package.json
index 4b5f5e197..be09427fb 100644
--- a/crates/node/package.json
+++ b/crates/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/oxide",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tailwindlabs/tailwindcss.git",
@@ -9,28 +9,38 @@
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {
-    "name": "tailwindcss-oxide",
-    "triples": {
-      "additional": [
-        "armv7-linux-androideabi",
-        "aarch64-linux-android",
-        "aarch64-apple-darwin",
-        "aarch64-unknown-linux-gnu",
-        "aarch64-unknown-linux-musl",
-        "armv7-unknown-linux-gnueabihf",
-        "x86_64-unknown-linux-musl",
-        "x86_64-unknown-freebsd",
-        "i686-pc-windows-msvc",
-        "aarch64-pc-windows-msvc"
-      ]
+    "binaryName": "tailwindcss-oxide",
+    "packageName": "@tailwindcss/oxide",
+    "targets": [
+      "armv7-linux-androideabi",
+      "aarch64-linux-android",
+      "aarch64-apple-darwin",
+      "aarch64-unknown-linux-gnu",
+      "aarch64-unknown-linux-musl",
+      "armv7-unknown-linux-gnueabihf",
+      "x86_64-unknown-linux-musl",
+      "x86_64-unknown-freebsd",
+      "i686-pc-windows-msvc",
+      "aarch64-pc-windows-msvc",
+      "wasm32-wasip1-threads"
+    ],
+    "wasm": {
+      "initialMemory": 16384,
+      "browser": {
+        "fs": true
+      }
     }
   },
   "license": "MIT",
   "devDependencies": {
-    "@napi-rs/cli": "^2.18.4"
+    "@emnapi/core": "1.11.3",
+    "@emnapi/runtime": "1.11.3",
+    "@napi-rs/cli": "3.7.4",
+    "@napi-rs/wasm-runtime": "^1.2.2",
+    "emnapi": "1.11.3"
   },
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   },
   "files": [
     "index.js",
@@ -41,10 +51,13 @@
     "access": "public"
   },
   "scripts": {
-    "artifacts": "napi artifacts",
-    "build": "napi build --platform --release --no-const-enum",
+    "build": "pnpm run build:platform && pnpm run build:wasm",
+    "build:platform": "napi build --platform --release",
+    "postbuild:platform": "node ./scripts/move-artifacts.mjs",
+    "build:wasm": "napi build --release --target wasm32-wasip1-threads",
+    "postbuild:wasm": "node ./scripts/move-artifacts.mjs",
     "dev": "cargo watch --quiet --shell 'npm run build'",
-    "build:debug": "napi build --platform --no-const-enum",
+    "build:debug": "napi build --platform",
     "version": "napi version"
   },
   "optionalDependencies": {
@@ -57,7 +70,8 @@
     "@tailwindcss/oxide-linux-arm64-musl": "workspace:*",
     "@tailwindcss/oxide-linux-x64-gnu": "workspace:*",
     "@tailwindcss/oxide-linux-x64-musl": "workspace:*",
-    "@tailwindcss/oxide-win32-x64-msvc": "workspace:*",
-    "@tailwindcss/oxide-win32-arm64-msvc": "workspace:*"
+    "@tailwindcss/oxide-wasm32-wasi": "workspace:*",
+    "@tailwindcss/oxide-win32-arm64-msvc": "workspace:*",
+    "@tailwindcss/oxide-win32-x64-msvc": "workspace:*"
   }
 }
diff --git a/crates/node/scripts/move-artifacts.mjs b/crates/node/scripts/move-artifacts.mjs
new file mode 100644
index 000000000..faf4728ef
--- /dev/null
+++ b/crates/node/scripts/move-artifacts.mjs
@@ -0,0 +1,37 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import url from 'node:url'
+
+const __dirname = path.dirname(url.fileURLToPath(import.meta.url))
+let root = path.resolve(__dirname, '..')
+const tailwindcssOxideRoot = path.join(root)
+
+// Move napi artifacts into sub packages
+for (let file of await fs.readdir(tailwindcssOxideRoot)) {
+  if (file.startsWith('tailwindcss-oxide.') && file.endsWith('.node')) {
+    let target = file.split('.')[1]
+    await fs.cp(
+      path.join(tailwindcssOxideRoot, file),
+      path.join(tailwindcssOxideRoot, 'npm', target, file),
+    )
+    console.log(`Moved ${file} to npm/${target}`)
+  }
+}
+
+// Move napi wasm artifacts into sub package
+let wasmArtifacts = {
+  'tailwindcss-oxide.debug.wasm': 'tailwindcss-oxide.wasm32-wasi.debug.wasm',
+  'tailwindcss-oxide.wasm': 'tailwindcss-oxide.wasm32-wasi.wasm',
+  'tailwindcss-oxide.wasi-browser.js': 'tailwindcss-oxide.wasi-browser.js',
+  'tailwindcss-oxide.wasi.cjs': 'tailwindcss-oxide.wasi.cjs',
+  'wasi-worker-browser.mjs': 'wasi-worker-browser.mjs',
+  'wasi-worker.mjs': 'wasi-worker.mjs',
+}
+for (let file of await fs.readdir(tailwindcssOxideRoot)) {
+  if (!wasmArtifacts[file]) continue
+  await fs.cp(
+    path.join(tailwindcssOxideRoot, file),
+    path.join(tailwindcssOxideRoot, 'npm', 'wasm32-wasi', wasmArtifacts[file]),
+  )
+  console.log(`Moved ${file} to npm/wasm32-wasi`)
+}
diff --git a/crates/node/src/lib.rs b/crates/node/src/lib.rs
index 2eff57be3..fb32a818c 100644
--- a/crates/node/src/lib.rs
+++ b/crates/node/src/lib.rs
@@ -28,12 +28,30 @@ pub struct GlobEntry {
   pub pattern: String,
 }
 
+#[derive(Debug, Clone)]
+#[napi(object)]
+pub struct SourceEntry {
+  /// Base path of the glob
+  pub base: String,
+
+  /// Glob pattern
+  pub pattern: String,
+
+  /// Negated flag
+  pub negated: bool,
+}
+
 impl From<ChangedContent> for tailwindcss_oxide::ChangedContent {
   fn from(changed_content: ChangedContent) -> Self {
-    Self {
-      file: changed_content.file.map(Into::into),
-      content: changed_content.content,
+    if let Some(file) = changed_content.file {
+      return tailwindcss_oxide::ChangedContent::File(file.into(), changed_content.extension);
     }
+
+    if let Some(contents) = changed_content.content {
+      return tailwindcss_oxide::ChangedContent::Content(contents, changed_content.extension);
+    }
+
+    unreachable!()
   }
 }
 
@@ -55,13 +73,23 @@ impl From<tailwindcss_oxide::GlobEntry> for GlobEntry {
   }
 }
 
+impl From<SourceEntry> for tailwindcss_oxide::PublicSourceEntry {
+  fn from(source: SourceEntry) -> Self {
+    Self {
+      base: source.base,
+      pattern: source.pattern,
+      negated: source.negated,
+    }
+  }
+}
+
 // ---
 
 #[derive(Debug, Clone)]
 #[napi(object)]
 pub struct ScannerOptions {
   /// Glob sources
-  pub sources: Option<Vec<GlobEntry>>,
+  pub sources: Option<Vec<SourceEntry>>,
 }
 
 #[derive(Debug, Clone)]
@@ -85,11 +113,10 @@ impl Scanner {
   #[napi(constructor)]
   pub fn new(opts: ScannerOptions) -> Self {
     Self {
-      scanner: tailwindcss_oxide::Scanner::new(
-        opts
-          .sources
-          .map(|x| x.into_iter().map(Into::into).collect()),
-      ),
+      scanner: tailwindcss_oxide::Scanner::new(match opts.sources {
+        Some(sources) => sources.into_iter().map(Into::into).collect(),
+        None => vec![],
+      }),
     }
   }
 
@@ -138,6 +165,11 @@ impl Scanner {
     self.scanner.get_files()
   }
 
+  #[napi(getter)]
+  pub fn scanned_files(&self) -> Vec<String> {
+    self.scanner.get_scanned_files()
+  }
+
   #[napi(getter)]
   pub fn globs(&mut self) -> Vec<GlobEntry> {
     self
@@ -147,4 +179,14 @@ impl Scanner {
       .map(Into::into)
       .collect()
   }
+
+  #[napi(getter)]
+  pub fn normalized_sources(&mut self) -> Vec<GlobEntry> {
+    self
+      .scanner
+      .get_normalized_sources()
+      .into_iter()
+      .map(Into::into)
+      .collect()
+  }
 }
diff --git a/crates/oxide/Cargo.toml b/crates/oxide/Cargo.toml
index 287e0cd61..f8a5f6137 100644
--- a/crates/oxide/Cargo.toml
+++ b/crates/oxide/Cargo.toml
@@ -4,19 +4,23 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bstr = "1.10.0"
+bstr = "1.11.3"
 globwalk = "0.9.1"
 log = "0.4.22"
 rayon = "1.10.0"
-fxhash = { package = "rustc-hash", version = "2.0.0" }
-crossbeam = "0.8.4"
+fxhash = { package = "rustc-hash", version = "2.1.1" }
 tracing = { version = "0.1.40", features = [] }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 walkdir = "2.5.0"
-ignore = "0.4.23"
 dunce = "1.0.5"
 bexpand = "1.2.0"
-glob-match = "0.2.1"
+fast-glob = "0.4.3"
+classification-macros = { path = "../classification-macros" }
+ignore = { path = "../ignore" }
+regex = "1.11.1"
 
 [dev-dependencies]
+insta = "1.48.0"
 tempfile = "3.13.0"
+pretty_assertions = "1.4.1"
+unicode-width = "0.2.0"
diff --git a/crates/oxide/src/cursor.rs b/crates/oxide/src/cursor.rs
index 0c422c6ff..71cdccdf6 100644
--- a/crates/oxide/src/cursor.rs
+++ b/crates/oxide/src/cursor.rs
@@ -1,82 +1,80 @@
 use std::{ascii::escape_default, fmt::Display};
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub struct Cursor<'a> {
     // The input we're scanning
     pub input: &'a [u8],
 
     // The location of the cursor in the input
     pub pos: usize,
-
-    /// Is the cursor at the start of the input
-    pub at_start: bool,
-
-    /// Is the cursor at the end of the input
-    pub at_end: bool,
-
-    /// The previously consumed character
-    /// If `at_start` is true, this will be NUL
-    pub prev: u8,
-
-    /// The current character
-    pub curr: u8,
-
-    /// The upcoming character (if any)
-    /// If `at_end` is true, this will be NUL
-    pub next: u8,
 }
 
 impl<'a> Cursor<'a> {
+    #[inline(always)]
     pub fn new(input: &'a [u8]) -> Self {
-        let mut cursor = Self {
-            input,
-            pos: 0,
-            at_start: true,
-            at_end: false,
-            prev: 0x00,
-            curr: 0x00,
-            next: 0x00,
-        };
-        cursor.move_to(0);
-        cursor
+        Self { input, pos: 0 }
     }
 
-    pub fn rewind_by(&mut self, amount: usize) {
-        self.move_to(self.pos.saturating_sub(amount));
+    /// The current byte at `pos`, or 0x00 if past the end.
+    #[inline(always)]
+    pub fn curr(&self) -> u8 {
+        if self.pos < self.input.len() {
+            unsafe { *self.input.get_unchecked(self.pos) }
+        } else {
+            0x00
+        }
+    }
+
+    /// The next byte at `pos + 1`, or 0x00 if past the end.
+    #[inline(always)]
+    pub fn next(&self) -> u8 {
+        let next_pos = self.pos + 1;
+        if next_pos < self.input.len() {
+            unsafe { *self.input.get_unchecked(next_pos) }
+        } else {
+            0x00
+        }
+    }
+
+    /// The previous byte at `pos - 1`, or 0x00 if at the start.
+    #[inline(always)]
+    pub fn prev(&self) -> u8 {
+        if self.pos > 0 {
+            unsafe { *self.input.get_unchecked(self.pos - 1) }
+        } else {
+            0x00
+        }
     }
 
     pub fn advance_by(&mut self, amount: usize) {
         self.move_to(self.pos.saturating_add(amount));
     }
 
+    #[inline(always)]
+    pub fn advance(&mut self) {
+        self.pos += 1;
+    }
+
+    #[inline(always)]
+    pub fn advance_twice(&mut self) {
+        self.pos += 2;
+    }
+
     pub fn move_to(&mut self, pos: usize) {
-        let len = self.input.len();
-        let pos = pos.clamp(0, len);
-
-        self.pos = pos;
-        self.at_start = pos == 0;
-        self.at_end = pos + 1 >= len;
-
-        self.prev = if pos > 0 { self.input[pos - 1] } else { 0x00 };
-        self.curr = if pos < len { self.input[pos] } else { 0x00 };
-        self.next = if pos + 1 < len {
-            self.input[pos + 1]
-        } else {
-            0x00
-        };
+        self.pos = pos.min(self.input.len());
     }
 }
 
-impl<'a> Display for Cursor<'a> {
+impl Display for Cursor<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let len = self.input.len().to_string();
 
         let pos = format!("{: >len_count$}", self.pos, len_count = len.len());
         write!(f, "{}/{} ", pos, len)?;
 
-        if self.at_start {
+        if self.pos == 0 {
             write!(f, "S ")?;
-        } else if self.at_end {
+        } else if self.pos + 1 >= self.input.len() {
             write!(f, "E ")?;
         } else {
             write!(f, "M ")?;
@@ -93,9 +91,9 @@ impl<'a> Display for Cursor<'a> {
         write!(
             f,
             "[{} {} {}]",
-            to_str(self.prev),
-            to_str(self.curr),
-            to_str(self.next)
+            to_str(self.prev()),
+            to_str(self.curr()),
+            to_str(self.next())
         )
     }
 }
@@ -103,57 +101,34 @@ impl<'a> Display for Cursor<'a> {
 #[cfg(test)]
 mod test {
     use super::*;
+    use pretty_assertions::assert_eq;
 
     #[test]
     fn test_cursor() {
         let mut cursor = Cursor::new(b"hello world");
         assert_eq!(cursor.pos, 0);
-        assert!(cursor.at_start);
-        assert!(!cursor.at_end);
-        assert_eq!(cursor.prev, 0x00);
-        assert_eq!(cursor.curr, b'h');
-        assert_eq!(cursor.next, b'e');
+        assert_eq!(cursor.prev(), 0x00);
+        assert_eq!(cursor.curr(), b'h');
+        assert_eq!(cursor.next(), b'e');
 
         cursor.advance_by(1);
         assert_eq!(cursor.pos, 1);
-        assert!(!cursor.at_start);
-        assert!(!cursor.at_end);
-        assert_eq!(cursor.prev, b'h');
-        assert_eq!(cursor.curr, b'e');
-        assert_eq!(cursor.next, b'l');
+        assert_eq!(cursor.prev(), b'h');
+        assert_eq!(cursor.curr(), b'e');
+        assert_eq!(cursor.next(), b'l');
 
         // Advancing too far should stop at the end
         cursor.advance_by(10);
         assert_eq!(cursor.pos, 11);
-        assert!(!cursor.at_start);
-        assert!(cursor.at_end);
-        assert_eq!(cursor.prev, b'd');
-        assert_eq!(cursor.curr, 0x00);
-        assert_eq!(cursor.next, 0x00);
+        assert_eq!(cursor.prev(), b'd');
+        assert_eq!(cursor.curr(), 0x00);
+        assert_eq!(cursor.next(), 0x00);
 
         // Can't advance past the end
         cursor.advance_by(1);
         assert_eq!(cursor.pos, 11);
-        assert!(!cursor.at_start);
-        assert!(cursor.at_end);
-        assert_eq!(cursor.prev, b'd');
-        assert_eq!(cursor.curr, 0x00);
-        assert_eq!(cursor.next, 0x00);
-
-        cursor.rewind_by(1);
-        assert_eq!(cursor.pos, 10);
-        assert!(!cursor.at_start);
-        assert!(cursor.at_end);
-        assert_eq!(cursor.prev, b'l');
-        assert_eq!(cursor.curr, b'd');
-        assert_eq!(cursor.next, 0x00);
-
-        cursor.rewind_by(10);
-        assert_eq!(cursor.pos, 0);
-        assert!(cursor.at_start);
-        assert!(!cursor.at_end);
-        assert_eq!(cursor.prev, 0x00);
-        assert_eq!(cursor.curr, b'h');
-        assert_eq!(cursor.next, b'e');
+        assert_eq!(cursor.prev(), b'd');
+        assert_eq!(cursor.curr(), 0x00);
+        assert_eq!(cursor.next(), 0x00);
     }
 }
diff --git a/crates/oxide/src/extractor/arbitrary_property_machine.rs b/crates/oxide/src/extractor/arbitrary_property_machine.rs
new file mode 100644
index 000000000..a43253339
--- /dev/null
+++ b/crates/oxide/src/extractor/arbitrary_property_machine.rs
@@ -0,0 +1,457 @@
+use crate::cursor;
+use crate::extractor::bracket_stack::BracketStack;
+use crate::extractor::machine::{Machine, MachineState};
+use crate::extractor::string_machine::StringMachine;
+use crate::extractor::CssVariableMachine;
+use classification_macros::ClassifyBytes;
+use std::marker::PhantomData;
+
+#[derive(Debug, Default)]
+pub struct IdleState;
+
+/// Parsing the property, e.g.:
+///
+/// ```text
+/// [color:red]
+///  ^^^^^
+///
+/// [--my-color:red]
+///  ^^^^^^^^^^
+/// ```
+#[derive(Debug, Default)]
+pub struct ParsingPropertyState;
+
+/// Parsing the value, e.g.:
+///
+/// ```text
+/// [color:red]
+///        ^^^
+/// ```
+#[derive(Debug, Default)]
+pub struct ParsingValueState;
+
+/// Extracts arbitrary properties from the input, including the brackets.
+///
+/// E.g.:
+///
+/// ```text
+/// [color:red]
+/// ^^^^^^^^^^^
+///
+/// [--my-color:red]
+/// ^^^^^^^^^^^^^^^^
+/// ```
+#[derive(Debug, Default)]
+pub struct ArbitraryPropertyMachine<State = IdleState> {
+    /// Start position of the arbitrary value
+    start_pos: usize,
+
+    /// Track brackets to ensure they are balanced
+    bracket_stack: BracketStack,
+
+    css_variable_machine: CssVariableMachine,
+    string_machine: StringMachine,
+
+    _state: PhantomData<State>,
+}
+
+impl<State> ArbitraryPropertyMachine<State> {
+    #[inline(always)]
+    fn transition<NextState>(&self) -> ArbitraryPropertyMachine<NextState> {
+        ArbitraryPropertyMachine {
+            start_pos: self.start_pos,
+            bracket_stack: Default::default(),
+            css_variable_machine: Default::default(),
+            string_machine: Default::default(),
+            _state: PhantomData,
+        }
+    }
+}
+
+impl Machine for ArbitraryPropertyMachine<IdleState> {
+    #[inline(always)]
+    fn reset(&mut self) {}
+
+    #[inline]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match cursor.curr().into() {
+            // Start of an arbitrary property
+            Class::OpenBracket => {
+                self.start_pos = cursor.pos;
+                cursor.advance();
+                self.transition::<ParsingPropertyState>().next(cursor)
+            }
+
+            // Anything else is not a valid start of an arbitrary value
+            _ => MachineState::Idle,
+        }
+    }
+}
+
+impl Machine for ArbitraryPropertyMachine<ParsingPropertyState> {
+    #[inline(always)]
+    fn reset(&mut self) {}
+
+    #[inline]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        let len = cursor.input.len();
+
+        while cursor.pos < len {
+            match cursor.curr().into() {
+                Class::Dash => match cursor.next().into() {
+                    // Start of a CSS variable
+                    //
+                    // E.g.: `[--my-color:red]`
+                    //         ^^
+                    Class::Dash => return self.parse_property_variable(cursor),
+
+                    // Dashes are allowed in the property name
+                    //
+                    // E.g.: `[background-color:red]`
+                    //                   ^
+                    _ => cursor.advance(),
+                },
+
+                // Alpha characters are allowed in the property name
+                //
+                // E.g.: `[color:red]`
+                //         ^^^^^
+                Class::AlphaLower => cursor.advance(),
+
+                // End of the property name, but there must be at least a single character
+                Class::Colon if cursor.pos > self.start_pos + 1 => {
+                    cursor.advance();
+                    return self.transition::<ParsingValueState>().next(cursor);
+                }
+
+                // Anything else is not a valid property character
+                _ => return self.restart(),
+            }
+        }
+
+        self.restart()
+    }
+}
+
+impl ArbitraryPropertyMachine<ParsingPropertyState> {
+    fn parse_property_variable(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match self.css_variable_machine.next(cursor) {
+            MachineState::Idle => self.restart(),
+            MachineState::Done(_) => match cursor.next().into() {
+                // End of the CSS variable, must be followed by a `:`
+                //
+                // E.g.: `[--my-color:red]`
+                //                   ^
+                Class::Colon => {
+                    cursor.advance_twice();
+                    self.transition::<ParsingValueState>().next(cursor)
+                }
+
+                // Invalid arbitrary property
+                _ => self.restart(),
+            },
+        }
+    }
+}
+
+impl Machine for ArbitraryPropertyMachine<ParsingValueState> {
+    #[inline(always)]
+    fn reset(&mut self) {
+        self.bracket_stack.reset();
+    }
+
+    #[inline]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        let len = cursor.input.len();
+        let start_of_value_pos = cursor.pos;
+        while cursor.pos < len {
+            match cursor.curr().into() {
+                Class::Escape => match cursor.next().into() {
+                    // An escaped whitespace character is not allowed
+                    //
+                    // E.g.: `[color:var(--my-\ color)]`
+                    //                         ^
+                    Class::Whitespace => return self.restart(),
+
+                    // An escaped character, skip the next character, resume after
+                    //
+                    // E.g.: `[color:var(--my-\#color)]`
+                    //                        ^
+                    _ => cursor.advance_twice(),
+                },
+
+                Class::OpenParen | Class::OpenBracket | Class::OpenCurly => {
+                    if !self.bracket_stack.push(cursor.curr()) {
+                        return self.restart();
+                    }
+                    cursor.advance();
+                }
+
+                Class::CloseParen | Class::CloseBracket | Class::CloseCurly
+                    if !self.bracket_stack.is_empty() =>
+                {
+                    if !self.bracket_stack.pop(cursor.curr()) {
+                        return self.restart();
+                    }
+                    cursor.advance();
+                }
+
+                // End of an arbitrary value
+                //
+                // 1. All brackets must be balanced
+                // 2. There must be at least a single character inside the brackets
+                Class::CloseBracket
+                    if self.start_pos + 1 != cursor.pos && self.bracket_stack.is_empty() =>
+                {
+                    return self.done(self.start_pos, cursor)
+                }
+
+                // Start of a string
+                Class::Quote => return self.parse_string(cursor),
+
+                // Another `:` inside of an arbitrary property is only valid inside of a string or
+                // inside of brackets. Everywhere else, it's invalid.
+                //
+                // E.g.: `[color:red:blue]`
+                //                  ^ Not valid
+                // E.g.: `[background:url(https://example.com)]`
+                //                             ^ Valid
+                // E.g.: `[content:'a:b:c:']`
+                //                   ^ ^ ^ Valid
+                Class::Colon if self.bracket_stack.is_empty() => return self.restart(),
+
+                // Any kind of whitespace is not allowed
+                Class::Whitespace => return self.restart(),
+
+                // URLs are not allowed
+                Class::Slash if start_of_value_pos == cursor.pos => return self.restart(),
+
+                // String interpolation-like syntax is not allowed. E.g.: `[${x}]`
+                Class::Dollar if matches!(cursor.next().into(), Class::OpenCurly) => {
+                    return self.restart()
+                }
+
+                // An `!` at the top-level is invalid. We don't allow things to end with
+                // `!important` either as we have dedicated syntax for this.
+                Class::Exclamation if self.bracket_stack.is_empty() => {
+                    return self.restart();
+                }
+
+                // Everything else is valid
+                _ => cursor.advance(),
+            };
+        }
+
+        self.restart()
+    }
+}
+
+impl ArbitraryPropertyMachine<ParsingValueState> {
+    fn parse_string(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match self.string_machine.next(cursor) {
+            MachineState::Idle => self.restart(),
+            MachineState::Done(_) => {
+                cursor.advance();
+                self.next(cursor)
+            }
+        }
+    }
+}
+
+#[derive(Clone, Copy, ClassifyBytes)]
+enum Class {
+    #[bytes(b'(')]
+    OpenParen,
+
+    #[bytes(b'[')]
+    OpenBracket,
+
+    #[bytes(b'{')]
+    OpenCurly,
+
+    #[bytes(b')')]
+    CloseParen,
+
+    #[bytes(b']')]
+    CloseBracket,
+
+    #[bytes(b'}')]
+    CloseCurly,
+
+    #[bytes(b'\\')]
+    Escape,
+
+    #[bytes(b'"', b'\'', b'`')]
+    Quote,
+
+    #[bytes(b'-')]
+    Dash,
+
+    #[bytes(b'$')]
+    Dollar,
+
+    #[bytes_range(b'a'..=b'z')]
+    AlphaLower,
+
+    #[bytes(b':')]
+    Colon,
+
+    #[bytes(b'/')]
+    Slash,
+
+    #[bytes(b'!')]
+    Exclamation,
+
+    #[bytes(b' ', b'\t', b'\n', b'\r', b'\x0C')]
+    Whitespace,
+
+    #[bytes(b'\0')]
+    End,
+
+    #[fallback]
+    Other,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{ArbitraryPropertyMachine, IdleState};
+    use crate::extractor::machine::Machine;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    #[ignore]
+    fn test_arbitrary_property_machine_performance() {
+        let input = r#"<button class="[color:red] [background-color:red] [--my-color:red] [background:url('https://example.com')]">"#.repeat(10);
+
+        ArbitraryPropertyMachine::<IdleState>::test_throughput(1_000_000, &input);
+        ArbitraryPropertyMachine::<IdleState>::test_duration_once(&input);
+
+        todo!()
+    }
+
+    #[test]
+    fn test_arbitrary_property_machine_extraction() {
+        for (input, expected) in [
+            // Simple arbitrary property
+            ("[color:red]", vec!["[color:red]"]),
+            // Name with dashes
+            ("[background-color:red]", vec!["[background-color:red]"]),
+            // Name with leading `-` is valid
+            ("[-webkit-value:red]", vec!["[-webkit-value:red]"]),
+            // Setting a CSS Variable
+            ("[--my-color:red]", vec!["[--my-color:red]"]),
+            // Value with nested brackets
+            (
+                "[background:url(https://example.com)]",
+                vec!["[background:url(https://example.com)]"],
+            ),
+            // Value containing strings
+            (
+                "[background:url('https://example.com')]",
+                vec!["[background:url('https://example.com')]"],
+            ),
+            // --------------------------------------------------------
+
+            // Invalid CSS Variable
+            ("[--my#color:red]", vec![]),
+            // Spaces are not allowed
+            ("[color: red]", vec![]),
+            // Multiple colons are not allowed
+            ("[color:red:blue]", vec![]),
+            // Only alphanumeric characters are allowed in the property name
+            ("[background_color:red]", vec![]),
+            // A color is required
+            ("[red]", vec![]),
+            // The property cannot be empty
+            ("[:red]", vec![]),
+            // Empty brackets are not allowed
+            ("[]", vec![]),
+            // URLs
+            ("[http://example.com]", vec![]),
+            ("[https://example.com]", vec![]),
+            // Missing colon in more complex example
+            (r#"[CssClass("gap-y-4")]"#, vec![]),
+            // Brackets must be balanced
+            ("[background:url(https://example.com]", vec![]),
+            // Many brackets (>= 8) must be balanced
+            (
+                "[background:url(https://example.com?q={[{[([{[[2]]}])]}]})]",
+                vec!["[background:url(https://example.com?q={[{[([{[[2]]}])]}]})]"],
+            ),
+            // A property containing `!` at the top-level is invalid
+            ("[color:red!]", vec![]),
+            ("[color:red!important]", vec![]),
+        ] {
+            for wrapper in [
+                // No wrapper
+                "{}",
+                // With leading spaces
+                " {}",
+                // With trailing spaces
+                "{} ",
+                // Surrounded by spaces
+                " {} ",
+                // Inside a string
+                "'{}'",
+                // Inside a function call
+                "fn({})",
+                // Inside nested function calls
+                "fn1(fn2({}))",
+                // --------------------------
+                //
+                // HTML
+                // Inside a class (on its own)
+                r#"<div class="{}"></div>"#,
+                // Inside a class (first)
+                r#"<div class="{} foo"></div>"#,
+                // Inside a class (second)
+                r#"<div class="foo {}"></div>"#,
+                // Inside a class (surrounded)
+                r#"<div class="foo {} bar"></div>"#,
+                // --------------------------
+                //
+                // JavaScript
+                // Inside a variable
+                r#"let classes = '{}';"#,
+                // Inside an object (key)
+                r#"let classes = { '{}': true };"#,
+                // Inside an object (no spaces, key)
+                r#"let classes = {'{}':true};"#,
+                // Inside an object (value)
+                r#"let classes = { primary: '{}' };"#,
+                // Inside an object (no spaces, value)
+                r#"let classes = {primary:'{}'};"#,
+            ] {
+                let input = wrapper.replace("{}", input);
+                let actual = ArbitraryPropertyMachine::<IdleState>::test_extract_all(&input);
+
+                if actual != expected {
+                    dbg!(&input);
+                }
+                assert_eq!(actual, expected);
+            }
+        }
+    }
+
+    #[test]
+    fn test_exceptions() {
+        for (input, expected) in [
+            // JS string interpolation
+            // In key
+            ("[${x}:value]", vec![]),
+            // As part of the key
+            ("[background-${property}:value]", vec![]),
+            // In value
+            ("[key:${x}]", vec![]),
+            // As part of the value
+            ("[key:value-${x}]", vec![]),
+            // Allowed in strings
+            ("[--img:url('${x}')]", vec!["[--img:url('${x}')]"]),
+        ] {
+            assert_eq!(
+                ArbitraryPropertyMachine::<IdleState>::test_extract_all(input),
+                expected
+            );
+        }
+    }
+}
diff --git a/crates/oxide/src/extractor/arbitrary_value_machine.rs b/crates/oxide/src/extractor/arbitrary_value_machine.rs
new file mode 100644
index 000000000..cbef62c42
--- /dev/null
+++ b/crates/oxide/src/extractor/arbitrary_value_machine.rs
@@ -0,0 +1,213 @@
+use crate::cursor;
+use crate::extractor::bracket_stack::BracketStack;
+use crate::extractor::machine::{Machine, MachineState};
+use crate::extractor::string_machine::StringMachine;
+use classification_macros::ClassifyBytes;
+
+/// Extracts arbitrary values including the brackets.
+///
+/// E.g.:
+///
+/// ```text
+/// bg-[#0088cc]
+///    ^^^^^^^^^
+///
+/// bg-red-500/[20%]
+///            ^^^^^
+/// ```
+#[derive(Debug, Default)]
+pub struct ArbitraryValueMachine {
+    /// Track brackets to ensure they are balanced
+    bracket_stack: BracketStack,
+
+    string_machine: StringMachine,
+}
+
+impl Machine for ArbitraryValueMachine {
+    #[inline(always)]
+    fn reset(&mut self) {
+        self.bracket_stack.reset();
+    }
+
+    #[inline]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        // An arbitrary value must start with an open bracket
+        if Class::OpenBracket != cursor.curr().into() {
+            return MachineState::Idle;
+        }
+
+        let start_pos = cursor.pos;
+        cursor.advance();
+
+        let len = cursor.input.len();
+
+        while cursor.pos < len {
+            match cursor.curr().into() {
+                Class::Escape => match cursor.next().into() {
+                    // An escaped whitespace character is not allowed
+                    //
+                    // E.g.: `[color:var(--my-\ color)]`
+                    //                         ^
+                    Class::Whitespace => {
+                        cursor.advance_twice();
+                        return self.restart();
+                    }
+
+                    // An escaped character, skip the next character, resume after
+                    //
+                    // E.g.: `[color:var(--my-\#color)]`
+                    //                        ^
+                    _ => cursor.advance_twice(),
+                },
+
+                Class::OpenParen | Class::OpenBracket | Class::OpenCurly => {
+                    if !self.bracket_stack.push(cursor.curr()) {
+                        return self.restart();
+                    }
+                    cursor.advance();
+                }
+
+                Class::CloseParen | Class::CloseBracket | Class::CloseCurly
+                    if !self.bracket_stack.is_empty() =>
+                {
+                    if !self.bracket_stack.pop(cursor.curr()) {
+                        return self.restart();
+                    }
+                    cursor.advance();
+                }
+
+                // End of an arbitrary value
+                //
+                // 1. All brackets must be balanced
+                // 2. There must be at least a single character inside the brackets
+                Class::CloseBracket
+                    if start_pos + 1 != cursor.pos && self.bracket_stack.is_empty() =>
+                {
+                    return self.done(start_pos, cursor);
+                }
+
+                // Start of a string
+                Class::Quote => match self.string_machine.next(cursor) {
+                    MachineState::Idle => return self.restart(),
+                    MachineState::Done(_) => cursor.advance(),
+                },
+
+                // Any kind of whitespace is not allowed
+                Class::Whitespace => return self.restart(),
+
+                // String interpolation-like syntax is not allowed. E.g.: `[${x}]`
+                Class::Dollar if matches!(cursor.next().into(), Class::OpenCurly) => {
+                    return self.restart()
+                }
+
+                // Everything else is valid
+                _ => cursor.advance(),
+            };
+        }
+
+        self.restart()
+    }
+}
+
+#[derive(Clone, Copy, PartialEq, ClassifyBytes)]
+enum Class {
+    #[bytes(b'\\')]
+    Escape,
+
+    #[bytes(b'(')]
+    OpenParen,
+
+    #[bytes(b')')]
+    CloseParen,
+
+    #[bytes(b'[')]
+    OpenBracket,
+
+    #[bytes(b']')]
+    CloseBracket,
+
+    #[bytes(b'{')]
+    OpenCurly,
+
+    #[bytes(b'}')]
+    CloseCurly,
+
+    #[bytes(b'"', b'\'', b'`')]
+    Quote,
+
+    #[bytes(b' ', b'\t', b'\n', b'\r', b'\x0C')]
+    Whitespace,
+
+    #[bytes(b'$')]
+    Dollar,
+
+    #[fallback]
+    Other,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::ArbitraryValueMachine;
+    use crate::extractor::machine::Machine;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    #[ignore]
+    fn test_arbitrary_value_machine_performance() {
+        let input = r#"<div class="[color:red] [[data-foo]] [url('https://tailwindcss.com')] [url(https://tailwindcss.com)]"></div>"#.repeat(100);
+
+        ArbitraryValueMachine::test_throughput(100_000, &input);
+        ArbitraryValueMachine::test_duration_once(&input);
+
+        todo!()
+    }
+
+    #[test]
+    fn test_arbitrary_value_machine_extraction() {
+        for (input, expected) in [
+            // Simple variable
+            ("[#0088cc]", vec!["[#0088cc]"]),
+            // With parentheses
+            (
+                "[url(https://tailwindcss.com)]",
+                vec!["[url(https://tailwindcss.com)]"],
+            ),
+            // With strings, where bracket balancing doesn't matter
+            ("['[({])}']", vec!["['[({])}']"]),
+            // With strings later in the input
+            (
+                "[url('https://tailwindcss.com?[{]}')]",
+                vec!["[url('https://tailwindcss.com?[{]}')]"],
+            ),
+            // With nested brackets
+            ("[[data-foo]]", vec!["[[data-foo]]"]),
+            (
+                "[&>[data-slot=icon]:last-child]",
+                vec!["[&>[data-slot=icon]:last-child]"],
+            ),
+            // With data types
+            ("[length:32rem]", vec!["[length:32rem]"]),
+            // Spaces are not allowed
+            ("[ #0088cc ]", vec![]),
+            // Unbalanced brackets are not allowed
+            ("[foo[bar]", vec![]),
+            // Empty brackets are not allowed
+            ("[]", vec![]),
+        ] {
+            assert_eq!(ArbitraryValueMachine::test_extract_all(input), expected);
+        }
+    }
+
+    #[test]
+    fn test_exceptions() {
+        for (input, expected) in [
+            // JS string interpolation
+            ("[${x}]", vec![]),
+            ("[url(${x})]", vec![]),
+            // Allowed in strings
+            ("[url('${x}')]", vec!["[url('${x}')]"]),
+        ] {
+            assert_eq!(ArbitraryValueMachine::test_extract_all(input), expected);
+        }
+    }
+}
diff --git a/crates/oxide/src/extractor/arbitrary_variable_machine.rs b/crates/oxide/src/extractor/arbitrary_variable_machine.rs
new file mode 100644
index 000000000..e8d475557
--- /dev/null
+++ b/crates/oxide/src/extractor/arbitrary_variable_machine.rs
@@ -0,0 +1,413 @@
+use crate::cursor;
+use crate::extractor::bracket_stack::BracketStack;
+use crate::extractor::css_variable_machine::CssVariableMachine;
+use crate::extractor::machine::{Machine, MachineState};
+use crate::extractor::string_machine::StringMachine;
+use classification_macros::ClassifyBytes;
+use std::marker::PhantomData;
+
+#[derive(Debug, Default)]
+pub struct IdleState;
+
+/// Currently parsing the inside of the arbitrary variable
+///
+/// ```text
+/// (--my-opacity)
+///  ^^^^^^^^^^^^
+/// ```
+#[derive(Debug, Default)]
+pub struct ParsingState;
+
+/// Currently parsing the data type of the arbitrary variable
+///
+/// ```text
+/// (length:--my-opacity)
+///  ^^^^^^^
+/// ```
+#[derive(Debug, Default)]
+pub struct ParsingDataTypeState;
+
+/// Currently parsing the fallback of the arbitrary variable
+///
+/// ```text
+/// (--my-opacity,50%)
+///              ^^^^
+/// ```
+#[derive(Debug, Default)]
+pub struct ParsingFallbackState;
+
+/// Extracts arbitrary variables including the parens.
+///
+/// E.g.:
+///
+/// ```text
+/// (--my-value)
+/// ^^^^^^^^^^^^
+///
+/// bg-red-500/(--my-opacity)
+///            ^^^^^^^^^^^^^^
+/// ```
+#[derive(Debug, Default)]
+pub struct ArbitraryVariableMachine<State = IdleState> {
+    /// Start position of the arbitrary variable
+    start_pos: usize,
+
+    /// Track brackets to ensure they are balanced
+    bracket_stack: BracketStack,
+
+    string_machine: StringMachine,
+    css_variable_machine: CssVariableMachine,
+
+    _state: PhantomData<State>,
+}
+
+impl<State> ArbitraryVariableMachine<State> {
+    #[inline(always)]
+    fn transition<NextState>(&self) -> ArbitraryVariableMachine<NextState> {
+        ArbitraryVariableMachine {
+            start_pos: self.start_pos,
+            bracket_stack: Default::default(),
+            string_machine: Default::default(),
+            css_variable_machine: Default::default(),
+            _state: PhantomData,
+        }
+    }
+}
+
+impl Machine for ArbitraryVariableMachine<IdleState> {
+    #[inline(always)]
+    fn reset(&mut self) {}
+
+    #[inline(always)]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match cursor.curr().into() {
+            // Arbitrary variables start with `(` followed by a CSS variable
+            //
+            // E.g.: `(--my-variable)`
+            //        ^^
+            //
+            Class::OpenParen => match cursor.next().into() {
+                Class::Dash => {
+                    self.start_pos = cursor.pos;
+                    cursor.advance();
+                    self.transition::<ParsingState>().next(cursor)
+                }
+
+                Class::AlphaLower => {
+                    self.start_pos = cursor.pos;
+                    cursor.advance();
+                    self.transition::<ParsingDataTypeState>().next(cursor)
+                }
+
+                _ => MachineState::Idle,
+            },
+
+            // Everything else, is not a valid start of the arbitrary variable. But the next
+            // character might be a valid start for a new utility.
+            _ => MachineState::Idle,
+        }
+    }
+}
+
+impl Machine for ArbitraryVariableMachine<ParsingState> {
+    #[inline(always)]
+    fn reset(&mut self) {}
+
+    #[inline(always)]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match self.css_variable_machine.next(cursor) {
+            MachineState::Idle => self.restart(),
+            MachineState::Done(_) => match cursor.next().into() {
+                // A CSS variable followed by a `,` means that there is a fallback
+                //
+                // E.g.: `(--my-color,red)`
+                //                   ^
+                Class::Comma => {
+                    cursor.advance_twice(); // Skip the `,`
+                    self.transition::<ParsingFallbackState>().next(cursor)
+                }
+
+                // End of the CSS variable
+                //
+                // E.g.: `(--my-color)`
+                //                  ^
+                _ => {
+                    cursor.advance();
+
+                    match cursor.curr().into() {
+                        // End of an arbitrary variable, must be followed by `)`
+                        Class::CloseParen => self.done(self.start_pos, cursor),
+
+                        // Invalid arbitrary variable, not ending at `)`
+                        _ => self.restart(),
+                    }
+                }
+            },
+        }
+    }
+}
+
+impl Machine for ArbitraryVariableMachine<ParsingDataTypeState> {
+    #[inline(always)]
+    fn reset(&mut self) {}
+
+    #[inline(always)]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        let len = cursor.input.len();
+
+        while cursor.pos < len {
+            match cursor.curr().into() {
+                // Valid data type characters
+                //
+                // E.g.: `(length:--my-length)`
+                //         ^
+                Class::AlphaLower | Class::Dash => {
+                    cursor.advance();
+                }
+
+                // End of the data type
+                //
+                // E.g.: `(length:--my-length)`
+                //               ^
+                Class::Colon => match cursor.next().into() {
+                    Class::Dash => {
+                        cursor.advance();
+                        return self.transition::<ParsingState>().next(cursor);
+                    }
+
+                    _ => return self.restart(),
+                },
+
+                // Anything else is not a valid character
+                _ => return self.restart(),
+            };
+        }
+        self.restart()
+    }
+}
+
+impl Machine for ArbitraryVariableMachine<ParsingFallbackState> {
+    #[inline(always)]
+    fn reset(&mut self) {
+        self.bracket_stack.reset();
+    }
+
+    #[inline(always)]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        let len = cursor.input.len();
+        while cursor.pos < len {
+            match cursor.curr().into() {
+                Class::Escape => match cursor.next().into() {
+                    // An escaped whitespace character is not allowed
+                    //
+                    // E.g.: `(--my-\ color)`
+                    //              ^^
+                    Class::Whitespace => return self.restart(),
+
+                    // An escaped character, skip the next character, resume after
+                    //
+                    // E.g.: `(--my-\#color)`
+                    //              ^^
+                    _ => cursor.advance_twice(),
+                },
+
+                Class::OpenParen | Class::OpenBracket | Class::OpenCurly => {
+                    if !self.bracket_stack.push(cursor.curr()) {
+                        return self.restart();
+                    }
+                    cursor.advance();
+                }
+
+                Class::CloseParen | Class::CloseBracket | Class::CloseCurly
+                    if !self.bracket_stack.is_empty() =>
+                {
+                    if !self.bracket_stack.pop(cursor.curr()) {
+                        return self.restart();
+                    }
+                    cursor.advance();
+                }
+
+                // End of an arbitrary variable
+                Class::CloseParen => return self.done(self.start_pos, cursor),
+
+                // Start of a string
+                Class::Quote => match self.string_machine.next(cursor) {
+                    MachineState::Idle => return self.restart(),
+                    MachineState::Done(_) => cursor.advance(),
+                },
+
+                // A `:` inside of a fallback value is only valid inside of brackets or inside of a
+                // string. Everywhere else, it's invalid.
+                //
+                // E.g.: `(--foo,bar:baz)`
+                //                  ^ Not valid
+                //
+                // E.g.: `(--url,url(https://example.com))`
+                //                        ^ Valid
+                //
+                // E.g.: `(--my-content:'a:b:c:')`
+                //                        ^ ^ ^ Valid
+                Class::Colon if self.bracket_stack.is_empty() => return self.restart(),
+
+                // Any kind of whitespace is not allowed
+                Class::Whitespace => return self.restart(),
+
+                // String interpolation-like syntax is not allowed. E.g.: `[${x}]`
+                Class::Dollar if matches!(cursor.next().into(), Class::OpenCurly) => {
+                    return self.restart()
+                }
+
+                // Everything else is valid
+                _ => cursor.advance(),
+            };
+        }
+
+        self.restart()
+    }
+}
+
+#[derive(Clone, Copy, PartialEq, ClassifyBytes)]
+enum Class {
+    #[bytes_range(b'a'..=b'z')]
+    AlphaLower,
+
+    #[bytes_range(b'A'..=b'Z')]
+    AlphaUpper,
+
+    #[bytes(b'@')]
+    At,
+
+    #[bytes(b':')]
+    Colon,
+
+    #[bytes(b',')]
+    Comma,
+
+    #[bytes(b'-')]
+    Dash,
+
+    #[bytes(b'.')]
+    Dot,
+
+    #[bytes(b'$')]
+    Dollar,
+
+    #[bytes(b'\\')]
+    Escape,
+
+    #[bytes(b'\0')]
+    End,
+
+    #[bytes_range(b'0'..=b'9')]
+    Number,
+
+    #[bytes(b'[')]
+    OpenBracket,
+
+    #[bytes(b']')]
+    CloseBracket,
+
+    #[bytes(b'(')]
+    OpenParen,
+
+    #[bytes(b')')]
+    CloseParen,
+
+    #[bytes(b'{')]
+    OpenCurly,
+
+    #[bytes(b'}')]
+    CloseCurly,
+
+    #[bytes(b'"', b'\'', b'`')]
+    Quote,
+
+    #[bytes(b'_')]
+    Underscore,
+
+    #[bytes(b' ', b'\t', b'\n', b'\r', b'\x0C')]
+    Whitespace,
+
+    #[fallback]
+    Other,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::ArbitraryVariableMachine;
+    use crate::extractor::{arbitrary_variable_machine::IdleState, machine::Machine};
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    #[ignore]
+    fn test_arbitrary_variable_machine_performance() {
+        let input = r#"<div class="(--foo) (--my-color,red,blue) (--my-img,url('https://example.com?q=(][)'))"></div>"#.repeat(100);
+
+        ArbitraryVariableMachine::<IdleState>::test_throughput(100_000, &input);
+        ArbitraryVariableMachine::<IdleState>::test_duration_once(&input);
+
+        todo!()
+    }
+
+    #[test]
+    fn test_arbitrary_variable_extraction() {
+        for (input, expected) in [
+            // Simple utility
+            ("(--foo)", vec!["(--foo)"]),
+            // With dashes
+            ("(--my-color)", vec!["(--my-color)"]),
+            // With a fallback
+            ("(--my-color,red,blue)", vec!["(--my-color,red,blue)"]),
+            // With a fallback containing a string with unbalanced brackets
+            (
+                "(--my-img,url('https://example.com?q=(][)'))",
+                vec!["(--my-img,url('https://example.com?q=(][)'))"],
+            ),
+            // With a type hint
+            ("(length:--my-length)", vec!["(length:--my-length)"]),
+            // --------------------------------------------------------
+
+            // Exceptions:
+            // Arbitrary variable must start with a CSS variable
+            (r"(bar)", vec![]),
+            // Arbitrary variables must be valid CSS variables
+            (r"(--my-\ color)", vec![]),
+            (r"(--my#color)", vec![]),
+            // Fallbacks cannot have spaces
+            (r"(--my-color, red)", vec![]),
+            // Fallbacks cannot have escaped spaces
+            (r"(--my-color,\ red)", vec![]),
+            // Variables must have at least one character after the `--`
+            (r"(--)", vec![]),
+            (r"(--,red)", vec![]),
+            (r"(-)", vec![]),
+            (r"(-my-color)", vec![]),
+        ] {
+            assert_eq!(
+                ArbitraryVariableMachine::<IdleState>::test_extract_all(input),
+                expected
+            );
+        }
+    }
+
+    #[test]
+    fn test_exceptions() {
+        for (input, expected) in [
+            // JS string interpolation
+            // As part of the variable
+            ("(--my-${var})", vec![]),
+            // As the fallback
+            ("(--my-variable,${var})", vec![]),
+            // As the fallback in strings
+            (
+                "(--my-variable,url('${var}'))",
+                vec!["(--my-variable,url('${var}'))"],
+            ),
+        ] {
+            assert_eq!(
+                ArbitraryVariableMachine::<IdleState>::test_extract_all(input),
+                expected
+            );
+        }
+    }
+}
diff --git a/crates/oxide/src/extractor/boundary.rs b/crates/oxide/src/extractor/boundary.rs
new file mode 100644
index 000000000..78f9d3184
--- /dev/null
+++ b/crates/oxide/src/extractor/boundary.rs
@@ -0,0 +1,128 @@
+use classification_macros::ClassifyBytes;
+
+use crate::extractor::Span;
+
+#[inline(always)]
+pub fn is_valid_before_boundary(c: &u8) -> bool {
+    matches!(c.into(), Class::Common | Class::Before)
+}
+
+#[inline(always)]
+pub fn is_valid_after_boundary(c: &u8) -> bool {
+    matches!(c.into(), Class::Common | Class::After)
+}
+
+#[inline(always)]
+pub fn has_valid_boundaries(span: &Span, input: &[u8]) -> bool {
+    let before = {
+        if span.start == 0 {
+            b'\0'
+        } else {
+            input[span.start - 1]
+        }
+    };
+
+    let after = {
+        if span.end >= input.len() - 1 {
+            b'\0'
+        } else {
+            input[span.end + 1]
+        }
+    };
+
+    // Ensure the span has valid boundary characters before and after
+    is_valid_before_boundary(&before) && is_valid_after_boundary(&after)
+}
+
+#[derive(Debug, Clone, Copy, ClassifyBytes)]
+enum Class {
+    // Whitespace, e.g.:
+    //
+    // ```
+    // <div class="flex flex-col items-center"></div>
+    //                 ^        ^
+    // ```
+    #[bytes(b'\t', b'\n', b'\x0C', b'\r', b' ')]
+    // Quotes, e.g.:
+    //
+    // ```
+    // <div class="flex">
+    //            ^    ^
+    // ```
+    #[bytes(b'"', b'\'', b'`')]
+    // End of the input, e.g.:
+    //
+    // ```
+    // flex
+    //     ^
+    // ```
+    #[bytes(b'\0')]
+    Common,
+
+    // Angular like attributes, e.g.:
+    //
+    // ````
+    // [class.foo]
+    //       ^
+    // ```
+    #[bytes(b'.')]
+    // Twig-like templating languages, e.g.:
+    //
+    // ```
+    // <div class="{% if true %}flex{% else %}block{% endif %}">
+    //                         ^
+    // ```
+    #[bytes(b'}')]
+    // XML-like languages where classes are inside the tag, e.g.:
+    // ```
+    // <f:case value="0">from-blue-900 to-cyan-200</f:case>
+    //                  ^
+    // ```
+    #[bytes(b'>')]
+    Before,
+
+    // Clojure and Angular like languages, e.g.:
+    // ```
+    // [:div.p-2]
+    //          ^
+    // [class.foo]
+    //           ^
+    // ```
+    #[bytes(b']')]
+    // Twig like templating languages, e.g.:
+    //
+    // ```
+    // <div class="{% if true %}flex{% else %}block{% endif %}">
+    //                              ^
+    // ```
+    #[bytes(b'{')]
+    // Svelte like attributes, e.g.:
+    //
+    // ```
+    // <div class:flex="bool"></div>
+    //                ^
+    // ```
+    #[bytes(b'=')]
+    // Escaped character when embedding one language in another via strings, e.g.:
+    //
+    // ```
+    // $attributes->merge([
+    //   'x-init' => '$el.classList.add(\'-translate-x-full\'); $el.classList.add(\'transition-transform\')',
+    //                                                     ^                                            ^
+    // ]);
+    // ```
+    //
+    // In this case there is some JavaScript embedded in an string in PHP and some of the quotes
+    // need to be escaped.
+    #[bytes(b'\\')]
+    // XML-like languages where classes are inside the tag, e.g.:
+    // ```
+    // <f:case value="0">from-blue-900 to-cyan-200</f:case>
+    //                                            ^
+    // ```
+    #[bytes(b'<')]
+    After,
+
+    #[fallback]
+    Other,
+}
diff --git a/crates/oxide/src/extractor/bracket_stack.rs b/crates/oxide/src/extractor/bracket_stack.rs
new file mode 100644
index 000000000..2b8d3a13f
--- /dev/null
+++ b/crates/oxide/src/extractor/bracket_stack.rs
@@ -0,0 +1,57 @@
+const SIZE: usize = 32;
+
+#[repr(C)]
+#[derive(Debug, Default)]
+pub struct BracketStack {
+    /// Bracket stack to ensure properly balanced brackets.
+    bracket_stack: [u8; SIZE],
+    bracket_stack_len: usize,
+}
+
+impl BracketStack {
+    #[inline(always)]
+    pub fn is_empty(&self) -> bool {
+        self.bracket_stack_len == 0
+    }
+
+    #[inline(always)]
+    pub fn push(&mut self, bracket: u8) -> bool {
+        if self.bracket_stack_len >= SIZE {
+            return false;
+        }
+
+        unsafe {
+            *self.bracket_stack.get_unchecked_mut(self.bracket_stack_len) = match bracket {
+                b'(' => b')',
+                b'[' => b']',
+                b'{' => b'}',
+                b'<' => b'>',
+                _ => std::hint::unreachable_unchecked(),
+            };
+        }
+
+        self.bracket_stack_len += 1;
+        true
+    }
+
+    #[inline(always)]
+    pub fn pop(&mut self, bracket: u8) -> bool {
+        if self.bracket_stack_len == 0 {
+            return false;
+        }
+
+        self.bracket_stack_len -= 1;
+        unsafe {
+            if *self.bracket_stack.get_unchecked(self.bracket_stack_len) != bracket {
+                return false;
+            }
+        }
+
+        true
+    }
+
+    #[inline(always)]
+    pub fn reset(&mut self) {
+        self.bracket_stack_len = 0;
+    }
+}
diff --git a/crates/oxide/src/extractor/candidate_machine.rs b/crates/oxide/src/extractor/candidate_machine.rs
new file mode 100644
index 000000000..a755cf02a
--- /dev/null
+++ b/crates/oxide/src/extractor/candidate_machine.rs
@@ -0,0 +1,361 @@
+use crate::cursor;
+use crate::extractor::boundary::{has_valid_boundaries, is_valid_before_boundary};
+use crate::extractor::machine::{Machine, MachineState};
+use crate::extractor::utility_machine::UtilityMachine;
+use crate::extractor::variant_machine::VariantMachine;
+use crate::extractor::Span;
+
+/// Extract full candidates including variants and utilities.
+#[derive(Debug, Default)]
+pub struct CandidateMachine {
+    /// Start position of the candidate
+    start_pos: usize,
+
+    /// End position of the last variant (if any)
+    last_variant_end_pos: Option<usize>,
+
+    utility_machine: UtilityMachine,
+    variant_machine: VariantMachine,
+}
+
+impl Machine for CandidateMachine {
+    #[inline(always)]
+    fn reset(&mut self) {
+        self.start_pos = 0;
+        self.last_variant_end_pos = None;
+    }
+
+    #[inline]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        let len = cursor.input.len();
+
+        while cursor.pos < len {
+            // Skip ahead for known characters that will never be part of a candidate. No need to
+            // run any sub-machines.
+            if cursor.curr().is_ascii_whitespace() {
+                self.reset();
+                cursor.advance();
+                continue;
+            }
+
+            // Candidates don't start with these characters, so we can skip ahead.
+            if matches!(cursor.curr(), b':' | b'"' | b'\'' | b'`') {
+                self.reset();
+                cursor.advance();
+                continue;
+            }
+
+            // Jump ahead if the character is known to be an invalid boundary and we should start
+            // at the next boundary even though "valid" candidates can exist.
+            //
+            // E.g.: `<div class="">`
+            //         ^^^            Valid candidate
+            //        ^               But this character makes it invalid
+            //             ^          Therefore we jump here
+            //
+            // E.g.: `Some Class`
+            //        ^    ^       Invalid, we can jump ahead to the next boundary
+            //
+            if matches!(cursor.curr(), b'<' | b'A'..=b'Z') {
+                if let Some(offset) = cursor.input[cursor.pos..]
+                    .iter()
+                    .position(|&c| is_valid_before_boundary(&c))
+                {
+                    self.reset();
+                    cursor.advance_by(offset + 1);
+                } else {
+                    return self.restart();
+                }
+
+                continue;
+            }
+
+            let mut variant_cursor = cursor.clone();
+            let variant_machine_state = self.variant_machine.next(&mut variant_cursor);
+
+            let mut utility_cursor = cursor.clone();
+            let utility_machine_state = self.utility_machine.next(&mut utility_cursor);
+
+            match (variant_machine_state, utility_machine_state) {
+                // No variant, but the utility machine completed
+                (MachineState::Idle, MachineState::Done(utility_span)) => {
+                    cursor.move_to(utility_cursor.pos + 1);
+
+                    let span = match self.last_variant_end_pos {
+                        Some(end_pos) => {
+                            // Verify that the utility is touching the last variant
+                            if end_pos + 1 != utility_span.start {
+                                return self.restart();
+                            }
+
+                            Span::new(self.start_pos, utility_span.end)
+                        }
+                        None => utility_span,
+                    };
+
+                    // Ensure the span has valid boundary characters before and after
+                    if !has_valid_boundaries(&span, cursor.input) {
+                        return self.restart();
+                    }
+
+                    return self.done_span(span);
+                }
+
+                // Both variant and utility machines are done
+                // E.g.: `hover:flex`
+                //        ^^^^^^      Variant
+                //        ^^^^^       Utility
+                //
+                (MachineState::Done(variant_span), MachineState::Done(utility_span)) => {
+                    cursor.move_to(variant_cursor.pos + 1);
+
+                    if let Some(end_pos) = self.last_variant_end_pos {
+                        // Verify variant is touching the last variant
+                        if end_pos + 1 != variant_span.start {
+                            return self.restart();
+                        }
+                    } else {
+                        // We know that there is no variant before this one.
+                        //
+                        // Edge case: JavaScript keys should be considered utilities if they are
+                        // not preceded by another variant, and followed by any kind of whitespace
+                        // or the end of the line.
+                        //
+                        // E.g.: `{ underline: true }`
+                        //          ^^^^^^^^^^        Variant
+                        //          ^^^^^^^^^         Utility (followed by `: `)
+                        let after = cursor.input.get(utility_span.end + 2).unwrap_or(&b'\0');
+                        if after.is_ascii_whitespace() || *after == b'\0' {
+                            cursor.move_to(utility_cursor.pos + 2);
+                            return self.done_span(utility_span);
+                        }
+
+                        self.start_pos = variant_span.start;
+                    }
+
+                    self.last_variant_end_pos = Some(variant_cursor.pos);
+                }
+
+                // Variant is done, utility is invalid
+                (MachineState::Done(variant_span), MachineState::Idle) => {
+                    cursor.move_to(variant_cursor.pos + 1);
+
+                    if let Some(end_pos) = self.last_variant_end_pos {
+                        if end_pos + 1 > variant_span.start {
+                            self.reset();
+                            return MachineState::Idle;
+                        }
+                    } else {
+                        self.start_pos = variant_span.start;
+                    }
+
+                    self.last_variant_end_pos = Some(variant_cursor.pos);
+                }
+
+                (MachineState::Idle, MachineState::Idle) => {
+                    // Skip main cursor to the next character after both machines. We already know
+                    // there is no candidate here.
+                    if variant_cursor.pos > cursor.pos || utility_cursor.pos > cursor.pos {
+                        cursor.move_to(variant_cursor.pos.max(utility_cursor.pos));
+                    }
+
+                    self.reset();
+                    cursor.advance();
+                }
+            }
+        }
+
+        MachineState::Idle
+    }
+}
+
+impl CandidateMachine {
+    #[inline(always)]
+    fn done_span(&mut self, span: Span) -> MachineState {
+        self.reset();
+        MachineState::Done(span)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::CandidateMachine;
+    use crate::extractor::machine::Machine;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    #[ignore]
+    fn test_candidate_machine_performance() {
+        let n = 10_000;
+        let input = include_str!("../fixtures/example.html");
+        // let input = &r#"<button type="button" class="absolute -top-1 -left-1.5 flex items-center justify-center p-1.5 text-gray-400 hover:text-gray-500">"#.repeat(100);
+
+        CandidateMachine::test_throughput(n, input);
+        CandidateMachine::test_duration_once(input);
+        CandidateMachine::test_duration_n(n, input);
+
+        todo!()
+    }
+
+    #[test]
+    fn test_candidate_extraction() {
+        for (input, expected) in [
+            // Simple utility
+            ("flex", vec!["flex"]),
+            // Simple utility with special character(s)
+            ("@container", vec!["@container"]),
+            // Single character utility
+            ("a", vec!["a"]),
+            // Simple utility with dashes
+            ("items-center", vec!["items-center"]),
+            // Simple utility with numbers
+            ("px-2.5", vec!["px-2.5"]),
+            // Simple variant with simple utility
+            ("hover:flex", vec!["hover:flex"]),
+            // Arbitrary properties
+            ("[color:red]", vec!["[color:red]"]),
+            ("![color:red]", vec!["![color:red]"]),
+            ("[color:red]!", vec!["[color:red]!"]),
+            ("[color:red]/20", vec!["[color:red]/20"]),
+            ("![color:red]/20", vec!["![color:red]/20"]),
+            ("[color:red]/20!", vec!["[color:red]/20!"]),
+            // With multiple variants
+            ("hover:focus:flex", vec!["hover:focus:flex"]),
+            // Exceptions:
+            //
+            // Keys inside of a JS object could be a variant-less candidate. Vue example.
+            ("{ underline: true }", vec!["underline", "true"]),
+            // With complex variants
+            (
+                "[&>[data-slot=icon]:last-child]:right-2.5",
+                vec!["[&>[data-slot=icon]:last-child]:right-2.5"],
+            ),
+            // With multiple (complex) variants
+            (
+                "[&>[data-slot=icon]:last-child]:sm:right-2.5",
+                vec!["[&>[data-slot=icon]:last-child]:sm:right-2.5"],
+            ),
+            (
+                "sm:[&>[data-slot=icon]:last-child]:right-2.5",
+                vec!["sm:[&>[data-slot=icon]:last-child]:right-2.5"],
+            ),
+            // Exceptions regarding boundaries
+            //
+            // `flex!` is valid, but since it's followed by a non-boundary character it's invalid.
+            // `block` is therefore also invalid because it didn't start after a boundary.
+            ("flex!block", vec![]),
+        ] {
+            for (wrapper, additional) in [
+                // No wrapper
+                ("{}", vec![]),
+                // With leading spaces
+                (" {}", vec![]),
+                ("  {}", vec![]),
+                ("   {}", vec![]),
+                // With trailing spaces
+                ("{} ", vec![]),
+                ("{}  ", vec![]),
+                ("{}   ", vec![]),
+                // Surrounded by spaces
+                (" {} ", vec![]),
+                // Inside a string
+                ("'{}'", vec![]),
+                // Inside a function call
+                ("fn('{}')", vec![]),
+                // Inside nested function calls
+                ("fn1(fn2('{}'))", vec![]),
+                // --------------------------
+                //
+                // HTML
+                // Inside a class (on its own)
+                (r#"<div class="{}"></div>"#, vec!["class"]),
+                // Inside a class (first)
+                (r#"<div class="{} foo"></div>"#, vec!["class", "foo"]),
+                // Inside a class (second)
+                (r#"<div class="foo {}"></div>"#, vec!["class", "foo"]),
+                // Inside a class (surrounded)
+                (
+                    r#"<div class="foo {} bar"></div>"#,
+                    vec!["class", "foo", "bar"],
+                ),
+                // --------------------------
+                //
+                // JavaScript
+                // Inside a variable
+                (r#"let classes = '{}';"#, vec!["let", "classes"]),
+                // Inside an object (key)
+                (
+                    r#"let classes = { '{}': true };"#,
+                    vec!["let", "classes", "true"],
+                ),
+                // Inside an object (no spaces, key)
+                (r#"let classes = {'{}':true};"#, vec!["let", "classes"]),
+                // Inside an object (value)
+                (
+                    r#"let classes = { primary: '{}' };"#,
+                    vec!["let", "classes", "primary"],
+                ),
+                // Inside an object (no spaces, value)
+                (r#"let classes = {primary:'{}'};"#, vec!["let", "classes"]),
+            ] {
+                let input = wrapper.replace("{}", input);
+
+                let mut expected = expected.clone();
+                expected.extend(additional);
+                expected.sort();
+
+                let mut actual = CandidateMachine::test_extract_all(&input);
+                actual.sort();
+
+                if actual != expected {
+                    dbg!(&input);
+                }
+
+                assert_eq!(actual, expected);
+            }
+        }
+    }
+
+    #[test]
+    fn do_not_consider_svg_path_commands() {
+        for input in [
+            r#"<path d="M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4"/>"#,
+            r#"<path d="0h2m-2"/>"#,
+        ] {
+            assert_eq!(
+                CandidateMachine::test_extract_all(input),
+                Vec::<&str>::new()
+            );
+        }
+    }
+
+    #[test]
+    fn test_js_interpolation() {
+        for (input, expected) in [
+            // Utilities
+            // Arbitrary value
+            ("bg-[${color}]", vec![]),
+            // Arbitrary property
+            ("[color:${value}]", vec![]),
+            ("[${key}:value]", vec![]),
+            ("[${key}:${value}]", vec![]),
+            // Arbitrary property for CSS variables
+            ("[--color:${value}]", vec![]),
+            ("[--color-${name}:value]", vec![]),
+            // Arbitrary variable
+            ("bg-(--my-${name})", vec![]),
+            ("bg-(--my-variable,${fallback})", vec![]),
+            (
+                "bg-(--my-image,url('https://example.com?q=${value}'))",
+                vec!["bg-(--my-image,url('https://example.com?q=${value}'))"],
+            ),
+            // Variants
+            ("data-[state=${state}]:flex", vec![]),
+            ("support-(--my-${value}):flex", vec![]),
+            ("support-(--my-variable,${fallback}):flex", vec![]),
+            ("[@media(width>=${value})]:flex", vec![]),
+        ] {
+            assert_eq!(CandidateMachine::test_extract_all(input), expected);
+        }
+    }
+}
diff --git a/crates/oxide/src/extractor/css_variable_machine.rs b/crates/oxide/src/extractor/css_variable_machine.rs
new file mode 100644
index 000000000..7beb827ee
--- /dev/null
+++ b/crates/oxide/src/extractor/css_variable_machine.rs
@@ -0,0 +1,214 @@
+use crate::cursor;
+use crate::extractor::machine::{Machine, MachineState};
+use classification_macros::ClassifyBytes;
+
+/// Extract CSS variables from an input.
+///
+/// E.g.:
+///
+/// ```text
+/// var(--my-variable)
+///     ^^^^^^^^^^^^^
+/// ```
+#[derive(Debug, Default)]
+pub struct CssVariableMachine;
+
+impl Machine for CssVariableMachine {
+    #[inline(always)]
+    fn reset(&mut self) {}
+
+    #[inline]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        // CSS Variables must start with `--`
+        if Class::Dash != cursor.curr().into() || Class::Dash != cursor.next().into() {
+            return MachineState::Idle;
+        }
+
+        let start_pos = cursor.pos;
+        let len = cursor.input.len();
+
+        cursor.advance_twice();
+
+        while cursor.pos < len {
+            match cursor.curr().into() {
+                // https://drafts.csswg.org/css-syntax-3/#ident-token-diagram
+                //
+                Class::AllowedCharacter | Class::Dash => {
+                    match cursor.next().into() {
+                        // Valid character followed by a valid character or an escape character
+                        //
+                        // E.g.: `--my-variable`
+                        //                ^^
+                        // E.g.: `--my-\#variable`
+                        //            ^^
+                        Class::AllowedCharacter | Class::Dash | Class::Escape => cursor.advance(),
+
+                        // Valid character followed by anything else means the variable is done
+                        //
+                        // E.g.: `'--my-variable'`
+                        //                      ^
+                        _ => {
+                            // There must be at least 1 character after the `--`
+                            if cursor.pos - start_pos < 2 {
+                                return self.restart();
+                            } else {
+                                return self.done(start_pos, cursor);
+                            }
+                        }
+                    }
+                }
+
+                Class::Escape => match cursor.next().into() {
+                    // An escaped whitespace character is not allowed
+                    //
+                    // In CSS it is allowed, but in the context of a class it's not because then we
+                    // would have spaces in the class.
+                    //
+                    // E.g.: `bg-(--my-\ color)`
+                    //                  ^
+                    Class::Whitespace => return self.restart(),
+
+                    // An escape at the end of the class is not allowed
+                    Class::End => return self.restart(),
+
+                    // An escaped character, skip the next character, resume after
+                    //
+                    // E.g.: `--my-\#variable`
+                    //             ^           We are here
+                    //               ^         Resume here
+                    _ => cursor.advance_twice(),
+                },
+
+                // Character is not valid anymore
+                _ => return self.restart(),
+            }
+        }
+
+        MachineState::Idle
+    }
+}
+
+#[derive(Clone, Copy, PartialEq, ClassifyBytes)]
+enum Class {
+    #[bytes(b'-')]
+    Dash,
+
+    #[bytes(b'_')]
+    #[bytes_range(b'a'..=b'z', b'A'..=b'Z', b'0'..=b'9')]
+    // non-ASCII (such as Emoji): https://drafts.csswg.org/css-syntax-3/#non-ascii-ident-code-point
+    #[bytes_range(0x80..=0xff)]
+    AllowedCharacter,
+
+    #[bytes(b'\\')]
+    Escape,
+
+    #[bytes(b' ', b'\t', b'\n', b'\r', b'\x0C')]
+    Whitespace,
+
+    #[bytes(b'\0')]
+    End,
+
+    #[fallback]
+    Other,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::CssVariableMachine;
+    use crate::extractor::machine::Machine;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    #[ignore]
+    fn test_css_variable_machine_performance() {
+        let input = r#"This sentence will contain a few variables here and there var(--my-variable) --other-variable-1\/2 var(--more-variables-here)"#.repeat(100);
+
+        CssVariableMachine::test_throughput(100_000, &input);
+        CssVariableMachine::test_duration_once(&input);
+
+        todo!();
+    }
+
+    #[test]
+    fn test_css_variable_machine_extraction() {
+        for (input, expected) in [
+            // Simple variable
+            ("--foo", vec!["--foo"]),
+            ("--my-variable", vec!["--my-variable"]),
+            // Multiple variables
+            (
+                "calc(var(--first) + var(--second))",
+                vec!["--first", "--second"],
+            ),
+            // Variables with... emojis
+            ("--😀", vec!["--😀"]),
+            ("--😀-😁", vec!["--😀-😁"]),
+            // Escaped character in the middle, skips the next character
+            (r#"--spacing-1\/2"#, vec![r#"--spacing-1\/2"#]),
+            // Escaped whitespace is not allowed
+            (r#"--my-\ variable"#, vec![]),
+            // --------------------------
+            //
+            // Exceptions
+            // Not a valid variable
+            ("", vec![]),
+            ("-", vec![]),
+            ("--", vec![]),
+        ] {
+            for wrapper in [
+                // No wrapper
+                "{}",
+                // With leading spaces
+                " {}",
+                // With trailing spaces
+                "{} ",
+                // Surrounded by spaces
+                " {} ",
+                // Inside a string
+                "'{}'",
+                // Inside a function call
+                "fn({})",
+                // Inside nested function calls
+                "fn1(fn2({}))",
+                // --------------------------
+                //
+                // HTML
+                // Inside a class (on its own)
+                r#"<div class="{}"></div>"#,
+                // Inside a class (first)
+                r#"<div class="{} foo"></div>"#,
+                // Inside a class (second)
+                r#"<div class="foo {}"></div>"#,
+                // Inside a class (surrounded)
+                r#"<div class="foo {} bar"></div>"#,
+                // Inside an arbitrary property
+                r#"<div class="[{}:red]"></div>"#,
+                // --------------------------
+                //
+                // JavaScript
+                // Inside a variable
+                r#"let classes = '{}';"#,
+                // Inside an object (key)
+                r#"let classes = { '{}': true };"#,
+                // Inside an object (no spaces, key)
+                r#"let classes = {'{}':true};"#,
+                // Inside an object (value)
+                r#"let classes = { primary: '{}' };"#,
+                // Inside an object (no spaces, value)
+                r#"let classes = {primary:'{}'};"#,
+                // Inside an array
+                r#"let classes = ['{}'];"#,
+            ] {
+                let input = wrapper.replace("{}", input);
+
+                let actual = CssVariableMachine::test_extract_all(&input);
+
+                if actual != expected {
+                    dbg!(&input);
+                }
+
+                assert_eq!(actual, expected);
+            }
+        }
+    }
+}
diff --git a/crates/oxide/src/extractor/machine.rs b/crates/oxide/src/extractor/machine.rs
new file mode 100644
index 000000000..5874e4b63
--- /dev/null
+++ b/crates/oxide/src/extractor/machine.rs
@@ -0,0 +1,161 @@
+use crate::cursor;
+
+#[derive(Debug, Clone, Copy)]
+pub struct Span {
+    /// Inclusive start position of the span
+    pub start: usize,
+
+    /// Inclusive end position of the span
+    pub end: usize,
+}
+
+impl Span {
+    pub fn new(start: usize, end: usize) -> Self {
+        Self { start, end }
+    }
+
+    #[inline(always)]
+    pub fn slice<'a>(&self, input: &'a [u8]) -> &'a [u8] {
+        &input[self.start..=self.end]
+    }
+}
+
+#[derive(Debug, Default)]
+pub enum MachineState {
+    /// Machine is not doing anything at the moment
+    #[default]
+    Idle,
+
+    /// Machine is done parsing and has extracted a span
+    Done(Span),
+}
+
+pub trait Machine: Sized + Default {
+    fn reset(&mut self);
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState;
+
+    /// Reset the state machine, and mark the machine as [MachineState::Idle].
+    #[inline(always)]
+    fn restart(&mut self) -> MachineState {
+        self.reset();
+        MachineState::Idle
+    }
+
+    /// Reset the state machine, and mark the machine as [MachineState::Done(…)].
+    #[inline(always)]
+    fn done(&mut self, start: usize, cursor: &cursor::Cursor<'_>) -> MachineState {
+        self.reset();
+        MachineState::Done(Span::new(start, cursor.pos))
+    }
+
+    #[cfg(test)]
+    fn test_throughput(iterations: usize, input: &str) {
+        use crate::throughput::Throughput;
+        use std::hint::black_box;
+
+        let input = input.as_bytes();
+        let len = input.len();
+
+        let throughput = Throughput::compute(iterations, len, || {
+            let mut machine = Self::default();
+            let mut cursor = cursor::Cursor::new(input);
+
+            while cursor.pos < len {
+                _ = black_box(machine.next(&mut cursor));
+
+                cursor.advance();
+            }
+        });
+        eprintln!(
+            "{}: Throughput: {}",
+            std::any::type_name::<Self>(),
+            throughput
+        );
+    }
+
+    #[cfg(test)]
+    fn test_duration_once(input: &str) {
+        use std::hint::black_box;
+
+        let input = input.as_bytes();
+        let len = input.len();
+
+        let duration = {
+            let start = std::time::Instant::now();
+            let mut machine = Self::default();
+            let mut cursor = cursor::Cursor::new(input);
+
+            while cursor.pos < len {
+                _ = black_box(machine.next(&mut cursor));
+
+                cursor.advance();
+            }
+
+            start.elapsed()
+        };
+        eprintln!(
+            "{}:   Duration: {:?}",
+            std::any::type_name::<Self>(),
+            duration
+        );
+    }
+
+    #[cfg(test)]
+    fn test_duration_n(n: usize, input: &str) {
+        use std::hint::black_box;
+
+        let input = input.as_bytes();
+        let len = input.len();
+
+        let duration = {
+            let start = std::time::Instant::now();
+
+            for _ in 0..n {
+                let mut machine = Self::default();
+                let mut cursor = cursor::Cursor::new(input);
+
+                while cursor.pos < len {
+                    _ = black_box(machine.next(&mut cursor));
+
+                    cursor.advance();
+                }
+            }
+
+            start.elapsed()
+        };
+        eprintln!(
+            "{}:   Duration: {:?} ({} iterations, ~{:?} per iteration)",
+            std::any::type_name::<Self>(),
+            duration,
+            n,
+            duration / n as u32
+        );
+    }
+
+    #[cfg(test)]
+    fn test_extract_all(input: &str) -> Vec<&str> {
+        input
+            // Mimicking the behavior of how we parse lines individually
+            .split_terminator("\n")
+            .flat_map(|input| {
+                let mut machine = Self::default();
+                let mut cursor = cursor::Cursor::new(input.as_bytes());
+
+                let mut actual: Vec<&str> = vec![];
+                let len = cursor.input.len();
+
+                while cursor.pos < len {
+                    if let MachineState::Done(span) = machine.next(&mut cursor) {
+                        actual.push(unsafe {
+                            std::str::from_utf8_unchecked(span.slice(cursor.input))
+                        });
+                    }
+
+                    cursor.advance();
+                }
+
+                actual
+            })
+            .collect()
+    }
+}
diff --git a/crates/oxide/src/extractor/mod.rs b/crates/oxide/src/extractor/mod.rs
new file mode 100644
index 000000000..a3d806a27
--- /dev/null
+++ b/crates/oxide/src/extractor/mod.rs
@@ -0,0 +1,1149 @@
+use crate::cursor;
+use crate::extractor::machine::Span;
+use candidate_machine::CandidateMachine;
+use css_variable_machine::CssVariableMachine;
+use machine::{Machine, MachineState};
+use std::fmt;
+
+pub mod arbitrary_property_machine;
+pub mod arbitrary_value_machine;
+pub mod arbitrary_variable_machine;
+mod boundary;
+pub mod bracket_stack;
+pub mod candidate_machine;
+pub mod css_variable_machine;
+pub mod machine;
+pub mod modifier_machine;
+pub mod named_utility_machine;
+pub mod named_variant_machine;
+pub mod pre_processors;
+pub mod string_machine;
+pub mod utility_machine;
+pub mod variant_machine;
+
+#[derive(Debug)]
+pub enum Extracted<'a> {
+    /// Extracted a valid looking candidate
+    ///
+    /// E.g.: `flex`
+    ///
+    Candidate(&'a [u8]),
+
+    /// Extracted a valid looking CSS variable
+    ///
+    /// E.g.: `--my-variable`
+    ///
+    CssVariable(&'a [u8]),
+}
+
+impl fmt::Display for Extracted<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Extracted::Candidate(candidate) => {
+                write!(f, "Candidate({})", std::str::from_utf8(candidate).unwrap())
+            }
+            Extracted::CssVariable(candidate) => {
+                write!(
+                    f,
+                    "CssVariable({})",
+                    std::str::from_utf8(candidate).unwrap()
+                )
+            }
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Extractor<'a> {
+    cursor: cursor::Cursor<'a>,
+
+    css_variable_machine: CssVariableMachine,
+    candidate_machine: CandidateMachine,
+}
+
+impl<'a> Extractor<'a> {
+    pub fn new(input: &'a [u8]) -> Self {
+        Self {
+            cursor: cursor::Cursor::new(input),
+
+            css_variable_machine: Default::default(),
+            candidate_machine: Default::default(),
+        }
+    }
+
+    pub fn extract(&mut self) -> Vec<Extracted<'a>> {
+        // Candidates found by inner candidate machines. If the outer machine finds a solution, we
+        // can discard the inner machines. Otherwise, we can keep the candidates from the inner
+        // machines.
+        let mut in_flight_spans: Vec<Span> = Vec::with_capacity(15);
+
+        // All the extracted values
+        let mut extracted = Vec::with_capacity(100);
+
+        let len = self.cursor.input.len();
+
+        // CSS Variable extractor
+        {
+            let cursor = &mut self.cursor.clone();
+            while cursor.pos < len {
+                if cursor.curr().is_ascii_whitespace() {
+                    cursor.advance();
+                    continue;
+                }
+
+                if let MachineState::Done(span) = self.css_variable_machine.next(cursor) {
+                    extracted.push(Extracted::CssVariable(span.slice(self.cursor.input)));
+                }
+
+                cursor.advance();
+            }
+        }
+
+        // Candidate extractor
+        {
+            let cursor = &mut self.cursor.clone();
+
+            while cursor.pos < len {
+                if cursor.curr().is_ascii_whitespace() {
+                    cursor.advance();
+                    continue;
+                }
+
+                let before = cursor.pos;
+                match self.candidate_machine.next(cursor) {
+                    MachineState::Done(span) => {
+                        in_flight_spans.push(span);
+                        extract_sub_candidates(before..span.start, cursor, &mut in_flight_spans);
+                    }
+                    MachineState::Idle => {
+                        extract_sub_candidates(
+                            before..cursor.pos.min(cursor.input.len()),
+                            cursor,
+                            &mut in_flight_spans,
+                        );
+                    }
+                }
+
+                cursor.advance();
+            }
+
+            // Commit the remaining in-flight spans as extracted candidates
+            if !in_flight_spans.is_empty() {
+                extracted.extend(
+                    drop_covered_spans(in_flight_spans)
+                        .iter()
+                        .map(|span| Extracted::Candidate(span.slice(self.cursor.input))),
+                );
+            }
+        }
+
+        extracted
+    }
+
+    pub fn extract_variables_from_css(&mut self) -> Vec<Extracted<'a>> {
+        let mut extracted = Vec::with_capacity(100);
+
+        let len = self.cursor.input.len();
+
+        let cursor = &mut self.cursor.clone();
+        while cursor.pos < len {
+            if cursor.curr().is_ascii_whitespace() {
+                cursor.advance();
+                continue;
+            }
+
+            if let MachineState::Done(span) = self.css_variable_machine.next(cursor) {
+                // We are only interested in variables that are used, not defined. Therefore we
+                // need to ensure that the variable is prefixed with `var(`.
+                if span.start < 4 {
+                    cursor.advance();
+                    continue;
+                }
+
+                let slice_before = Span::new(span.start - 4, span.start - 1);
+                if !slice_before.slice(self.cursor.input).starts_with(b"var(") {
+                    cursor.advance();
+                    continue;
+                }
+
+                extracted.push(Extracted::CssVariable(span.slice(self.cursor.input)));
+            }
+
+            cursor.advance();
+        }
+
+        extracted
+    }
+}
+
+// Extract sub-candidates from a given range.
+//
+// E.g.: `[ClassPrefix('gap-y-4')]` will not be a valid candidate or variant. In that case we want
+//       to extract candidates from inside the `[…]`.
+//
+// ```
+// [ClassPrefix('gap-y-4')]
+//  ^ Try again here
+// ```
+#[inline(always)]
+fn extract_sub_candidates(
+    range: std::ops::Range<usize>,
+    cursor: &cursor::Cursor<'_>,
+    in_flight_spans: &mut Vec<Span>,
+) {
+    let end = range.end;
+    for i in range {
+        if cursor.input[i] == b'[' {
+            let mut cursor = cursor.clone();
+            cursor.move_to(i + 1);
+
+            let mut machine = CandidateMachine::default();
+
+            while cursor.pos < end {
+                if let MachineState::Done(span) = machine.next(&mut cursor) {
+                    in_flight_spans.push(span);
+                }
+
+                cursor.advance();
+            }
+        }
+    }
+}
+
+fn drop_covered_spans(mut spans: Vec<Span>) -> Vec<Span> {
+    if spans.len() <= 1 {
+        return spans;
+    }
+
+    spans.sort_by(|a, b| a.start.cmp(&b.start).then(b.end.cmp(&a.end)));
+
+    let mut result = Vec::with_capacity(spans.len());
+    let mut max_end = None;
+
+    for span in spans {
+        if max_end.is_none_or(|end| span.end > end) {
+            result.push(span);
+            max_end = Some(span.end);
+        }
+    }
+
+    result
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{Extracted, Extractor};
+    use crate::throughput::Throughput;
+    use pretty_assertions::assert_eq;
+    use std::hint::black_box;
+
+    fn pre_process_input(input: &str, extension: &str) -> String {
+        let input = crate::scanner::pre_process_input(input.as_bytes().to_vec(), extension);
+        String::from_utf8(input).unwrap()
+    }
+
+    fn extract_sorted_candidates(input: &str) -> Vec<&str> {
+        let mut machine = Extractor::new(input.as_bytes());
+        let mut actual = machine
+            .extract()
+            .iter()
+            .filter_map(|x| match x {
+                Extracted::Candidate(candidate) => std::str::from_utf8(candidate).ok(),
+                Extracted::CssVariable(_) => None,
+            })
+            .collect::<Vec<_>>();
+        actual.sort();
+        actual
+    }
+
+    fn extract_sorted_css_variables(input: &str) -> Vec<&str> {
+        let mut machine = Extractor::new(input.as_bytes());
+        let mut actual = machine
+            .extract()
+            .iter()
+            .filter_map(|x| match x {
+                Extracted::Candidate(_) => None,
+                Extracted::CssVariable(bytes) => std::str::from_utf8(bytes).ok(),
+            })
+            .collect::<Vec<_>>();
+        actual.sort();
+        actual
+    }
+
+    fn assert_extract_sorted_candidates(input: &str, expected: Vec<&str>) {
+        let mut actual = extract_sorted_candidates(input);
+        actual.sort();
+        actual.dedup();
+
+        let mut expected = expected;
+        expected.sort();
+        expected.dedup();
+
+        if actual != expected {
+            dbg!(&input);
+        }
+        assert_eq!(actual, expected);
+    }
+
+    fn assert_extract_candidates_contains(input: &str, expected: Vec<&str>) {
+        let actual = extract_sorted_candidates(input);
+
+        let mut missing = vec![];
+        for item in &expected {
+            if !actual.contains(item) {
+                missing.push(item);
+            }
+        }
+
+        if !missing.is_empty() {
+            dbg!(&actual, &missing);
+            panic!("Missing some items");
+        }
+    }
+
+    fn assert_extract_sorted_css_variables(input: &str, expected: Vec<&str>) {
+        let actual = extract_sorted_css_variables(input);
+
+        let mut expected = expected;
+        expected.sort();
+
+        if actual != expected {
+            dbg!(&input);
+        }
+        assert_eq!(actual, expected);
+    }
+
+    #[test]
+    #[ignore]
+    fn test_extract_performance() {
+        if true {
+            let iterations = 50_000;
+
+            let input = include_bytes!("../fixtures/example.html");
+
+            let throughput = Throughput::compute(iterations, input.len(), || {
+                let mut extractor = Extractor::new(input);
+                _ = black_box(extractor.extract());
+            });
+            eprintln!("Extractor throughput: {:}", throughput);
+
+            let mut extractor = Extractor::new(input);
+            let start = std::time::Instant::now();
+            _ = black_box(extractor.extract().len());
+            let end = start.elapsed();
+            eprintln!("Extractor took: {:?}", end);
+
+            todo!();
+        }
+    }
+
+    #[test]
+    fn test_candidates_extraction() {
+        for (input, expected) in [
+            // Simple utility
+            ("flex", vec!["flex"]),
+            // Single character utility
+            ("a", vec!["a"]),
+            // Simple variant with simple utility
+            ("hover:flex", vec!["hover:flex"]),
+            // Multiple utilities
+            ("flex block", vec!["flex", "block"]),
+            // Simple utility with dashes
+            ("items-center", vec!["items-center"]),
+            ("items--center", vec!["items--center"]),
+            // Simple utility with numbers
+            ("px-2.5", vec!["px-2.5"]),
+            // Arbitrary properties
+            ("[color:red]", vec!["[color:red]"]),
+            ("![color:red]", vec!["![color:red]"]),
+            ("[color:red]!", vec!["[color:red]!"]),
+            ("[color:red]/20", vec!["[color:red]/20"]),
+            ("![color:red]/20", vec!["![color:red]/20"]),
+            ("[color:red]/20!", vec!["[color:red]/20!"]),
+            // In HTML
+            (
+                r#"<div class="flex items-center px-2.5 bg-[#0088cc] text-(--my-color)"></div>"#,
+                vec![
+                    "class",
+                    "flex",
+                    "items-center",
+                    "px-2.5",
+                    "bg-[#0088cc]",
+                    "text-(--my-color)",
+                ],
+            ),
+            // In an array, looks like an arbitrary property (because it starts with `[`).
+            (r#"["flex"]"#, vec!["flex"]),
+            (r#"["p-2.5"]"#, vec!["p-2.5"]),
+            (r#"["flex","p-2.5"]"#, vec!["flex", "p-2.5"]),
+            (r#"["flex", "p-2.5"]"#, vec!["flex", "p-2.5"]),
+            // Overlapping candidates, outer candidate should win
+            (
+                r#"[CssClass("[&:hover]:flex",'italic')]"#,
+                vec!["[&:hover]:flex", "italic"],
+            ),
+            (
+                r#"["flex",["italic",["underline"]]]"#,
+                vec!["flex", "italic", "underline"],
+            ),
+            (r#"[:is(italic):is(underline)]"#, vec![]),
+            (
+                r#"[:is(italic):is(underline)]:flex"#,
+                vec!["[:is(italic):is(underline)]:flex"],
+            ),
+            (r#"[:div {:class ["p-2""#, vec!["p-2"]),
+            (r#"               "text-green"]}"#, vec!["text-green"]),
+            (r#"[:div.p-2]"#, vec!["p-2"]),
+            // Longer example with mixed types of variants and utilities
+            (
+                "[&>[data-slot=icon]:last-child]:right-2.5",
+                vec!["[&>[data-slot=icon]:last-child]:right-2.5"],
+            ),
+            (
+                "sm:[&>[data-slot=icon]:last-child]:right-2.5",
+                vec!["sm:[&>[data-slot=icon]:last-child]:right-2.5"],
+            ),
+            // --------------------------------------------------------
+
+            // Exceptions:
+            //
+            // Keys inside of a JS object could be a variant-less candidate. Vue example.
+            ("{ underline: true }", vec!["underline", "true"]),
+            (
+                r#"            <CheckIcon className={clsx('h-4 w-4', { invisible: index !== 0 })} />"#,
+                vec!["className", "h-4", "w-4", "invisible", "index"],
+            ),
+            // You can have variants but in a string. Vue example.
+            (
+                "{ 'hover:underline': true }",
+                vec!["hover:underline", "true"],
+            ),
+            // Important marker on both sides is invalid
+            ("!flex!", vec![]),
+            // Important marker before a modifier is invalid
+            ("bg-red-500!/20", vec![]),
+            // HTML start of a tag
+            ("<div", vec![]),
+            // HTML end of a tag
+            ("</div>", vec![]),
+            // HTML element on its own
+            ("<div></div>", vec![]),
+            // Modifier followed by a modifier is invalid
+            ("bg-red-500/20/20", vec![]),
+            ("bg-red-500/20/[20%]", vec![]),
+            ("bg-red-500/20/(--my-opacity)", vec![]),
+            ("bg-red-500/[20%]/20", vec![]),
+            ("bg-red-500/[20%]/[20%]", vec![]),
+            ("bg-red-500/[20%]/(--my-opacity)", vec![]),
+            ("bg-red-500/(--my-opacity)/20", vec![]),
+            ("bg-red-500/(--my-opacity)/[20%]", vec![]),
+            ("bg-red-500/(--my-opacity)/(--my-opacity)", vec![]),
+            // Arbitrary value followed by an arbitrary value is invalid
+            ("bg-[red]-[blue]", vec![]),
+            ("bg-[red][blue]", vec![]),
+            // Arbitrary value followed by an arbitrary variable is invalid
+            ("bg-[red]-(--my-color)", vec![]),
+            ("bg-[red](--my-color)", vec![]),
+            // Important looking utility cannot be followed by another utility
+            ("flex!block", vec![]),
+            // Invalid variants make the whole candidate invalid
+            ("[foo]/bar:flex", vec![]),
+            // Utilities cannot start with `_`
+            ("_blank", vec![]),
+            ("hover:_blank", vec![]),
+            ("hover:focus:_blank", vec![]),
+        ] {
+            assert_extract_sorted_candidates(input, expected);
+        }
+    }
+
+    #[test]
+    fn test_extractor_extract_candidates() {
+        for (input, expected) in [
+            // Simple utility
+            ("flex", vec!["flex"]),
+            // Simple utility with special character(s)
+            ("@container", vec!["@container"]),
+            // Single character utility
+            ("a", vec!["a"]),
+            // Simple utility with dashes
+            ("items-center", vec!["items-center"]),
+            // Simple utility with numbers
+            ("px-2.5", vec!["px-2.5"]),
+            // Simple variant with simple utility
+            ("hover:flex", vec!["hover:flex"]),
+            // Arbitrary properties
+            ("[color:red]", vec!["[color:red]"]),
+            ("![color:red]", vec!["![color:red]"]),
+            ("[color:red]!", vec!["[color:red]!"]),
+            ("[color:red]/20", vec!["[color:red]/20"]),
+            ("![color:red]/20", vec!["![color:red]/20"]),
+            ("[color:red]/20!", vec!["[color:red]/20!"]),
+            // With multiple variants
+            ("hover:focus:flex", vec!["hover:focus:flex"]),
+            // Exceptions:
+            //
+            // Keys inside of a JS object could be a variant-less candidate. Vue example.
+            ("{ underline: true }", vec!["underline", "true"]),
+            // With complex variants
+            (
+                "[&>[data-slot=icon]:last-child]:right-2.5",
+                vec!["[&>[data-slot=icon]:last-child]:right-2.5"],
+            ),
+            // With multiple (complex) variants
+            (
+                "[&>[data-slot=icon]:last-child]:sm:right-2.5",
+                vec!["[&>[data-slot=icon]:last-child]:sm:right-2.5"],
+            ),
+            (
+                "sm:[&>[data-slot=icon]:last-child]:right-2.5",
+                vec!["sm:[&>[data-slot=icon]:last-child]:right-2.5"],
+            ),
+            // Exceptions regarding boundaries
+            //
+            // `flex!` is valid, but since it's followed by a non-boundary character it's invalid.
+            // `block` is therefore also invalid because it didn't start after a boundary.
+            ("flex!block", vec![]),
+        ] {
+            for (wrapper, additional) in [
+                // No wrapper
+                ("{}", vec![]),
+                // With leading spaces
+                (" {}", vec![]),
+                ("  {}", vec![]),
+                ("   {}", vec![]),
+                // With trailing spaces
+                ("{} ", vec![]),
+                ("{}  ", vec![]),
+                ("{}   ", vec![]),
+                // Surrounded by spaces
+                (" {} ", vec![]),
+                // Inside a string
+                ("'{}'", vec![]),
+                // Inside a function call
+                ("fn('{}')", vec![]),
+                // Inside nested function calls
+                ("fn1(fn2('{}'))", vec![]),
+                // --------------------------
+                //
+                // HTML
+                // Inside a class (on its own)
+                (r#"<div class="{}"></div>"#, vec!["class"]),
+                // Inside a class (first)
+                (r#"<div class="{} foo"></div>"#, vec!["class", "foo"]),
+                // Inside a class (second)
+                (r#"<div class="foo {}"></div>"#, vec!["class", "foo"]),
+                // Inside a class (surrounded)
+                (
+                    r#"<div class="foo {} bar"></div>"#,
+                    vec!["class", "foo", "bar"],
+                ),
+                // --------------------------
+                //
+                // JavaScript
+                // Inside a variable
+                (r#"let classes = '{}';"#, vec!["let", "classes"]),
+                // Inside an object (key)
+                (
+                    r#"let classes = { '{}': true };"#,
+                    vec!["let", "classes", "true"],
+                ),
+                // Inside an object (no spaces, key)
+                (r#"let classes = {'{}':true};"#, vec!["let", "classes"]),
+                // Inside an object (value)
+                (
+                    r#"let classes = { primary: '{}' };"#,
+                    vec!["let", "classes", "primary"],
+                ),
+                // Inside an object (no spaces, value)
+                (r#"let classes = {primary:'{}'};"#, vec!["let", "classes"]),
+                // Inside an array
+                (r#"let classes = ['{}'];"#, vec!["let", "classes"]),
+            ] {
+                let input = &wrapper.replace("{}", input);
+                let mut expected = expected.clone();
+                expected.extend(additional);
+
+                assert_extract_sorted_candidates(input, expected);
+            }
+        }
+    }
+
+    #[test]
+    fn test_ruby_syntax() {
+        for (input, expected) in [
+            (r#"%w[flex]"#, vec!["flex"]),
+            (r#"%w[flex items-center]"#, vec!["flex", "items-center"]),
+            (r#"%w[[color:red]]"#, vec!["[color:red]"]),
+            // See: https://github.com/tailwindlabs/tailwindcss/issues/13778
+            (
+                r#"def call = tag.span "Foo", class: %w[rounded-full h-0.75 w-0.75]"#,
+                vec![
+                    "def",
+                    "call",
+                    "span",
+                    "class",
+                    "rounded-full",
+                    "h-0.75",
+                    "w-0.75",
+                ],
+            ),
+            (
+                r#"def call = tag.span "Foo", class: %w[rounded-full w-0.75 h-0.75]"#,
+                vec![
+                    "def",
+                    "call",
+                    "span",
+                    "class",
+                    "rounded-full",
+                    "h-0.75",
+                    "w-0.75",
+                ],
+            ),
+            (
+                r#"def call = tag.span "Foo", class: %w[w-0.75 h-0.75 rounded-full]"#,
+                vec![
+                    "def",
+                    "call",
+                    "span",
+                    "class",
+                    "rounded-full",
+                    "h-0.75",
+                    "w-0.75",
+                ],
+            ),
+            // Other similar syntaxes
+            (r#"%w[flex]"#, vec!["flex"]),
+            (r#"%w(flex)"#, vec!["flex"]),
+        ] {
+            assert_extract_sorted_candidates(&pre_process_input(input, "rb"), expected);
+        }
+    }
+
+    // Pug syntax, see: https://github.com/tailwindlabs/tailwindcss/issues/14005
+    #[test]
+    fn test_pug_syntax() {
+        for (input, expected) in [
+            // Class literal
+            (
+                ".bg-green-300.2xl:bg-red-500",
+                vec!["bg-green-300", "2xl:bg-red-500"],
+            ),
+            (
+                ".2xl:bg-red-500.bg-green-300",
+                vec!["bg-green-300", "2xl:bg-red-500"],
+            ),
+            (".xl:col-span-2.xl:pr-8", vec!["xl:col-span-2", "xl:pr-8"]),
+            (
+                "div.2xl:bg-red-500.bg-green-300",
+                vec!["div", "bg-green-300", "2xl:bg-red-500"],
+            ),
+            // Quoted attribute
+            (
+                r#"input(type="checkbox" class="px-2.5")"#,
+                vec!["input", "type", "checkbox", "class", "px-2.5"],
+            ),
+        ] {
+            assert_extract_sorted_candidates(&pre_process_input(input, "pug"), expected);
+        }
+    }
+
+    // Slim syntax, see: https://github.com/tailwindlabs/tailwindcss/issues/16790
+    #[test]
+    fn test_slim_syntax() {
+        for (input, expected) in [
+            // Class literal
+            (
+                ".bg-blue-100.2xl:bg-red-100",
+                vec!["bg-blue-100", "2xl:bg-red-100"],
+            ),
+            (
+                ".2xl:bg-red-100.bg-blue-100",
+                vec!["bg-blue-100", "2xl:bg-red-100"],
+            ),
+            // Quoted attribute
+            (r#"div class="px-2.5""#, vec!["div", "class", "px-2.5"]),
+        ] {
+            assert_extract_sorted_candidates(&pre_process_input(input, "slim"), expected);
+        }
+    }
+
+    // C# syntax, see: https://github.com/tailwindlabs/tailwindcss/issues/16189#issue-2826350984
+    #[test]
+    fn test_csharp_syntax() {
+        for (input, expected) in [
+            // Not a valid arbitrary value or variant
+            // Extract inner candidates: `gap-y-4`
+            (r#"[CssClass("gap-y-4")]"#, vec!["gap-y-4"]),
+            (r#"[CssClass("hover:gap-y-4")]"#, vec!["hover:gap-y-4"]),
+            // Valid arbitrary variant + utility, extract full candidate without inner candidates
+            (
+                r#"[CssClass("gap-y-4")]:flex"#,
+                vec![r#"[CssClass("gap-y-4")]:flex"#],
+            ),
+        ] {
+            assert_extract_sorted_candidates(input, expected);
+        }
+    }
+
+    // Clojure syntax, see: https://github.com/tailwindlabs/tailwindcss/issues/16189#issuecomment-2642438176
+    #[test]
+    fn test_clojure_syntax() {
+        for (input, expected) in [
+            (r#"[:div {:class ["p-2"]}"#, vec!["p-2"]),
+            (
+                r#"[:div {:class ["p-2" "text-green"]}"#,
+                vec!["p-2", "text-green"],
+            ),
+            (r#"[:div {:class ["p-2""#, vec!["p-2"]),
+            (r#"               "text-green"]}"#, vec!["text-green"]),
+            (r#"[:div.p-2]"#, vec!["p-2"]),
+            (r#"[:div {:class ["p-2"]}"#, vec!["p-2"]),
+            (
+                r#"[:div {:class ["p-2" "text-green"]}"#,
+                vec!["p-2", "text-green"],
+            ),
+        ] {
+            assert_extract_candidates_contains(&pre_process_input(input, "cljs"), expected);
+        }
+    }
+
+    // Gleam syntax, see: https://github.com/tailwindlabs/tailwindcss/issues/15632#issuecomment-2617431021
+    #[test]
+    fn test_gleam_syntax() {
+        for (input, expected) in [
+            (r#"html.div([attribute.class("py-10")], [])"#, vec!["py-10"]),
+            (
+                r#"html.div([attribute.class("hover:py-10")], [])"#,
+                vec!["hover:py-10"],
+            ),
+        ] {
+            assert_extract_sorted_candidates(input, expected);
+        }
+    }
+
+    #[test]
+    fn test_overlapping_candidates() {
+        for (input, expected) in [
+            // Not a valid arbitrary property
+            // Not a valid arbitrary variant
+            // Extract inner candidates
+            (
+                r#"[CssClass("[&:hover]:flex",'italic')]"#,
+                vec!["[&:hover]:flex", "italic"],
+            ),
+            // Not a valid arbitrary property or variant, array syntax
+            // Extract inner candidates
+            (
+                r#"["flex",["italic",["underline"]]]"#,
+                vec!["flex", "italic", "underline"],
+            ),
+            // Not a valid arbitrary variant (not followed by a candidate)
+            // Inner classes `is`, `italic` and `underline` are not valid in this context
+            (r#"[:is(italic):is(underline)]"#, vec![]),
+            // Valid arbitrary variant, nothing inside should be extracted
+            (
+                r#"[:is(italic):is(underline)]:flex"#,
+                vec!["[:is(italic):is(underline)]:flex"],
+            ),
+        ] {
+            assert_extract_sorted_candidates(input, expected);
+        }
+    }
+
+    #[test]
+    fn test_js_syntax() {
+        for (input, expected) in [
+            // String
+            (
+                r#"let classes = 'flex items-center';"#,
+                vec!["let", "classes", "flex", "items-center"],
+            ),
+            // Array
+            (
+                r#"let classes = ['flex', 'items-center'];"#,
+                vec!["let", "classes", "flex", "items-center"],
+            ),
+            // Minified array
+            (
+                r#"let classes = ['flex','items-center'];"#,
+                vec!["let", "classes", "flex", "items-center"],
+            ),
+            // Function call
+            (
+                r#"let classes = something('flex');"#,
+                vec!["let", "classes", "flex"],
+            ),
+            // Function call in array
+            (
+                r#"let classes = [wrapper('flex')]"#,
+                vec!["let", "classes", "flex"],
+            ),
+        ] {
+            assert_extract_sorted_candidates(input, expected);
+        }
+    }
+
+    // See: https://github.com/tailwindlabs/tailwindcss/issues/16750
+    #[test]
+    fn test_js_tuple_syntax() {
+        for (input, expected) in [
+            // Split
+            (
+                r#"["h-[calc(100vh-(var(--spacing)*8)-(var(--spacing)*14))]",\n  true],"#,
+                vec![
+                    "h-[calc(100vh-(var(--spacing)*8)-(var(--spacing)*14))]",
+                    "true",
+                ],
+            ),
+            // Same line
+            (
+                r#"["h-[calc(100vh-(var(--spacing)*8)-(var(--spacing)*14))]", true],"#,
+                vec![
+                    "h-[calc(100vh-(var(--spacing)*8)-(var(--spacing)*14))]",
+                    "true",
+                ],
+            ),
+            // Split with space in front
+            (
+                r#"[ "h-[calc(100vh-(var(--spacing)*8)-(var(--spacing)*14))]",\n  true],"#,
+                vec![
+                    "h-[calc(100vh-(var(--spacing)*8)-(var(--spacing)*14))]",
+                    "true",
+                ],
+            ),
+        ] {
+            assert_extract_sorted_candidates(input, expected);
+        }
+    }
+
+    // See: https://github.com/tailwindlabs/tailwindcss/issues/16801
+    #[test]
+    fn test_angular_binding_syntax() {
+        for (input, expected) in [
+            (
+                r#"'[ngClass]': `{"variant": variant(), "no-variant": !variant() }`"#,
+                vec!["variant", "no-variant"],
+            ),
+            (
+                r#"'[class]': '"bg-gradient-to-b px-6 py-3 rounded-3xl from-5%"',"#,
+                vec!["bg-gradient-to-b", "px-6", "py-3", "rounded-3xl", "from-5%"],
+            ),
+            (
+                r#"'[class.from-secondary-light]': `variant() === 'secondary'`,"#,
+                vec!["from-secondary-light", "secondary"],
+            ),
+            (
+                r#"'[class.to-secondary]': `variant() === 'secondary'`,"#,
+                vec!["to-secondary", "secondary"],
+            ),
+            (
+                r#"'[class.from-5%]': `variant() === 'secondary'`,"#,
+                vec!["from-5%", "secondary"],
+            ),
+            (
+                r#"'[class.from-1%]': `variant() === 'primary'`,"#,
+                vec!["from-1%", "primary"],
+            ),
+            (
+                r#"'[class.from-light-blue]': `variant() === 'primary'`,"#,
+                vec!["from-light-blue", "primary"],
+            ),
+            (
+                r#"'[class.to-primary]': `variant() === 'primary'`,"#,
+                vec!["to-primary", "primary"],
+            ),
+        ] {
+            assert_extract_sorted_candidates(input, expected);
+        }
+    }
+
+    #[test]
+    fn test_angular_binding_attribute_syntax() {
+        for (input, expected) in [
+            // Simple class
+            (
+                r#"<div [class.underline]="bool"></div>"#,
+                vec!["underline", "bool"],
+            ),
+            // With additional dots
+            (
+                r#"<div [class.px-2.5]="bool"></div>"#,
+                vec!["px-2.5", "bool"],
+            ),
+            // With additional square brackets
+            (
+                r#"<div [class.bg-[#0088cc]]="bool"></div>"#,
+                vec!["bg-[#0088cc]", "bool"],
+            ),
+        ] {
+            assert_extract_sorted_candidates(input, expected);
+        }
+    }
+
+    #[test]
+    fn test_svelte_shorthand_syntax() {
+        assert_extract_sorted_candidates(
+            &pre_process_input(r#"<div class:px-4='condition'></div>"#, "svelte"),
+            vec!["class", "px-4", "condition"],
+        );
+        assert_extract_sorted_candidates(
+            &pre_process_input(r#"<div class:flex='condition'></div>"#, "svelte"),
+            vec!["class", "flex", "condition"],
+        );
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/16999
+    #[test]
+    fn test_twig_syntax() {
+        assert_extract_candidates_contains(
+            r#"<div class="flex items-center mx-4{% if session.isValid %}{% else %} h-4{% endif %}"></div>"#,
+            vec!["flex", "items-center", "mx-4", "h-4"],
+        );
+
+        // With touching both `}` and `{`
+        assert_extract_candidates_contains(
+            r#"<div class="{% if true %}flex{% else %}block{% endif %}">"#,
+            vec!["flex", "block"],
+        );
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/20233
+    #[test]
+    fn test_template_toolkit_syntax() {
+        assert_extract_candidates_contains(
+            &pre_process_input(
+                r#"<div class="[% IF $is_open %]bg-white/40[% ELSE %]bg-white/10[% END %]"></div>"#,
+                "tx",
+            ),
+            vec!["bg-white/40", "bg-white/10"],
+        );
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/17050
+    #[test]
+    fn test_haml_syntax() {
+        for (input, expected) in [
+            // Element with classes
+            (
+                "%body.flex.flex-col.items-center.justify-center",
+                vec!["flex", "flex-col", "items-center", "justify-center"],
+            ),
+            // Plain element
+            (
+                ".text-slate-500.xl:text-gray-500",
+                vec!["text-slate-500", "xl:text-gray-500"],
+            ),
+            // Element with hash attributes
+            (
+                ".text-black.xl:text-red-500{ data: { tailwind: 'css' } }",
+                vec!["text-black", "xl:text-red-500"],
+            ),
+            // Element with a boolean attribute
+            (
+                ".text-green-500.xl:text-blue-500(data-sidebar)",
+                vec!["text-green-500", "xl:text-blue-500"],
+            ),
+            // Element with interpreted content
+            (
+                ".text-yellow-500.xl:text-purple-500= 'Element with interpreted content'",
+                vec!["text-yellow-500", "xl:text-purple-500"],
+            ),
+            // Element with a hash at the end and an extra class.
+            (
+                ".text-orange-500.xl:text-pink-500{ class: 'bg-slate-100' }",
+                vec!["text-orange-500", "xl:text-pink-500", "bg-slate-100"],
+            ),
+            // Object reference
+            (
+                ".text-teal-500.xl:text-indigo-500[@user, :greeting]",
+                vec!["text-teal-500", "xl:text-indigo-500"],
+            ),
+            // Element with an ID
+            (
+                ".text-lime-500.xl:text-emerald-500#root",
+                vec!["text-lime-500", "xl:text-emerald-500"],
+            ),
+        ] {
+            assert_extract_candidates_contains(&pre_process_input(input, "haml"), expected);
+        }
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/17088
+    #[test]
+    fn test_fluid_template_syntax() {
+        let input = r#"
+            <f:variable name="bgStyle">
+              <f:switch expression="{data.layout}">
+                <f:case value="0">from-blue-900 to-cyan-200</f:case>
+                <f:case value="1">from-cyan-600 to-teal-200</f:case>
+                <f:defaultCase>from-blue-300 to-cyan-100</f:defaultCase>
+              </f:switch>
+            </f:variable>
+        "#;
+
+        assert_extract_candidates_contains(
+            input,
+            vec![
+                "from-blue-900",
+                "to-cyan-200",
+                "from-cyan-600",
+                "to-teal-200",
+                "from-blue-300",
+                "to-cyan-100",
+            ],
+        );
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/16982
+    #[test]
+    fn test_arbitrary_container_queries_syntax() {
+        assert_extract_sorted_candidates(
+            r#"<div class="@md:flex @max-md:flex @-[36rem]:flex @[36rem]:flex"></div>"#,
+            vec![
+                "class",
+                "@md:flex",
+                "@max-md:flex",
+                "@-[36rem]:flex",
+                "@[36rem]:flex",
+            ],
+        );
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/17023
+    #[test]
+    fn test_js_embedded_in_php_syntax() {
+        // Escaped single quotes
+        let input = r#"
+            @php
+            if ($sidebarIsStashable) {
+                $attributes = $attributes->merge([
+                    'x-init' => '$el.classList.add(\'-translate-x-full\'); $el.classList.add(\'transition-transform\')',
+                ]);
+            }
+            @endphp
+        "#;
+        assert_extract_candidates_contains(
+            input,
+            vec!["-translate-x-full", "transition-transform"],
+        );
+
+        // Double quotes
+        let input = r#"
+            @php
+            if ($sidebarIsStashable) {
+                $attributes = $attributes->merge([
+                    'x-init' => "\$el.classList.add('-translate-x-full'); \$el.classList.add('transition-transform')",
+                ]);
+            }
+            @endphp
+        "#;
+        assert_extract_candidates_contains(
+            input,
+            vec!["-translate-x-full", "transition-transform"],
+        );
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/16978
+    #[test]
+    fn test_classes_containing_number_followed_by_dash_or_underscore() {
+        assert_extract_sorted_candidates(
+            r#"<div class="text-Title1_Strong"></div>"#,
+            vec!["class", "text-Title1_Strong"],
+        );
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/16983
+    #[test]
+    fn test_arbitrary_variable_with_data_type() {
+        assert_extract_sorted_candidates(
+            r#"<div class="bg-(length:--my-length) bg-[color:var(--my-color)]"></div>"#,
+            vec![
+                "class",
+                "bg-(length:--my-length)",
+                "bg-[color:var(--my-color)]",
+            ],
+        );
+    }
+
+    // See: https://github.com/tailwindlabs/tailwindcss/issues/18092
+    #[test]
+    fn test_leptos_rs_view_class_colon_syntax() {
+        for (input, expected) in [
+            (r#"<div class:px-6=true>"#, vec!["class", "px-6"]),
+            (
+                r#"view! { <div class:px-6=true> }"#,
+                vec!["class", "px-6", "view!"],
+            ),
+        ] {
+            assert_extract_sorted_candidates(&pre_process_input(input, "svelte"), expected);
+        }
+    }
+
+    #[test]
+    fn test_extract_css_variables() {
+        for (input, expected) in [
+            // Simple variable
+            ("--foo", vec!["--foo"]),
+            ("--my-variable", vec!["--my-variable"]),
+            // Multiple variables
+            (
+                "calc(var(--first) + var(--second))",
+                vec!["--first", "--second"],
+            ),
+            // Escaped character in the middle, skips the next character
+            (r#"--spacing-1\/2"#, vec![r#"--spacing-1\/2"#]),
+            // Escaped whitespace is not allowed
+            (r#"--my-\ variable"#, vec![]),
+        ] {
+            for wrapper in [
+                // No wrapper
+                "{}",
+                // With leading spaces
+                " {}",
+                // With trailing spaces
+                "{} ",
+                // Surrounded by spaces
+                " {} ",
+                // Inside a string
+                "'{}'",
+                // Inside a function call
+                "fn({})",
+                // Inside nested function calls
+                "fn1(fn2({}))",
+                // --------------------------
+                //
+                // HTML
+                // Inside a class (on its own)
+                r#"<div class="{}"></div>"#,
+                // Inside a class (first)
+                r#"<div class="{} foo"></div>"#,
+                // Inside a class (second)
+                r#"<div class="foo {}"></div>"#,
+                // Inside a class (surrounded)
+                r#"<div class="foo {} bar"></div>"#,
+                // Inside an arbitrary property
+                r#"<div class="[{}:red]"></div>"#,
+                // --------------------------
+                //
+                // JavaScript
+                // Inside a variable
+                r#"let classes = '{}';"#,
+                // Inside an object (key)
+                r#"let classes = { '{}': true };"#,
+                // Inside an object (no spaces, key)
+                r#"let classes = {'{}':true};"#,
+                // Inside an object (value)
+                r#"let classes = { primary: '{}' };"#,
+                // Inside an object (no spaces, value)
+                r#"let classes = {primary:'{}'};"#,
+                // Inside an array
+                r#"let classes = ['{}'];"#,
+            ] {
+                let input = wrapper.replace("{}", input);
+
+                assert_extract_sorted_css_variables(&input, expected.clone());
+            }
+        }
+    }
+}
diff --git a/crates/oxide/src/extractor/modifier_machine.rs b/crates/oxide/src/extractor/modifier_machine.rs
new file mode 100644
index 000000000..811bc9ded
--- /dev/null
+++ b/crates/oxide/src/extractor/modifier_machine.rs
@@ -0,0 +1,167 @@
+use crate::cursor;
+use crate::extractor::arbitrary_value_machine::ArbitraryValueMachine;
+use crate::extractor::arbitrary_variable_machine::ArbitraryVariableMachine;
+use crate::extractor::machine::{Machine, MachineState};
+use classification_macros::ClassifyBytes;
+
+/// Extract modifiers from an input including the `/`.
+///
+/// E.g.:
+///
+/// ```text
+/// bg-red-500/20
+///           ^^^
+///
+/// bg-red-500/[20%]
+///           ^^^^^^
+///
+/// bg-red-500/(--my-opacity)
+///           ^^^^^^^^^^^^^^^
+/// ```
+#[derive(Debug, Default)]
+pub struct ModifierMachine {
+    arbitrary_value_machine: ArbitraryValueMachine,
+    arbitrary_variable_machine: ArbitraryVariableMachine,
+}
+
+impl Machine for ModifierMachine {
+    #[inline(always)]
+    fn reset(&mut self) {}
+
+    #[inline]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        // A modifier must start with a `/`, everything else is not a valid start of a modifier
+        if Class::Slash != cursor.curr().into() {
+            return MachineState::Idle;
+        }
+
+        let start_pos = cursor.pos;
+        cursor.advance();
+
+        match cursor.curr().into() {
+            // Start of an arbitrary value:
+            //
+            // ```
+            // bg-red-500/[20%]
+            //            ^^^^^
+            // ```
+            Class::OpenBracket => match self.arbitrary_value_machine.next(cursor) {
+                MachineState::Idle => self.restart(),
+                MachineState::Done(_) => self.done(start_pos, cursor),
+            },
+
+            // Start of an arbitrary variable:
+            //
+            // ```
+            // bg-red-500/(--my-opacity)
+            //            ^^^^^^^^^^^^^^
+            // ```
+            Class::OpenParen => match self.arbitrary_variable_machine.next(cursor) {
+                MachineState::Idle => self.restart(),
+                MachineState::Done(_) => self.done(start_pos, cursor),
+            },
+
+            // Start of a named modifier:
+            //
+            // ```
+            // bg-red-500/20
+            //            ^^
+            // ```
+            Class::ValidStart => {
+                let len = cursor.input.len();
+                while cursor.pos < len {
+                    match cursor.curr().into() {
+                        Class::ValidStart | Class::ValidInside => {
+                            match cursor.next().into() {
+                                // Only valid characters are allowed, if followed by another valid character
+                                Class::ValidStart | Class::ValidInside => cursor.advance(),
+
+                                // Valid character, but at the end of the modifier, this ends the
+                                // modifier
+                                _ => return self.done(start_pos, cursor),
+                            }
+                        }
+
+                        // Anything else is invalid, end of the modifier
+                        _ => return self.restart(),
+                    }
+                }
+
+                MachineState::Idle
+            }
+
+            // Anything else is not a valid start of a modifier
+            _ => MachineState::Idle,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, ClassifyBytes)]
+enum Class {
+    #[bytes_range(b'a'..=b'z', b'A'..=b'Z', b'0'..=b'9')]
+    ValidStart,
+
+    #[bytes(b'-', b'_', b'.')]
+    ValidInside,
+
+    #[bytes(b'[')]
+    OpenBracket,
+
+    #[bytes(b'(')]
+    OpenParen,
+
+    #[bytes(b'/')]
+    Slash,
+
+    #[fallback]
+    Other,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::ModifierMachine;
+    use crate::extractor::machine::Machine;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    #[ignore]
+    fn test_modifier_machine_performance() {
+        let input = r#"<button class="group-hover/name:flex bg-red-500/20 text-black/[20%] border-white/(--my-opacity)">"#;
+
+        ModifierMachine::test_throughput(1_000_000, input);
+        ModifierMachine::test_duration_once(input);
+
+        todo!()
+    }
+
+    #[test]
+    fn test_modifier_extraction() {
+        for (input, expected) in [
+            // Simple modifier
+            ("foo/bar", vec!["/bar"]),
+            ("foo/bar-baz", vec!["/bar-baz"]),
+            // Simple modifier with numbers
+            ("foo/20", vec!["/20"]),
+            // Simple modifier with numbers
+            ("foo/20", vec!["/20"]),
+            // Arbitrary value
+            ("foo/[20]", vec!["/[20]"]),
+            // Arbitrary value with CSS variable shorthand
+            ("foo/(--x)", vec!["/(--x)"]),
+            ("foo/(--foo-bar)", vec!["/(--foo-bar)"]),
+            // --------------------------------------------------------
+
+            // Empty arbitrary value is not allowed
+            ("foo/[]", vec![]),
+            // Empty arbitrary value shorthand is not allowed
+            ("foo/()", vec![]),
+            // A CSS variable must start with `--` and must have at least a single character
+            ("foo/(-)", vec![]),
+            ("foo/(--)", vec![]),
+            // Arbitrary value shorthand should be a valid CSS variable
+            ("foo/(--my#color)", vec![]),
+        ] {
+            assert_eq!(ModifierMachine::test_extract_all(input), expected);
+        }
+    }
+}
diff --git a/crates/oxide/src/extractor/named_utility_machine.rs b/crates/oxide/src/extractor/named_utility_machine.rs
new file mode 100644
index 000000000..24dc027b2
--- /dev/null
+++ b/crates/oxide/src/extractor/named_utility_machine.rs
@@ -0,0 +1,535 @@
+use crate::cursor;
+use crate::extractor::arbitrary_value_machine::ArbitraryValueMachine;
+use crate::extractor::arbitrary_variable_machine::ArbitraryVariableMachine;
+use crate::extractor::boundary::is_valid_after_boundary;
+use crate::extractor::machine::{Machine, MachineState};
+use classification_macros::ClassifyBytes;
+use std::marker::PhantomData;
+
+#[derive(Debug, Default)]
+pub struct IdleState;
+
+#[derive(Debug, Default)]
+pub struct ParsingState;
+
+/// Extracts named utilities from an input.
+///
+/// E.g.:
+///
+/// ```text
+/// flex
+/// ^^^^
+///
+/// bg-red-500
+/// ^^^^^^^^^^
+/// ```
+#[derive(Debug, Default)]
+pub struct NamedUtilityMachine<State = IdleState> {
+    /// Start position of the utility
+    start_pos: usize,
+
+    arbitrary_variable_machine: ArbitraryVariableMachine,
+    arbitrary_value_machine: ArbitraryValueMachine,
+
+    _state: PhantomData<State>,
+}
+
+impl<State> NamedUtilityMachine<State> {
+    #[inline(always)]
+    fn transition<NextState>(&self) -> NamedUtilityMachine<NextState> {
+        NamedUtilityMachine {
+            start_pos: self.start_pos,
+            arbitrary_variable_machine: Default::default(),
+            arbitrary_value_machine: Default::default(),
+            _state: PhantomData,
+        }
+    }
+}
+
+impl Machine for NamedUtilityMachine<IdleState> {
+    #[inline(always)]
+    fn reset(&mut self) {}
+
+    #[inline]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match cursor.curr().into() {
+            Class::AlphaLower => match cursor.next().into() {
+                // Valid single character utility in between quotes
+                //
+                // E.g.: `<div class="a"></div>`
+                //                    ^
+                // E.g.: `<div class="a "></div>`
+                //                    ^
+                // E.g.: `<div class=" a"></div>`
+                //                     ^
+                Class::Whitespace | Class::Quote | Class::End => self.done(cursor.pos, cursor),
+
+                // Valid start characters
+                //
+                // E.g.: `flex`
+                //        ^
+                _ => {
+                    self.start_pos = cursor.pos;
+                    cursor.advance();
+                    self.transition::<ParsingState>().next(cursor)
+                }
+            },
+
+            // Valid start characters
+            //
+            // E.g.: `@container`
+            //        ^
+            Class::At => {
+                self.start_pos = cursor.pos;
+                cursor.advance();
+                self.transition::<ParsingState>().next(cursor)
+            }
+
+            // Valid start of a negative utility, if followed by another set of valid
+            // characters. `@` as a second character is invalid.
+            //
+            // E.g.: `-mx-2.5`
+            //        ^^
+            Class::Dash => match cursor.next().into() {
+                Class::AlphaLower => {
+                    self.start_pos = cursor.pos;
+                    cursor.advance();
+                    self.transition::<ParsingState>().next(cursor)
+                }
+
+                // A dash should not be followed by anything else
+                _ => MachineState::Idle,
+            },
+
+            // Everything else, is not a valid start of the utility.
+            _ => MachineState::Idle,
+        }
+    }
+}
+
+impl Machine for NamedUtilityMachine<ParsingState> {
+    #[inline(always)]
+    fn reset(&mut self) {
+        self.start_pos = 0;
+    }
+
+    #[inline]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        let len = cursor.input.len();
+
+        while cursor.pos < len {
+            match cursor.curr().into() {
+                // Followed by a boundary character, we are at the end of the utility.
+                //
+                // E.g.: `'flex'`
+                //             ^
+                // E.g.: `<div class="flex items-center">`
+                //                        ^
+                // E.g.: `[flex]` (Angular syntax)
+                //             ^
+                // E.g.: `[class.flex.items-center]` (Angular syntax)
+                //                   ^
+                // E.g.: `:div="{ flex: true }"` (JavaScript object syntax)
+                //                    ^
+                Class::AlphaLower | Class::AlphaUpper => {
+                    if is_valid_after_boundary(&cursor.next()) || {
+                        // Or any of these characters
+                        //
+                        // - `:`, because of JS object keys
+                        // - `/`, because of modifiers
+                        // - `!`, because of important
+                        matches!(
+                            cursor.next().into(),
+                            Class::Colon | Class::Slash | Class::Exclamation
+                        )
+                    } {
+                        return self.done(self.start_pos, cursor);
+                    }
+
+                    // Still valid characters
+                    cursor.advance()
+                }
+
+                Class::Dash => match cursor.next().into() {
+                    // Start of an arbitrary value
+                    //
+                    // E.g.: `bg-[#0088cc]`
+                    //          ^^
+                    Class::OpenBracket => {
+                        cursor.advance();
+                        return match self.arbitrary_value_machine.next(cursor) {
+                            MachineState::Idle => self.restart(),
+                            MachineState::Done(_) => self.done(self.start_pos, cursor),
+                        };
+                    }
+
+                    // Start of an arbitrary variable
+                    //
+                    // E.g.: `bg-(--my-color)`
+                    //          ^^
+                    Class::OpenParen => {
+                        cursor.advance();
+                        return match self.arbitrary_variable_machine.next(cursor) {
+                            MachineState::Idle => self.restart(),
+                            MachineState::Done(_) => self.done(self.start_pos, cursor),
+                        };
+                    }
+
+                    // A dash is a valid character if it is followed by another valid
+                    // character.
+                    //
+                    // E.g.: `flex-`
+                    //            ^    Invalid
+                    // E.g.: `flex-!`
+                    //            ^    Invalid
+                    // E.g.: `flex-/`
+                    //            ^    Invalid
+                    // E.g.: `flex-2`
+                    //            ^    Valid
+                    // E.g.: `foo--bar`
+                    //            ^    Valid
+                    Class::AlphaLower | Class::AlphaUpper | Class::Number | Class::Dash => {
+                        cursor.advance();
+                    }
+
+                    // Everything else is invalid
+                    _ => return self.restart(),
+                },
+
+                Class::Underscore => match cursor.next().into() {
+                    // Valid characters _if_ followed by another valid character. These characters are
+                    // only valid inside of the utility but not at the end of the utility.
+                    //
+                    // E.g.: `custom_`
+                    //              ^    Invalid
+                    // E.g.: `custom_!`
+                    //              ^    Invalid
+                    // E.g.: `custom_/`
+                    //              ^    Invalid
+                    // E.g.: `custom_2`
+                    //              ^    Valid
+                    //
+                    Class::AlphaLower | Class::AlphaUpper | Class::Number | Class::Underscore => {
+                        cursor.advance();
+                    }
+
+                    // Followed by a boundary character, we are at the end of the utility.
+                    //
+                    // E.g.: `'flex'`
+                    //             ^
+                    // E.g.: `<div class="flex items-center">`
+                    //                        ^
+                    // E.g.: `[flex]` (Angular syntax)
+                    //             ^
+                    // E.g.: `[class.flex.items-center]` (Angular syntax)
+                    //                   ^
+                    // E.g.: `:div="{ flex: true }"` (JavaScript object syntax)
+                    //                    ^
+                    _ if is_valid_after_boundary(&cursor.next()) || {
+                        // Or any of these characters
+                        //
+                        // - `:`, because of JS object keys
+                        // - `/`, because of modifiers
+                        // - `!`, because of important
+                        matches!(
+                            cursor.next().into(),
+                            Class::Colon | Class::Slash | Class::Exclamation
+                        )
+                    } =>
+                    {
+                        return self.done(self.start_pos, cursor)
+                    }
+
+                    // Everything else is invalid
+                    _ => return self.restart(),
+                },
+
+                // A dot must be surrounded by numbers
+                //
+                // E.g.: `px-2.5`
+                //           ^^^
+                Class::Dot => {
+                    if !matches!(cursor.prev().into(), Class::Number) {
+                        return self.restart();
+                    }
+
+                    if !matches!(cursor.next().into(), Class::Number) {
+                        return self.restart();
+                    }
+
+                    cursor.advance();
+                }
+
+                // A number must be preceded by a `-`, `.` or another alphanumeric
+                // character, and can be followed by a `.` or an alphanumeric character or
+                // dash or underscore.
+                //
+                // E.g.: `text-2xs`
+                //            ^^
+                //       `p-2.5`
+                //           ^^
+                //       `bg-red-500`
+                //                ^^
+                // It can also be followed by a %, but that will be considered the end of
+                // the candidate.
+                //
+                // E.g.: `from-15%`
+                //               ^
+                //
+                Class::Number => {
+                    if !matches!(
+                        cursor.prev().into(),
+                        Class::Dash
+                            | Class::Underscore
+                            | Class::Dot
+                            | Class::Number
+                            | Class::AlphaLower
+                            | Class::AlphaUpper
+                    ) {
+                        return self.restart();
+                    }
+
+                    if !matches!(
+                        cursor.next().into(),
+                        Class::Dot
+                            | Class::Number
+                            | Class::AlphaLower
+                            | Class::AlphaUpper
+                            | Class::Percent
+                            | Class::Underscore
+                            | Class::Dash
+                    ) {
+                        return self.done(self.start_pos, cursor);
+                    }
+
+                    cursor.advance();
+                }
+
+                // A percent sign must be preceded by a number.
+                //
+                // E.g.:
+                //
+                // ```
+                // from-15%
+                //       ^^
+                // ```
+                Class::Percent => {
+                    if !matches!(cursor.prev().into(), Class::Number) {
+                        return self.restart();
+                    }
+
+                    return self.done(self.start_pos, cursor);
+                }
+
+                // Everything else is invalid
+                _ => return self.restart(),
+            };
+        }
+
+        self.restart()
+    }
+}
+
+#[derive(Clone, Copy, ClassifyBytes)]
+enum Class {
+    #[bytes_range(b'a'..=b'z')]
+    AlphaLower,
+
+    #[bytes_range(b'A'..=b'Z')]
+    AlphaUpper,
+
+    #[bytes(b'@')]
+    At,
+
+    #[bytes(b':')]
+    Colon,
+
+    #[bytes(b'-')]
+    Dash,
+
+    #[bytes(b'.')]
+    Dot,
+
+    #[bytes(b'\0')]
+    End,
+
+    #[bytes(b'!')]
+    Exclamation,
+
+    #[bytes_range(b'0'..=b'9')]
+    Number,
+
+    #[bytes(b'[')]
+    OpenBracket,
+
+    #[bytes(b']')]
+    CloseBracket,
+
+    #[bytes(b'(')]
+    OpenParen,
+
+    #[bytes(b'%')]
+    Percent,
+
+    #[bytes(b'"', b'\'', b'`')]
+    Quote,
+
+    #[bytes(b'/')]
+    Slash,
+
+    #[bytes(b'_')]
+    Underscore,
+
+    #[bytes(b' ', b'\t', b'\n', b'\r', b'\x0C')]
+    Whitespace,
+
+    #[fallback]
+    Other,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{IdleState, NamedUtilityMachine};
+    use crate::extractor::machine::Machine;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    #[ignore]
+    fn test_named_utility_machine_performance() {
+        let input = r#"<button class="flex items-center px-2.5 -inset-x-2 bg-[#0088cc] text-(--my-color)">"#;
+
+        NamedUtilityMachine::<IdleState>::test_throughput(1_000_000, input);
+        NamedUtilityMachine::<IdleState>::test_duration_once(input);
+
+        todo!()
+    }
+
+    #[test]
+    fn test_named_utility_extraction() {
+        for (input, expected) in [
+            // Simple utility
+            ("flex", vec!["flex"]),
+            // Simple utility with special character(s)
+            ("@container", vec!["@container"]),
+            // Simple single-character utility
+            ("a", vec!["a"]),
+            // With dashes
+            ("items-center", vec!["items-center"]),
+            // With double dashes
+            ("items--center", vec!["items--center"]),
+            // With numbers
+            ("px-5", vec!["px-5"]),
+            ("px-2.5", vec!["px-2.5"]),
+            // Underscores followed by numbers
+            ("header_1", vec!["header_1"]),
+            ("header_1_2", vec!["header_1_2"]),
+            // With number followed by dash or underscore
+            ("text-title1-strong", vec!["text-title1-strong"]),
+            ("text-title1_strong", vec!["text-title1_strong"]),
+            // With capital letter followed by number
+            ("text-titleV1-strong", vec!["text-titleV1-strong"]),
+            // With trailing % sign
+            ("from-15%", vec!["from-15%"]),
+            // Arbitrary value with bracket notation
+            ("bg-[#0088cc]", vec!["bg-[#0088cc]"]),
+            // Arbitrary variable
+            ("bg-(--my-color)", vec!["bg-(--my-color)"]),
+            // Arbitrary variable with fallback
+            ("bg-(--my-color,red,blue)", vec!["bg-(--my-color,red,blue)"]),
+            // --------------------------------------------------------
+
+            // Exceptions:
+            // Arbitrary variable must be valid
+            (r"bg-(--my-color\)", vec![]),
+            (r"bg-(--my#color)", vec![]),
+            // Single letter utility with uppercase letter is invalid
+            ("A", vec![]),
+            // A dot must be in-between numbers
+            ("opacity-0.5", vec!["opacity-0.5"]),
+            ("opacity-.5", vec![]),
+            ("opacity-5.", vec![]),
+            // A number must be preceded by a `-`, `.` or another number
+            ("text-2xs", vec!["text-2xs"]),
+            // Random invalid utilities
+            ("-$", vec![]),
+            ("-_", vec![]),
+            ("-foo-", vec![]),
+            ("foo-=", vec![]),
+            ("foo-#", vec![]),
+            ("foo-!", vec![]),
+            ("foo-/20", vec![]),
+            ("-", vec![]),
+            ("--", vec![]),
+            ("---", vec![]),
+        ] {
+            for (wrapper, additional) in [
+                // No wrapper
+                ("{}", vec![]),
+                // With leading spaces
+                (" {}", vec![]),
+                // With trailing spaces
+                ("{} ", vec![]),
+                // Surrounded by spaces
+                (" {} ", vec![]),
+                // Inside a string
+                ("'{}'", vec![]),
+                // Inside a function call
+                ("fn('{}')", vec![]),
+                // Inside nested function calls
+                ("fn1(fn2('{}'))", vec!["fn1", "fn2"]),
+                // --------------------------
+                //
+                // HTML
+                // Inside a class (on its own)
+                (r#"<div class="{}"></div>"#, vec!["div", "class"]),
+                // Inside a class (first)
+                (r#"<div class="{} foo"></div>"#, vec!["div", "class", "foo"]),
+                // Inside a class (second)
+                (r#"<div class="foo {}"></div>"#, vec!["div", "class", "foo"]),
+                // Inside a class (surrounded)
+                (
+                    r#"<div class="foo {} bar"></div>"#,
+                    vec!["div", "class", "foo", "bar"],
+                ),
+                // --------------------------
+                //
+                // JavaScript
+                // Inside a variable
+                (r#"let classes = '{}';"#, vec!["let", "classes"]),
+                // Inside an object (key)
+                (
+                    r#"let classes = { '{}': true };"#,
+                    vec!["let", "classes", "true"],
+                ),
+                // Inside an object (no spaces, key)
+                (r#"let classes = {'{}':true};"#, vec!["let", "classes"]),
+                // Inside an object (value)
+                (
+                    r#"let classes = { primary: '{}' };"#,
+                    vec!["let", "classes", "primary"],
+                ),
+                // Inside an object (no spaces, value)
+                (
+                    r#"let classes = {primary:'{}'};"#,
+                    vec!["let", "classes", "primary"],
+                ),
+                // Inside an array
+                (r#"let classes = ['{}'];"#, vec!["let", "classes"]),
+            ] {
+                let input = wrapper.replace("{}", input);
+
+                let mut expected = expected.clone();
+                expected.extend(additional);
+                expected.sort();
+
+                let mut actual = NamedUtilityMachine::<IdleState>::test_extract_all(&input);
+                actual.sort();
+
+                if actual != expected {
+                    dbg!(&input);
+                }
+                assert_eq!(actual, expected);
+            }
+        }
+    }
+}
diff --git a/crates/oxide/src/extractor/named_variant_machine.rs b/crates/oxide/src/extractor/named_variant_machine.rs
new file mode 100644
index 000000000..285fe6ab5
--- /dev/null
+++ b/crates/oxide/src/extractor/named_variant_machine.rs
@@ -0,0 +1,422 @@
+use crate::cursor;
+use crate::extractor::arbitrary_value_machine::ArbitraryValueMachine;
+use crate::extractor::arbitrary_variable_machine::ArbitraryVariableMachine;
+use crate::extractor::machine::{Machine, MachineState};
+use crate::extractor::modifier_machine::ModifierMachine;
+use classification_macros::ClassifyBytes;
+use std::marker::PhantomData;
+
+#[derive(Debug, Default)]
+pub struct IdleState;
+
+/// Parsing a variant
+#[derive(Debug, Default)]
+pub struct ParsingState;
+
+/// Parsing a modifier
+///
+/// E.g.:
+///
+/// ```text
+/// group-hover/name:
+///            ^^^^^
+/// ```
+///
+#[derive(Debug, Default)]
+pub struct ParsingModifierState;
+
+/// Parsing the end of a variant
+///
+/// E.g.:
+///
+/// ```text
+/// hover:
+///      ^
+/// ```
+#[derive(Debug, Default)]
+pub struct ParsingEndState;
+
+/// Extract named variants from an input including the `:`.
+///
+/// E.g.:
+///
+/// ```text
+/// hover:flex
+/// ^^^^^^
+///
+/// data-[state=pending]:flex
+/// ^^^^^^^^^^^^^^^^^^^^^
+///
+/// supports-(--my-variable):flex
+/// ^^^^^^^^^^^^^^^^^^^^^^^^^
+/// ```
+#[derive(Debug, Default)]
+pub struct NamedVariantMachine<State = IdleState> {
+    /// Start position of the variant
+    start_pos: usize,
+
+    arbitrary_variable_machine: ArbitraryVariableMachine,
+    arbitrary_value_machine: ArbitraryValueMachine,
+    modifier_machine: ModifierMachine,
+
+    _state: PhantomData<State>,
+}
+
+impl<State> NamedVariantMachine<State> {
+    #[inline(always)]
+    fn transition<NextState>(&self) -> NamedVariantMachine<NextState> {
+        NamedVariantMachine {
+            start_pos: self.start_pos,
+            arbitrary_variable_machine: Default::default(),
+            arbitrary_value_machine: Default::default(),
+            modifier_machine: Default::default(),
+            _state: PhantomData,
+        }
+    }
+}
+
+impl Machine for NamedVariantMachine<IdleState> {
+    #[inline(always)]
+    fn reset(&mut self) {}
+
+    #[inline(always)]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match cursor.curr().into() {
+            Class::AlphaLower | Class::Star => match cursor.next().into() {
+                // Valid single character variant, must be followed by a `:`
+                //
+                // E.g.: `<div class="x:flex"></div>`
+                //                    ^^
+                // E.g.: `*:`
+                //        ^^
+                Class::Colon => {
+                    cursor.advance();
+                    self.transition::<ParsingEndState>().next(cursor)
+                }
+
+                // Valid start characters
+                //
+                // E.g.: `hover:`
+                //        ^
+                // E.g.: `**:`
+                //        ^
+                _ => {
+                    self.start_pos = cursor.pos;
+                    cursor.advance();
+                    self.transition::<ParsingState>().next(cursor)
+                }
+            },
+
+            // Valid start characters
+            //
+            // E.g.: `2xl:`
+            //        ^
+            // E.g.: `@md:`
+            //        ^
+            Class::Number | Class::At => {
+                self.start_pos = cursor.pos;
+                cursor.advance();
+                self.transition::<ParsingState>().next(cursor)
+            }
+
+            // Everything else, is not a valid start of the variant.
+            _ => MachineState::Idle,
+        }
+    }
+}
+
+impl Machine for NamedVariantMachine<ParsingState> {
+    #[inline(always)]
+    fn reset(&mut self) {}
+
+    #[inline(always)]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        let len = cursor.input.len();
+
+        while cursor.pos < len {
+            match cursor.curr().into() {
+                Class::Dash => match cursor.next().into() {
+                    // Start of an arbitrary value
+                    //
+                    // E.g.: `data-[state=pending]:`.
+                    //            ^^
+                    Class::OpenBracket => {
+                        cursor.advance();
+                        return match self.arbitrary_value_machine.next(cursor) {
+                            MachineState::Idle => self.restart(),
+                            MachineState::Done(_) => self.parse_arbitrary_end(cursor),
+                        };
+                    }
+
+                    // Start of an arbitrary variable
+                    //
+                    // E.g.: `supports-(--my-color):`.
+                    //                ^^
+                    Class::OpenParen => {
+                        cursor.advance();
+                        return match self.arbitrary_variable_machine.next(cursor) {
+                            MachineState::Idle => self.restart(),
+                            MachineState::Done(_) => self.parse_arbitrary_end(cursor),
+                        };
+                    }
+
+                    // Valid characters _if_ followed by another valid character. These characters are
+                    // only valid inside of the variant but not at the end of the variant.
+                    //
+                    // E.g.: `hover-`
+                    //             ^   Invalid
+                    // E.g.: `hover-!`
+                    //             ^   Invalid
+                    // E.g.: `hover-/`
+                    //             ^   Invalid
+                    // E.g.: `flex-1`
+                    //            ^    Valid
+                    Class::Dash
+                    | Class::Underscore
+                    | Class::AlphaLower
+                    | Class::AlphaUpper
+                    | Class::Number => cursor.advance(),
+
+                    // Everything else is invalid
+                    _ => return self.restart(),
+                },
+
+                // Start of an arbitrary value
+                //
+                // E.g.: `@[state=pending]:`.
+                //         ^
+                Class::OpenBracket => {
+                    return match self.arbitrary_value_machine.next(cursor) {
+                        MachineState::Idle => self.restart(),
+                        MachineState::Done(_) => self.parse_arbitrary_end(cursor),
+                    };
+                }
+
+                Class::Underscore => match cursor.next().into() {
+                    // Valid characters _if_ followed by another valid character. These characters are
+                    // only valid inside of the variant but not at the end of the variant.
+                    //
+                    // E.g.: `hover_`
+                    //             ^     Invalid
+                    // E.g.: `hover_!`
+                    //             ^     Invalid
+                    // E.g.: `hover_/`
+                    //             ^     Invalid
+                    // E.g.: `custom_1`
+                    //              ^    Valid
+                    Class::Dash
+                    | Class::Underscore
+                    | Class::AlphaLower
+                    | Class::AlphaUpper
+                    | Class::Number => cursor.advance(),
+
+                    // Everything else is invalid
+                    _ => return self.restart(),
+                },
+
+                // Still valid characters
+                Class::AlphaLower | Class::AlphaUpper | Class::Number | Class::Star => {
+                    cursor.advance()
+                }
+
+                // A `/` means we are at the end of the variant, but there might be a modifier
+                //
+                // E.g.:
+                //
+                // ```
+                // group-hover/name:
+                //            ^
+                // ```
+                Class::Slash => return self.transition::<ParsingModifierState>().next(cursor),
+
+                // A `:` means we are at the end of the variant
+                //
+                // E.g.: `hover:`
+                //             ^
+                Class::Colon => return self.done(self.start_pos, cursor),
+
+                // A dot must be surrounded by numbers
+                //
+                // E.g.: `2.5xl:flex`
+                //        ^^^
+                Class::Dot => {
+                    if !matches!(cursor.prev().into(), Class::Number) {
+                        return self.restart();
+                    }
+
+                    if !matches!(cursor.next().into(), Class::Number) {
+                        return self.restart();
+                    }
+
+                    cursor.advance();
+                }
+
+                // Everything else is invalid
+                _ => return self.restart(),
+            };
+        }
+
+        self.restart()
+    }
+}
+
+impl NamedVariantMachine<ParsingState> {
+    #[inline(always)]
+    fn parse_arbitrary_end(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match cursor.next().into() {
+            Class::Slash => {
+                cursor.advance();
+                self.transition::<ParsingModifierState>().next(cursor)
+            }
+            Class::Colon => {
+                cursor.advance();
+                self.transition::<ParsingEndState>().next(cursor)
+            }
+            _ => self.restart(),
+        }
+    }
+}
+
+impl Machine for NamedVariantMachine<ParsingModifierState> {
+    #[inline(always)]
+    fn reset(&mut self) {}
+
+    #[inline(always)]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match self.modifier_machine.next(cursor) {
+            MachineState::Idle => self.restart(),
+            MachineState::Done(_) => match cursor.next().into() {
+                // Modifier must be followed by a `:`
+                //
+                // E.g.: `group-hover/name:`
+                //                        ^
+                Class::Colon => {
+                    cursor.advance();
+                    self.transition::<ParsingEndState>().next(cursor)
+                }
+
+                // Everything else is invalid
+                _ => self.restart(),
+            },
+        }
+    }
+}
+
+impl Machine for NamedVariantMachine<ParsingEndState> {
+    #[inline(always)]
+    fn reset(&mut self) {}
+
+    #[inline(always)]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match cursor.curr().into() {
+            // The end of a variant must be the `:`
+            //
+            // E.g.: `hover:`
+            //             ^
+            Class::Colon => self.done(self.start_pos, cursor),
+
+            // Everything else is invalid
+            _ => self.restart(),
+        }
+    }
+}
+
+#[derive(Clone, Copy, ClassifyBytes)]
+enum Class {
+    #[bytes_range(b'a'..=b'z')]
+    AlphaLower,
+
+    #[bytes_range(b'A'..=b'Z')]
+    AlphaUpper,
+
+    #[bytes(b'@')]
+    At,
+
+    #[bytes(b':')]
+    Colon,
+
+    #[bytes(b'-')]
+    Dash,
+
+    #[bytes(b'.')]
+    Dot,
+
+    #[bytes_range(b'0'..=b'9')]
+    Number,
+
+    #[bytes(b'[')]
+    OpenBracket,
+
+    #[bytes(b'(')]
+    OpenParen,
+
+    #[bytes(b'*')]
+    Star,
+
+    #[bytes(b'/')]
+    Slash,
+
+    #[bytes(b'_')]
+    Underscore,
+
+    #[fallback]
+    Other,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{IdleState, NamedVariantMachine};
+    use crate::extractor::machine::Machine;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    #[ignore]
+    fn test_named_variant_machine_performance() {
+        let input = r#"<button class="hover:focus:flex data-[state=pending]:flex supports-(--my-variable):flex group-hover/named:not-has-peer-data-disabled:flex">"#;
+
+        NamedVariantMachine::<IdleState>::test_throughput(1_000_000, input);
+        NamedVariantMachine::<IdleState>::test_duration_once(input);
+
+        todo!()
+    }
+
+    #[test]
+    fn test_named_variant_extraction() {
+        for (input, expected) in [
+            // Simple variant
+            ("hover:", vec!["hover:"]),
+            // Simple single-character variant
+            ("a:", vec!["a:"]),
+            ("a/foo:", vec!["a/foo:"]),
+            //
+            ("group-hover:flex", vec!["group-hover:"]),
+            ("group-hover/name:flex", vec!["group-hover/name:"]),
+            (
+                "group-[data-state=pending]/name:flex",
+                vec!["group-[data-state=pending]/name:"],
+            ),
+            ("supports-(--foo)/name:flex", vec!["supports-(--foo)/name:"]),
+            // Odd media queries
+            ("1.5xl:flex", vec!["1.5xl:"]),
+            // Container queries
+            ("@md:flex", vec!["@md:"]),
+            ("@max-md:flex", vec!["@max-md:"]),
+            ("@-[36rem]:flex", vec!["@-[36rem]:"]),
+            ("@[36rem]:flex", vec!["@[36rem]:"]),
+            // --------------------------------------------------------
+
+            // Exceptions:
+            // Arbitrary variable must be valid
+            (r"supports-(--my-color\):", vec![]),
+            (r"supports-(--my#color)", vec![]),
+            // Single letter variant with uppercase letter is invalid
+            ("A:", vec![]),
+        ] {
+            let actual = NamedVariantMachine::<IdleState>::test_extract_all(input);
+            if actual != expected {
+                dbg!(&input);
+            }
+            assert_eq!(actual, expected);
+        }
+    }
+}
diff --git a/crates/oxide/src/extractor/pre_processors/clojure.rs b/crates/oxide/src/extractor/pre_processors/clojure.rs
new file mode 100644
index 000000000..3fb4ce601
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/clojure.rs
@@ -0,0 +1,436 @@
+use crate::cursor;
+use crate::extractor::pre_processors::pre_processor::PreProcessor;
+use bstr::ByteSlice;
+
+#[derive(Debug, Default)]
+pub struct Clojure;
+
+/// This is meant to be a rough estimate of a valid ClojureScript keyword
+///
+/// This can be approximated by the following regex:
+/// /::?[a-zA-Z0-9!#$%&*+./:<=>?_|-]+/
+///
+/// However, keywords are intended to be detected as utilities. Since the set
+/// of valid characters in a utility (outside of arbitrary values) is smaller,
+/// along with the fact that neither `[]` nor `()` are allowed in keywords we
+/// can simplify this list quite a bit.
+#[inline]
+fn is_keyword_character(byte: u8) -> bool {
+    (matches!(
+        byte,
+        b'!' | b'#' | b'%' | b'*' | b'+' | b'-' | b'.' | b'/' | b':' | b'_'
+    ) | byte.is_ascii_alphanumeric())
+}
+
+impl PreProcessor for Clojure {
+    fn process(&self, content: &[u8]) -> Vec<u8> {
+        let content = content
+            .replace(":class", "      ")
+            .replace(":className", "          ");
+        let len = content.len();
+        let mut result = content.to_vec();
+        let mut cursor = cursor::Cursor::new(&content);
+
+        while cursor.pos < len {
+            match cursor.curr() {
+                // Consume strings as-is
+                b'"' => {
+                    result[cursor.pos] = b' ';
+                    cursor.advance();
+
+                    while cursor.pos < len {
+                        match cursor.curr() {
+                            // Escaped character, skip ahead to the next character
+                            b'\\' => cursor.advance_twice(),
+
+                            // End of the string
+                            b'"' => {
+                                result[cursor.pos] = b' ';
+                                break;
+                            }
+
+                            // Everything else is valid
+                            _ => cursor.advance(),
+                        };
+                    }
+                }
+
+                // Discard line comments until the end of the line.
+                // Comments start with `;;`
+                b';' if matches!(cursor.next(), b';') => {
+                    while cursor.pos < len && cursor.curr() != b'\n' {
+                        result[cursor.pos] = b' ';
+                        cursor.advance();
+                    }
+                }
+
+                // Consume keyword until a terminating character is reached.
+                b':' => {
+                    result[cursor.pos] = b' ';
+                    cursor.advance();
+
+                    while cursor.pos < len {
+                        match cursor.curr() {
+                            // A `.` surrounded by digits is a decimal number, so we don't want to replace it.
+                            //
+                            // E.g.:
+                            // ```
+                            // gap-1.5
+                            //      ^
+                            // ```
+                            b'.' if cursor.prev().is_ascii_digit()
+                                && cursor.next().is_ascii_digit() =>
+                            {
+                                // Keep the `.` as-is
+                            }
+                            // A `.` not surrounded by digits denotes the start of a new class name in a
+                            // dot-delimited keyword.
+                            //
+                            // E.g.:
+                            // ```
+                            // flex.gap-1.5
+                            //     ^
+                            // ```
+                            b'.' => {
+                                result[cursor.pos] = b' ';
+                            }
+                            // End of keyword.
+                            _ if !is_keyword_character(cursor.curr()) => {
+                                result[cursor.pos] = b' ';
+                                break;
+                            }
+
+                            // Consume everything else.
+                            _ => {}
+                        };
+
+                        cursor.advance();
+                    }
+                }
+
+                // Handle quote with a list, e.g.: `'(…)`
+                // and with a vector, e.g.: `'[…]`
+                b'\'' if matches!(cursor.next(), b'[' | b'(') => {
+                    result[cursor.pos] = b' ';
+                    cursor.advance();
+                    result[cursor.pos] = b' ';
+                    let end = match cursor.curr() {
+                        b'[' => b']',
+                        b'(' => b')',
+                        _ => unreachable!(),
+                    };
+
+                    // Consume until the closing `]`
+                    while cursor.pos < len {
+                        match cursor.curr() {
+                            x if x == end => {
+                                result[cursor.pos] = b' ';
+                                break;
+                            }
+
+                            // Consume strings as-is
+                            b'"' => {
+                                result[cursor.pos] = b' ';
+                                cursor.advance();
+
+                                while cursor.pos < len {
+                                    match cursor.curr() {
+                                        // Escaped character, skip ahead to the next character
+                                        b'\\' => cursor.advance_twice(),
+
+                                        // End of the string
+                                        b'"' => {
+                                            result[cursor.pos] = b' ';
+                                            break;
+                                        }
+
+                                        // Everything else is valid
+                                        _ => cursor.advance(),
+                                    };
+                                }
+                            }
+                            _ => {}
+                        };
+
+                        cursor.advance();
+                    }
+                }
+
+                // Handle quote with a keyword, e.g.: `'bg-white`
+                b'\'' if !cursor.next().is_ascii_whitespace() => {
+                    result[cursor.pos] = b' ';
+                    cursor.advance();
+
+                    while cursor.pos < len {
+                        match cursor.curr() {
+                            // End of keyword.
+                            _ if !is_keyword_character(cursor.curr()) => {
+                                result[cursor.pos] = b' ';
+                                break;
+                            }
+
+                            // Consume everything else.
+                            _ => {}
+                        };
+
+                        cursor.advance();
+                    }
+                }
+
+                // Aggressively discard everything else, reducing false positives and preventing
+                // characters surrounding keywords from producing false negatives.
+                // E.g.:
+                // ```
+                // (when condition :bg-white)
+                //                          ^
+                // ```
+                // A ')' is never a valid part of a keyword, but will nonetheless prevent 'bg-white'
+                // from being extracted if not discarded.
+                _ => {
+                    result[cursor.pos] = b' ';
+                }
+            };
+
+            cursor.advance();
+        }
+
+        result
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Clojure;
+    use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+    #[test]
+    fn test_clojure_pre_processor() {
+        for (input, expected) in [
+            (":div.flex-1.flex-2", " div flex-1 flex-2"),
+            (
+                ":.flex-3.flex-4 ;defaults to div",
+                "  flex-3 flex-4                 ",
+            ),
+            ("{:class :flex-5.flex-6", "         flex-5 flex-6"),
+            (r#"{:class "flex-7 flex-8"}"#, r#"         flex-7 flex-8  "#),
+            (
+                r#"{:class  ["flex-9" :flex-10]}"#,
+                r#"           flex-9   flex-10  "#,
+            ),
+            (
+                r#"(dom/div {:class "flex-11 flex-12"})"#,
+                r#"                  flex-11 flex-12   "#,
+            ),
+            ("(dom/div :.flex-13.flex-14", "           flex-13 flex-14"),
+            (
+                r#"[:div#hello.bg-white.pr-1.5 {:class ["grid grid-cols-[auto,1fr] grid-rows-2"]}]"#,
+                r#"  div#hello bg-white pr-1.5           grid grid-cols-[auto,1fr] grid-rows-2    "#,
+            ),
+        ] {
+            Clojure::test(input, expected);
+        }
+    }
+
+    #[test]
+    fn test_extract_candidates() {
+        // https://github.com/luckasRanarison/tailwind-tools.nvim/issues/68#issuecomment-2660951258
+        let input = r#"
+            :div.c1.c2
+            :.c3.c4 ;defaults to div
+            {:class :c5.c6
+            {:class "c7 c8"}
+            {:class  ["c9" :c10]}
+            (dom/div {:class "c11 c12"})
+            (dom/div :.c13.c14
+            {:className :c15.c16
+            {:className "c17 c18"}
+            {:className  ["c19" :c20]}
+            (dom/div {:className "c21 c22"})
+        "#;
+
+        Clojure::test_extract_contains(
+            input,
+            vec![
+                "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13",
+                "c14", "c15", "c16", "c17", "c18", "c19", "c20", "c21", "c22",
+            ],
+        );
+
+        // Similar structure but using real classes
+        let input = r#"
+            :div.flex-1.flex-2
+            :.flex-3.flex-4 ;defaults to div
+            {:class :flex-5.flex-6
+            {:class "flex-7 flex-8"}
+            {:class  ["flex-9" :flex-10]}
+            (dom/div {:class "flex-11 flex-12"})
+            (dom/div :.flex-13.flex-14
+            {:className :flex-15.flex-16
+            {:className "flex-17 flex-18"}
+            {:className  ["flex-19" :flex-20]}
+            (dom/div {:className "flex-21 flex-22"})
+        "#;
+
+        Clojure::test_extract_contains(
+            input,
+            vec![
+                "flex-1", "flex-2", "flex-3", "flex-4", "flex-5", "flex-6", "flex-7", "flex-8",
+                "flex-9", "flex-10", "flex-11", "flex-12", "flex-13", "flex-14", "flex-15",
+                "flex-16", "flex-17", "flex-18", "flex-19", "flex-20", "flex-21", "flex-22",
+            ],
+        );
+    }
+
+    #[test]
+    fn test_special_characters_are_valid_in_strings() {
+        // In this case the `:` and `.` should not be replaced by ` ` because they are inside a
+        // string.
+        let input = r#"
+            (dom/div {:class "hover:flex px-1.5"})
+        "#;
+
+        Clojure::test_extract_contains(input, vec!["hover:flex", "px-1.5"]);
+    }
+
+    #[test]
+    fn test_ignore_comments_with_invalid_strings() {
+        let input = r#"
+            ;; This is an unclosed string: "
+            (dom/div {:class "hover:flex px-1.5"})
+        "#;
+
+        Clojure::test_extract_contains(input, vec!["hover:flex", "px-1.5"]);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/17760
+    #[test]
+    fn test_extraction_of_classes_with_dots() {
+        let input = r#"
+            ($ :div {:class [:flex :gap-1.5 :p-1]} …)
+        "#;
+
+        Clojure::test_extract_contains(input, vec!["flex", "gap-1.5", "p-1"]);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/18336
+    #[test]
+    fn test_extraction_of_pseudoclasses_from_keywords() {
+        let input = r#"
+            ($ :div {:class [:flex :first:lg:pr-6 :first:2xl:pl-6 :group-hover/2:2xs:pt-6]} …)
+
+            :.hover:bg-white
+
+            [:div#hello.bg-white.pr-1.5]
+        "#;
+
+        Clojure::test_extract_contains(
+            input,
+            vec![
+                "flex",
+                "first:lg:pr-6",
+                "first:2xl:pl-6",
+                "group-hover/2:2xs:pt-6",
+                "hover:bg-white",
+                "bg-white",
+                "pr-1.5",
+            ],
+        );
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/18344
+    #[test]
+    fn test_noninterference_of_parens_on_keywords() {
+        let input = r#"
+            (get props :y-padding :py-5)
+            ($ :div {:class [:flex.pr-1.5 (if condition :bg-white :bg-black)]})
+        "#;
+
+        Clojure::test_extract_contains(
+            input,
+            vec!["py-5", "flex", "pr-1.5", "bg-white", "bg-black"],
+        );
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/18882
+    #[test]
+    fn test_extract_from_symbol_list() {
+        let input = r#"
+            [:div {:class '[z-1 z-2
+                            z-3 z-4]}]
+        "#;
+        Clojure::test_extract_contains(input, vec!["z-1", "z-2", "z-3", "z-4"]);
+
+        // https://github.com/tailwindlabs/tailwindcss/pull/18345#issuecomment-3253403847
+        let input = r#"
+            (def hl-class-names '[ring ring-blue-500])
+
+            [:div
+             {:class (cond-> '[input w-full]
+                       textarea? (conj 'textarea)
+                       (seq errors) (concat '[border-red-500 bg-red-100])
+                       highlight? (concat hl-class-names))}]
+        "#;
+        Clojure::test_extract_contains(
+            input,
+            vec![
+                "ring",
+                "ring-blue-500",
+                "input",
+                "w-full",
+                "textarea",
+                "border-red-500",
+                "bg-red-100",
+            ],
+        );
+
+        let input = r#"
+          [:div
+            {:class '[h-100 lg:h-200 max-w-32 mx-auto py-60
+                      flex flex-col justify-end items-center
+                      lg:flex-row lg:justify-between
+                      bg-cover bg-center bg-no-repeat rounded-3xl overflow-hidden
+                      font-semibold text-gray-900]}]
+        "#;
+        Clojure::test_extract_contains(
+            input,
+            vec![
+                "h-100",
+                "lg:h-200",
+                "max-w-32",
+                "mx-auto",
+                "py-60",
+                "flex",
+                "flex-col",
+                "justify-end",
+                "items-center",
+                "lg:flex-row",
+                "lg:justify-between",
+                "bg-cover",
+                "bg-center",
+                "bg-no-repeat",
+                "rounded-3xl",
+                "overflow-hidden",
+                "font-semibold",
+                "text-gray-900",
+            ],
+        );
+
+        // `/` is invalid and requires explicit quoting
+        let input = r#"
+            '[p-32 "text-black/50"]
+        "#;
+        Clojure::test_extract_contains(input, vec!["p-32", "text-black/50"]);
+
+        // `[…]` is invalid and requires explicit quoting
+        let input = r#"
+            (print '[ring ring-blue-500 "bg-[#0088cc]"])
+        "#;
+        Clojure::test_extract_contains(input, vec!["ring", "ring-blue-500", "bg-[#0088cc]"]);
+
+        // `'(…)` looks similar to `[…]` but uses parentheses instead of brackets
+        let input = r#"
+            (print '(ring ring-blue-500 "bg-[#0088cc]"))
+        "#;
+        Clojure::test_extract_contains(input, vec!["ring", "ring-blue-500", "bg-[#0088cc]"]);
+    }
+}
diff --git a/crates/oxide/src/extractor/pre_processors/elixir.rs b/crates/oxide/src/extractor/pre_processors/elixir.rs
new file mode 100644
index 000000000..7737a6b2d
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/elixir.rs
@@ -0,0 +1,154 @@
+use crate::cursor;
+use crate::extractor::bracket_stack::BracketStack;
+use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+#[derive(Debug, Default)]
+pub struct Elixir;
+
+impl PreProcessor for Elixir {
+    fn process(&self, content: &[u8]) -> Vec<u8> {
+        let mut cursor = cursor::Cursor::new(content);
+        let mut result = content.to_vec();
+        let mut bracket_stack = BracketStack::default();
+
+        while cursor.pos < content.len() {
+            // Look for a sigil marker
+            if cursor.curr() != b'~' {
+                cursor.advance();
+                continue;
+            }
+
+            // Scan charlists, strings, and wordlists
+            if !matches!(cursor.next(), b'c' | b'C' | b's' | b'S' | b'w' | b'W') {
+                cursor.advance();
+                continue;
+            }
+
+            cursor.advance_twice();
+
+            // Match the opening for a sigil
+            if !matches!(cursor.curr(), b'(' | b'[' | b'{') {
+                continue;
+            }
+
+            // Replace the opening bracket with a space
+            result[cursor.pos] = b' ';
+
+            // Scan until we find a balanced closing one and replace it too
+            bracket_stack.push(cursor.curr());
+
+            while cursor.pos < content.len() {
+                cursor.advance();
+
+                match cursor.curr() {
+                    // Escaped character, skip ahead to the next character
+                    b'\\' => cursor.advance_twice(),
+                    b'(' | b'[' | b'{' => {
+                        bracket_stack.push(cursor.curr());
+                    }
+                    b')' | b']' | b'}' if !bracket_stack.is_empty() => {
+                        bracket_stack.pop(cursor.curr());
+
+                        if bracket_stack.is_empty() {
+                            // Replace the closing bracket with a space
+                            result[cursor.pos] = b' ';
+                            break;
+                        }
+                    }
+                    _ => {}
+                }
+            }
+        }
+
+        result
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Elixir;
+    use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+    #[test]
+    fn test_elixir_pre_processor() {
+        for (input, expected) in [
+            // Simple sigils
+            ("~W(flex underline)", "~W flex underline "),
+            ("~W[flex underline]", "~W flex underline "),
+            ("~W{flex underline}", "~W flex underline "),
+            // Sigils with nested brackets
+            (
+                "~W(text-(--my-color) bg-(--my-color))",
+                "~W text-(--my-color) bg-(--my-color) ",
+            ),
+            ("~W[text-[red] bg-[red]]", "~W text-[red] bg-[red] "),
+            // Word sigils with modifiers
+            ("~W(flex underline)a", "~W flex underline a"),
+            ("~W(flex underline)c", "~W flex underline c"),
+            ("~W(flex underline)s", "~W flex underline s"),
+            // Other sigil types
+            ("~w(flex underline)", "~w flex underline "),
+            ("~c(flex underline)", "~c flex underline "),
+            ("~C(flex underline)", "~C flex underline "),
+            ("~s(flex underline)", "~s flex underline "),
+            ("~S(flex underline)", "~S flex underline "),
+        ] {
+            Elixir::test(input, expected);
+        }
+    }
+
+    #[test]
+    fn test_extract_candidates() {
+        let input = r#"
+          ~W(c1 c2)
+          ~W[c3 c4]
+          ~W{c5 c6}
+          ~W(text-(--c7) bg-(--c8))
+          ~W[text-[c9] bg-[c10]]
+          ~W(c13 c14)a
+          ~W(c15 c16)c
+          ~W(c17 c18)s
+          ~w(c19 c20)
+          ~c(c21 c22)
+          ~C(c23 c24)
+          ~s(c25 c26)
+          ~S(c27 c28)
+          ~W"c29 c30"
+          ~W'c31 c32'
+        "#;
+
+        Elixir::test_extract_contains(
+            input,
+            vec![
+                "c1",
+                "c2",
+                "c3",
+                "c4",
+                "c5",
+                "c6",
+                "text-(--c7)",
+                "bg-(--c8)",
+                "c13",
+                "c14",
+                "c15",
+                "c16",
+                "c17",
+                "c18",
+                "c19",
+                "c20",
+                "c21",
+                "c22",
+                "c23",
+                "c24",
+                "c25",
+                "c26",
+                "c27",
+                "c28",
+                "c29",
+                "c30",
+                "c31",
+                "c32",
+            ],
+        );
+    }
+}
diff --git a/crates/oxide/src/extractor/pre_processors/haml.rs b/crates/oxide/src/extractor/pre_processors/haml.rs
new file mode 100644
index 000000000..ec8be0817
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/haml.rs
@@ -0,0 +1,616 @@
+use crate::cursor;
+use crate::extractor::bracket_stack::BracketStack;
+use crate::extractor::machine::{Machine, MachineState};
+use crate::extractor::pre_processors::pre_processor::PreProcessor;
+use crate::extractor::variant_machine::VariantMachine;
+use crate::scanner::pre_process_input;
+use bstr::ByteVec;
+
+#[derive(Debug, Default)]
+pub struct Haml;
+
+impl PreProcessor for Haml {
+    fn process(&self, content: &[u8]) -> Vec<u8> {
+        let len = content.len();
+        let mut result = content.to_vec();
+        let mut cursor = cursor::Cursor::new(content);
+        let mut bracket_stack = BracketStack::default();
+
+        // Haml Comments: -#
+        // https://haml.info/docs/yardoc/file.REFERENCE.html#ruby-evaluation
+        //
+        // > The hyphen followed immediately by the pound sign signifies a silent comment. Any text
+        // > following this isn’t rendered in the resulting document at all.
+        //
+        // ```haml
+        // %p foo
+        // -# This is a comment
+        // %p bar
+        // ```
+        //
+        // > You can also nest text beneath a silent comment. None of this text will be rendered.
+        //
+        // ```haml
+        // %p foo
+        // -#
+        //   This won't be displayed
+        //     Nor will this
+        //                    Nor will this.
+        // %p bar
+        // ```
+        //
+        // Ruby Evaluation
+        // https://haml.info/docs/yardoc/file.REFERENCE.html#ruby-evaluation
+        //
+        // When any of the following characters are the first non-whitespace character on the line,
+        // then the line is treated as Ruby code:
+        //
+        // - Inserting Ruby: =
+        //   https://haml.info/docs/yardoc/file.REFERENCE.html#inserting_ruby
+        //
+        //   ```haml
+        //   %p
+        //     = ['hi', 'there', 'reader!'].join " "
+        //     = "yo"
+        //   ```
+        //
+        // - Running Ruby: -
+        //   https://haml.info/docs/yardoc/file.REFERENCE.html#running-ruby--
+        //
+        //   ```haml
+        //   - foo = "hello"
+        //   - foo << " there"
+        //   - foo << " you!"
+        //   %p= foo
+        //   ```
+        //
+        // - Whitespace Preservation: ~
+        //   https://haml.info/docs/yardoc/file.REFERENCE.html#tilde
+        //
+        //   > ~ works just like =, except that it runs Haml::Helpers.preserve on its input.
+        //
+        //   ```haml
+        //   ~ "Foo\n<pre>Bar\nBaz</pre>"
+        //   ```
+        //
+        // Important note:
+        //
+        // > A line of Ruby code can be stretched over multiple lines as long as each line but the
+        // > last ends with a comma.
+        //
+        // ```haml
+        // - links = {:home => "/",
+        //   :docs => "/docs",
+        //   :about => "/about"}
+        // ```
+        //
+        // Ruby Blocks:
+        // https://haml.info/docs/yardoc/file.REFERENCE.html#ruby-blocks
+        //
+        // > Ruby blocks, like XHTML tags, don’t need to be explicitly closed in Haml. Rather,
+        // > they’re automatically closed, based on indentation. A block begins whenever the
+        // > indentation is increased after a Ruby evaluation command. It ends when the indentation
+        // > decreases (as long as it’s not an else clause or something similar).
+        //
+        // ```haml
+        // - (42...47).each do |i|
+        //   %p= i
+        // %p See, I can count!
+        // ```
+        //
+        let mut last_newline_position = 0;
+
+        while cursor.pos < len {
+            match cursor.curr() {
+                // Escape the next character
+                b'\\' => {
+                    cursor.advance_twice();
+                    continue;
+                }
+
+                // Track the last newline position
+                b'\n' => {
+                    last_newline_position = cursor.pos;
+                    cursor.advance();
+                    continue;
+                }
+
+                // Skip HAML comments. `-#`
+                b'-' if cursor.input[last_newline_position..cursor.pos]
+                    .iter()
+                    .all(u8::is_ascii_whitespace)
+                    && matches!(cursor.next(), b'#') =>
+                {
+                    // Just consume the comment
+                    let updated_last_newline_position =
+                        self.skip_indented_block(&mut cursor, last_newline_position);
+
+                    // Override the last known newline position
+                    last_newline_position = updated_last_newline_position;
+                }
+
+                // Skip HTML comments. `/`
+                b'/' if cursor.input[last_newline_position..cursor.pos]
+                    .iter()
+                    .all(u8::is_ascii_whitespace) =>
+                {
+                    // Just consume the comment
+                    let updated_last_newline_position =
+                        self.skip_indented_block(&mut cursor, last_newline_position);
+
+                    // Override the last known newline position
+                    last_newline_position = updated_last_newline_position;
+                }
+
+                // Ruby evaluation
+                b'-' | b'=' | b'~'
+                    if cursor.input[last_newline_position..cursor.pos]
+                        .iter()
+                        .all(u8::is_ascii_whitespace) =>
+                {
+                    let mut start = cursor.pos;
+                    let end = self.skip_indented_block(&mut cursor, last_newline_position);
+
+                    // Increment start with 1 character to skip the `=` or `-` character
+                    start += 1;
+
+                    let ruby_code = &cursor.input[start..end];
+
+                    // Override the last known newline position
+                    last_newline_position = end;
+
+                    let replaced = pre_process_input(ruby_code.to_vec(), "rb");
+                    result.replace_range(start..end, replaced);
+                }
+
+                // Only replace `.` with a space if it's not surrounded by numbers. E.g.:
+                //
+                // ```diff
+                // - .flex.items-center
+                // +  flex items-center
+                // ```
+                //
+                // But with numbers, it's allowed:
+                //
+                // ```diff
+                // - px-2.5
+                // + px-2.5
+                // ```
+                b'.' => {
+                    // Don't replace dots with spaces when inside of any type of brackets, because
+                    // this could be part of arbitrary values. E.g.: `bg-[url(https://example.com)]`
+                    //                                                                       ^
+                    if !bracket_stack.is_empty() {
+                        cursor.advance();
+                        continue;
+                    }
+
+                    // If the dot is surrounded by digits, we want to keep it. E.g.: `px-2.5`
+                    // EXCEPT if it's followed by a valid variant that happens to start with a
+                    // digit.
+                    // E.g.: `bg-red-500.2xl:flex`
+                    //                 ^^^
+                    if cursor.prev().is_ascii_digit() && cursor.next().is_ascii_digit() {
+                        let mut next_cursor = cursor.clone();
+                        next_cursor.advance();
+
+                        let mut variant_machine = VariantMachine::default();
+                        if let MachineState::Done(_) = variant_machine.next(&mut next_cursor) {
+                            result[cursor.pos] = b' ';
+                        }
+                    } else {
+                        result[cursor.pos] = b' ';
+                    }
+                }
+
+                // Handle Ruby syntax with `%w[]` arrays embedded in Haml attribute hashes. E.g.:
+                //
+                // ```haml
+                // %div{class: %w[bg-blue-500 w-10 h-10]}
+                // ```
+                //
+                // A `%` that follows a value is not a percent literal. E.g.: the `50%w` in
+                // `hit rate 50%w.`
+                b'%' if matches!(cursor.next(), b'w' | b'W')
+                    && !cursor.prev().is_ascii_alphanumeric()
+                    && !matches!(cursor.prev(), b'_' | b')' | b']' | b'}') =>
+                {
+                    // Boundary characters
+                    let (open, close) = match cursor.input.get(cursor.pos + 2) {
+                        Some(b'[') => (b'[', b']'),
+                        Some(b'(') => (b'(', b')'),
+                        Some(b'{') => (b'{', b'}'),
+                        Some(b'<') => (b'<', b'>'),
+
+                        // Any other ASCII punctuation can be used as a custom delimiter
+                        Some(&c) if c.is_ascii_punctuation() => (c, c),
+
+                        // Everything else is not a valid delimiter
+                        _ => {
+                            cursor.advance();
+                            continue;
+                        }
+                    };
+
+                    result[cursor.pos] = b' '; // Replace `%`
+                    cursor.advance();
+                    result[cursor.pos] = b' '; // Replace `w`
+                    cursor.advance();
+                    result[cursor.pos] = b' '; // Replace the opening delimiter
+                    cursor.advance();
+
+                    // Paired delimiters can be nested as long as they are balanced. E.g.:
+                    // `%w[foo[bar]baz]` produces a flat array.
+                    let mut depth = 1_usize;
+
+                    while cursor.pos < len {
+                        match cursor.curr() {
+                            // Skip escaped characters, unless the backslash is the delimiter
+                            // itself
+                            b'\\' if close != b'\\' => {
+                                // Use backslash to embed spaces in the strings.
+                                if cursor.next() == b' ' {
+                                    result[cursor.pos] = b' ';
+                                }
+
+                                cursor.advance();
+                            }
+
+                            // Start of a nested delimiter pair
+                            c if c == open && open != close => depth += 1,
+
+                            // Closing delimiter
+                            c if c == close => {
+                                depth -= 1;
+
+                                // End of the literal, replace the closing delimiter with a space
+                                if depth == 0 {
+                                    result[cursor.pos] = b' ';
+                                    break;
+                                }
+                            }
+
+                            // Everything else is valid content
+                            _ => {}
+                        }
+
+                        cursor.advance();
+                    }
+                }
+
+                // Replace following characters with spaces if they are not inside of brackets
+                b'#' | b'=' if bracket_stack.is_empty() => {
+                    result[cursor.pos] = b' ';
+                }
+
+                b'(' | b'[' | b'{' => {
+                    // Replace first bracket with a space
+                    if bracket_stack.is_empty() {
+                        result[cursor.pos] = b' ';
+                    }
+                    bracket_stack.push(cursor.curr());
+                }
+
+                b')' | b']' | b'}' if !bracket_stack.is_empty() => {
+                    bracket_stack.pop(cursor.curr());
+
+                    // Replace closing bracket with a space
+                    if bracket_stack.is_empty() {
+                        result[cursor.pos] = b' ';
+                    }
+                }
+
+                // Consume everything else
+                _ => {}
+            };
+
+            cursor.advance();
+        }
+
+        result
+    }
+}
+
+impl Haml {
+    fn skip_indented_block(
+        &self,
+        cursor: &mut cursor::Cursor,
+        last_known_newline_position: usize,
+    ) -> usize {
+        let len = cursor.input.len();
+
+        // Special case: if the first character of the block is `=`, then newlines are only allowed
+        // _if_ the last character of the previous line is a comma `,`.
+        //
+        // https://haml.info/docs/yardoc/file.REFERENCE.html#inserting_ruby
+        //
+        // > A line of Ruby code can be stretched over multiple lines as long as each line but the
+        // > last ends with a comma. For example:
+        //
+        // ```haml
+        // = link_to_remote "Add to cart",
+        //     :url => { :action => "add", :id => product.id },
+        //     :update => { :success => "cart", :failure => "error" }
+        // ```
+        let evaluation_type = cursor.curr();
+
+        let block_indentation_level = cursor
+            .pos
+            .saturating_sub(last_known_newline_position)
+            .saturating_sub(1); /* The newline itself */
+
+        let mut last_newline_position = last_known_newline_position;
+
+        // Consume until the end of the line first
+        while cursor.pos < len && cursor.curr() != b'\n' {
+            cursor.advance();
+        }
+
+        // Block is already done, aka just a line
+        if evaluation_type == b'=' && cursor.prev() != b',' {
+            return cursor.pos;
+        }
+
+        'outer: while cursor.pos < len {
+            match cursor.curr() {
+                // Escape the next character
+                b'\\' => {
+                    cursor.advance_twice();
+                    continue;
+                }
+
+                // Track the last newline position
+                b'\n' => {
+                    last_newline_position = cursor.pos;
+
+                    // We are done with this block
+                    if evaluation_type == b'=' && cursor.prev() != b',' {
+                        break;
+                    }
+
+                    cursor.advance();
+                    continue;
+                }
+
+                // Skip whitespace and compute the indentation level
+                x if x.is_ascii_whitespace() => {
+                    // Find first non-whitespace character
+                    while cursor.pos < len && cursor.curr().is_ascii_whitespace() {
+                        if cursor.curr() == b'\n' {
+                            last_newline_position = cursor.pos;
+
+                            if evaluation_type == b'=' && cursor.prev() != b',' {
+                                // We are done with this block
+                                break 'outer;
+                            }
+                        }
+
+                        cursor.advance();
+                    }
+
+                    let indentation = cursor
+                        .pos
+                        .saturating_sub(last_newline_position)
+                        .saturating_sub(1); /* The newline itself */
+                    if indentation < block_indentation_level {
+                        // We are done with this block
+                        break;
+                    }
+                }
+
+                // Not whitespace, end of block
+                _ => break,
+            };
+
+            cursor.advance();
+        }
+
+        // We didn't find a newline, we reached the end of the input
+        if last_known_newline_position == last_newline_position {
+            return cursor.pos;
+        }
+
+        // Move the cursor to the last newline position
+        cursor.move_to(last_newline_position);
+
+        last_newline_position
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Haml;
+    use crate::extractor::pre_processors::pre_processor::PreProcessor;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    fn test_haml_pre_processor() {
+        for (input, expected) in [
+            // Element with classes
+            (
+                "%body.flex.flex-col.items-center.justify-center",
+                "%body flex flex-col items-center justify-center",
+            ),
+            // Plain element
+            (
+                ".text-slate-500.xl:text-gray-500",
+                " text-slate-500 xl:text-gray-500",
+            ),
+            // Element with hash attributes
+            (
+                ".text-black.xl:text-red-500{ data: { tailwind: 'css' } }",
+                " text-black xl:text-red-500  data: { tailwind: 'css' }  ",
+            ),
+            // Element with a boolean attribute
+            (
+                ".text-green-500.xl:text-blue-500(data-sidebar)",
+                " text-green-500 xl:text-blue-500 data-sidebar ",
+            ),
+            // Element with interpreted content
+            (
+                ".text-yellow-500.xl:text-purple-500= 'Element with interpreted content'",
+                " text-yellow-500 xl:text-purple-500  'Element with interpreted content'",
+            ),
+            // Element with a hash at the end and an extra class.
+            (
+                ".text-orange-500.xl:text-pink-500{ class: 'bg-slate-100' }",
+                " text-orange-500 xl:text-pink-500  class: 'bg-slate-100'  ",
+            ),
+            // Object reference
+            (
+                ".text-teal-500.xl:text-indigo-500[@user, :greeting]",
+                " text-teal-500 xl:text-indigo-500 @user, :greeting ",
+            ),
+            // Element with an ID
+            (
+                ".text-lime-500.xl:text-emerald-500#root",
+                " text-lime-500 xl:text-emerald-500 root",
+            ),
+            // Dots in strings in HTML attributes stay as-is
+            (r#"<div id="px-2.5"></div>"#, r#"<div id "px-2.5"></div>"#),
+        ] {
+            Haml::test(input, expected);
+        }
+    }
+
+    #[test]
+    fn test_strings_only_occur_when_nested() {
+        let input = r#"
+            %p.mt-2.text-xl
+              The quote in the next word, can't be the start of a string
+
+            %h3.mt-24.text-center.text-4xl.font-bold.italic
+              The classes above should be extracted
+        "#;
+
+        Haml::test_extract_contains(
+            input,
+            vec![
+                // First paragraph
+                "mt-2",
+                "text-xl",
+                // second paragraph
+                "mt-24",
+                "text-center",
+                "text-4xl",
+                "font-bold",
+                "italic",
+            ],
+        );
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/20386
+    #[test]
+    fn test_embedded_ruby_percent_w_delimiters() {
+        for (input, expected) in [
+            // %w[…] in an attribute hash
+            (
+                "%div{class: %w[flex px-2.5]}",
+                "%div class:    flex px-2.5  ",
+            ),
+            // %w<…>
+            (
+                "%div{class: %w<flex px-2.5>}",
+                "%div class:    flex px-2.5  ",
+            ),
+            // Nested `<…>` does not end the literal
+            (
+                "%div{class: %w<flex <nested> px-2.5>}",
+                "%div class:    flex <nested> px-2.5  ",
+            ),
+            // Custom delimiters
+            (
+                "%div{class: %w|flex px-2.5|}",
+                "%div class:    flex px-2.5  ",
+            ),
+            (
+                "%div{class: %W!flex px-2.5!}",
+                "%div class:    flex px-2.5  ",
+            ),
+            (
+                "%div{class: %w#text-sm leading-6#}",
+                "%div class:    text-sm leading-6  ",
+            ),
+            (
+                "%div{class: %w=italic tracking-wide=}",
+                "%div class:    italic tracking-wide  ",
+            ),
+            // Nested paired delimiters stay balanced inside the literal
+            (
+                "%div{class: %w[content-['[hello]'] p-4]}",
+                "%div class:    content-['[hello]'] p-4  ",
+            ),
+            // Escaped spaces embed a space in a single array element
+            (
+                r#"%div{class: %w[foo\ bar baz-1]}"#,
+                r#"%div class:    foo  bar baz-1  "#,
+            ),
+            // A `%` that follows a value is not a percent literal
+            ("%p hit rate 50%w.", "%p hit rate 50%w "),
+        ] {
+            Haml::test(input, expected);
+        }
+
+        let input = r#"
+            %div{class: %w[bg-blue-500 w-10 h-10]}
+            %div{class: %w<flex px-2.5>}
+            %div{class: %w|underline font-bold|}
+            - classes = %w<mt-4 grid>
+        "#;
+
+        Haml::test_extract_contains(
+            input,
+            vec![
+                "bg-blue-500",
+                "w-10",
+                "h-10",
+                "flex",
+                "px-2.5",
+                "underline",
+                "font-bold",
+                "mt-4",
+                "grid",
+            ],
+        );
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/pull/17051#issuecomment-2711181352
+    #[test]
+    fn test_haml_full_file_17051() {
+        let actual = Haml::extract_annotated(include_bytes!("./test-fixtures/haml/src-17051.haml"));
+        let expected = include_str!("./test-fixtures/haml/dst-17051.haml");
+
+        assert_eq!(actual.replace("\r\n", "\n"), expected.replace("\r\n", "\n"));
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/17813
+    #[test]
+    fn test_haml_full_file_17813() {
+        let actual = Haml::extract_annotated(include_bytes!("./test-fixtures/haml/src-17813.haml"));
+        let expected = include_str!("./test-fixtures/haml/dst-17813.haml");
+
+        assert_eq!(actual.replace("\r\n", "\n"), expected.replace("\r\n", "\n"));
+    }
+
+    #[test]
+    fn test_arbitrary_code_followed_by_classes() {
+        let input = r#"
+            %p
+              = i < 3
+              .flex.items-center
+        "#;
+        Haml::test_extract_contains(input, vec!["flex", "items-center"]);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/17379#issuecomment-2910108646
+    #[test]
+    fn test_crash_missing_newline() {
+        // The empty `""` will introduce a newline
+        let good = ["- index = 0", "- index += 1", ""].join("\n");
+        Haml::test_extract_contains(&good, vec!["index"]);
+
+        // This used to crash before the fix
+        let bad = ["- index = 0", "- index += 1"].join("\n");
+        Haml::test_extract_contains(&bad, vec!["index"]);
+    }
+}
diff --git a/crates/oxide/src/extractor/pre_processors/json.rs b/crates/oxide/src/extractor/pre_processors/json.rs
new file mode 100644
index 000000000..cd457050c
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/json.rs
@@ -0,0 +1,63 @@
+use crate::cursor;
+use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+#[derive(Debug, Default)]
+pub struct Json;
+
+impl PreProcessor for Json {
+    fn process(&self, content: &[u8]) -> Vec<u8> {
+        let len = content.len();
+        let mut result = content.to_vec();
+        let mut cursor = cursor::Cursor::new(content);
+
+        while cursor.pos < len {
+            match cursor.curr() {
+                // Consume strings as-is
+                b'"' => {
+                    cursor.advance();
+
+                    while cursor.pos < len {
+                        match cursor.curr() {
+                            // Escaped character, skip ahead to the next character
+                            b'\\' => cursor.advance_twice(),
+
+                            // End of the string
+                            b'"' => break,
+
+                            // Everything else is valid
+                            _ => cursor.advance(),
+                        };
+                    }
+                }
+
+                // Replace brackets and curlies with spaces
+                b'[' | b'{' | b']' | b'}' => {
+                    result[cursor.pos] = b' ';
+                }
+
+                // Consume everything else
+                _ => {}
+            };
+
+            cursor.advance();
+        }
+
+        result
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Json;
+    use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+    #[test]
+    fn test_json_pre_processor() {
+        let (input, expected) = (
+            r#"[1,[2,[3,4,["flex flex-1 content-['hello_world']"]]], {"flex": true}]"#,
+            r#" 1, 2, 3,4, "flex flex-1 content-['hello_world']"   ,  "flex": true  "#,
+        );
+
+        Json::test(input, expected);
+    }
+}
diff --git a/crates/oxide/src/extractor/pre_processors/markdown.rs b/crates/oxide/src/extractor/pre_processors/markdown.rs
new file mode 100644
index 000000000..488614ee5
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/markdown.rs
@@ -0,0 +1,83 @@
+use crate::cursor;
+use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+#[derive(Debug, Default)]
+pub struct Markdown;
+
+impl PreProcessor for Markdown {
+    fn process(&self, content: &[u8]) -> Vec<u8> {
+        let len = content.len();
+        let mut result = content.to_vec();
+        let mut cursor = cursor::Cursor::new(content);
+        let mut bracket_stack = vec![];
+
+        let mut in_directive = false;
+
+        while cursor.pos < len {
+            match (in_directive, cursor.curr()) {
+                (false, b'{') => {
+                    result[cursor.pos] = b' ';
+                    in_directive = true;
+                }
+                (true, b'(' | b'[' | b'{' | b'<') => {
+                    bracket_stack.push(cursor.curr());
+                }
+                (true, b')' | b']' | b'}' | b'>') if !bracket_stack.is_empty() => {
+                    bracket_stack.pop();
+                }
+                (true, b'}') => {
+                    result[cursor.pos] = b' ';
+                    in_directive = false;
+                }
+                (true, b'.') if bracket_stack.is_empty() => {
+                    result[cursor.pos] = b' ';
+                }
+                _ => {}
+            }
+
+            cursor.advance();
+        }
+
+        result
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Markdown;
+    use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+    #[test]
+    fn test_markdown_pre_processor() {
+        for (input, expected) in [
+            // Convert dots to spaces inside markdown inline directives
+            (
+                ":span[Some Text]{.text-gray-500}",
+                ":span[Some Text]  text-gray-500 ",
+            ),
+            (
+                ":span[Some Text]{.text-gray-500.bg-red-500}",
+                ":span[Some Text]  text-gray-500 bg-red-500 ",
+            ),
+            (
+                ":span[Some Text]{#myId .my-class key=val key2='val 2'}",
+                ":span[Some Text] #myId  my-class key=val key2='val 2' ",
+            ),
+        ] {
+            Markdown::test(input, expected);
+        }
+    }
+
+    #[test]
+    fn test_nested_classes_keep_the_dots() {
+        for (input, expected) in [
+            (
+                r#"{<div class="px-2.5"></div>}"#,
+                r#" <div class="px-2.5"></div> "#,
+            ),
+            (r#"{content-['example.js']}"#, r#" content-['example.js'] "#),
+        ] {
+            Markdown::test(input, expected);
+        }
+    }
+}
diff --git a/crates/oxide/src/extractor/pre_processors/mod.rs b/crates/oxide/src/extractor/pre_processors/mod.rs
new file mode 100644
index 000000000..1a04af5c9
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/mod.rs
@@ -0,0 +1,31 @@
+pub mod clojure;
+pub mod elixir;
+pub mod haml;
+pub mod json;
+pub mod markdown;
+pub mod pre_processor;
+pub mod pug;
+pub mod razor;
+pub mod ruby;
+pub mod rust;
+pub mod slim;
+pub mod svelte;
+pub mod template_toolkit;
+pub mod twig;
+pub mod vue;
+
+pub use clojure::*;
+pub use elixir::*;
+pub use haml::*;
+pub use json::*;
+pub use markdown::*;
+pub use pre_processor::*;
+pub use pug::*;
+pub use razor::*;
+pub use ruby::*;
+pub use rust::*;
+pub use slim::*;
+pub use svelte::*;
+pub use template_toolkit::*;
+pub use twig::*;
+pub use vue::*;
diff --git a/crates/oxide/src/extractor/pre_processors/pre_processor.rs b/crates/oxide/src/extractor/pre_processors/pre_processor.rs
new file mode 100644
index 000000000..8e02b8f69
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/pre_processor.rs
@@ -0,0 +1,186 @@
+pub trait PreProcessor: Sized + Default {
+    fn process(&self, content: &[u8]) -> Vec<u8>;
+
+    #[cfg(test)]
+    fn test(input: &str, expected: &str) {
+        use pretty_assertions::assert_eq;
+
+        let input = input.as_bytes();
+        let expected = expected.as_bytes();
+
+        let processor = Self::default();
+
+        let actual = processor.process(input);
+
+        // Convert to strings for better error messages.
+        let input = String::from_utf8_lossy(input);
+        let actual = String::from_utf8_lossy(&actual);
+        let expected = String::from_utf8_lossy(expected);
+
+        // The input and output should have the exact same length.
+        assert_eq!(input.len(), actual.len());
+        assert_eq!(actual.len(), expected.len());
+
+        assert_eq!(actual, expected);
+    }
+
+    #[cfg(test)]
+    fn test_extract_exact(input: &str, expected: Vec<&str>) {
+        use crate::extractor::{Extracted, Extractor};
+
+        let input = input.as_bytes();
+
+        let processor = Self::default();
+        let transformed = processor.process(input);
+
+        let extracted = Extractor::new(&transformed).extract();
+
+        // Extract all candidates and css variables.
+        let candidates = extracted
+            .iter()
+            .filter_map(|x| match x {
+                Extracted::Candidate(bytes) => std::str::from_utf8(bytes).ok(),
+                Extracted::CssVariable(bytes) => std::str::from_utf8(bytes).ok(),
+            })
+            .collect::<Vec<_>>();
+
+        if candidates != expected {
+            dbg!(&candidates, &expected);
+            panic!("Extracted candidates do not match expected candidates");
+        }
+    }
+
+    #[cfg(test)]
+    fn test_extract_contains(input: &str, expected: Vec<&str>) {
+        use crate::extractor::{Extracted, Extractor};
+
+        let input = input.as_bytes();
+
+        let processor = Self::default();
+        let transformed = processor.process(input);
+
+        let extracted = Extractor::new(&transformed).extract();
+
+        // Extract all candidates and css variables.
+        let candidates = extracted
+            .iter()
+            .filter_map(|x| match x {
+                Extracted::Candidate(bytes) => std::str::from_utf8(bytes).ok(),
+                Extracted::CssVariable(bytes) => std::str::from_utf8(bytes).ok(),
+            })
+            .collect::<Vec<_>>();
+
+        // Ensure all items are present in the candidates.
+        let mut missing = vec![];
+        for item in &expected {
+            if !candidates.contains(item) {
+                missing.push(item);
+            }
+        }
+
+        if !missing.is_empty() {
+            dbg!(&candidates, &missing);
+            panic!("Missing some items");
+        }
+    }
+
+    #[cfg(test)]
+    fn extract_annotated(input: &[u8]) -> String {
+        use crate::extractor::{Extracted, Extractor};
+        use std::collections::BTreeMap;
+        use unicode_width::UnicodeWidthStr;
+
+        let processor = Self::default();
+        let transformed = processor.process(input);
+
+        let extracted = Extractor::new(&transformed).extract();
+
+        // Extract only candidate positions
+        let byte_ranges = extracted
+            .iter()
+            .filter_map(|x| match x {
+                Extracted::Candidate(bytes) => {
+                    let start = bytes.as_ptr() as usize - transformed.as_ptr() as usize;
+                    let end = start + bytes.len();
+                    Some((start, end))
+                }
+                _ => None,
+            })
+            .collect::<Vec<_>>();
+
+        // Convert byte ranges to (line, start_col, end_col)
+        let mut annotations = byte_ranges
+            .into_iter()
+            .map(|(start, end)| {
+                let (line, start_col) = byte_offset_to_line_and_column(input, start);
+                let (_, end_col) = byte_offset_to_line_and_column(input, end);
+                (line, start_col, end_col)
+            })
+            .collect::<Vec<_>>();
+
+        // Sort for safe insertion
+        annotations.sort_by(|a, b| b.0.cmp(&a.0).then(b.1.cmp(&a.1)));
+
+        // Convert input to lines
+        let mut lines = std::str::from_utf8(input)
+            .expect("Input must be valid UTF-8")
+            .lines()
+            .map(|line| line.to_string())
+            .collect::<Vec<_>>();
+
+        // Group annotations per line
+        let mut grouped = BTreeMap::<usize, Vec<(usize, usize)>>::new();
+        for (line, start_char, end_char) in annotations {
+            grouped
+                .entry(line)
+                .or_default()
+                .push((start_char, end_char));
+        }
+
+        // Inject annotation lines
+        for (line_idx, spans) in grouped.into_iter().rev() {
+            let display_line = &lines[line_idx];
+            let width = UnicodeWidthStr::width(display_line.as_str());
+            let mut annotation = vec![' '; width];
+
+            for (start, end) in spans {
+                for i in start..end.min(annotation.len()) {
+                    annotation[i] = '^';
+                }
+            }
+
+            let annotation_line: String = annotation
+                .into_iter()
+                .collect::<String>()
+                .trim_end()
+                .to_owned();
+            lines.insert(line_idx + 1, annotation_line);
+        }
+
+        lines.join("\n").trim_end().to_string() + "\n"
+    }
+}
+
+#[cfg(test)]
+fn byte_offset_to_line_and_column(input: &[u8], offset: usize) -> (usize, usize) {
+    use unicode_width::UnicodeWidthStr;
+
+    let mut line_start = 0;
+    let mut line = 0;
+
+    for (i, &b) in input.iter().enumerate() {
+        if i >= offset {
+            break;
+        }
+        if b == b'\n' {
+            line += 1;
+            line_start = i + 1;
+        }
+    }
+
+    let slice = &input[line_start..offset];
+    let column = std::str::from_utf8(slice).expect("Valid UTF-8");
+    let column = UnicodeWidthStr::width(column);
+
+    (line, column)
+}
diff --git a/crates/oxide/src/extractor/pre_processors/pug.rs b/crates/oxide/src/extractor/pre_processors/pug.rs
new file mode 100644
index 000000000..70dfe5683
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/pug.rs
@@ -0,0 +1,181 @@
+use crate::cursor;
+use crate::extractor::bracket_stack::BracketStack;
+use crate::extractor::machine::{Machine, MachineState};
+use crate::extractor::pre_processors::pre_processor::PreProcessor;
+use crate::extractor::variant_machine::VariantMachine;
+
+#[derive(Debug, Default)]
+pub struct Pug;
+
+impl PreProcessor for Pug {
+    fn process(&self, content: &[u8]) -> Vec<u8> {
+        let len = content.len();
+        let mut result = content.to_vec();
+        let mut cursor = cursor::Cursor::new(content);
+        let mut bracket_stack = BracketStack::default();
+
+        while cursor.pos < len {
+            match cursor.curr() {
+                // Only replace `.` with a space if it's not surrounded by numbers. E.g.:
+                //
+                // ```diff
+                // - .flex.items-center
+                // +  flex items-center
+                // ```
+                //
+                // But with numbers, it's allowed:
+                //
+                // ```diff
+                // - px-2.5
+                // + px-2.5
+                // ```
+                b'.' => {
+                    // Don't replace dots with spaces when inside of any type of brackets, because
+                    // this could be part of arbitrary values. E.g.: `bg-[url(https://example.com)]`
+                    //                                                                       ^
+                    if !bracket_stack.is_empty() {
+                        cursor.advance();
+                        continue;
+                    }
+
+                    // If the dot is surrounded by digits, we want to keep it. E.g.: `px-2.5`
+                    // EXCEPT if it's followed by a valid variant that happens to start with a
+                    // digit.
+                    // E.g.: `bg-red-500.2xl:flex`
+                    //                 ^^^
+                    if cursor.prev().is_ascii_digit() && cursor.next().is_ascii_digit() {
+                        let mut next_cursor = cursor.clone();
+                        next_cursor.advance();
+
+                        let mut variant_machine = VariantMachine::default();
+                        if let MachineState::Done(_) = variant_machine.next(&mut next_cursor) {
+                            result[cursor.pos] = b' ';
+                        }
+                    } else {
+                        result[cursor.pos] = b' ';
+                    }
+                }
+
+                // In Pug the class name shorthand can be followed by a parenthesis. E.g.:
+                //
+                // ```pug
+                // body.border-t-4.p-8(attr=value)
+                //                    ^ Not part of the p-8 class
+                // ```
+                //
+                // This means that we need to replace all these `(` and `)` with spaces to make
+                // sure that we can extract the `p-8`.
+                //
+                // However, we also need to make sure that we keep the parens that are part of the
+                // utility class. E.g.: `bg-(--my-color)`.
+                b'(' if bracket_stack.is_empty() && !matches!(cursor.prev(), b'-' | b'/') => {
+                    result[cursor.pos] = b' ';
+                    bracket_stack.push(cursor.curr());
+                }
+
+                b'(' | b'[' | b'{' => {
+                    bracket_stack.push(cursor.curr());
+                }
+
+                b')' | b']' | b'}' if !bracket_stack.is_empty() => {
+                    bracket_stack.pop(cursor.curr());
+                }
+
+                // Consume everything else
+                _ => {}
+            };
+
+            cursor.advance();
+        }
+
+        result
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Pug;
+    use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+    #[test]
+    fn test_pug_pre_processor() {
+        for (input, expected) in [
+            // Convert dots to spaces
+            ("div.flex.bg-red-500", "div flex bg-red-500"),
+            (".flex.bg-red-500", " flex bg-red-500"),
+            // Keep dots in strings
+            (r#"div(class="px-2.5")"#, r#"div class="px-2.5")"#),
+            // Nested brackets
+            (
+                "bg-[url(https://example.com/?q=[1,2])]",
+                "bg-[url(https://example.com/?q=[1,2])]",
+            ),
+            // Classes in HTML attributes
+            (r#"<div id="px-2.5"></div>"#, r#"<div id="px-2.5"></div>"#),
+        ] {
+            Pug::test(input, expected);
+        }
+    }
+
+    #[test]
+    fn test_strings_only_occur_when_nested() {
+        let input = r#"
+            p.mt-2.text-xl
+              div The quote in the next word, can't be the start of a string
+
+            h3.mt-24.text-center.text-4xl.font-bold.italic
+              div The classes above should be extracted
+        "#;
+
+        Pug::test_extract_contains(
+            input,
+            vec![
+                // First paragraph
+                "mt-2",
+                "text-xl",
+                // second paragraph
+                "mt-24",
+                "text-center",
+                "text-4xl",
+                "font-bold",
+                "italic",
+            ],
+        );
+    }
+
+    #[test]
+    fn test_arbitrary_code_followed_by_classes() {
+        let input = r#"
+            - i < 3
+              .flex.items-center
+        "#;
+        Pug::test_extract_contains(input, vec!["flex", "items-center"]);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/17313
+    #[test]
+    fn test_class_shorthand_followed_by_parens() {
+        let input = r#"
+            .text-sky-600.bg-neutral-900(title="A tooltip") This div has an HTML attribute.
+        "#;
+        Pug::test_extract_contains(input, vec!["text-sky-600", "bg-neutral-900"]);
+
+        // Additional test with CSS Variable shorthand syntax in the attribute itself because `(`
+        // and `)` are not valid in the class shorthand version.
+        //
+        // Also included an arbitrary value including `(` and `)` to make sure that we don't
+        // accidentally remove those either.
+        let input = r#"
+            .p-8(class="bg-(--my-color) bg-(--my-color)/(--my-opacity) bg-[url(https://example.com)]")
+        "#;
+        Pug::test_extract_contains(
+            input,
+            vec![
+                "p-8",
+                "bg-(--my-color)",
+                "bg-(--my-color)/(--my-opacity)",
+                "bg-[url(https://example.com)]",
+            ],
+        );
+    }
+}
diff --git a/crates/oxide/src/extractor/pre_processors/razor.rs b/crates/oxide/src/extractor/pre_processors/razor.rs
new file mode 100644
index 000000000..2713ea748
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/razor.rs
@@ -0,0 +1,42 @@
+use crate::extractor::pre_processors::pre_processor::PreProcessor;
+use bstr::ByteSlice;
+
+#[derive(Debug, Default)]
+pub struct Razor;
+
+impl PreProcessor for Razor {
+    fn process(&self, content: &[u8]) -> Vec<u8> {
+        content.replace("@@", " @").replace(r#"@("@")"#, "     @")
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Razor;
+    use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+    #[test]
+    fn test_razor_pre_processor() {
+        let (input, expected) = (
+            r#"<div class="@@sm:text-red-500">"#,
+            r#"<div class=" @sm:text-red-500">"#,
+        );
+        Razor::test(input, expected);
+        Razor::test_extract_contains(input, vec!["@sm:text-red-500"]);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/17424
+    #[test]
+    fn test_razor_syntax_with() {
+        let (input, expected) = (
+            r#"<p class="@("@")md:bg-red-500 @@md:border-green-500 border-8">With 2 elements</p>"#,
+            r#"<p class="     @md:bg-red-500  @md:border-green-500 border-8">With 2 elements</p>"#,
+        );
+
+        Razor::test(input, expected);
+        Razor::test_extract_contains(
+            input,
+            vec!["@md:bg-red-500", "@md:border-green-500", "border-8"],
+        );
+    }
+}
diff --git a/crates/oxide/src/extractor/pre_processors/ruby.rs b/crates/oxide/src/extractor/pre_processors/ruby.rs
new file mode 100644
index 000000000..d9a57ab77
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/ruby.rs
@@ -0,0 +1,528 @@
+// See: - https://docs.ruby-lang.org/en/3.4/syntax/literals_rdoc.html#label-Percent+Literals
+//      - https://docs.ruby-lang.org/en/3.4/syntax/literals_rdoc.html#label-25w+and+-25W-3A+String-Array+Literals
+use crate::cursor;
+use crate::extractor::bracket_stack;
+use crate::extractor::pre_processors::pre_processor::PreProcessor;
+use crate::scanner::pre_process_input;
+use bstr::ByteVec;
+use regex::{Regex, RegexBuilder};
+use std::sync;
+
+static TEMPLATE_START_REGEX: sync::LazyLock<Regex> = sync::LazyLock::new(|| {
+    RegexBuilder::new(r#"\s*([a-z0-9_-]+)_template\s*<<[-~]?([A-Z]+)$"#)
+        .multi_line(true)
+        .build()
+        .unwrap()
+});
+
+static TEMPLATE_END_REGEX: sync::LazyLock<Regex> = sync::LazyLock::new(|| {
+    RegexBuilder::new(r#"^\s*([A-Z]+)"#)
+        .multi_line(true)
+        .build()
+        .unwrap()
+});
+
+#[derive(Debug, Default)]
+pub struct Ruby;
+
+impl PreProcessor for Ruby {
+    fn process(&self, content: &[u8]) -> Vec<u8> {
+        let len = content.len();
+        let mut result = content.to_vec();
+        let mut cursor = cursor::Cursor::new(content);
+        let mut bracket_stack = bracket_stack::BracketStack::default();
+
+        // Extract embedded template languages
+        // https://viewcomponent.org/guide/templates.html#interpolations
+        // Only process if content is valid UTF-8, otherwise skip HEREDOC extraction
+        // but still perform the byte-level Ruby processing below
+        if let Ok(content_as_str) = std::str::from_utf8(content) {
+            let starts = TEMPLATE_START_REGEX
+                .captures_iter(content_as_str)
+                .collect::<Vec<_>>();
+            let ends = TEMPLATE_END_REGEX
+                .captures_iter(content_as_str)
+                .collect::<Vec<_>>();
+
+            for start in starts.iter() {
+                // The language for this block
+                let lang = start.get(1).unwrap().as_str();
+
+                // The HEREDOC delimiter
+                let delimiter_start = start.get(2).unwrap().as_str();
+
+                // Where the "body" starts for the HEREDOC block
+                let body_start = start.get(0).unwrap().end();
+
+                // Look through all of the ends to find a matching language
+                for end in ends.iter() {
+                    // 1. This must appear after the start
+                    let body_end = end.get(0).unwrap().start();
+                    if body_end < body_start {
+                        continue;
+                    }
+
+                    // The languages must match otherwise we haven't found the end
+                    let delimiter_end = end.get(1).unwrap().as_str();
+                    if delimiter_end != delimiter_start {
+                        continue;
+                    }
+
+                    let body = &content_as_str[body_start..body_end];
+                    let replaced =
+                        pre_process_input(body.as_bytes().to_vec(), &lang.to_ascii_lowercase());
+
+                    result.replace_range(body_start..body_end, replaced);
+                    break;
+                }
+            }
+        }
+
+        // Ruby extraction
+        while cursor.pos < len {
+            match cursor.curr() {
+                b'"' => {
+                    cursor.advance();
+
+                    while cursor.pos < len {
+                        match cursor.curr() {
+                            // Escaped character, skip ahead to the next character
+                            b'\\' => cursor.advance_twice(),
+
+                            // End of the string
+                            b'"' => break,
+
+                            // Everything else is valid
+                            _ => cursor.advance(),
+                        };
+                    }
+
+                    cursor.advance();
+                    continue;
+                }
+
+                b'\'' => {
+                    cursor.advance();
+
+                    while cursor.pos < len {
+                        match cursor.curr() {
+                            // Escaped character, skip ahead to the next character
+                            b'\\' => cursor.advance_twice(),
+
+                            // End of the string
+                            b'\'' => break,
+
+                            // Everything else is valid
+                            _ => cursor.advance(),
+                        };
+                    }
+
+                    cursor.advance();
+                    continue;
+                }
+
+                // Replace comments in Ruby files
+                //
+                // Except for strict locals, these are defined in a `<%# locals: … %>`. Checking if
+                // the comment is preceded by a `%` should be enough without having to perform more
+                // parsing logic. Worst case we _do_ scan a few comments.
+                //
+                // We also want to skip interpolation syntax, which look like `#{…}`.
+                b'#' if !matches!(cursor.prev(), b'%') && !matches!(cursor.next(), b'{') => {
+                    result[cursor.pos] = b' ';
+                    cursor.advance();
+
+                    while cursor.pos < len {
+                        match cursor.curr() {
+                            // End of the comment
+                            b'\n' => break,
+
+                            // Everything else is part of the comment and replaced
+                            _ => {
+                                result[cursor.pos] = b' ';
+                                cursor.advance();
+                            }
+                        };
+                    }
+
+                    cursor.advance();
+                    continue;
+                }
+
+                _ => {}
+            }
+
+            // Looking for `%w`, `%W`, or `%p`
+            if cursor.curr() != b'%' || !matches!(cursor.next(), b'w' | b'W' | b'p') {
+                cursor.advance();
+                continue;
+            }
+
+            // A `%` that follows a value is a modulo operation, not a percent literal. E.g.: the
+            // `50%w` in `hit rate 50%w.`
+            if cursor.prev().is_ascii_alphanumeric()
+                || matches!(cursor.prev(), b'_' | b')' | b']' | b'}')
+            {
+                cursor.advance();
+                continue;
+            }
+
+            cursor.advance_twice();
+
+            // Boundary character
+            let boundary = match cursor.curr() {
+                b'[' => b']',
+                b'(' => b')',
+                b'{' => b'}',
+                b'<' => b'>',
+                b' ' => b'\n',
+
+                // Any other ASCII punctuation can be used as a custom delimiter
+                c if c.is_ascii_punctuation() => c,
+
+                // Everything else is not a valid delimiter
+                _ => {
+                    cursor.advance();
+                    continue;
+                }
+            };
+
+            bracket_stack.reset();
+
+            // Replace the current character with a space
+            result[cursor.pos] = b' ';
+
+            // Skip the boundary character
+            cursor.advance();
+
+            while cursor.pos < len {
+                match cursor.curr() {
+                    // Skip escaped characters, unless the backslash is the delimiter itself
+                    b'\\' if boundary != b'\\' => {
+                        // Use backslash to embed spaces in the strings.
+                        if cursor.next() == b' ' {
+                            result[cursor.pos] = b' ';
+                        }
+
+                        cursor.advance();
+                    }
+
+                    // Start of a nested bracket
+                    b'[' | b'(' | b'{' => {
+                        bracket_stack.push(cursor.curr());
+                    }
+
+                    // Start of a nested `<…>`, which Ruby allows inside a `%w<…>` literal
+                    b'<' if boundary == b'>' => {
+                        bracket_stack.push(cursor.curr());
+                    }
+
+                    // End of a nested bracket
+                    b']' | b')' | b'}' if !bracket_stack.is_empty() => {
+                        if !bracket_stack.pop(cursor.curr()) {
+                            // Unbalanced
+                            cursor.advance();
+                        }
+                    }
+
+                    // End of a nested `<…>`
+                    b'>' if boundary == b'>' && !bracket_stack.is_empty() => {
+                        if !bracket_stack.pop(cursor.curr()) {
+                            // Unbalanced
+                            cursor.advance();
+                        }
+                    }
+
+                    // End of the pattern, replace the boundary character with a space
+                    _ if cursor.curr() == boundary => {
+                        if boundary != b'\n' {
+                            result[cursor.pos] = b' ';
+                        }
+
+                        break;
+                    }
+
+                    // Everything else is valid
+                    _ => {}
+                }
+
+                cursor.advance();
+            }
+        }
+
+        result
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Ruby;
+    use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+    #[test]
+    fn test_ruby_pre_processor() {
+        for (input, expected) in [
+            // %w[…]
+            ("%w[flex px-2.5]", "%w flex px-2.5 "),
+            (
+                "%w[flex data-[state=pending]:bg-[#0088cc] flex-col]",
+                "%w flex data-[state=pending]:bg-[#0088cc] flex-col ",
+            ),
+            // %w{…}
+            ("%w{flex px-2.5}", "%w flex px-2.5 "),
+            (
+                "%w{flex data-[state=pending]:bg-(--my-color) flex-col}",
+                "%w flex data-[state=pending]:bg-(--my-color) flex-col ",
+            ),
+            // %w(…)
+            ("%w(flex px-2.5)", "%w flex px-2.5 "),
+            (
+                "%w(flex data-[state=pending]:bg-(--my-color) flex-col)",
+                "%w flex data-[state=pending]:bg-(--my-color) flex-col ",
+            ),
+            // %w<…>
+            ("%w<flex px-2.5>", "%w flex px-2.5 "),
+            (
+                "%w<flex data-[state=pending]:bg-(--my-color) flex-col>",
+                "%w flex data-[state=pending]:bg-(--my-color) flex-col ",
+            ),
+            // Nested `<…>` does not end the literal
+            ("%w<flex <nested> px-2.5>", "%w flex <nested> px-2.5 "),
+            // %w|…|, %w:…:, %w!…!
+            ("%w|flex px-2.5|", "%w flex px-2.5 "),
+            ("%w:flex px-2.5:", "%w flex px-2.5 "),
+            ("%w!flex px-2.5!", "%w flex px-2.5 "),
+            (r#"%w\flex px-2.5\"#, r#"%w flex px-2.5 "#),
+            // A `%` that follows a value is a modulo operation, not a percent literal
+            (
+                "hit rate 50%w.\n%w[flex px-2.5]",
+                "hit rate 50%w.\n%w flex px-2.5 ",
+            ),
+
+            // %w …\n
+            ("%w flex px-2.5\n", "%w flex px-2.5\n"),
+
+            // Use backslash to embed spaces in the strings.
+            (r#"%w[foo\ bar baz\ bat]"#, r#"%w foo  bar baz  bat "#),
+            (r#"%W[foo\ bar baz\ bat]"#, r#"%W foo  bar baz  bat "#),
+
+            // The nested delimiters evaluated to a flat array of strings
+            // (not nested array).
+            (r#"%w[foo[bar baz]qux]"#, r#"%w foo[bar baz]qux "#),
+
+            (
+              "# test\n# test\n# {ActiveRecord::Base#save!}[rdoc-ref:Persistence#save!]\n%w[flex px-2.5]",
+              "      \n      \n                                                        \n%w flex px-2.5 "
+            ),
+
+            (r#""foo # bar""#, r#""foo # bar""#),
+            (r#"'foo # bar'"#, r#"'foo # bar'"#),
+            (
+              r#"def call = tag.span "Foo", class: %w[rounded-full h-0.75 w-0.75]"#,
+              r#"def call = tag.span "Foo", class: %w rounded-full h-0.75 w-0.75 "#
+            ),
+
+            (r#"%w[foo ' bar]"#, r#"%w foo ' bar "#),
+            (r#"%w[foo " bar]"#, r#"%w foo " bar "#),
+            (r#"%W[foo ' bar]"#, r#"%W foo ' bar "#),
+            (r#"%W[foo " bar]"#, r#"%W foo " bar "#),
+
+            (r#"%p foo ' bar "#, r#"%p foo ' bar "#),
+            (r#"%p foo " bar "#, r#"%p foo " bar "#),
+
+            (
+              "%p has a ' quote\n# this should be removed\n%p has a ' quote",
+              "%p has a ' quote\n                        \n%p has a ' quote"
+            ),
+            (
+              "%p has a \" quote\n# this should be removed\n%p has a \" quote",
+              "%p has a \" quote\n                        \n%p has a \" quote"
+            ),
+
+            (
+              "%w#this text is kept# # this text is not",
+              "%w this text is kept                    ",
+            ),
+        ] {
+            Ruby::test(input, expected);
+        }
+    }
+
+    #[test]
+    fn test_ruby_extraction() {
+        for (input, expected) in [
+            // %w[…]
+            ("%w[flex px-2.5]", vec!["flex", "px-2.5"]),
+            ("%w[px-2.5 flex]", vec!["flex", "px-2.5"]),
+            ("%w[2xl:flex]", vec!["2xl:flex"]),
+            (
+                "%w[flex data-[state=pending]:bg-[#0088cc] flex-col]",
+                vec!["flex", "data-[state=pending]:bg-[#0088cc]", "flex-col"],
+            ),
+            // %w{…}
+            ("%w{flex px-2.5}", vec!["flex", "px-2.5"]),
+            ("%w{px-2.5 flex}", vec!["flex", "px-2.5"]),
+            ("%w{2xl:flex}", vec!["2xl:flex"]),
+            (
+                "%w{flex data-[state=pending]:bg-(--my-color) flex-col}",
+                vec!["flex", "data-[state=pending]:bg-(--my-color)", "flex-col"],
+            ),
+            // %w(…)
+            ("%w(flex px-2.5)", vec!["flex", "px-2.5"]),
+            ("%w(px-2.5 flex)", vec!["flex", "px-2.5"]),
+            ("%w(2xl:flex)", vec!["2xl:flex"]),
+            (
+                "%w(flex data-[state=pending]:bg-(--my-color) flex-col)",
+                vec!["flex", "data-[state=pending]:bg-(--my-color)", "flex-col"],
+            ),
+            // %w<…>
+            ("%w<flex px-2.5>", vec!["flex", "px-2.5"]),
+            ("%w<px-2.5 flex>", vec!["flex", "px-2.5"]),
+            ("%w<2xl:flex>", vec!["2xl:flex"]),
+            (
+                "%w<flex data-[state=pending]:bg-(--my-color) flex-col>",
+                vec!["flex", "data-[state=pending]:bg-(--my-color)", "flex-col"],
+            ),
+            // Nested `<…>` does not end the literal
+            ("%w<flex <nested> px-2.5>", vec!["flex", "px-2.5"]),
+            // %w|…|, %w:…:, %w!…!
+            ("%w|flex px-2.5|", vec!["flex", "px-2.5"]),
+            ("%w:flex px-2.5:", vec!["flex", "px-2.5"]),
+            ("%w!flex px-2.5!", vec!["flex", "px-2.5"]),
+
+            (
+              "# test\n# test\n# {ActiveRecord::Base#save!}[rdoc-ref:Persistence#save!]\n%w[flex px-2.5]",
+              vec!["flex", "px-2.5"],
+            ),
+
+            (r#""foo # bar""#, vec!["foo", "bar"]),
+            (r#"'foo # bar'"#, vec!["foo", "bar"]),
+
+            (r#"%w[foo ' bar]"#, vec!["foo", "bar"]),
+        ] {
+            Ruby::test_extract_contains(input, expected);
+        }
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/17334
+    #[test]
+    fn test_embedded_slim_extraction() {
+        let input = r#"
+            class QweComponent < ApplicationComponent
+              slim_template <<~SLIM
+                button.rounded-full.bg-red-500
+                  | Some text
+                button.rounded-full(
+                  class="flex"
+                )
+                  | Some text
+              SLIM
+            end
+        "#;
+
+        Ruby::test_extract_contains(input, vec!["rounded-full", "bg-red-500", "flex"]);
+
+        // Embedded Svelte just to verify that we properly pick up the `{x}_template`
+        let input = r#"
+            class QweComponent < ApplicationComponent
+              svelte_template <<~HTML
+                  <div class:flex="true"></div>
+              HTML
+            end
+        "#;
+
+        Ruby::test_extract_contains(input, vec!["flex"]);
+
+        // Together in the same file
+        let input = r#"
+            class QweComponent < ApplicationComponent
+              slim_template <<~SLIM
+                button.z-1.z-2
+                  | Some text
+              SLIM
+            end
+
+            class QweComponent < ApplicationComponent
+              svelte_template <<~HTML
+                <div class:z-3="true"></div>
+              HTML
+            end
+        "#;
+        Ruby::test_extract_contains(input, vec!["z-1", "z-2", "z-3"]);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/19728
+    #[test]
+    fn test_interpolated_expressions() {
+        let input = r#"
+            def width_class(width = nil)
+              <<~STYLE_CLASS
+                #{width || 'w-100'}
+              STYLE_CLASS
+            end
+        "#;
+
+        Ruby::test_extract_contains(input, vec!["w-100"]);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/19239
+    #[test]
+    fn test_skip_comments() {
+        let input = r#"
+          # From activerecord-8.1.1/lib/active_record/errors.rb:147
+          # Rails uses RDoc cross-reference syntax in inline documentation:
+          # {ActiveRecord::Base#save!}[rdoc-ref:Persistence#save!]
+        "#;
+
+        // Nothing should be extracted from comments, so expect an empty array.
+        Ruby::test_extract_exact(input, vec![]);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/19481
+    #[test]
+    fn test_strict_locals() {
+        // Strict locals are defined in a `<%# locals: … %>`, but the `#` looks like a comment
+        // which we should not ignore in this case.
+        let input = r#"
+          <%# locals: (css: "text-amber-600") %>
+          <% more_css = "text-sky-500" %>
+
+          <p class="text-green-500">
+            In a partial
+          </p>
+
+          <p class="<%= css %>">
+            In a partial using explicit local variables
+          </p>
+
+          <p class="<%= more_css %>">
+            In a partial using explicit local variables
+          </p>
+        "#;
+
+        Ruby::test_extract_contains(
+            input,
+            vec!["text-amber-600", "text-sky-500", "text-green-500"],
+        );
+    }
+
+    #[test]
+    fn test_invalid_utf8_does_not_panic() {
+        // Invalid UTF-8 sequence: 0x80 is a continuation byte without a leading byte
+        let invalid_utf8: &[u8] = &[0x80, 0x81, 0x82];
+
+        let processor = Ruby::default();
+
+        // Should not panic, just return the input unchanged
+        let result = processor.process(invalid_utf8);
+        assert_eq!(result, invalid_utf8);
+    }
+
+    #[test]
+    fn test_valid_utf8_with_multibyte_chars() {
+        // Test that valid UTF-8 with multi-byte characters (like em-dashes) works
+        let input = "# Comment with em—dash\n%w[flex px-2.5]";
+
+        Ruby::test_extract_contains(input, vec!["flex", "px-2.5"]);
+    }
+}
diff --git a/crates/oxide/src/extractor/pre_processors/rust.rs b/crates/oxide/src/extractor/pre_processors/rust.rs
new file mode 100644
index 000000000..4fa53f793
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/rust.rs
@@ -0,0 +1,238 @@
+use crate::extractor::bracket_stack;
+use crate::extractor::cursor;
+use crate::extractor::machine::Machine;
+use crate::extractor::pre_processors::pre_processor::PreProcessor;
+use crate::extractor::variant_machine::VariantMachine;
+use crate::extractor::MachineState;
+use bstr::ByteSlice;
+
+#[derive(Debug, Default)]
+pub struct Rust;
+
+impl PreProcessor for Rust {
+    fn process(&self, content: &[u8]) -> Vec<u8> {
+        // Leptos support: https://github.com/tailwindlabs/tailwindcss/pull/18093
+        let replaced_content = content
+            .replace(" class:", " class ")
+            .replace("\tclass:", " class ")
+            .replace("\nclass:", " class ");
+
+        if replaced_content.contains_str(b"html!") {
+            self.process_maud_templates(&replaced_content)
+        } else {
+            replaced_content
+        }
+    }
+}
+
+impl Rust {
+    fn process_maud_templates(&self, replaced_content: &[u8]) -> Vec<u8> {
+        let len = replaced_content.len();
+        let mut result = replaced_content.to_vec();
+        let mut cursor = cursor::Cursor::new(replaced_content);
+        let mut bracket_stack = bracket_stack::BracketStack::default();
+
+        while cursor.pos < len {
+            match cursor.curr() {
+                // Escaped character, skip ahead to the next character
+                b'\\' => {
+                    cursor.advance_twice();
+                    continue;
+                }
+
+                // Consume strings as-is
+                b'"' => {
+                    result[cursor.pos] = b' ';
+                    cursor.advance();
+
+                    while cursor.pos < len {
+                        match cursor.curr() {
+                            // Escaped character, skip ahead to the next character
+                            b'\\' => cursor.advance_twice(),
+
+                            // End of the string
+                            b'"' => {
+                                result[cursor.pos] = b' ';
+                                break;
+                            }
+
+                            // Everything else is valid
+                            _ => cursor.advance(),
+                        };
+                    }
+                }
+
+                // Only replace `.` with a space if it's not surrounded by numbers. E.g.:
+                //
+                // ```diff
+                // - .flex.items-center
+                // +  flex items-center
+                // ```
+                //
+                // But with numbers, it's allowed:
+                //
+                // ```diff
+                // - px-2.5
+                // + px-2.5
+                // ```
+                b'.' => {
+                    // Don't replace dots with spaces when inside of any type of brackets, because
+                    // this could be part of arbitrary values. E.g.: `bg-[url(https://example.com)]`
+                    //                                                                       ^
+                    if !bracket_stack.is_empty() {
+                        cursor.advance();
+                        continue;
+                    }
+
+                    // If the dot is surrounded by digits, we want to keep it. E.g.: `px-2.5`
+                    // EXCEPT if it's followed by a valid variant that happens to start with a
+                    // digit.
+                    // E.g.: `bg-red-500.2xl:flex`
+                    //                 ^^^
+                    if cursor.prev().is_ascii_digit() && cursor.next().is_ascii_digit() {
+                        let mut next_cursor = cursor.clone();
+                        next_cursor.advance();
+
+                        let mut variant_machine = VariantMachine::default();
+                        if let MachineState::Done(_) = variant_machine.next(&mut next_cursor) {
+                            result[cursor.pos] = b' ';
+                        }
+                    } else {
+                        result[cursor.pos] = b' ';
+                    }
+                }
+
+                b'[' => {
+                    bracket_stack.push(cursor.curr());
+
+                    // Handle `p.flex[condition]`. If there is a `-` before it, it will likely be an
+                    // arbitrary value e.g. `text-[red]`
+                    if !matches!(cursor.prev(), b'-') {
+                        result[cursor.pos] = b' ';
+                    }
+                }
+
+                b']' if !bracket_stack.is_empty() => {
+                    bracket_stack.pop(cursor.curr());
+                }
+
+                // Consume everything else
+                _ => {}
+            };
+
+            cursor.advance();
+        }
+
+        result
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Rust;
+    use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+    #[test]
+    fn test_leptos_extraction() {
+        for (input, expected) in [
+            // Spaces
+            (
+                "<div class:flex class:px-2.5={condition()}>",
+                "<div class flex class px-2.5={condition()}>",
+            ),
+            // Tabs
+            (
+                "<div\tclass:flex class:px-2.5={condition()}>",
+                "<div class flex class px-2.5={condition()}>",
+            ),
+            // Newlines
+            (
+                "<div\nclass:flex class:px-2.5={condition()}>",
+                "<div class flex class px-2.5={condition()}>",
+            ),
+        ] {
+            Rust::test(input, expected);
+        }
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/18984
+    #[test]
+    fn test_maud_template_extraction() {
+        let input = r#"
+            use maud::{html, Markup};
+
+            pub fn main() -> Markup {
+                html! {
+                    header.px-8.py-4.text-black {
+                        "Hello, world!"
+                    }
+                }
+            }
+        "#;
+
+        Rust::test_extract_contains(input, vec!["px-8", "py-4", "text-black"]);
+
+        // https://maud.lambda.xyz/elements-attributes.html#classes-and-ids-foo-bar
+        let input = r#"
+            html! {
+                input #cannon .big.scary.bright-red type="button" value="Launch Party Cannon";
+            }
+        "#;
+        Rust::test_extract_contains(input, vec!["big", "scary", "bright-red"]);
+
+        let input = r#"
+            html! {
+                div."bg-[#0088cc]" { "Quotes for backticks" }
+            }
+        "#;
+        Rust::test_extract_contains(input, vec!["bg-[#0088cc]"]);
+
+        let input = r#"
+            html! {
+                #main {
+                    "Main content!"
+                    .tip { "Storing food in a refrigerator can make it 20% cooler." }
+                }
+            }
+        "#;
+        Rust::test_extract_contains(input, vec!["tip"]);
+
+        let input = r#"
+            html! {
+                div."bg-[url(https://example.com)]" { "Arbitrary values" }
+            }
+        "#;
+        Rust::test_extract_contains(input, vec!["bg-[url(https://example.com)]"]);
+
+        let input = r#"
+            html! {
+                div.px-4.text-black {
+                    "Some text, with unbalanced brackets ]["
+                }
+                div.px-8.text-white {
+                    "Some more text, with unbalanced brackets ]["
+                }
+            }
+        "#;
+        Rust::test_extract_contains(input, vec!["px-4", "text-black", "px-8", "text-white"]);
+
+        let input = r#"html! { \x.px-4.text-black {  } }"#;
+        Rust::test(input, r#"html! { \x px-4 text-black {  } }"#);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/20233
+    #[test]
+    fn test_maud_template_extraction_with_conditional_classes() {
+        let input = r#"
+            use maud::{html, Markup};
+
+            pub fn main() -> Markup {
+                html! {
+                    p.text-black[cuteness > 50] { "Squee!" }
+                }
+            }
+        "#;
+
+        Rust::test_extract_contains(input, vec!["text-black"]);
+    }
+}
diff --git a/crates/oxide/src/extractor/pre_processors/slim.rs b/crates/oxide/src/extractor/pre_processors/slim.rs
new file mode 100644
index 000000000..5683858d5
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/slim.rs
@@ -0,0 +1,449 @@
+use crate::cursor;
+use crate::extractor::bracket_stack::BracketStack;
+use crate::extractor::machine::{Machine, MachineState};
+use crate::extractor::pre_processors::pre_processor::PreProcessor;
+use crate::extractor::variant_machine::VariantMachine;
+
+#[derive(Debug, Default)]
+pub struct Slim;
+
+impl PreProcessor for Slim {
+    fn process(&self, content: &[u8]) -> Vec<u8> {
+        let len = content.len();
+        let mut result = content.to_vec();
+        let mut cursor = cursor::Cursor::new(content);
+        let mut bracket_stack = BracketStack::default();
+
+        while cursor.pos < len {
+            match cursor.curr() {
+                // Only replace `.` with a space if it's not surrounded by numbers. E.g.:
+                //
+                // ```diff
+                // - .flex.items-center
+                // +  flex items-center
+                // ```
+                //
+                // But with numbers, it's allowed:
+                //
+                // ```diff
+                // - px-2.5
+                // + px-2.5
+                // ```
+                b'.' => {
+                    // Don't replace dots with spaces when inside of any type of brackets, because
+                    // this could be part of arbitrary values. E.g.: `bg-[url(https://example.com)]`
+                    //                                                                       ^
+                    if !bracket_stack.is_empty() {
+                        cursor.advance();
+                        continue;
+                    }
+
+                    // If the dot is surrounded by digits, we want to keep it. E.g.: `px-2.5`
+                    // EXCEPT if it's followed by a valid variant that happens to start with a
+                    // digit.
+                    // E.g.: `bg-red-500.2xl:flex`
+                    //                 ^^^
+                    if cursor.prev().is_ascii_digit() && cursor.next().is_ascii_digit() {
+                        let mut next_cursor = cursor.clone();
+                        next_cursor.advance();
+
+                        let mut variant_machine = VariantMachine::default();
+                        if let MachineState::Done(_) = variant_machine.next(&mut next_cursor) {
+                            result[cursor.pos] = b' ';
+                        }
+                    } else {
+                        result[cursor.pos] = b' ';
+                    }
+                }
+
+                // Handle Ruby syntax with `%w[]` arrays embedded in Slim directly.
+                //
+                // E.g.:
+                //
+                // ```
+                // div [
+                //   class=%w[bg-blue-500 w-10 h-10]
+                // ]
+                // ```
+                //
+                // A `%` that follows a value is not a percent literal. E.g.: the `50%w` in
+                // `hit rate 50%w.`
+                b'%' if matches!(cursor.next(), b'w' | b'W')
+                    && !cursor.prev().is_ascii_alphanumeric()
+                    && !matches!(cursor.prev(), b'_' | b')' | b']' | b'}') =>
+                {
+                    // Boundary characters
+                    let (open, close) = match cursor.input.get(cursor.pos + 2) {
+                        Some(b'[') => (b'[', b']'),
+                        Some(b'(') => (b'(', b')'),
+                        Some(b'{') => (b'{', b'}'),
+                        Some(b'<') => (b'<', b'>'),
+
+                        // Any other ASCII punctuation can be used as a custom delimiter
+                        Some(&c) if c.is_ascii_punctuation() => (c, c),
+
+                        // Everything else is not a valid delimiter
+                        _ => {
+                            cursor.advance();
+                            continue;
+                        }
+                    };
+
+                    result[cursor.pos] = b' '; // Replace `%`
+                    cursor.advance();
+                    result[cursor.pos] = b' '; // Replace `w`
+                    cursor.advance();
+                    result[cursor.pos] = b' '; // Replace the opening delimiter
+                    cursor.advance();
+
+                    // Paired delimiters can be nested as long as they are balanced. E.g.:
+                    // `%w[foo[bar]baz]` produces a flat array.
+                    let mut depth = 1_usize;
+
+                    while cursor.pos < len {
+                        match cursor.curr() {
+                            // Skip escaped characters, unless the backslash is the delimiter
+                            // itself
+                            b'\\' if close != b'\\' => {
+                                // Use backslash to embed spaces in the strings.
+                                if cursor.next() == b' ' {
+                                    result[cursor.pos] = b' ';
+                                }
+
+                                cursor.advance();
+                            }
+
+                            // Start of a nested delimiter pair
+                            c if c == open && open != close => depth += 1,
+
+                            // Closing delimiter
+                            c if c == close => {
+                                depth -= 1;
+
+                                // End of the literal, replace the closing delimiter with a space
+                                if depth == 0 {
+                                    result[cursor.pos] = b' ';
+                                    break;
+                                }
+                            }
+
+                            // Everything else is valid content
+                            _ => {}
+                        }
+
+                        cursor.advance();
+                    }
+                }
+
+                // Any `[` preceded by an alphanumeric value will not be part of a candidate.
+                //
+                // E.g.:
+                //
+                // ```
+                //  .text-xl.text-red-600[
+                //                       ^ not part of the `text-red-600` candidate
+                //    data-foo="bar"
+                //  ]
+                //    | This line should be red
+                // ```
+                //
+                // We know that `-[` is valid for an arbitrary value and that `:[` is valid as a
+                // variant. However `[color:red]` is also valid, in this case `[` will be preceded
+                // by nothing or a boundary character.
+                // Instead of listing all boundary characters, let's list the characters we know
+                // will be invalid instead.
+                b'[' if bracket_stack.is_empty()
+                    && matches!(cursor.prev(), b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9') =>
+                {
+                    result[cursor.pos] = b' ';
+                    bracket_stack.push(cursor.curr());
+                }
+
+                // In Slim the class name shorthand can be followed by a parenthesis. E.g.:
+                //
+                // ```slim
+                // body.border-t-4.p-8(attr=value)
+                //                    ^ Not part of the p-8 class
+                // ```
+                //
+                // This means that we need to replace all these `(` and `)` with spaces to make
+                // sure that we can extract the `p-8`.
+                //
+                // However, we also need to make sure that we keep the parens that are part of the
+                // utility class. E.g.: `bg-(--my-color)`.
+                b'(' if bracket_stack.is_empty() && !matches!(cursor.prev(), b'-' | b'/') => {
+                    result[cursor.pos] = b' ';
+                    bracket_stack.push(cursor.curr());
+                }
+
+                b'(' | b'[' | b'{' => {
+                    bracket_stack.push(cursor.curr());
+                }
+
+                b')' | b']' | b'}' if !bracket_stack.is_empty() => {
+                    bracket_stack.pop(cursor.curr());
+                }
+
+                // Consume everything else
+                _ => {}
+            };
+
+            cursor.advance();
+        }
+
+        result
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Slim;
+    use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+    #[test]
+    fn test_slim_pre_processor() {
+        for (input, expected) in [
+            // Convert dots to spaces
+            ("div.flex.bg-red-500", "div flex bg-red-500"),
+            (".flex.bg-red-500", " flex bg-red-500"),
+            (".bg-red-500.2xl:flex", " bg-red-500 2xl:flex"),
+            (
+                ".bg-red-500.2xl:flex.bg-green-200.3xl:flex",
+                " bg-red-500 2xl:flex bg-green-200 3xl:flex",
+            ),
+            // Keep dots in strings
+            (r#"div(class="px-2.5")"#, r#"div class="px-2.5")"#),
+            // Replace top-level `(a-z0-9)[` with `$1 `. E.g.: `.flex[x]` -> `.flex x]`
+            (".text-xl.text-red-600[", " text-xl text-red-600 "),
+            // But keep important brackets:
+            (".text-[#0088cc]", " text-[#0088cc]"),
+            // Arbitrary value and arbitrary modifier
+            (
+                ".text-[#0088cc].bg-[#0088cc]/[20%]",
+                " text-[#0088cc] bg-[#0088cc]/[20%]",
+            ),
+            // Start of arbitrary property
+            ("[color:red]", "[color:red]"),
+            // Arbitrary container query
+            ("@[320px]:flex", "@[320px]:flex"),
+            // Nested brackets
+            (
+                "bg-[url(https://example.com/?q=[1,2])]",
+                "bg-[url(https://example.com/?q=[1,2])]",
+            ),
+            // Nested brackets, with "invalid" syntax but valid due to nesting
+            ("content-['50[]']", "content-['50[]']"),
+            // Escaped string
+            ("content-['a\'b\'c\'']", "content-['a\'b\'c\'']"),
+            // Classes in HTML attributes
+            ("<div id=\"px-2.5\"></div>", "<div id=\"px-2.5\"></div>"),
+            (
+                "<div id=\"px-2.5 bg-red-500 2xl:flex bg-green-200 3xl:flex\"></div>",
+                "<div id=\"px-2.5 bg-red-500 2xl:flex bg-green-200 3xl:flex\"></div>",
+            ),
+        ] {
+            Slim::test(input, expected);
+        }
+    }
+
+    #[test]
+    fn test_nested_slim_syntax() {
+        let input = r#"
+            .text-black[
+              data-controller= ['foo', ('bar' if rand.positive?)].join(' ')
+            ]
+              .bg-green-300
+                | BLACK on GREEN - OK
+
+              .bg-red-300[
+                data-foo= 42
+              ]
+                | Should be BLACK on RED - FAIL
+        "#;
+
+        Slim::test_extract_contains(input, vec!["text-black", "bg-green-300", "bg-red-300"]);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/17081
+    // https://github.com/slim-template/slim?tab=readme-ov-file#verbatim-text-with-trailing-white-space-
+    #[test]
+    fn test_single_quotes_to_enforce_trailing_whitespace() {
+        let input = r#"
+            div
+              'A single quote enforces trailing white space
+              = 1234
+
+            .text-red-500.text-3xl
+              | This text should be red
+        "#;
+
+        let expected = r#"
+            div
+              'A single quote enforces trailing white space
+              = 1234
+
+             text-red-500 text-3xl
+              | This text should be red
+        "#;
+
+        Slim::test(input, expected);
+        Slim::test_extract_contains(input, vec!["text-red-500", "text-3xl"]);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/17277
+    #[test]
+    fn test_class_shorthand_followed_by_parens() {
+        let input = r#"
+              body.border-t-4.p-8(class="\#{body_classes}" data-hotwire-native="\#{hotwire_native_app?}" data-controller="update-time-zone")
+        "#;
+        Slim::test_extract_contains(input, vec!["border-t-4", "p-8"]);
+
+        // Additional test with CSS Variable shorthand syntax in the attribute itself because `(`
+        // and `)` are not valid in the class shorthand version.
+        //
+        // Also included an arbitrary value including `(` and `)` to make sure that we don't
+        // accidentally remove those either.
+        let input = r#"
+              body.p-8(class="bg-(--my-color) bg-(--my-color)/(--my-opacity) bg-[url(https://example.com)]")
+        "#;
+        Slim::test_extract_contains(
+            input,
+            vec![
+                "p-8",
+                "bg-(--my-color)",
+                "bg-(--my-color)/(--my-opacity)",
+                "bg-[url(https://example.com)]",
+            ],
+        );
+
+        // Top-level class shorthand with parens
+        let input = r#"
+            div class="bg-(--my-color) bg-(--my-color)/(--my-opacity)"
+        "#;
+        Slim::test_extract_contains(
+            input,
+            vec!["bg-(--my-color)", "bg-(--my-color)/(--my-opacity)"],
+        );
+    }
+
+    #[test]
+    fn test_strings_only_occur_when_nested() {
+        let input = r#"
+            p.mt-2.text-xl
+              | The quote in the next word, can't be the start of a string
+
+            h3.mt-24.text-center.text-4xl.font-bold.italic
+              | The classes above should be extracted
+        "#;
+
+        Slim::test_extract_contains(
+            input,
+            vec![
+                // First paragraph
+                "mt-2",
+                "text-xl",
+                // second paragraph
+                "mt-24",
+                "text-center",
+                "text-4xl",
+                "font-bold",
+                "italic",
+            ],
+        );
+    }
+
+    #[test]
+    fn test_arbitrary_code_followed_by_classes() {
+        let input = r#"
+            - i < 3
+              .flex.items-center
+        "#;
+        Slim::test_extract_contains(input, vec!["flex", "items-center"]);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/17542
+    #[test]
+    fn test_embedded_ruby_percent_w_extraction() {
+        let input = r#"
+            div[
+              class=%w[bg-blue-500 w-10 h-10]
+            ]
+            div[
+              class=%w[w-10 bg-green-500 h-10]
+            ]
+        "#;
+
+        let expected = "
+            div \n              class=   bg-blue-500 w-10 h-10 \n            ]
+            div \n              class=   w-10 bg-green-500 h-10 \n            ]
+        ";
+
+        Slim::test(input, expected);
+        Slim::test_extract_contains(input, vec!["bg-blue-500", "bg-green-500", "w-10", "h-10"]);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/20386
+    #[test]
+    fn test_embedded_ruby_percent_w_delimiters() {
+        for (input, expected) in [
+            // %w<…>, Slim only counts `[({` nesting in attribute values, so the code must be
+            // wrapped in parentheses to contain spaces
+            (
+                "div class=(%w<bg-blue-500 w-10 h-10>)",
+                "div class=    bg-blue-500 w-10 h-10 )",
+            ),
+            // Nested `<…>` does not end the literal
+            (
+                "div class=(%w<flex <nested> px-2.5>)",
+                "div class=    flex <nested> px-2.5 )",
+            ),
+            // Custom delimiters
+            ("div class=(%w|flex px-2.5|)", "div class=    flex px-2.5 )"),
+            ("div class=(%W!flex px-2.5!)", "div class=    flex px-2.5 )"),
+            (
+                "div class=(%w#text-sm leading-6#)",
+                "div class=    text-sm leading-6 )",
+            ),
+            (
+                "div class=(%w=italic tracking-wide=)",
+                "div class=    italic tracking-wide )",
+            ),
+            // Nested paired delimiters stay balanced inside the literal
+            (
+                "div class=(%w[content-['[hello]'] p-4])",
+                "div class=    content-['[hello]'] p-4 )",
+            ),
+            // Escaped spaces embed a space in a single array element
+            (
+                r#"div class=(%w[foo\ bar baz-1])"#,
+                r#"div class=    foo  bar baz-1 )"#,
+            ),
+            // Ruby control line, which is plain Ruby code
+            ("- classes = %w<mt-4 flex>", "- classes =    mt-4 flex "),
+            // A `%` that follows a value is not a percent literal
+            ("| hit rate 50%w.", "| hit rate 50%w "),
+        ] {
+            Slim::test(input, expected);
+        }
+
+        let input = r#"
+            div[
+              class=(%w<bg-blue-500 w-10 h-10>)
+            ]
+            - classes = %w|w-10 bg-green-500 h-10|
+            = tag.div class: %W!px-2.5 flex!
+        "#;
+
+        Slim::test_extract_contains(
+            input,
+            vec![
+                "bg-blue-500",
+                "bg-green-500",
+                "w-10",
+                "h-10",
+                "px-2.5",
+                "flex",
+            ],
+        );
+    }
+}
diff --git a/crates/oxide/src/extractor/pre_processors/svelte.rs b/crates/oxide/src/extractor/pre_processors/svelte.rs
new file mode 100644
index 000000000..5834f7feb
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/svelte.rs
@@ -0,0 +1,43 @@
+use crate::extractor::pre_processors::pre_processor::PreProcessor;
+use bstr::ByteSlice;
+
+#[derive(Debug, Default)]
+pub struct Svelte;
+
+impl PreProcessor for Svelte {
+    fn process(&self, content: &[u8]) -> Vec<u8> {
+        content
+            .replace(" class:", " class ")
+            .replace("\tclass:", " class ")
+            .replace("\nclass:", " class ")
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Svelte;
+    use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+    #[test]
+    fn test_svelte_pre_processor() {
+        for (input, expected) in [
+            // Spaces
+            (
+                "<div class:flex class:px-2.5={condition()}>",
+                "<div class flex class px-2.5={condition()}>",
+            ),
+            // Tabs
+            (
+                "<div\tclass:flex class:px-2.5={condition()}>",
+                "<div class flex class px-2.5={condition()}>",
+            ),
+            // Newlines
+            (
+                "<div\nclass:flex class:px-2.5={condition()}>",
+                "<div class flex class px-2.5={condition()}>",
+            ),
+        ] {
+            Svelte::test(input, expected);
+        }
+    }
+}
diff --git a/crates/oxide/src/extractor/pre_processors/template_toolkit.rs b/crates/oxide/src/extractor/pre_processors/template_toolkit.rs
new file mode 100644
index 000000000..6456a2694
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/template_toolkit.rs
@@ -0,0 +1,52 @@
+use crate::cursor;
+use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+#[derive(Debug, Default)]
+pub struct TemplateToolkit;
+
+impl PreProcessor for TemplateToolkit {
+    fn process(&self, content: &[u8]) -> Vec<u8> {
+        let len = content.len();
+        let mut result = content.to_vec();
+        let mut cursor = cursor::Cursor::new(content);
+
+        while cursor.pos < len {
+            match (cursor.curr(), cursor.next()) {
+                (b'[', b'%') => result[cursor.pos] = b' ',
+                (b'%', b']') => result[cursor.pos + 1] = b' ',
+                _ => {}
+            }
+
+            cursor.advance();
+        }
+
+        result
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::TemplateToolkit;
+    use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+    #[test]
+    fn test_template_toolkit_pre_processor() {
+        for (input, expected) in [
+            (
+                "[% IF $is_open %]bg-white/40[% ELSE %]bg-white/10[% END %]",
+                " % IF $is_open % bg-white/40 % ELSE % bg-white/10 % END % ",
+            ),
+            ("[% WRAPPER %]flex[% END %]", " % WRAPPER % flex % END % "),
+        ] {
+            TemplateToolkit::test(input, expected);
+        }
+    }
+
+    #[test]
+    fn test_extraction_between_template_tags_works() {
+        TemplateToolkit::test_extract_contains(
+            r#"<div class="[% IF $is_open %]bg-white/40[% ELSE %]bg-white/10[% END %]"></div>"#,
+            vec!["bg-white/40", "bg-white/10"],
+        );
+    }
+}
diff --git a/crates/oxide/src/extractor/pre_processors/test-fixtures/haml/dst-17051.haml b/crates/oxide/src/extractor/pre_processors/test-fixtures/haml/dst-17051.haml
new file mode 100644
index 000000000..56a38cbe3
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/test-fixtures/haml/dst-17051.haml
@@ -0,0 +1,262 @@
+/ https://github.com/tailwindlabs/tailwindcss/pull/17051#issuecomment-2711181352
+- star_styles = "size-[800px] mask mask-star bg-gradient-to-r from-secondary via-cyan-400 to-lime-400"
+  ^^^^^^^^^^^    ^^^^^^^^^^^^ ^^^^ ^^^^^^^^^ ^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^ ^^^^^^^^^^^^ ^^^^^^^^^^^
+- crazy_text_styles = "italic font-black bg-gradient-to-r via-60% to-90% from-orange-500 via-secondary to-primary text-transparent bg-clip-text inline-block py-2"
+  ^^^^^^^^^^^^^^^^^    ^^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^ ^^^^^^^ ^^^^^^ ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^ ^^^^^^^^^^^^ ^^^^
+
+.relative
+ ^^^^^^^^
+  - # Blurred background star
+  .absolute.left-0.z-0{ class: "-top-[400px] -right-[400px]" }
+   ^^^^^^^^ ^^^^^^ ^^^  ^^^^^   ^^^^^^^^^^^^ ^^^^^^^^^^^^^^
+    .flex.justify-end.blur-3xl
+     ^^^^ ^^^^^^^^^^^ ^^^^^^^^
+      %div{ class: star_styles }
+            ^^^^^  ^^^^^^^^^^^
+
+  .relative.z-10
+   ^^^^^^^^ ^^^^
+    %h1.mt-8.text-center.text-5xl.font-black.tracking-wide.drop-shadow-lg
+        ^^^^ ^^^^^^^^^^^ ^^^^^^^^ ^^^^^^^^^^ ^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
+      %div
+        Components, Guides, and Paradigms
+                            ^^^
+      .md:inline-flex.md:items-center.justify-center
+       ^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^
+        %span.-mr-2
+              ^^^^^
+          for
+          ^^^
+        %span.relative.-rotate-3.hover:-rotate-6.hover:scale-125.transition-transform
+              ^^^^^^^^ ^^^^^^^^^ ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^
+          %span{ class: crazy_text_styles + " absolute blur-xl" }
+                 ^^^^^  ^^^^^^^^^^^^^^^^^     ^^^^^^^^ ^^^^^^^
+            &nbsp;CRAZY&nbsp;
+          %span{ class: crazy_text_styles + " drop-shadow-[0_0_1px_#fff]" }
+                 ^^^^^  ^^^^^^^^^^^^^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+            &nbsp;CRAZY&nbsp;
+        %span.-ml-3.md:-ml-1
+              ^^^^^ ^^^^^^^^
+          \-fast Development
+      %div
+        in Ruby on Rails!
+        ^^      ^^
+
+    .mt-16.text-center
+     ^^^^^ ^^^^^^^^^^^
+      = daisy_button "😃 Get Started", css: "btn-primary text-xl",
+        ^^^^^^^^^^^^                   ^^^   ^^^^^^^^^^^ ^^^^^^^
+        right_icon: "arrow-right", target: "_blank",
+        ^^^^^^^^^^   ^^^^^^^^^^^   ^^^^^^
+        href: "https://github.com/profoundry-us/loco_motion#locomotion-components"
+        ^^^^                                                ^^^^^^^^^^^^^^^^^^^^^
+
+    .mt-32.lg:flex.lg:space-x-8
+     ^^^^^ ^^^^^^^ ^^^^^^^^^^^^
+      %div{ class: "md:basis-2/5" }
+            ^^^^^   ^^^^^^^^^^^^
+        %h3.text-4xl.font-bold
+            ^^^^^^^^ ^^^^^^^^^
+          Easy, Flexible Components
+        %p.mt-2.text-xl
+           ^^^^ ^^^^^^^
+          Powered by the fabulous
+                  ^^ ^^^ ^^^^^^^^
+          = succeed ',' do
+            ^^^^^^^     ^^
+            = daisy_link("ViewComponent", "https://viewcomponent.org", target: "_blank")
+                                                                 ^^^   ^^^^^^
+          = succeed ', and' do
+            ^^^^^^^    ^^^  ^^
+            = daisy_link "DaisyUI", "https://daisyui.com/", target: "_blank"
+              ^^^^^^^^^^                                    ^^^^^^
+          = daisy_link "TailwindCSS", "https://tailwindcss.com/", target: "_blank"
+            ^^^^^^^^^^                                            ^^^^^^
+          libraries, our components are designed to be fast, flexible, and easy to
+                     ^^^ ^^^^^^^^^^ ^^^ ^^^^^^^^ ^^ ^^                 ^^^ ^^^^ ^^
+          use <i>directly</i> in Ruby on Rails!
+          ^^^    ^^^^^^^^     ^^      ^^
+
+      = doc_example(css: "mt-8 lg:mt-0 lg:basis-3/5 h-44") do
+                    ^^^   ^^^^ ^^^^^^^ ^^^^^^^^^^^^ ^^^^   ^^
+        .flex.flex-col.sm:flex-row.items-center.gap-4
+         ^^^^ ^^^^^^^^ ^^^^^^^^^^^ ^^^^^^^^^^^^ ^^^^^
+          = daisy_button "Accent Button", css: "btn-accent"
+            ^^^^^^^^^^^^                  ^^^   ^^^^^^^^^^
+          = daisy_tip("Click to Swap") do
+                             ^^        ^^
+            = daisy_swap off: "🌚", on: "🌞", css: "swap-rotate text-4xl"
+              ^^^^^^^^^^ ^^^        ^^        ^^^   ^^^^^^^^^^^ ^^^^^^^^
+          = daisy_badge "Large Badge", css: "badge-secondary badge-lg"
+            ^^^^^^^^^^^                ^^^   ^^^^^^^^^^^^^^^ ^^^^^^^^
+
+
+    .mt-32.xl:flex.xl:flex-row-reverse.xl:items-center
+     ^^^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^
+      .text-xl.xl:ml-8
+       ^^^^^^^ ^^^^^^^
+        %h3.text-4xl.font-bold
+            ^^^^^^^^ ^^^^^^^^^
+          Simple, Concise Views
+
+        %p.mt-2
+           ^^^^
+          Utilize
+          = daisy_link("HAML", "https://haml.info/", target: "_blank")
+                                                     ^^^^^^
+          so your views are simple, concise, and easy to understand.
+          ^^ ^^^^ ^^^^^ ^^^                  ^^^ ^^^^ ^^ ^^^^^^^^^^
+
+        %p.mt-2
+           ^^^^
+          No more messy ERB files with all of their closing tags and Ruby wrappers.
+             ^^^^ ^^^^^     ^^^^^ ^^^^ ^^^ ^^ ^^^^^ ^^^^^^^ ^^^^ ^^^      ^^^^^^^^
+          HAML feels more natural to write and reduces file sizes, making your
+               ^^^^^ ^^^^ ^^^^^^^ ^^ ^^^^^ ^^^ ^^^^^^^ ^^^^        ^^^^^^ ^^^^
+          views easier to read and maintain.
+          ^^^^^ ^^^^^^ ^^ ^^^^ ^^^ ^^^^^^^^
+
+        %p.mt-2
+           ^^^^
+          :markdown
+            **PLUS!** You can utilize filters like _Markdown_, CoffeeScript,
+                          ^^^ ^^^^^^^ ^^^^^^^ ^^^^
+            Textile, and many more!
+                     ^^^ ^^^^ ^^^^^
+
+      .mt-8.xl:mt-0
+       ^^^^ ^^^^^^^
+        .flex.flex-col.xl:flex.xl:flex-row.w-full
+         ^^^^ ^^^^^^^^ ^^^^^^^ ^^^^^^^^^^^ ^^^^^^
+          = doc_code(css: "grow", code_css: "xl:pl-2 xl:pr-0 xl:rounded-r-none", language: "erb") do
+                     ^^^   ^^^^   ^^^^^^^^   ^^^^^^^ ^^^^^^^ ^^^^^^^^^^^^^^^^^   ^^^^^^^^   ^^^   ^^
+            :escaped
+              <% # Ruby %>
+
+              <% 5.times do |i| %>
+                   ^^^^^ ^^
+                <% if i.even? %>
+                   ^^ ^
+                  <p class="odd">Number <%= i %></p>
+                     ^^^^^  ^^^             ^
+                <% else %>
+                   ^^^^
+                  <p class="even">Numero <%= i %></p>
+                     ^^^^^  ^^^^             ^
+                <% end %>
+                   ^^^
+              <% end %>
+                 ^^^
+
+          = doc_code(css: "grow mt-8 xl:mt-0", pre_css: "xl:h-full", code_css: "xl:pl-0 xl:pr-2 xl:h-full xl:rounded-l-none") do
+                     ^^^   ^^^^ ^^^^ ^^^^^^^   ^^^^^^^   ^^^^^^^^^   ^^^^^^^^   ^^^^^^^ ^^^^^^^ ^^^^^^^^^ ^^^^^^^^^^^^^^^^^   ^^
+            :escaped
+              - # HAML
+
+              - 5.times do |i|
+                  ^^^^^ ^^
+                - if i.even?
+                  ^^
+                  %p.odd Number \#{i}
+                     ^^^           ^
+                - else
+                  ^^^^
+                  %p.even Numero \#{i}
+                     ^^^^           ^
+
+
+    %h3.mt-32.text-4xl.font-bold
+        ^^^^^ ^^^^^^^^ ^^^^^^^^^
+      Build Your <i>OWN</i> Components
+
+    %p.mt-2.text-xl
+       ^^^^ ^^^^^^^
+      Can't find exactly what you need? No problem! Build your own components
+          ^ ^^^^ ^^^^^^^ ^^^^ ^^^          ^^^^^^^^       ^^^^ ^^^ ^^^^^^^^^^
+      with ease using our simple, flexible, and powerful DSL.
+      ^^^^ ^^^^ ^^^^^ ^^^                   ^^^ ^^^^^^^^
+
+    .mt-8.xl:flex.xl:space-x-8
+     ^^^^ ^^^^^^^ ^^^^^^^^^^^^
+      %div
+        = doc_code(language: "ruby") do
+                   ^^^^^^^^   ^^^^   ^^
+          :escaped
+            # app/components/application_component.rb
+                                                   ^^
+            class ApplicationComponent < LocoMotion::BaseComponent
+            ^^^^^
+              # Add your custom / shared component logic here!
+                    ^^^^ ^^^^^^   ^^^^^^ ^^^^^^^^^ ^^^^^ ^^^^^
+            end
+            ^^^
+
+        = doc_code(language: "haml", css: "mt-8") do
+                   ^^^^^^^^   ^^^^   ^^^   ^^^^   ^^
+          :escaped
+            - # app/components/character_component.html.haml
+            = part(:component) do
+                               ^^
+              = part(:head)
+              = part(:body) do
+                            ^^
+                = content
+                  ^^^^^^^
+              = part(:legs)
+
+      %div.mt-8.xl:mt-0
+           ^^^^ ^^^^^^^
+        = doc_code(language: "ruby") do
+                   ^^^^^^^^   ^^^^   ^^
+          :escaped
+            # app/components/character_component.rb
+                                                 ^^
+            class CharacterComponent < ApplicationComponent
+            ^^^^^
+              define_parts :head, :body, :legs
+              ^^^^^^^^^^^^
+
+              def before_render
+              ^^^ ^^^^^^^^^^^^^
+                set_tag_name(:head, :h1)
+                ^^^^^^^^^^^^
+                add_css(:head, "text-3xl font-bold")
+                ^^^^^^^         ^^^^^^^^ ^^^^^^^^^
+
+                set_tag_name(:body, :p)
+                ^^^^^^^^^^^^
+                add_stimulus_controller(:body, "character-body")
+                ^^^^^^^^^^^^^^^^^^^^^^^         ^^^^^^^^^^^^^^
+                add_css(:body, "text-lg")
+                ^^^^^^^         ^^^^^^^
+
+                set_tag_name(:legs, :footer)
+                ^^^^^^^^^^^^
+                add_css(:legs, "text-sm")
+                ^^^^^^^         ^^^^^^^
+              end
+              ^^^
+            end
+            ^^^
+
+    %h3.mt-24.text-center.text-4xl.font-bold.italic
+        ^^^^^ ^^^^^^^^^^^ ^^^^^^^^ ^^^^^^^^^ ^^^^^^
+      More Coming Soon!
+    %p.mt-2.text-xl.text-center
+       ^^^^ ^^^^^^^ ^^^^^^^^^^^
+      Keen an eye out as we'll be adding more components, guides, and
+           ^^ ^^^ ^^^ ^^ ^^ ^^ ^^ ^^^^^^ ^^^^                     ^^^
+      %br.max-sm:hidden
+          ^^^^^^^^^^^^^
+      suggested gems for you to build amazing Rails apps!
+      ^^^^^^^^^ ^^^^ ^^^ ^^^ ^^ ^^^^^ ^^^^^^^       ^^^^^
+    .mt-4.text-center
+     ^^^^ ^^^^^^^^^^^
+      = daisy_button "😉 Get Started", css: "btn-primary text-xl",
+        ^^^^^^^^^^^^                   ^^^   ^^^^^^^^^^^ ^^^^^^^
+        right_icon: "arrow-right", target: "_blank",
+        ^^^^^^^^^^   ^^^^^^^^^^^   ^^^^^^
+        class: "px-2.5"
+        ^^^^^   ^^^^^^
+        href: "https://github.com/profoundry-us/loco_motion#locomotion-components"
+        ^^^^                                                ^^^^^^^^^^^^^^^^^^^^^
diff --git a/crates/oxide/src/extractor/pre_processors/test-fixtures/haml/dst-17813.haml b/crates/oxide/src/extractor/pre_processors/test-fixtures/haml/dst-17813.haml
new file mode 100644
index 000000000..18f0fdc4b
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/test-fixtures/haml/dst-17813.haml
@@ -0,0 +1,30 @@
+:ruby
+  - devices_classes = 'size-5 mr-2px'
+    ^^^^^^^^^^^^^^^    ^^^^^^ ^^^^^^
+  - icon_classes = 'w-[12px] h-[12px]'
+    ^^^^^^^^^^^^    ^^^^^^^^ ^^^^^^^^
+!!!
+%html{ lang: 'en' }
+       ^^^^   ^^
+  %head
+    %title Tailwind v4.1.4 + HAML bug
+                    ^^^^^^        ^^^
+
+  -# This is a comment
+          ^^ ^ ^^^^^^^
+
+    A multi-line comment
+      ^^^^^^^^^^ ^^^^^^^
+      With more indentation
+           ^^^^ ^^^^^^^^^^^
+
+    Which can dedent again just fine
+          ^^^ ^^^^^^ ^^^^^ ^^^^ ^^^^
+
+  %body
+  - icon_classes = 'self-center w-[16px] h-[16px]'
+    ^^^^^^^^^^^^    ^^^^^^^^^^^ ^^^^^^^^ ^^^^^^^^
+    .flex{ class: icon_classes }
+     ^^^^  ^^^^^  ^^^^^^^^^^^^
+    .flex{ class: devices_classes }
+     ^^^^  ^^^^^  ^^^^^^^^^^^^^^^
diff --git a/crates/oxide/src/extractor/pre_processors/test-fixtures/haml/src-17051.haml b/crates/oxide/src/extractor/pre_processors/test-fixtures/haml/src-17051.haml
new file mode 100644
index 000000000..8f9b61941
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/test-fixtures/haml/src-17051.haml
@@ -0,0 +1,155 @@
+/ https://github.com/tailwindlabs/tailwindcss/pull/17051#issuecomment-2711181352
+- star_styles = "size-[800px] mask mask-star bg-gradient-to-r from-secondary via-cyan-400 to-lime-400"
+- crazy_text_styles = "italic font-black bg-gradient-to-r via-60% to-90% from-orange-500 via-secondary to-primary text-transparent bg-clip-text inline-block py-2"
+
+.relative
+  - # Blurred background star
+  .absolute.left-0.z-0{ class: "-top-[400px] -right-[400px]" }
+    .flex.justify-end.blur-3xl
+      %div{ class: star_styles }
+
+  .relative.z-10
+    %h1.mt-8.text-center.text-5xl.font-black.tracking-wide.drop-shadow-lg
+      %div
+        Components, Guides, and Paradigms
+      .md:inline-flex.md:items-center.justify-center
+        %span.-mr-2
+          for
+        %span.relative.-rotate-3.hover:-rotate-6.hover:scale-125.transition-transform
+          %span{ class: crazy_text_styles + " absolute blur-xl" }
+            &nbsp;CRAZY&nbsp;
+          %span{ class: crazy_text_styles + " drop-shadow-[0_0_1px_#fff]" }
+            &nbsp;CRAZY&nbsp;
+        %span.-ml-3.md:-ml-1
+          \-fast Development
+      %div
+        in Ruby on Rails!
+
+    .mt-16.text-center
+      = daisy_button "😃 Get Started", css: "btn-primary text-xl",
+        right_icon: "arrow-right", target: "_blank",
+        href: "https://github.com/profoundry-us/loco_motion#locomotion-components"
+
+    .mt-32.lg:flex.lg:space-x-8
+      %div{ class: "md:basis-2/5" }
+        %h3.text-4xl.font-bold
+          Easy, Flexible Components
+        %p.mt-2.text-xl
+          Powered by the fabulous
+          = succeed ',' do
+            = daisy_link("ViewComponent", "https://viewcomponent.org", target: "_blank")
+          = succeed ', and' do
+            = daisy_link "DaisyUI", "https://daisyui.com/", target: "_blank"
+          = daisy_link "TailwindCSS", "https://tailwindcss.com/", target: "_blank"
+          libraries, our components are designed to be fast, flexible, and easy to
+          use <i>directly</i> in Ruby on Rails!
+
+      = doc_example(css: "mt-8 lg:mt-0 lg:basis-3/5 h-44") do
+        .flex.flex-col.sm:flex-row.items-center.gap-4
+          = daisy_button "Accent Button", css: "btn-accent"
+          = daisy_tip("Click to Swap") do
+            = daisy_swap off: "🌚", on: "🌞", css: "swap-rotate text-4xl"
+          = daisy_badge "Large Badge", css: "badge-secondary badge-lg"
+
+
+    .mt-32.xl:flex.xl:flex-row-reverse.xl:items-center
+      .text-xl.xl:ml-8
+        %h3.text-4xl.font-bold
+          Simple, Concise Views
+
+        %p.mt-2
+          Utilize
+          = daisy_link("HAML", "https://haml.info/", target: "_blank")
+          so your views are simple, concise, and easy to understand.
+
+        %p.mt-2
+          No more messy ERB files with all of their closing tags and Ruby wrappers.
+          HAML feels more natural to write and reduces file sizes, making your
+          views easier to read and maintain.
+
+        %p.mt-2
+          :markdown
+            **PLUS!** You can utilize filters like _Markdown_, CoffeeScript,
+            Textile, and many more!
+
+      .mt-8.xl:mt-0
+        .flex.flex-col.xl:flex.xl:flex-row.w-full
+          = doc_code(css: "grow", code_css: "xl:pl-2 xl:pr-0 xl:rounded-r-none", language: "erb") do
+            :escaped
+              <% # Ruby %>
+
+              <% 5.times do |i| %>
+                <% if i.even? %>
+                  <p class="odd">Number <%= i %></p>
+                <% else %>
+                  <p class="even">Numero <%= i %></p>
+                <% end %>
+              <% end %>
+
+          = doc_code(css: "grow mt-8 xl:mt-0", pre_css: "xl:h-full", code_css: "xl:pl-0 xl:pr-2 xl:h-full xl:rounded-l-none") do
+            :escaped
+              - # HAML
+
+              - 5.times do |i|
+                - if i.even?
+                  %p.odd Number \#{i}
+                - else
+                  %p.even Numero \#{i}
+
+
+    %h3.mt-32.text-4xl.font-bold
+      Build Your <i>OWN</i> Components
+
+    %p.mt-2.text-xl
+      Can't find exactly what you need? No problem! Build your own components
+      with ease using our simple, flexible, and powerful DSL.
+
+    .mt-8.xl:flex.xl:space-x-8
+      %div
+        = doc_code(language: "ruby") do
+          :escaped
+            # app/components/application_component.rb
+            class ApplicationComponent < LocoMotion::BaseComponent
+              # Add your custom / shared component logic here!
+            end
+
+        = doc_code(language: "haml", css: "mt-8") do
+          :escaped
+            - # app/components/character_component.html.haml
+            = part(:component) do
+              = part(:head)
+              = part(:body) do
+                = content
+              = part(:legs)
+
+      %div.mt-8.xl:mt-0
+        = doc_code(language: "ruby") do
+          :escaped
+            # app/components/character_component.rb
+            class CharacterComponent < ApplicationComponent
+              define_parts :head, :body, :legs
+
+              def before_render
+                set_tag_name(:head, :h1)
+                add_css(:head, "text-3xl font-bold")
+
+                set_tag_name(:body, :p)
+                add_stimulus_controller(:body, "character-body")
+                add_css(:body, "text-lg")
+
+                set_tag_name(:legs, :footer)
+                add_css(:legs, "text-sm")
+              end
+            end
+
+    %h3.mt-24.text-center.text-4xl.font-bold.italic
+      More Coming Soon!
+    %p.mt-2.text-xl.text-center
+      Keen an eye out as we'll be adding more components, guides, and
+      %br.max-sm:hidden
+      suggested gems for you to build amazing Rails apps!
+    .mt-4.text-center
+      = daisy_button "😉 Get Started", css: "btn-primary text-xl",
+        right_icon: "arrow-right", target: "_blank",
+        class: "px-2.5"
+        href: "https://github.com/profoundry-us/loco_motion#locomotion-components"
diff --git a/crates/oxide/src/extractor/pre_processors/test-fixtures/haml/src-17813.haml b/crates/oxide/src/extractor/pre_processors/test-fixtures/haml/src-17813.haml
new file mode 100644
index 000000000..5fdaefdb0
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/test-fixtures/haml/src-17813.haml
@@ -0,0 +1,19 @@
+:ruby
+  - devices_classes = 'size-5 mr-2px'
+  - icon_classes = 'w-[12px] h-[12px]'
+!!!
+%html{ lang: 'en' }
+  %head
+    %title Tailwind v4.1.4 + HAML bug
+
+  -# This is a comment
+
+    A multi-line comment
+      With more indentation
+
+    Which can dedent again just fine
+
+  %body
+  - icon_classes = 'self-center w-[16px] h-[16px]'
+    .flex{ class: icon_classes }
+    .flex{ class: devices_classes }
diff --git a/crates/oxide/src/extractor/pre_processors/twig.rs b/crates/oxide/src/extractor/pre_processors/twig.rs
new file mode 100644
index 000000000..b6f4a3319
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/twig.rs
@@ -0,0 +1,179 @@
+use crate::cursor;
+use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+#[derive(Debug, Default)]
+pub struct Twig;
+
+impl PreProcessor for Twig {
+    fn process(&self, content: &[u8]) -> Vec<u8> {
+        let len = content.len();
+        let mut result = content.to_vec();
+        let mut cursor = cursor::Cursor::new(content);
+        let mut bracket_stack = vec![];
+
+        const ADD_CLASS: &[u8] = b"addClass";
+        const REMOVE_CLASS: &[u8] = b"removeClass";
+
+        while cursor.pos < len {
+            match (!bracket_stack.is_empty(), cursor.curr()) {
+                // addClass(
+                //         ^
+                (false, b'(')
+                    if cursor.pos >= ADD_CLASS.len()
+                        && matches!(
+                            &content[cursor.pos - ADD_CLASS.len()..cursor.pos],
+                            ADD_CLASS
+                        ) =>
+                {
+                    bracket_stack.push(cursor.curr());
+                    result[cursor.pos] = b' ';
+                }
+
+                // removeClass(
+                //            ^
+                (false, b'(')
+                    if cursor.pos >= REMOVE_CLASS.len()
+                        && matches!(
+                            &content[cursor.pos - REMOVE_CLASS.len()..cursor.pos],
+                            REMOVE_CLASS
+                        ) =>
+                {
+                    bracket_stack.push(cursor.curr());
+                    result[cursor.pos] = b' ';
+                }
+
+                (true, b'(') => {
+                    bracket_stack.push(cursor.curr());
+                }
+
+                (true, b')') => {
+                    bracket_stack.pop();
+
+                    if bracket_stack.is_empty() {
+                        result[cursor.pos] = b' ';
+                    }
+                }
+
+                _ => {}
+            }
+
+            cursor.advance();
+        }
+
+        result
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Twig;
+    use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+    #[test]
+    fn test_twig_pre_processor() {
+        for (input, expected) in [
+            (
+                // Ensure we don't crash when we encounter an `(`
+                "(p-(--value))",
+                "(p-(--value))",
+            ),
+            (
+                // addClass with single argument
+                "addClass(p-(--value))",
+                "addClass p-(--value) ",
+            ),
+            (
+                // addClass with single argument
+                "addClass(m-4 p-8 w-full)",
+                "addClass m-4 p-8 w-full ",
+            ),
+            (
+                // removeClass with single argument
+                "removeClass(p-(--value))",
+                "removeClass p-(--value) ",
+            ),
+            (
+                // removeClass with single argument
+                "removeClass(m-4 p-8 w-full)",
+                "removeClass m-4 p-8 w-full ",
+            ),
+            (
+                // Combined with single arguments
+                "addClass(m-(--value))|removeClass(p-(--value))",
+                "addClass m-(--value) |removeClass p-(--value) ",
+            ),
+        ] {
+            Twig::test(input, expected);
+        }
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/19458
+    #[test]
+    fn test_extraction_in_add_class_and_remove_class_works() {
+        // Inside normal HTML
+        let input = r#"
+          <div data-loading="addClass(opacity-50)">
+            <!-- -->
+          </div>
+        "#;
+
+        let expected = r#"
+          <div data-loading="addClass opacity-50 ">
+            <!-- -->
+          </div>
+        "#;
+
+        Twig::test(input, expected);
+        Twig::test_extract_contains(input, vec!["opacity-50"]);
+
+        // Inside a component
+        let input = r#"
+            <twig:d:Card
+              {{ ...attributes.defaults({
+                  as: "a",
+                  class: "cursor-pointer bg-base-200 card-sm md:card-md lg:card-lg",
+                  role: "button",
+                  tabindex: "0",
+                  "data-action": "live#$render",
+                  "data-loading": "addAttribute(disabled)",
+                  "data-poll": "delay(60000)|$render",
+                  "data-loading": "addClass(border border-red-500 opacity-75)",
+                 })
+              }}
+            >
+        "#;
+
+        let expected = r#"
+            <twig:d:Card
+              {{ ...attributes.defaults({
+                  as: "a",
+                  class: "cursor-pointer bg-base-200 card-sm md:card-md lg:card-lg",
+                  role: "button",
+                  tabindex: "0",
+                  "data-action": "live#$render",
+                  "data-loading": "addAttribute(disabled)",
+                  "data-poll": "delay(60000)|$render",
+                  "data-loading": "addClass border border-red-500 opacity-75 ",
+                 })
+              }}
+            >
+        "#;
+
+        Twig::test(input, expected);
+        Twig::test_extract_contains(
+            input,
+            vec![
+                // class
+                "cursor-pointer",
+                "bg-base-200",
+                "card-sm",
+                "md:card-md",
+                "lg:card-lg",
+                // data-loading
+                "border",
+                "border-red-500",
+                "opacity-75",
+            ],
+        );
+    }
+}
diff --git a/crates/oxide/src/extractor/pre_processors/vue.rs b/crates/oxide/src/extractor/pre_processors/vue.rs
new file mode 100644
index 000000000..ae037435c
--- /dev/null
+++ b/crates/oxide/src/extractor/pre_processors/vue.rs
@@ -0,0 +1,60 @@
+use crate::extractor::pre_processors::pre_processor::PreProcessor;
+use crate::scanner::pre_process_input;
+use bstr::ByteSlice;
+use regex::Regex;
+use std::sync;
+
+static TEMPLATE_REGEX: sync::LazyLock<Regex> = sync::LazyLock::new(|| {
+    Regex::new(r#"<template lang=['"]([^"']*)['"]>([\s\S]*)<\/template>"#).unwrap()
+});
+
+#[derive(Debug, Default)]
+pub struct Vue;
+
+impl PreProcessor for Vue {
+    fn process(&self, content: &[u8]) -> Vec<u8> {
+        let mut result = content.to_vec();
+
+        // Only process template tags if content is valid UTF-8
+        if let Ok(content_as_str) = std::str::from_utf8(content) {
+            for (_, [lang, body]) in TEMPLATE_REGEX
+                .captures_iter(content_as_str)
+                .map(|c| c.extract())
+            {
+                let replaced = pre_process_input(body.as_bytes().to_vec(), lang);
+                result = result.replace(body, replaced);
+            }
+        }
+
+        result
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Vue;
+    use crate::extractor::pre_processors::pre_processor::PreProcessor;
+
+    #[test]
+    fn test_vue_template_pug() {
+        let input = r#"
+            <template lang="pug">
+            .bg-neutral-900.text-red-500 This is a test.
+            </template>
+        "#;
+
+        Vue::test_extract_contains(input, vec!["bg-neutral-900", "text-red-500"]);
+    }
+
+    #[test]
+    fn test_invalid_utf8_does_not_panic() {
+        // Invalid UTF-8 sequence: 0x80 is a continuation byte without a leading byte
+        let invalid_utf8: &[u8] = &[0x80, 0x81, 0x82];
+
+        let processor = Vue::default();
+
+        // Should not panic, just return the input unchanged
+        let result = processor.process(invalid_utf8);
+        assert_eq!(result, invalid_utf8);
+    }
+}
diff --git a/crates/oxide/src/extractor/string_machine.rs b/crates/oxide/src/extractor/string_machine.rs
new file mode 100644
index 000000000..4fad49faa
--- /dev/null
+++ b/crates/oxide/src/extractor/string_machine.rs
@@ -0,0 +1,138 @@
+use crate::cursor;
+use crate::extractor::machine::{Machine, MachineState};
+use classification_macros::ClassifyBytes;
+
+/// Extracts a string (including the quotes) from the input.
+///
+/// Rules:
+///
+/// - The string must start and end with the same quote character.
+/// - The string cannot contain any whitespace characters.
+/// - The string can contain any other character except for the quote character (unless it's escaped).
+/// - Balancing of brackets is not required.
+///
+///
+/// E.g.:
+///
+/// ```text
+/// 'hello_world'
+/// ^^^^^^^^^^^^^
+///
+/// content-['hello_world']
+///          ^^^^^^^^^^^^^
+/// ```
+#[derive(Debug, Default)]
+pub struct StringMachine;
+
+impl Machine for StringMachine {
+    #[inline(always)]
+    fn reset(&mut self) {}
+
+    #[inline]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        if Class::Quote != cursor.curr().into() {
+            return MachineState::Idle;
+        }
+
+        // Start of a string
+        let len = cursor.input.len();
+        let start_pos = cursor.pos;
+        let end_char = cursor.curr();
+
+        cursor.advance();
+
+        while cursor.pos < len {
+            match cursor.curr().into() {
+                Class::Escape => match cursor.next().into() {
+                    // An escaped whitespace character is not allowed
+                    Class::Whitespace => return MachineState::Idle,
+
+                    // An escaped character, skip ahead to the next character
+                    _ => cursor.advance(),
+                },
+
+                // End of the string
+                Class::Quote if cursor.curr() == end_char => return self.done(start_pos, cursor),
+
+                // Any kind of whitespace is not allowed
+                Class::Whitespace => return MachineState::Idle,
+
+                // Everything else is valid
+                _ => {}
+            };
+
+            cursor.advance()
+        }
+
+        MachineState::Idle
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, ClassifyBytes)]
+enum Class {
+    #[bytes(b'"', b'\'', b'`')]
+    Quote,
+
+    #[bytes(b'\\')]
+    Escape,
+
+    #[bytes(b' ', b'\t', b'\n', b'\r', b'\x0C')]
+    Whitespace,
+
+    #[fallback]
+    Other,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::StringMachine;
+    use crate::extractor::machine::Machine;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    #[ignore]
+    fn test_string_machine_performance() {
+        let input = r#"There will be a 'string' in this input, even "strings_with_other_quotes_and_\#escaped_characters"  "#.repeat(100);
+
+        StringMachine::test_throughput(100_000, &input);
+        StringMachine::test_duration_once(&input);
+
+        todo!()
+    }
+
+    #[test]
+    fn test_string_machine_extraction() {
+        for (input, expected) in [
+            // Simple string
+            ("'foo'", vec!["'foo'"]),
+            // String as part of a candidate
+            ("content-['hello_world']", vec!["'hello_world'"]),
+            // With nested quotes
+            (r#"'"`hello`"'"#, vec![r#"'"`hello`"'"#]),
+            // With escaped opening quote
+            (r#"'Tailwind\'s_parser'"#, vec![r#"'Tailwind\'s_parser'"#]),
+            (
+                r#"'Tailwind\'\'s_parser'"#,
+                vec![r#"'Tailwind\'\'s_parser'"#],
+            ),
+            (
+                r#"'Tailwind\'\'\'s_parser'"#,
+                vec![r#"'Tailwind\'\'\'s_parser'"#],
+            ),
+            (
+                r#"'Tailwind\'\'\'\'s_parser'"#,
+                vec![r#"'Tailwind\'\'\'\'s_parser'"#],
+            ),
+            // Spaces are not allowed
+            ("' hello world '", vec![]),
+            // With unfinished quote
+            ("'unfinished_quote", vec![]),
+            // An escape at the end will never be valid, because it _must_ be followed by the
+            // ending quote.
+            (r#"'escaped_ending_quote\'"#, vec![]),
+            (r#"'escaped_end\"#, vec![]),
+        ] {
+            assert_eq!(StringMachine::test_extract_all(input), expected);
+        }
+    }
+}
diff --git a/crates/oxide/src/extractor/utility_machine.rs b/crates/oxide/src/extractor/utility_machine.rs
new file mode 100644
index 000000000..c116ec4e4
--- /dev/null
+++ b/crates/oxide/src/extractor/utility_machine.rs
@@ -0,0 +1,346 @@
+use crate::cursor;
+use crate::extractor::arbitrary_property_machine::ArbitraryPropertyMachine;
+use crate::extractor::machine::{Machine, MachineState};
+use crate::extractor::modifier_machine::ModifierMachine;
+use crate::extractor::named_utility_machine::NamedUtilityMachine;
+use classification_macros::ClassifyBytes;
+
+#[derive(Debug, Default)]
+pub struct UtilityMachine {
+    /// Start position of the utility
+    start_pos: usize,
+
+    /// Whether the legacy important marker `!` was used
+    legacy_important: bool,
+
+    arbitrary_property_machine: ArbitraryPropertyMachine,
+    named_utility_machine: NamedUtilityMachine,
+    modifier_machine: ModifierMachine,
+}
+
+impl Machine for UtilityMachine {
+    #[inline(always)]
+    fn reset(&mut self) {
+        self.start_pos = 0;
+        self.legacy_important = false;
+    }
+
+    #[inline]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match cursor.curr().into() {
+            // LEGACY: Important marker
+            Class::Exclamation => {
+                self.legacy_important = true;
+
+                match cursor.next().into() {
+                    // Start of an arbitrary property
+                    //
+                    // E.g.: `![color:red]`
+                    //        ^
+                    Class::OpenBracket => {
+                        self.start_pos = cursor.pos;
+                        cursor.advance();
+                        self.parse_arbitrary_property(cursor)
+                    }
+
+                    // Start of a named utility
+                    //
+                    // E.g.: `!flex`
+                    //        ^
+                    _ => {
+                        self.start_pos = cursor.pos;
+                        cursor.advance();
+                        self.parse_named_utility(cursor)
+                    }
+                }
+            }
+
+            // Start of an arbitrary property
+            //
+            // E.g.: `[color:red]`
+            //        ^
+            Class::OpenBracket => {
+                self.start_pos = cursor.pos;
+                self.parse_arbitrary_property(cursor)
+            }
+
+            // Everything else might be a named utility. Delegate to the named utility machine
+            // to determine if it's a named utility or not.
+            _ => {
+                self.start_pos = cursor.pos;
+                self.parse_named_utility(cursor)
+            }
+        }
+    }
+}
+
+impl UtilityMachine {
+    fn parse_arbitrary_property(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match self.arbitrary_property_machine.next(cursor) {
+            MachineState::Idle => self.restart(),
+            MachineState::Done(_) => match cursor.next().into() {
+                // End of arbitrary property, but there is a potential modifier.
+                //
+                // E.g.: `[color:#0088cc]/`
+                //                       ^
+                Class::Slash => {
+                    cursor.advance();
+                    self.parse_modifier(cursor)
+                }
+
+                // End of arbitrary property, but there is an `!`.
+                //
+                // E.g.: `[color:#0088cc]!`
+                //                       ^
+                Class::Exclamation => {
+                    cursor.advance();
+                    self.parse_important(cursor)
+                }
+
+                // End of arbitrary property
+                //
+                // E.g.: `[color:#0088cc]`
+                //                      ^
+                _ => self.done(self.start_pos, cursor),
+            },
+        }
+    }
+
+    fn parse_named_utility(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match self.named_utility_machine.next(cursor) {
+            MachineState::Idle => self.restart(),
+            MachineState::Done(_) => match cursor.next().into() {
+                // End of a named utility, but there is a potential modifier.
+                //
+                // E.g.: `bg-red-500/`
+                //                  ^
+                Class::Slash => {
+                    cursor.advance();
+                    self.parse_modifier(cursor)
+                }
+
+                // End of named utility, but there is an `!`.
+                //
+                // E.g.: `bg-red-500!`
+                //                  ^
+                Class::Exclamation => {
+                    cursor.advance();
+                    self.parse_important(cursor)
+                }
+
+                // End of a named utility
+                //
+                // E.g.: `bg-red-500`
+                //                 ^
+                _ => self.done(self.start_pos, cursor),
+            },
+        }
+    }
+
+    fn parse_modifier(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match self.modifier_machine.next(cursor) {
+            MachineState::Idle => self.restart(),
+            MachineState::Done(_) => match cursor.next().into() {
+                // A modifier followed by a modifier is invalid
+                Class::Slash => self.restart(),
+
+                // A modifier followed by the important marker `!`
+                Class::Exclamation => {
+                    cursor.advance();
+                    self.parse_important(cursor)
+                }
+
+                // Everything else is valid
+                _ => self.done(self.start_pos, cursor),
+            },
+        }
+    }
+
+    fn parse_important(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        // Only the `!` is valid if we didn't start with `!`
+        //
+        // E.g.:
+        //
+        // ```
+        // !bg-red-500!
+        //            ^ invalid because of the first `!`
+        // ```
+        if self.legacy_important {
+            return self.restart();
+        }
+
+        self.done(self.start_pos, cursor)
+    }
+}
+
+#[derive(Debug, Clone, Copy, ClassifyBytes)]
+enum Class {
+    #[bytes(b'!')]
+    Exclamation,
+
+    #[bytes(b'[')]
+    OpenBracket,
+
+    #[bytes(b'/')]
+    Slash,
+
+    #[fallback]
+    Other,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::UtilityMachine;
+    use crate::extractor::machine::Machine;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    #[ignore]
+    fn test_utility_machine_performance() {
+        let input = r#"<button type="button" class="absolute -top-1 -left-1.5 flex items-center justify-center p-1.5 text-gray-400">"#.repeat(100);
+
+        UtilityMachine::test_throughput(100_000, &input);
+        UtilityMachine::test_duration_once(&input);
+
+        todo!()
+    }
+
+    #[test]
+    fn test_utility_extraction() {
+        for (input, expected) in [
+            // Simple utility
+            ("flex", vec!["flex"]),
+            // Simple utility with special character(s)
+            ("@container", vec!["@container"]),
+            // Single character utility
+            ("a", vec!["a"]),
+            // Important utilities
+            ("!flex", vec!["!flex"]),
+            ("flex!", vec!["flex!"]),
+            ("flex! block", vec!["flex!", "block"]),
+            // With dashes
+            ("items-center", vec!["items-center"]),
+            ("items--center", vec!["items--center"]),
+            // Inside a string
+            ("'flex'", vec!["flex"]),
+            // Multiple utilities
+            ("flex items-center", vec!["flex", "items-center"]),
+            // Arbitrary property
+            ("[color:red]", vec!["[color:red]"]),
+            ("![color:red]", vec!["![color:red]"]),
+            ("[color:red]!", vec!["[color:red]!"]),
+            ("[color:red]/20", vec!["[color:red]/20"]),
+            ("![color:red]/20", vec!["![color:red]/20"]),
+            ("[color:red]/20!", vec!["[color:red]/20!"]),
+            // Modifiers
+            ("bg-red-500/20", vec!["bg-red-500/20"]),
+            ("bg-red-500/[20%]", vec!["bg-red-500/[20%]"]),
+            (
+                "bg-red-500/(--my-opacity)",
+                vec!["bg-red-500/(--my-opacity)"],
+            ),
+            // Modifiers with important (legacy)
+            ("!bg-red-500/20", vec!["!bg-red-500/20"]),
+            ("!bg-red-500/[20%]", vec!["!bg-red-500/[20%]"]),
+            (
+                "!bg-red-500/(--my-opacity)",
+                vec!["!bg-red-500/(--my-opacity)"],
+            ),
+            // Modifiers with important
+            ("bg-red-500/20!", vec!["bg-red-500/20!"]),
+            ("bg-red-500/[20%]!", vec!["bg-red-500/[20%]!"]),
+            (
+                "bg-red-500/(--my-opacity)!",
+                vec!["bg-red-500/(--my-opacity)!"],
+            ),
+            // Arbitrary value with bracket notation
+            ("bg-[#0088cc]", vec!["bg-[#0088cc]"]),
+            // Arbitrary value with arbitrary property shorthand modifier
+            (
+                "bg-[#0088cc]/(--my-opacity)",
+                vec!["bg-[#0088cc]/(--my-opacity)"],
+            ),
+            // Arbitrary value with CSS property shorthand
+            ("bg-(--my-color)", vec!["bg-(--my-color)"]),
+            // Multiple utilities including arbitrary property shorthand
+            (
+                "bg-(--my-color) flex px-(--my-padding)",
+                vec!["bg-(--my-color)", "flex", "px-(--my-padding)"],
+            ),
+            // --------------------------------------------------------
+
+            // Exceptions:
+            ("bg-red-500/20/20", vec![]),
+            ("bg-[#0088cc]/20/20", vec![]),
+        ] {
+            for (wrapper, additional) in [
+                // No wrapper
+                ("{}", vec![]),
+                // With leading spaces
+                (" {}", vec![]),
+                // With trailing spaces
+                ("{} ", vec![]),
+                // Surrounded by spaces
+                (" {} ", vec![]),
+                // Inside a string
+                ("'{}'", vec![]),
+                // Inside a function call
+                ("fn('{}')", vec![]),
+                // Inside nested function calls
+                ("fn1(fn2('{}'))", vec!["fn1", "fn2"]),
+                // --------------------------
+                //
+                // HTML
+                // Inside a class (on its own)
+                (r#"<div class="{}"></div>"#, vec!["div", "class"]),
+                // Inside a class (first)
+                (r#"<div class="{} foo"></div>"#, vec!["div", "class", "foo"]),
+                // Inside a class (second)
+                (r#"<div class="foo {}"></div>"#, vec!["div", "class", "foo"]),
+                // Inside a class (surrounded)
+                (
+                    r#"<div class="foo {} bar"></div>"#,
+                    vec!["div", "class", "foo", "bar"],
+                ),
+                // --------------------------
+                //
+                // JavaScript
+                // Inside a variable
+                (r#"let classes = '{}';"#, vec!["let", "classes"]),
+                // Inside an object (key)
+                (
+                    r#"let classes = { '{}': true };"#,
+                    vec!["let", "classes", "true"],
+                ),
+                // Inside an object (no spaces, key)
+                (r#"let classes = {'{}':true};"#, vec!["let", "classes"]),
+                // Inside an object (value)
+                (
+                    r#"let classes = { primary: '{}' };"#,
+                    vec!["let", "classes", "primary"],
+                ),
+                // Inside an object (no spaces, value)
+                (
+                    r#"let classes = {primary:'{}'};"#,
+                    vec!["let", "classes", "primary"],
+                ),
+                // Inside an array
+                (r#"let classes = ['{}'];"#, vec!["let", "classes"]),
+            ] {
+                let input = wrapper.replace("{}", input);
+
+                let mut expected = expected.clone();
+                expected.extend(additional);
+                expected.sort();
+
+                let mut actual = UtilityMachine::test_extract_all(&input);
+                actual.sort();
+
+                if actual != expected {
+                    dbg!(&input);
+                }
+                assert_eq!(actual, expected);
+            }
+        }
+    }
+}
diff --git a/crates/oxide/src/extractor/variant_machine.rs b/crates/oxide/src/extractor/variant_machine.rs
new file mode 100644
index 000000000..9ec2adc09
--- /dev/null
+++ b/crates/oxide/src/extractor/variant_machine.rs
@@ -0,0 +1,146 @@
+use crate::cursor;
+use crate::extractor::arbitrary_value_machine::ArbitraryValueMachine;
+use crate::extractor::machine::{Machine, MachineState};
+use crate::extractor::named_variant_machine::NamedVariantMachine;
+use classification_macros::ClassifyBytes;
+
+#[derive(Debug, Default)]
+pub struct VariantMachine {
+    arbitrary_value_machine: ArbitraryValueMachine,
+    named_variant_machine: NamedVariantMachine,
+}
+
+impl Machine for VariantMachine {
+    #[inline(always)]
+    fn reset(&mut self) {}
+
+    #[inline]
+    fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState {
+        match cursor.curr().into() {
+            // Start of an arbitrary variant
+            //
+            // E.g.: `[&:hover]:`
+            //        ^
+            Class::OpenBracket => {
+                let start_pos = cursor.pos;
+                match self.arbitrary_value_machine.next(cursor) {
+                    MachineState::Idle => self.restart(),
+                    MachineState::Done(_) => self.parse_arbitrary_end(start_pos, cursor),
+                }
+            }
+
+            // Start of a named variant
+            _ => {
+                let start_pos = cursor.pos;
+                match self.named_variant_machine.next(cursor) {
+                    MachineState::Idle => self.restart(),
+                    MachineState::Done(_) => self.done(start_pos, cursor),
+                }
+            }
+        }
+    }
+}
+
+impl VariantMachine {
+    #[inline(always)]
+    fn parse_arbitrary_end(
+        &mut self,
+        start_pos: usize,
+        cursor: &mut cursor::Cursor<'_>,
+    ) -> MachineState {
+        match cursor.next().into() {
+            // End of an arbitrary value, must be followed by a `:`
+            //
+            // E.g.: `[&:hover]:`
+            //                 ^
+            Class::Colon => {
+                cursor.advance();
+                self.done(start_pos, cursor)
+            }
+
+            // Everything else is invalid
+            _ => self.restart(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, ClassifyBytes)]
+enum Class {
+    #[bytes(b'[')]
+    OpenBracket,
+
+    #[bytes(b':')]
+    Colon,
+
+    #[fallback]
+    Other,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::VariantMachine;
+    use crate::extractor::machine::Machine;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    #[ignore]
+    fn test_variant_machine_performance() {
+        let input = r#"<button class="hover:focus:flex data-[state=pending]:[&.in-progress]:flex supports-(--my-variable):flex group-hover/named:not-has-peer-data-disabled:flex">"#;
+
+        VariantMachine::test_throughput(100_000, input);
+        VariantMachine::test_duration_once(input);
+
+        todo!()
+    }
+
+    #[test]
+    fn test_variant_extraction() {
+        for (input, expected) in [
+            // Simple variant
+            ("hover:flex", vec!["hover:"]),
+            // Single character variant
+            ("a:flex", vec!["a:"]),
+            ("*:flex", vec!["*:"]),
+            // With special characters
+            ("**:flex", vec!["**:"]),
+            // With dashes
+            ("data-disabled:flex", vec!["data-disabled:"]),
+            // Multiple variants
+            ("hover:focus:flex", vec!["hover:", "focus:"]),
+            // Arbitrary variant
+            ("[&:hover:focus]:flex", vec!["[&:hover:focus]:"]),
+            // Arbitrary variant with nested brackets
+            (
+                "[&>[data-slot=icon]:last-child]:",
+                vec!["[&>[data-slot=icon]:last-child]:"],
+            ),
+            (
+                "sm:[&>[data-slot=icon]:last-child]:",
+                vec!["sm:", "[&>[data-slot=icon]:last-child]:"],
+            ),
+            (
+                "[:is(italic):is(underline)]:",
+                vec!["[:is(italic):is(underline)]:"],
+            ),
+            // Modifiers
+            ("group-hover/foo:flex", vec!["group-hover/foo:"]),
+            ("group-hover/[.parent]:flex", vec!["group-hover/[.parent]:"]),
+            // Arbitrary variant with bracket notation
+            ("data-[state=pending]:flex", vec!["data-[state=pending]:"]),
+            // Arbitrary variant with CSS property shorthand
+            ("supports-(--my-color):flex", vec!["supports-(--my-color):"]),
+            // -------------------------------------------------------------
+
+            // Exceptions
+            // Empty arbitrary variant is not allowed
+            ("[]:flex", vec![]),
+            // Named variant must be followed by `:`
+            ("hover", vec![]),
+            // Modifier cannot be followed by another modifier. However, we don't check boundary
+            // characters in this state machine so we will get `bar:`.
+            ("group-hover/foo/bar:flex", vec!["bar:"]),
+        ] {
+            assert_eq!(VariantMachine::test_extract_all(input), expected);
+        }
+    }
+}
diff --git a/crates/oxide/src/fast_skip.rs b/crates/oxide/src/fast_skip.rs
index 488e61bd6..54930548c 100644
--- a/crates/oxide/src/fast_skip.rs
+++ b/crates/oxide/src/fast_skip.rs
@@ -10,7 +10,7 @@ pub fn fast_skip(cursor: &Cursor) -> Option<usize> {
         return None;
     }
 
-    if !cursor.curr.is_ascii_whitespace() {
+    if !cursor.curr().is_ascii_whitespace() {
         return None;
     }
 
diff --git a/crates/oxide/src/fixtures/example.html b/crates/oxide/src/fixtures/example.html
new file mode 100644
index 000000000..41d8beed6
--- /dev/null
+++ b/crates/oxide/src/fixtures/example.html
@@ -0,0 +1,552 @@
+<div class="font-semibold px-3 text-left text-gray-900 py-3.5 text-sm">
+  <nav class="font-medium text-gray-900">
+    <ul class="h-7 justify-center rounded-full items-center w-7 flex mx-auto">
+      <li class="h-0.5 inset-x-0 absolute bottom-0">
+        <a href="#" target="_blank" class="space-y-1 px-2 mt-3">
+          This is link 4132f37a-a03f-4776-9a8e-1b70ff626f71
+        </a>
+        <img
+          class="text-gray-900 font-medium text-sm ml-3.5"
+          alt="Profile picture of user 40faf8f0-6221-4ec4-a65e-fe22e1d9abd2"
+          src="https://example.org/pictures/4f7d7f80-e9cd-447a-9b35-f9d93befe025"
+        />
+      </li>
+      <li class="text-indigo-700 order-1 font-semibold">
+        <ol class="h-24 sm:w-32 w-24 object-center rounded-md sm:h-32 object-cover">
+          <li class="lg:justify-center lg:gap-x-12 hidden lg:flex lg:min-w-0 lg:flex-1">
+            <img
+              class="hover:bg-gray-100 bg-gray-50 py-1.5 focus:z-10 text-gray-400"
+              alt="Profile picture of user d27b5a21-1622-4f3a-ba7d-6230fae487c2"
+              src="https://example.org/pictures/2a026d06-0e67-467d-babf-8a18614667f2"
+            />
+            <ul class="w-6 h-6 mr-3 flex-shrink-0">
+              <li class="flow-root">
+                <img
+                  class="bg-white focus:ring-indigo-500 group font-medium items-center inline-flex focus:ring-offset-2 focus:ring-2 focus:outline-none text-base rounded-md hover:text-gray-900"
+                  alt="Profile picture of user 0052230e-90d8-4d84-ab64-904b87fe4622"
+                  src="https://example.org/pictures/f7ec91ba-17a7-470f-a472-705a8b5a79ce"
+                />
+              </li>
+              <li class="items-center right-0 flex pointer-events-none absolute inset-y-0">
+                <img
+                  class="ml-3"
+                  alt="Profile picture of user a7c51adf-3917-4e41-b5f1-d263768c9adf"
+                  src="https://example.org/pictures/a56323a8-8aa3-4d39-8c79-9ee875ecd6f0"
+                />
+              </li>
+            </ul>
+            <ul class="hover:bg-opacity-75 hover:bg-indigo-500 text-white">
+              <li class="font-medium hover:text-indigo-500 text-indigo-600 text-sm">
+                <ul class="sr-only"></ul>
+                <ol class="flex-col px-8 flex pt-8"></ol>
+                <a href="#" class="items-center sm:items-start flex">
+                  This is link 8c59d1ad-9ef0-4a41-ab15-e9fe04d77ae2
+                </a>
+              </li>
+              <li class="rounded-full w-8 h-8">
+                <ol class="lg:grid lg:grid-cols-12"></ol>
+                <a
+                  href="#"
+                  target="_blank"
+                  rel="noreferrer"
+                  class="px-4 border-t py-6 space-y-6 border-gray-200"
+                >
+                  This is link 4182f198-ff54-45a4-ace9-e6f46a60ec92
+                </a>
+              </li>
+              <li class="border-gray-700 border-t pt-4 pb-3">
+                <ol class="font-medium text-gray-900 p-2 block -m-2"></ol>
+                <ol
+                  class="sm:py-24 to-green-400 lg:px-0 bg-gradient-to-r lg:items-center lg:justify-end sm:px-6 lg:bg-none from-cyan-600 px-4 lg:pl-8 py-16 lg:flex"
+                ></ol>
+                <img
+                  class="lg:gap-24 lg:grid-cols-2 lg:grid lg:mx-auto lg:items-start lg:max-w-7xl lg:px-8"
+                  alt="Profile picture of user c44d18a8-a1f1-4bf4-87b0-89f37e34aba1"
+                  src="https://example.org/pictures/527dca2c-5afe-4a5c-96cd-706396701c36"
+                />
+              </li>
+              <li class="hover:bg-gray-100 bg-white focus:z-10 text-gray-900 relative py-1.5">
+                <a
+                  href="#"
+                  target="_blank"
+                  rel="noreferrer"
+                  class="text-sm font-medium text-gray-500"
+                >
+                  This is link f6db0c8d-6409-4abd-9af1-d3e68ebbd25c
+                </a>
+                <a href="#" rel="noreferrer" class="text-sm font-medium mt-12">
+                  This is link 51c9b242-e449-44d8-9289-1a5d474d5fbb
+                </a>
+                <ul class="h-12"></ul>
+              </li>
+              <li class="bg-gray-100">
+                <a href="#" rel="noreferrer" class="bg-gray-100">
+                  This is link eb479051-0dff-4d8f-9456-bb8b56ab90af
+                </a>
+                <img
+                  class="ml-3 text-gray-900 font-medium text-base"
+                  alt="Profile picture of user 17d797ac-aea7-4154-b522-f0ac89762b0b"
+                  src="https://example.org/pictures/55e31a5b-2fcb-4b35-832c-fad711717f1a"
+                />
+                <ul class="font-medium hover:text-gray-700 text-gray-500 ml-4 text-sm"></ul>
+              </li>
+            </ul>
+            <ul class="space-y-6 border-t py-6 border-gray-200 px-4">
+              <li class="md:hidden z-40 relative">
+                <ol class="h-7 w-7 mx-auto items-center justify-center rounded-full flex"></ol>
+                <ol class="items-center flex rounded-full w-7 mx-auto h-7 justify-center"></ol>
+                <a
+                  href="#"
+                  target="_blank"
+                  class="sm:py-32 lg:px-8 max-w-7xl mx-auto px-4 py-24 sm:px-6 relative"
+                >
+                  This is link 5014471c-4f44-4696-a1f6-7817d57827eb
+                </a>
+                <img
+                  class="h-5 group-hover:text-gray-500 w-5 ml-2"
+                  alt="Profile picture of user 98731873-0af8-4823-9115-f1333a2cdc2e"
+                  src="https://example.org/pictures/12ac8cbf-4540-49ff-a71f-4b0ac684b374"
+                />
+              </li>
+              <li
+                class="focus:outline-none font-medium px-4 justify-center text-sm focus:ring-2 border hover:bg-gray-50 focus:ring-offset-2 py-2 border-gray-300 bg-white inline-flex text-gray-700 rounded-md shadow-sm focus:ring-gray-900"
+              >
+                <img
+                  class="bg-white focus:ring-indigo-500 text-base focus:outline-none focus:ring-2 items-center font-medium focus:ring-offset-2 hover:text-gray-900 rounded-md group inline-flex"
+                  alt="Profile picture of user 3ae3670d-c729-41d2-adee-691340673aef"
+                  src="https://example.org/pictures/5f289b87-efc2-4cc9-9061-21883b0778db"
+                />
+              </li>
+              <li class="text-base text-gray-500 mt-6 font-medium text-center">
+                <ol class="text-sm font-medium text-indigo-600 hover:text-indigo-500"></ol>
+                <ol class="rounded-md h-6 w-6 inline-block"></ol>
+              </li>
+              <li class="hidden lg:flex lg:items-center">
+                <ol class="border-indigo-600"></ol>
+              </li>
+            </ul>
+          </li>
+          <li class="sr-only">
+            <img
+              class="justify-center py-2 bg-white flex"
+              alt="Profile picture of user 89195190-9a42-4826-89ba-e7bc1d677520"
+              src="https://example.org/pictures/742d9c44-1c75-461f-b2d0-e52636041966"
+            />
+            <img
+              class="-ml-14 sticky left-0 z-20 text-gray-400 -mt-2.5 leading-5 pr-2 w-14 text-right text-xs"
+              alt="Profile picture of user 77a37b14-1c0f-4ef0-85d4-a18755065ea3"
+              src="https://example.org/pictures/8ad2e05f-6ea6-4d94-8f82-f8aa59274b9e"
+            />
+          </li>
+        </ol>
+        <img
+          class="border-t shadow-sm sm:border bg-white sm:rounded-lg border-gray-200 border-b"
+          alt="Profile picture of user 07935cf2-78e5-49ba-afdb-09d13c8320d6"
+          src="https://example.org/pictures/8f895991-6e8c-4bcb-82c3-11c2a3338eb2"
+        />
+        <ol class="grid-cols-2 grid gap-x-8 gap-y-10">
+          <li
+            class="py-1 w-48 shadow-lg bg-white rounded-md ring-1 absolute ring-black z-10 focus:outline-none right-0 mt-2 ring-opacity-5 origin-top-right"
+          >
+            <ol class="h-6 w-6">
+              <li class="bg-gray-500 inset-0 transition-opacity fixed bg-opacity-75">
+                <ol class="flex"></ol>
+                <a href="#" class="mt-2 flex items-center justify-between">
+                  This is link 1a1a3c60-a2ea-4153-acd7-12aa82f03c8d
+                </a>
+                <a href="#" target="_blank" class="text-gray-300 flex-shrink-0 w-5 h-5">
+                  This is link bdaa695c-3fe4-4cab-8d68-dbb338601044
+                </a>
+              </li>
+              <li class="text-gray-500">
+                <ol class="py-20"></ol>
+                <a href="#" target="_blank" class="text-sm ml-3">
+                  This is link 2183c71d-39ec-42d4-8b1e-eeb7e5490050
+                </a>
+              </li>
+              <li class="mt-10">
+                <ol class="group"></ol>
+                <a href="#" rel="noreferrer" class="bg-gray-50">
+                  This is link c49882fd-ab55-41a4-8dac-b96fe2901bce
+                </a>
+                <ol class="bg-white h-[940px] overflow-y-auto"></ol>
+              </li>
+              <li class="flex-1 space-y-1">
+                <ol class="h-6 w-6"></ol>
+              </li>
+            </ol>
+            <ul class="z-10 flex relative items-center lg:hidden">
+              <li class="aspect-w-1 bg-gray-100 rounded-lg overflow-hidden aspect-h-1">
+                <img
+                  class="overflow-hidden sm:rounded-md bg-white shadow"
+                  alt="Profile picture of user 263bb89c-5b54-4247-8c82-fec829b1a895"
+                  src="https://example.org/pictures/4c12a5c4-d117-4f81-93e1-47a45626a36e"
+                />
+                <a href="#" class="sr-only"> This is link fc3885d8-d63f-4455-b056-f113aa3a2f23 </a>
+                <ol
+                  class="border-t grid-cols-1 border-gray-200 gap-6 border-b mt-6 sm:grid-cols-2 grid py-6"
+                ></ol>
+              </li>
+              <li class="space-x-3 items-center flex">
+                <a href="#" class="py-2 bg-white">
+                  This is link 1d718cb1-05e3-4d14-b959-92f5fd475ce0
+                </a>
+                <img
+                  class="rounded-md w-full focus:border-indigo-500 border-gray-300 focus:ring-indigo-500 block mt-1 shadow-sm sm:text-sm"
+                  alt="Profile picture of user 1c4d6dc3-700a-4167-8ec3-3dc2f73d4ad5"
+                  src="https://example.org/pictures/359599b3-5610-482e-bc09-025ac5283170"
+                />
+                <ul class="max-w-3xl mx-auto divide-y-2 divide-gray-200"></ul>
+                <ul class="flex space-x-4"></ul>
+              </li>
+              <li class="text-gray-500 hover:text-gray-600">
+                <ul class="h-96 w-full relative lg:hidden"></ul>
+                <ol class="text-gray-500 mt-6 text-sm"></ol>
+                <a href="#" class="sm:col-span-6">
+                  This is link 51cc68af-1184-4f8c-9efd-d2f855902b0b
+                </a>
+                <ol
+                  class="left-0 inset-y-0 absolute pointer-events-none pl-3 items-center flex"
+                ></ol>
+              </li>
+              <li class="flex-shrink-0">
+                <ol
+                  class="shadow-lg rounded-lg ring-1 bg-white ring-black ring-opacity-5 divide-gray-50 divide-y-2"
+                ></ol>
+              </li>
+            </ul>
+            <img
+              class="pl-3 sm:pr-6 py-3.5 relative pr-4"
+              alt="Profile picture of user 095f88c2-1892-41d1-8165-981ab47b1942"
+              src="https://example.org/pictures/c70d575b-353a-4360-99df-c2100a36e41b"
+            />
+          </li>
+          <li class="whitespace-nowrap">
+            <a href="#" target="_blank" rel="noreferrer" class="h-full">
+              This is link c804eb7a-39ea-46e6-a79a-2d48e61d5b4e
+            </a>
+          </li>
+          <li class="text-gray-900 text-2xl font-bold tracking-tight">
+            <img
+              class="text-gray-900 font-medium"
+              alt="Profile picture of user 12190673-25cb-4175-90d7-73282e51bd02"
+              src="https://example.org/pictures/e55a076b-0325-4629-8e02-c9491f2f49cc"
+            />
+          </li>
+          <li
+            class="ring-black sm:-mx-6 overflow-hidden ring-1 ring-opacity-5 mt-8 md:rounded-lg md:mx-0 -mx-4 shadow"
+          >
+            <ol class="flex items-center font-medium hover:text-gray-800 text-sm text-gray-700">
+              <li class="flex mt-8 flex-col">
+                <ol class="sm:inline hidden"></ol>
+                <ul class="flex items-center absolute inset-0"></ul>
+                <ol class="h-6 w-6"></ol>
+              </li>
+              <li class="-ml-2 rounded-md text-gray-400 p-2 bg-white">
+                <img
+                  class="block ml-3 font-medium text-sm text-gray-700"
+                  alt="Profile picture of user 2cee83e8-6405-4046-9454-7f6083db307d"
+                  src="https://example.org/pictures/93097140-2e56-4a3f-bc41-e00c658b7767"
+                />
+                <ul class="sm:grid font-medium hidden grid-cols-4 text-gray-600 mt-6 text-sm"></ul>
+                <ul class="h-64 w-64 rounded-full xl:h-80 xl:w-80"></ul>
+                <ul class="sr-only"></ul>
+              </li>
+            </ol>
+            <img
+              class="aspect-w-2 group sm:aspect-w-1 aspect-h-1 overflow-hidden sm:aspect-h-1 sm:row-span-2 rounded-lg"
+              alt="Profile picture of user bc370a72-a44e-44e1-bbec-962c234060da"
+              src="https://example.org/pictures/d284630d-a088-49ad-a018-b245a8d7acb7"
+            />
+          </li>
+          <li class="space-y-6 mt-6">
+            <ul class="w-5 text-gray-400 h-5">
+              <li
+                class="hover:bg-gray-100 py-1.5 bg-gray-50 text-gray-400 focus:z-10 rounded-tl-lg"
+              >
+                <img
+                  class="bg-gray-50 py-1.5 hover:bg-gray-100 focus:z-10 text-gray-400"
+                  alt="Profile picture of user 4b298841-5911-4b70-ae5a-a5aa8646e575"
+                  src="https://example.org/pictures/fd05d4f7-2b6c-4de4-b7a7-3035e7b5fe78"
+                />
+                <img
+                  class="px-3 py-2 bg-white relative"
+                  alt="Profile picture of user 5406aa7d-5563-4ce1-980f-754a912cd9ff"
+                  src="https://example.org/pictures/e979117e-580c-40a7-be74-bf1b916b9ac0"
+                />
+                <a
+                  href="#"
+                  target="_blank"
+                  rel="noreferrer"
+                  class="mt-2 font-medium text-gray-900 text-lg"
+                >
+                  This is link 95d285c9-6e4e-43c2-a97f-bb958dcce92f
+                </a>
+                <ul class="sr-only"></ul>
+              </li>
+              <li class="mt-2 text-sm text-gray-500">
+                <a href="#" target="_blank" class="text-sm text-blue-gray-900 font-medium block">
+                  This is link e0ca5c13-efa5-44d7-b91e-512df7c88410
+                </a>
+                <img
+                  class="w-5 h-5"
+                  alt="Profile picture of user 4f5aeddc-6718-40fd-87d2-dcca7e4ef8b1"
+                  src="https://example.org/pictures/6a2ed606-6c59-413c-911f-612c7390091f"
+                />
+                <ol class="font-medium text-gray-900"></ol>
+                <ol class="justify-center rounded-full h-7 items-center mx-auto w-7 flex"></ol>
+              </li>
+              <li class="font-medium px-1 whitespace-nowrap py-4 text-sm border-b-2">
+                <a
+                  href="#"
+                  target="_blank"
+                  class="min-h-80 rounded-md aspect-h-1 aspect-w-1 lg:aspect-none w-full group-hover:opacity-75 lg:h-80 overflow-hidden bg-gray-200"
+                >
+                  This is link 4f52e535-2e46-44e2-8a5f-fce48c1a673a
+                </a>
+                <ul class="text-gray-300 h-full w-full"></ul>
+                <img
+                  class="block"
+                  alt="Profile picture of user 76dd6af3-d2b7-4a7a-8bc3-628ce95ea9b3"
+                  src="https://example.org/pictures/c6b476c8-283c-44f7-a5c6-4cb48c5ae10b"
+                />
+                <ol class="h-32 relative lg:hidden w-full"></ol>
+              </li>
+              <li class="bg-gray-100 z-10 sticky sm:pt-3 pl-1 pt-1 md:hidden sm:pl-3 top-0">
+                <ol class="z-40 relative lg:hidden"></ol>
+                <a href="#" class="sr-only"> This is link ec11a608-55b8-41fd-8085-325252c469af </a>
+                <ol class="divide-gray-200 lg:col-span-9 divide-y"></ol>
+              </li>
+            </ul>
+            <ul class="text-xl font-semibold ml-1">
+              <li class="lg:flex-1 lg:w-0">
+                <ol class="sm:hidden"></ol>
+                <img
+                  class="block py-2 text-blue-gray-900 text-base hover:bg-blue-gray-50 font-medium px-3 rounded-md"
+                  alt="Profile picture of user 885eb4a3-98ca-4614-b255-ec03e124c026"
+                  src="https://example.org/pictures/6d3a9136-583e-4742-826f-e6d94f60ce99"
+                />
+              </li>
+              <li class="truncate w-0 ml-2 flex-1">
+                <img
+                  class="hover:text-gray-600 text-gray-500"
+                  alt="Profile picture of user de38ffb5-607b-4ed6-87bd-dd05fde1731c"
+                  src="https://example.org/pictures/da67f442-40c9-425d-9344-2f9772582519"
+                />
+                <ol class="text-center mt-8 text-gray-400 text-base"></ol>
+              </li>
+            </ul>
+          </li>
+        </ol>
+      </li>
+      <li class="lg:block hidden lg:flex-1">
+        <a href="#" target="_blank" class="text-base ml-3 text-gray-500">
+          This is link 9a44892f-7ead-48b6-af94-913ec04821a1
+        </a>
+        <ol
+          class="shadow-sm border-gray-300 focus:ring-indigo-500 sm:text-sm focus:border-indigo-500 w-full rounded-md block"
+        >
+          <li class="bg-white hover:bg-gray-100 py-1.5 focus:z-10">
+            <a
+              href="#"
+              target="_blank"
+              class="bg-gray-200 text-gray-700 gap-px lg:flex-none border-b text-center grid-cols-7 grid text-xs leading-6 border-gray-300 font-semibold"
+            >
+              This is link 42a16c66-508d-4d65-bb1a-b252f7e78df2
+            </a>
+            <a href="#" class="h-8 w-auto"> This is link 021bda37-522f-413d-af3c-4a8c4f4d666a </a>
+            <img
+              class="max-h-12"
+              alt="Profile picture of user a1a859bc-ef5e-4349-99ab-a8f4ae262d94"
+              src="https://example.org/pictures/da93a022-cbbf-4ba0-b34c-21c090d87d74"
+            />
+            <a
+              href="#"
+              target="_blank"
+              rel="noreferrer"
+              class="flex relative justify-center text-sm"
+            >
+              This is link fa5aded2-2906-4809-b742-26832b226f50
+            </a>
+          </li>
+          <li class="py-12 sm:px-6 lg:py-16 px-4 lg:px-8 mx-auto max-w-7xl">
+            <a href="#" rel="noreferrer" class="min-w-0 ml-3 flex-1">
+              This is link 715e397d-5676-42fc-9d8f-456172543c31
+            </a>
+            <img
+              class="bg-gray-800"
+              alt="Profile picture of user c02575ab-6ff1-45f9-a8e3-242c79b133fc"
+              src="https://example.org/pictures/3d8ecc7a-2504-4797-a644-f93d74acf853"
+            />
+            <img
+              class="text-base text-gray-900 font-medium"
+              alt="Profile picture of user 9f457701-be79-4ff2-9dfc-9382dafb20ab"
+              src="https://example.org/pictures/438b713b-c9fd-4da2-a265-4b8d8f531e30"
+            />
+            <a href="#" rel="noreferrer" class="text-sm">
+              This is link 4c84098a-c0ac-4044-bbba-6f10bcc315fb
+            </a>
+          </li>
+          <li class="w-6 flex-shrink-0 h-6 text-green-500">
+            <img
+              class="mx-auto sm:px-6 px-4 max-w-7xl"
+              alt="Profile picture of user 00ae83b8-845d-447e-ae1b-cd3c685e1ca0"
+              src="https://example.org/pictures/b9deba2b-c5b3-4b80-bf76-e0a717d310fd"
+            />
+            <ul class="w-72">
+              <li class="sm:flex sm:justify-between sm:items-center">
+                <img
+                  class="block font-medium text-sm text-gray-700"
+                  alt="Profile picture of user c0de8cb0-e9d7-4639-8c3d-851ca17e665b"
+                  src="https://example.org/pictures/897193ff-aa53-4e9e-b761-bc4f75aef572"
+                />
+              </li>
+              <li class="text-sm hidden font-medium ml-3 text-gray-700 lg:block">
+                <img
+                  class="h-8 w-auto"
+                  alt="Profile picture of user 9ff9c8ac-2374-4960-9996-ec258745c91a"
+                  src="https://example.org/pictures/e898638f-08fa-4743-aea7-66adba84bded"
+                />
+              </li>
+              <li
+                class="mx-auto sm:px-6 px-4 lg:items-center lg:flex lg:py-16 lg:px-8 max-w-7xl py-12"
+              >
+                <img
+                  class="lg:max-w-none px-4 max-w-2xl mx-auto lg:px-0"
+                  alt="Profile picture of user 7c4d617d-afa2-4410-81c5-2def540d2d20"
+                  src="https://example.org/pictures/05a7dbc1-c1cc-4f99-99e5-7b507a4108b3"
+                />
+                <ul class="hover:text-gray-600 text-gray-500"></ul>
+                <ul
+                  class="relative rounded-md border-transparent focus-within:ring-2 focus-within:ring-white -ml-2 group"
+                ></ul>
+              </li>
+            </ul>
+            <img
+              class="h-5 text-gray-300 w-5"
+              alt="Profile picture of user bf2c6905-715a-4e38-9b5d-17fd8e7aec2a"
+              src="https://example.org/pictures/e759a4d7-5e63-4075-ba32-c6574107f401"
+            />
+          </li>
+          <li class="object-cover object-center h-full w-full">
+            <ol class="w-full">
+              <li class="md:mt-0 absolute sm:-mt-32 -mt-72 inset-0">
+                <ul class="w-12 h-12 rounded-full"></ul>
+              </li>
+              <li class="h-1.5 rounded-full w-1.5 mb-1 mx-0.5 bg-gray-400">
+                <ol class="border-gray-200 border-4 rounded-lg border-dashed h-96"></ol>
+                <img
+                  class="order-1 font-semibold text-gray-700"
+                  alt="Profile picture of user 1c2cabee-08a3-4b48-ba54-5a578b2c3d30"
+                  src="https://example.org/pictures/f5c185be-8b9d-490d-81f4-73a6e1517d98"
+                />
+                <img
+                  class="font-bold sm:text-4xl text-gray-900 tracking-tight text-3xl leading-8 text-center"
+                  alt="Profile picture of user 1e8a2508-a37d-4f6b-9a8c-c6fcf0773604"
+                  src="https://example.org/pictures/90af1bd2-30ed-45d3-917f-c685190ce56e"
+                />
+              </li>
+              <li class="space-x-2 mt-4 text-sm text-gray-700 flex">
+                <ul
+                  class="rounded-full translate-x-1/2 block transform border-2 absolute bottom-0 right-0 border-white translate-y-1/2"
+                ></ul>
+                <ol
+                  class="sm:hidden text-base py-2 text-gray-900 w-full placeholder-gray-500 h-full focus:outline-none border-transparent pr-3 pl-8 focus:placeholder-gray-400 focus:ring-0 focus:border-transparent"
+                ></ol>
+              </li>
+            </ol>
+            <ul class="lg:mt-0 self-center flow-root mt-8">
+              <li
+                class="justify-center rounded-full bg-transparent bg-white hover:text-gray-500 focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 text-gray-400 inline-flex focus:outline-none h-8 items-center w-8"
+              >
+                <ol class="block xl:inline"></ol>
+                <ol class="flex-shrink-0 ml-4"></ol>
+                <ol class="text-gray-200"></ol>
+                <img
+                  class="border-gray-300 focus:relative md:w-9 rounded-r-md flex bg-white md:hover:bg-gray-50 pl-4 text-gray-400 border hover:text-gray-500 items-center pr-3 border-l-0 justify-center md:px-2 py-2"
+                  alt="Profile picture of user b0a1e2d3-84c4-494b-91d6-194fc294b0db"
+                  src="https://example.org/pictures/2f414511-756c-40ef-aded-22e3f4d985d7"
+                />
+              </li>
+              <li class="inset-0 absolute">
+                <img
+                  class="text-gray-500 text-base font-medium text-center"
+                  alt="Profile picture of user 431f88eb-5002-43ab-b23a-37ae0ef7d424"
+                  src="https://example.org/pictures/bc7c19bb-4ef2-46ff-b00e-da70febab926"
+                />
+                <img
+                  class="inset-0 absolute z-10"
+                  alt="Profile picture of user 4a3698d0-7cea-4ba2-854d-28b2bb2d374b"
+                  src="https://example.org/pictures/6078c4cd-db51-43af-90b3-8aeb0a8f1030"
+                />
+              </li>
+            </ul>
+            <a href="#" rel="noreferrer" class="bg-white">
+              This is link ab01c689-e03a-4992-8322-37c20551cb07
+            </a>
+          </li>
+          <li class="flex px-4 pb-2 pt-5">
+            <ol
+              class="sm:px-6 px-4 bg-white relative pb-8 md:p-6 shadow-2xl items-center flex w-full sm:pt-8 overflow-hidden lg:p-8 pt-14"
+            >
+              <li class="py-1.5 hover:bg-gray-100 focus:z-10 text-gray-400 bg-gray-50">
+                <a
+                  href="#"
+                  rel="noreferrer"
+                  class="sm:text-sm bg-gray-50 items-center border-gray-300 border-r-0 rounded-l-md text-gray-500 inline-flex border px-3"
+                >
+                  This is link 3ef75acd-3dfc-4e82-801b-eae9ff7c4351
+                </a>
+                <ol class="absolute border-dashed border-gray-200 border-2 rounded-lg inset-0"></ol>
+              </li>
+              <li class="hover:bg-gray-50 block">
+                <ol class="items-center flex justify-center p-8"></ol>
+                <ul class="mx-auto sm:px-6 lg:px-8 pb-12 max-w-7xl px-4"></ul>
+                <img
+                  class="h-6 w-6 text-green-400"
+                  alt="Profile picture of user f5900afb-7bee-4492-b6e3-148f0afc4f5f"
+                  src="https://example.org/pictures/1b12c3fb-9f84-4cc7-84a7-d38f7ea232ee"
+                />
+              </li>
+              <li class="flex mt-4 lg:flex-grow-0 flex-grow lg:ml-4 flex-shrink-0 ml-8">
+                <img
+                  class="focus:ring-indigo-500 block w-full sm:text-sm border-gray-300 focus:border-indigo-500 rounded-md shadow-sm"
+                  alt="Profile picture of user c9dd7fa0-c1f4-477c-b24e-87d200ebb161"
+                  src="https://example.org/pictures/1a3b2e5c-a192-47f3-a550-e18f715213a2"
+                />
+                <a href="#" target="_blank" rel="noreferrer" class="text-gray-300 hover:text-white">
+                  This is link 81b819f3-b2e8-41db-ab8d-abe8c6926047
+                </a>
+              </li>
+            </ol>
+            <img
+              class="lg:flex-1 lg:block hidden"
+              alt="Profile picture of user 352e9ea2-0216-4a0c-917c-1906f5ef4ed1"
+              src="https://example.org/pictures/ec02985c-b92d-4978-906e-7bdc70bfa54e"
+            />
+          </li>
+        </ol>
+      </li>
+      <li class="sr-only">
+        <a href="#" target="_blank" class="text-gray-500 mt-4 text-sm">
+          This is link a712361b-f51e-4f0a-9d55-b64a5d53e10e
+        </a>
+        <a
+          href="#"
+          rel="noreferrer"
+          class="rounded-lg ring-opacity-5 shadow-lg overflow-hidden ring-1 ring-black"
+        >
+          This is link 8eb412d6-1c39-4fed-b507-cf2a65904247
+        </a>
+      </li>
+    </ul>
+  </nav>
+  <img
+    class="bg-gray-100"
+    alt="Profile picture of user 8825a6f0-3a41-44b8-92ec-abcd0af79bfb"
+    src="https://example.org/pictures/679e2a54-073e-416a-85c4-3eba0626aab3"
+  />
+  <span class="bg-white focus:z-10 py-1.5 hover:bg-gray-100">
+    This is text 3d190171-53b3-4393-99ab-9bedfc964141
+  </span>
+</div>
diff --git a/crates/oxide/src/glob.rs b/crates/oxide/src/glob.rs
index 92c83908b..9a6296bcb 100644
--- a/crates/oxide/src/glob.rs
+++ b/crates/oxide/src/glob.rs
@@ -1,11 +1,17 @@
 use fxhash::{FxHashMap, FxHashSet};
-use glob_match::glob_match;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use tracing::event;
 
-use crate::GlobEntry;
+#[derive(Debug, Clone, PartialEq)]
+pub struct GlobEntry {
+    /// Base path of the glob
+    pub base: String,
 
-pub fn hoist_static_glob_parts(entries: &Vec<GlobEntry>) -> Vec<GlobEntry> {
+    /// Glob pattern
+    pub pattern: String,
+}
+
+pub fn hoist_static_glob_parts(entries: &Vec<GlobEntry>, emit_parent_glob: bool) -> Vec<GlobEntry> {
     let mut result = vec![];
 
     for entry in entries {
@@ -40,7 +46,7 @@ pub fn hoist_static_glob_parts(entries: &Vec<GlobEntry>) -> Vec<GlobEntry> {
         // If the base path is a file, then we want to move the file to the pattern, and point the
         // directory to the base. This is necessary for file watchers that can only listen to
         // folders.
-        if pattern.is_empty() && base.is_file() {
+        if emit_parent_glob && pattern.is_empty() && base.is_file() {
             result.push(GlobEntry {
                 // SAFETY: `parent()` will be available because we verify `base` is a file, thus a
                 // parent folder exists.
@@ -83,7 +89,7 @@ pub fn hoist_static_glob_parts(entries: &Vec<GlobEntry>) -> Vec<GlobEntry> {
 /// tailwind --pwd ./project/components --content "**/*.js"
 /// ```
 pub fn optimize_patterns(entries: &Vec<GlobEntry>) -> Vec<GlobEntry> {
-    let entries = hoist_static_glob_parts(entries);
+    let entries = hoist_static_glob_parts(entries, true);
 
     // Track all base paths and their patterns. Later we will turn them back into `GlobalEntry`s.
     let mut pattern_map: FxHashMap<String, FxHashSet<String>> = FxHashMap::default();
@@ -132,11 +138,23 @@ pub fn optimize_patterns(entries: &Vec<GlobEntry>) -> Vec<GlobEntry> {
 // using `*`.
 //
 // E.g.:
-//  Original input: `../project-b/**/*.{html,js}`
-//  Expanded input: `../project-b/**/*.html` & `../project-b/**/*.js`
-//  Split on first input: ("../project-b", "**/*.html")
-//  Split on second input: ("../project-b", "**/*.js")
-fn split_pattern(pattern: &str) -> (Option<String>, Option<String>) {
+//
+//  Input:
+//  - `../project-b/**/*.html`
+//  - `../project-b/**/*.js`
+//
+//  Split results in:
+//  - `("../project-b", "**/*.html")`
+//  - `("../project-b", "**/*.js")`
+//
+// A static file glob should also be considered as a dynamic part.
+//
+// E.g.:
+//
+// Input: `../project-b/foo/bar.html`
+// Split results in: `("../project-b/foo", "bar.html")`
+//
+pub fn split_pattern(pattern: &str) -> (Option<String>, Option<String>) {
     // No dynamic parts, so we can just return the input as-is.
     if !pattern.contains('*') {
         return (Some(pattern.to_owned()), None);
@@ -168,19 +186,12 @@ fn split_pattern(pattern: &str) -> (Option<String>, Option<String>) {
     (static_part, dynamic_part)
 }
 
-pub fn path_matches_globs(path: &Path, globs: &[GlobEntry]) -> bool {
-    let path = path.to_string_lossy();
-
-    globs
-        .iter()
-        .any(|g| glob_match(&format!("{}/{}", g.base, g.pattern), &path))
-}
-
 #[cfg(test)]
 mod tests {
     use super::optimize_patterns;
     use crate::GlobEntry;
     use bexpand::Expression;
+    use pretty_assertions::assert_eq;
     use std::process::Command;
     use std::{fs, path};
     use tempfile::tempdir;
diff --git a/crates/oxide/src/lib.rs b/crates/oxide/src/lib.rs
index 4631cabc8..d7f0321af 100644
--- a/crates/oxide/src/lib.rs
+++ b/crates/oxide/src/lib.rs
@@ -1,490 +1,12 @@
-use crate::glob::hoist_static_glob_parts;
-use crate::parser::Extractor;
-use crate::scanner::allowed_paths::resolve_paths;
-use crate::scanner::detect_sources::DetectSources;
-use bexpand::Expression;
-use bstr::ByteSlice;
-use fxhash::{FxHashMap, FxHashSet};
-use glob::optimize_patterns;
-use glob_match::glob_match;
-use paths::Path;
-use rayon::prelude::*;
-use scanner::allowed_paths::read_dir;
-use std::fs;
-use std::path::PathBuf;
-use std::sync;
-use std::time::SystemTime;
-use tracing::event;
-
 pub mod cursor;
+pub mod extractor;
 pub mod fast_skip;
 pub mod glob;
-pub mod parser;
 pub mod paths;
 pub mod scanner;
+pub mod throughput;
 
-static SHOULD_TRACE: sync::LazyLock<bool> = sync::LazyLock::new(
-    || matches!(std::env::var("DEBUG"), Ok(value) if value.eq("*") || (value.contains("tailwindcss:oxide") && !value.contains("-tailwindcss:oxide"))),
-);
-
-fn init_tracing() {
-    if !*SHOULD_TRACE {
-        return;
-    }
-
-    _ = tracing_subscriber::fmt()
-        .with_max_level(tracing::Level::INFO)
-        .with_span_events(tracing_subscriber::fmt::format::FmtSpan::ACTIVE)
-        .compact()
-        .try_init();
-}
-
-#[derive(Debug, Clone)]
-pub struct ChangedContent {
-    pub file: Option<PathBuf>,
-    pub content: Option<String>,
-}
-
-#[derive(Debug, Clone)]
-pub struct ScanOptions {
-    /// Base path to start scanning from
-    pub base: Option<String>,
-    /// Glob sources
-    pub sources: Vec<GlobEntry>,
-}
-
-#[derive(Debug, Clone)]
-pub struct ScanResult {
-    pub candidates: Vec<String>,
-    pub files: Vec<String>,
-    pub globs: Vec<GlobEntry>,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct GlobEntry {
-    pub base: String,
-    pub pattern: String,
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct Scanner {
-    /// Glob sources
-    sources: Option<Vec<GlobEntry>>,
-
-    /// Scanner is ready to scan. We delay the file system traversal for detecting all files until
-    /// we actually need them.
-    ready: bool,
-
-    /// All files that we have to scan
-    files: Vec<PathBuf>,
-
-    /// All directories, sub-directories, etc… we saw during source detection
-    dirs: Vec<PathBuf>,
-
-    /// All generated globs
-    globs: Vec<GlobEntry>,
-
-    /// Track file modification times
-    mtimes: FxHashMap<PathBuf, SystemTime>,
-
-    /// Track unique set of candidates
-    candidates: FxHashSet<String>,
-}
-
-impl Scanner {
-    pub fn new(sources: Option<Vec<GlobEntry>>) -> Self {
-        Self {
-            sources,
-            ..Default::default()
-        }
-    }
-
-    pub fn scan(&mut self) -> Vec<String> {
-        init_tracing();
-        self.prepare();
-        self.compute_candidates();
-
-        let mut candidates: Vec<String> = self.candidates.clone().into_par_iter().collect();
-
-        candidates.par_sort();
-        candidates
-    }
-
-    #[tracing::instrument(skip_all)]
-    pub fn scan_content(&mut self, changed_content: Vec<ChangedContent>) -> Vec<String> {
-        self.prepare();
-        let candidates = parse_all_blobs(read_all_files(changed_content));
-
-        let mut new_candidates = vec![];
-        for candidate in candidates {
-            if self.candidates.contains(&candidate) {
-                continue;
-            }
-            self.candidates.insert(candidate.clone());
-            new_candidates.push(candidate);
-        }
-
-        new_candidates
-    }
-
-    #[tracing::instrument(skip_all)]
-    pub fn get_candidates_with_positions(
-        &mut self,
-        changed_content: ChangedContent,
-    ) -> Vec<(String, usize)> {
-        self.prepare();
-
-        let content = read_changed_content(changed_content).unwrap_or_default();
-        let extractor = Extractor::with_positions(&content[..], Default::default());
-
-        let candidates: Vec<(String, usize)> = extractor
-            .into_par_iter()
-            .map(|(s, i)| {
-                // SAFETY: When we parsed the candidates, we already guaranteed that the byte slices
-                // are valid, therefore we don't have to re-check here when we want to convert it back
-                // to a string.
-                unsafe { (String::from_utf8_unchecked(s.to_vec()), i) }
-            })
-            .collect();
-        candidates
-    }
-
-    #[tracing::instrument(skip_all)]
-    pub fn get_files(&mut self) -> Vec<String> {
-        self.prepare();
-
-        self.files
-            .par_iter()
-            .filter_map(|x| Path::from(x.clone()).canonicalize().ok())
-            .map(|x| x.to_string())
-            .collect()
-    }
-
-    #[tracing::instrument(skip_all)]
-    pub fn get_globs(&mut self) -> Vec<GlobEntry> {
-        self.prepare();
-
-        self.globs.clone()
-    }
-
-    #[tracing::instrument(skip_all)]
-    fn compute_candidates(&mut self) {
-        let mut changed_content = vec![];
-
-        let current_mtimes = self
-            .files
-            .par_iter()
-            .map(|path| {
-                fs::metadata(path)
-                    .and_then(|m| m.modified())
-                    .unwrap_or(SystemTime::now())
-            })
-            .collect::<Vec<_>>();
-
-        for (idx, path) in self.files.iter().enumerate() {
-            let current_time = current_mtimes[idx];
-            let previous_time = self.mtimes.insert(path.clone(), current_time);
-
-            let should_scan_file = match previous_time {
-                // Time has changed, so we need to re-scan the file
-                Some(prev) if prev != current_time => true,
-
-                // File was in the cache, no need to re-scan
-                Some(_) => false,
-
-                // File didn't exist before, so we need to scan it
-                None => true,
-            };
-
-            if should_scan_file {
-                changed_content.push(ChangedContent {
-                    file: Some(path.clone()),
-                    content: None,
-                });
-            }
-        }
-
-        if !changed_content.is_empty() {
-            let candidates = parse_all_blobs(read_all_files(changed_content));
-            self.candidates.par_extend(candidates);
-        }
-    }
-
-    // Ensures that all files/globs are resolved and the scanner is ready to scan
-    // content for candidates.
-    fn prepare(&mut self) {
-        if self.ready {
-            self.check_for_new_files();
-            return;
-        }
-
-        self.scan_sources();
-
-        self.ready = true;
-    }
-
-    #[tracing::instrument(skip_all)]
-    fn check_for_new_files(&mut self) {
-        let current_mtimes = self
-            .dirs
-            .par_iter()
-            .map(|path| {
-                fs::metadata(path)
-                    .and_then(|m| m.modified())
-                    .unwrap_or(SystemTime::now())
-            })
-            .collect::<Vec<_>>();
-
-        let mut modified_dirs: Vec<PathBuf> = vec![];
-
-        // Check all directories to see if they were modified
-        for (idx, path) in self.dirs.iter().enumerate() {
-            let current_time = current_mtimes[idx];
-            let previous_time = self.mtimes.insert(path.clone(), current_time);
-
-            let should_scan = match previous_time {
-                // Time has changed, so we need to re-scan the file
-                Some(prev) if prev != current_time => true,
-
-                // File was in the cache, no need to re-scan
-                Some(_) => false,
-
-                // File didn't exist before, so we need to scan it
-                None => true,
-            };
-
-            if should_scan {
-                modified_dirs.push(path.clone());
-            }
-        }
-
-        // Scan all modified directories for their immediate files
-        let mut known = FxHashSet::from_iter(self.files.iter().chain(self.dirs.iter()).cloned());
-
-        while !modified_dirs.is_empty() {
-            let new_entries = modified_dirs
-                .iter()
-                .flat_map(|dir| read_dir(dir, Some(1)))
-                .map(|entry| entry.path().to_owned())
-                .filter(|path| !known.contains(path))
-                .collect::<Vec<_>>();
-
-            modified_dirs.clear();
-
-            for path in new_entries {
-                if path.is_file() {
-                    known.insert(path.clone());
-                    self.files.push(path);
-                } else if path.is_dir() {
-                    known.insert(path.clone());
-                    self.dirs.push(path.clone());
-
-                    // Recursively scan the new directory for files
-                    modified_dirs.push(path);
-                }
-            }
-        }
-    }
-
-    #[tracing::instrument(skip_all)]
-    fn scan_sources(&mut self) {
-        let Some(sources) = &self.sources else {
-            return;
-        };
-
-        if sources.is_empty() {
-            return;
-        }
-
-        // Expand glob patterns and create new `GlobEntry` instances for each expanded pattern.
-        let sources = sources
-            .iter()
-            .flat_map(|source| {
-                let expression: Result<Expression, _> = source.pattern[..].try_into();
-                let Ok(expression) = expression else {
-                    return vec![source.clone()];
-                };
-
-                expression
-                    .into_iter()
-                    .filter_map(Result::ok)
-                    .map(move |pattern| GlobEntry {
-                        base: source.base.clone(),
-                        pattern: pattern.into(),
-                    })
-                    .collect::<Vec<_>>()
-            })
-            .collect::<Vec<_>>();
-
-        // Partition sources into sources that should be promoted to auto source detection and
-        // sources that should be resolved as globs.
-        let (auto_sources, glob_sources): (Vec<_>, Vec<_>) = sources.iter().partition(|source| {
-            // If a glob ends with `/**/*`, then we just want to register the base path as a new
-            // base. Essentially converting it to use auto source detection.
-            if source.pattern.ends_with("**/*") {
-                return true;
-            }
-
-            // Directories should be promoted to auto source detection
-            if PathBuf::from(&source.base).join(&source.pattern).is_dir() {
-                return true;
-            }
-
-            false
-        });
-
-        fn join_paths(a: &str, b: &str) -> PathBuf {
-            let mut tmp = a.to_owned();
-            let b = b.trim_end_matches("**/*").trim_end_matches('/');
-
-            if b.starts_with('/') {
-                return PathBuf::from(b);
-            }
-
-            // On Windows a path like C:/foo.txt is absolute but C:foo.txt is not
-            // (the 2nd is relative to the CWD)
-            if b.chars().nth(1) == Some(':') && b.chars().nth(2) == Some('/') {
-                return PathBuf::from(b);
-            }
-
-            tmp += "/";
-            tmp += b;
-
-            PathBuf::from(&tmp)
-        }
-
-        for path in auto_sources.iter().filter_map(|source| {
-            dunce::canonicalize(join_paths(&source.base, &source.pattern)).ok()
-        }) {
-            // Insert a glob for the base path, so we can see new files/folders in the directory itself.
-            self.globs.push(GlobEntry {
-                base: path.to_string_lossy().into(),
-                pattern: "*".into(),
-            });
-
-            // Detect all files/folders in the directory
-            let detect_sources = DetectSources::new(path);
-
-            let (files, globs, dirs) = detect_sources.detect();
-            self.files.extend(files);
-            self.globs.extend(globs);
-            self.dirs.extend(dirs);
-        }
-
-        // Turn `Vec<&GlobEntry>` in `Vec<GlobEntry>`
-        let glob_sources: Vec<_> = glob_sources.into_iter().cloned().collect();
-        let hoisted = hoist_static_glob_parts(&glob_sources);
-
-        for source in &hoisted {
-            // If the pattern is empty, then the base points to a specific file or folder already
-            // if it doesn't contain any dynamic parts. In that case we can use the base as the
-            // pattern.
-            //
-            // Otherwise we need to combine the base and the pattern, otherwise a pattern that
-            // looks like `*.html`, will never match a path that looks like
-            // `/my-project/project-a/index.html`, because it contains `/`.
-            //
-            // We can't prepend `**/`, because then `/my-project/project-a/nested/index.html` would
-            // match as well.
-            //
-            // Instead we combine the base and the pattern as a single glob pattern.
-            let mut full_pattern = source.base.clone().replace('\\', "/");
-
-            if !source.pattern.is_empty() {
-                full_pattern.push('/');
-                full_pattern.push_str(&source.pattern);
-            }
-
-            let base = PathBuf::from(&source.base);
-            for entry in resolve_paths(&base) {
-                let Some(file_type) = entry.file_type() else {
-                    continue;
-                };
-
-                if !file_type.is_file() {
-                    continue;
-                }
-
-                let file_path = entry.into_path();
-
-                let Some(file_path_str) = file_path.to_str() else {
-                    continue;
-                };
-
-                let file_path_str = file_path_str.replace('\\', "/");
-
-                if glob_match(&full_pattern, &file_path_str) {
-                    self.files.push(file_path);
-                }
-            }
-        }
-
-        self.globs.extend(hoisted);
-
-        // Re-optimize the globs to reduce the number of patterns we have to scan.
-        self.globs = optimize_patterns(&self.globs);
-    }
-}
-
-fn read_changed_content(c: ChangedContent) -> Option<Vec<u8>> {
-    if let Some(content) = c.content {
-        return Some(content.into_bytes());
-    }
-
-    let Some(file) = c.file else {
-        return Default::default();
-    };
-
-    let Ok(content) = std::fs::read(&file).map_err(|e| {
-        event!(tracing::Level::ERROR, "Failed to read file: {:?}", e);
-        e
-    }) else {
-        return Default::default();
-    };
-
-    let Some(extension) = file.extension().map(|x| x.to_str()) else {
-        return Some(content);
-    };
-
-    match extension {
-        Some("svelte") => Some(content.replace(" class:", " ")),
-        _ => Some(content),
-    }
-}
-
-#[tracing::instrument(skip_all)]
-fn read_all_files(changed_content: Vec<ChangedContent>) -> Vec<Vec<u8>> {
-    event!(
-        tracing::Level::INFO,
-        "Reading {:?} file(s)",
-        changed_content.len()
-    );
-
-    changed_content
-        .into_par_iter()
-        .filter_map(read_changed_content)
-        .collect()
-}
-
-#[tracing::instrument(skip_all)]
-fn parse_all_blobs(blobs: Vec<Vec<u8>>) -> Vec<String> {
-    let mut result: Vec<_> = blobs
-        .par_iter()
-        .flat_map(|blob| blob.par_split(|x| matches!(x, b'\n')))
-        .map(|blob| Extractor::unique(blob, Default::default()))
-        .reduce(Default::default, |mut a, b| {
-            a.extend(b);
-            a
-        })
-        .into_iter()
-        .map(|s| {
-            // SAFETY: When we parsed the candidates, we already guaranteed that the byte slices
-            // are valid, therefore we don't have to re-check here when we want to convert it back
-            // to a string.
-            unsafe { String::from_utf8_unchecked(s.to_vec()) }
-        })
-        .collect();
-
-    result.par_sort();
-    result
-}
+pub use glob::GlobEntry;
+pub use scanner::sources::PublicSourceEntry;
+pub use scanner::ChangedContent;
+pub use scanner::Scanner;
diff --git a/crates/oxide/src/main.rs b/crates/oxide/src/main.rs
new file mode 100644
index 000000000..1fa2918af
--- /dev/null
+++ b/crates/oxide/src/main.rs
@@ -0,0 +1,65 @@
+use std::hint::black_box;
+use tailwindcss_oxide::cursor::Cursor;
+use tailwindcss_oxide::extractor::machine::{Machine, MachineState};
+use tailwindcss_oxide::extractor::{Extracted, Extractor};
+use tailwindcss_oxide::throughput::Throughput;
+
+fn run_full_extractor(input: &[u8]) -> Vec<&[u8]> {
+    Extractor::new(input)
+        .extract()
+        .into_iter()
+        .map(|x| match x {
+            Extracted::Candidate(bytes) => bytes,
+            Extracted::CssVariable(bytes) => bytes,
+        })
+        .collect::<Vec<_>>()
+}
+
+fn _run_machine<T: Machine>(input: &[u8]) -> Vec<&[u8]> {
+    let len = input.len();
+    let mut machine = T::default();
+    let mut cursor = Cursor::new(input);
+    let mut result = Vec::with_capacity(25);
+
+    while cursor.pos < len {
+        if let MachineState::Done(span) = machine.next(&mut cursor) {
+            result.push(span.slice(input));
+        }
+
+        cursor.advance();
+    }
+
+    result
+}
+
+fn run(input: &[u8]) -> Vec<&[u8]> {
+    // _run_machine::<tailwindcss_oxide::extractor::arbitrary_property_machine::ArbitraryPropertyMachine>(input)
+    // _run_machine::<tailwindcss_oxide::extractor::arbitrary_value_machine::ArbitraryValueMachine>(input)
+    // _run_machine::<tailwindcss_oxide::extractor::arbitrary_variable_machine::ArbitraryVariableMachine>(input)
+    // _run_machine::<tailwindcss_oxide::extractor::candidate_machine::CandidateMachine>(input)
+    // _run_machine::<tailwindcss_oxide::extractor::css_variable_machine::CssVariableMachine>(input)
+    // _run_machine::<tailwindcss_oxide::extractor::modifier_machine::ModifierMachine>(input)
+    // _run_machine::<tailwindcss_oxide::extractor::named_utility_machine::NamedUtilityMachine>(input)
+    // _run_machine::<tailwindcss_oxide::extractor::named_variant_machine::NamedVariantMachine>(input)
+    // _run_machine::<tailwindcss_oxide::extractor::string_machine::StringMachine>(input)
+    // _run_machine::<tailwindcss_oxide::extractor::utility_machine::UtilityMachine>(input)
+    // _run_machine::<tailwindcss_oxide::extractor::variant_machine::VariantMachine>(input)
+
+    run_full_extractor(input)
+}
+
+fn main() {
+    let iterations = 10_000;
+    let input = include_bytes!("./fixtures/example.html");
+
+    let throughput = Throughput::compute(iterations, input.len(), || {
+        _ = black_box(
+            input
+                .split(|x| *x == b'\n')
+                .flat_map(run)
+                .collect::<Vec<_>>(),
+        );
+    });
+
+    eprintln!("Extractor: {:}", throughput);
+}
diff --git a/crates/oxide/src/parser.rs b/crates/oxide/src/parser.rs
deleted file mode 100644
index 281774261..000000000
--- a/crates/oxide/src/parser.rs
+++ /dev/null
@@ -1,1637 +0,0 @@
-use crate::{cursor::Cursor, fast_skip::fast_skip};
-use bstr::ByteSlice;
-use fxhash::FxHashSet;
-use tracing::trace;
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub enum ParseAction<'a> {
-    Consume,
-    Skip,
-    RestartAt(usize),
-
-    SingleCandidate(&'a [u8]),
-    MultipleCandidates(Vec<&'a [u8]>),
-    Done,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub enum Bracketing<'a> {
-    Included(&'a [u8]),
-    Wrapped(&'a [u8]),
-    None,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub struct SplitCandidate<'a> {
-    variant: &'a [u8],
-    utility: &'a [u8],
-}
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum ValidationResult {
-    Invalid,
-    Valid,
-    Restart,
-}
-
-#[derive(Default)]
-pub struct ExtractorOptions {
-    pub preserve_spaces_in_arbitrary: bool,
-}
-
-#[derive(Debug, PartialEq, Eq, Clone)]
-enum Arbitrary {
-    /// Not inside any arbitrary value
-    None,
-
-    /// In arbitrary value mode with square brackets
-    ///
-    /// E.g.: `bg-[…]`
-    ///           ^
-    Brackets { start_idx: usize },
-
-    /// In arbitrary value mode with parens
-    ///
-    /// E.g.: `bg-(…)`
-    ///           ^
-    Parens { start_idx: usize },
-}
-
-pub struct Extractor<'a> {
-    opts: ExtractorOptions,
-
-    input: &'a [u8],
-    cursor: Cursor<'a>,
-
-    idx_start: usize,
-    idx_end: usize,
-    idx_last: usize,
-
-    arbitrary: Arbitrary,
-
-    in_candidate: bool,
-    in_escape: bool,
-
-    discard_next: bool,
-
-    quote_stack: Vec<u8>,
-    bracket_stack: Vec<u8>,
-}
-
-impl<'a> Extractor<'a> {
-    pub fn all(input: &'a [u8], opts: ExtractorOptions) -> Vec<&'a [u8]> {
-        Self::new(input, opts).flatten().collect()
-    }
-
-    pub fn unique(input: &'a [u8], opts: ExtractorOptions) -> FxHashSet<&'a [u8]> {
-        let mut candidates: FxHashSet<&[u8]> = Default::default();
-        candidates.reserve(100);
-        candidates.extend(Self::new(input, opts).flatten());
-        candidates
-    }
-
-    pub fn unique_ord(input: &'a [u8], opts: ExtractorOptions) -> Vec<&'a [u8]> {
-        // This is an inefficient way to get an ordered, unique
-        // list as a Vec but it is only meant for testing.
-        let mut candidates = Self::all(input, opts);
-        let mut unique_list = FxHashSet::default();
-        unique_list.reserve(candidates.len());
-        candidates.retain(|c| unique_list.insert(*c));
-
-        candidates
-    }
-
-    pub fn with_positions(input: &'a [u8], opts: ExtractorOptions) -> Vec<(&'a [u8], usize)> {
-        let mut result = Vec::new();
-        let extractor = Self::new(input, opts).flatten();
-        for item in extractor {
-            // Since the items are slices of the input buffer, we can calculate the start index
-            // by doing some pointer arithmetics.
-            let start_index = item.as_ptr() as usize - input.as_ptr() as usize;
-            result.push((item, start_index));
-        }
-        result
-    }
-}
-
-impl<'a> Extractor<'a> {
-    pub fn new(input: &'a [u8], opts: ExtractorOptions) -> Self {
-        Self {
-            opts,
-            input,
-            cursor: Cursor::new(input),
-
-            idx_start: 0,
-            idx_end: 0,
-
-            arbitrary: Arbitrary::None,
-            in_candidate: false,
-            in_escape: false,
-
-            discard_next: false,
-
-            idx_last: input.len(),
-            quote_stack: Vec::with_capacity(8),
-            bracket_stack: Vec::with_capacity(8),
-        }
-    }
-}
-
-/// Helpers
-impl<'a> Extractor<'a> {
-    #[inline(always)]
-    fn in_quotes(&self) -> bool {
-        !self.quote_stack.is_empty()
-    }
-
-    #[inline(always)]
-    fn get_current_candidate(&mut self) -> ParseAction<'a> {
-        if self.discard_next {
-            return ParseAction::Skip;
-        }
-
-        let mut candidate = &self.input[self.idx_start..=self.idx_end];
-
-        // The bracket stack is not empty, which means that we are dealing with unbalanced
-        // brackets.
-        if !self.bracket_stack.is_empty() {
-            return ParseAction::Skip;
-        }
-
-        while !candidate.is_empty() {
-            match Extractor::is_valid_candidate_string(candidate) {
-                ValidationResult::Valid => return ParseAction::SingleCandidate(candidate),
-                ValidationResult::Restart => return ParseAction::RestartAt(self.idx_start + 1),
-                _ => {}
-            }
-
-            match candidate.split_last() {
-                // At this point the candidate is technically invalid, however it can be that it
-                // has a few dangling characters attached to it. For example, think about a
-                // JavaScript object:
-                //
-                // ```js
-                // { underline: true }
-                // ```
-                //
-                // The candidate at this point will be `underline:`, which is invalid. However, we
-                // can assume in this case that the `:` should not be there, and therefore we can
-                // try to slice it off and retry the validation.
-                Some((b':' | b'/' | b'.', head)) => {
-                    candidate = head;
-                }
-
-                // It could also be that we have the candidate is nested inside of bracket or quote
-                // pairs. In this case we want to retrieve the inner part and try to validate that
-                // inner part instead. For example, in a JavaScript array:
-                //
-                // ```js
-                // let myClasses = ["underline"]
-                // ```
-                //
-                // The `underline` is nested inside of quotes and in square brackets. Let's try to
-                // get the inner part and validate that instead.
-                _ => match Self::slice_surrounding(candidate) {
-                    Some(shorter) if shorter != candidate => {
-                        candidate = shorter;
-                    }
-                    _ => break,
-                },
-            }
-        }
-
-        ParseAction::Consume
-    }
-
-    #[inline(always)]
-    fn split_candidate(candidate: &'a [u8]) -> SplitCandidate {
-        let mut brackets = 0;
-        let mut idx_end = 0;
-
-        for (n, c) in candidate.iter().enumerate() {
-            match c {
-                b'[' => brackets += 1,
-                b']' if brackets > 0 => brackets -= 1,
-                b':' if brackets == 0 => idx_end = n + 1,
-                _ => {}
-            }
-        }
-
-        SplitCandidate {
-            variant: &candidate[0..idx_end],
-            utility: &candidate[idx_end..],
-        }
-    }
-
-    #[inline(always)]
-    fn contains_in_constrained(candidate: &'a [u8], bytes: Vec<u8>) -> bool {
-        let mut brackets = 0;
-
-        for c in candidate {
-            match c {
-                b'[' => brackets += 1,
-                b']' if brackets > 0 => brackets -= 1,
-                _ if brackets == 0 && bytes.contains(c) => return true,
-                _ => {}
-            }
-        }
-
-        false
-    }
-
-    #[inline(always)]
-    fn is_valid_candidate_string(candidate: &'a [u8]) -> ValidationResult {
-        // Reject candidates that start with a capital letter
-        if candidate[0].is_ascii_uppercase() {
-            return ValidationResult::Invalid;
-        }
-
-        // Rejects candidates that end with "-" or "_"
-        if candidate.ends_with(b"-") || candidate.ends_with(b"_") {
-            return ValidationResult::Invalid;
-        }
-
-        // Reject candidates that are single camelCase words, e.g.: `useEffect`
-        if candidate.iter().all(|c| c.is_ascii_alphanumeric())
-            && candidate.iter().any(|c| c.is_ascii_uppercase())
-        {
-            return ValidationResult::Invalid;
-        }
-
-        // Reject candidates that look like SVG path data, e.g.: `m32.368 m7.5`
-        if !candidate.contains(&b'-')
-            && !candidate.contains(&b':')
-            && candidate.iter().any(|c| c == &b'.')
-        {
-            return ValidationResult::Invalid;
-        }
-
-        // Reject candidates that look like version constraints or email addresses, e.g.: `next@latest`, `bob@example.com`
-        if candidate
-            .iter()
-            .all(|c| c.is_ascii_alphanumeric() || c == &b'.' || c == &b'-' || c == &b'@')
-            && candidate[1..].contains(&b'@')
-        {
-            return ValidationResult::Invalid;
-        }
-
-        // Reject candidates that look like URLs
-        if candidate.starts_with(b"http://") || candidate.starts_with(b"https://") {
-            return ValidationResult::Invalid;
-        }
-
-        // Reject candidates that look short markdown links, e.g.: `[https://example.com]`
-        if candidate.starts_with(b"[http://") || candidate.starts_with(b"[https://") {
-            return ValidationResult::Invalid;
-        }
-
-        // Reject candidates that look like imports with path aliases, e.g.: `@/components/button`
-        if candidate.len() > 1 && candidate[1] == b'/' {
-            return ValidationResult::Invalid;
-        }
-
-        // Reject candidates that look like paths, e.g.: `app/assets/stylesheets`
-        if !candidate.contains(&b':') && !candidate.contains(&b'[') {
-            let mut count = 0;
-            for c in candidate {
-                if c == &b'/' {
-                    count += 1;
-                }
-                if count > 1 {
-                    return ValidationResult::Invalid;
-                }
-            }
-        }
-
-        let split_candidate = Extractor::split_candidate(candidate);
-
-        let mut offset = 0;
-        let mut offset_end = 0;
-        let utility = &split_candidate.utility;
-        let original_utility = &utility;
-
-        // Some special cases that we can ignore while validating
-        if utility.starts_with(b"!-") {
-            offset += 2;
-        } else if utility.starts_with(b"!") || utility.starts_with(b"-") {
-            offset += 1;
-        } else if utility.ends_with(b"!") {
-            offset_end += 1;
-        }
-
-        // These are allowed in arbitrary values and in variants but nowhere else
-        if Extractor::contains_in_constrained(utility, vec![b'<', b'>']) {
-            return ValidationResult::Restart;
-        }
-
-        // It's an arbitrary property
-        if utility.starts_with(b"[")
-            && utility.ends_with(b"]")
-            && (utility.starts_with(b"['")
-                || utility.starts_with(b"[\"")
-                || utility.starts_with(b"[`"))
-        {
-            return ValidationResult::Restart;
-        }
-
-        // Pluck out the part that we are interested in.
-        let utility = &utility[offset..(utility.len() - offset_end)];
-
-        // Validations
-        // We should have _something_
-        if utility.is_empty() {
-            return ValidationResult::Invalid;
-        }
-
-        // <sm is fine, but only as a variant
-        // TODO: We probably have to ensure that this `:` is not inside the arbitrary values...
-        if utility.starts_with(b"<") && !utility.contains(&b':') {
-            return ValidationResult::Invalid;
-        }
-
-        // Only variants can start with a number. E.g.: `2xl` is fine, but only as a variant.
-        // TODO: Adjust this if we run into issues with actual utilities starting with a number?
-        // TODO: We probably have to ensure that this `:` is not inside the arbitrary values...
-        if utility[0] >= b'0' && utility[0] <= b'9' && !utility.contains(&b':') {
-            return ValidationResult::Invalid;
-        }
-
-        // In case of an arbitrary property, we should have at least this structure: [a:b]
-        if utility.starts_with(b"[") && utility.ends_with(b"]") {
-            // [a:b] is at least 5 characters long
-            if utility.len() < 5 {
-                return ValidationResult::Invalid;
-            }
-
-            // Now that we validated that the candidate is technically fine, let's ensure that it
-            // doesn't start with a `-` because that would make it invalid for arbitrary properties.
-            if original_utility.starts_with(b"-") || original_utility.starts_with(b"!-") {
-                return ValidationResult::Invalid;
-            }
-
-            // Make sure an arbitrary property/value pair is valid, otherwise
-            // we may generate invalid CSS that will cause tools like PostCSS
-            // to crash when trying to parse the generated CSS.
-            if !Self::validate_arbitrary_property(utility) {
-                return ValidationResult::Invalid;
-            }
-
-            // The ':` must be preceded by a-Z0-9 because it represents a property name.
-            // SAFETY: the Self::validate_arbitrary_property function from above validates that the
-            //         `:` exists.
-            let colon = utility.find(":").unwrap();
-
-            if !utility
-                .chars()
-                .nth(colon - 1)
-                .map_or_else(|| false, |c| c.is_ascii_alphanumeric())
-            {
-                return ValidationResult::Invalid;
-            }
-
-            let property = &utility[1..colon];
-
-            // The property must match /^[a-zA-Z-][a-zA-Z0-9-_]+$/
-            if !property[0].is_ascii_alphabetic() && property[0] != b'-' {
-                return ValidationResult::Invalid;
-            }
-
-            if !property
-                .iter()
-                .all(|c| c.is_ascii_alphanumeric() || c == &b'-' || c == &b'_')
-            {
-                return ValidationResult::Invalid;
-            }
-        }
-
-        ValidationResult::Valid
-    }
-
-    /**
-     * Make sure an arbitrary property/value pair is valid, otherwise
-     * PostCSS may crash when trying to parse the generated CSS.
-     *
-     * `input` - the full candidate string, including the brackets
-     */
-    fn validate_arbitrary_property(candidate: &[u8]) -> bool {
-        if !candidate.starts_with(b"[") || !candidate.ends_with(b"]") {
-            return false;
-        }
-        let property = &candidate[1..candidate.len() - 1];
-        let is_custom_property = property.starts_with(b"--");
-        let Some(colon_pos) = property.find(b":") else {
-            return false;
-        };
-        if is_custom_property {
-            return true;
-        }
-
-        let mut stack = vec![];
-        let mut iter = property[colon_pos + 1..].iter();
-        while let Some(c) = iter.next() {
-            match c {
-                // The value portion cannot contain unquoted colons.
-                // E.g. `[foo::bar]` leads to "foo::bar; which errors because of the `:`.
-                b':' | b'{' | b'}' if stack.is_empty() => {
-                    return false;
-                }
-
-                b'\'' => {
-                    if let Some(b'\'') = stack.last() {
-                        _ = stack.pop()
-                    } else {
-                        stack.push(b'\'')
-                    }
-                }
-                b'"' => {
-                    if let Some(b'"') = stack.last() {
-                        _ = stack.pop()
-                    } else {
-                        stack.push(b'"')
-                    }
-                }
-
-                // Skip escaped characters.
-                b'\\' => {
-                    iter.next();
-                }
-
-                _ => {}
-            }
-        }
-
-        true
-    }
-
-    #[inline(always)]
-    fn parse_escaped(&mut self) -> ParseAction<'a> {
-        // If this character is escaped, we don't care about it.
-        // It gets consumed.
-        trace!("Escape::Consume");
-
-        self.in_escape = false;
-
-        ParseAction::Consume
-    }
-
-    #[inline(always)]
-    fn parse_arbitrary(&mut self) -> ParseAction<'a> {
-        // In this we could technically use memchr 6 times (then looped) to find the indexes / bounds of arbitrary values
-        if self.in_escape {
-            return self.parse_escaped();
-        }
-
-        match self.cursor.curr {
-            b'\\' => {
-                // The `\` character is used to escape characters in arbitrary content _and_ to prevent the starting of arbitrary content
-                trace!("Arbitrary::Escape");
-                self.in_escape = true;
-            }
-
-            b'(' => self.bracket_stack.push(self.cursor.curr),
-            b')' => match self.bracket_stack.last() {
-                Some(&b'(') => {
-                    self.bracket_stack.pop();
-                }
-
-                // This is the last bracket meaning the end of arbitrary content
-                _ if !self.in_quotes() => {
-                    if matches!(self.cursor.next, b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9') {
-                        return ParseAction::Consume;
-                    }
-
-                    if let Arbitrary::Parens { start_idx } = self.arbitrary {
-                        trace!("Arbitrary::End\t");
-                        self.arbitrary = Arbitrary::None;
-
-                        if self.cursor.pos - start_idx == 1 {
-                            // We have an empty arbitrary value, which is not allowed
-                            return ParseAction::Skip;
-                        }
-
-                        // We have a valid arbitrary value
-                        return ParseAction::Consume;
-                    }
-
-                    // Last parenthesis is different compared to what we expect, therefore we are
-                    // not in a valid arbitrary value.
-                    return ParseAction::Skip;
-                }
-
-                // We're probably in quotes or nested brackets, so we keep going
-                _ => {}
-            },
-
-            // Make sure the brackets are balanced
-            b'[' => self.bracket_stack.push(self.cursor.curr),
-            b']' => match self.bracket_stack.last() {
-                // We've ended a nested bracket
-                Some(&b'[') => {
-                    self.bracket_stack.pop();
-                }
-
-                // This is the last bracket meaning the end of arbitrary content
-                _ if !self.in_quotes() => {
-                    if matches!(self.cursor.next, b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9') {
-                        return ParseAction::Consume;
-                    }
-
-                    if let Arbitrary::Brackets { start_idx: _ } = self.arbitrary {
-                        trace!("Arbitrary::End\t");
-                        self.arbitrary = Arbitrary::None;
-
-                        // TODO: This is temporarily disabled such that the upgrade tool can work
-                        // with legacy arbitrary values. This will be re-enabled in the future (or
-                        // with a flag)
-                        // if self.cursor.pos - start_idx == 1 {
-                        //     // We have an empty arbitrary value, which is not allowed
-                        //     return ParseAction::Skip;
-                        // }
-                    }
-                }
-
-                // We're probably in quotes or nested brackets, so we keep going
-                _ => {}
-            },
-
-            // Arbitrary values sometimes contain quotes
-            // These can "escape" the arbitrary value mode
-            // switching of `[` and `]` characters
-            b'"' | b'\'' | b'`' => match self.quote_stack.last() {
-                Some(&last_quote) if last_quote == self.cursor.curr => {
-                    trace!("Quote::End\t");
-                    self.quote_stack.pop();
-                }
-                _ => {
-                    trace!("Quote::Start\t");
-                    self.quote_stack.push(self.cursor.curr);
-                }
-            },
-
-            c if c.is_ascii_whitespace() && !self.opts.preserve_spaces_in_arbitrary => {
-                trace!("Arbitrary::SkipAndEndEarly\t");
-
-                if let Arbitrary::Brackets { start_idx } | Arbitrary::Parens { start_idx } =
-                    self.arbitrary
-                {
-                    // Restart the parser ahead of the arbitrary value It may pick up more
-                    // candidates
-                    return ParseAction::RestartAt(start_idx + 1);
-                }
-            }
-
-            // Arbitrary values allow any character inside them
-            // Except spaces unless you are in loose mode
-            _ => {
-                trace!("Arbitrary::Consume\t");
-                // No need to move the end index because either the arbitrary value will end properly OR we'll hit invalid characters
-            }
-        }
-
-        ParseAction::Consume
-    }
-
-    #[inline(always)]
-    fn parse_start(&mut self) -> ParseAction<'a> {
-        match self.cursor.curr {
-            // Enter arbitrary property mode
-            b'[' => {
-                trace!("Arbitrary::Start\t");
-                self.arbitrary = Arbitrary::Brackets {
-                    start_idx: self.cursor.pos,
-                };
-
-                ParseAction::Consume
-            }
-
-            // Allowed first characters.
-            b'@' | b'!' | b'-' | b'<' | b'>' | b'0'..=b'9' | b'a'..=b'z' | b'A'..=b'Z' | b'*' => {
-                // TODO: A bunch of characters that we currently support but maybe we only want it behind
-                // a flag. E.g.: `<sm`
-                // | '$' | '^' | '_'
-
-                // When the new candidate is preceded by a `:`, then we want to keep parsing, but
-                // throw away the full candidate because it can not be a valid candidate at the end
-                // of the day.
-                if self.cursor.prev == b':' {
-                    self.discard_next = true;
-                }
-
-                trace!("Candidate::Start\t");
-
-                ParseAction::Consume
-            }
-
-            _ => ParseAction::Skip,
-        }
-    }
-
-    #[inline(always)]
-    fn parse_continue(&mut self) -> ParseAction<'a> {
-        match self.cursor.curr {
-            // Enter arbitrary value mode. E.g.: `bg-[rgba(0, 0, 0)]`
-            //                                       ^
-            b'[' if matches!(self.cursor.prev, b'@' | b'-' | b':' | b'/' | b'!' | b'\0')
-                || self.cursor.prev.is_ascii_whitespace() =>
-            {
-                trace!("Arbitrary::Start\t");
-                self.arbitrary = Arbitrary::Brackets {
-                    start_idx: self.cursor.pos,
-                };
-            }
-
-            // Enter arbitrary value mode. E.g.: `bg-(--my-color)`
-            //                                       ^
-            b'(' if matches!(self.cursor.prev, b'-' | b'/') => {
-                trace!("Arbitrary::Start\t");
-                self.arbitrary = Arbitrary::Parens {
-                    start_idx: self.cursor.pos,
-                };
-            }
-
-            // Can't enter arbitrary value mode. This can't be a candidate.
-            b'[' | b'(' => {
-                trace!("Arbitrary::Skip_Start\t");
-                return ParseAction::Skip;
-            }
-
-            // A % can only appear at the end of the candidate itself. It can also only be after a
-            // digit 0-9. This covers the following cases:
-            // - from-15%
-            b'%' if self.cursor.prev.is_ascii_digit() => {
-                return match (self.cursor.at_end, self.cursor.next) {
-                    // End of string == end of candidate == okay
-                    (true, _) => ParseAction::Consume,
-
-                    // Looks like the end of a candidate == okay
-                    (_, b'\'' | b'"' | b'`') => ParseAction::Consume,
-                    (_, c) if c.is_ascii_whitespace() => ParseAction::Consume,
-
-                    // Otherwise, not a valid character in a candidate
-                    _ => ParseAction::Skip,
-                };
-            }
-            b'%' => return ParseAction::Skip,
-
-            // < and > can only be part of a variant and only be the first or last character
-            b'<' | b'>' | b'*' => {
-                // Can only be the first or last character
-                //
-                // E.g.:
-                //
-                // - <sm:underline
-                //   ^
-                // - md>:underline
-                //     ^
-                if self.cursor.pos == self.idx_start || self.cursor.pos == self.idx_last {
-                    trace!("Candidate::Consume\t");
-                }
-                // If it is in the middle, it can only be part of a stacked variant
-                // - dark:<sm:underline
-                //        ^
-                // - dark:md>:underline
-                //          ^
-                else if self.cursor.prev == b':' || self.cursor.next == b':' {
-                    trace!("Candidate::Consume\t");
-                } else {
-                    return ParseAction::Skip;
-                }
-            }
-
-            // Allowed characters in the candidate itself
-            // None of these can come after a closing bracket `]`
-            b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9' | b'-' | b'_' | b'@'
-                if self.cursor.prev != b']' =>
-            {
-                /* TODO: The `b'@'` is necessary for custom separators like _@, maybe we can handle this in a better way... */
-                trace!("Candidate::Consume\t");
-            }
-
-            // A dot (.) can only appear in the candidate itself (not the arbitrary part), if the previous
-            // and next characters are both digits. This covers the following cases:
-            // - p-1.5
-            b'.' if self.cursor.prev.is_ascii_digit() => match self.cursor.next {
-                next if next.is_ascii_digit() => {
-                    trace!("Candidate::Consume\t");
-                }
-                _ => return ParseAction::Skip,
-            },
-
-            // Allowed characters in the candidate itself
-            // These MUST NOT appear at the end of the candidate
-            b'/' | b':' if !self.cursor.at_end => {
-                trace!("Candidate::Consume\t");
-            }
-
-            // The important character `!`, is allowed at the end of the candidate
-            b'!' => {
-                trace!("Candidate::Consume\t");
-            }
-
-            _ => return ParseAction::Skip,
-        }
-
-        ParseAction::Consume
-    }
-
-    #[inline(always)]
-    fn can_be_candidate(&mut self) -> bool {
-        self.in_candidate
-            && matches!(self.arbitrary, Arbitrary::None)
-            && (0..=127).contains(&self.cursor.curr)
-            && (self.idx_start == 0 || self.input[self.idx_start - 1] <= 127)
-    }
-
-    #[inline(always)]
-    fn handle_skip(&mut self) {
-        // In all other cases, we skip characters and reset everything so we can make new candidates
-        trace!("Characters::Skip\t");
-        self.idx_start = self.cursor.pos;
-        self.idx_end = self.cursor.pos;
-        self.in_candidate = false;
-        self.arbitrary = Arbitrary::None;
-        self.in_escape = false;
-    }
-
-    #[inline(always)]
-    fn parse_char(&mut self) -> ParseAction<'a> {
-        if !matches!(self.arbitrary, Arbitrary::None) {
-            self.parse_arbitrary()
-        } else if self.in_candidate {
-            self.parse_continue()
-        } else if self.parse_start() == ParseAction::Consume {
-            self.in_candidate = true;
-            self.idx_start = self.cursor.pos;
-            self.idx_end = self.cursor.pos;
-
-            ParseAction::Consume
-        } else {
-            ParseAction::Skip
-        }
-    }
-
-    #[inline(always)]
-    fn yield_candidate(&mut self) -> ParseAction<'a> {
-        if self.can_be_candidate() {
-            self.get_current_candidate()
-        } else {
-            ParseAction::Consume
-        }
-    }
-
-    #[inline(always)]
-    fn restart(&mut self, pos: usize) {
-        trace!("Parser::Restart\t{}", pos);
-
-        self.idx_start = pos;
-        self.idx_end = pos;
-
-        self.arbitrary = Arbitrary::None;
-        self.in_candidate = false;
-        self.in_escape = false;
-
-        self.discard_next = false;
-
-        self.quote_stack.clear();
-        self.bracket_stack.clear();
-        self.cursor.move_to(pos);
-    }
-
-    #[inline(always)]
-    fn without_surrounding(&self) -> Bracketing<'a> {
-        let range = self.idx_start..=self.idx_end;
-        let clipped = &self.input[range];
-
-        Self::slice_surrounding(clipped)
-            .map(Bracketing::Included)
-            .or_else(|| {
-                if self.idx_start == 0 || self.idx_end + 1 == self.idx_last {
-                    return None;
-                }
-
-                let range = self.idx_start - 1..=self.idx_end + 1;
-                let clipped = &self.input[range];
-                Self::slice_surrounding(clipped).map(Bracketing::Wrapped)
-            })
-            .unwrap_or(Bracketing::None)
-    }
-
-    #[inline(always)]
-    fn is_balanced(input: &[u8]) -> bool {
-        let mut depth = 0isize;
-
-        for n in input {
-            match n {
-                b'[' | b'{' | b'(' => depth += 1,
-                b']' | b'}' | b')' => depth -= 1,
-                _ => continue,
-            }
-
-            if depth < 0 {
-                return false;
-            }
-        }
-
-        depth == 0
-    }
-
-    #[inline(always)]
-    fn slice_surrounding(input: &[u8]) -> Option<&[u8]> {
-        let mut prev = None;
-        let mut input = input;
-
-        loop {
-            let leading = input.first().unwrap_or(&0x00);
-            let trailing = input.last().unwrap_or(&0x00);
-
-            let needed = matches!(
-                (leading, trailing),
-                (b'(', b')')
-                    | (b'{', b'}')
-                    | (b'[', b']')
-                    | (b'"', b'"')
-                    | (b'`', b'`')
-                    | (b'\'', b'\'')
-            );
-
-            if needed {
-                prev = Some(input);
-                input = &input[1..input.len() - 1];
-                continue;
-            }
-            if Self::is_balanced(input) && prev.is_some() {
-                return Some(input);
-            }
-            return prev;
-        }
-    }
-
-    #[inline(always)]
-    fn parse_and_yield(&mut self) -> ParseAction<'a> {
-        trace!("Cursor {}", self.cursor);
-
-        // Fast skipping of invalid characters
-        let can_skip_whitespace = false; // if self.opts.preserve_spaces_in_arbitrary { !self.in_arbitrary } else { true };
-        if can_skip_whitespace {
-            if let Some(pos) = fast_skip(&self.cursor) {
-                trace!("FastSkip::Restart\t{}", pos);
-                return ParseAction::RestartAt(pos);
-            }
-        }
-
-        let action = self.parse_char();
-
-        match action {
-            ParseAction::RestartAt(_) => return action,
-            ParseAction::Consume => {
-                self.idx_end = self.cursor.pos;
-
-                // If we're still consuming characters, we keep going
-                // Only exception is if we've hit the end of the input
-                if !self.cursor.at_end {
-                    return action;
-                }
-            }
-            _ => {}
-        }
-
-        let action = self.yield_candidate();
-
-        match (&action, self.cursor.curr) {
-            (ParseAction::RestartAt(_), _) => action,
-            (_, 0x00) => ParseAction::Done,
-            (ParseAction::SingleCandidate(candidate), _) => self.generate_slices(candidate),
-            _ => ParseAction::RestartAt(self.cursor.pos + 1),
-        }
-    }
-
-    /// Peek inside `[]`, `{}`, and `()` pairs
-    /// to look for an additional candidate
-    #[inline(always)]
-    fn generate_slices(&mut self, candidate: &'a [u8]) -> ParseAction<'a> {
-        match self.without_surrounding() {
-            Bracketing::None => ParseAction::SingleCandidate(candidate),
-            Bracketing::Included(sliceable) if sliceable == candidate => {
-                ParseAction::SingleCandidate(candidate)
-            }
-            Bracketing::Included(sliceable) | Bracketing::Wrapped(sliceable) => {
-                if candidate == sliceable {
-                    ParseAction::SingleCandidate(candidate)
-                } else {
-                    let parts = vec![candidate, sliceable];
-                    let parts = parts
-                        .into_iter()
-                        .filter(|v| !v.is_empty())
-                        .collect::<Vec<_>>();
-
-                    ParseAction::MultipleCandidates(parts)
-                }
-            }
-        }
-    }
-}
-
-impl<'a> Iterator for Extractor<'a> {
-    type Item = Vec<&'a [u8]>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.cursor.at_end {
-            return None;
-        }
-
-        loop {
-            let result = self.parse_and_yield();
-
-            // Cursor control
-            match result {
-                ParseAction::RestartAt(pos) => self.restart(pos),
-                _ => self.cursor.advance_by(1),
-            }
-
-            // Candidate state control
-            match result {
-                ParseAction::SingleCandidate(_) => self.handle_skip(),
-                ParseAction::MultipleCandidates(_) => self.handle_skip(),
-                _ => {}
-            }
-
-            // Iterator results
-            return match result {
-                ParseAction::SingleCandidate(candidate) => Some(vec![candidate]),
-                ParseAction::MultipleCandidates(candidates) => Some(candidates),
-                ParseAction::Done => None,
-                _ => continue,
-            };
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    fn _please_trace() {
-        tracing_subscriber::fmt()
-            .with_max_level(tracing::Level::TRACE)
-            .with_span_events(tracing_subscriber::fmt::format::FmtSpan::ACTIVE)
-            .compact()
-            .init();
-    }
-
-    fn run(input: &str, loose: bool) -> Vec<&str> {
-        Extractor::unique_ord(
-            input.as_bytes(),
-            ExtractorOptions {
-                preserve_spaces_in_arbitrary: loose,
-            },
-        )
-        .into_iter()
-        .map(|s| unsafe { std::str::from_utf8_unchecked(s) })
-        .collect()
-    }
-
-    #[test]
-    fn it_can_parse_simple_candidates() {
-        let candidates = run("underline", false);
-        assert_eq!(candidates, vec!["underline"]);
-    }
-
-    #[test]
-    fn it_can_parse_multiple_simple_utilities() {
-        let candidates = run("font-bold underline", false);
-        assert_eq!(candidates, vec!["font-bold", "underline"]);
-    }
-
-    #[test]
-    fn it_can_parse_simple_candidates_with_variants() {
-        let candidates = run("hover:underline", false);
-        assert_eq!(candidates, vec!["hover:underline"]);
-    }
-
-    #[test]
-    fn it_can_parse_start_variants() {
-        let candidates = run("*:underline", false);
-        assert_eq!(candidates, vec!["*:underline"]);
-
-        let candidates = run("hover:*:underline", false);
-        assert_eq!(candidates, vec!["hover:*:underline"]);
-    }
-
-    #[test]
-    fn it_can_parse_simple_candidates_with_stacked_variants() {
-        let candidates = run("focus:hover:underline", false);
-        assert_eq!(candidates, vec!["focus:hover:underline"]);
-    }
-
-    #[test]
-    fn it_can_parse_utilities_with_arbitrary_values() {
-        let candidates = run("m-[2px]", false);
-        assert_eq!(candidates, vec!["m-[2px]"]);
-    }
-
-    #[test]
-    fn it_can_parse_utilities_with_arbitrary_var_shorthand() {
-        let candidates = run("m-(--my-var)", false);
-        assert_eq!(candidates, vec!["m-(--my-var)"]);
-    }
-
-    #[test]
-    fn it_can_parse_utilities_with_arbitrary_var_shorthand_as_modifier() {
-        let candidates = run("bg-(--my-color)/(--my-opacity)", false);
-        assert_eq!(candidates, vec!["bg-(--my-color)/(--my-opacity)"]);
-    }
-
-    #[test]
-    fn it_throws_away_arbitrary_values_that_are_unbalanced() {
-        let candidates = run("m-[calc(100px*2]", false);
-        assert!(candidates.is_empty());
-    }
-
-    #[test]
-    fn it_can_parse_utilities_with_arbitrary_values_and_variants() {
-        let candidates = run("hover:m-[2px]", false);
-        assert_eq!(candidates, vec!["hover:m-[2px]"]);
-    }
-
-    #[test]
-    fn it_can_parse_arbitrary_variants() {
-        let candidates = run("[@media(min-width:200px)]:underline", false);
-        assert_eq!(candidates, vec!["[@media(min-width:200px)]:underline"]);
-    }
-
-    #[test]
-    fn it_can_parse_matched_variants() {
-        let candidates = run("group-[&:hover]:underline", false);
-        assert_eq!(candidates, vec!["group-[&:hover]:underline"]);
-    }
-
-    #[test]
-    fn it_should_not_keep_spaces() {
-        let candidates = run("bg-[rgba(0, 0, 0)]", false);
-
-        assert_eq!(candidates, vec!["rgba"]);
-    }
-
-    #[test]
-    fn it_should_keep_spaces_in_loose_mode() {
-        let candidates = run("bg-[rgba(0, 0, 0)]", true);
-        assert_eq!(candidates, vec!["bg-[rgba(0, 0, 0)]"]);
-    }
-
-    #[test]
-    fn it_should_keep_important_arbitrary_properties_legacy() {
-        let candidates = run("![foo:bar]", false);
-        assert_eq!(candidates, vec!["![foo:bar]"]);
-    }
-
-    #[test]
-    fn it_should_keep_important_arbitrary_properties() {
-        let candidates = run("[foo:bar]!", false);
-        assert_eq!(candidates, vec!["[foo:bar]!"]);
-    }
-
-    #[test]
-    fn it_should_keep_important_arbitrary_values() {
-        let candidates = run("w-[calc(var(--size)/2)]!", false);
-        assert_eq!(candidates, vec!["w-[calc(var(--size)/2)]!"]);
-    }
-
-    #[test]
-    fn it_should_keep_important_candidates_legacy() {
-        let candidates = run("!w-4", false);
-        assert_eq!(candidates, vec!["!w-4"]);
-    }
-
-    #[test]
-    fn it_should_keep_important_candidates() {
-        let candidates = run("w-4!", false);
-        assert_eq!(candidates, vec!["w-4!"]);
-    }
-
-    #[test]
-    fn it_should_not_allow_for_bogus_candidates() {
-        let candidates = run("[0]", false);
-        assert!(candidates.is_empty());
-
-        let candidates = run("[something]", false);
-        assert_eq!(candidates, vec!["something"]);
-
-        let candidates = run(" [feature(slice_as_chunks)]", false);
-        assert_eq!(candidates, vec!["feature(slice_as_chunks)"]);
-
-        let candidates = run("![feature(slice_as_chunks)]", false);
-        assert!(candidates.is_empty());
-
-        let candidates = run("-[feature(slice_as_chunks)]", false);
-        assert!(candidates.is_empty());
-
-        let candidates = run("!-[feature(slice_as_chunks)]", false);
-        assert!(candidates.is_empty());
-
-        let candidates = run("-[foo:bar]", false);
-        assert!(candidates.is_empty());
-
-        let candidates = run("!-[foo:bar]", false);
-        assert!(candidates.is_empty());
-    }
-
-    #[test]
-    fn it_should_keep_candidates_with_brackets_in_arbitrary_values_inside_quotes() {
-        let candidates = run("content-['hello_[_]_world']", false);
-        assert_eq!(candidates, vec!["content-['hello_[_]_world']"]);
-    }
-
-    #[test]
-    fn it_should_ignore_leading_spaces() {
-        let candidates = run("        backdrop-filter-none", false);
-        assert_eq!(candidates, vec!["backdrop-filter-none"]);
-    }
-
-    #[test]
-    fn it_should_ignore_trailing_spaces() {
-        let candidates = run("backdrop-filter-none        ", false);
-        assert_eq!(candidates, vec!["backdrop-filter-none"]);
-    }
-
-    #[test]
-    fn it_should_keep_classes_before_an_ending_newline() {
-        let candidates = run("backdrop-filter-none\n", false);
-        assert_eq!(candidates, vec!["backdrop-filter-none"]);
-    }
-
-    #[test]
-    fn it_should_parse_out_the_correct_classes_from_tailwind_tests() {
-        // From: tests/arbitrary-variants.test.js
-        let candidates = run(
-            r#"
-                <div class="dark:lg:hover:[&>*]:underline"></div>
-
-                <div class="[&_.foo\_\_bar]:hover:underline"></div>
-                <div class="hover:[&_.foo\_\_bar]:underline"></div>
-            "#,
-            false,
-        );
-        // TODO: it should not include additional (separate) classes: class, hover:, foo: bar, underline
-        // TODO: Double check the expectations based on above information
-        assert_eq!(
-            candidates,
-            vec![
-                "div",
-                "class",
-                r#"dark:lg:hover:[&>*]:underline"#,
-                r#"[&_.foo\_\_bar]:hover:underline"#,
-                r#"hover:[&_.foo\_\_bar]:underline"#
-            ]
-        );
-    }
-
-    #[test]
-    fn potential_candidates_are_skipped_when_hitting_impossible_characters() {
-        let candidates = run("        <p class=\"text-sm text-blue-700\">A new software update is available. See what’s new in version 2.0.4.</p>", false);
-        assert_eq!(
-            candidates,
-            vec![
-                "p",
-                "class",
-                "text-sm",
-                "text-blue-700",
-                // "A", // Uppercase first letter is not allowed
-                "new",
-                "software",
-                "update",
-                "is",
-                "available",
-                // "See", // Uppercase first letter is not allowed
-                // "what", // what is dropped because it is followed by the fancy: ’
-                // "s",    // s is dropped because it is preceded by the fancy: ’
-                // "new", // Already seen
-                "in",
-                "version",
-            ]
-        );
-    }
-
-    #[test]
-    fn ignores_arbitrary_property_ish_things() {
-        // FIXME: () are only valid in an arbitrary
-        let candidates = run(" [feature(slice_as_chunks)]", false);
-        assert_eq!(candidates, vec!["feature(slice_as_chunks)",]);
-    }
-
-    #[test]
-    fn foo_bar() {
-        // w[…] is not a valid pattern for part of candidate
-        // but @[] is (specifically in the context of a variant)
-
-        let candidates = run("%w[text-[#bada55]]", false);
-        assert_eq!(candidates, vec!["w", "text-[#bada55]"]);
-    }
-
-    #[test]
-    fn crash_001() {
-        let candidates = run("Aҿɿ[~5", false);
-        assert!(candidates.is_empty());
-    }
-
-    #[test]
-    fn crash_002() {
-        let candidates = run("", false);
-        assert!(candidates.is_empty());
-    }
-
-    #[test]
-    fn bad_001() {
-        let candidates = run("[杛杛]/", false);
-        assert_eq!(candidates, vec!["杛杛"]);
-    }
-
-    #[test]
-    fn bad_002() {
-        let candidates = run(r"[\]\\\:[]", false);
-        assert!(candidates.is_empty());
-    }
-
-    #[test]
-    fn bad_003() {
-        // TODO: This seems… wrong
-        let candidates = run(r"[𕤵:]", false);
-        assert_eq!(candidates, vec!["𕤵", "𕤵:",]);
-    }
-
-    #[test]
-    fn classes_in_js_arrays() {
-        let candidates = run(
-            r#"let classes = ['bg-black', 'hover:px-0.5', 'text-[13px]', '[--my-var:1_/_2]', '[.foo_&]:px-[0]', '[.foo_&]:[color:red]']">"#,
-            false,
-        );
-        assert_eq!(
-            candidates,
-            vec![
-                "let",
-                "classes",
-                "bg-black",
-                "hover:px-0.5",
-                "text-[13px]",
-                "[--my-var:1_/_2]",
-                "--my-var:1_/_2",
-                "[.foo_&]:px-[0]",
-                "[.foo_&]:[color:red]",
-            ]
-        );
-    }
-
-    #[test]
-    fn classes_in_js_arrays_without_spaces() {
-        let candidates = run(
-            r#"let classes = ['bg-black','hover:px-0.5','text-[13px]','[--my-var:1_/_2]','[.foo_&]:px-[0]','[.foo_&]:[color:red]']">"#,
-            false,
-        );
-        assert_eq!(
-            candidates,
-            vec![
-                "let",
-                "classes",
-                "bg-black",
-                "hover:px-0.5",
-                "text-[13px]",
-                "[--my-var:1_/_2]",
-                "--my-var:1_/_2",
-                "[.foo_&]:px-[0]",
-                "[.foo_&]:[color:red]",
-            ]
-        );
-    }
-
-    #[test]
-    fn classes_as_object_keys() {
-        let candidates = run(
-            r#"<div :class="{ underline: active, 'px-1.5': online }"></div>"#,
-            false,
-        );
-        assert_eq!(
-            candidates,
-            vec!["div", "underline", "active", "px-1.5", "online"]
-        );
-    }
-
-    #[test]
-    fn multiple_nested_candidates() {
-        let candidates = run(r#"{color:red}"#, false);
-        assert_eq!(candidates, vec!["color:red"]);
-    }
-
-    #[test]
-    fn percent_ended_candidates() {
-        let candidates = run(
-            r#"<!-- This should work `underline from-50% flex` -->"#,
-            false,
-        );
-        assert_eq!(
-            candidates,
-            vec!["should", "work", "underline", "from-50%", "flex",]
-        );
-    }
-
-    #[test]
-    fn candidate_cannot_start_with_uppercase_character() {
-        let candidates = run(r#"<div class="foo Bar baz"></div>"#, false);
-        assert_eq!(candidates, vec!["div", "class", "foo", "baz"]);
-    }
-
-    #[test]
-    fn candidate_cannot_end_with_a_dash() {
-        let candidates = run(r#"<div class="foo bar- baz"></div>"#, false);
-        assert_eq!(candidates, vec!["div", "class", "foo", "baz"]);
-    }
-
-    #[test]
-    fn candidate_cannot_end_with_an_underscore() {
-        let candidates = run(r#"<div class="foo bar_ baz"></div>"#, false);
-        assert_eq!(candidates, vec!["div", "class", "foo", "baz"]);
-    }
-
-    #[test]
-    fn candidate_cannot_be_a_single_camelcase_word() {
-        let candidates = run(r#"<div class="foo useEffect baz"></div>"#, false);
-        assert_eq!(candidates, vec!["div", "class", "foo", "baz"]);
-    }
-
-    #[test]
-    fn candidate_cannot_be_svg_path_data() {
-        let candidates = run(r#"<path d="M25.517 0C18.712">"#, false);
-        assert_eq!(candidates, vec!["path", "d"]);
-    }
-
-    #[test]
-    fn candidate_cannot_be_email_or_version_constraint() {
-        let candidates = run(r#"<div class="@container/dialog"> next@latest"#, false);
-        assert_eq!(candidates, vec!["div", "class", "@container/dialog"]);
-    }
-
-    #[test]
-    fn candidate_cannot_be_a_url() {
-        let candidates = run(
-            r#"Our website is https://example.com or http://example.com if you want a virus"#,
-            false,
-        );
-        assert_eq!(
-            candidates,
-            vec!["website", "is", "com", "or", "if", "you", "want", "a", "virus"]
-        );
-    }
-
-    #[test]
-    fn candidate_cannot_be_a_paths_with_aliases() {
-        let candidates = run(r#"import potato from '@/potato';"#, false);
-        assert_eq!(candidates, vec!["import", "potato", "from"]);
-    }
-
-    #[test]
-    fn candidate_cannot_be_a_path() {
-        let candidates = run(
-            r#"import potato from 'some/path/to/something';
-            import banana from '@/banana';"#,
-            false,
-        );
-        assert_eq!(candidates, vec!["import", "potato", "from", "banana"]);
-    }
-
-    #[test]
-    fn ruby_percent_formatted_strings() {
-        let candidates = run(r#"%w[hover:flex]"#, false);
-        assert_eq!(candidates, vec!["w", "hover:flex"]);
-    }
-
-    #[test]
-    fn urls_in_arbitrary_values_are_ok() {
-        let candidates = run(r#"<div class="bg-[url('/img/hero-pattern.svg')]">"#, false);
-        assert_eq!(
-            candidates,
-            vec!["div", "class", "bg-[url('/img/hero-pattern.svg')]"]
-        );
-    }
-
-    #[test]
-    fn colon_in_arbitrary_property_value() {
-        let candidates = run("[color::] #[test::foo]", false);
-        assert!(candidates
-            .iter()
-            .all(|candidate| !candidate.starts_with('[')));
-    }
-
-    #[test]
-    fn braces_in_arbitrary_property_value() {
-        let candidates = run("[color:${foo}] #[test:{foo}]", false);
-        assert!(candidates
-            .iter()
-            .all(|candidate| !candidate.starts_with('[')));
-    }
-
-    #[test]
-    fn quoted_colon_in_arbitrary_property_value() {
-        let candidates = run("[content:'bar:bar'] [content:\"bar:bar\"]", false);
-        assert!(candidates
-            .iter()
-            .any(|candidate| candidate == &"[content:'bar:bar']"));
-        assert!(candidates
-            .iter()
-            .any(|candidate| candidate == &"[content:\"bar:bar\"]"));
-    }
-
-    #[test]
-    fn quoted_braces_in_arbitrary_property_value() {
-        let candidates = run("[content:'{bar}'] [content:\"{bar}\"]", false);
-        assert!(candidates
-            .iter()
-            .any(|candidate| candidate == &"[content:'{bar}']"));
-        assert!(candidates
-            .iter()
-            .any(|candidate| candidate == &"[content:\"{bar}\"]"));
-    }
-
-    #[test]
-    fn colon_in_custom_property_value() {
-        let candidates = run("[--foo:bar:bar]", false);
-        assert!(candidates
-            .iter()
-            .any(|candidate| candidate == &"[--foo:bar:bar]"));
-    }
-
-    #[test]
-    fn braces_in_custom_property_value() {
-        let candidates = run("[--foo:{bar}]", false);
-        assert!(candidates
-            .iter()
-            .any(|candidate| candidate == &"[--foo:{bar}]"));
-    }
-
-    #[test]
-    fn candidate_slicing() {
-        let result = Extractor::slice_surrounding(&b".foo_&]:px-[0"[..])
-            .map(std::str::from_utf8)
-            .transpose()
-            .unwrap();
-        assert_eq!(result, None);
-
-        let result = Extractor::slice_surrounding(&b"[.foo_&]:px-[0]"[..])
-            .map(std::str::from_utf8)
-            .transpose()
-            .unwrap();
-        assert_eq!(result, Some("[.foo_&]:px-[0]"));
-
-        let result = Extractor::slice_surrounding(&b"{[.foo_&]:px-[0]}"[..])
-            .map(std::str::from_utf8)
-            .transpose()
-            .unwrap();
-        assert_eq!(result, Some("[.foo_&]:px-[0]"));
-
-        let result = Extractor::slice_surrounding(&b"![foo:bar]"[..])
-            .map(std::str::from_utf8)
-            .transpose()
-            .unwrap();
-        assert_eq!(result, None);
-
-        let result = Extractor::slice_surrounding(&b"[\"pt-1.5\"]"[..])
-            .map(std::str::from_utf8)
-            .transpose()
-            .unwrap();
-        assert_eq!(result, Some("pt-1.5"));
-
-        let count = 1_000;
-        let crazy = format!("{}[.foo_&]:px-[0]{}", "[".repeat(count), "]".repeat(count));
-
-        let result = Extractor::slice_surrounding(crazy.as_bytes())
-            .map(std::str::from_utf8)
-            .transpose()
-            .unwrap();
-        assert_eq!(result, Some("[.foo_&]:px-[0]"));
-    }
-
-    #[test]
-    fn does_not_emit_the_same_slice_multiple_times() {
-        let candidates: Vec<_> =
-            Extractor::with_positions("<div class=\"flex\"></div>".as_bytes(), Default::default())
-                .into_iter()
-                .map(|(s, p)| unsafe { (std::str::from_utf8_unchecked(s), p) })
-                .collect();
-
-        assert_eq!(candidates, vec![("div", 1), ("class", 5), ("flex", 12),]);
-    }
-
-    #[test]
-    fn empty_arbitrary_values_are_allowed_for_codemods() {
-        let candidates = run(
-            r#"<div class="group-[]:flex group-[]/name:flex peer-[]:flex peer-[]/name:flex"></div>"#,
-            false,
-        );
-        assert_eq!(
-            candidates,
-            vec![
-                "div",
-                "class",
-                "group-[]:flex",
-                "group-[]/name:flex",
-                "peer-[]:flex",
-                "peer-[]/name:flex"
-            ]
-        );
-    }
-
-    #[test]
-    fn simple_utility_names_with_numbers_work() {
-        let candidates = run(r#"<div class="h2 hz"></div>"#, false);
-        assert_eq!(candidates, vec!["div", "class", "h2", "hz",]);
-    }
-
-    #[test]
-    fn classes_in_an_array_without_whitespace() {
-        let candidates = run(
-            "let classes = ['bg-black','hover:px-0.5','text-[13px]','[--my-var:1_/_2]','[.foo_&]:px-[0]','[.foo_&]:[color:red]']",
-            false,
-        );
-
-        assert_eq!(
-            candidates,
-            vec![
-                "let",
-                "classes",
-                "bg-black",
-                "hover:px-0.5",
-                "text-[13px]",
-                "[--my-var:1_/_2]",
-                "--my-var:1_/_2",
-                "[.foo_&]:px-[0]",
-                "[.foo_&]:[color:red]",
-            ]
-        );
-    }
-
-    #[test]
-    fn classes_in_an_array_with_spaces() {
-        let candidates = run(
-            "let classes = ['bg-black', 'hover:px-0.5', 'text-[13px]', '[--my-var:1_/_2]', '[.foo_&]:px-[0]', '[.foo_&]:[color:red]']",
-            false,
-        );
-
-        assert_eq!(
-            candidates,
-            vec![
-                "let",
-                "classes",
-                "bg-black",
-                "hover:px-0.5",
-                "text-[13px]",
-                "[--my-var:1_/_2]",
-                "--my-var:1_/_2",
-                "[.foo_&]:px-[0]",
-                "[.foo_&]:[color:red]",
-            ]
-        );
-    }
-
-    #[test]
-    fn classes_in_an_array_with_tabs() {
-        let candidates = run(
-            "let classes = ['bg-black',\t'hover:px-0.5',\t'text-[13px]',\t'[--my-var:1_/_2]',\t'[.foo_&]:px-[0]',\t'[.foo_&]:[color:red]']",
-            false,
-        );
-
-        assert_eq!(
-            candidates,
-            vec![
-                "let",
-                "classes",
-                "bg-black",
-                "hover:px-0.5",
-                "text-[13px]",
-                "[--my-var:1_/_2]",
-                "--my-var:1_/_2",
-                "[.foo_&]:px-[0]",
-                "[.foo_&]:[color:red]",
-            ]
-        );
-    }
-
-    #[test]
-    fn classes_in_an_array_with_newlines() {
-        let candidates = run(
-            "let classes = [\n'bg-black',\n'hover:px-0.5',\n'text-[13px]',\n'[--my-var:1_/_2]',\n'[.foo_&]:px-[0]',\n'[.foo_&]:[color:red]'\n]",
-            false,
-        );
-
-        assert_eq!(
-            candidates,
-            vec![
-                "let",
-                "classes",
-                "bg-black",
-                "hover:px-0.5",
-                "text-[13px]",
-                "[--my-var:1_/_2]",
-                "--my-var:1_/_2",
-                "[.foo_&]:px-[0]",
-                "[.foo_&]:[color:red]",
-            ]
-        );
-    }
-}
diff --git a/crates/oxide/src/scanner/allowed_paths.rs b/crates/oxide/src/scanner/allowed_paths.rs
deleted file mode 100644
index 8a584d06f..000000000
--- a/crates/oxide/src/scanner/allowed_paths.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use ignore::{DirEntry, WalkBuilder};
-use std::{path::Path, sync};
-
-static BINARY_EXTENSIONS: sync::LazyLock<Vec<&'static str>> = sync::LazyLock::new(|| {
-    include_str!("fixtures/binary-extensions.txt")
-        .trim()
-        .lines()
-        .collect()
-});
-
-static IGNORED_EXTENSIONS: sync::LazyLock<Vec<&'static str>> = sync::LazyLock::new(|| {
-    include_str!("fixtures/ignored-extensions.txt")
-        .trim()
-        .lines()
-        .collect()
-});
-
-static IGNORED_FILES: sync::LazyLock<Vec<&'static str>> = sync::LazyLock::new(|| {
-    include_str!("fixtures/ignored-files.txt")
-        .trim()
-        .lines()
-        .collect()
-});
-
-static IGNORED_CONTENT_DIRS: sync::LazyLock<Vec<&'static str>> =
-    sync::LazyLock::new(|| vec![".git"]);
-
-#[tracing::instrument(skip_all)]
-pub fn resolve_allowed_paths(root: &Path) -> impl Iterator<Item = DirEntry> {
-    // Read the directory recursively with no depth limit
-    read_dir(root, None)
-}
-
-#[tracing::instrument(skip_all)]
-pub fn resolve_paths(root: &Path) -> impl Iterator<Item = DirEntry> {
-    WalkBuilder::new(root)
-        .hidden(false)
-        .require_git(false)
-        .build()
-        .filter_map(Result::ok)
-}
-
-pub fn read_dir(root: &Path, depth: Option<usize>) -> impl Iterator<Item = DirEntry> {
-    WalkBuilder::new(root)
-        .hidden(false)
-        .require_git(false)
-        .max_depth(depth)
-        .filter_entry(move |entry| match entry.file_type() {
-            Some(file_type) if file_type.is_dir() => match entry.file_name().to_str() {
-                Some(dir) => !IGNORED_CONTENT_DIRS.contains(&dir),
-                None => false,
-            },
-            Some(file_type) if file_type.is_file() || file_type.is_symlink() => {
-                is_allowed_content_path(entry.path())
-            }
-            _ => false,
-        })
-        .build()
-        .filter_map(Result::ok)
-}
-
-pub fn is_allowed_content_path(path: &Path) -> bool {
-    // Skip known ignored files
-    if path
-        .file_name()
-        .unwrap()
-        .to_str()
-        .map(|s| IGNORED_FILES.contains(&s))
-        .unwrap_or(false)
-    {
-        return false;
-    }
-
-    // Skip known ignored extensions
-    path.extension()
-        .map(|s| s.to_str().unwrap_or_default())
-        .map(|ext| !IGNORED_EXTENSIONS.contains(&ext) && !BINARY_EXTENSIONS.contains(&ext))
-        .unwrap_or(false)
-}
diff --git a/crates/oxide/src/scanner/auto_source_detection.rs b/crates/oxide/src/scanner/auto_source_detection.rs
new file mode 100644
index 000000000..0d723a1ab
--- /dev/null
+++ b/crates/oxide/src/scanner/auto_source_detection.rs
@@ -0,0 +1,71 @@
+use ignore::gitignore::{Gitignore, GitignoreBuilder};
+use std::sync;
+
+/// All the default rules for auto source detection.
+///
+/// This includes:
+///
+/// - Ignoring common content directories like `.git` and `node_modules`
+/// - Ignoring file extensions we definitely don't want to include like `.css` and `.scss`
+/// - Ignoring common binary file extensions like `.png` and `.jpg`
+/// - Ignoring common files like `yarn.lock` and `package-lock.json`
+///
+pub static RULES: sync::LazyLock<Vec<Gitignore>> = sync::LazyLock::new(|| {
+    let mut builder = GitignoreBuilder::new("");
+
+    builder.add_line(None, &IGNORED_CONTENT_DIRS_GLOB).unwrap();
+    builder.add_line(None, &IGNORED_EXTENSIONS_GLOB).unwrap();
+    builder.add_line(None, &IGNORED_FILES_GLOB).unwrap();
+
+    // Ensure these rules do not match on folder names
+    let mut file_only_builder = GitignoreBuilder::new("");
+    file_only_builder
+        .only_on_files(true)
+        .add_line(None, &BINARY_EXTENSIONS_GLOB)
+        .unwrap();
+
+    vec![builder.build().unwrap(), file_only_builder.build().unwrap()]
+});
+
+pub static IGNORED_CONTENT_DIRS: sync::LazyLock<Vec<&'static str>> = sync::LazyLock::new(|| {
+    include_str!("fixtures/ignored-content-dirs.txt")
+        .trim()
+        .lines()
+        .collect()
+});
+
+static IGNORED_CONTENT_DIRS_GLOB: sync::LazyLock<String> =
+    sync::LazyLock::new(|| format!("{{{}}}/", IGNORED_CONTENT_DIRS.join(",")));
+
+static IGNORED_EXTENSIONS_GLOB: sync::LazyLock<String> = sync::LazyLock::new(|| {
+    format!(
+        "*.{{{}}}",
+        include_str!("fixtures/ignored-extensions.txt")
+            .trim()
+            .lines()
+            .collect::<Vec<&str>>()
+            .join(",")
+    )
+});
+
+pub static BINARY_EXTENSIONS_GLOB: sync::LazyLock<String> = sync::LazyLock::new(|| {
+    format!(
+        "*.{{{}}}",
+        include_str!("fixtures/binary-extensions.txt")
+            .trim()
+            .lines()
+            .collect::<Vec<&str>>()
+            .join(",")
+    )
+});
+
+static IGNORED_FILES_GLOB: sync::LazyLock<String> = sync::LazyLock::new(|| {
+    format!(
+        "{{{}}}",
+        include_str!("fixtures/ignored-files.txt")
+            .trim()
+            .lines()
+            .collect::<Vec<&str>>()
+            .join(",")
+    )
+});
diff --git a/crates/oxide/src/scanner/detect_sources.rs b/crates/oxide/src/scanner/detect_sources.rs
index 742054f77..6cfdd49cc 100644
--- a/crates/oxide/src/scanner/detect_sources.rs
+++ b/crates/oxide/src/scanner/detect_sources.rs
@@ -1,16 +1,12 @@
-use crate::scanner::allowed_paths::{is_allowed_content_path, resolve_allowed_paths};
+use crate::scanner::auto_source_detection::IGNORED_CONTENT_DIRS;
 use crate::GlobEntry;
 use fxhash::FxHashSet;
+use globwalk::DirEntry;
 use std::cmp::Ordering;
 use std::path::PathBuf;
 use std::sync;
 use walkdir::WalkDir;
 
-#[derive(Debug, Clone)]
-pub struct DetectSources {
-    base: PathBuf,
-}
-
 static KNOWN_EXTENSIONS: sync::LazyLock<Vec<&'static str>> = sync::LazyLock::new(|| {
     include_str!("fixtures/template-extensions.txt")
         .trim()
@@ -22,202 +18,143 @@ static KNOWN_EXTENSIONS: sync::LazyLock<Vec<&'static str>> = sync::LazyLock::new
         .collect()
 });
 
-impl DetectSources {
-    pub fn new(base: PathBuf) -> Self {
-        Self { base }
-    }
-
-    pub fn detect(&self) -> (Vec<PathBuf>, Vec<GlobEntry>, Vec<PathBuf>) {
-        let (files, dirs) = self.resolve_files();
-        let globs = self.resolve_globs(&dirs);
-
-        (files, globs, dirs)
-    }
-
-    fn resolve_files(&self) -> (Vec<PathBuf>, Vec<PathBuf>) {
-        let mut files: Vec<PathBuf> = vec![];
-        let mut dirs: Vec<PathBuf> = vec![];
-
-        for entry in resolve_allowed_paths(&self.base) {
-            let Some(file_type) = entry.file_type() else {
-                continue;
-            };
-
-            if file_type.is_file() {
-                files.push(entry.into_path());
-            } else if file_type.is_dir() {
-                dirs.push(entry.into_path());
-            }
-        }
-
-        (files, dirs)
-    }
-
-    fn resolve_globs(&self, dirs: &Vec<PathBuf>) -> Vec<GlobEntry> {
-        let allowed_paths = FxHashSet::from_iter(dirs);
-
-        // A list of directory names where we can't use globs, but we should track each file
-        // individually instead. This is because these directories are often used for both source and
-        // destination files.
-        let mut forced_static_directories = vec![self.base.join("public")];
-
-        // A list of known extensions + a list of extensions we found in the project.
-        let mut found_extensions =
-            FxHashSet::from_iter(KNOWN_EXTENSIONS.iter().map(|x| x.to_string()));
-
-        // All root directories.
-        let mut root_directories = FxHashSet::from_iter(vec![self.base.clone()]);
-
-        // All directories where we can safely use deeply nested globs to watch all files.
-        // In other comments we refer to these as "deep glob directories" or similar.
-        //
-        // E.g.: `./src/**/*.{html,js}`
-        let mut deep_globable_directories: FxHashSet<PathBuf> = FxHashSet::default();
-
-        // All directories where we can only use shallow globs to watch all direct files but not
-        // folders.
-        // In other comments we refer to these as "shallow glob directories" or similar.
-        //
-        // E.g.: `./src/*/*.{html,js}`
-        let mut shallow_globable_directories: FxHashSet<PathBuf> = FxHashSet::default();
-
-        // Collect all valid paths from the root. This will already filter out ignored files, unknown
-        // extensions and binary files.
-        let mut it = WalkDir::new(&self.base)
-            // Sorting to make sure that we always see the directories before the files. Also sorting
-            // alphabetically by default.
-            .sort_by(
-                |a, z| match (a.file_type().is_dir(), z.file_type().is_dir()) {
-                    (true, false) => Ordering::Less,
-                    (false, true) => Ordering::Greater,
-                    _ => a.file_name().cmp(z.file_name()),
-                },
-            )
-            .into_iter();
-
-        loop {
-            // We are only interested in valid entries
-            let entry = match it.next() {
-                Some(Ok(entry)) => entry,
-                _ => break,
-            };
-
-            // Ignore known directories that we don't want to traverse into.
-            if entry.file_type().is_dir() && entry.file_name() == ".git" {
-                it.skip_current_dir();
-                continue;
-            }
-
-            if entry.file_type().is_dir() {
-                // If we are in a directory where we know that we can't use any globs, then we have to
-                // track each file individually.
-                if forced_static_directories.contains(&entry.path().to_path_buf()) {
-                    forced_static_directories.push(entry.path().to_path_buf());
-                    root_directories.insert(entry.path().to_path_buf());
-                    continue;
-                }
-
-                // If we are in a directory where the parent is a forced static directory, then this
-                // will become a forced static directory as well.
-                if forced_static_directories.contains(&entry.path().parent().unwrap().to_path_buf())
-                {
-                    forced_static_directories.push(entry.path().to_path_buf());
-                    root_directories.insert(entry.path().to_path_buf());
-                    continue;
-                }
-
-                // If we are in a directory, and the directory is git ignored, then we don't have to
-                // descent into the directory. However, we have to make sure that we mark the _parent_
-                // directory as a shallow glob directory because using deep globs from any of the
-                // parent directories will include this ignored directory which should not be the case.
-                //
-                // Another important part is that if one of the ignored directories is a deep glob
-                // directory, then all of its parents (until the root) should be marked as shallow glob
-                // directories as well.
-                if !allowed_paths.contains(&entry.path().to_path_buf()) {
-                    let mut parent = entry.path().parent();
-                    while let Some(parent_path) = parent {
-                        // If the parent is already marked as a valid deep glob directory, then we have
-                        // to mark it as a shallow glob directory instead, because we won't be able to
-                        // use deep globs for this directory anymore.
-                        if deep_globable_directories.contains(parent_path) {
-                            deep_globable_directories.remove(parent_path);
-                            shallow_globable_directories.insert(parent_path.to_path_buf());
-                        }
-
-                        // If we reached the root, then we can stop.
-                        if parent_path == self.base {
-                            break;
-                        }
-
-                        // Mark the parent directory as a shallow glob directory and continue with its
-                        // parent.
-                        shallow_globable_directories.insert(parent_path.to_path_buf());
-                        parent = parent_path.parent();
-                    }
-
-                    it.skip_current_dir();
-                    continue;
-                }
-
-                // If we are in a directory that is not git ignored, then we can mark this directory as
-                // a valid deep glob directory. This is only necessary if any of its parents aren't
-                // marked as deep glob directories already.
-                let mut found_deep_glob_parent = false;
-                let mut parent = entry.path().parent();
-                while let Some(parent_path) = parent {
-                    // If we reached the root, then we can stop.
-                    if parent_path == self.base {
-                        break;
-                    }
-
-                    // If the parent is already marked as a deep glob directory, then we can stop
-                    // because this glob will match the current directory already.
-                    if deep_globable_directories.contains(parent_path) {
-                        found_deep_glob_parent = true;
-                        break;
-                    }
-
-                    parent = parent_path.parent();
-                }
-
-                // If we didn't find a deep glob directory parent, then we can mark this directory as a
-                // deep glob directory (unless it is the root).
-                if !found_deep_glob_parent && entry.path() != self.base {
-                    deep_globable_directories.insert(entry.path().to_path_buf());
-                }
-            }
-
-            // Handle allowed content paths
-            if is_allowed_content_path(entry.path())
-                && allowed_paths.contains(&entry.path().to_path_buf())
-            {
-                let path = entry.path();
-
-                // Collect the extension for future use when building globs.
-                if let Some(extension) = path.extension().and_then(|x| x.to_str()) {
-                    found_extensions.insert(extension.to_string());
-                }
-            }
-        }
-
-        let mut extension_list = found_extensions.into_iter().collect::<Vec<_>>();
-
-        extension_list.sort();
-
-        let extension_list = extension_list.join(",");
-
-        // Build the globs for all globable directories.
-        let shallow_globs = shallow_globable_directories.iter().map(|path| GlobEntry {
-            base: path.display().to_string(),
-            pattern: format!("*/*.{{{}}}", extension_list),
-        });
-
-        let deep_globs = deep_globable_directories.iter().map(|path| GlobEntry {
-            base: path.display().to_string(),
-            pattern: format!("**/*.{{{}}}", extension_list),
-        });
-
-        shallow_globs.chain(deep_globs).collect::<Vec<_>>()
+// Sorting to make sure that we always see the directories before the files. Also sorting
+// alphabetically by default.
+fn sort_by_dir_and_name(a: &DirEntry, z: &DirEntry) -> Ordering {
+    match (a.file_type().is_dir(), z.file_type().is_dir()) {
+        (true, false) => Ordering::Less,
+        (false, true) => Ordering::Greater,
+        _ => a.file_name().cmp(z.file_name()),
     }
 }
+
+pub fn resolve_globs(
+    base: PathBuf,
+    dirs: &FxHashSet<PathBuf>,
+    extensions: &FxHashSet<String>,
+) -> Vec<GlobEntry> {
+    // A list of known extensions + a list of extensions we found in the project.
+    let mut found_extensions: FxHashSet<String> =
+        FxHashSet::from_iter(KNOWN_EXTENSIONS.iter().map(|x| x.to_string()));
+    found_extensions.extend(extensions.iter().cloned());
+
+    // A list of directory names where we can't use globs, but we should track each file
+    // individually instead. This is because these directories are often used for both source and
+    // destination files.
+    let forced_static_directories: FxHashSet<PathBuf> =
+        FxHashSet::from_iter(vec![base.join("public")]);
+
+    // All directories where we can safely use deeply nested globs to watch all files.
+    // In other comments we refer to these as "deep glob directories" or similar.
+    //
+    // E.g.: `./src/**/*.{html,js}`
+    let mut deep_globable_directories: FxHashSet<PathBuf> = Default::default();
+
+    // All directories where we can only use shallow globs to watch all direct files but not
+    // folders.
+    // In other comments we refer to these as "shallow glob directories" or similar.
+    //
+    // E.g.: `./src/*/*.{html,js}`
+    let mut shallow_globable_directories: FxHashSet<PathBuf> = Default::default();
+
+    // Collect all valid paths from the root. This will already filter out ignored files, unknown
+    // extensions and binary files.
+    let mut it = WalkDir::new(&base)
+        .sort_by(sort_by_dir_and_name)
+        .into_iter();
+
+    // Figure out all the shallow globable directories.
+    while let Some(Ok(entry)) = it.next() {
+        let path = entry.path();
+        if !path.is_dir() {
+            continue;
+        }
+
+        if !dirs.contains(path) {
+            let mut path = path;
+            while let Some(parent) = path.parent() {
+                if parent == base {
+                    break;
+                }
+
+                shallow_globable_directories.insert(parent.to_path_buf());
+                path = parent
+            }
+
+            it.skip_current_dir();
+        }
+    }
+
+    // Figure out all the deep globable directories.
+    let mut it = WalkDir::new(&base)
+        .sort_by(sort_by_dir_and_name)
+        .into_iter();
+
+    while let Some(Ok(entry)) = it.next() {
+        let path = entry.path();
+        if path.is_file() {
+            continue;
+        }
+
+        if path == base {
+            continue;
+        }
+
+        if IGNORED_CONTENT_DIRS
+            .iter()
+            .any(|dir| match path.file_name() {
+                Some(name) => name == *dir,
+                None => false,
+            })
+        {
+            it.skip_current_dir();
+            continue;
+        }
+
+        if !dirs.contains(path) {
+            it.skip_current_dir();
+            continue;
+        }
+
+        // Already marked as a shallow globable directory.
+        if shallow_globable_directories.contains(path) {
+            continue;
+        }
+
+        if forced_static_directories.contains(path) {
+            it.skip_current_dir();
+            continue;
+        }
+
+        // Track deep globable directories.
+        deep_globable_directories.insert(path.to_path_buf());
+        it.skip_current_dir();
+    }
+
+    let mut extension_list = found_extensions.clone().into_iter().collect::<Vec<_>>();
+
+    extension_list.sort();
+
+    let extension_list = extension_list.join(",");
+
+    // Build the globs for all globable directories.
+    let shallow_globs = shallow_globable_directories.iter().map(|path| GlobEntry {
+        base: path.display().to_string(),
+        pattern: format!("*/*.{{{}}}", extension_list),
+    });
+
+    let deep_globs = deep_globable_directories.iter().map(|path| GlobEntry {
+        base: path.display().to_string(),
+        pattern: format!("**/*.{{{}}}", extension_list),
+    });
+
+    shallow_globs
+        .chain(deep_globs)
+        // Insert a glob for the base path, so we can see new files/folders in the directory
+        // itself
+        .chain(vec![GlobEntry {
+            base: base.to_string_lossy().into(),
+            pattern: "*".into(),
+        }])
+        .collect::<Vec<_>>()
+}
diff --git a/crates/oxide/src/scanner/fixtures/binary-extensions.txt b/crates/oxide/src/scanner/fixtures/binary-extensions.txt
index d2d7d8e0c..d26c1c222 100644
--- a/crates/oxide/src/scanner/fixtures/binary-extensions.txt
+++ b/crates/oxide/src/scanner/fixtures/binary-extensions.txt
@@ -3,7 +3,6 @@
 3g2
 3gp
 7z
-DS_Store
 a
 aac
 adp
@@ -38,6 +37,7 @@ cpio
 cr2
 cur
 dat
+db
 dcm
 deb
 dex
@@ -51,6 +51,7 @@ docx
 dot
 dotm
 dra
+DS_Store
 dsk
 dts
 dtshd
@@ -65,6 +66,7 @@ eol
 eot
 epub
 exe
+exr
 f4v
 fbs
 fh
@@ -77,6 +79,7 @@ fpx
 fst
 fvt
 g3
+geojson
 gh
 gif
 graffle
@@ -85,6 +88,7 @@ gzip
 h261
 h263
 h264
+hdr
 icns
 ico
 ief
@@ -131,6 +135,7 @@ mpg
 mpga
 mxu
 nef
+node
 npx
 numbers
 nupkg
@@ -198,8 +203,6 @@ snap
 snk
 so
 sqlite
-sqlite
-sqlite3
 sqlite3
 stl
 storedata
@@ -229,6 +232,7 @@ uvu
 viv
 vob
 war
+wasm
 wav
 wax
 wbmp
diff --git a/crates/oxide/src/scanner/fixtures/ignored-content-dirs.txt b/crates/oxide/src/scanner/fixtures/ignored-content-dirs.txt
new file mode 100644
index 000000000..79f01ecc1
--- /dev/null
+++ b/crates/oxide/src/scanner/fixtures/ignored-content-dirs.txt
@@ -0,0 +1,15 @@
+.git
+.hg
+.jj
+.next
+.parcel-cache
+.pnpm-store
+.svelte-kit
+.svn
+.turbo
+.venv
+.vercel
+.yarn
+__pycache__
+node_modules
+venv
diff --git a/crates/oxide/src/scanner/fixtures/ignored-extensions.txt b/crates/oxide/src/scanner/fixtures/ignored-extensions.txt
index f147c24fe..4dc099e0d 100644
--- a/crates/oxide/src/scanner/fixtures/ignored-extensions.txt
+++ b/crates/oxide/src/scanner/fixtures/ignored-extensions.txt
@@ -1,6 +1,6 @@
-css
 less
 lock
 sass
 scss
 styl
+log
diff --git a/crates/oxide/src/scanner/fixtures/ignored-files.txt b/crates/oxide/src/scanner/fixtures/ignored-files.txt
index 45d4ced87..1e8f1029f 100644
--- a/crates/oxide/src/scanner/fixtures/ignored-files.txt
+++ b/crates/oxide/src/scanner/fixtures/ignored-files.txt
@@ -1,3 +1,6 @@
 package-lock.json
 pnpm-lock.yaml
 bun.lockb
+.gitignore
+.env
+.env.*
diff --git a/crates/oxide/src/scanner/init_tracing.rs b/crates/oxide/src/scanner/init_tracing.rs
new file mode 100644
index 000000000..dd4c1d071
--- /dev/null
+++ b/crates/oxide/src/scanner/init_tracing.rs
@@ -0,0 +1,102 @@
+use std::fs::OpenOptions;
+use std::io::{self, Write};
+use std::path::Path;
+use std::sync::{self, Arc, Mutex};
+use tracing_subscriber::fmt::writer::BoxMakeWriter;
+
+pub static SHOULD_TRACE: sync::LazyLock<bool> = sync::LazyLock::new(
+    || matches!(std::env::var("DEBUG"), Ok(value) if value.eq("*") || (value.contains("tailwindcss:oxide") && !value.contains("-tailwindcss:oxide"))),
+);
+
+fn dim(input: &str) -> String {
+    format!("\u{001b}[2m{input}\u{001b}[22m")
+}
+
+fn blue(input: &str) -> String {
+    format!("\u{001b}[34m{input}\u{001b}[39m")
+}
+
+fn highlight(input: &str) -> String {
+    format!("{}{}{}", dim(&blue("`")), blue(input), dim(&blue("`")))
+}
+
+struct MutexWriter(Arc<Mutex<std::fs::File>>);
+
+impl Write for MutexWriter {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.0.lock().unwrap().write(buf)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.0.lock().unwrap().flush()
+    }
+}
+
+pub fn init_tracing() {
+    if !*SHOULD_TRACE {
+        return;
+    }
+
+    let root = Path::new(".tailwindcss");
+    let logs_dir = root.join("logs");
+    if let Err(err) = std::fs::create_dir_all(&logs_dir) {
+        eprintln!(
+            "{} Failed to create {}, skipping debug logs ({err})",
+            dim("[DEBUG]"),
+            highlight(&logs_dir.display().to_string())
+        );
+        return;
+    }
+
+    // Ensure everything inside `.tailwindcss/` is ignored by git. The file is only created if it
+    // doesn't exist yet, an existing `.gitignore` is left untouched.
+    if let Ok(mut file) = std::fs::File::create_new(root.join(".gitignore")) {
+        _ = file.write_all(b"*\n");
+    }
+
+    let file_path = logs_dir.join(format!(
+        "scanner-{}-{}.log",
+        std::time::SystemTime::now()
+            .duration_since(std::time::UNIX_EPOCH)
+            .map(|d| d.as_millis())
+            .unwrap_or(0),
+        std::process::id()
+    ));
+    let file = match OpenOptions::new()
+        .create(true)
+        .append(true)
+        .open(&file_path)
+    {
+        Ok(file) => file,
+        Err(err) => {
+            eprintln!(
+                "{} Failed to create {}, skipping debug logs ({err})",
+                dim("[DEBUG]"),
+                highlight(&file_path.display().to_string())
+            );
+            return;
+        }
+    };
+
+    let absolute_file_path = dunce::canonicalize(&file_path).unwrap_or_else(|_| file_path.clone());
+    eprintln!(
+        "{} Writing debug info to: {}\n",
+        dim("[DEBUG]"),
+        highlight(&absolute_file_path.display().to_string())
+    );
+
+    let file = Arc::new(Mutex::new(file));
+
+    let writer: BoxMakeWriter = BoxMakeWriter::new({
+        let file = file.clone();
+        move || Box::new(MutexWriter(file.clone())) as Box<dyn Write + Send>
+    });
+
+    _ = tracing_subscriber::fmt()
+        .with_max_level(tracing::Level::INFO)
+        .with_span_events(tracing_subscriber::fmt::format::FmtSpan::ACTIVE)
+        .with_writer(writer)
+        .with_ansi(false)
+        .compact()
+        .try_init();
+}
diff --git a/crates/oxide/src/scanner/mod.rs b/crates/oxide/src/scanner/mod.rs
index 8ddf60fd0..b7da9aa17 100644
--- a/crates/oxide/src/scanner/mod.rs
+++ b/crates/oxide/src/scanner/mod.rs
@@ -1,2 +1,952 @@
-pub mod allowed_paths;
+pub mod auto_source_detection;
 pub mod detect_sources;
+pub mod init_tracing;
+pub mod sources;
+
+use crate::extractor::{Extracted, Extractor};
+use crate::glob::optimize_patterns;
+use crate::scanner::detect_sources::resolve_globs;
+use crate::scanner::sources::{
+    public_source_entries_to_private_source_entries, PublicSourceEntry, SourceEntry, Sources,
+};
+use crate::GlobEntry;
+use auto_source_detection::BINARY_EXTENSIONS_GLOB;
+use bstr::ByteSlice;
+use fast_glob::glob_match;
+use fxhash::{FxHashMap, FxHashSet};
+use ignore::{gitignore::GitignoreBuilder, WalkBuilder};
+use init_tracing::{init_tracing, SHOULD_TRACE};
+use rayon::prelude::*;
+use std::path::{Path, PathBuf};
+use std::sync::{Arc, Mutex};
+use std::time::SystemTime;
+use tracing::event;
+
+// @source "some/folder";               // This is auto source detection
+// @source "some/folder/**/*";          // This is auto source detection
+// @source "some/folder/*.html";        // This is just a glob, but new files matching this should be included
+// @source "node_modules/my-ui-lib";    // Auto source detection but since node_modules is explicit we allow it
+//                                      // Maybe could be considered `external(…)` automatically if:
+//                                      // 1. It's git ignored but listed explicitly
+//                                      // 2. It exists outside of the current working directory (do we know that?)
+//
+// @source "do-include-me.bin";         // `.bin` is typically ignored, but now it's explicit so should be included
+// @source "git-ignored.html";          // A git ignored file that is listed explicitly, should be scanned
+
+#[derive(Debug, Clone)]
+pub enum ChangedContent {
+    File(PathBuf, String),
+    Content(String, String),
+}
+
+#[derive(Debug, Clone)]
+pub struct ScanOptions {
+    /// Base path to start scanning from
+    pub base: Option<String>,
+
+    /// Glob sources
+    pub sources: Vec<GlobEntry>,
+}
+
+#[derive(Debug, Clone)]
+pub struct ScanResult {
+    pub candidates: Vec<String>,
+    pub files: Vec<String>,
+    pub globs: Vec<GlobEntry>,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct Scanner {
+    /// Content sources
+    sources: Sources,
+
+    /// The walker to detect all files that we have to scan
+    walker: Option<WalkBuilder>,
+
+    /// All found extensions
+    extensions: FxHashSet<String>,
+
+    /// All files that we have to scan
+    files: FxHashSet<PathBuf>,
+
+    /// All directories, sub-directories, etc… we saw during source detection
+    dirs: FxHashSet<PathBuf>,
+
+    /// All generated globs, used for setting up watchers
+    globs: Option<Vec<GlobEntry>>,
+
+    /// Track unique set of candidates
+    candidates: FxHashSet<String>,
+
+    /// Track mtimes for files so incremental scans can skip unchanged files.
+    mtimes: FxHashMap<PathBuf, SystemTime>,
+
+    /// Files that were scanned during the last `scan()` call.
+    scanned_files: Vec<String>,
+
+    /// Whether we've completed at least one full scan. When false, we skip
+    /// mtime tracking entirely so the initial build stays fast.
+    has_scanned_once: bool,
+
+    /// Whether sources have been scanned since the last `scan()` call
+    sources_scanned: bool,
+}
+
+impl Scanner {
+    pub fn new(sources: Vec<PublicSourceEntry>) -> Self {
+        init_tracing();
+
+        if *SHOULD_TRACE {
+            event!(tracing::Level::INFO, "Provided sources:");
+            for source in &sources {
+                event!(tracing::Level::INFO, "Source: {:?}", source);
+            }
+        }
+
+        let sources = Sources::new(public_source_entries_to_private_source_entries(sources));
+        if *SHOULD_TRACE {
+            event!(tracing::Level::INFO, "Optimized sources:");
+            for source in sources.iter() {
+                event!(tracing::Level::INFO, "Source: {:?}", source);
+            }
+        }
+
+        let walker = create_walker(&sources);
+
+        Self {
+            sources,
+            walker,
+            ..Default::default()
+        }
+    }
+
+    pub fn scan(&mut self) -> Vec<String> {
+        self.sources_scanned = false;
+
+        let (scanned_blobs, css_files, files) = self.discover_sources();
+
+        self.extract_candidates(scanned_blobs, css_files);
+        self.scanned_files = files;
+
+        // Return all candidates sorted
+        let mut result = self.candidates.iter().cloned().collect::<Vec<_>>();
+        result.par_sort_unstable();
+        result
+    }
+
+    #[tracing::instrument(skip_all)]
+    pub fn scan_content(&mut self, changed_content: Vec<ChangedContent>) -> Vec<String> {
+        let (changed_files, changed_contents) =
+            changed_content
+                .into_iter()
+                .partition::<Vec<_>, _>(|x| match x {
+                    ChangedContent::File(_, _) => true,
+                    ChangedContent::Content(_, _) => false,
+                });
+
+        // Raw content can be parsed directly, no need to verify if the file exists and is allowed
+        // to be scanned.
+        let mut content_to_scan: Vec<ChangedContent> = changed_contents;
+
+        // Fully resolve all files
+        let changed_files = changed_files
+            .into_iter()
+            .filter_map(|changed_content| match changed_content {
+                ChangedContent::File(file, extension) => {
+                    let Ok(file) = dunce::canonicalize(file) else {
+                        return None;
+                    };
+                    Some(ChangedContent::File(file, extension))
+                }
+                _ => unreachable!(),
+            })
+            .collect::<Vec<_>>();
+
+        let (known_files, mut new_unknown_files) = changed_files
+            .into_iter()
+            .partition::<Vec<_>, _>(|changed_file| match changed_file {
+                ChangedContent::Content(_, _) => unreachable!(),
+                ChangedContent::File(file, _) => self.files.contains(file),
+            });
+
+        // All known files are allowed to be scanned
+        content_to_scan.extend(known_files);
+
+        // Figure out if the new unknown files are allowed to be scanned
+        if !new_unknown_files.is_empty() {
+            if let Some(walk_builder) = &mut self.walker {
+                for entry in walk_builder.build().filter_map(Result::ok) {
+                    let path = entry.path();
+                    if !path.is_file() {
+                        continue;
+                    }
+
+                    // The walked path can contain symlinks, while the changed files have already
+                    // been canonicalized. Lazily canonicalize the walked path so we can compare
+                    // the real paths as well.
+                    let mut canonical_path: Option<PathBuf> = None;
+
+                    let mut drop_file_indexes = vec![];
+                    for (idx, changed_file) in new_unknown_files.iter().enumerate().rev() {
+                        let ChangedContent::File(file, _) = changed_file else {
+                            continue;
+                        };
+
+                        // When the file is found on disk it means that all the rules pass. We can
+                        // extract the current file and remove it from the list of passed in files.
+                        let matches = file == path
+                            || (file.file_name() == path.file_name() && {
+                                if canonical_path.is_none() {
+                                    canonical_path = dunce::canonicalize(path).ok();
+                                }
+                                canonical_path.as_deref() == Some(file.as_path())
+                            });
+
+                        if matches {
+                            self.files.insert(path.to_path_buf()); // Track for future use
+                            content_to_scan.push(changed_file.clone()); // Track for parsing
+                            drop_file_indexes.push(idx);
+                        }
+                    }
+
+                    // Remove all files that we found on disk
+                    if !drop_file_indexes.is_empty() {
+                        drop_file_indexes.into_iter().for_each(|idx| {
+                            new_unknown_files.remove(idx);
+                        });
+                    }
+
+                    // We can stop walking the file system if all files we are interested in have
+                    // been found.
+                    if new_unknown_files.is_empty() {
+                        break;
+                    }
+                }
+            }
+        }
+
+        // Read all content into blobs for extraction
+        let blobs = read_all_files(content_to_scan);
+        self.extract_candidates(blobs, vec![])
+    }
+
+    #[tracing::instrument(skip_all)]
+    fn extract_candidates(&mut self, blobs: Vec<Vec<u8>>, css_files: Vec<PathBuf>) -> Vec<String> {
+        // Extract all candidates from the pre-read blobs
+        let mut new_candidates = parse_all_blobs(blobs);
+
+        // Extract all CSS variables from the CSS files
+        if !css_files.is_empty() {
+            let css_variables = extract_css_variables(read_all_files(
+                css_files
+                    .into_iter()
+                    .map(|file| ChangedContent::File(file, "css".into()))
+                    .collect(),
+            ));
+
+            new_candidates.extend(css_variables);
+        }
+
+        // Only keep candidates we haven't seen before
+        for existing in self.candidates.iter() {
+            new_candidates.remove(existing);
+        }
+
+        // Track new candidates for subsequent calls
+        self.candidates.extend(new_candidates.iter().cloned());
+
+        let mut result: Vec<String> = new_candidates.into_iter().collect();
+        result.par_sort_unstable();
+
+        result
+    }
+
+    #[tracing::instrument(skip_all)]
+    pub fn get_files(&mut self) -> Vec<String> {
+        let _ = self.discover_sources();
+
+        self.files
+            .par_iter()
+            .filter_map(|x| x.clone().into_os_string().into_string().ok())
+            .collect()
+    }
+
+    #[tracing::instrument(skip_all)]
+    pub fn get_scanned_files(&self) -> Vec<String> {
+        self.scanned_files.clone()
+    }
+
+    #[tracing::instrument(skip_all)]
+    pub fn get_globs(&mut self) -> Vec<GlobEntry> {
+        if let Some(globs) = &self.globs {
+            return globs.clone();
+        }
+
+        let _ = self.discover_sources();
+
+        let mut globs = vec![];
+        for source in self.sources.iter() {
+            match source {
+                SourceEntry::Auto { base } | SourceEntry::External { base } => {
+                    globs.extend(resolve_globs(
+                        base.to_path_buf(),
+                        &self.dirs,
+                        &self.extensions,
+                    ));
+                }
+                SourceEntry::Pattern { base, pattern } => {
+                    globs.push(GlobEntry {
+                        base: base.to_string_lossy().to_string(),
+                        pattern: pattern.to_string(),
+                    });
+                }
+                _ => {}
+            }
+        }
+
+        // Re-optimize the globs to reduce the number of patterns we have to scan.
+        globs = optimize_patterns(&globs);
+
+        // Track the globs for subsequent calls
+        self.globs = Some(globs.clone());
+
+        globs
+    }
+
+    #[tracing::instrument(skip_all)]
+    pub fn get_normalized_sources(&self) -> Vec<GlobEntry> {
+        self.sources
+            .iter()
+            .filter_map(|source| match source {
+                SourceEntry::Auto { base } | SourceEntry::External { base } => Some(GlobEntry {
+                    base: base.to_string_lossy().to_string(),
+                    pattern: "**/*".to_string(),
+                }),
+                SourceEntry::Pattern { base, pattern } => Some(GlobEntry {
+                    base: base.to_string_lossy().to_string(),
+                    pattern: pattern.to_string(),
+                }),
+                _ => None,
+            })
+            .collect()
+    }
+
+    #[tracing::instrument(skip_all)]
+    pub fn get_candidates_with_positions(
+        &mut self,
+        changed_content: ChangedContent,
+    ) -> Vec<(String, usize)> {
+        let content = read_changed_content(changed_content).unwrap_or_default();
+        let original_content = &content;
+
+        // Workaround for legacy upgrades:
+        //
+        // `-[]` won't parse in the new parser (`[…]` must contain _something_), but we do need it
+        // for people using `group-[]` (which we will later replace with `in-[.group]` instead).
+        let content = content.replace("-[]", "XYZ");
+        let offset = content.as_ptr() as usize;
+
+        let mut extractor = Extractor::new(&content[..]);
+
+        extractor
+            .extract()
+            .into_par_iter()
+            .flat_map(|extracted| match extracted {
+                Extracted::Candidate(s) => {
+                    let i = s.as_ptr() as usize - offset;
+                    let original = &original_content[i..i + s.len()];
+                    if original.contains_str("-[]") {
+                        return String::from_utf8(original.to_vec())
+                            .ok()
+                            .map(|candidate| (candidate, i));
+                    }
+
+                    String::from_utf8(s.to_vec())
+                        .ok()
+                        .map(|candidate| (candidate, i))
+                }
+
+                _ => None,
+            })
+            .collect()
+    }
+
+    #[tracing::instrument(skip_all)]
+    fn discover_sources(&mut self) -> (Vec<Vec<u8>>, Vec<PathBuf>, Vec<String>) {
+        if self.sources_scanned {
+            return (vec![], vec![], vec![]);
+        }
+        self.sources_scanned = true;
+
+        let Some(walker) = &mut self.walker else {
+            return (vec![], vec![], vec![]);
+        };
+
+        // Use synchronous walk for the initial build (lower overhead) and parallel
+        // walk for subsequent calls (watch mode) where the overhead is amortised.
+        let all_entries = if self.has_scanned_once {
+            walk_parallel(walker)
+        } else {
+            walk_synchronous(walker)
+        };
+
+        let mut css_files: Vec<PathBuf> = vec![];
+        let mut content_paths: Vec<(PathBuf, String)> = vec![];
+        let mut changed_files = vec![];
+
+        // Fresh state
+        self.files.clear();
+        self.dirs.clear();
+        self.extensions.clear();
+        self.globs = None;
+
+        // Cache canonicalized folders in case a file itself is not symlinked, but any of the parent
+        // folders are symlinked.
+        let mut cached_canonical_dirs: FxHashMap<PathBuf, PathBuf> = FxHashMap::default();
+
+        for entry in all_entries {
+            match entry {
+                WalkEntry::Dir(path) => {
+                    self.dirs.insert(path);
+                }
+                WalkEntry::File {
+                    path,
+                    mtime,
+                    is_symlink,
+                } => {
+                    // Deduplicate: parallel walk can visit the same file from multiple threads
+                    if !self.files.insert(path.clone()) {
+                        continue;
+                    }
+
+                    // Track canonicalized paths in addition to potentially symlinked file paths
+                    let canonical = if is_symlink {
+                        dunce::canonicalize(&path).ok()
+                    } else {
+                        path.parent().and_then(|parent| {
+                            // Perf: cache the canonicalized parent path such that sibling files don't
+                            // have to canonicalize over and over again.
+                            let canonical_parent = cached_canonical_dirs
+                                .entry(parent.to_path_buf())
+                                .or_insert_with(|| {
+                                    dunce::canonicalize(parent)
+                                        .unwrap_or_else(|_| parent.to_path_buf())
+                                });
+
+                            if canonical_parent.as_path() != parent {
+                                path.file_name()
+                                    .map(|file_name| canonical_parent.join(file_name))
+                            } else {
+                                None
+                            }
+                        })
+                    };
+
+                    if let Some(canonical) = canonical {
+                        if canonical != path {
+                            self.files.insert(canonical);
+                        }
+                    }
+                    let extension = path
+                        .extension()
+                        .and_then(|x| x.to_str())
+                        .unwrap_or_default()
+                        .to_owned();
+
+                    self.extensions.insert(extension.to_owned());
+
+                    // On incremental scans, check mtime to skip unchanged files.
+                    // On the first scan, track mtimes while still scanning every file.
+                    let changed = if self.has_scanned_once {
+                        match mtime {
+                            Some(mtime) => {
+                                let prev = self.mtimes.insert(path.clone(), mtime);
+                                prev.is_none_or(|prev| prev != mtime)
+                            }
+                            None => true,
+                        }
+                    } else {
+                        if let Some(mtime) = mtime {
+                            self.mtimes.insert(path.clone(), mtime);
+                        }
+
+                        true
+                    };
+
+                    if !changed {
+                        continue;
+                    }
+
+                    if let Ok(file) = path.clone().into_os_string().into_string() {
+                        changed_files.push(file);
+                    }
+
+                    match extension.as_str() {
+                        // Special handing for CSS files, we don't want to extract candidates from
+                        // these files, but we do want to extract used CSS variables.
+                        "css" => css_files.push(path),
+                        _ => content_paths.push((path, extension)),
+                    }
+                }
+            }
+        }
+
+        // Ensure `mtimes` don't include stale files
+        self.mtimes.retain(|path, _| self.files.contains(path));
+
+        // Read + preprocess all discovered files in parallel
+        let scanned_blobs: Vec<Vec<u8>> = content_paths
+            .into_par_iter()
+            .filter_map(|(path, ext)| {
+                let content = std::fs::read(&path).ok()?;
+                event!(tracing::Level::INFO, "Reading {:?}", path);
+                let processed = pre_process_input(content, &ext);
+                if processed.is_empty() {
+                    None
+                } else {
+                    Some(processed)
+                }
+            })
+            .collect();
+
+        if !self.has_scanned_once {
+            self.has_scanned_once = true;
+        }
+
+        changed_files.par_sort_unstable();
+
+        (scanned_blobs, css_files, changed_files)
+    }
+}
+
+fn read_changed_content(c: ChangedContent) -> Option<Vec<u8>> {
+    let (content, extension) = match c {
+        ChangedContent::File(file, extension) => match std::fs::read(&file) {
+            Ok(content) => {
+                event!(tracing::Level::INFO, "Reading {:?}", file);
+                (content, extension)
+            }
+            Err(e) => {
+                event!(tracing::Level::ERROR, "Failed to read file: {:?}", e);
+                return None;
+            }
+        },
+
+        ChangedContent::Content(contents, extension) => (contents.into_bytes(), extension),
+    };
+
+    Some(pre_process_input(content, &extension))
+}
+
+pub fn pre_process_input(content: Vec<u8>, extension: &str) -> Vec<u8> {
+    use crate::extractor::pre_processors::*;
+
+    match extension {
+        "clj" | "cljs" | "cljc" => Clojure.process(&content),
+        "heex" | "eex" | "ex" | "exs" => Elixir.process(&content),
+        "cshtml" | "razor" => Razor.process(&content),
+        "haml" => Haml.process(&content),
+        "json" | "jsonl" | "ndjson" => Json.process(&content),
+        "md" | "mdx" => Markdown.process(&content),
+        "pug" => Pug.process(&content),
+        "rb" | "erb" => Ruby.process(&content),
+        "slim" | "slang" => Slim.process(&content),
+        "svelte" => Svelte.process(&content),
+        "rs" => Rust.process(&content),
+        "tt" | "tt2" | "tx" => TemplateToolkit.process(&content),
+        "twig" => Twig.process(&content),
+        "vue" => Vue.process(&content),
+        _ => content,
+    }
+}
+
+#[tracing::instrument(skip_all)]
+fn read_all_files(changed_content: Vec<ChangedContent>) -> Vec<Vec<u8>> {
+    event!(
+        tracing::Level::INFO,
+        "Reading {:?} file(s)",
+        changed_content.len()
+    );
+
+    changed_content
+        .into_par_iter()
+        .filter_map(read_changed_content)
+        .collect()
+}
+
+#[tracing::instrument(skip_all)]
+fn extract_css_variables(blobs: Vec<Vec<u8>>) -> FxHashSet<String> {
+    extract(blobs, |mut extractor| {
+        extractor.extract_variables_from_css()
+    })
+}
+
+#[tracing::instrument(skip_all)]
+fn parse_all_blobs(blobs: Vec<Vec<u8>>) -> FxHashSet<String> {
+    extract(blobs, |mut extractor| extractor.extract())
+}
+
+#[tracing::instrument(skip_all)]
+fn extract<H>(blobs: Vec<Vec<u8>>, handle: H) -> FxHashSet<String>
+where
+    H: Fn(Extractor) -> Vec<Extracted> + std::marker::Sync,
+{
+    blobs
+        .par_iter()
+        .flat_map(|blob| blob.par_split(|x| *x == b'\n'))
+        .filter_map(|blob| {
+            if blob.is_empty() {
+                return None;
+            }
+
+            let extracted = handle(crate::extractor::Extractor::new(blob));
+            if extracted.is_empty() {
+                return None;
+            }
+
+            Some(FxHashSet::from_iter(extracted.into_iter().map(
+                |x| match x {
+                    Extracted::Candidate(bytes) => bytes,
+                    Extracted::CssVariable(bytes) => bytes,
+                },
+            )))
+        })
+        .reduce(Default::default, |mut a, b| {
+            a.extend(b);
+            a
+        })
+        .into_iter()
+        .filter_map(|s| String::from_utf8(s.to_vec()).ok())
+        .collect()
+}
+
+#[derive(Debug)]
+enum WalkEntry {
+    Dir(PathBuf),
+    File {
+        path: PathBuf,
+        mtime: Option<SystemTime>,
+
+        /// Whether the path itself is a symlink
+        is_symlink: bool,
+    },
+}
+
+impl From<ignore::DirEntry> for WalkEntry {
+    fn from(entry: ignore::DirEntry) -> Self {
+        let is_dir = entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false);
+        let is_symlink = entry.path_is_symlink();
+        let path = entry.into_path();
+
+        if is_dir {
+            WalkEntry::Dir(path)
+        } else {
+            let mtime = path.metadata().ok().and_then(|m| m.modified().ok());
+            WalkEntry::File {
+                path,
+                mtime,
+                is_symlink,
+            }
+        }
+    }
+}
+
+/// Walk the file system synchronously. Used for the initial build where the overhead of spawning
+/// parallel walker threads is not worth it.
+#[tracing::instrument(skip_all)]
+fn walk_synchronous(walker: &mut WalkBuilder) -> Vec<WalkEntry> {
+    walker
+        .build()
+        .filter_map(Result::ok)
+        .map(WalkEntry::from)
+        .collect()
+}
+
+/// Walk the file system in parallel. Used in watch mode where the parallel walker overhead is
+/// amortised across many rebuilds and subsequent calls are much faster.
+#[tracing::instrument(skip_all)]
+fn walk_parallel(walker: &mut WalkBuilder) -> Vec<WalkEntry> {
+    struct FlushOnDrop {
+        local: Vec<WalkEntry>,
+        shared: Arc<Mutex<Vec<WalkEntry>>>,
+    }
+
+    impl Drop for FlushOnDrop {
+        fn drop(&mut self) {
+            if !self.local.is_empty() {
+                self.shared.lock().unwrap().append(&mut self.local);
+            }
+        }
+    }
+
+    let collected: Arc<Mutex<Vec<WalkEntry>>> = Arc::new(Mutex::new(vec![]));
+
+    walker.build_parallel().run(|| {
+        let mut buf = FlushOnDrop {
+            local: Vec::with_capacity(256),
+            shared: collected.clone(),
+        };
+
+        Box::new(move |entry| {
+            let Ok(entry) = entry else {
+                return ignore::WalkState::Continue;
+            };
+
+            buf.local.push(WalkEntry::from(entry));
+
+            if buf.local.len() >= 256 {
+                buf.shared.lock().unwrap().append(&mut buf.local);
+            }
+
+            ignore::WalkState::Continue
+        })
+    });
+
+    // All threads have finished and flushed their buffers via FlushOnDrop::drop
+    Arc::try_unwrap(collected).unwrap().into_inner().unwrap()
+}
+
+/// Sets up a WalkBuilder with all source roots, gitignore rules, and source pattern matching.
+///
+/// This is the common setup shared between the full walker (with mtime tracking for re-scans)
+/// and the parallel walker (without mtime tracking for the initial scan).
+fn create_walker(sources: &Sources) -> Option<WalkBuilder> {
+    let mut other_roots: FxHashSet<&PathBuf> = FxHashSet::default();
+    let mut first_root: Option<&PathBuf> = None;
+
+    let mut ignores: Vec<(&PathBuf, Vec<String>)> = Default::default();
+    let mut emit = |base, pattern| match ignores.last_mut() {
+        Some((prev_base, patterns)) if *prev_base == base => {
+            patterns.push(pattern);
+        }
+        _ => {
+            ignores.push((base, vec![pattern]));
+        }
+    };
+
+    for source in sources.iter() {
+        match source {
+            SourceEntry::Auto { base } => {
+                if first_root.is_none() {
+                    first_root = Some(base);
+                } else {
+                    other_roots.insert(base);
+                }
+            }
+            SourceEntry::Pattern { base, pattern } => {
+                let pattern = pattern.to_owned();
+
+                if first_root.is_none() {
+                    first_root = Some(base);
+                } else {
+                    other_roots.insert(base);
+                }
+
+                if !pattern.contains("**") {
+                    // Specific patterns should take precedence even over git-ignored files:
+                    emit(base, format!("!{}", pattern));
+                } else {
+                    // Assumption: the pattern we receive will already be brace expanded. So
+                    // `*.{html,jsx}` will result in two separate patterns: `*.html` and `*.jsx`.
+                    if let Some(extension) = Path::new(&pattern).extension() {
+                        // Extend auto source detection to include the extension
+                        emit(base, format!("!*.{}", extension.to_string_lossy()));
+                    }
+                }
+            }
+            SourceEntry::Ignored { base, pattern } => {
+                emit(base, pattern.to_owned());
+            }
+            SourceEntry::External { base } => {
+                if first_root.is_none() {
+                    first_root = Some(base);
+                } else {
+                    other_roots.insert(base);
+                }
+
+                // External sources should take precedence even over git-ignored files:
+                emit(base, "!/**/*".to_owned());
+
+                // External sources should still disallow binary extensions:
+                emit(base, BINARY_EXTENSIONS_GLOB.clone());
+            }
+        }
+    }
+
+    let mut builder = WalkBuilder::new(first_root?);
+
+    // We have to follow symlinks
+    builder.follow_links(true);
+
+    // Scan hidden files / directories
+    builder.hidden(false);
+
+    // Don't respect global gitignore files
+    builder.git_global(false);
+
+    // By default, allow .gitignore files to be used regardless of whether or not
+    // a .git directory is present. This is an optimization for when projects
+    // are first created and may not be in a git repo yet.
+    builder.require_git(false);
+
+    // If we are in a git repo then require it to ensure that only rules within
+    // the repo are used. For example, we don't want to consider a .gitignore file
+    // in the user's home folder if we're in a git repo.
+    //
+    // The alternative is using a call like `.parents(false)` but that will
+    // prevent looking at parent directories for .gitignore files from within
+    // the repo and that's not what we want.
+    //
+    // For example, in a project with this structure:
+    //
+    // home
+    // .gitignore
+    //  my-project
+    //   .gitignore
+    //   apps
+    //     .gitignore
+    //     web
+    //       {root}
+    //
+    // We do want to consider all .gitignore files listed:
+    // - home/.gitignore
+    // - my-project/.gitignore
+    // - my-project/apps/.gitignore
+    //
+    // However, if a repo is initialized inside my-project then only the following
+    // make sense for consideration:
+    // - my-project/.gitignore
+    // - my-project/apps/.gitignore
+    //
+    // Setting the require_git(true) flag conditionally allows us to do this.
+    for parent in first_root?.ancestors() {
+        if parent.join(".git").exists() {
+            builder.require_git(true);
+            break;
+        }
+    }
+
+    for root in other_roots {
+        builder.add(root);
+    }
+
+    // Setup auto source detection rules
+    for ignore in auto_source_detection::RULES.iter() {
+        builder.add_gitignore(ignore.clone());
+    }
+
+    // Setup ignores based on `@source` definitions
+    for (base, patterns) in ignores {
+        let mut ignore_builder = GitignoreBuilder::new(base);
+        for pattern in patterns {
+            ignore_builder.add_line(None, &pattern).unwrap();
+        }
+        let ignore = ignore_builder.build().unwrap();
+        builder.add_gitignore(ignore);
+    }
+
+    // Pre-compute source matching data to avoid allocations in the hot filter_entry path
+    let auto_bases: Vec<PathBuf> = sources
+        .iter()
+        .filter_map(|source| match source {
+            SourceEntry::Auto { base } | SourceEntry::External { base } => Some(base.clone()),
+            _ => None,
+        })
+        .collect();
+
+    let pattern_sources: Vec<(PathBuf, String)> = sources
+        .iter()
+        .filter_map(|source| match source {
+            SourceEntry::Pattern { base, pattern } => Some((base.into(), pattern.into())),
+            _ => None,
+        })
+        .collect();
+
+    // Source pattern matching filter (lock-free, safe for parallel walking)
+    builder.filter_entry(move |entry| {
+        let path = entry.path();
+
+        // Ensure the entries are matching any of the provided source patterns (this is
+        // necessary for manual-patterns that can filter the file extension)
+        if path.is_file() {
+            let mut matches = false;
+
+            for base in &auto_bases {
+                if path.starts_with(base) {
+                    matches = true;
+                    break;
+                }
+            }
+
+            if !matches {
+                for (base, pattern) in &pattern_sources {
+                    let remainder = path.strip_prefix(base);
+                    if remainder.is_ok_and(|remainder| {
+                        let mut path_str = remainder.to_string_lossy().to_string();
+                        if !path_str.starts_with("/") {
+                            path_str = format!("/{path_str}");
+                        }
+                        glob_match(pattern, path_str.as_bytes())
+                    }) {
+                        matches = true;
+                        break;
+                    }
+                }
+            }
+
+            if !matches {
+                return false;
+            }
+        }
+
+        true
+    });
+
+    Some(builder)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{ChangedContent, Scanner};
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    fn test_positions() {
+        let mut scanner = Scanner::new(vec![]);
+
+        for (input, expected) in [
+            // Before migrations
+            (
+                r#"<div class="!tw__flex sm:!tw__block tw__bg-gradient-to-t flex tw:[color:red] group-[]:tw__flex"#,
+                vec![
+                    ("class".to_string(), 5),
+                    ("!tw__flex".to_string(), 12),
+                    ("sm:!tw__block".to_string(), 22),
+                    ("tw__bg-gradient-to-t".to_string(), 36),
+                    ("flex".to_string(), 57),
+                    ("tw:[color:red]".to_string(), 62),
+                    ("group-[]:tw__flex".to_string(), 77),
+                ],
+            ),
+            // After migrations
+            (
+                r#"<div class="tw:flex! tw:sm:block! tw:bg-linear-to-t flex tw:[color:red] tw:in-[.tw\:group]:flex"></div>"#,
+                vec![
+                    ("class".to_string(), 5),
+                    ("tw:flex!".to_string(), 12),
+                    ("tw:sm:block!".to_string(), 21),
+                    ("tw:bg-linear-to-t".to_string(), 34),
+                    ("flex".to_string(), 52),
+                    ("tw:[color:red]".to_string(), 57),
+                    ("tw:in-[.tw\\:group]:flex".to_string(), 72),
+                ],
+            ),
+        ] {
+            let candidates = scanner.get_candidates_with_positions(ChangedContent::Content(
+                input.to_string(),
+                "html".into(),
+            ));
+            assert_eq!(candidates, expected);
+        }
+    }
+}
diff --git a/crates/oxide/src/scanner/sources.rs b/crates/oxide/src/scanner/sources.rs
new file mode 100644
index 000000000..53c09387f
--- /dev/null
+++ b/crates/oxide/src/scanner/sources.rs
@@ -0,0 +1,938 @@
+use crate::GlobEntry;
+use bexpand::Expression;
+use fxhash::{FxHashMap, FxHashSet};
+use ignore::gitignore::Gitignore;
+use std::path::{Component, Path, PathBuf};
+use tracing::{event, Level};
+
+use super::auto_source_detection::IGNORED_CONTENT_DIRS;
+
+#[derive(Debug, Clone)]
+pub struct PublicSourceEntry {
+    /// Base path of the glob
+    pub base: String,
+
+    /// Glob pattern
+    pub pattern: String,
+
+    /// Negated flag
+    pub negated: bool,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum SourceEntry {
+    /// Auto source detection
+    ///
+    /// Represented by:
+    ///
+    /// ```css
+    /// @source "src";`
+    /// @source "src/**/*";`
+    /// ```
+    Auto { base: PathBuf },
+
+    /// Explicit source pattern regardless of any auto source detection rules
+    ///
+    /// Represented by:
+    ///
+    /// ```css
+    /// @source "src/**/*.html";`
+    /// ```
+    Pattern { base: PathBuf, pattern: String },
+
+    /// Ignored pattern
+    ///
+    /// Represented by:
+    ///
+    /// ```css
+    /// @source not "src";`
+    /// @source not "src/**/*.html";`
+    /// ```
+    Ignored { base: PathBuf, pattern: String },
+
+    /// External sources are directories that are ignored (by us or .gitignore rules), but should be
+    /// included bypassing the default ignore rules.
+    ///
+    /// Represented by:
+    ///
+    /// ```css
+    /// @source "../node_modules/my-lib";`
+    /// @source "../node_modules/my-lib/**/*";`
+    /// ```
+    External { base: PathBuf },
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct Sources {
+    sources: Vec<SourceEntry>,
+}
+
+impl Sources {
+    pub fn new(sources: Vec<SourceEntry>) -> Self {
+        Self { sources }
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = &SourceEntry> {
+        self.sources.iter()
+    }
+}
+
+/// When dealing with a pattern, then it could be that we end up with:
+///
+/// ```json
+/// { base: '/some/folder', pattern: 'foo.ts' }
+/// ```
+///
+/// If we just emit `!foo.ts` for the `/some/folder` path, then _everything_ else in that folder
+/// would still be walked (but the result will be ignored).
+///
+/// Instead, we have to ensure that we ignore everything in that folder _except_ for the `foo.ts`
+/// pattern.
+///
+/// This should be equivalent to:
+/// ```gitignore
+/// *
+/// !foo.ts
+/// ```
+///
+/// However, we have to be careful that we don't start ignoring files/folders that already exist.
+/// ```css
+/// @source "./some/folder/foo.ts";
+/// @source "./some/folder/bar.ts";
+/// ```
+/// Would result in:
+/// ```json
+/// { base: '/some/folder', pattern: 'foo.ts' }
+/// { base: '/some/folder', pattern: 'bar.ts' }
+/// ```
+///
+/// If we were to blindly emit `*` for each pattern, then the `.gitignore` equivalent would look like
+/// this:
+/// ```gitignore
+/// *
+/// !foo.ts
+/// *
+/// !bar.ts
+/// ```
+///
+/// This would result in ignoring the `foo.ts` file as well. Therefore we only want to insert
+/// this `*` pattern when nothing else exists yet.
+///
+/// There is another problem that we need to solve. Let's say you have a pattern that contains a `*`
+/// in the pattern:
+/// ```css
+/// @source './src/ba*/*.html';
+/// ```
+///
+/// This would result in
+/// ```json
+/// { base: '/src', pattern: '/ba*/*.html' }
+/// ```
+///
+/// If we now inject the `*` pattern for the `/src` folder, then we wouldn't scan any `ba*` folders
+/// (e.g. `bar` or `baz`). For this, we have to make sure that we add inverse patterns for these
+/// folders. This would essentially result in:
+/// ```gitignore
+/// *                     ← ignore everything
+/// !/ba*/                ← except for the `ba*/` pattern, so we scan these folders
+/// !/ba*/*.html          ← then ensure we scan the `*.html` files in it as well
+/// ```
+///
+fn expand_restricted_patterns(sources: Vec<SourceEntry>) -> Vec<SourceEntry> {
+    let unrestricted_roots = sources
+        .iter()
+        .filter_map(|source| match source {
+            SourceEntry::Auto { base } | SourceEntry::External { base } => Some(base.clone()),
+            SourceEntry::Pattern { base, pattern } if pattern.contains("**") => Some(base.clone()),
+            _ => None,
+        })
+        .collect::<Vec<_>>();
+
+    // Bases of restricted patterns. Each of these becomes its own walk root with its own
+    // `*` + `!<pattern>` rules, so an ancestor base must not ignore them recursively.
+    let pattern_roots = sources
+        .iter()
+        .filter_map(|source| match source {
+            SourceEntry::Pattern { base, .. } => Some(base.clone()),
+            _ => None,
+        })
+        .collect::<Vec<_>>();
+
+    let mut restricted_roots: FxHashSet<PathBuf> = FxHashSet::default();
+    let mut expanded = vec![];
+
+    for source in sources {
+        let SourceEntry::Pattern { base, pattern } = &source else {
+            expanded.push(source);
+            continue;
+        };
+
+        // `base` is already included by another `@source` that we know should be walked. This
+        // includes the case where `base` is _nested_ inside such a root, because everything under
+        // an unrestricted root is walked already. Restricting it would incorrectly hide siblings
+        // that the broader source is supposed to pick up.
+        if unrestricted_roots.iter().any(|root| base.starts_with(root)) {
+            expanded.push(source);
+            continue;
+        }
+
+        // Ignore everything in the directory. We will later add the specific patterns we are
+        // interested in.
+        if restricted_roots.insert(base.clone()) {
+            // When another source root is nested inside this base — an unrestricted root, or the
+            // base of another restricted pattern (which is walked from its own root with its own
+            // rules) — only ignore direct children so the nested root can still be walked.
+            let has_nested_root = unrestricted_roots.iter().any(|root| root.starts_with(base))
+                || pattern_roots
+                    .iter()
+                    .any(|root| root != base && root.starts_with(base));
+
+            let pattern = if has_nested_root { "/*" } else { "*" };
+
+            expanded.push(SourceEntry::Ignored {
+                base: base.clone(),
+                pattern: pattern.to_owned(),
+            });
+        }
+
+        // Ensure to _include_ parent paths, otherwise the `*` from above would block walking the
+        // folders that need to be walked.
+        //
+        // ```css
+        // @source './src/ba*/*.html';
+        // ```
+        //
+        // ```gitignore
+        // *                     ← added by the above rule
+        // !/ba*/                ← this is what we're focusing on in this block
+        // !/ba*/*.html          ← this is added later
+        // ```
+        {
+            let mut dir = PathBuf::new();
+            let mut components = Path::new(pattern).components().peekable();
+
+            while let Some(component) = components.next() {
+                if components.peek().is_none() {
+                    break;
+                }
+
+                match component {
+                    Component::Prefix(_) | Component::RootDir | Component::CurDir => continue,
+                    Component::ParentDir | Component::Normal(_) => dir.push(component),
+                }
+
+                expanded.push(SourceEntry::Ignored {
+                    base: base.clone(),
+                    pattern: format!("!/{}/", path_to_posix_string(&dir).trim_start_matches('/')),
+                });
+            }
+        }
+
+        // Track the original source
+        expanded.push(source);
+    }
+
+    expanded
+}
+
+impl PublicSourceEntry {
+    /// Optimize the PublicSourceEntry by trying to move all the static parts of the pattern to the
+    /// base of the PublicSourceEntry.
+    ///
+    /// ```diff
+    /// - { base: '/', pattern: 'src/**/*.html'}
+    /// + { base: '/src', pattern: '**/*.html'}
+    /// ```
+    ///
+    /// A file stays in the `pattern` part, because the `base` should only be a directory.
+    ///
+    /// ```diff
+    /// - { base: '/', pattern: 'src/examples/index.html'}
+    /// + { base: '/src/examples', pattern: 'index.html'}
+    /// ```
+    ///
+    /// A folder will be moved to the `base` part, and the `pattern` will be set to `**/*`.
+    ///
+    /// ```diff
+    /// - { base: '/', pattern: 'src/examples'}
+    /// + { base: '/src/examples', pattern: '**/*'}
+    /// ```
+    ///
+    /// In addition, we will canonicalize the base path so we always work with the correctly
+    /// resolved path.
+    pub fn optimize(&mut self) {
+        // Resolve base path immediately
+        let Ok(mut base) = dunce::canonicalize(&self.base) else {
+            event!(Level::ERROR, "Failed to resolve base: {:?}", self.base);
+            return;
+        };
+
+        let mut new_pattern = PathBuf::new();
+        enum ComponentStage {
+            Base,
+            Pattern,
+        }
+        let mut stage = ComponentStage::Base;
+
+        let mut components = Path::new(&self.pattern).components().peekable();
+        while let Some(component) = components.next() {
+            match stage {
+                ComponentStage::Base => {
+                    match component {
+                        // Ignore the current dir, e.g. `.`
+                        Component::CurDir => {}
+
+                        // Go up a directory, e.g. `..`
+                        Component::ParentDir => {
+                            base.pop();
+                        }
+
+                        // Once we hit a component that contains a wildcard character, then we
+                        // can't change the base anymore and we must move to the pattern part.
+                        Component::Normal(part) if part.to_string_lossy().contains("*") => {
+                            new_pattern.push(component);
+                            stage = ComponentStage::Pattern;
+                        }
+
+                        // File or folder, but not the last component
+                        Component::Normal(part) if components.peek().is_some() => {
+                            base.push(part);
+                        }
+
+                        // Last file or folder. If it's a folder, we move it to the base,
+                        // otherwise we move it to the pattern.
+                        Component::Normal(part) => {
+                            let full_path = base.join(part);
+                            if full_path.is_dir() {
+                                base.push(part);
+                            } else {
+                                new_pattern.push(part);
+                            }
+                        }
+
+                        // When we're dealing with an absolute path, then we have to bypass the
+                        // `base` entirely.
+                        Component::Prefix(_) => {
+                            base.clear();
+                            base.push(component);
+                        }
+                        Component::RootDir => {
+                            #[cfg(not(windows))]
+                            base.clear();
+                            base.push(component);
+                        }
+                    }
+                }
+                ComponentStage::Pattern => {
+                    new_pattern.push(component);
+                }
+            }
+        }
+
+        self.base = base.to_string_lossy().to_string();
+        self.pattern = path_to_posix_string(&new_pattern);
+
+        // Ensure we have `**/*` when the base is a folder and we don't have a pattern at all
+        if self.pattern == "" {
+            self.pattern = "/**/*".to_owned();
+        }
+        // Ensure that the pattern is pinned to the base path.
+        else if !self.pattern.starts_with("/") {
+            self.pattern = format!("/{}", self.pattern);
+        }
+    }
+}
+
+fn path_to_posix_string(path: &Path) -> String {
+    let mut parts = Vec::new();
+    let mut is_rooted = false;
+
+    for component in path.components() {
+        match component {
+            Component::Prefix(prefix) => {
+                parts.push(prefix.as_os_str().to_string_lossy().to_string());
+            }
+            Component::RootDir => {
+                is_rooted = true;
+                if parts.is_empty() {
+                    parts.push(String::new());
+                }
+            }
+            Component::CurDir => {
+                parts.push(".".to_string());
+            }
+            Component::ParentDir => {
+                parts.push("..".to_string());
+            }
+            Component::Normal(part) => {
+                parts.push(part.to_string_lossy().to_string());
+            }
+        }
+    }
+
+    let result = parts.join("/");
+    if result.is_empty() && is_rooted {
+        "/".to_string()
+    } else {
+        result
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use pretty_assertions::assert_eq;
+    use std::fs;
+    use tempfile::tempdir;
+
+    #[test]
+    fn path_to_posix_string_serializes_relative_paths() {
+        let path = PathBuf::from("src").join("**").join("*.html");
+
+        assert_eq!(path_to_posix_string(&path), "src/**/*.html");
+    }
+
+    #[test]
+    fn path_to_posix_string_serializes_rooted_paths() {
+        let path = PathBuf::from(std::path::MAIN_SEPARATOR.to_string())
+            .join("src")
+            .join("**")
+            .join("*.html");
+
+        assert_eq!(path_to_posix_string(&path), "/src/**/*.html");
+    }
+
+    #[test]
+    fn path_to_posix_string_serializes_empty_paths() {
+        assert_eq!(path_to_posix_string(&PathBuf::new()), "");
+    }
+
+    #[test]
+    fn optimize_hoists_static_directories_and_keeps_files_in_the_pattern() {
+        let dir = tempdir().unwrap();
+        fs::create_dir_all(dir.path().join("src").join("examples")).unwrap();
+
+        let mut source = PublicSourceEntry {
+            base: dir.path().to_string_lossy().to_string(),
+            pattern: "src/examples/index.html".to_string(),
+            negated: false,
+        };
+
+        source.optimize();
+
+        assert_eq!(
+            source.base,
+            dunce::canonicalize(dir.path().join("src").join("examples"))
+                .unwrap()
+                .to_string_lossy()
+        );
+        assert_eq!(source.pattern, "/index.html");
+    }
+
+    #[test]
+    fn optimize_hoists_folder_patterns() {
+        let dir = tempdir().unwrap();
+        fs::create_dir_all(dir.path().join("src").join("examples")).unwrap();
+
+        let mut source = PublicSourceEntry {
+            base: dir.path().to_string_lossy().to_string(),
+            pattern: "src/examples".to_string(),
+            negated: false,
+        };
+
+        source.optimize();
+
+        assert_eq!(
+            source.base,
+            dunce::canonicalize(dir.path().join("src").join("examples"))
+                .unwrap()
+                .to_string_lossy()
+        );
+        assert_eq!(source.pattern, "/**/*");
+    }
+
+    #[test]
+    fn optimize_keeps_wildcards_in_the_pattern() {
+        let dir = tempdir().unwrap();
+        fs::create_dir_all(dir.path().join("src")).unwrap();
+
+        let mut source = PublicSourceEntry {
+            base: dir.path().to_string_lossy().to_string(),
+            pattern: "src/**/*.html".to_string(),
+            negated: false,
+        };
+
+        source.optimize();
+
+        assert_eq!(
+            source.base,
+            dunce::canonicalize(dir.path().join("src"))
+                .unwrap()
+                .to_string_lossy()
+        );
+        assert_eq!(source.pattern, "/**/*.html");
+    }
+
+    #[test]
+    fn concrete_patterns_are_expanded_to_restrict_their_base() {
+        let dir = tempdir().unwrap();
+        fs::create_dir_all(dir.path().join("src")).unwrap();
+        let base = dunce::canonicalize(dir.path().join("src")).unwrap();
+
+        let sources = public_source_entries_to_private_source_entries(vec![PublicSourceEntry {
+            base: dir.path().to_string_lossy().to_string(),
+            pattern: "src/foo.html".to_string(),
+            negated: false,
+        }]);
+
+        assert_eq!(
+            sources,
+            vec![
+                SourceEntry::Ignored {
+                    base: base.clone(),
+                    pattern: "*".to_string(),
+                },
+                SourceEntry::Pattern {
+                    base,
+                    pattern: "/foo.html".to_string(),
+                },
+            ]
+        );
+    }
+
+    #[test]
+    fn restricted_patterns_include_parent_directory_allow_rules() {
+        let dir = tempdir().unwrap();
+        fs::create_dir_all(dir.path().join("src")).unwrap();
+        let base = dunce::canonicalize(dir.path().join("src")).unwrap();
+
+        let sources = public_source_entries_to_private_source_entries(vec![PublicSourceEntry {
+            base: dir.path().to_string_lossy().to_string(),
+            pattern: "src/ef*/*.html".to_string(),
+            negated: false,
+        }]);
+
+        assert_eq!(
+            sources,
+            vec![
+                SourceEntry::Ignored {
+                    base: base.clone(),
+                    pattern: "*".to_string(),
+                },
+                SourceEntry::Ignored {
+                    base: base.clone(),
+                    pattern: "!/ef*/".to_string(),
+                },
+                SourceEntry::Pattern {
+                    base,
+                    pattern: "/ef*/*.html".to_string(),
+                },
+            ]
+        );
+    }
+
+    #[test]
+    fn unrestricted_sources_do_not_expand_patterns_for_the_same_base() {
+        let dir = tempdir().unwrap();
+        fs::create_dir_all(dir.path().join("src")).unwrap();
+        let base = dunce::canonicalize(dir.path().join("src")).unwrap();
+
+        let sources = public_source_entries_to_private_source_entries(vec![
+            PublicSourceEntry {
+                base: dir.path().to_string_lossy().to_string(),
+                pattern: "src".to_string(),
+                negated: false,
+            },
+            PublicSourceEntry {
+                base: dir.path().to_string_lossy().to_string(),
+                pattern: "src/foo.html".to_string(),
+                negated: false,
+            },
+        ]);
+
+        assert_eq!(
+            sources,
+            vec![
+                SourceEntry::Auto { base: base.clone() },
+                SourceEntry::Pattern {
+                    base,
+                    pattern: "/foo.html".to_string(),
+                },
+            ]
+        );
+    }
+
+    #[test]
+    fn restricted_parent_bases_do_not_open_unrelated_siblings() {
+        let dir = tempdir().unwrap();
+        let project = dir.path().join("Users").join("robin").join("docus-test");
+        fs::create_dir_all(&project).unwrap();
+
+        let users = dunce::canonicalize(dir.path().join("Users")).unwrap();
+        let project = dunce::canonicalize(project).unwrap();
+
+        let sources = public_source_entries_to_private_source_entries(vec![
+            PublicSourceEntry {
+                base: project.to_string_lossy().to_string(),
+                pattern: "**/*".to_string(),
+                negated: false,
+            },
+            PublicSourceEntry {
+                base: project.to_string_lossy().to_string(),
+                pattern: "../../app.config.ts".to_string(),
+                negated: false,
+            },
+        ]);
+
+        assert_eq!(
+            sources,
+            vec![
+                SourceEntry::Auto {
+                    base: project.clone(),
+                },
+                SourceEntry::Ignored {
+                    base: users.clone(),
+                    pattern: "/*".to_string(),
+                },
+                SourceEntry::Pattern {
+                    base: users,
+                    pattern: "/app.config.ts".to_string(),
+                },
+            ]
+        );
+    }
+
+    #[test]
+    fn restricted_patterns_preserve_source_order() {
+        let dir = tempdir().unwrap();
+        fs::create_dir_all(dir.path().join("src")).unwrap();
+        let base = dunce::canonicalize(dir.path().join("src")).unwrap();
+
+        let sources = public_source_entries_to_private_source_entries(vec![
+            PublicSourceEntry {
+                base: dir.path().to_string_lossy().to_string(),
+                pattern: "src/foo.html".to_string(),
+                negated: false,
+            },
+            PublicSourceEntry {
+                base: dir.path().to_string_lossy().to_string(),
+                pattern: "src/foo.html".to_string(),
+                negated: true,
+            },
+        ]);
+
+        assert_eq!(
+            sources,
+            vec![
+                SourceEntry::Ignored {
+                    base: base.clone(),
+                    pattern: "*".to_string(),
+                },
+                SourceEntry::Pattern {
+                    base: base.clone(),
+                    pattern: "/foo.html".to_string(),
+                },
+                SourceEntry::Ignored {
+                    base,
+                    pattern: "/foo.html".to_string(),
+                },
+            ]
+        );
+    }
+
+    /// Run the public-to-private conversion for an auto-detected source pointing at `base` and
+    /// return the resulting entry.
+    fn auto_source_entry(base: &Path) -> SourceEntry {
+        public_source_entries_to_private_source_entries(vec![PublicSourceEntry {
+            base: base.to_string_lossy().to_string(),
+            pattern: "**/*".to_string(),
+            negated: false,
+        }])
+        .into_iter()
+        .next()
+        .unwrap()
+    }
+
+    #[test]
+    fn auto_detected_folders_become_auto_sources() {
+        let dir = tempdir().unwrap();
+        let base = dir.path().join("src");
+        fs::create_dir_all(&base).unwrap();
+        let base = dunce::canonicalize(&base).unwrap();
+
+        assert_eq!(auto_source_entry(&base), SourceEntry::Auto { base });
+    }
+
+    #[test]
+    fn folders_ignored_by_default_become_external_sources() {
+        let dir = tempdir().unwrap();
+        let base = dir.path().join("node_modules").join("my-lib");
+        fs::create_dir_all(&base).unwrap();
+        let base = dunce::canonicalize(&base).unwrap();
+
+        assert_eq!(auto_source_entry(&base), SourceEntry::External { base });
+    }
+
+    #[test]
+    fn folders_ignored_by_gitignore_become_external_sources() {
+        let dir = tempdir().unwrap();
+        // Pretend this is a git repository so the `.gitignore` search is bounded to it.
+        fs::create_dir_all(dir.path().join(".git")).unwrap();
+        fs::write(dir.path().join(".gitignore"), "dist/\n").unwrap();
+
+        let base = dir.path().join("dist");
+        fs::create_dir_all(&base).unwrap();
+        let base = dunce::canonicalize(&base).unwrap();
+
+        assert_eq!(auto_source_entry(&base), SourceEntry::External { base });
+    }
+
+    #[test]
+    fn folders_ignored_by_a_parent_gitignore_become_external_sources() {
+        let dir = tempdir().unwrap();
+        fs::create_dir_all(dir.path().join(".git")).unwrap();
+        // A `.gitignore` higher up in the tree should still apply to nested directories.
+        fs::write(dir.path().join(".gitignore"), "generated/\n").unwrap();
+
+        let base = dir.path().join("packages").join("app").join("generated");
+        fs::create_dir_all(&base).unwrap();
+        let base = dunce::canonicalize(&base).unwrap();
+
+        assert_eq!(auto_source_entry(&base), SourceEntry::External { base });
+    }
+
+    #[test]
+    fn folders_not_ignored_by_gitignore_stay_auto_sources() {
+        let dir = tempdir().unwrap();
+        fs::create_dir_all(dir.path().join(".git")).unwrap();
+        fs::write(dir.path().join(".gitignore"), "dist/\n").unwrap();
+
+        let base = dir.path().join("src");
+        fs::create_dir_all(&base).unwrap();
+        let base = dunce::canonicalize(&base).unwrap();
+
+        assert_eq!(auto_source_entry(&base), SourceEntry::Auto { base });
+    }
+}
+
+/// For each public source entry:
+///
+/// 1. Perform brace expansion
+///
+/// ```diff
+/// - { base: '/', pattern: 'src/{foo,bar}.html'}
+/// + { base: '/', pattern: 'src/foo.html'}
+/// + { base: '/', pattern: 'src/bar.html'}
+/// ```
+///
+/// 2. Hoist static parts, e.g.:
+///
+/// ```diff
+/// - { base: '/', pattern: 'src/**/*.html'}
+/// + { base: '/src', pattern: '**/*.html'}
+/// ```
+///
+/// 3. Convert to private SourceEntry
+///
+pub fn public_source_entries_to_private_source_entries(
+    sources: Vec<PublicSourceEntry>,
+) -> Vec<SourceEntry> {
+    // Perform brace expansion
+    let expanded_globs = sources
+        .into_iter()
+        .flat_map(|source| {
+            let expression: Result<Expression, _> = source.pattern[..].try_into();
+            let Ok(expression) = expression else {
+                return vec![source];
+            };
+
+            expression
+                .into_iter()
+                .filter_map(Result::ok)
+                .map(move |pattern| PublicSourceEntry {
+                    base: source.base.clone(),
+                    pattern: pattern.into(),
+                    negated: source.negated,
+                })
+                .collect::<Vec<_>>()
+        })
+        .map(|mut public_source| {
+            public_source.optimize();
+            public_source
+        })
+        .collect::<Vec<_>>();
+
+    // Compiled `.gitignore` matchers are cached per directory so we read and parse each
+    // `.gitignore` file at most once, even though entries commonly share ancestor directories (e.g.
+    // the repository root). A cached `None` means the directory has no `.gitignore` file.
+    let mut gitignores: FxHashMap<PathBuf, Option<Gitignore>> = FxHashMap::default();
+
+    // Boundary for the `.gitignore` walk when a source is not inside a git repository (see below).
+    let cwd = std::env::current_dir()
+        .map(|cwd| dunce::canonicalize(&cwd).unwrap_or(cwd))
+        .ok();
+
+    // Convert from public SourceEntry to private SourceEntry
+    let sources = expanded_globs
+        .into_iter()
+        .map(|public_source| {
+            let mut source: SourceEntry = public_source.into();
+
+            // Promote auto-sources to external sources if they were gitignored
+            if let SourceEntry::Auto { ref base } = source {
+                let inside_git_repo = base.ancestors().any(|dir| dir.join(".git").exists());
+
+                // Walk up from the folder, applying each `.gitignore` relative to the directory
+                // that contains it (matching git), and stop at the git repository root so
+                // `.gitignore` files outside of the repo are not considered.
+                for dir in base.ancestors() {
+                    let gitignore = gitignores.entry(dir.to_path_buf()).or_insert_with(|| {
+                        let path = dir.join(".gitignore");
+
+                        // `Gitignore::new` roots the matcher at the directory containing the file,
+                        // so patterns match relative to it.
+                        path.is_file().then(|| Gitignore::new(&path).0)
+                    });
+
+                    // Only `.gitignore` files in ancestors of `base` can ignore `base` itself.
+                    // Patterns in `base`'s own `.gitignore` only match paths _inside_ `base`, never
+                    // `base` itself (the file walker still applies them to `base`'s contents).
+                    //
+                    // Skipping `base`'s own `.gitignore` also prevents a false positive for
+                    // whitelist style `.gitignore` files, because relativizing `base` against
+                    // itself yields the empty path, which incorrectly matches `/*`.
+                    //
+                    // E.g.:
+                    //
+                    // ```gitignore
+                    // /*
+                    // !/.gitignore
+                    // !/app
+                    // !/public
+                    // ```
+                    //
+                    // Everything inside `base` except `.gitignore`, `app` and `public` is ignored,
+                    // but `base` itself is not.
+                    if dir != base {
+                        if let Some(gitignore) = gitignore {
+                            if gitignore
+                                .matched_path_or_any_parents(&base, true)
+                                .is_ignore()
+                            {
+                                source = SourceEntry::External { base: base.into() };
+                                break;
+                            }
+                        }
+                    }
+
+                    // Stop at the git repository root.
+                    if dir.join(".git").exists() {
+                        break;
+                    }
+
+                    // Without a git repository there is no repository root to stop at. Stop once
+                    // the directory contains the current working directory instead, so `.gitignore`
+                    // files outside of the project (e.g. in the user's home directory) can never
+                    // promote a source to an external source. Note that the file walker still
+                    // applies those `.gitignore` files when deciding which files to scan.
+                    if !inside_git_repo && cwd.as_ref().is_some_and(|cwd| cwd.starts_with(dir)) {
+                        break;
+                    }
+                }
+            }
+
+            source
+        })
+        .collect::<Vec<SourceEntry>>();
+
+    expand_restricted_patterns(sources)
+}
+
+/// Convert a public source entry to a source entry
+impl From<PublicSourceEntry> for SourceEntry {
+    fn from(value: PublicSourceEntry) -> Self {
+        if value.negated {
+            return SourceEntry::Ignored {
+                base: value.base.into(),
+                pattern: value.pattern,
+            };
+        }
+
+        let auto =
+            value.pattern == "/**/*" || PathBuf::from(&value.base).join(&value.pattern).is_dir();
+
+        if !auto {
+            return SourceEntry::Pattern {
+                base: value.base.into(),
+                pattern: value.pattern,
+            };
+        }
+
+        let inside_ignored_content_dir = IGNORED_CONTENT_DIRS.iter().any(|dir| {
+            value.base.contains(&format!(
+                "{}{}{}",
+                std::path::MAIN_SEPARATOR,
+                dir,
+                std::path::MAIN_SEPARATOR
+            )) || value
+                .base
+                .ends_with(&format!("{}{}", std::path::MAIN_SEPARATOR, dir))
+        });
+
+        match inside_ignored_content_dir {
+            false => SourceEntry::Auto {
+                base: value.base.into(),
+            },
+            true => SourceEntry::External {
+                base: value.base.into(),
+            },
+        }
+    }
+}
+
+impl From<GlobEntry> for SourceEntry {
+    fn from(value: GlobEntry) -> Self {
+        SourceEntry::Pattern {
+            base: PathBuf::from(value.base),
+            pattern: value.pattern,
+        }
+    }
+}
+
+impl From<SourceEntry> for GlobEntry {
+    fn from(value: SourceEntry) -> Self {
+        match value {
+            SourceEntry::Auto { base } | SourceEntry::External { base } => GlobEntry {
+                base: base.to_string_lossy().into(),
+                pattern: "**/*".into(),
+            },
+            SourceEntry::Pattern { base, pattern } => GlobEntry {
+                base: base.to_string_lossy().into(),
+                pattern: pattern.clone(),
+            },
+            SourceEntry::Ignored { base, pattern } => GlobEntry {
+                base: base.to_string_lossy().into(),
+                pattern: pattern.clone(),
+            },
+        }
+    }
+}
+
+impl From<&SourceEntry> for GlobEntry {
+    fn from(value: &SourceEntry) -> Self {
+        match value {
+            SourceEntry::Auto { base } | SourceEntry::External { base } => GlobEntry {
+                base: base.to_string_lossy().into(),
+                pattern: "**/*".into(),
+            },
+            SourceEntry::Pattern { base, pattern } => GlobEntry {
+                base: base.to_string_lossy().into(),
+                pattern: pattern.clone(),
+            },
+            SourceEntry::Ignored { base, pattern } => GlobEntry {
+                base: base.to_string_lossy().into(),
+                pattern: pattern.clone(),
+            },
+        }
+    }
+}
diff --git a/crates/oxide/src/throughput.rs b/crates/oxide/src/throughput.rs
new file mode 100644
index 000000000..19597925f
--- /dev/null
+++ b/crates/oxide/src/throughput.rs
@@ -0,0 +1,52 @@
+use std::fmt::Display;
+
+pub struct Throughput {
+    rate: f64,
+    elapsed: std::time::Duration,
+}
+
+impl Display for Throughput {
+    #[inline(always)]
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        write!(
+            f,
+            "{}/s over {:.2}s",
+            format_byte_size(self.rate),
+            self.elapsed.as_secs_f64()
+        )
+    }
+}
+
+impl Throughput {
+    #[inline(always)]
+    pub fn compute<F>(iterations: usize, memory_baseline: usize, cb: F) -> Self
+    where
+        F: Fn(),
+    {
+        let now = std::time::Instant::now();
+        for _ in 0..iterations {
+            cb();
+        }
+        let elapsed = now.elapsed();
+        let memory_size = iterations * memory_baseline;
+
+        Self {
+            rate: memory_size as f64 / elapsed.as_secs_f64(),
+            elapsed,
+        }
+    }
+}
+
+#[inline(always)]
+fn format_byte_size(size: f64) -> String {
+    let units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+    let unit = 1000;
+    let mut size = size;
+    let mut i = 0;
+    while size > unit as f64 {
+        size /= unit as f64;
+        i += 1;
+    }
+
+    format!("{:.2} {}", size, units[i])
+}
diff --git a/crates/oxide/tests/scanner.rs b/crates/oxide/tests/scanner.rs
index cdec9a44d..fb5354a87 100644
--- a/crates/oxide/tests/scanner.rs
+++ b/crates/oxide/tests/scanner.rs
@@ -1,5 +1,8 @@
 #[cfg(test)]
 mod scanner {
+    use insta::assert_snapshot;
+    use pretty_assertions::assert_eq;
+    use std::path::{Path, PathBuf};
     use std::process::Command;
     use std::thread::sleep;
     use std::time::Duration;
@@ -8,6 +11,204 @@ mod scanner {
     use tailwindcss_oxide::*;
     use tempfile::tempdir;
 
+    fn symlink<P: AsRef<Path>, Q: AsRef<Path>>(original: P, link: Q) -> std::io::Result<()> {
+        #[cfg(not(windows))]
+        let result = std::os::unix::fs::symlink(original, link);
+
+        #[cfg(windows)]
+        let result = std::os::windows::fs::symlink_dir(original, link);
+
+        result
+    }
+
+    fn symlink_file<P: AsRef<Path>, Q: AsRef<Path>>(original: P, link: Q) -> std::io::Result<()> {
+        #[cfg(not(windows))]
+        let result = std::os::unix::fs::symlink(original, link);
+
+        #[cfg(windows)]
+        let result = std::os::windows::fs::symlink_file(original, link);
+
+        result
+    }
+
+    fn public_source_entry_from_pattern(dir: PathBuf, pattern: &str) -> PublicSourceEntry {
+        let mut parts = pattern.split_whitespace();
+        let _ = parts.next().unwrap_or_default();
+        let not_or_pattern = parts.next().unwrap_or_default();
+        if not_or_pattern == "not" {
+            let pattern = parts.next().unwrap_or_default();
+            return PublicSourceEntry {
+                base: dir.to_string_lossy().into(),
+                pattern: pattern[1..pattern.len() - 1].to_string(),
+                negated: true,
+            };
+        }
+
+        PublicSourceEntry {
+            base: dir.to_string_lossy().into(),
+            pattern: not_or_pattern[1..not_or_pattern.len() - 1].to_string(),
+            negated: false,
+        }
+    }
+
+    struct ScanResult {
+        files: Vec<String>,
+        globs: Vec<String>,
+        normalized_sources: Vec<String>,
+        candidates: Vec<String>,
+        tree: String,
+    }
+
+    /// Renders the directory as a tree, annotating every file and folder with an indicator that
+    /// shows whether the scanner picked it up:
+    ///
+    /// - `✓` — scanned
+    /// - `✗` — ignored / skipped
+    ///
+    /// Symlinks are rendered as `link → target`, where the target is shown relative to the folder
+    /// containing the symlink. The contents of every `.gitignore` file are printed right below the
+    /// file itself.
+    ///
+    /// Folders that are a git repository root (they contain a `.git` folder) are marked with
+    /// `(git)`, because ignore rules behave differently inside and outside of a repository.
+    fn fs_tree(root: &Path, scanned: &[String]) -> String {
+        /// Computes the relative path from `parent` to `target`, where both are relative to the
+        /// same root, e.g.: `b/c` seen from `b` is `c`, and the root itself seen from `b` is `..`.
+        fn relative_to(target: &Path, parent: &Path) -> String {
+            let target = target.components().collect::<Vec<_>>();
+            let parent = parent.components().collect::<Vec<_>>();
+
+            let common = target
+                .iter()
+                .zip(&parent)
+                .take_while(|(a, b)| **a == **b)
+                .count();
+
+            let mut parts = vec![".."; parent.len() - common];
+            parts.extend(
+                target[common..]
+                    .iter()
+                    .map(|component| component.as_os_str().to_str().unwrap()),
+            );
+
+            if parts.is_empty() {
+                // The symlink points to its own parent folder
+                ".".into()
+            } else {
+                parts.join("/")
+            }
+        }
+
+        fn walk(
+            dir: &Path,
+            root: &Path,
+            prefix: &str,
+            scanned: &[String],
+            visited: &mut Vec<PathBuf>,
+            out: &mut String,
+        ) {
+            let mut entries = fs::read_dir(dir)
+                .unwrap()
+                .filter_map(Result::ok)
+                .filter(|entry| entry.file_name() != ".git")
+                .collect::<Vec<_>>();
+            entries.sort_by_key(|entry| entry.file_name());
+
+            for (i, entry) in entries.iter().enumerate() {
+                let last = i == entries.len() - 1;
+                let connector = if last { "└── " } else { "├── " };
+                let child_prefix = if last { "    " } else { "│   " };
+
+                let path = entry.path();
+                let name = entry.file_name().to_string_lossy().to_string();
+                let rel = path
+                    .strip_prefix(root)
+                    .unwrap()
+                    .to_string_lossy()
+                    .replace('\\', "/");
+
+                let file_type = entry.file_type().unwrap();
+
+                // a file is scanned when it shows up in the scanned files list. a folder is
+                // considered scanned when any scanned file lives inside of it. paths that go
+                // through a symlink count towards the symlink, not towards the target directory.
+                let dir_prefix = format!("{rel}/");
+                let is_scanned = scanned
+                    .iter()
+                    .any(|file| file == &rel || file.starts_with(&dir_prefix));
+                let indicator = if is_scanned { "✓" } else { "✗" };
+
+                let mut display_name = name.clone();
+                if path.join(".git").exists() {
+                    display_name = format!("{display_name} (git)");
+                }
+                if file_type.is_symlink() {
+                    if let Ok(target) = fs::read_link(&path) {
+                        // Show the target relative to the folder containing the symlink, or as-is
+                        // when it points outside of the tree.
+                        let target = match (target.strip_prefix(root), dir.strip_prefix(root)) {
+                            (Ok(target), Ok(parent)) => relative_to(target, parent),
+                            _ => target.to_string_lossy().replace('\\', "/"),
+                        };
+                        display_name = format!("{name} → {target}");
+
+                        // The symlink points to a target that doesn't exist
+                        if path.metadata().is_err() {
+                            display_name = format!("{display_name} (broken)");
+                        }
+                    }
+                }
+
+                out.push_str(&format!("{prefix}{connector}{indicator} {display_name}\n"));
+
+                // Print the contents of `.gitignore` files below the file itself, so the ignore
+                // rules are visible in the same output.
+                if name == ".gitignore" {
+                    if let Ok(contents) = fs::read_to_string(&path) {
+                        for line in contents.lines() {
+                            let line = format!("{prefix}{child_prefix}    {line}");
+                            out.push_str(line.trim_end());
+                            out.push('\n');
+                        }
+                    }
+                }
+
+                // Descend into directories, including symlinked ones. The paths inside a symlinked
+                // directory are computed through the symlink, so the indicators show what the
+                // scanner saw via that route. A visited stack prevents symlink cycles from
+                // recursing forever.
+                if path.metadata().map(|meta| meta.is_dir()).unwrap_or(false) {
+                    let Ok(canonical) = dunce::canonicalize(&path) else {
+                        continue;
+                    };
+                    if visited.contains(&canonical) {
+                        continue;
+                    }
+
+                    visited.push(canonical);
+                    walk(
+                        &path,
+                        root,
+                        &format!("{prefix}{child_prefix}"),
+                        scanned,
+                        visited,
+                        out,
+                    );
+                    visited.pop();
+                }
+            }
+        }
+
+        let mut visited = vec![dunce::canonicalize(root).unwrap()];
+        let mut out = if root.join(".git").exists() {
+            String::from(". (git)\n")
+        } else {
+            String::from(".\n")
+        };
+        walk(root, root, "", scanned, &mut visited, &mut out);
+        out
+    }
+
     fn create_files_in(dir: &path::Path, paths: &[(&str, &str)]) {
         // Create the necessary files
         for (path, contents) in paths {
@@ -22,10 +223,57 @@ mod scanner {
         }
     }
 
+    fn scanned_files(scanner: &mut Scanner, base: &Path) -> Vec<String> {
+        let base_dir =
+            format!("{}{}", dunce::canonicalize(base).unwrap().display(), "/").replace('\\', "/");
+
+        let mut files = scanner
+            .get_files()
+            .iter()
+            // Normalize paths to use unix style separators
+            .map(|file| file.replace('\\', "/").replace(&base_dir, ""))
+            .collect::<Vec<_>>();
+        files.sort();
+        files
+    }
+
+    fn scanned_globs(scanner: &mut Scanner, base: &Path) -> Vec<String> {
+        let base_dir =
+            format!("{}{}", dunce::canonicalize(base).unwrap().display(), "/").replace('\\', "/");
+
+        let mut globs = scanner
+            .get_globs()
+            .iter()
+            .map(|glob| {
+                if glob.pattern.starts_with('/') {
+                    format!("{}{}", glob.base, glob.pattern)
+                } else {
+                    format!("{}/{}", glob.base, glob.pattern)
+                }
+            })
+            // Normalize paths to use unix style separators
+            .map(|file| file.replace('\\', "/").replace(&base_dir, ""))
+            .collect::<Vec<_>>();
+        globs.sort();
+        globs
+    }
+
+    fn normalize_files(files: Vec<String>, base: &Path) -> Vec<String> {
+        let base_dir =
+            format!("{}{}", dunce::canonicalize(base).unwrap().display(), "/").replace('\\', "/");
+
+        let mut files = files
+            .iter()
+            .map(|file| file.replace('\\', "/").replace(&base_dir, ""))
+            .collect::<Vec<_>>();
+        files.sort();
+        files
+    }
+
     fn scan_with_globs(
         paths_with_content: &[(&str, &str)],
-        globs: Vec<&str>,
-    ) -> (Vec<String>, Vec<String>) {
+        source_directives: Vec<&str>,
+    ) -> ScanResult {
         // Create a temporary working directory
         let dir = tempdir().unwrap().into_path();
 
@@ -38,101 +286,167 @@ mod scanner {
         let base = format!("{}", dir.display()).replace('\\', "/");
 
         // Resolve all content paths for the (temporary) current working directory
-        let mut sources: Vec<GlobEntry> = globs
+        let sources: Vec<PublicSourceEntry> = source_directives
             .iter()
-            .map(|x| GlobEntry {
-                base: base.clone(),
-                pattern: x.to_string(),
-            })
+            .map(|str| public_source_entry_from_pattern(base.clone().into(), str))
             .collect();
 
-        sources.push(GlobEntry {
-            base: base.clone(),
-            pattern: "**/*".to_string(),
-        });
-
-        let mut scanner = Scanner::new(Some(sources));
+        let mut scanner = Scanner::new(sources);
 
         let candidates = scanner.scan();
-
-        let mut paths: Vec<_> = scanner.get_files();
-
-        for glob in scanner.get_globs() {
-            paths.push(format!("{}{}{}", glob.base, "/", glob.pattern));
-        }
-
-        let parent_dir =
+        let base_dir =
             format!("{}{}", dunce::canonicalize(&base).unwrap().display(), "/").replace('\\', "/");
 
-        paths = paths
-            .into_iter()
-            .map(|x| {
-                // Normalize paths to use unix style separators
-                x.replace('\\', "/").replace(&parent_dir, "")
+        // Get all scanned files as strings relative to the base directory
+        let files = scanned_files(&mut scanner, Path::new(&base));
+
+        // Get all scanned globs as strings relative to the base directory
+        let globs = scanned_globs(&mut scanner, Path::new(&base));
+
+        // Get all normalized sources as strings relative to the base directory
+        let mut normalized_sources = scanner
+            .get_normalized_sources()
+            .iter()
+            .map(|glob| {
+                if glob.pattern.starts_with('/') {
+                    format!("{}{}", glob.base, glob.pattern)
+                } else {
+                    format!("{}/{}", glob.base, glob.pattern)
+                }
             })
-            .collect();
+            // Normalize paths to use unix style separators
+            .map(|file| file.replace('\\', "/").replace(&base_dir, ""))
+            .collect::<Vec<_>>();
+        normalized_sources.sort();
 
-        // Sort the output for easier comparison (depending on internal data structure the order
-        // _could_ be random)
-        paths.sort();
+        let tree = fs_tree(&dir, &files);
 
-        (paths, candidates)
+        ScanResult {
+            files,
+            globs,
+            normalized_sources,
+            candidates,
+            tree,
+        }
     }
 
-    fn scan(paths_with_content: &[(&str, &str)]) -> (Vec<String>, Vec<String>) {
-        scan_with_globs(paths_with_content, vec![])
-    }
-
-    fn test(paths_with_content: &[(&str, &str)]) -> Vec<String> {
-        scan(paths_with_content).0
+    fn scan(paths_with_content: &[(&str, &str)]) -> ScanResult {
+        scan_with_globs(paths_with_content, vec!["@source '**/*'"])
     }
 
     #[test]
     fn it_should_work_with_a_set_of_root_files() {
-        let globs = test(&[
+        let ScanResult {
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan(&[
             ("index.html", ""),
             ("a.html", ""),
             ("b.html", ""),
             ("c.html", ""),
         ]);
-        assert_eq!(globs, vec!["*", "a.html", "b.html", "c.html", "index.html"]);
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✓ a.html
+        ├── ✓ b.html
+        ├── ✓ c.html
+        └── ✓ index.html
+        ");
+        assert_eq!(files, vec!["a.html", "b.html", "c.html", "index.html"]);
+        assert_eq!(globs, vec!["*"]);
+        assert_eq!(normalized_sources, vec!["**/*"]);
     }
 
     #[test]
     fn it_should_work_with_a_set_of_root_files_and_ignore_ignored_files() {
-        let globs = test(&[
+        let ScanResult {
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan(&[
             (".gitignore", "b.html"),
             ("index.html", ""),
             ("a.html", ""),
             ("b.html", ""),
             ("c.html", ""),
         ]);
-        assert_eq!(globs, vec!["*", "a.html", "c.html", "index.html"]);
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ .gitignore
+        │       b.html
+        ├── ✓ a.html
+        ├── ✗ b.html
+        ├── ✓ c.html
+        └── ✓ index.html
+        ");
+
+        assert_eq!(files, vec!["a.html", "c.html", "index.html"]);
+        assert_eq!(globs, vec!["*"]);
+        assert_eq!(normalized_sources, vec!["**/*"]);
     }
 
     #[test]
     fn it_should_list_all_files_in_the_public_folder_explicitly() {
-        let globs = test(&[
+        let ScanResult {
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan(&[
             ("index.html", ""),
             ("public/a.html", ""),
             ("public/b.html", ""),
             ("public/c.html", ""),
+            ("public/nested/c.html", ""),
+            ("public/deeply/nested/c.html", ""),
         ]);
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✓ index.html
+        └── ✓ public
+            ├── ✓ a.html
+            ├── ✓ b.html
+            ├── ✓ c.html
+            ├── ✓ deeply
+            │   └── ✓ nested
+            │       └── ✓ c.html
+            └── ✓ nested
+                └── ✓ c.html
+        ");
+
         assert_eq!(
-            globs,
+            files,
             vec![
-                "*",
                 "index.html",
                 "public/a.html",
                 "public/b.html",
                 "public/c.html",
+                "public/deeply/nested/c.html",
+                "public/nested/c.html",
             ]
         );
+        assert_eq!(globs, vec!["*"]);
+        assert_eq!(normalized_sources, vec!["**/*"]);
     }
 
     #[test]
     fn it_should_list_nested_folders_explicitly_in_the_public_folder() {
-        let globs = test(&[
+        let ScanResult {
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan(&[
             ("index.html", ""),
             ("public/a.html", ""),
             ("public/b.html", ""),
@@ -143,10 +457,29 @@ mod scanner {
             ("public/nested/again/a.html", ""),
             ("public/very/deeply/nested/a.html", ""),
         ]);
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✓ index.html
+        └── ✓ public
+            ├── ✓ a.html
+            ├── ✓ b.html
+            ├── ✓ c.html
+            ├── ✓ nested
+            │   ├── ✓ a.html
+            │   ├── ✓ again
+            │   │   └── ✓ a.html
+            │   ├── ✓ b.html
+            │   └── ✓ c.html
+            └── ✓ very
+                └── ✓ deeply
+                    └── ✓ nested
+                        └── ✓ a.html
+        ");
+
         assert_eq!(
-            globs,
+            files,
             vec![
-                "*",
                 "index.html",
                 "public/a.html",
                 "public/b.html",
@@ -158,72 +491,226 @@ mod scanner {
                 "public/very/deeply/nested/a.html",
             ]
         );
+        assert_eq!(globs, vec!["*",]);
+        assert_eq!(normalized_sources, vec!["**/*"]);
     }
 
     #[test]
     fn it_should_list_all_files_in_the_public_folder_explicitly_except_ignored_files() {
-        let globs = test(&[
+        let ScanResult {
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan(&[
             (".gitignore", "public/b.html\na.html"),
             ("index.html", ""),
             ("public/a.html", ""),
             ("public/b.html", ""),
             ("public/c.html", ""),
         ]);
-        assert_eq!(globs, vec!["*", "index.html", "public/c.html",]);
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ .gitignore
+        │       public/b.html
+        │       a.html
+        ├── ✓ index.html
+        └── ✓ public
+            ├── ✗ a.html
+            ├── ✗ b.html
+            └── ✓ c.html
+        ");
+
+        assert_eq!(files, vec!["index.html", "public/c.html",]);
+        assert_eq!(globs, vec!["*"]);
+        assert_eq!(normalized_sources, vec!["**/*"]);
     }
 
     #[test]
     fn it_should_use_a_glob_for_top_level_folders() {
-        let globs = test(&[
+        let ScanResult {
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan(&[
             ("index.html", ""),
             ("src/a.html", ""),
             ("src/b.html", ""),
             ("src/c.html", ""),
         ]);
-        assert_eq!(globs, vec!["*",
-            "index.html",
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✓ index.html
+        └── ✓ src
+            ├── ✓ a.html
+            ├── ✓ b.html
+            └── ✓ c.html
+        ");
+
+        assert_eq!(
+            files,
+            vec!["index.html", "src/a.html", "src/b.html", "src/c.html"]
+        );
+        assert_eq!(globs, vec![
+            "*",
             "src/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
-            "src/a.html",
-            "src/b.html",
-            "src/c.html"
         ]);
+        assert_eq!(normalized_sources, vec!["**/*"]);
     }
 
     #[test]
     fn it_should_ignore_binary_files() {
-        let globs = test(&[
+        let ScanResult {
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan(&[
             ("index.html", ""),
             ("a.mp4", ""),
             ("b.png", ""),
             ("c.lock", ""),
         ]);
-        assert_eq!(globs, vec!["*", "index.html"]);
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ a.mp4
+        ├── ✗ b.png
+        ├── ✗ c.lock
+        └── ✓ index.html
+        ");
+
+        assert_eq!(files, vec!["index.html"]);
+        assert_eq!(globs, vec!["*"]);
+        assert_eq!(normalized_sources, vec!["**/*"]);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/17569
+    #[test]
+    fn it_should_not_ignore_folders_that_end_with_a_binary_extension() {
+        let ScanResult {
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan(&[
+            // Looks like `.pages` binary extension, but it's a folder
+            ("some.pages/index.html", "content-['some.pages/index.html']"),
+            // Ignore a specific folder. This is to ensure that this still "wins" from the internal
+            // solution of dealing with binary extensions for files only.
+            (".gitignore", "other.pages"),
+            (
+                "other.pages/index.html",
+                "content-['other.pages/index.html']",
+            ),
+        ]);
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ .gitignore
+        │       other.pages
+        ├── ✗ other.pages
+        │   └── ✗ index.html
+        └── ✓ some.pages
+            └── ✓ index.html
+        ");
+
+        assert_eq!(files, vec!["some.pages/index.html"]);
+        assert_eq!(globs, vec!["*", "some.pages/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}"]);
+        assert_eq!(normalized_sources, vec!["**/*"]);
     }
 
     #[test]
     fn it_should_ignore_known_extensions() {
-        let globs = test(&[
+        let ScanResult {
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan(&[
             ("index.html", ""),
             ("a.css", ""),
             ("b.sass", ""),
             ("c.less", ""),
         ]);
-        assert_eq!(globs, vec!["*", "index.html"]);
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✓ a.css
+        ├── ✗ b.sass
+        ├── ✗ c.less
+        └── ✓ index.html
+        ");
+
+        assert_eq!(files, vec!["a.css", "index.html"]);
+        assert_eq!(globs, vec!["*"]);
+        assert_eq!(normalized_sources, vec!["**/*"]);
+    }
+
+    #[test]
+    fn it_should_find_new_extensions() {
+        let ScanResult {
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan(&[("src/index.my-extension", "")]);
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✓ src
+            └── ✓ index.my-extension
+        ");
+
+        assert_eq!(files, vec!["src/index.my-extension"]);
+        assert_eq!(globs, vec!["*", "src/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,my-extension,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}"]);
+        assert_eq!(normalized_sources, vec!["**/*"]);
     }
 
     #[test]
     fn it_should_ignore_known_files() {
-        let globs = test(&[
+        let ScanResult {
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan(&[
             ("index.html", ""),
             ("package-lock.json", ""),
             ("yarn.lock", ""),
         ]);
-        assert_eq!(globs, vec!["*", "index.html"]);
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✓ index.html
+        ├── ✗ package-lock.json
+        └── ✗ yarn.lock
+        ");
+
+        assert_eq!(files, vec!["index.html"]);
+        assert_eq!(globs, vec!["*"]);
+        assert_eq!(normalized_sources, vec!["**/*"]);
     }
 
     #[test]
     fn it_should_ignore_and_expand_nested_ignored_folders() {
-        let globs = test(&[
+        let ScanResult {
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan(&[
             // Explicitly listed root files
             ("foo.html", ""),
             ("bar.html", ""),
@@ -266,39 +753,81 @@ mod scanner {
             ("nested-d/very/deeply/nested/directory/again/foo.html", ""),
         ]);
 
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✓ bar.html
+        ├── ✓ baz.html
+        ├── ✓ foo.html
+        ├── ✓ nested-a
+        │   ├── ✓ bar.html
+        │   ├── ✓ baz.html
+        │   └── ✓ foo.html
+        ├── ✓ nested-b
+        │   └── ✓ deeply-nested
+        │       ├── ✓ bar.html
+        │       ├── ✓ baz.html
+        │       └── ✓ foo.html
+        ├── ✓ nested-c
+        │   ├── ✗ .gitignore
+        │   │       ignored-folder/
+        │   ├── ✓ bar.html
+        │   ├── ✓ baz.html
+        │   ├── ✓ foo.html
+        │   ├── ✗ ignored-folder
+        │   │   ├── ✗ bar.html
+        │   │   ├── ✗ baz.html
+        │   │   └── ✗ foo.html
+        │   └── ✓ sibling-folder
+        │       ├── ✓ bar.html
+        │       ├── ✓ baz.html
+        │       └── ✓ foo.html
+        └── ✓ nested-d
+            ├── ✗ .gitignore
+            │       deep/
+            ├── ✓ bar.html
+            ├── ✓ baz.html
+            ├── ✓ foo.html
+            └── ✓ very
+                └── ✓ deeply
+                    └── ✓ nested
+                        ├── ✓ bar.html
+                        ├── ✓ baz.html
+                        ├── ✗ deep
+                        │   ├── ✗ bar.html
+                        │   ├── ✗ baz.html
+                        │   └── ✗ foo.html
+                        ├── ✓ directory
+                        │   ├── ✓ again
+                        │   │   └── ✓ foo.html
+                        │   ├── ✓ bar.html
+                        │   ├── ✓ baz.html
+                        │   └── ✓ foo.html
+                        └── ✓ foo.html
+        ");
+
         assert_eq!(
-            globs,
+            files,
             vec![
-                "*",
                 "bar.html",
                 "baz.html",
                 "foo.html",
-                "nested-a/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
                 "nested-a/bar.html",
                 "nested-a/baz.html",
                 "nested-a/foo.html",
-                "nested-b/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
                 "nested-b/deeply-nested/bar.html",
                 "nested-b/deeply-nested/baz.html",
                 "nested-b/deeply-nested/foo.html",
-                "nested-c/*/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
                 "nested-c/bar.html",
                 "nested-c/baz.html",
                 "nested-c/foo.html",
-                "nested-c/sibling-folder/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
                 "nested-c/sibling-folder/bar.html",
                 "nested-c/sibling-folder/baz.html",
                 "nested-c/sibling-folder/foo.html",
-                "nested-d/*/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
                 "nested-d/bar.html",
                 "nested-d/baz.html",
                 "nested-d/foo.html",
-                "nested-d/very/*/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
-                "nested-d/very/deeply/*/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
-                "nested-d/very/deeply/nested/*/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
                 "nested-d/very/deeply/nested/bar.html",
                 "nested-d/very/deeply/nested/baz.html",
-                "nested-d/very/deeply/nested/directory/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
                 "nested-d/very/deeply/nested/directory/again/foo.html",
                 "nested-d/very/deeply/nested/directory/bar.html",
                 "nested-d/very/deeply/nested/directory/baz.html",
@@ -306,6 +835,19 @@ mod scanner {
                 "nested-d/very/deeply/nested/foo.html",
             ]
         );
+        assert_eq!(globs, vec![
+            "*",
+            "nested-a/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+            "nested-b/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+            "nested-c/*/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+            "nested-c/sibling-folder/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+            "nested-d/*/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+            "nested-d/very/*/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+            "nested-d/very/deeply/*/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+            "nested-d/very/deeply/nested/*/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+            "nested-d/very/deeply/nested/directory/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+        ]);
+        assert_eq!(normalized_sources, vec!["**/*"]);
     }
 
     #[test]
@@ -314,7 +856,12 @@ mod scanner {
         ignores.push_str("# md:font-bold\n");
         ignores.push_str("foo.html\n");
 
-        let candidates = scan(&[
+        let ScanResult {
+            candidates,
+            normalized_sources,
+            tree,
+            ..
+        } = scan(&[
             // The gitignore file is used to filter out files but not scanned for candidates
             (".gitignore", &ignores),
             // A file that should definitely be scanned
@@ -323,41 +870,149 @@ mod scanner {
             ("foo.jpg", "xl:font-bold"),
             // A file that is ignored
             ("foo.html", "lg:font-bold"),
+            // An Angular file using the class shorthand syntax
+            (
+                "index.angular.html",
+                "<div [class.underline]=\"bool\"></div>",
+            ),
             // A svelte file with `class:foo="bar"` syntax
             ("index.svelte", "<div class:px-4='condition'></div>"),
-        ])
-        .1;
+            ("index2.svelte", "<div\n\tclass:px-5='condition'></div>"),
+            ("index3.svelte", "<div\n  class:px-6='condition'></div>"),
+            ("index4.svelte", "<div\nclass:px-7='condition'></div>"),
+        ]);
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ .gitignore
+        │       # md:font-bold
+        │       foo.html
+        ├── ✗ foo.html
+        ├── ✗ foo.jpg
+        ├── ✓ index.angular.html
+        ├── ✓ index.html
+        ├── ✓ index.svelte
+        ├── ✓ index2.svelte
+        ├── ✓ index3.svelte
+        └── ✓ index4.svelte
+        ");
 
         assert_eq!(
             candidates,
-            vec!["condition", "div", "font-bold", "md:flex", "px-4"]
+            vec![
+                "bool",
+                "class",
+                "condition",
+                "font-bold",
+                "md:flex",
+                "px-4",
+                "px-5",
+                "px-6",
+                "px-7",
+                "underline"
+            ]
         );
+        assert_eq!(normalized_sources, vec!["**/*"]);
     }
 
     #[test]
     fn it_should_be_possible_to_scan_in_the_parent_directory() {
-        let candidates = scan_with_globs(
+        let ScanResult {
+            candidates,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
             &[("foo/bar/baz/foo.html", "content-['foo.html']")],
-            vec!["./foo/bar/baz/.."],
-        )
-        .1;
+            vec!["@source '**/*'", "@source './foo/bar/baz/..'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✓ foo
+            └── ✓ bar
+                └── ✓ baz
+                    └── ✓ foo.html
+        ");
 
         assert_eq!(candidates, vec!["content-['foo.html']"]);
+        assert_eq!(normalized_sources, vec!["**/*", "foo/bar/**/*"]);
+    }
+
+    #[test]
+    fn it_should_preserve_source_order_when_referencing_a_sibling_project() {
+        // Create a temporary working directory
+        let dir = tempdir().unwrap().into_path();
+
+        // Create files
+        create_files_in(
+            &dir,
+            &[
+                ("project-a/src/index.css", ""),
+                ("project-b/keep/keep.html", "content-['GOOD-1']"),
+                ("project-b/ignored/ignored.html", "content-['BAD-1']"),
+                ("project-b/ignored/except.html", "content-['GOOD-2']"),
+            ],
+        );
+
+        let base = dir.join("project-a/src");
+        let mut scanner = Scanner::new(vec![
+            public_source_entry_from_pattern(base.clone(), "@source '../../project-b'"),
+            public_source_entry_from_pattern(base.clone(), "@source not '../../project-b/ignored'"),
+            public_source_entry_from_pattern(
+                base.clone(),
+                "@source '../../project-b/ignored/except.html'",
+            ),
+        ]);
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✗ project-a
+        │   └── ✗ src
+        │       └── ✗ index.css
+        └── ✓ project-b
+            ├── ✓ ignored
+            │   ├── ✓ except.html
+            │   └── ✗ ignored.html
+            └── ✓ keep
+                └── ✓ keep.html
+        ");
+
+        assert_eq!(candidates, vec!["content-['GOOD-1']", "content-['GOOD-2']"]);
     }
 
     #[test]
     fn it_should_scan_files_without_extensions() {
         // These look like folders, but they are files
-        let candidates =
-            scan_with_globs(&[("my-file", "content-['my-file']")], vec!["./my-file"]).1;
+        let ScanResult {
+            candidates,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[("my-file", "content-['my-file']")],
+            vec!["@source '**/*'", "@source './my-file'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✓ my-file
+        ");
 
         assert_eq!(candidates, vec!["content-['my-file']"]);
+        assert_eq!(normalized_sources, vec!["**/*", "my-file"]);
     }
 
     #[test]
     fn it_should_scan_folders_with_extensions() {
         // These look like files, but they are folders
-        let candidates = scan_with_globs(
+        let ScanResult {
+            candidates,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
             &[
                 (
                     "my-folder.templates/foo.html",
@@ -368,9 +1023,20 @@ mod scanner {
                     "content-['my-folder.bin/foo.html']",
                 ),
             ],
-            vec!["./my-folder.templates", "./my-folder.bin"],
-        )
-        .1;
+            vec![
+                "@source '**/*'",
+                "@source './my-folder.templates'",
+                "@source './my-folder.bin'",
+            ],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✓ my-folder.bin
+        │   └── ✓ foo.html
+        └── ✓ my-folder.templates
+            └── ✓ foo.html
+        ");
 
         assert_eq!(
             candidates,
@@ -379,21 +1045,219 @@ mod scanner {
                 "content-['my-folder.templates/foo.html']",
             ]
         );
+        assert_eq!(
+            normalized_sources,
+            vec!["**/*", "my-folder.bin/**/*", "my-folder.templates/**/*"]
+        );
     }
 
     #[test]
     fn it_should_scan_content_paths() {
-        let candidates = scan_with_globs(
+        let ScanResult {
+            candidates,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
             &[
                 // We know that `.styl` extensions are ignored, so they are not covered by auto content
                 // detection.
                 ("foo.styl", "content-['foo.styl']"),
             ],
-            vec!["*.styl"],
-        )
-        .1;
+            vec!["@source '**/*'", "@source '*.styl'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✓ foo.styl
+        ");
 
         assert_eq!(candidates, vec!["content-['foo.styl']"]);
+        assert_eq!(normalized_sources, vec!["**/*", "*.styl"]);
+    }
+
+    #[test]
+    fn it_should_drop_invalid_utf8_candidates() {
+        let dir = tempdir().unwrap();
+        fs::write(dir.path().join("index.html"), b"flex bg-[\x80] block").unwrap();
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.path().to_path_buf(),
+            "@source '*.html'",
+        )]);
+
+        let candidates = scanner
+            .scan()
+            .into_iter()
+            .map(String::into_bytes)
+            .collect::<Vec<_>>();
+
+        assert_eq!(candidates, vec![b"block".to_vec(), b"flex".to_vec()]);
+    }
+
+    #[test]
+    fn it_should_not_store_invalid_utf8_candidates_during_incremental_scans() {
+        let dir = tempdir().unwrap();
+        let file = dir.path().join("index.html");
+        fs::write(&file, b"flex bg-[\x80]").unwrap();
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.path().to_path_buf(),
+            "@source '*.html'",
+        )]);
+
+        let candidates = scanner
+            .scan_content(vec![ChangedContent::File(file, "html".into())])
+            .into_iter()
+            .map(String::into_bytes)
+            .collect::<Vec<_>>();
+        assert_eq!(candidates, vec![b"flex".to_vec()]);
+
+        let candidates =
+            scanner.scan_content(vec![ChangedContent::Content("block".into(), "html".into())]);
+        assert_eq!(candidates, vec!["block"]);
+
+        let candidates = scanner
+            .scan()
+            .into_iter()
+            .map(String::into_bytes)
+            .collect::<Vec<_>>();
+        assert_eq!(candidates, vec![b"block".to_vec(), b"flex".to_vec()]);
+    }
+
+    #[test]
+    fn it_should_drop_invalid_utf8_candidates_with_positions() {
+        let dir = tempdir().unwrap();
+        let file = dir.path().join("index.html");
+        fs::write(
+            &file,
+            b"flex bg-[\x80] group-[]:block group-[]:bg-[\x80] grid",
+        )
+        .unwrap();
+
+        let mut scanner = Scanner::new(vec![]);
+        let candidates = scanner
+            .get_candidates_with_positions(ChangedContent::File(file, "html".into()))
+            .into_iter()
+            .map(|(candidate, position)| (candidate.into_bytes(), position))
+            .collect::<Vec<_>>();
+
+        assert_eq!(
+            candidates,
+            vec![
+                (b"flex".to_vec(), 0),
+                (b"group-[]:block".to_vec(), 12),
+                (b"grid".to_vec(), 43),
+            ]
+        );
+    }
+
+    #[test]
+    fn it_should_preserve_valid_utf8_candidates() {
+        let dir = tempdir().unwrap();
+        fs::write(
+            dir.path().join("index.html"),
+            "before:content-['💩'] bg-[é] font-[中文]".as_bytes(),
+        )
+        .unwrap();
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.path().to_path_buf(),
+            "@source '*.html'",
+        )]);
+
+        assert_eq!(
+            scanner.scan(),
+            vec!["before:content-['💩']", "bg-[é]", "font-[中文]"]
+        );
+    }
+
+    #[test]
+    fn it_should_preserve_paths_for_sources_ending_in_a_deep_glob() {
+        let ScanResult {
+            candidates,
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                (
+                    "blog/2024/foo/bar/baz/index.html",
+                    "content-['blog/2024/foo/bar/baz/index.html']",
+                ),
+                (
+                    "blog/2024/foo/bar/qux/index.html",
+                    "content-['blog/2024/foo/bar/qux/index.html']",
+                ),
+            ],
+            vec!["@source './blog/*/foo/bar/baz/**/*'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✓ blog
+            └── ✓ 2024
+                └── ✓ foo
+                    └── ✓ bar
+                        ├── ✓ baz
+                        │   └── ✓ index.html
+                        └── ✗ qux
+                            └── ✗ index.html
+        ");
+
+        assert_eq!(
+            candidates,
+            vec!["content-['blog/2024/foo/bar/baz/index.html']"]
+        );
+        assert_eq!(files, vec!["blog/2024/foo/bar/baz/index.html"]);
+        assert_eq!(globs, vec!["blog/*/foo/bar/baz/**/*"]);
+        assert_eq!(normalized_sources, vec!["blog/*/foo/bar/baz/**/*"]);
+    }
+
+    #[test]
+    fn it_should_scan_next_dynamic_folders() {
+        let ScanResult {
+            candidates,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                // We know that `.styl` extensions are ignored, so they are not covered by auto content
+                // detection.
+                ("app/[slug]/page.styl", "content-['[slug]']"),
+                ("app/[...slug]/page.styl", "content-['[...slug]']"),
+                ("app/[[...slug]]/page.styl", "content-['[[...slug]]']"),
+                ("app/(theme)/page.styl", "content-['(theme)']"),
+            ],
+            vec!["@source '**/*'", "@source './**/*.{styl}'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✓ app
+            ├── ✓ (theme)
+            │   └── ✓ page.styl
+            ├── ✓ [...slug]
+            │   └── ✓ page.styl
+            ├── ✓ [[...slug]]
+            │   └── ✓ page.styl
+            └── ✓ [slug]
+                └── ✓ page.styl
+        ");
+
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['(theme)']",
+                "content-['[...slug]']",
+                "content-['[[...slug]]']",
+                "content-['[slug]']",
+            ],
+        );
+        assert_eq!(normalized_sources, vec!["**/*", "**/*.styl"]);
     }
 
     #[test]
@@ -416,38 +1280,60 @@ mod scanner {
         // Get POSIX-style absolute path
         let full_path = format!("{}", dir.display()).replace('\\', "/");
 
-        let sources = vec![GlobEntry {
+        let sources = vec![PublicSourceEntry {
             base: full_path.clone(),
             pattern: full_path.clone(),
+            negated: false,
         }];
 
-        let mut scanner = Scanner::new(Some(sources));
+        let mut scanner = Scanner::new(sources);
         let candidates = scanner.scan();
 
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        . (git)
+        ├── ✓ project-a
+        │   └── ✓ index.html
+        └── ✓ project-b
+            └── ✓ index.html
+        ");
+
         // We've done the initial scan and found the files
         assert_eq!(
             candidates,
             vec![
-                "content-['project-a/index.html']".to_owned(),
-                "content-['project-b/index.html']".to_owned(),
+                "content-['project-a/index.html']",
+                "content-['project-b/index.html']"
             ]
         );
     }
 
     #[test]
     fn it_should_scan_content_paths_even_when_they_are_git_ignored() {
-        let candidates = scan_with_globs(
+        let ScanResult {
+            candidates,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
             &[
                 (".gitignore", "foo.styl"),
                 // We know that `.styl` extensions are ignored, so they are not covered by auto content
                 // detection.
                 ("foo.styl", "content-['foo.styl']"),
             ],
-            vec!["foo.styl"],
-        )
-        .1;
+            // But explicitly including them should still work
+            vec!["@source '**/*'", "@source 'foo.styl'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ .gitignore
+        │       foo.styl
+        └── ✓ foo.styl
+        ");
 
         assert_eq!(candidates, vec!["content-['foo.styl']"]);
+        assert_eq!(normalized_sources, vec!["**/*", "foo.styl"]);
     }
 
     #[test]
@@ -468,25 +1354,27 @@ mod scanner {
         );
 
         let sources = vec![
-            GlobEntry {
-                base: dir.join("project-a").to_string_lossy().to_string(),
-                pattern: "**/*".to_owned(),
-            },
-            GlobEntry {
-                base: dir.join("project-b").to_string_lossy().to_string(),
-                pattern: "**/*".to_owned(),
-            },
+            public_source_entry_from_pattern(dir.join("project-a"), "@source '**/*'"),
+            public_source_entry_from_pattern(dir.join("project-b"), "@source '**/*'"),
         ];
 
-        let mut scanner = Scanner::new(Some(sources));
+        let mut scanner = Scanner::new(sources);
         let candidates = scanner.scan();
 
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        . (git)
+        ├── ✓ project-a
+        │   └── ✓ index.html
+        └── ✓ project-b
+            └── ✓ index.html
+        ");
+
         // We've done the initial scan and found the files
         assert_eq!(
             candidates,
             vec![
-                "content-['project-a/index.html']".to_owned(),
-                "content-['project-b/index.html']".to_owned(),
+                "content-['project-a/index.html']",
+                "content-['project-b/index.html']"
             ]
         );
 
@@ -509,10 +1397,10 @@ mod scanner {
         assert_eq!(
             candidates,
             vec![
-                "content-['project-a/index.html']".to_owned(),
-                "content-['project-a/new.html']".to_owned(),
-                "content-['project-b/index.html']".to_owned(),
-                "content-['project-b/new.html']".to_owned(),
+                "content-['project-a/index.html']",
+                "content-['project-a/new.html']",
+                "content-['project-b/index.html']",
+                "content-['project-b/new.html']"
             ]
         );
 
@@ -541,12 +1429,12 @@ mod scanner {
         assert_eq!(
             candidates,
             vec![
-                "content-['project-a/index.html']".to_owned(),
-                "content-['project-a/new.html']".to_owned(),
-                "content-['project-a/sub1/sub2/index.html']".to_owned(),
-                "content-['project-b/index.html']".to_owned(),
-                "content-['project-b/new.html']".to_owned(),
-                "content-['project-b/sub1/sub2/index.html']".to_owned(),
+                "content-['project-a/index.html']",
+                "content-['project-a/new.html']",
+                "content-['project-a/sub1/sub2/index.html']",
+                "content-['project-b/index.html']",
+                "content-['project-b/new.html']",
+                "content-['project-b/sub1/sub2/index.html']"
             ]
         );
 
@@ -575,15 +1463,2618 @@ mod scanner {
         assert_eq!(
             candidates,
             vec![
-                "content-['project-a/index.html']".to_owned(),
-                "content-['project-a/new.html']".to_owned(),
-                "content-['project-a/sub1/sub2/index.html']".to_owned(),
-                "content-['project-a/sub1/sub2/new.html']".to_owned(),
-                "content-['project-b/index.html']".to_owned(),
-                "content-['project-b/new.html']".to_owned(),
-                "content-['project-b/sub1/sub2/index.html']".to_owned(),
-                "content-['project-b/sub1/sub2/new.html']".to_owned(),
+                "content-['project-a/index.html']",
+                "content-['project-a/new.html']",
+                "content-['project-a/sub1/sub2/index.html']",
+                "content-['project-a/sub1/sub2/new.html']",
+                "content-['project-b/index.html']",
+                "content-['project-b/new.html']",
+                "content-['project-b/sub1/sub2/index.html']",
+                "content-['project-b/sub1/sub2/new.html']"
+            ]
+        );
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        . (git)
+        ├── ✓ project-a
+        │   ├── ✓ index.html
+        │   ├── ✓ new.html
+        │   └── ✓ sub1
+        │       └── ✓ sub2
+        │           ├── ✓ index.html
+        │           └── ✓ new.html
+        └── ✓ project-b
+            ├── ✓ index.html
+            ├── ✓ new.html
+            └── ✓ sub1
+                └── ✓ sub2
+                    ├── ✓ index.html
+                    └── ✓ new.html
+        ");
+    }
+
+    #[test]
+    fn it_should_remove_deleted_files_from_scanned_files() {
+        // Create a temporary working directory
+        let dir = tempdir().unwrap().into_path();
+
+        // Initialize this directory as a git repository
+        let _ = Command::new("git").arg("init").current_dir(&dir).output();
+
+        // Create files
+        create_files_in(
+            &dir,
+            &[
+                ("src/index.html", "content-['src/index.html']"),
+                ("src/keep.html", "content-['src/keep.html']"),
+                ("src/remove.html", "content-['src/remove.html']"),
+            ],
+        );
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source '**/*'",
+        )]);
+
+        scanner.scan();
+        assert_eq!(
+            scanned_files(&mut scanner, &dir),
+            vec!["src/index.html", "src/keep.html", "src/remove.html"]
+        );
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        . (git)
+        └── ✓ src
+            ├── ✓ index.html
+            ├── ✓ keep.html
+            └── ✓ remove.html
+        ");
+
+        fs::remove_file(dir.join("src/remove.html")).unwrap();
+
+        scanner.scan();
+        assert_eq!(
+            scanned_files(&mut scanner, &dir),
+            vec!["src/index.html", "src/keep.html"]
+        );
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        . (git)
+        └── ✓ src
+            ├── ✓ index.html
+            └── ✓ keep.html
+        ");
+    }
+
+    #[test]
+    fn it_should_remove_deleted_directories_from_scanned_files() {
+        // Create a temporary working directory
+        let dir = tempdir().unwrap().into_path();
+
+        // Initialize this directory as a git repository
+        let _ = Command::new("git").arg("init").current_dir(&dir).output();
+
+        // Create files
+        create_files_in(
+            &dir,
+            &[
+                ("src/index.html", "content-['src/index.html']"),
+                ("src/keep/index.html", "content-['src/keep/index.html']"),
+                ("src/remove/index.html", "content-['src/remove/index.html']"),
+                (
+                    "src/remove/nested/index.html",
+                    "content-['src/remove/nested/index.html']",
+                ),
+            ],
+        );
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source '**/*'",
+        )]);
+
+        scanner.scan();
+        assert_eq!(
+            scanned_files(&mut scanner, &dir),
+            vec![
+                "src/index.html",
+                "src/keep/index.html",
+                "src/remove/index.html",
+                "src/remove/nested/index.html",
+            ]
+        );
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        . (git)
+        └── ✓ src
+            ├── ✓ index.html
+            ├── ✓ keep
+            │   └── ✓ index.html
+            └── ✓ remove
+                ├── ✓ index.html
+                └── ✓ nested
+                    └── ✓ index.html
+        ");
+
+        fs::remove_dir_all(dir.join("src/remove")).unwrap();
+
+        scanner.scan();
+        assert_eq!(
+            scanned_files(&mut scanner, &dir),
+            vec!["src/index.html", "src/keep/index.html"]
+        );
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        . (git)
+        └── ✓ src
+            ├── ✓ index.html
+            └── ✓ keep
+                └── ✓ index.html
+        ");
+    }
+
+    #[test]
+    fn it_should_remove_deleted_directories_from_scanned_globs() {
+        // Create a temporary working directory
+        let dir = tempdir().unwrap().into_path();
+
+        // Initialize this directory as a git repository
+        let _ = Command::new("git").arg("init").current_dir(&dir).output();
+
+        // Create files
+        create_files_in(
+            &dir,
+            &[
+                ("index.html", "content-['index.html']"),
+                ("src/index.html", "content-['src/index.html']"),
+            ],
+        );
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source '**/*'",
+        )]);
+
+        scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        . (git)
+        ├── ✓ index.html
+        └── ✓ src
+            └── ✓ index.html
+        ");
+
+        let globs = scanned_globs(&mut scanner, &dir);
+        assert!(globs.iter().any(|glob| glob.starts_with("src/**/*")));
+
+        fs::remove_dir_all(dir.join("src")).unwrap();
+
+        scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        . (git)
+        └── ✓ index.html
+        ");
+
+        let globs = scanned_globs(&mut scanner, &dir);
+        assert!(!globs.iter().any(|glob| glob.starts_with("src/**/*")));
+    }
+
+    #[test]
+    fn it_should_track_files_scanned_by_the_last_scan() {
+        let dir = tempdir().unwrap().into_path();
+
+        let _ = Command::new("git").arg("init").current_dir(&dir).output();
+
+        create_files_in(
+            &dir,
+            &[
+                ("src/index.html", "content-['src/index.html']"),
+                ("src/keep.html", "content-['src/keep.html']"),
+            ],
+        );
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source '**/*'",
+        )]);
+
+        assert_eq!(
+            scanner.scan(),
+            vec!["content-['src/index.html']", "content-['src/keep.html']"]
+        );
+
+        assert_eq!(
+            scanner.scan(),
+            vec!["content-['src/index.html']", "content-['src/keep.html']"]
+        );
+        assert_eq!(scanner.get_scanned_files(), Vec::<String>::new());
+
+        sleep(Duration::from_millis(10));
+        fs::write(dir.join("src/index.html"), "content-['src/changed.html']").unwrap();
+
+        assert_eq!(
+            scanner.scan(),
+            vec![
+                "content-['src/changed.html']",
+                "content-['src/index.html']",
+                "content-['src/keep.html']",
+            ]
+        );
+        assert_eq!(
+            normalize_files(scanner.get_scanned_files(), &dir),
+            vec!["src/index.html"]
+        );
+    }
+
+    #[test]
+    fn it_should_ignore_negated_custom_sources() {
+        let ScanResult {
+            candidates,
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                ("src/index.ts", "content-['src/index.ts']"),
+                ("src/colors/red.jsx", "content-['src/colors/red.jsx']"),
+                ("src/colors/blue.tsx", "content-['src/colors/blue.tsx']"),
+                ("src/colors/green.tsx", "content-['src/colors/green.tsx']"),
+                ("src/utils/string.ts", "content-['src/utils/string.ts']"),
+                ("src/utils/date.ts", "content-['src/utils/date.ts']"),
+                ("src/utils/file.ts", "content-['src/utils/file.ts']"),
+                (
+                    "src/admin/foo/template.html",
+                    "content-['src/admin/template.html']",
+                ),
+                (
+                    "src/templates/index.html",
+                    "content-['src/templates/index.html']",
+                ),
+            ],
+            vec![
+                "@source '**/*'",
+                "@source not 'src/index.ts'",
+                "@source not '**/*.{jsx,tsx}'",
+                "@source not 'src/utils'",
+                "@source not 'dist'",
+            ],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✓ src
+            ├── ✓ admin
+            │   └── ✓ foo
+            │       └── ✓ template.html
+            ├── ✗ colors
+            │   ├── ✗ blue.tsx
+            │   ├── ✗ green.tsx
+            │   └── ✗ red.jsx
+            ├── ✗ index.ts
+            ├── ✓ templates
+            │   └── ✓ index.html
+            └── ✗ utils
+                ├── ✗ date.ts
+                ├── ✗ file.ts
+                └── ✗ string.ts
+        ");
+
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['src/admin/template.html']",
+                "content-['src/templates/index.html']",
+            ]
+        );
+
+        assert_eq!(
+            files,
+            vec![
+                "src/admin/foo/template.html",
+                "src/templates/index.html",
+                // These files are ignored and thus do not need to be watched:
+
+                // "src/colors/blue.tsx",
+                // "src/colors/green.tsx",
+                // "src/colors/red.jsx",
+                // "src/index.ts",
+                // "src/utils/date.ts",
+                // "src/utils/file.ts",
+                // "src/utils/string.ts"
+            ]
+        );
+        assert_eq!(
+            globs,
+            vec![
+                "*",
+                "src/*/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+                "src/admin/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+                "src/colors/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+                "src/templates/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+            ]
+        );
+
+        assert_eq!(normalized_sources, vec!["**/*",]);
+    }
+
+    #[test]
+    fn it_should_include_defined_extensions_that_are_ignored_by_default() {
+        let ScanResult {
+            candidates,
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
+            // Typically skipped
+            &[
+                ("src/index.exe", "content-['src/index.exe']"),
+                ("src/index.bin", "content-['src/index.bin']"),
+                ("out/out.exe", "content-['out/out.exe']"),
+            ],
+            // But explicitly included
+            vec!["@source '**/*'", "@source 'src/**/*.{exe,bin}'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ out
+        │   └── ✗ out.exe
+        └── ✓ src
+            ├── ✓ index.bin
+            └── ✓ index.exe
+        ");
+
+        assert_eq!(
+            candidates,
+            vec!["content-['src/index.bin']", "content-['src/index.exe']",]
+        );
+        assert_eq!(files, vec!["src/index.bin", "src/index.exe",]);
+        assert_eq!(
+            globs,
+            vec![
+                "*",
+                // Contains `.exe` and `.bin` in the list
+                "out/**/*.{aspx,astro,bin,cjs,cts,eex,erb,exe,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+                "src/{**/*.bin,**/*.exe,**/*.{aspx,astro,bin,cjs,cts,eex,erb,exe,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}}",
+            ]
+        );
+        assert_eq!(
+            normalized_sources,
+            vec!["**/*", "src/**/*.bin", "src/**/*.exe"]
+        );
+    }
+
+    #[test]
+    fn it_should_work_with_manual_glob_only() {
+        let ScanResult {
+            candidates,
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                ("index.html", "content-['index.html']"),
+                ("src/index.html", "content-['src/index.html']"),
+                ("src/ignore.html", "content-['src/ignore.html']"),
+                ("src/admin/index.html", "content-['src/admin/index.html']"),
+                ("src/admin/ignore.html", "content-['src/admin/ignore.html']"),
+                (
+                    "src/dashboard/index.html",
+                    "content-['src/dashboard/index.html']",
+                ),
+                (
+                    "src/dashboard/ignore.html",
+                    "content-['src/dashboard/ignore.html']",
+                ),
+                ("src/lib.ts", "content-['src/lib.ts']"),
+            ],
+            vec![
+                "@source './src/**/*.html'",
+                "@source not './src/index.html'",
+                "@source not './src/**/ignore.html'",
+            ],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ index.html
+        └── ✓ src
+            ├── ✓ admin
+            │   ├── ✗ ignore.html
+            │   └── ✓ index.html
+            ├── ✓ dashboard
+            │   ├── ✗ ignore.html
+            │   └── ✓ index.html
+            ├── ✗ ignore.html
+            ├── ✗ index.html
+            └── ✗ lib.ts
+        ");
+
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['src/admin/index.html']",
+                "content-['src/dashboard/index.html']",
+            ]
+        );
+
+        assert_eq!(
+            files,
+            vec!["src/admin/index.html", "src/dashboard/index.html",]
+        );
+        assert_eq!(globs, vec!["src/**/*.html"]);
+        assert_eq!(normalized_sources, vec!["src/**/*.html"]);
+    }
+
+    #[test]
+    fn it_should_restrict_explicit_file_sources_to_the_matching_file() {
+        let ScanResult {
+            candidates,
+            files,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                ("src/foo.html", "content-['src/foo.html']"),
+                ("src/bar.html", "content-['src/bar.html']"),
+            ],
+            vec!["@source './src/foo.html'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✓ src
+            ├── ✗ bar.html
+            └── ✓ foo.html
+        ");
+
+        assert_eq!(candidates, vec!["content-['src/foo.html']"]);
+        assert_eq!(files, vec!["src/foo.html"]);
+    }
+
+    #[test]
+    fn it_should_combine_multiple_restricted_sources_for_the_same_base() {
+        let ScanResult {
+            candidates,
+            files,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                ("src/foo.html", "content-['src/foo.html']"),
+                ("src/bar.html", "content-['src/bar.html']"),
+                ("src/baz.html", "content-['src/baz.html']"),
+            ],
+            vec!["@source './src/foo.html'", "@source './src/bar.html'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✓ src
+            ├── ✓ bar.html
+            ├── ✗ baz.html
+            └── ✓ foo.html
+        ");
+
+        assert_eq!(
+            candidates,
+            vec!["content-['src/bar.html']", "content-['src/foo.html']"]
+        );
+        assert_eq!(files, vec!["src/bar.html", "src/foo.html"]);
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/20333
+    #[test]
+    fn it_should_combine_nested_and_root_restricted_sources() {
+        // The restriction (`*`) added for the root-level file must not prevent walking into the
+        // `nested` folder that another explicit source points into. At the same time, relaxing
+        // that restriction to `/*` must not accidentally open up sibling folders (`ignore-me`)
+        // or files that no explicit source points at.
+        let paths_with_content = &[
+            ("nested/component.html", "content-['nested/component.html']"),
+            ("nested/ignore-me.html", "content-['nested/ignore-me.html']"),
+            ("ignore-me/component.html", "content-['ignore-me']"),
+            ("component-sources.classes.txt", "content-['classes.txt']"),
+            ("ignore-me.txt", "content-['ignore-me.txt']"),
+        ];
+
+        let ScanResult {
+            candidates,
+            files,
+            tree,
+            ..
+        } = scan_with_globs(
+            paths_with_content,
+            vec![
+                "@source './nested/component.html'",
+                "@source './component-sources.classes.txt'",
+            ],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✓ component-sources.classes.txt
+        ├── ✗ ignore-me
+        │   └── ✗ component.html
+        ├── ✗ ignore-me.txt
+        └── ✓ nested
+            ├── ✓ component.html
+            └── ✗ ignore-me.html
+        ");
+
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['classes.txt']",
+                "content-['nested/component.html']"
+            ]
+        );
+        assert_eq!(
+            files,
+            vec!["component-sources.classes.txt", "nested/component.html"]
+        );
+
+        // Same setup, but with the root-level source declared first
+        let ScanResult {
+            candidates,
+            files,
+            tree,
+            ..
+        } = scan_with_globs(
+            paths_with_content,
+            vec![
+                "@source './component-sources.classes.txt'",
+                "@source './nested/component.html'",
+            ],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✓ component-sources.classes.txt
+        ├── ✗ ignore-me
+        │   └── ✗ component.html
+        ├── ✗ ignore-me.txt
+        └── ✓ nested
+            ├── ✓ component.html
+            └── ✗ ignore-me.html
+        ");
+
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['classes.txt']",
+                "content-['nested/component.html']"
+            ]
+        );
+        assert_eq!(
+            files,
+            vec!["component-sources.classes.txt", "nested/component.html"]
+        );
+    }
+
+    #[test]
+    fn it_should_allow_later_ignores_to_override_restricted_sources() {
+        let ScanResult {
+            candidates,
+            files,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[("src/foo.html", "content-['src/foo.html']")],
+            vec!["@source './src/foo.html'", "@source not './src/foo.html'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✗ src
+            └── ✗ foo.html
+        ");
+
+        assert!(candidates.is_empty());
+        assert!(files.is_empty());
+    }
+
+    #[test]
+    fn it_should_handle_sources_with_parent_patterns() {
+        {
+            let ScanResult {
+                candidates,
+                files,
+                tree,
+                ..
+            } = scan_with_globs(
+                &[
+                    ("src/foo.html", "content-['src/foo.html']"),
+                    ("src/bar/index.html", "content-['src/bar/index.html']"),
+                    ("src/bar/ignore.html", "content-['src/bar/ignore.html']"),
+                ],
+                vec!["@source './src/ba*/*.html'"],
+            );
+
+            assert_snapshot!(tree, @"
+            . (git)
+            └── ✓ src
+                ├── ✓ bar
+                │   ├── ✓ ignore.html
+                │   └── ✓ index.html
+                └── ✗ foo.html
+            ");
+
+            assert_eq!(
+                candidates,
+                vec![
+                    "content-['src/bar/ignore.html']",
+                    "content-['src/bar/index.html']"
+                ]
+            );
+            assert_eq!(files, vec!["src/bar/ignore.html", "src/bar/index.html"]);
+        }
+
+        {
+            let ScanResult {
+                candidates,
+                files,
+                tree,
+                ..
+            } = scan_with_globs(
+                &[
+                    ("src/foo.html", "content-['src/foo.html']"),
+                    ("src/bar/index.html", "content-['src/bar/index.html']"),
+                    ("src/bar/ignore.html", "content-['src/bar/ignore.html']"),
+                ],
+                vec![
+                    "@source './src/ba*/*.html'",
+                    "@source not './src/bar/ignore.html'", // Ignore the ignore.html
+                ],
+            );
+
+            assert_snapshot!(tree, @"
+            . (git)
+            └── ✓ src
+                ├── ✓ bar
+                │   ├── ✗ ignore.html
+                │   └── ✓ index.html
+                └── ✗ foo.html
+            ");
+
+            assert_eq!(candidates, vec!["content-['src/bar/index.html']"]);
+            assert_eq!(files, vec!["src/bar/index.html"]);
+        }
+
+        {
+            let ScanResult {
+                candidates,
+                files,
+                tree,
+                ..
+            } = scan_with_globs(
+                &[
+                    ("src/foo.html", "content-['src/foo.html']"),
+                    ("src/bar/index.html", "content-['src/bar/index.html']"),
+                    ("src/bar/ignore.html", "content-['src/bar/ignore.html']"),
+                ],
+                vec!["@source '**/*'", "@source not './src/ba*/*.html'"],
+            );
+
+            assert_snapshot!(tree, @"
+            . (git)
+            └── ✓ src
+                ├── ✗ bar
+                │   ├── ✗ ignore.html
+                │   └── ✗ index.html
+                └── ✓ foo.html
+            ");
+
+            assert_eq!(candidates, vec!["content-['src/foo.html']"]);
+            assert_eq!(files, vec!["src/foo.html"]);
+        }
+
+        {
+            let ScanResult {
+                candidates,
+                files,
+                tree,
+                ..
+            } = scan_with_globs(
+                &[
+                    ("src/foo.html", "content-['src/foo.html']"),
+                    ("src/bar/index.html", "content-['src/bar/index.html']"),
+                    ("src/bar/ignore.html", "content-['src/bar/ignore.html']"),
+                ],
+                vec![
+                    "@source '**/*'",
+                    "@source not './src/ba*/*.html'",
+                    "@source './src/bar/index.html'", //
+                ],
+            );
+
+            assert_snapshot!(tree, @"
+            . (git)
+            └── ✓ src
+                ├── ✓ bar
+                │   ├── ✗ ignore.html
+                │   └── ✓ index.html
+                └── ✓ foo.html
+            ");
+
+            assert_eq!(
+                candidates,
+                vec!["content-['src/bar/index.html']", "content-['src/foo.html']"]
+            );
+            assert_eq!(files, vec!["src/bar/index.html", "src/foo.html"]);
+        }
+    }
+
+    #[test]
+    fn nested_explicit_source_should_not_suppress_siblings_of_broad_source() {
+        // A broad `**/*` source should keep auto-detecting every file, even when a more
+        // specific `@source` points at a single file inside a subdirectory. The restriction
+        // added for the explicit file must not hide its siblings from the broad source.
+        let ScanResult {
+            candidates,
+            files,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                ("src/components/button.html", "content-['button']"),
+                ("src/components/card.html", "content-['card']"),
+            ],
+            vec!["@source '**/*'", "@source './src/components/button.html'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✓ src
+            └── ✓ components
+                ├── ✓ button.html
+                └── ✓ card.html
+        ");
+
+        assert_eq!(candidates, vec!["content-['button']", "content-['card']"]);
+        assert_eq!(
+            files,
+            vec!["src/components/button.html", "src/components/card.html"]
+        );
+    }
+
+    #[test]
+    fn nested_explicit_source_should_not_suppress_siblings_of_auto_source() {
+        // Same as above, but the broad source is an auto-detected directory (`@source "src"`)
+        // and the explicit file lives in a nested subdirectory of it.
+        let ScanResult {
+            candidates,
+            files,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                ("src/components/button.html", "content-['button']"),
+                ("src/components/card.html", "content-['card']"),
+            ],
+            vec!["@source 'src'", "@source './src/components/button.html'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✓ src
+            └── ✓ components
+                ├── ✓ button.html
+                └── ✓ card.html
+        ");
+
+        assert_eq!(candidates, vec!["content-['button']", "content-['card']"]);
+        assert_eq!(
+            files,
+            vec!["src/components/button.html", "src/components/card.html"]
+        );
+    }
+
+    #[test]
+    fn root_file_source_should_not_suppress_sibling_source_roots() {
+        let ScanResult {
+            candidates, tree, ..
+        } = scan_with_globs(
+            &[
+                ("index.css", ""),
+                ("src/index.html", "content-['src/index.html']"),
+                ("pages/foo.html", "content-['pages/foo.html']"),
+                ("pages/nested/foo.html", "content-['pages/nested/foo.html']"),
+            ],
+            vec![
+                "@source './src'",
+                "@source './pages/**/*.html'",
+                "@source './index.css'",
+            ],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✓ index.css
+        ├── ✓ pages
+        │   ├── ✓ foo.html
+        │   └── ✓ nested
+        │       └── ✓ foo.html
+        └── ✓ src
+            └── ✓ index.html
+        ");
+
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['pages/foo.html']",
+                "content-['pages/nested/foo.html']",
+                "content-['src/index.html']",
             ]
         );
     }
+
+    #[test]
+    fn it_respects_gitignore_in_workspace_root() {
+        let ScanResult {
+            candidates,
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                (".gitignore", "ignore-1.html\nweb/ignore-2.html"),
+                ("src/index.html", "content-['src/index.html']"),
+                ("web/index.html", "content-['web/index.html']"),
+                ("web/ignore-1.html", "content-['web/ignore-1.html']"),
+                ("web/ignore-2.html", "content-['web/ignore-2.html']"),
+            ],
+            vec!["@source './src'", "@source './web'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ .gitignore
+        │       ignore-1.html
+        │       web/ignore-2.html
+        ├── ✓ src
+        │   └── ✓ index.html
+        └── ✓ web
+            ├── ✗ ignore-1.html
+            ├── ✗ ignore-2.html
+            └── ✓ index.html
+        ");
+
+        assert_eq!(
+            candidates,
+            vec!["content-['src/index.html']", "content-['web/index.html']",]
+        );
+
+        assert_eq!(files, vec!["src/index.html", "web/index.html",]);
+        assert_eq!(globs, vec!["src/*", "web/*",]);
+        assert_eq!(normalized_sources, vec!["src/**/*", "web/**/*",]);
+    }
+
+    #[test]
+    fn it_includes_skipped_by_default_extensions_with_a_specific_source() {
+        let ScanResult {
+            candidates,
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                ("src/logo.jpg", "content-['/src/logo.jpg']"),
+                ("src/logo.png", "content-['/src/logo.png']"),
+            ],
+            vec!["@source './src/logo.{jpg,png}'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✓ src
+            ├── ✓ logo.jpg
+            └── ✓ logo.png
+        ");
+
+        assert_eq!(
+            candidates,
+            vec!["content-['/src/logo.jpg']", "content-['/src/logo.png']"]
+        );
+        assert_eq!(files, vec!["src/logo.jpg", "src/logo.png"]);
+        assert!(globs.is_empty());
+        assert_eq!(normalized_sources, vec!["src/logo.jpg", "src/logo.png"]);
+    }
+
+    #[test]
+    fn it_respects_gitignore_in_workspace_root_for_manual_globs() {
+        let ScanResult {
+            candidates,
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                (".gitignore", "ignore-1.html\n/web/ignore-2.html"),
+                ("web/index.html", "content-['web/index.html']"),
+                ("web/ignore-1.html", "content-['web/ignore-1.html']"),
+                ("web/ignore-2.html", "content-['web/ignore-2.html']"),
+            ],
+            vec!["@source './web'", "@source './web/ignore-1.html'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ .gitignore
+        │       ignore-1.html
+        │       /web/ignore-2.html
+        └── ✓ web
+            ├── ✓ ignore-1.html
+            ├── ✗ ignore-2.html
+            └── ✓ index.html
+        ");
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['web/ignore-1.html']",
+                "content-['web/index.html']",
+            ]
+        );
+
+        assert_eq!(files, vec!["web/ignore-1.html", "web/index.html",]);
+        assert_eq!(globs, vec!["web/*"]);
+        assert_eq!(normalized_sources, vec!["web/**/*", "web/ignore-1.html"]);
+    }
+
+    #[test]
+    fn it_respects_gitignore_files_with_whitelist_patterns() {
+        // https://github.com/tailwindlabs/tailwindcss/discussions/20382
+        //
+        // A `.gitignore` that ignores everything (`/*`) and then whitelists specific
+        // directories and files using negated patterns.
+        let ScanResult {
+            files,
+            candidates,
+            tree,
+            ..
+        } = scan(&[
+            (
+                ".gitignore",
+                "/*\n!/app\n!/public\n!/package.json\n!/.gitignore\n",
+            ),
+            ("app/index.html", "content-['app/index.html']"),
+            ("public/index.html", "content-['public/index.html']"),
+            ("package.json", ""),
+            // These are all ignored by the `/*` rule because they are not whitelisted
+            ("build/generated.html", "content-['build/generated.html']"),
+            ("logs/dev.log", "content-['logs/dev.log']"),
+            (
+                "node_modules/my-ui-lib/index.html",
+                "content-['node_modules/my-ui-lib/index.html']",
+            ),
+        ]);
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ .gitignore
+        │       /*
+        │       !/app
+        │       !/public
+        │       !/package.json
+        │       !/.gitignore
+        ├── ✓ app
+        │   └── ✓ index.html
+        ├── ✗ build
+        │   └── ✗ generated.html
+        ├── ✗ logs
+        │   └── ✗ dev.log
+        ├── ✗ node_modules
+        │   └── ✗ my-ui-lib
+        │       └── ✗ index.html
+        ├── ✓ package.json
+        └── ✓ public
+            └── ✓ index.html
+        ");
+
+        assert_eq!(
+            files,
+            vec!["app/index.html", "package.json", "public/index.html"]
+        );
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['app/index.html']",
+                "content-['public/index.html']"
+            ]
+        );
+    }
+
+    #[test]
+    fn it_respects_gitignore_files_with_nested_whitelist_patterns() {
+        // Example from the official `.gitignore` documentation:
+        //
+        // ```gitignore
+        // # exclude everything except directory foo/bar
+        // /*
+        // !/foo
+        // /foo/*
+        // !/foo/bar
+        // ```
+        let ScanResult {
+            files,
+            candidates,
+            tree,
+            ..
+        } = scan(&[
+            (
+                ".gitignore",
+                "# exclude everything except directory foo/bar\n/*\n!/foo\n/foo/*\n!/foo/bar\n",
+            ),
+            ("foo/bar/index.html", "content-['foo/bar/index.html']"),
+            (
+                "foo/bar/nested/index.html",
+                "content-['foo/bar/nested/index.html']",
+            ),
+            // These are all ignored because they are not inside `foo/bar`
+            ("index.html", "content-['index.html']"),
+            ("foo/index.html", "content-['foo/index.html']"),
+            ("foo/baz/index.html", "content-['foo/baz/index.html']"),
+        ]);
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ .gitignore
+        │       # exclude everything except directory foo/bar
+        │       /*
+        │       !/foo
+        │       /foo/*
+        │       !/foo/bar
+        ├── ✓ foo
+        │   ├── ✓ bar
+        │   │   ├── ✓ index.html
+        │   │   └── ✓ nested
+        │   │       └── ✓ index.html
+        │   ├── ✗ baz
+        │   │   └── ✗ index.html
+        │   └── ✗ index.html
+        └── ✗ index.html
+        ");
+
+        assert_eq!(
+            files,
+            vec!["foo/bar/index.html", "foo/bar/nested/index.html"]
+        );
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['foo/bar/index.html']",
+                "content-['foo/bar/nested/index.html']"
+            ]
+        );
+    }
+
+    #[test]
+    fn explicit_source_directories_respect_their_own_gitignore() {
+        // A directory referenced via `@source` behaves like an auto source detection
+        // root. The `.gitignore` file _inside_ that directory still applies to its
+        // contents. Only when the directory itself is ignored (by an ancestor
+        // `.gitignore`, see the tests above) do we bypass the ignore rules.
+        let ScanResult {
+            files,
+            candidates,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                ("vendor/.gitignore", "ignored.html"),
+                ("vendor/index.html", "content-['vendor/index.html']"),
+                ("vendor/ignored.html", "content-['vendor/ignored.html']"),
+            ],
+            vec!["@source 'vendor'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✓ vendor
+            ├── ✗ .gitignore
+            │       ignored.html
+            ├── ✗ ignored.html
+            └── ✓ index.html
+        ");
+
+        assert_eq!(files, vec!["vendor/index.html"]);
+        assert_eq!(candidates, vec!["content-['vendor/index.html']"]);
+    }
+
+    #[test]
+    fn explicit_sources_can_include_files_inside_gitignored_parent_directories() {
+        let ScanResult {
+            candidates,
+            files,
+            globs,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                (".gitignore", "src/efgh/"),
+                ("src/efgh/index.html", "content-['src/efgh/index.html']"),
+                ("src/efgh/ignore.js", "content-['src/efgh/ignore.js']"),
+                ("src/abcd/index.html", "content-['src/abcd/index.html']"),
+            ],
+            vec!["@source './src/ef*/*.html'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ .gitignore
+        │       src/efgh/
+        └── ✓ src
+            ├── ✗ abcd
+            │   └── ✗ index.html
+            └── ✓ efgh
+                ├── ✗ ignore.js
+                └── ✓ index.html
+        ");
+
+        assert_eq!(candidates, vec!["content-['src/efgh/index.html']"]);
+        assert_eq!(files, vec!["src/efgh/index.html"]);
+        assert_eq!(globs, vec!["src/ef*/*.html"]);
+    }
+
+    #[test]
+    fn skips_ignore_files_outside_of_a_repo() {
+        // Create a temporary working directory
+        let dir = tempdir().unwrap().into_path();
+
+        // Create files
+        create_files_in(
+            &dir,
+            &[
+                // This file should always be picked up
+                ("home/project/apps/web/index.html", "content-['index.html']"),
+                // Set up various ignore rules
+                ("home/.gitignore", "ignore-home.html"),
+                ("home/project/.gitignore", "ignore-project.html"),
+                ("home/project/apps/.gitignore", "ignore-apps.html"),
+                ("home/project/apps/web/.gitignore", "ignore-web.html"),
+                // Some of these should be ignored depending on which dir is the repo root
+                (
+                    "home/project/apps/web/ignore-home.html",
+                    "content-['ignore-home.html']",
+                ),
+                (
+                    "home/project/apps/web/ignore-project.html",
+                    "content-['ignore-project.html']",
+                ),
+                (
+                    "home/project/apps/web/ignore-apps.html",
+                    "content-['ignore-apps.html']",
+                ),
+                (
+                    "home/project/apps/web/ignore-web.html",
+                    "content-['ignore-web.html']",
+                ),
+                // Auto content detection outside of `web/`
+                (
+                    "home/project/apps/admin/index.html",
+                    "content-['home/project/apps/admin/index.html']",
+                ),
+                // Manual sources outside of `web/`
+                (
+                    "home/project/apps/dashboard/index.html",
+                    "content-['home/project/apps/dashboard/index.html']",
+                ),
+            ],
+        );
+
+        let sources = vec![
+            public_source_entry_from_pattern(
+                dir.join("home/project/apps/web")
+                    .to_string_lossy()
+                    .to_string()
+                    .into(),
+                "@source '**/*'",
+            ),
+            public_source_entry_from_pattern(
+                dir.join("home/project/apps/web")
+                    .to_string_lossy()
+                    .to_string()
+                    .into(),
+                "@source '../admin'",
+            ),
+            public_source_entry_from_pattern(
+                dir.join("home/project/apps/web")
+                    .to_string_lossy()
+                    .to_string()
+                    .into(),
+                "@source '../dashboard/*.html'",
+            ),
+        ];
+
+        let mut scanner = Scanner::new(sources.clone());
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        └── ✓ home
+            ├── ✗ .gitignore
+            │       ignore-home.html
+            └── ✓ project
+                ├── ✗ .gitignore
+                │       ignore-project.html
+                └── ✓ apps
+                    ├── ✗ .gitignore
+                    │       ignore-apps.html
+                    ├── ✓ admin
+                    │   └── ✓ index.html
+                    ├── ✓ dashboard
+                    │   └── ✓ index.html
+                    └── ✓ web
+                        ├── ✗ .gitignore
+                        │       ignore-web.html
+                        ├── ✗ ignore-apps.html
+                        ├── ✗ ignore-home.html
+                        ├── ✗ ignore-project.html
+                        ├── ✗ ignore-web.html
+                        └── ✓ index.html
+        ");
+
+        // All ignore files are applied because there's no git repo
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['home/project/apps/admin/index.html']",
+                "content-['home/project/apps/dashboard/index.html']",
+                "content-['index.html']"
+            ]
+        );
+
+        // Initialize `home` as a git repository and scan again
+        // The results should be the same as before
+        _ = Command::new("git")
+            .arg("init")
+            .current_dir(dir.join("home"))
+            .output();
+        let mut scanner = Scanner::new(sources.clone());
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        └── ✓ home (git)
+            ├── ✗ .gitignore
+            │       ignore-home.html
+            └── ✓ project
+                ├── ✗ .gitignore
+                │       ignore-project.html
+                └── ✓ apps
+                    ├── ✗ .gitignore
+                    │       ignore-apps.html
+                    ├── ✓ admin
+                    │   └── ✓ index.html
+                    ├── ✓ dashboard
+                    │   └── ✓ index.html
+                    └── ✓ web
+                        ├── ✗ .gitignore
+                        │       ignore-web.html
+                        ├── ✗ ignore-apps.html
+                        ├── ✗ ignore-home.html
+                        ├── ✗ ignore-project.html
+                        ├── ✗ ignore-web.html
+                        └── ✓ index.html
+        ");
+
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['home/project/apps/admin/index.html']",
+                "content-['home/project/apps/dashboard/index.html']",
+                "content-['index.html']"
+            ]
+        );
+
+        // Drop the .git folder
+        fs::remove_dir_all(dir.join("home/.git")).unwrap();
+
+        // Initialize `home/project` as a git repository and scan again
+        _ = Command::new("git")
+            .arg("init")
+            .current_dir(dir.join("home/project"))
+            .output();
+        let mut scanner = Scanner::new(sources.clone());
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        └── ✓ home
+            ├── ✗ .gitignore
+            │       ignore-home.html
+            └── ✓ project (git)
+                ├── ✗ .gitignore
+                │       ignore-project.html
+                └── ✓ apps
+                    ├── ✗ .gitignore
+                    │       ignore-apps.html
+                    ├── ✓ admin
+                    │   └── ✓ index.html
+                    ├── ✓ dashboard
+                    │   └── ✓ index.html
+                    └── ✓ web
+                        ├── ✗ .gitignore
+                        │       ignore-web.html
+                        ├── ✗ ignore-apps.html
+                        ├── ✓ ignore-home.html
+                        ├── ✗ ignore-project.html
+                        ├── ✗ ignore-web.html
+                        └── ✓ index.html
+        ");
+
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['home/project/apps/admin/index.html']",
+                "content-['home/project/apps/dashboard/index.html']",
+                "content-['ignore-home.html']",
+                "content-['index.html']"
+            ]
+        );
+
+        // Drop the .git folder
+        fs::remove_dir_all(dir.join("home/project/.git")).unwrap();
+
+        // Initialize `home/project/apps` as a git repository and scan again
+        _ = Command::new("git")
+            .arg("init")
+            .current_dir(dir.join("home/project/apps"))
+            .output();
+        let mut scanner = Scanner::new(sources.clone());
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        └── ✓ home
+            ├── ✗ .gitignore
+            │       ignore-home.html
+            └── ✓ project
+                ├── ✗ .gitignore
+                │       ignore-project.html
+                └── ✓ apps (git)
+                    ├── ✗ .gitignore
+                    │       ignore-apps.html
+                    ├── ✓ admin
+                    │   └── ✓ index.html
+                    ├── ✓ dashboard
+                    │   └── ✓ index.html
+                    └── ✓ web
+                        ├── ✗ .gitignore
+                        │       ignore-web.html
+                        ├── ✗ ignore-apps.html
+                        ├── ✓ ignore-home.html
+                        ├── ✓ ignore-project.html
+                        ├── ✗ ignore-web.html
+                        └── ✓ index.html
+        ");
+
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['home/project/apps/admin/index.html']",
+                "content-['home/project/apps/dashboard/index.html']",
+                "content-['ignore-home.html']",
+                "content-['ignore-project.html']",
+                "content-['index.html']"
+            ]
+        );
+
+        // Drop the .git folder
+        fs::remove_dir_all(dir.join("home/project/apps/.git")).unwrap();
+
+        // Initialize `home/project/apps` as a git repository and scan again
+        _ = Command::new("git")
+            .arg("init")
+            .current_dir(dir.join("home/project/apps/web"))
+            .output();
+
+        let mut scanner = Scanner::new(sources.clone());
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        └── ✓ home
+            ├── ✗ .gitignore
+            │       ignore-home.html
+            └── ✓ project
+                ├── ✗ .gitignore
+                │       ignore-project.html
+                └── ✓ apps
+                    ├── ✗ .gitignore
+                    │       ignore-apps.html
+                    ├── ✓ admin
+                    │   └── ✓ index.html
+                    ├── ✓ dashboard
+                    │   └── ✓ index.html
+                    └── ✓ web (git)
+                        ├── ✗ .gitignore
+                        │       ignore-web.html
+                        ├── ✓ ignore-apps.html
+                        ├── ✓ ignore-home.html
+                        ├── ✓ ignore-project.html
+                        ├── ✗ ignore-web.html
+                        └── ✓ index.html
+        ");
+
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['home/project/apps/admin/index.html']",
+                "content-['home/project/apps/dashboard/index.html']",
+                "content-['ignore-apps.html']",
+                "content-['ignore-home.html']",
+                "content-['ignore-project.html']",
+                "content-['index.html']",
+            ]
+        );
+    }
+
+    #[test]
+    fn test_explicitly_ignore_explicitly_allowed_files() {
+        // Create a temporary working directory
+        let dir = tempdir().unwrap().into_path();
+
+        // Create files
+        create_files_in(
+            &dir,
+            &[
+                ("src/keep-me.html", "content-['keep-me.html']"),
+                ("src/ignore-me.html", "content-['ignore-me.html']"),
+            ],
+        );
+
+        let sources = vec![
+            public_source_entry_from_pattern(dir.clone(), "@source '**/*.html'"),
+            public_source_entry_from_pattern(dir.clone(), "@source not 'src/ignore-me.html'"),
+        ];
+
+        let mut scanner = Scanner::new(sources.clone());
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        └── ✓ src
+            ├── ✗ ignore-me.html
+            └── ✓ keep-me.html
+        ");
+
+        assert_eq!(candidates, vec!["content-['keep-me.html']"]);
+    }
+
+    #[test]
+    fn test_works_with_filenames_containing_glob_characters() {
+        // Create a temporary working directory
+        let dir = tempdir().unwrap().into_path();
+
+        // Create files
+        create_files_in(
+            &dir,
+            &[
+                ("src/app/[foo]/ignore-me.html", "content-['ignore-me.html']"),
+                ("src/app/[foo]/keep-me.html", "content-['keep-me.html']"),
+            ],
+        );
+
+        let sources = vec![
+            public_source_entry_from_pattern(dir.clone(), "@source '**/*'"),
+            public_source_entry_from_pattern(
+                dir.clone(),
+                "@source not 'src/app/[foo]/ignore*.html'",
+            ),
+        ];
+
+        let mut scanner = Scanner::new(sources.clone());
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        └── ✓ src
+            └── ✓ app
+                └── ✓ [foo]
+                    ├── ✗ ignore-me.html
+                    └── ✓ keep-me.html
+        ");
+
+        assert_eq!(candidates, vec!["content-['keep-me.html']"]);
+    }
+
+    #[test]
+    fn test_ignore_files_can_be_included_with_custom_source_rule() {
+        // Create a temporary working directory
+        let dir = tempdir().unwrap().into_path();
+
+        // Create files
+        create_files_in(
+            &dir,
+            &[("src/keep-me.html", "content-['src/keep-me.html']")],
+        );
+
+        let mut scanner = Scanner::new(vec![
+            public_source_entry_from_pattern(dir.clone(), "@source '**/*.html'"),
+            public_source_entry_from_pattern(
+                dir.clone(),
+                "@source not 'src/ignored-by-source-not.html'",
+            ),
+        ]);
+
+        let candidates = scanner.scan();
+        assert_eq!(candidates, vec!["content-['src/keep-me.html']"]);
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        └── ✓ src
+            └── ✓ keep-me.html
+        ");
+
+        // Create new files that should definitely be ignored
+        create_files_in(
+            &dir,
+            &[
+                // Create new file that matches the `@source '…'` glob
+                ("src/new-file.html", "content-['src/new-file.html']"),
+                // Create new file that is ignored based on file extension
+                (
+                    "src/ignore-by-extension.bin",
+                    "content-['src/ignore-by-extension.bin']",
+                ),
+                // Create a file that is ignored based on the `.gitignore` file
+                (".gitignore", "src/ignored-by-gitignore.html"),
+                (
+                    "src/ignored-by-gitignore.html",
+                    "content-['src/ignored-by-gitignore.html']",
+                ),
+                // Create a file that is ignored by the `@source not '…'`
+                (
+                    "src/ignored-by-source-not.html",
+                    "content-['src/ignored-by-source-not.html']",
+                ),
+            ],
+        );
+
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✗ .gitignore
+        │       src/ignored-by-gitignore.html
+        └── ✓ src
+            ├── ✗ ignore-by-extension.bin
+            ├── ✓ ignored-by-gitignore.html
+            ├── ✗ ignored-by-source-not.html
+            ├── ✓ keep-me.html
+            └── ✓ new-file.html
+        ");
+
+        assert_eq!(
+            candidates,
+            vec![
+                // Ignored by git ignore BUT included by `@source "**/*.html"`
+                "content-['src/ignored-by-gitignore.html']",
+                "content-['src/keep-me.html']",
+                "content-['src/new-file.html']"
+            ]
+        );
+    }
+
+    #[test]
+    fn test_allow_default_ignored_files() {
+        // Create a temporary working directory
+        let dir = tempdir().unwrap().into_path();
+
+        // Create files
+        create_files_in(&dir, &[("foo.styl", "content-['foo.styl']")]);
+
+        let sources = vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source '**/*'",
+        )];
+
+        let mut scanner = Scanner::new(sources.clone());
+
+        let candidates = scanner.scan();
+        assert!(candidates.is_empty());
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        └── ✗ foo.styl
+        ");
+
+        // Explicitly allow `.styl` files
+        let mut scanner = Scanner::new(vec![
+            public_source_entry_from_pattern(dir.clone(), "@source '**/*'"),
+            public_source_entry_from_pattern(dir.clone(), "@source '*.styl'"),
+        ]);
+
+        let candidates = scanner.scan();
+        assert_eq!(candidates, vec!["content-['foo.styl']"]);
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        └── ✓ foo.styl
+        ");
+    }
+
+    #[test]
+    fn test_allow_default_ignored_files_via_gitignore() {
+        // Create a temporary working directory
+        let dir = tempdir().unwrap().into_path();
+
+        // Create files
+        create_files_in(
+            &dir,
+            &[
+                ("index.html", "content-['index.html']"),
+                (".gitignore", "index.html"),
+            ],
+        );
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source '**/*'",
+        )]);
+
+        let candidates = scanner.scan();
+        assert!(candidates.is_empty());
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✗ .gitignore
+        │       index.html
+        └── ✗ index.html
+        ");
+
+        let mut scanner = Scanner::new(vec![
+            public_source_entry_from_pattern(dir.clone(), "@source '**/*'"),
+            public_source_entry_from_pattern(dir.clone(), "@source './*.html'"),
+        ]);
+
+        let candidates = scanner.scan();
+        assert_eq!(candidates, vec!["content-['index.html']"]);
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✗ .gitignore
+        │       index.html
+        └── ✓ index.html
+        ");
+    }
+
+    #[test]
+    fn test_allow_explicit_node_modules_paths() {
+        // Create a temporary working directory
+        let dir = tempdir().unwrap().into_path();
+
+        // Create files
+        create_files_in(
+            &dir,
+            &[
+                // Current project
+                ("src/index.html", "content-['src/index.html']"),
+                // Ignore file
+                (".gitignore", "node_modules"),
+                // Library ignored by default
+                (
+                    "node_modules/my-ui-lib/index.html",
+                    "content-['node_modules/my-ui-lib/index.html']",
+                ),
+            ],
+        );
+
+        // Default auto source detection
+        let sources = vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source './'",
+        )];
+
+        let mut scanner = Scanner::new(sources.clone());
+
+        let candidates = scanner.scan();
+        assert_eq!(candidates, vec!["content-['src/index.html']"]);
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✗ .gitignore
+        │       node_modules
+        ├── ✗ node_modules
+        │   └── ✗ my-ui-lib
+        │       └── ✗ index.html
+        └── ✓ src
+            └── ✓ index.html
+        ");
+
+        // Explicitly listing all `*.html` files, should not include `node_modules` because it's
+        // ignored
+        let sources = vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source '**/*.html'",
+        )];
+
+        let mut scanner = Scanner::new(sources.clone());
+        let candidates = scanner.scan();
+        assert_eq!(candidates, vec!["content-['src/index.html']"]);
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✗ .gitignore
+        │       node_modules
+        ├── ✗ node_modules
+        │   └── ✗ my-ui-lib
+        │       └── ✗ index.html
+        └── ✓ src
+            └── ✓ index.html
+        ");
+
+        // Explicitly listing all `*.html` files
+        // Explicitly list the `node_modules/my-ui-lib`
+        //
+        let sources = vec![
+            public_source_entry_from_pattern(dir.clone(), "@source '**/*.html'"),
+            public_source_entry_from_pattern(dir.clone(), "@source 'node_modules/my-ui-lib'"),
+        ];
+
+        let mut scanner = Scanner::new(sources.clone());
+        let candidates = scanner.scan();
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['node_modules/my-ui-lib/index.html']",
+                "content-['src/index.html']"
+            ]
+        );
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✗ .gitignore
+        │       node_modules
+        ├── ✓ node_modules
+        │   └── ✓ my-ui-lib
+        │       └── ✓ index.html
+        └── ✓ src
+            └── ✓ index.html
+        ");
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/19844
+    #[test]
+    fn test_allow_explicit_sources_ignored_by_allow_list_gitignore() {
+        let ScanResult {
+            candidates, tree, ..
+        } = scan_with_globs(
+            &[
+                (".gitignore", "*\n!/app\n!/app/design\n!/app/design/**\n"),
+                (
+                    "app/design/frontend/theme/templates/component.phtml",
+                    "content-['app/design/frontend/theme/templates/component.phtml']",
+                ),
+                (
+                    "vendor/acme/theme/module/templates/component.phtml",
+                    "content-['vendor/acme/theme/module/templates/component.phtml']",
+                ),
+            ],
+            vec!["@source 'vendor/acme/theme'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ .gitignore
+        │       *
+        │       !/app
+        │       !/app/design
+        │       !/app/design/**
+        ├── ✗ app
+        │   └── ✗ design
+        │       └── ✗ frontend
+        │           └── ✗ theme
+        │               └── ✗ templates
+        │                   └── ✗ component.phtml
+        └── ✓ vendor
+            └── ✓ acme
+                └── ✓ theme
+                    └── ✓ module
+                        └── ✓ templates
+                            └── ✓ component.phtml
+        ");
+
+        assert_eq!(
+            candidates,
+            vec!["content-['vendor/acme/theme/module/templates/component.phtml']"]
+        );
+    }
+
+    #[test]
+    fn test_ignore_node_modules_without_gitignore() {
+        let ScanResult {
+            candidates,
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                (
+                    "packages/web/index.html",
+                    "content-['packages/web/index.html']",
+                ),
+                (
+                    "node_modules/index.html",
+                    "content-['node_modules/index.html']",
+                ),
+                (
+                    "packages/web/node_modules/index.html",
+                    "content-['packages/web/node_modules/index.html']",
+                ),
+            ],
+            vec!["@source '**/*'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ node_modules
+        │   └── ✗ index.html
+        └── ✓ packages
+            └── ✓ web
+                ├── ✓ index.html
+                └── ✗ node_modules
+                    └── ✗ index.html
+        ");
+
+        assert_eq!(candidates, vec!["content-['packages/web/index.html']"]);
+
+        assert_eq!(files, vec!["packages/web/index.html",]);
+        assert_eq!(globs, vec!["*", "packages/*/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}", "packages/web/*/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}"]);
+        assert_eq!(normalized_sources, vec!["**/*"]);
+    }
+
+    #[test]
+    fn test_ignore_gitignore_in_node_modules_source() {
+        let ScanResult {
+            candidates,
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                (".gitignore", "node_modules\ndist"),
+                (
+                    "node_modules/my-ui-lib/dist/index.html",
+                    "content-['node_modules/my-ui-lib/dist/index.html']",
+                ),
+                (
+                    "node_modules/my-ui-lib/node.exe",
+                    "content-['node_modules/my-ui-lib/node.exe']",
+                ),
+            ],
+            vec!["@source 'node_modules/my-ui-lib'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ .gitignore
+        │       node_modules
+        │       dist
+        └── ✓ node_modules
+            └── ✓ my-ui-lib
+                ├── ✓ dist
+                │   └── ✓ index.html
+                └── ✗ node.exe
+        ");
+
+        assert_eq!(
+            candidates,
+            vec!["content-['node_modules/my-ui-lib/dist/index.html']"]
+        );
+        assert_eq!(files, vec!["node_modules/my-ui-lib/dist/index.html"]);
+        assert_eq!(globs, vec!["node_modules/my-ui-lib/*", "node_modules/my-ui-lib/dist/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}"]);
+        assert_eq!(normalized_sources, vec!["node_modules/my-ui-lib/**/*"]);
+    }
+
+    #[test]
+    fn test_manually_scanning_files_should_follow_all_rules() {
+        // Create a temporary working directory
+        let dir = tempdir().unwrap().into_path();
+
+        // Create files
+        create_files_in(
+            &dir,
+            &[
+                // Ignore all `.jsx` files, and all `generated` folders
+                (".gitignore", "*.jsx\ngenerated/"),
+                // .tsx files are allowed
+                (
+                    "src/components/button.tsx",
+                    "content-['src/components/button.tsx']",
+                ),
+                // .jsx files are not allowed
+                (
+                    "src/components/button.jsx",
+                    "content-['src/components/button.jsx']",
+                ),
+            ],
+        );
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source '**/*'",
+        )]);
+
+        let candidates = scanner.scan();
+        assert_eq!(candidates, vec!["content-['src/components/button.tsx']"]);
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✗ .gitignore
+        │       *.jsx
+        │       generated/
+        └── ✓ src
+            └── ✓ components
+                ├── ✗ button.jsx
+                └── ✓ button.tsx
+        ");
+
+        // Create 2 new files, one "good" and one "bad" file, and manually scan them. This should
+        // only return the "good" file because the "bad" one is ignored by a `.gitignore` file.
+        create_files_in(
+            &dir,
+            &[
+                (
+                    "src/components/good.tsx",
+                    "content-['src/components/good.tsx']",
+                ),
+                (
+                    "src/components/bad.jsx",
+                    "content-['src/components/bad.jsx']",
+                ),
+            ],
+        );
+
+        let candidates = scanner.scan_content(vec![
+            ChangedContent::File(dir.join("src/components/good.tsx"), "tsx".to_owned()),
+            ChangedContent::File(dir.join("src/components/bad.jsx"), "jsx".to_owned()),
+        ]);
+
+        assert_eq!(candidates, vec!["content-['src/components/good.tsx']"]);
+
+        // Create a generated file in a nested folder that is ignored by a `.gitignore` file higher
+        // up the tree.
+        create_files_in(
+            &dir,
+            &[
+                (
+                    "src/components/generated/bad.tsx",
+                    "content-['src/components/generated/bad.tsx']",
+                ),
+                (
+                    "src/components/generated/bad.jsx",
+                    "content-['src/components/generated/bad.jsx']",
+                ),
+            ],
+        );
+
+        let candidates = scanner.scan_content(vec![
+            ChangedContent::File(
+                dir.join("src/components/generated/bad.tsx"),
+                "tsx".to_owned(),
+            ),
+            ChangedContent::File(
+                dir.join("src/components/generated/bad.jsx"),
+                "jsx".to_owned(),
+            ),
+        ]);
+
+        assert!(candidates.is_empty());
+    }
+
+    #[test]
+    fn test_works_with_utf8_special_character_paths() {
+        let ScanResult {
+            candidates,
+            files,
+            globs,
+            normalized_sources,
+            tree,
+            ..
+        } = scan_with_globs(
+            &[
+                ("src/💩.js", "content-['src/💩.js']"),
+                ("src/🤦‍♂️.tsx", "content-['src/🤦‍♂️.tsx']"),
+                ("src/🤦‍♂️/foo.tsx", "content-['src/🤦‍♂️/foo.tsx']"),
+            ],
+            vec!["@source '**/*'", "@source not 'src/🤦‍♂️'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        └── ✓ src
+            ├── ✓ 💩.js
+            ├── ✗ 🤦‍♂️
+            │   └── ✗ foo.tsx
+            └── ✓ 🤦‍♂️.tsx
+        ");
+
+        assert_eq!(
+            candidates,
+            vec!["content-['src/💩.js']", "content-['src/🤦‍♂️.tsx']"]
+        );
+
+        assert_eq!(files, vec!["src/💩.js", "src/🤦‍♂️.tsx"]);
+        assert_eq!(globs, vec!["*", "src/*/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}"]);
+        assert_eq!(normalized_sources, vec!["**/*"]);
+    }
+
+    #[test]
+    fn test_glob_with_symlinks() {
+        let dir = tempdir().unwrap().into_path();
+        create_files_in(
+            &dir,
+            &[
+                (".gitignore", "node_modules\ndist"),
+                (
+                    "node_modules/.pnpm/@org+my-ui-library/dist/index.ts",
+                    "content-['node_modules/.pnpm/@org+my-ui-library/dist/index.ts']",
+                ),
+                // Make sure the `@org` does exist
+                ("node_modules/@org/.gitkeep", ""),
+            ],
+        );
+        let _ = symlink(
+            dir.join("node_modules/.pnpm/@org+my-ui-library"),
+            dir.join("node_modules/@org/my-ui-library"),
+        );
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source 'node_modules'",
+        )]);
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✗ .gitignore
+        │       node_modules
+        │       dist
+        └── ✓ node_modules
+            ├── ✓ .pnpm
+            │   └── ✓ @org+my-ui-library
+            │       └── ✓ dist
+            │           └── ✓ index.ts
+            └── ✓ @org
+                ├── ✓ .gitkeep
+                └── ✓ my-ui-library → ../.pnpm/@org+my-ui-library
+                    └── ✓ dist
+                        └── ✓ index.ts
+        ");
+
+        assert_eq!(
+            candidates,
+            vec!["content-['node_modules/.pnpm/@org+my-ui-library/dist/index.ts']"]
+        );
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source 'node_modules/@org/my-ui-library'",
+        )]);
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✗ .gitignore
+        │       node_modules
+        │       dist
+        └── ✓ node_modules
+            ├── ✓ .pnpm
+            │   └── ✓ @org+my-ui-library
+            │       └── ✓ dist
+            │           └── ✓ index.ts
+            └── ✓ @org
+                ├── ✗ .gitkeep
+                └── ✓ my-ui-library → ../.pnpm/@org+my-ui-library
+                    └── ✓ dist
+                        └── ✓ index.ts
+        ");
+
+        assert_eq!(
+            candidates,
+            vec!["content-['node_modules/.pnpm/@org+my-ui-library/dist/index.ts']"]
+        );
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source 'node_modules/@org'",
+        )]);
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✗ .gitignore
+        │       node_modules
+        │       dist
+        └── ✓ node_modules
+            ├── ✓ .pnpm
+            │   └── ✓ @org+my-ui-library
+            │       └── ✓ dist
+            │           └── ✓ index.ts
+            └── ✓ @org
+                ├── ✓ .gitkeep
+                └── ✓ my-ui-library → ../.pnpm/@org+my-ui-library
+                    └── ✓ dist
+                        └── ✓ index.ts
+        ");
+
+        assert_eq!(
+            candidates,
+            vec!["content-['node_modules/.pnpm/@org+my-ui-library/dist/index.ts']"]
+        );
+    }
+
+    #[test]
+    fn test_globs_with_recursive_symlinks() {
+        let dir = tempdir().unwrap().into_path();
+        create_files_in(
+            &dir,
+            &[
+                ("b/index.html", "content-['b/index.html']"),
+                ("z/index.html", "content-['z/index.html']"),
+            ],
+        );
+
+        // Create recursive symlinks:
+        //
+        // - `a → b`, `b/c → c`, `c → a` form a cycle
+        // - `b/root → .` points back at the root directory
+        let _ = symlink(dir.join("b"), dir.join("a"));
+        let _ = symlink(dir.join("c"), dir.join("b/c"));
+        let _ = symlink(&dir, dir.join("b/root"));
+        let _ = symlink(dir.join("a"), dir.join("c"));
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source '.'",
+        )]);
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✓ a → b
+        │   ├── ✗ c → ../c
+        │   ├── ✓ index.html
+        │   └── ✗ root → ..
+        ├── ✓ b
+        │   ├── ✗ c → ../c
+        │   ├── ✓ index.html
+        │   └── ✗ root → ..
+        ├── ✓ c → a
+        │   ├── ✗ c → .
+        │   ├── ✓ index.html
+        │   └── ✗ root → ..
+        └── ✓ z
+            └── ✓ index.html
+        ");
+
+        assert_eq!(
+            candidates,
+            vec!["content-['b/index.html']", "content-['z/index.html']"]
+        );
+    }
+
+    #[test]
+    fn test_partial_globs_with_symlinks() {
+        let dir = tempdir().unwrap().into_path();
+        create_files_in(&dir, &[("abcd/xyz.html", "content-['abcd/xyz.html']")]);
+        let _ = symlink(dir.join("abcd"), dir.join("efgh"));
+
+        // No sources should find nothing
+        let mut scanner = Scanner::new(vec![]);
+        let candidates = scanner.scan();
+        assert!(candidates.is_empty());
+
+        // Full symlinked folder name, should find the file
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source 'efgh/*.html'",
+        )]);
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✓ abcd
+        │   └── ✓ xyz.html
+        └── ✓ efgh → abcd
+            └── ✓ xyz.html
+        ");
+
+        assert_eq!(candidates, vec!["content-['abcd/xyz.html']"]);
+
+        // Partially referencing the symlinked folder with a glob, should find the file
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source 'ef*/*.html'",
+        )]);
+        let candidates = scanner.scan();
+
+        assert_eq!(candidates, vec!["content-['abcd/xyz.html']"]);
+    }
+
+    #[test]
+    fn test_symlinked_sources_within_the_scanned_tree_can_be_ignored() {
+        let dir = tempdir().unwrap().into_path();
+        create_files_in(
+            &dir,
+            &[
+                ("src/keep.html", "content-['src/keep.html']"),
+                (
+                    "actual-dir/ignore.html",
+                    "content-['actual-dir/ignore.html']",
+                ),
+                ("actual-file.html", "content-['actual-file.html']"),
+            ],
+        );
+
+        let _ = symlink(dir.join("actual-dir"), dir.join("linked-dir"));
+        let _ = symlink_file(dir.join("actual-file.html"), dir.join("linked-file.html"));
+
+        let base = dir.join("src");
+        let mut scanner = Scanner::new(vec![
+            public_source_entry_from_pattern(base.clone(), "@source '../**/*'"),
+            public_source_entry_from_pattern(base.clone(), "@source not '../actual-dir'"),
+            public_source_entry_from_pattern(base.clone(), "@source not '../linked-dir'"),
+            public_source_entry_from_pattern(base.clone(), "@source not '../actual-file.html'"),
+            public_source_entry_from_pattern(base.clone(), "@source not '../linked-file.html'"),
+        ]);
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✗ actual-dir
+        │   └── ✗ ignore.html
+        ├── ✗ actual-file.html
+        ├── ✗ linked-dir → actual-dir
+        │   └── ✗ ignore.html
+        ├── ✗ linked-file.html → actual-file.html
+        └── ✓ src
+            └── ✓ keep.html
+        ");
+
+        assert_eq!(candidates, vec!["content-['src/keep.html']"]);
+
+        let mut scanner = Scanner::new(vec![
+            public_source_entry_from_pattern(base.clone(), "@source '../**/*'"),
+            public_source_entry_from_pattern(base.clone(), "@source not '../actual-dir/**/*.html'"),
+            public_source_entry_from_pattern(base.clone(), "@source not '../linked-dir/**/*.html'"),
+            public_source_entry_from_pattern(base.clone(), "@source not '../actual-file.html'"),
+            public_source_entry_from_pattern(base.clone(), "@source not '../linked-file.html'"),
+        ]);
+        let candidates = scanner.scan();
+
+        assert_eq!(candidates, vec!["content-['src/keep.html']"]);
+    }
+
+    #[test]
+    fn test_symlinked_sources_outside_the_scanned_tree_can_be_ignored() {
+        let dir = tempdir().unwrap().into_path();
+        create_files_in(
+            &dir,
+            &[
+                (
+                    "actual-dir/ignore.html",
+                    "content-['actual-dir/ignore.html']",
+                ),
+                ("project/keep.html", "content-['project/keep.html']"),
+            ],
+        );
+
+        let _ = symlink(dir.join("actual-dir"), dir.join("project/linked-dir"));
+
+        let base = dir.join("project");
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            base.clone(),
+            "@source '**/*'",
+        )]);
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✓ actual-dir
+        │   └── ✓ ignore.html
+        └── ✓ project
+            ├── ✓ keep.html
+            └── ✓ linked-dir → ../actual-dir
+                └── ✓ ignore.html
+        ");
+
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['actual-dir/ignore.html']",
+                "content-['project/keep.html']",
+            ]
+        );
+
+        let mut scanner = Scanner::new(vec![
+            public_source_entry_from_pattern(base.clone(), "@source '**/*'"),
+            public_source_entry_from_pattern(base.clone(), "@source not 'linked-dir'"),
+        ]);
+        let candidates = scanner.scan();
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✗ actual-dir
+        │   └── ✗ ignore.html
+        └── ✓ project
+            ├── ✓ keep.html
+            └── ✗ linked-dir → ../actual-dir
+                └── ✗ ignore.html
+        ");
+
+        assert_eq!(candidates, vec!["content-['project/keep.html']"]);
+    }
+
+    #[test]
+    fn test_files_behind_symlinks_are_tracked_with_their_canonical_paths() {
+        let dir = tempdir().unwrap().into_path();
+        create_files_in(
+            &dir,
+            &[
+                (
+                    "packages/repro/source.html",
+                    "content-['packages/repro/source.html']",
+                ),
+                (
+                    "packages/repro/nested/deep.html",
+                    "content-['packages/repro/nested/deep.html']",
+                ),
+                (
+                    "packages/other/index.html",
+                    "content-['packages/other/index.html']",
+                ),
+            ],
+        );
+
+        // Mimic a pnpm workspace where `node_modules` contains a symlink to the actual package
+        fs::create_dir_all(dir.join("node_modules")).unwrap();
+        let _ = symlink(dir.join("packages/repro"), dir.join("node_modules/repro"));
+
+        // A directly symlinked file
+        let _ = symlink_file(
+            dir.join("packages/other/index.html"),
+            dir.join("linked.html"),
+        );
+
+        let mut scanner = Scanner::new(vec![
+            public_source_entry_from_pattern(
+                dir.clone(),
+                "@source 'node_modules/repro/source.html'",
+            ),
+            // The symlink sits multiple levels up from the file
+            public_source_entry_from_pattern(
+                dir.clone(),
+                "@source 'node_modules/repro/nested/deep.html'",
+            ),
+            public_source_entry_from_pattern(dir.clone(), "@source 'linked.html'"),
+        ]);
+
+        let candidates = scanner.scan();
+        assert_eq!(
+            candidates,
+            vec![
+                "content-['packages/other/index.html']",
+                "content-['packages/repro/nested/deep.html']",
+                "content-['packages/repro/source.html']",
+            ]
+        );
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✓ linked.html → packages/other/index.html
+        ├── ✓ node_modules
+        │   └── ✓ repro → ../packages/repro
+        │       ├── ✓ nested
+        │       │   └── ✓ deep.html
+        │       └── ✓ source.html
+        └── ✓ packages
+            ├── ✓ other
+            │   └── ✓ index.html
+            └── ✓ repro
+                ├── ✓ nested
+                │   └── ✓ deep.html
+                └── ✓ source.html
+        ");
+
+        // Both the symlinked paths and the canonical paths should be tracked, such that file
+        // watchers watching the returned files also watch the real files on disk.
+        let files = scanned_files(&mut scanner, &dir);
+        assert_eq!(
+            files,
+            vec![
+                "linked.html",
+                "node_modules/repro/nested/deep.html",
+                "node_modules/repro/source.html",
+                "packages/other/index.html",
+                "packages/repro/nested/deep.html",
+                "packages/repro/source.html",
+            ]
+        );
+    }
+
+    #[test]
+    fn test_changes_to_the_canonical_path_of_a_symlinked_file_are_detected() {
+        let dir = tempdir().unwrap().into_path();
+        create_files_in(&dir, &[("packages/repro/source.html", "content-['v1']")]);
+
+        // Mimic a pnpm workspace where `node_modules` contains a symlink to the actual package
+        fs::create_dir_all(dir.join("node_modules")).unwrap();
+        let _ = symlink(dir.join("packages/repro"), dir.join("node_modules/repro"));
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source 'node_modules/repro/source.html'",
+        )]);
+
+        let candidates = scanner.scan();
+        assert_eq!(candidates, vec!["content-['v1']"]);
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✓ node_modules
+        │   └── ✓ repro → ../packages/repro
+        │       └── ✓ source.html
+        └── ✓ packages
+            └── ✓ repro
+                └── ✓ source.html
+        ");
+
+        // Update the real file on disk. This is the path file watchers will report changes for.
+        create_files_in(&dir, &[("packages/repro/source.html", "content-['v2']")]);
+
+        let candidates = scanner.scan_content(vec![ChangedContent::File(
+            dir.join("packages/repro/source.html"),
+            "html".into(),
+        )]);
+        assert_eq!(candidates, vec!["content-['v2']"]);
+    }
+
+    #[test]
+    fn test_new_files_behind_symlinks_are_detected_at_their_canonical_path() {
+        let dir = tempdir().unwrap().into_path();
+        create_files_in(&dir, &[("packages/repro/a.html", "content-['a']")]);
+
+        // Mimic a pnpm workspace where `node_modules` contains a symlink to the actual package
+        fs::create_dir_all(dir.join("node_modules")).unwrap();
+        let _ = symlink(dir.join("packages/repro"), dir.join("node_modules/repro"));
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source 'node_modules/repro/*.html'",
+        )]);
+
+        let candidates = scanner.scan();
+        assert_eq!(candidates, vec!["content-['a']"]);
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✓ node_modules
+        │   └── ✓ repro → ../packages/repro
+        │       └── ✓ a.html
+        └── ✓ packages
+            └── ✓ repro
+                └── ✓ a.html
+        ");
+
+        // Create a new file in the real directory. File watchers watching the real directory
+        // will report the new file with its canonical path.
+        create_files_in(&dir, &[("packages/repro/b.html", "content-['b']")]);
+
+        let candidates = scanner.scan_content(vec![ChangedContent::File(
+            dir.join("packages/repro/b.html"),
+            "html".into(),
+        )]);
+        assert_eq!(candidates, vec!["content-['b']"]);
+
+        assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @"
+        .
+        ├── ✓ node_modules
+        │   └── ✓ repro → ../packages/repro
+        │       ├── ✓ a.html
+        │       └── ✓ b.html
+        └── ✓ packages
+            └── ✓ repro
+                ├── ✓ a.html
+                └── ✗ b.html
+        ");
+    }
+
+    // https://github.com/tailwindlabs/tailwindcss/pull/20408
+    #[test]
+    fn test_resolving_globs_does_not_traverse_gitignored_directories() {
+        let ScanResult {
+            files, globs, tree, ..
+        } = scan_with_globs(
+            &[
+                (".gitignore", "/vendor\n"),
+                ("vendor/pkg/canary/index.html", ""),
+                ("src/index.html", ""),
+            ],
+            vec!["@source '**/*'", "@source './vendor/pkg/canary'"],
+        );
+
+        assert_snapshot!(tree, @"
+        . (git)
+        ├── ✗ .gitignore
+        │       /vendor
+        ├── ✓ src
+        │   └── ✓ index.html
+        └── ✓ vendor
+            └── ✓ pkg
+                └── ✓ canary
+                    └── ✓ index.html
+        ");
+
+        assert_eq!(
+            files,
+            vec!["src/index.html", "vendor/pkg/canary/index.html"]
+        );
+        assert_eq!(globs, vec![
+            "*",
+            "src/**/*.{aspx,astro,cjs,cts,eex,erb,gjs,gts,haml,handlebars,hbs,heex,html,jade,js,jsx,liquid,md,mdx,mjs,mts,mustache,njk,nunjucks,php,pug,py,razor,rb,rhtml,rs,slim,svelte,tpl,ts,tsx,twig,vue}",
+
+            // This should not include `**` or `**.*.{aspx,...}` otherwise this might be scanned recursively.
+            "vendor/pkg/canary/*",
+        ]);
+    }
+
+    #[test]
+    fn test_extract_used_css_variables_from_css() {
+        let dir = tempdir().unwrap().into_path();
+        create_files_in(
+            &dir,
+            &[
+                (
+                    "src/index.css",
+                    r#"
+                        @theme {
+                            --color-red: #ff0000; /* Not used, so don't extract */
+                            --color-green: #00ff00; /* Not used, so don't extract */
+                        }
+
+                        .button {
+                            color: var(--color-red); /* Used, so extract */
+                        }
+                    "#,
+                ),
+                ("src/used-at-start.css", "var(--color-used-at-start)"),
+                // Here to verify that we don't crash when trying to find `var(` in front of the
+                // variable.
+                ("src/defined-at-start.css", "--color-defined-at-start: red;"),
+            ],
+        );
+        fs::write(
+            dir.join("src/invalid.css"),
+            b".button { color: var(--color-\x80); }",
+        )
+        .unwrap();
+
+        let mut scanner = Scanner::new(vec![public_source_entry_from_pattern(
+            dir.clone(),
+            "@source './'",
+        )]);
+        let candidates = scanner.scan();
+
+        assert_eq!(candidates, vec!["--color-red", "--color-used-at-start"]);
+    }
 }
diff --git a/integrations/cli/config.test.ts b/integrations/cli/config.test.ts
index dd93ade64..dda70814b 100644
--- a/integrations/cli/config.test.ts
+++ b/integrations/cli/config.test.ts
@@ -126,6 +126,72 @@ test(
   },
 )
 
+// https://github.com/tailwindlabs/tailwindcss/issues/19706
+test(
+  'Config files (TS, valid types)',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          },
+          "devDependencies": {
+            "typescript": "^5.9.3"
+          }
+        }
+      `,
+      'tsconfig.json': json`
+        {
+          "compilerOptions": {
+            "target": "ES2022",
+            "module": "NodeNext",
+            "moduleResolution": "NodeNext",
+            "declaration": true,
+            "composite": true,
+            "outDir": "./.build",
+            "skipLibCheck": true
+          },
+          "include": ["tailwind.config.ts"]
+        }
+      `,
+      'index.html': html`
+        <div class="text-primary"></div>
+      `,
+      'tailwind.config.ts': ts`
+        import type { Config } from 'tailwindcss'
+
+        function defineConfig(config: Config): Config {
+          return config
+        }
+
+        export default defineConfig({
+          theme: {
+            extend: {
+              colors: {
+                primary: 'blue',
+              },
+            },
+          },
+        })
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss';
+        @config '../tailwind.config.ts';
+      `,
+    },
+  },
+  async ({ fs, exec }) => {
+    // We expect that these commands don't crash:
+    await exec('pnpm tsc -b')
+    await exec('pnpm tailwindcss --input src/index.css --output dist/out.css')
+
+    await fs.expectFileToContain('dist/out.css', [candidate`text-primary`])
+  },
+)
+
 test(
   'Config files (CJS, watch mode)',
   {
diff --git a/integrations/cli/index.test.ts b/integrations/cli/index.test.ts
index a16206171..07f8bcb68 100644
--- a/integrations/cli/index.test.ts
+++ b/integrations/cli/index.test.ts
@@ -1,8 +1,11 @@
 import dedent from 'dedent'
 import os from 'node:os'
 import path from 'node:path'
+import { fileURLToPath } from 'node:url'
 import { describe } from 'vitest'
-import { candidate, css, html, js, json, test, ts, yaml } from '../utils'
+import { candidate, css, html, js, json, retryAssertion, test, ts, txt, yaml } from '../utils'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
 const STANDALONE_BINARY = (() => {
   switch (os.platform()) {
@@ -23,7 +26,7 @@ describe.each([
     'Standalone CLI',
     path.resolve(__dirname, `../../packages/@tailwindcss-standalone/dist/${STANDALONE_BINARY}`),
   ],
-])('%s', (_, command) => {
+])('%s', (kind, command) => {
   test(
     'production build',
     {
@@ -95,6 +98,149 @@ describe.each([
     },
   )
 
+  test(
+    'production build — read input from stdin',
+    {
+      fs: {
+        'package.json': json`{}`,
+        'pnpm-workspace.yaml': yaml`
+          #
+          packages:
+            - project-a
+        `,
+        'project-a/package.json': json`
+          {
+            "dependencies": {
+              "tailwindcss": "workspace:^",
+              "@tailwindcss/cli": "workspace:^"
+            }
+          }
+        `,
+        'project-a/index.html': html`
+          <div
+            class="underline 2xl:font-bold hocus:underline inverted:flex *:flex **:flex"
+          ></div>
+        `,
+        'project-a/plugin.js': js`
+          module.exports = function ({ addVariant }) {
+            addVariant('inverted', '@media (inverted-colors: inverted)')
+            addVariant('hocus', ['&:focus', '&:hover'])
+          }
+        `,
+        'project-a/tailwind.config.js': js`
+          module.exports = {
+            content: ['../project-b/src/**/*.js'],
+          }
+        `,
+        'project-a/src/index.js': js`
+          const className = "content-['project-a/src/index.js']"
+          module.exports = { className }
+        `,
+        'project-b/src/index.html': html`
+          <div class="flex" />
+        `,
+        'project-b/src/index.js': js`
+          const className = "content-['project-b/src/index.js']"
+          module.exports = { className }
+        `,
+      },
+    },
+    async ({ root, fs, exec }) => {
+      await exec(
+        `${command} --input - --output dist/out.css`,
+        { cwd: path.join(root, 'project-a') },
+        {
+          stdin: css`
+            @import 'tailwindcss/utilities';
+            @config './tailwind.config.js';
+            @source '../project-b/src/**/*.html';
+            @plugin './plugin.js';
+          `,
+        },
+      )
+
+      await fs.expectFileToContain('project-a/dist/out.css', [
+        candidate`underline`,
+        candidate`flex`,
+        candidate`content-['project-a/src/index.js']`,
+        candidate`content-['project-b/src/index.js']`,
+        candidate`inverted:flex`,
+        candidate`hocus:underline`,
+        candidate`*:flex`,
+        candidate`**:flex`,
+      ])
+    },
+  )
+
+  test(
+    'production build — (write to stdout)',
+    {
+      fs: {
+        'package.json': json`{}`,
+        'pnpm-workspace.yaml': yaml`
+          #
+          packages:
+            - project-a
+        `,
+        'project-a/package.json': json`
+          {
+            "dependencies": {
+              "tailwindcss": "workspace:^",
+              "@tailwindcss/cli": "workspace:^"
+            }
+          }
+        `,
+        'project-a/index.html': html`
+          <div
+            class="underline 2xl:font-bold hocus:underline inverted:flex *:flex **:flex"
+          ></div>
+        `,
+        'project-a/plugin.js': js`
+          module.exports = function ({ addVariant }) {
+            addVariant('inverted', '@media (inverted-colors: inverted)')
+            addVariant('hocus', ['&:focus', '&:hover'])
+          }
+        `,
+        'project-a/tailwind.config.js': js`
+          module.exports = {
+            content: ['../project-b/src/**/*.js'],
+          }
+        `,
+        'project-a/src/index.css': css`
+          @import 'tailwindcss/utilities';
+          @config '../tailwind.config.js';
+          @source '../../project-b/src/**/*.html';
+          @plugin '../plugin.js';
+        `,
+        'project-a/src/index.js': js`
+          const className = "content-['project-a/src/index.js']"
+          module.exports = { className }
+        `,
+        'project-b/src/index.html': html`
+          <div class="flex" />
+        `,
+        'project-b/src/index.js': js`
+          const className = "content-['project-b/src/index.js']"
+          module.exports = { className }
+        `,
+      },
+    },
+    async ({ root, expect, exec }) => {
+      let stdout = await exec(`${command} --input src/index.css --output -`, {
+        cwd: path.join(root, 'project-a'),
+      })
+
+      expect(stdout).toContain(candidate`underline`)
+      expect(stdout).toContain(candidate`flex`)
+      expect(stdout).toContain(candidate`content-['project-a/src/index.js']`)
+      expect(stdout).toContain(candidate`content-['project-b/src/index.js']`)
+      expect(stdout).toContain(candidate`inverted:flex`)
+      expect(stdout).toContain(candidate`hocus:underline`)
+      expect(stdout).toContain(candidate`*:flex`)
+      expect(stdout).toContain(candidate`**:flex`)
+    },
+  )
+
   test(
     'watch mode',
     {
@@ -225,12 +371,121 @@ describe.each([
         `,
       )
 
-      await fs.expectFileToContain('project-a/dist/out.css', [
-        css`
-          :root {
+      await fs.expectFileToContain('project-a/dist/out.css', [css``])
+    },
+  )
+
+  test(
+    'watch mode with polling',
+    {
+      fs: {
+        'package.json': json`
+          {
+            "dependencies": {
+              "tailwindcss": "workspace:^",
+              "@tailwindcss/cli": "workspace:^"
+            }
           }
         `,
-      ])
+        'src/index.css': css`@import 'tailwindcss/utilities';`,
+        'src/index.html': html`
+          <div class="underline"></div>
+        `,
+      },
+    },
+    async ({ fs, spawn }) => {
+      let process = await spawn(
+        `${command} --input src/index.css --output dist/out.css --watch --poll=50`,
+      )
+      await process.onStderr((m) => m.includes('Done in'))
+
+      await fs.expectFileToContain('dist/out.css', [candidate`underline`])
+
+      await fs.write('src/index.html', html`
+          <div class="underline flex"></div>
+        `)
+
+      await fs.expectFileToContain('dist/out.css', [candidate`flex`])
+    },
+  )
+
+  test(
+    "watch mode with unknown @source paths shouldn't crash on Windows",
+    {
+      fs: {
+        'package.json': json`
+          {
+            "dependencies": {
+              "tailwindcss": "workspace:^",
+              "@tailwindcss/cli": "workspace:^"
+            }
+          }
+        `,
+        'index.html': html`
+          <div class="underline"></div>
+        `,
+        'src/index.css': css`
+          @import 'tailwindcss';
+          @source "unknown-folder/**/*";
+        `,
+      },
+    },
+    async ({ fs, spawn }) => {
+      let process = await spawn(`${command} --input src/index.css --output dist/out.css --watch`)
+      await process.onStderr((m) => m.includes('Done in'))
+
+      await fs.expectFileToContain('dist/out.css', [candidate`underline`])
+    },
+  )
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/17632
+  test(
+    'watch mode rebuilds when the input file is in an ignored folder',
+    {
+      fs: {
+        'package.json': json`
+          {
+            "dependencies": {
+              "tailwindcss": "workspace:^",
+              "@tailwindcss/cli": "workspace:^"
+            }
+          }
+        `,
+        'assets/tailwind.config.js': js`
+          module.exports = {
+            content: {
+              relative: true,
+              files: ['html/*.html'],
+            },
+          }
+        `,
+        'assets/html/index.html': html`
+          <div class="underline"></div>
+        `,
+        'assets/css/index.css': css`
+          @import 'tailwindcss' source(none);
+          @config '../tailwind.config.js';
+        `,
+      },
+    },
+    async ({ fs, spawn }) => {
+      let process = await spawn(
+        `${command} --input assets/css/index.css --output dist/out.css --watch`,
+      )
+      await process.onStderr((m) => m.includes('Done in'))
+
+      await fs.expectFileToContain('dist/out.css', [candidate`underline`])
+
+      await fs.write(
+        'assets/css/index.css',
+        css`
+          @import 'tailwindcss' source(none);
+          @config '../tailwind.config.js';
+          @source inline("flex");
+        `,
+      )
+
+      await fs.expectFileToContain('dist/out.css', [candidate`flex`])
     },
   )
 
@@ -413,6 +668,835 @@ describe.each([
       ])
     },
   )
+
+  test(
+    'git ignore files outside of a repo are not considered',
+    {
+      fs: {
+        // Make the test root a pnpm workspace that includes `home/project` so
+        // the install below resolves the transitive dependency overrides that
+        // the test harness injects into this `pnpm-workspace.yaml`.
+        'pnpm-workspace.yaml': yaml`
+          #
+          packages:
+            - home/project
+        `,
+
+        // Ignore everything in the "home" directory
+        'home/.gitignore': '*',
+
+        // Only ignore files called ignore-*.html in the actual git repo
+        'home/project/.gitignore': 'ignore-*.html',
+
+        'home/project/package.json': json`
+          {
+            "type": "module",
+            "dependencies": {
+              "tailwindcss": "workspace:^",
+              "@tailwindcss/cli": "workspace:^"
+            }
+          }
+        `,
+
+        'home/project/src/index.css': css` @import 'tailwindcss'; `,
+        'home/project/src/index.html': html`
+          <div
+            class="content-['index.html']"
+          ></div>
+        `,
+        'home/project/src/ignore-1.html': html`
+          <div
+            class="content-['ignore-1.html']"
+          ></div>
+        `,
+        'home/project/src/ignore-2.html': html`
+          <div
+            class="content-['ignore-2.html']"
+          ></div>
+        `,
+      },
+
+      installDependencies: false,
+    },
+    async ({ fs, root, exec }) => {
+      await exec(`pnpm install`, {
+        cwd: path.join(root, 'home/project'),
+      })
+
+      // No git repo = all ignore files are considered
+      await exec(`${command} --input src/index.css --output dist/out.css`, {
+        cwd: path.join(root, 'home/project'),
+      })
+
+      await fs.expectFileNotToContain('./home/project/dist/out.css', [
+        candidate`content-['index.html']`,
+        candidate`content-['ignore-1.html']`,
+        candidate`content-['ignore-2.html']`,
+      ])
+
+      // Make home/project a git repo
+      // Only ignore files within the repo are considered
+      await exec(`git init`, {
+        cwd: path.join(root, 'home/project'),
+      })
+
+      await exec(`${command} --input src/index.css --output dist/out.css`, {
+        cwd: path.join(root, 'home/project'),
+      })
+
+      await fs.expectFileToContain('./home/project/dist/out.css', [
+        candidate`content-['index.html']`,
+      ])
+
+      await fs.expectFileNotToContain('./home/project/dist/out.css', [
+        candidate`content-['ignore-1.html']`,
+        candidate`content-['ignore-2.html']`,
+      ])
+    },
+  )
+
+  test(
+    'production build + inline source maps',
+    {
+      fs: {
+        'package.json': json`
+          {
+            "dependencies": {
+              "tailwindcss": "workspace:^",
+              "@tailwindcss/cli": "workspace:^"
+            }
+          }
+        `,
+        'src/index.html': html`
+          <div class="flex"></div>
+        `,
+        'src/index.css': css`
+          @import 'tailwindcss/utilities';
+          /*  */
+        `,
+      },
+    },
+    async ({ exec, expect, fs, parseSourceMap }) => {
+      await exec(`${command} --input src/index.css --output dist/out.css --map`)
+
+      await fs.expectFileToContain('dist/out.css', [candidate`flex`])
+
+      // Make sure we can find a source map
+      let map = parseSourceMap(await fs.read('dist/out.css'))
+
+      expect(map.at(1, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '/*! tailwi...',
+      })
+
+      expect(map.at(2, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.flex {...',
+      })
+
+      expect(map.at(3, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'display: f...',
+      })
+
+      expect(map.at(4, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}...',
+      })
+    },
+  )
+
+  test(
+    'production build + separate source maps',
+    {
+      fs: {
+        'package.json': json`
+          {
+            "dependencies": {
+              "tailwindcss": "workspace:^",
+              "@tailwindcss/cli": "workspace:^"
+            }
+          }
+        `,
+        'src/index.html': html`
+          <div class="flex"></div>
+        `,
+        'src/index.css': css`
+          @import 'tailwindcss/utilities';
+          /*  */
+        `,
+      },
+    },
+    async ({ exec, expect, fs, parseSourceMap }) => {
+      await exec(`${command} --input src/index.css --output dist/out.css --map dist/out.css.map`)
+
+      await fs.expectFileToContain('dist/out.css', [candidate`flex`])
+
+      // Make sure we can find a source map
+      let map = parseSourceMap({
+        map: await fs.read('dist/out.css.map'),
+        content: await fs.read('dist/out.css'),
+      })
+
+      expect(map.at(1, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '/*! tailwi...',
+      })
+
+      expect(map.at(2, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.flex {...',
+      })
+
+      expect(map.at(3, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'display: f...',
+      })
+
+      expect(map.at(4, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}\n\n/*# sou...',
+      })
+    },
+  )
+
+  // Skipped because Lightning CSS has a bug with source maps containing
+  // license comments and it breaks stuff.
+  test.skip(
+    'production build + minify + source maps',
+    {
+      fs: {
+        'package.json': json`
+          {
+            "dependencies": {
+              "tailwindcss": "workspace:^",
+              "@tailwindcss/cli": "workspace:^"
+            }
+          }
+        `,
+        'src/index.html': html`
+          <div class="flex"></div>
+        `,
+        'src/index.css': css`
+          @import 'tailwindcss/utilities';
+          /*  */
+        `,
+      },
+    },
+    async ({ exec, expect, fs, parseSourceMap }) => {
+      await exec(`${command} --input src/index.css --output dist/out.css --minify --map`)
+
+      await fs.expectFileToContain('dist/out.css', [candidate`flex`])
+
+      // Make sure we can find a source map
+      let map = parseSourceMap(await fs.read('dist/out.css'))
+
+      expect(map.at(1, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '/*! tailwi...',
+      })
+
+      expect(map.at(2, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.flex {...',
+      })
+
+      expect(map.at(3, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'display: f...',
+      })
+
+      expect(map.at(4, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}\n\n/*# sou...',
+      })
+    },
+  )
+
+  test(
+    'watch mode + inline source maps',
+    {
+      fs: {
+        'package.json': json`
+          {
+            "dependencies": {
+              "tailwindcss": "workspace:^",
+              "@tailwindcss/cli": "workspace:^"
+            }
+          }
+        `,
+        'src/index.html': html`
+          <div class="flex"></div>
+        `,
+        'src/index.css': css`
+          @import 'tailwindcss/utilities';
+          /*  */
+        `,
+      },
+    },
+    async ({ spawn, expect, fs, parseSourceMap }) => {
+      let process = await spawn(
+        `${command} --input src/index.css --output dist/out.css --map --watch`,
+      )
+      await process.onStderr((m) => m.includes('Done in'))
+
+      await fs.expectFileToContain('dist/out.css', [candidate`flex`])
+
+      let originalCss = await fs.read('dist/out.css')
+      let currentCss = originalCss
+
+      // Make sure we can find a source map
+      let map = parseSourceMap(currentCss)
+
+      expect(map.at(1, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '/*! tailwi...',
+      })
+
+      expect(map.at(2, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.flex {...',
+      })
+
+      expect(map.at(3, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'display: f...',
+      })
+
+      expect(map.at(4, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}...',
+      })
+
+      // Write to project source files
+      await fs.write('src/index.html', html`
+        <div class="flex underline"></div>
+      `)
+
+      // Wait for the CSS to be rebuilt
+      await retryAssertion(async () => {
+        currentCss = await fs.read('dist/out.css')
+        expect(currentCss).not.toEqual(originalCss)
+        originalCss = currentCss
+      })
+
+      // Make sure the source map was updated
+      map = parseSourceMap(currentCss)
+
+      expect(map.at(1, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '/*! tailwi...',
+      })
+
+      expect(map.at(2, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.flex {...',
+      })
+
+      expect(map.at(3, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'display: f...',
+      })
+
+      expect(map.at(4, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}\n.underli...',
+      })
+
+      expect(map.at(5, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.underline...',
+      })
+
+      expect(map.at(6, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'text-decor...',
+      })
+
+      expect(map.at(7, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}...',
+      })
+
+      // Write to the main CSS file
+      await fs.write(
+        'src/index.css',
+        css`
+          @import 'tailwindcss/utilities';
+          @source inline("w-auto");
+        `,
+      )
+
+      // Wait for the CSS to be rebuilt
+      await retryAssertion(async () => {
+        currentCss = await fs.read('dist/out.css')
+        expect(currentCss).not.toEqual(originalCss)
+        originalCss = currentCss
+      })
+
+      // Make sure the source map was updated
+      map = parseSourceMap(currentCss)
+
+      expect(map.at(1, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '/*! tailwi...',
+      })
+
+      expect(map.at(2, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.flex {...',
+      })
+
+      expect(map.at(3, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'display: f...',
+      })
+
+      expect(map.at(4, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}\n.w-auto...',
+      })
+
+      expect(map.at(5, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.w-auto {...',
+      })
+
+      expect(map.at(6, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'width: aut...',
+      })
+
+      expect(map.at(7, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}\n.underli...',
+      })
+
+      expect(map.at(8, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.underline...',
+      })
+
+      expect(map.at(9, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'text-decor...',
+      })
+
+      expect(map.at(10, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}...',
+      })
+    },
+  )
+
+  test(
+    'watch mode + separate source maps',
+    {
+      fs: {
+        'package.json': json`
+          {
+            "dependencies": {
+              "tailwindcss": "workspace:^",
+              "@tailwindcss/cli": "workspace:^"
+            }
+          }
+        `,
+        'src/index.html': html`
+          <div class="flex"></div>
+        `,
+        'src/index.css': css`
+          @import 'tailwindcss/utilities';
+          /*  */
+        `,
+      },
+    },
+    async ({ spawn, expect, fs, parseSourceMap }) => {
+      let process = await spawn(
+        `${command} --input src/index.css --output dist/out.css --map dist/out.css.map --watch`,
+      )
+      await process.onStderr((m) => m.includes('Done in'))
+
+      await fs.expectFileToContain('dist/out.css', [candidate`flex`])
+
+      // Make sure we can find a source map
+      let originalCss = await fs.read('dist/out.css')
+      let originalMap = await fs.read('dist/out.css.map')
+      let currentCss = originalCss
+      let currentMap = originalMap
+
+      // Make sure we can find a source map
+      let map = parseSourceMap({ map: currentMap, content: currentCss })
+
+      expect(map.at(1, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '/*! tailwi...',
+      })
+
+      expect(map.at(2, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.flex {...',
+      })
+
+      expect(map.at(3, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'display: f...',
+      })
+
+      expect(map.at(4, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}\n\n/*# sou...',
+      })
+
+      // Write to project source files
+      await fs.write('src/index.html', html`
+        <div class="flex underline"></div>
+      `)
+
+      // Wait for the CSS to be rebuilt
+      await retryAssertion(async () => {
+        currentCss = await fs.read('dist/out.css')
+        currentMap = await fs.read('dist/out.css.map')
+        expect(currentCss).not.toEqual(originalCss)
+        expect(currentMap).not.toEqual(originalMap)
+        originalCss = currentCss
+        originalMap = currentMap
+      })
+
+      // Make sure the source map was updated
+      map = parseSourceMap({ map: currentMap, content: currentCss })
+
+      expect(map.at(1, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '/*! tailwi...',
+      })
+
+      expect(map.at(2, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.flex {...',
+      })
+
+      expect(map.at(3, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'display: f...',
+      })
+
+      expect(map.at(4, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}\n.underli...',
+      })
+
+      expect(map.at(5, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.underline...',
+      })
+
+      expect(map.at(6, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'text-decor...',
+      })
+
+      expect(map.at(7, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}\n\n/*# sou...',
+      })
+
+      // Write to the main CSS file
+      await fs.write(
+        'src/index.css',
+        css`
+          @import 'tailwindcss/utilities';
+          @source inline("w-auto");
+        `,
+      )
+
+      // Wait for the CSS to be rebuilt
+      await retryAssertion(async () => {
+        currentCss = await fs.read('dist/out.css')
+        currentMap = await fs.read('dist/out.css.map')
+        expect(currentCss).not.toEqual(originalCss)
+        expect(currentMap).not.toEqual(originalMap)
+        originalCss = currentCss
+        originalMap = currentMap
+      })
+
+      // Make sure the source map was updated
+      map = parseSourceMap({ map: currentMap, content: currentCss })
+
+      expect(map.at(1, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '/*! tailwi...',
+      })
+
+      expect(map.at(2, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.flex {...',
+      })
+
+      expect(map.at(3, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'display: f...',
+      })
+
+      expect(map.at(4, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}\n.w-auto...',
+      })
+
+      expect(map.at(5, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.w-auto {...',
+      })
+
+      expect(map.at(6, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'width: aut...',
+      })
+
+      expect(map.at(7, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}\n.underli...',
+      })
+
+      expect(map.at(8, 0)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: '.underline...',
+      })
+
+      expect(map.at(9, 2)).toMatchObject({
+        source:
+          kind === 'CLI'
+            ? expect.stringContaining('utilities.css')
+            : expect.stringMatching(/\/utilities-\w+\.css$/),
+        original: '@tailwind...',
+        generated: 'text-decor...',
+      })
+
+      expect(map.at(10, 0)).toMatchObject({
+        source: null,
+        original: '(none)',
+        generated: '}\n\n/*# sou...',
+      })
+    },
+  )
+
+  test(
+    'watch mode should trigger a full rebuild when a dependency is removed',
+    {
+      fs: {
+        'package.json': json`
+          {
+            "dependencies": {
+              "tailwindcss": "workspace:^",
+              "@tailwindcss/cli": "workspace:^"
+            }
+          }
+        `,
+        'src/index.html': html`
+          <div class="flex text-primary"></div>
+        `,
+        'src/index.css': css`
+          @import 'tailwindcss/utilities';
+          @config '../tailwind.config.js';
+        `,
+        'tailwind.config.js': js`
+          const myColor = require('./my-color')
+
+          module.exports = {
+            theme: {
+              extend: {
+                colors: {
+                  primary: myColor,
+                },
+              },
+            },
+          }
+        `,
+        'my-color.js': js`
+          //
+          module.exports = 'blue'
+        `,
+      },
+    },
+    async ({ spawn, fs, expect }) => {
+      let process = await spawn(`${command} --input src/index.css --output dist/out.css --watch`)
+      await process.onStderr((m) => m.includes('Done in'))
+
+      expect(await fs.dumpFiles('dist/*.css')).toMatchInlineSnapshot(`
+        "
+        --- dist/out.css ---
+        .flex {
+          display: flex;
+        }
+        .text-primary {
+          color: blue;
+        }
+        "
+      `)
+
+      // Remove the dependency of the tailwind.config.js file
+      await fs.delete('my-color.js')
+
+      // We expect an error
+      await process.onStderr((m) => m.includes('Error'))
+      await process.onStderr((m) => m.includes('Done in'))
+
+      // Re-create the file to resolve the issue
+      await fs.write('my-color.js', js`module.exports = 'red'`)
+      await process.onStderr((m) => m.includes('Done in'))
+
+      // Expect a full rebuild
+      expect(await fs.dumpFiles('dist/*.css')).toMatchInlineSnapshot(`
+        "
+        --- dist/out.css ---
+        .flex {
+          display: flex;
+        }
+        .text-primary {
+          color: red;
+        }
+        "
+      `)
+    },
+  )
 })
 
 test(
@@ -428,7 +1512,7 @@ test(
         }
       `,
       'index.css': css`
-        @import 'tailwindcss/theme' theme(reference);
+        @reference 'tailwindcss/theme';
 
         /* (1) */
         /* - Only './src' should be auto-scanned, not the current working directory */
@@ -450,7 +1534,7 @@ test(
         /* (4) */
         /* - './pages' should be auto-scanned */
         /* - Only '.html' files should be included */
-        /* - './page/ignored.html' should be ignored */
+        /* - './page/ignored.html' will not be ignored because of the specific pattern */
         @source "./pages/**/*.html";
       `,
 
@@ -487,7 +1571,7 @@ test(
       // (4)
       'pages/foo.html': 'content-["pages/foo.html"]',
       'pages/nested/foo.html': 'content-["pages/nested/foo.html"]',
-      'pages/ignored.html': 'content-["pages/ignored.html"] content-["BAD"]',
+      'pages/ignored.html': 'content-["pages/ignored.html"]',
       'pages/foo.jsx': 'content-["pages/foo.jsx"] content-["BAD"]',
       'pages/nested/foo.jsx': 'content-["pages/nested/foo.jsx"] content-["BAD"]',
     },
@@ -498,6 +1582,7 @@ test(
     expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
       "
       --- ./dist/out.css ---
+      @layer properties;
       .content-\\[\\"components\\/my-component\\.tsx\\"\\] {
         --tw-content: "components/my-component.tsx";
         content: var(--tw-content);
@@ -518,6 +1603,10 @@ test(
         --tw-content: "pages/foo.html";
         content: var(--tw-content);
       }
+      .content-\\[\\"pages\\/ignored\\.html\\"\\] {
+        --tw-content: "pages/ignored.html";
+        content: var(--tw-content);
+      }
       .content-\\[\\"pages\\/nested\\/foo\\.html\\"\\] {
         --tw-content: "pages/nested/foo.html";
         content: var(--tw-content);
@@ -530,18 +1619,18 @@ test(
         --tw-content: "src/nested/index.html";
         content: var(--tw-content);
       }
-      @supports (-moz-orient: inline) {
-        @layer base {
-          *, ::before, ::after, ::backdrop {
-            --tw-content: "";
-          }
-        }
-      }
       @property --tw-content {
         syntax: "*";
         inherits: false;
         initial-value: "";
       }
+      @layer properties {
+        @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
+          *, ::before, ::after, ::backdrop {
+            --tw-content: "";
+          }
+        }
+      }
       "
     `)
   },
@@ -566,7 +1655,7 @@ test(
         }
       `,
       'project-a/src/index.css': css`
-        @import 'tailwindcss/theme' theme(reference);
+        @reference 'tailwindcss/theme';
 
         /* Run auto-content detection in ../../project-b */
         @import 'tailwindcss/utilities' source('../../project-b');
@@ -685,10 +1774,11 @@ test(
         bar.html
       `,
 
-      // Project D, foo.html is ignored by the gitignore file.
+      // Project D, foo.html is ignored by the gitignore file but the source rule is explicit about
+      // adding all `.html` files.
       'project-d/src/foo.html': html`
         <div
-          class="content-['SHOULD-NOT-EXIST-IN-OUTPUT'] content-['project-d/src/foo.html']"
+          class="content-['project-d/src/foo.html']"
         ></div>
       `,
 
@@ -731,6 +1821,7 @@ test(
     expect(await fs.dumpFiles('./project-a/dist/*.css')).toMatchInlineSnapshot(`
       "
       --- ./project-a/dist/out.css ---
+      @layer properties;
       .content-\\[\\'project-a\\/node_modules\\/my-lib-1\\/src\\/index\\.html\\'\\] {
         --tw-content: 'project-a/node modules/my-lib-1/src/index.html';
         content: var(--tw-content);
@@ -763,6 +1854,10 @@ test(
         --tw-content: 'project-d/src/bar.html';
         content: var(--tw-content);
       }
+      .content-\\[\\'project-d\\/src\\/foo\\.html\\'\\] {
+        --tw-content: 'project-d/src/foo.html';
+        content: var(--tw-content);
+      }
       .content-\\[\\'project-d\\/src\\/index\\.html\\'\\] {
         --tw-content: 'project-d/src/index.html';
         content: var(--tw-content);
@@ -775,18 +1870,18 @@ test(
         --tw-content: 'project-e/nested/index.html';
         content: var(--tw-content);
       }
-      @supports (-moz-orient: inline) {
-        @layer base {
-          *, ::before, ::after, ::backdrop {
-            --tw-content: "";
-          }
-        }
-      }
       @property --tw-content {
         syntax: "*";
         inherits: false;
         initial-value: "";
       }
+      @layer properties {
+        @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
+          *, ::before, ::after, ::backdrop {
+            --tw-content: "";
+          }
+        }
+      }
       "
     `)
 
@@ -918,6 +2013,394 @@ test(
   },
 )
 
+test(
+  'source(…) and `@source` are relative to the file they are in',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'index.css': css` @import './project-a/src/index.css'; `,
+
+      'project-a/src/index.css': css`
+        /* Run auto-content detection in ../../project-b */
+        @import 'tailwindcss/utilities' source('../../project-b');
+
+        /* Explicitly using node_modules in the @source allows git ignored folders */
+        @source '../../project-c';
+      `,
+
+      // Project A is the current folder, but we explicitly configured
+      // `source(project-b)`, therefore project-a should not be included in
+      // the output.
+      'project-a/src/index.html': html`
+        <div
+          class="content-['SHOULD-NOT-EXIST-IN-OUTPUT'] content-['project-a/src/index.html']"
+        ></div>
+      `,
+
+      // Project B is the configured `source(…)`, therefore auto source
+      // detection should include known extensions and folders in the output.
+      'project-b/src/index.html': html`
+        <div
+          class="content-['project-b/src/index.html']"
+        ></div>
+      `,
+
+      // Project C should apply auto source detection, therefore known
+      // extensions and folders should be included in the output.
+      'project-c/src/index.html': html`
+        <div
+          class="content-['project-c/src/index.html']"
+        ></div>
+      `,
+    },
+  },
+  async ({ fs, exec, root, expect }) => {
+    await exec('pnpm tailwindcss --input ./index.css --output dist/out.css', { cwd: root })
+
+    let content = await fs.dumpFiles('./dist/*.css')
+
+    expect(content).not.toContain(candidate`content-['project-a/src/index.html']`)
+    expect(content).toContain(candidate`content-['project-b/src/index.html']`)
+    expect(content).toContain(candidate`content-['project-c/src/index.html']`)
+  },
+)
+
+test(
+  '@source order is important (referencing sibling project)',
+  {
+    fs: {
+      'package.json': json`{}`,
+      'pnpm-workspace.yaml': yaml`
+        #
+        packages:
+          - project-a
+      `,
+      'project-a/package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'project-a/src/index.css': css`
+        @import 'tailwindcss/utilities' source(none);
+
+        @source '../../project-b';
+        @source not '../../project-b/ignored';
+        @source '../../project-b/ignored/except.html';
+      `,
+
+      'project-b/keep/keep.html': html`<div class="content-['GOOD-1']"></div>`,
+      'project-b/ignored/ignored.html': html`<div class="content-['BAD-1']"></div>`,
+      'project-b/ignored/except.html': html`<div class="content-['GOOD-2']"></div>`,
+    },
+  },
+  async ({ fs, root, exec, expect }) => {
+    await exec('pnpm tailwindcss --input src/index.css --output dist/out.css', {
+      cwd: path.join(root, 'project-a'),
+    })
+
+    expect(await fs.dumpFiles('./project-a/dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./project-a/dist/out.css ---
+      @layer properties;
+      .content-\\[\\'GOOD-1\\'\\] {
+        --tw-content: 'GOOD-1';
+        content: var(--tw-content);
+      }
+      .content-\\[\\'GOOD-2\\'\\] {
+        --tw-content: 'GOOD-2';
+        content: var(--tw-content);
+      }
+      @property --tw-content {
+        syntax: "*";
+        inherits: false;
+        initial-value: "";
+      }
+      @layer properties {
+        @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
+          *, ::before, ::after, ::backdrop {
+            --tw-content: "";
+          }
+        }
+      }
+      "
+    `)
+  },
+)
+
+test(
+  '@source works with symlinks (referencing sibling project)',
+  {
+    fs: {
+      'package.json': json`{}`,
+      'pnpm-workspace.yaml': yaml`
+        #
+        packages:
+          - project-a
+      `,
+      'project-a/package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'project-a/src/index.css': css`
+        @import 'tailwindcss/utilities' source(none);
+
+        /* Same as the previous test, but using symlinks instead */
+        @source '../../project-b';
+        @source not '../../project-b/ignored';
+        @source '../../project-b/ignored/except.html';
+      `,
+
+      'project-b/keep/keep.html': html`<div class="content-['GOOD-1']"></div>`,
+      'project-c/ignored/ignored.html': html`<div class="content-['BAD-1']"></div>`,
+      'project-c/ignored/except.html': html`<div class="content-['GOOD-2']"></div>`,
+
+      // Symlink the ignored folder to another project
+      'project-b/ignored': 'symlink:../../project-c/ignored/',
+    },
+  },
+  async ({ fs, root, exec, expect }) => {
+    await exec('pnpm tailwindcss --input src/index.css --output dist/out.css', {
+      cwd: path.join(root, 'project-a'),
+    })
+
+    expect(await fs.dumpFiles('./project-a/dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./project-a/dist/out.css ---
+      @layer properties;
+      .content-\\[\\'GOOD-1\\'\\] {
+        --tw-content: 'GOOD-1';
+        content: var(--tw-content);
+      }
+      .content-\\[\\'GOOD-2\\'\\] {
+        --tw-content: 'GOOD-2';
+        content: var(--tw-content);
+      }
+      @property --tw-content {
+        syntax: "*";
+        inherits: false;
+        initial-value: "";
+      }
+      @layer properties {
+        @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
+          *, ::before, ::after, ::backdrop {
+            --tw-content: "";
+          }
+        }
+      }
+      "
+    `)
+  },
+)
+
+// https://github.com/tailwindlabs/tailwindcss/issues/19844
+test(
+  '@source scans directories ignored by allow-list .gitignore files',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      '.gitignore': txt`
+        *
+        !/app
+        !/app/design
+        !/app/design/**
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss/utilities' source(none);
+        @source '../vendor/acme/theme';
+      `,
+      // 1. Ignored by the `*` in `.gitignore`
+      // 2. Included by the `!` pattern in `.gitignore`
+      // 3. Ignored by `source(none)`
+      //
+      // → Should be ignored
+      'app/design/frontend/theme/templates/component.phtml': html`
+        <div
+          class="content-['app/design/frontend/theme/templates/component.phtml']"
+        ></div>
+      `,
+      // 1. Ignored by the `*` in `.gitignore`
+      // 2. Included by the `!` pattern in `.gitignore`
+      // 3. Ignored by `source(none)`
+      // 4. Included by the `@source` directive
+      //
+      // → Should be included
+      'vendor/acme/theme/module/templates/component.phtml': html`
+        <div
+          class="content-['vendor/acme/theme/module/templates/component.phtml']"
+        ></div>
+      `,
+    },
+  },
+  async ({ fs, exec }) => {
+    await exec('pnpm tailwindcss --input src/index.css --output dist/out.css')
+
+    // 1. Ignored by the `*` in `.gitignore`
+    // 2. Included by the `!` pattern in `.gitignore`
+    // 3. Ignored by `source(none)`
+    //
+    // → Should be ignored
+    await fs.expectFileNotToContain('dist/out.css', [
+      candidate`content-['app/design/frontend/theme/templates/component.phtml']`,
+    ])
+
+    // 1. Ignored by the `*` in `.gitignore`
+    // 2. Included by the `!` pattern in `.gitignore`
+    // 3. Ignored by `source(none)`
+    // 4. Included by the `@source` directive
+    //
+    // → Should be included
+    await fs.expectFileToContain('dist/out.css', [
+      candidate`content-['vendor/acme/theme/module/templates/component.phtml']`,
+    ])
+  },
+)
+
+// https://github.com/tailwindlabs/tailwindcss/discussions/20382
+test(
+  'auto source detection respects allow-list .gitignore files',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      '.gitignore': txt`
+        /*
+        !/.gitignore
+        !/app
+        !/public
+        !/package.json
+      `,
+      'app/root.css': css` @import 'tailwindcss/utilities'; `,
+      // Included by the `!/app` pattern in `.gitignore`
+      //
+      // → Should be included
+      'app/index.html': html`
+        <div class="content-['app/index.html']"></div>
+      `,
+      // Included by the `!/public` pattern in `.gitignore`
+      //
+      // → Should be included
+      'public/index.html': html`
+        <div class="content-['public/index.html']"></div>
+      `,
+      // Ignored by the `/*` in `.gitignore`
+      //
+      // → Should be ignored
+      'build/index.html': html`
+        <div class="content-['build/index.html']"></div>
+      `,
+      // Ignored by the `/*` in `.gitignore` and the default `node_modules` rules
+      //
+      // → Should be ignored
+      'node_modules/my-ui-lib/index.html': html`
+        <div
+          class="content-['node_modules/my-ui-lib/index.html']"
+        ></div>
+      `,
+    },
+  },
+  async ({ fs, exec }) => {
+    await exec('pnpm tailwindcss --input app/root.css --output dist/out.css')
+
+    await fs.expectFileToContain('dist/out.css', [
+      candidate`content-['app/index.html']`,
+      candidate`content-['public/index.html']`,
+    ])
+
+    await fs.expectFileNotToContain('dist/out.css', [
+      candidate`content-['build/index.html']`,
+      candidate`content-['node_modules/my-ui-lib/index.html']`,
+    ])
+  },
+)
+
+test(
+  '@source works with symlinks (referencing folder in current folder)',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss/utilities' source(none);
+
+        /* Same as the previous test, but using symlinks instead */
+        @source '../lib';
+        @source not '../lib/ignored';
+        @source '../lib/ignored/except.html';
+      `,
+
+      'lib/keep/keep.html': html`<div class="content-['GOOD-1']"></div>`,
+      'vendor/ignored/ignored.html': html`<div class="content-['BAD-1']"></div>`,
+      'vendor/ignored/except.html': html`<div class="content-['GOOD-2']"></div>`,
+
+      // Symlink the ignored folder to another folder
+      'lib/ignored': 'symlink:../../vendor/ignored/',
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm tailwindcss --input src/index.css --output dist/out.css')
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/out.css ---
+      @layer properties;
+      .content-\\[\\'GOOD-1\\'\\] {
+        --tw-content: 'GOOD-1';
+        content: var(--tw-content);
+      }
+      .content-\\[\\'GOOD-2\\'\\] {
+        --tw-content: 'GOOD-2';
+        content: var(--tw-content);
+      }
+      @property --tw-content {
+        syntax: "*";
+        inherits: false;
+        initial-value: "";
+      }
+      @layer properties {
+        @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
+          *, ::before, ::after, ::backdrop {
+            --tw-content: "";
+          }
+        }
+      }
+      "
+    `)
+  },
+)
+
 test(
   'auto source detection disabled',
   {
@@ -931,18 +2414,16 @@ test(
         }
       `,
       'index.css': css`
-        @import 'tailwindcss/theme' theme(reference);
+        @reference 'tailwindcss/theme';
 
         /* (1) */
-        /* - Only './src' should be auto-scanned, not the current working directory */
-        /* - .gitignore'd paths should be ignored (node_modules) */
-        /* - Binary extensions should be ignored (jpg, zip) */
+        /* - Disable auto-source detection */
         @import 'tailwindcss/utilities' source(none);
 
         /* (2) */
         /* - './pages' should be auto-scanned */
         /* - Only '.html' files should be included */
-        /* - './page/ignored.html' should be ignored */
+        /* - './page/ignored.html' will not be ignored because of the specific pattern */
         @source "./pages/**/*.html";
       `,
 
@@ -962,7 +2443,7 @@ test(
       // (4)
       'pages/foo.html': 'content-["pages/foo.html"]',
       'pages/nested/foo.html': 'content-["pages/nested/foo.html"]',
-      'pages/ignored.html': 'content-["pages/ignored.html"] content-["BAD"]',
+      'pages/ignored.html': 'content-["pages/ignored.html"]',
       'pages/foo.jsx': 'content-["pages/foo.jsx"] content-["BAD"]',
       'pages/nested/foo.jsx': 'content-["pages/nested/foo.jsx"] content-["BAD"]',
     },
@@ -973,27 +2454,733 @@ test(
     expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
       "
       --- ./dist/out.css ---
+      @layer properties;
       .content-\\[\\"pages\\/foo\\.html\\"\\] {
         --tw-content: "pages/foo.html";
         content: var(--tw-content);
       }
+      .content-\\[\\"pages\\/ignored\\.html\\"\\] {
+        --tw-content: "pages/ignored.html";
+        content: var(--tw-content);
+      }
       .content-\\[\\"pages\\/nested\\/foo\\.html\\"\\] {
         --tw-content: "pages/nested/foo.html";
         content: var(--tw-content);
       }
-      @supports (-moz-orient: inline) {
-        @layer base {
-          *, ::before, ::after, ::backdrop {
-            --tw-content: "";
-          }
-        }
-      }
       @property --tw-content {
         syntax: "*";
         inherits: false;
         initial-value: "";
       }
+      @layer properties {
+        @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
+          *, ::before, ::after, ::backdrop {
+            --tw-content: "";
+          }
+        }
+      }
       "
     `)
   },
 )
+
+test(
+  '@theme reference should never emit values',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'src/index.css': css`
+        @reference "tailwindcss";
+
+        .keep-me {
+          color: red;
+        }
+      `,
+    },
+  },
+  async ({ fs, spawn, expect }) => {
+    let process = await spawn(
+      `pnpm tailwindcss --input src/index.css --output dist/out.css --watch`,
+    )
+    await process.onStderr((m) => m.includes('Done in'))
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/out.css ---
+      .keep-me {
+        color: red;
+      }
+      "
+    `)
+
+    await fs.write(
+      './src/index.css',
+      css`
+        @reference "tailwindcss";
+
+        /* Not a reference! */
+        @theme {
+          --color-pink: pink;
+        }
+
+        .keep-me {
+          color: red;
+        }
+      `,
+    )
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/out.css ---
+      .keep-me {
+        color: red;
+      }
+      "
+    `)
+  },
+)
+
+test(
+  'emit CSS variables if used outside of utilities',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss/utilities';
+        @theme {
+          --color-blue-500: blue;
+        }
+      `,
+      'src/index.ts': ts`
+        function MyComponent() {
+          return <motion.div />
+        }
+      `,
+    },
+  },
+  async ({ fs, spawn, expect }) => {
+    let process = await spawn(
+      'pnpm tailwindcss --input src/index.css --output dist/out.css --watch',
+    )
+    await process.onStderr((m) => m.includes('Done in'))
+
+    // No CSS variables are used, so nothing should be generated yet.
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/out.css ---
+      <EMPTY>
+      "
+    `)
+
+    // Use a CSS variable in JS/TS land, now it should be generated.
+    await fs.write(
+      './src/index.ts',
+      ts`
+        function MyComponent() {
+          return <motion.div animate={{ backgroundColor: 'var(--color-blue-500)' }} />
+        }
+      `,
+    )
+
+    // prettier-ignore
+    await fs.expectFileToContain(
+      './dist/out.css',
+      css`
+        :root, :host {
+          --color-blue-500: blue;
+        }
+      `,
+    )
+  },
+)
+
+test(
+  'can read files with UTF-8 files with BOM',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'index.css': withBOM(css`
+        @reference 'tailwindcss/theme.css';
+        @import 'tailwindcss/utilities';
+      `),
+      'index.html': withBOM(html`
+        <div class="underline"></div>
+      `),
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm tailwindcss --input index.css --output dist/out.css')
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/out.css ---
+      .underline {
+        text-decoration-line: underline;
+      }
+      "
+    `)
+  },
+)
+
+test(
+  'fails when reading files with UTF-16 files with BOM',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await fs.write(
+      'index.css',
+      withBOM(css`
+        @reference 'tailwindcss/theme.css';
+        @import 'tailwindcss/utilities';
+      `),
+      'utf16le',
+    )
+    await fs.write(
+      'index.html',
+      withBOM(html`
+        <div class="underline"></div>
+      `),
+      'utf16le',
+    )
+
+    await expect(exec('pnpm tailwindcss --input index.css --output dist/out.css')).rejects.toThrow(
+      /Invalid declaration:/,
+    )
+  },
+)
+
+test(
+  'fails when input file does not exist',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+    },
+  },
+  async ({ exec, expect }) => {
+    await expect(exec('pnpm tailwindcss --input index.css --output dist/out.css')).rejects.toThrow(
+      /Specified input file.*does not exist./,
+    )
+  },
+)
+
+test(
+  'fails when input file and output file are the same',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'input.css': '',
+    },
+  },
+  async ({ exec, expect }) => {
+    await expect(exec('pnpm tailwindcss --input input.css --output input.css')).rejects.toThrow(
+      /Specified input file.*and output file.*are identical./,
+    )
+    await expect(
+      exec('pnpm tailwindcss --input input.css --output ./src/../input.css'),
+    ).rejects.toThrow(/Specified input file.*and output file.*are identical./)
+  },
+)
+
+test(
+  'input and output flags can be the same if `-` is used',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'index.html': html`<div class="flex"></div>`,
+    },
+  },
+  async ({ exec, expect }) => {
+    expect(
+      await exec('pnpm tailwindcss --input - --output -', undefined, {
+        stdin: '@tailwind utilities;',
+      }),
+    ).toContain(candidate`flex`)
+  },
+)
+
+test(
+  'suppress output by using the --silent flag',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'index.css': css` @import 'tailwindcss/utilities';`,
+      'index.html': html`<div class="flex"></div>`,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    let output = await exec('pnpm tailwindcss --input index.css --output dist/loud.css')
+    expect(output).toContain('Done in')
+
+    let silentOutput = await exec(
+      'pnpm tailwindcss --input index.css --output dist/silent.css --silent',
+    )
+    expect(silentOutput).not.toContain('Done in')
+    expect(silentOutput).not.toContain('tailwindcss v')
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/loud.css ---
+      .flex {
+        display: flex;
+      }
+
+
+      --- ./dist/silent.css ---
+      .flex {
+        display: flex;
+      }
+      "
+    `)
+  },
+)
+
+test(
+  'changes to CSS files should pick up new CSS variables (if any)',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'unrelated.module.css': css`
+        .module {
+          color: var(--color-blue-500);
+        }
+      `,
+      'index.css': css`
+        @import 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+      'index.html': html`<div class="flex"></div>`,
+    },
+  },
+  async ({ spawn, exec, fs, expect }) => {
+    // Generate the initial build so output CSS files exist on disk
+    await exec('pnpm tailwindcss --input ./index.css --output ./dist/out.css')
+
+    // NOTE: We are writing to an output CSS file which is not being ignored by
+    // `.gitignore` nor marked with `@source not`. This should not result in an
+    // infinite loop.
+    let process = await spawn(
+      'pnpm tailwindcss --input ./index.css --output ./dist/out.css --watch',
+    )
+    await process.onStderr((m) => m.includes('Done in'))
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/out.css ---
+      :root, :host {
+        --color-blue-500: oklch(62.3% 0.214 259.815);
+      }
+      .flex {
+        display: flex;
+      }
+      "
+    `)
+
+    await fs.write(
+      'unrelated.module.css',
+      css`
+        .module {
+          color: var(--color-blue-500);
+          background-color: var(--color-red-500);
+        }
+      `,
+    )
+    await process.onStderr((m) => m.includes('Done in'))
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/out.css ---
+      :root, :host {
+        --color-red-500: oklch(63.7% 0.237 25.331);
+        --color-blue-500: oklch(62.3% 0.214 259.815);
+      }
+      .flex {
+        display: flex;
+      }
+      "
+    `)
+  },
+)
+
+test(
+  'polyfills should be imported after external `@import url(…)` statements',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'index.css': css`
+        @import url('https://fonts.googleapis.com');
+        @import 'tailwindcss';
+      `,
+      'index.html': html`<div class="bg-red-500/50 shadow-md"></div>`,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm tailwindcss --input ./index.css --output ./dist/out.css')
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/out.css ---
+      @import url('https://fonts.googleapis.com');
+      @layer properties;
+      @layer theme, base, components, utilities;
+      @layer theme {
+        :root, :host {
+          --font-sans: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', 'Noto Sans', Arial,
+          sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+          --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New',
+          monospace;
+          --color-red-500: oklch(63.7% 0.237 25.331);
+          --default-font-family: var(--font-sans);
+          --default-mono-font-family: var(--font-mono);
+        }
+      }
+      @layer base {
+        *, ::after, ::before, ::backdrop, ::file-selector-button {
+          box-sizing: border-box;
+          margin: 0;
+          padding: 0;
+          border: 0 solid;
+        }
+        html, :host {
+          line-height: 1.5;
+          -webkit-text-size-adjust: 100%;
+          tab-size: 4;
+          font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', 'Noto Sans', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji');
+          font-feature-settings: var(--default-font-feature-settings, normal);
+          font-variation-settings: var(--default-font-variation-settings, normal);
+          -webkit-tap-highlight-color: transparent;
+        }
+        hr {
+          height: 0;
+          color: inherit;
+          border-top-width: 1px;
+        }
+        abbr:where([title]) {
+          -webkit-text-decoration: underline dotted;
+          text-decoration: underline dotted;
+        }
+        h1, h2, h3, h4, h5, h6 {
+          font-size: inherit;
+          font-weight: inherit;
+        }
+        a {
+          color: inherit;
+          -webkit-text-decoration: inherit;
+          text-decoration: inherit;
+        }
+        b, strong {
+          font-weight: bolder;
+        }
+        code, kbd, samp, pre {
+          font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace);
+          font-feature-settings: var(--default-mono-font-feature-settings, normal);
+          font-variation-settings: var(--default-mono-font-variation-settings, normal);
+          font-size: 1em;
+        }
+        small {
+          font-size: 80%;
+        }
+        sub, sup {
+          font-size: 75%;
+          line-height: 0;
+          position: relative;
+          vertical-align: baseline;
+        }
+        sub {
+          bottom: -0.25em;
+        }
+        sup {
+          top: -0.5em;
+        }
+        table {
+          text-indent: 0;
+          border-color: inherit;
+          border-collapse: collapse;
+        }
+        :-moz-focusring:where(:not(iframe)) {
+          outline: auto;
+        }
+        progress {
+          vertical-align: baseline;
+        }
+        summary {
+          display: list-item;
+        }
+        ol, ul, menu {
+          list-style: none;
+        }
+        img, svg, video, canvas, audio, iframe, embed, object {
+          display: block;
+          vertical-align: middle;
+        }
+        img, video {
+          max-width: 100%;
+          height: auto;
+        }
+        button, input, select, optgroup, textarea, ::file-selector-button {
+          font: inherit;
+          font-feature-settings: inherit;
+          font-variation-settings: inherit;
+          letter-spacing: inherit;
+          color: inherit;
+          border-radius: 0;
+          background-color: transparent;
+          opacity: 1;
+        }
+        :where(select:is([multiple], [size])) optgroup {
+          font-weight: bolder;
+        }
+        :where(select:is([multiple], [size])) optgroup option {
+          padding-inline-start: 20px;
+        }
+        ::file-selector-button {
+          margin-inline-end: 4px;
+        }
+        ::placeholder {
+          opacity: 1;
+        }
+        @supports (not (-webkit-appearance: -apple-pay-button))  or (contain-intrinsic-size: 1px) {
+          ::placeholder {
+            color: currentcolor;
+            @supports (color: color-mix(in lab, red, red)) {
+              color: color-mix(in oklab, currentcolor 50%, transparent);
+            }
+          }
+        }
+        textarea {
+          resize: vertical;
+        }
+        ::-webkit-search-decoration {
+          -webkit-appearance: none;
+        }
+        ::-webkit-date-and-time-value {
+          min-height: 1lh;
+          text-align: inherit;
+        }
+        ::-webkit-datetime-edit {
+          display: inline-flex;
+        }
+        ::-webkit-datetime-edit-fields-wrapper {
+          padding: 0;
+        }
+        ::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month-field, ::-webkit-datetime-edit-day-field, ::-webkit-datetime-edit-hour-field, ::-webkit-datetime-edit-minute-field, ::-webkit-datetime-edit-second-field, ::-webkit-datetime-edit-millisecond-field, ::-webkit-datetime-edit-meridiem-field {
+          padding-block: 0;
+        }
+        ::-webkit-calendar-picker-indicator {
+          line-height: 1;
+        }
+        :-moz-ui-invalid {
+          box-shadow: none;
+        }
+        button, input:where([type='button'], [type='reset'], [type='submit']), ::file-selector-button {
+          appearance: button;
+        }
+        ::-webkit-inner-spin-button, ::-webkit-outer-spin-button {
+          height: auto;
+        }
+        [hidden]:where(:not([hidden='until-found'])) {
+          display: none !important;
+        }
+      }
+      @layer utilities {
+        .bg-red-500\\/50 {
+          background-color: color-mix(in srgb, oklch(63.7% 0.237 25.331) 50%, transparent);
+          @supports (color: color-mix(in lab, red, red)) {
+            background-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+          }
+        }
+        .shadow-md {
+          --tw-shadow: 0 4px 6px -1px var(--tw-shadow-color, rgb(0 0 0 / 0.1)), 0 2px 4px -2px var(--tw-shadow-color, rgb(0 0 0 / 0.1));
+          box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+        }
+      }
+      @property --tw-shadow {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0 0 #0000;
+      }
+      @property --tw-shadow-color {
+        syntax: "*";
+        inherits: false;
+      }
+      @property --tw-shadow-alpha {
+        syntax: "<percentage>";
+        inherits: false;
+        initial-value: 100%;
+      }
+      @property --tw-inset-shadow {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0 0 #0000;
+      }
+      @property --tw-inset-shadow-color {
+        syntax: "*";
+        inherits: false;
+      }
+      @property --tw-inset-shadow-alpha {
+        syntax: "<percentage>";
+        inherits: false;
+        initial-value: 100%;
+      }
+      @property --tw-ring-color {
+        syntax: "*";
+        inherits: false;
+      }
+      @property --tw-ring-shadow {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0 0 #0000;
+      }
+      @property --tw-inset-ring-color {
+        syntax: "*";
+        inherits: false;
+      }
+      @property --tw-inset-ring-shadow {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0 0 #0000;
+      }
+      @property --tw-ring-inset {
+        syntax: "*";
+        inherits: false;
+      }
+      @property --tw-ring-offset-width {
+        syntax: "<length>";
+        inherits: false;
+        initial-value: 0px;
+      }
+      @property --tw-ring-offset-color {
+        syntax: "*";
+        inherits: false;
+        initial-value: #fff;
+      }
+      @property --tw-ring-offset-shadow {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0 0 #0000;
+      }
+      @layer properties {
+        @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
+          *, ::before, ::after, ::backdrop {
+            --tw-shadow: 0 0 #0000;
+            --tw-shadow-color: initial;
+            --tw-shadow-alpha: 100%;
+            --tw-inset-shadow: 0 0 #0000;
+            --tw-inset-shadow-color: initial;
+            --tw-inset-shadow-alpha: 100%;
+            --tw-ring-color: initial;
+            --tw-ring-shadow: 0 0 #0000;
+            --tw-inset-ring-color: initial;
+            --tw-inset-ring-shadow: 0 0 #0000;
+            --tw-ring-inset: initial;
+            --tw-ring-offset-width: 0px;
+            --tw-ring-offset-color: #fff;
+            --tw-ring-offset-shadow: 0 0 #0000;
+          }
+        }
+      }
+      "
+    `)
+  },
+)
+
+test(
+  'CSS parse errors should include filename and line number',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'input.css': txt`
+        .test {
+          color: red;
+          */
+        }
+      `,
+    },
+  },
+  async ({ exec, expect }) => {
+    await expect(exec('pnpm tailwindcss --input input.css --output dist/out.css')).rejects.toThrow(
+      /CssSyntaxError: .*input.css:3:3: Invalid declaration: `\*\/`/,
+    )
+  },
+)
+
+function withBOM(text: string): string {
+  return '\uFEFF' + text
+}
diff --git a/integrations/cli/plugins.test.ts b/integrations/cli/plugins.test.ts
index 833b0f677..0b810c538 100644
--- a/integrations/cli/plugins.test.ts
+++ b/integrations/cli/plugins.test.ts
@@ -1,4 +1,4 @@
-import { candidate, css, html, json, test } from '../utils'
+import { candidate, css, html, json, test, ts } from '../utils'
 
 test(
   'builds the `@tailwindcss/typography` plugin utilities',
@@ -14,7 +14,7 @@ test(
         }
       `,
       'index.html': html`
-        <div className="prose">
+        <div className="prose prose-stone prose-invert">
           <h1>Headline</h1>
           <p>
             Until now, trying to style an article, document, or blog post with Tailwind has been a
@@ -28,17 +28,100 @@ test(
       `,
     },
   },
-  async ({ fs, exec }) => {
+  async ({ fs, exec, expect }) => {
     await exec('pnpm tailwindcss --input src/index.css --output dist/out.css')
 
+    // Verify that `prose-stone` is defined before `prose-invert`
+    {
+      let contents = await fs.read('dist/out.css')
+      let proseInvertIdx = contents.indexOf('.prose-invert')
+      let proseStoneIdx = contents.indexOf('.prose-stone')
+
+      expect(proseStoneIdx).toBeLessThan(proseInvertIdx)
+    }
+
     await fs.expectFileToContain('dist/out.css', [
       candidate`prose`,
-      ':where(h1):not(:where([class~="not-prose"],[class~="not-prose"] *))',
-      ':where(tbody td, tfoot td):not(:where([class~="not-prose"],[class~="not-prose"] *))',
+      ':where(h1):not(:where([class~="not-prose"], [class~="not-prose"] *))',
+      ':where(tbody td, tfoot td):not(:where([class~="not-prose"], [class~="not-prose"] *))',
     ])
   },
 )
 
+test(
+  'builds the `@tailwindcss/typography` plugin utilities with `@variant` usages',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "@tailwindcss/typography": "^0.5.14",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'index.html': html`
+        <div className="prose prose-custom">
+          <h1>Headline</h1>
+          <p>
+            Until now, trying to style an article, document, or blog post with Tailwind has been a
+            tedious task that required a keen eye for typography and a lot of complex custom CSS.
+          </p>
+        </div>
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss/utilities';
+        @theme {
+          --breakpoint-sm: 640px;
+        }
+        @plugin '@tailwindcss/typography';
+        @config '../tailwind.config.js';
+        @custom-variant custom (&.custom);
+      `,
+      'tailwind.config.js': ts`
+        module.exports = {
+          theme: {
+            typography: ({ theme }) => ({
+              custom: {
+                css: {
+                  hr: {
+                    '--x': '1',
+                    '@variant sm:custom': {
+                      '--x': '2',
+                    },
+                  },
+                },
+              },
+            }),
+          },
+        }
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm tailwindcss --input src/index.css --output dist/out.css')
+
+    // We don't want to see `@variant` in the output
+    let contents = await fs.read('dist/out.css')
+    expect(contents).not.toContain('@variant')
+
+    expect(await fs.dumpFiles('dist/out.css')).toMatchInlineSnapshot(`
+      "
+      --- dist/out.css ---
+      .prose-custom :where(hr):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
+        --x: 1;
+        @media (width >= 640px) {
+          &.custom {
+            --x: 2;
+          }
+        }
+      }
+      "
+    `)
+  },
+)
+
 test(
   'builds the `@tailwindcss/forms` plugin utilities',
   {
@@ -108,7 +191,7 @@ test(
     await fs.expectFileToContain('dist/out.css', [
       //
       `::-webkit-date-and-time-value`,
-      `[type='checkbox']:indeterminate`,
+      `input:where([type='checkbox']):indeterminate`,
     ])
 
     // No classes are included even though they are used in the HTML
@@ -198,3 +281,88 @@ test(
     ])
   },
 )
+
+// https://github.com/tailwindlabs/tailwindcss/issues/15844
+test(
+  'builds CSS with a custom plugin compiled from TypeScript',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/cli": "workspace:^"
+          },
+          "devDependencies": {
+            "typescript": "^5.7.2"
+          }
+        }
+      `,
+      'tsconfig.json': json`
+        {
+          "compilerOptions": {
+            "target": "ES2022",
+            "module": "NodeNext",
+            "moduleResolution": "NodeNext",
+            "declaration": true,
+            "composite": true,
+            "rootDir": "./src",
+            "outDir": "./.build",
+            "skipLibCheck": true
+          },
+          "include": ["src/**/*.ts"]
+        }
+      `,
+      'index.html': html`
+        <div class="test-red"></div>
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss';
+        @plugin '../.build/plugin.js';
+      `,
+      'src/plugin.ts': ts`
+        import plugin from 'tailwindcss/plugin'
+
+        export const typedPlugin = plugin(() => {
+          return ({ matchComponents }) => {
+            matchComponents(
+              {
+                test: (content: string) => ({
+                  color: content,
+                }),
+              },
+              {
+                values: {
+                  red: 'red',
+                },
+              },
+            )
+          }
+        })
+
+        export default plugin(({ matchComponents }) => {
+          matchComponents(
+            {
+              test: (content: string) => ({
+                color: content,
+              }),
+            },
+            {
+              values: {
+                red: 'red',
+              },
+            },
+          )
+        })
+      `,
+    },
+  },
+  async ({ fs, exec }) => {
+    // We expect that these commands don't crash:
+    await exec('pnpm tsc -b')
+    await exec('pnpm tailwindcss --input src/index.css --output dist/out.css')
+
+    await fs.expectFileToContain('dist/out.css', [candidate`test-red`])
+  },
+)
diff --git a/integrations/cli/standalone.test.ts b/integrations/cli/standalone.test.ts
index a40d69fc9..f84bf4511 100644
--- a/integrations/cli/standalone.test.ts
+++ b/integrations/cli/standalone.test.ts
@@ -1,6 +1,7 @@
+import nodeFs from 'node:fs/promises'
 import os from 'node:os'
 import path from 'node:path'
-import { candidate, css, html, json, test } from '../utils'
+import { candidate, css, html, IS_WINDOWS, js, json, test, ts } from '../utils'
 
 const STANDALONE_BINARY = (() => {
   switch (os.platform()) {
@@ -15,6 +16,41 @@ const STANDALONE_BINARY = (() => {
   }
 })()
 
+test(
+  'does not scan itself for candidates',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {}
+        }
+      `,
+      'src/index.css': css` @import 'tailwindcss'; `,
+    },
+  },
+  async ({ root, fs, exec }) => {
+    let sourceBinary = path.resolve(
+      __dirname,
+      `../../packages/@tailwindcss-standalone/dist/${STANDALONE_BINARY}`,
+    )
+    let binary = IS_WINDOWS ? 'tailwindcss.exe' : 'tailwindcss'
+    let localBinary = path.join(root, binary)
+    await nodeFs.copyFile(sourceBinary, localBinary)
+
+    if (!IS_WINDOWS) {
+      await nodeFs.chmod(localBinary, 0o755)
+    }
+
+    await exec(`${IS_WINDOWS ? binary : `./${binary}`} --input src/index.css --output dist/out.css`)
+
+    await fs.expectFileNotToContain('dist/out.css', [
+      candidate`flex`,
+      candidate`grid`,
+      candidate`underline`,
+    ])
+  },
+)
+
 test(
   'includes first-party plugins',
   {
@@ -35,7 +71,7 @@ test(
         <div class="aspect-w-16"></div>
       `,
       'src/index.css': css`
-        @import 'tailwindcss/theme' theme(reference);
+        @reference 'tailwindcss/theme';
         @import 'tailwindcss/utilities';
 
         @plugin '@tailwindcss/forms';
@@ -56,3 +92,109 @@ test(
     ])
   },
 )
+
+test(
+  'includes js APIs for plugins',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {}
+        }
+      `,
+      'index.html': html`
+        <div class="underline example1 example2 example3"></div>
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss/theme' theme(reference);
+        @import 'tailwindcss/utilities';
+        @plugin './plugin.js';
+        @plugin './plugin.cjs';
+        @plugin './plugin.ts';
+      `,
+      'src/plugin.js': js`
+        import plugin from 'tailwindcss/plugin'
+
+        // Make sure all available JS APIs can be imported and used
+        import * as tw from 'tailwindcss'
+        import colors from 'tailwindcss/colors'
+        import flattenColorPalette from 'tailwindcss/lib/util/flattenColorPalette'
+        import defaultTheme from 'tailwindcss/defaultTheme'
+        import * as pkg from 'tailwindcss/package.json'
+
+        export default plugin(function ({ addUtilities }) {
+          addUtilities({
+            '.example1': {
+              '--version': pkg.version,
+              '--default-theme': typeof defaultTheme,
+              '--flatten-color-palette': typeof flattenColorPalette,
+              '--colors': typeof colors,
+              '--core': typeof tw,
+              color: 'red',
+            },
+          })
+        })
+      `,
+      'src/plugin.cjs': js`
+        const plugin = require('tailwindcss/plugin')
+
+        // Make sure all available JS APIs can be imported and used
+        const tw = require('tailwindcss')
+        const colors = require('tailwindcss/colors')
+        const flattenColorPalette = require('tailwindcss/lib/util/flattenColorPalette')
+        const defaultTheme = require('tailwindcss/defaultTheme')
+        const pkg = require('tailwindcss/package.json')
+
+        module.exports = plugin(function ({ addUtilities }) {
+          addUtilities({
+            '.example2': {
+              '--version': pkg.version,
+              '--default-theme': typeof defaultTheme,
+              '--flatten-color-palette': typeof flattenColorPalette,
+              '--colors': typeof colors,
+              '--core': typeof tw,
+              color: 'red',
+            },
+          })
+        })
+      `,
+      'src/plugin.ts': ts`
+        import plugin from 'tailwindcss/plugin'
+
+        // Make sure all available JS APIs can be imported and used
+        import * as tw from 'tailwindcss'
+        import colors from 'tailwindcss/colors'
+        import flattenColorPalette from 'tailwindcss/lib/util/flattenColorPalette'
+        import defaultTheme from 'tailwindcss/defaultTheme'
+        import * as pkg from 'tailwindcss/package.json'
+
+        export interface PluginOptions {}
+
+        export default plugin(function ({ addUtilities }) {
+          addUtilities({
+            '.example3': {
+              '--version': pkg.version,
+              '--default-theme': typeof defaultTheme,
+              '--flatten-color-palette': typeof flattenColorPalette,
+              '--colors': typeof colors,
+              '--core': typeof tw,
+              color: 'red',
+            },
+          })
+        })
+      `,
+    },
+  },
+  async ({ fs, exec }) => {
+    await exec(
+      `${path.resolve(__dirname, `../../packages/@tailwindcss-standalone/dist/${STANDALONE_BINARY}`)} --input src/index.css --output dist/out.css`,
+    )
+
+    await fs.expectFileToContain('dist/out.css', [
+      candidate`underline`,
+      candidate`example1`,
+      candidate`example2`,
+      candidate`example3`,
+    ])
+  },
+)
diff --git a/integrations/oxide/wasm.test.ts b/integrations/oxide/wasm.test.ts
new file mode 100644
index 000000000..2d63c707a
--- /dev/null
+++ b/integrations/oxide/wasm.test.ts
@@ -0,0 +1,243 @@
+import { css, js, json, test, yaml } from '../utils'
+
+// This test runs the wasm build using the `node:wasi` runtime.
+//
+// There are currently a known problems that the Node WASI preview implementation does not properly
+// handle FS reads on macOS and it does not implement all APIs on Windows. Because of that, this
+// test is only run on Linux for now.
+//
+// https://github.com/nodejs/node/issues/47193
+// https://github.com/nodejs/uvwasi/issues/11
+
+let testFn = process.platform === 'linux' ? test : test.skip
+
+testFn(
+  '@tailwindcss/oxide-wasm32-wasi can be loaded into a Node.js process',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "@tailwindcss/oxide-wasm32-wasi": "workspace:^"
+          }
+        }
+      `,
+      'src/index.css': css`@import 'tailwindcss/utilities';`,
+      'src/index.js': js`
+        const className = "content-['src/index.js']"
+        module.exports = { className }
+      `,
+      'index.mjs': js`
+        import { Scanner } from '@tailwindcss/oxide-wasm32-wasi'
+        import { join, resolve } from 'node:path'
+
+        let scanner = new Scanner({
+          sources: [
+            {
+              base: join(process.cwd(), 'src'),
+              pattern: '**/*',
+              negated: false,
+            },
+          ],
+        })
+        console.log(JSON.stringify(scanner.scan()))
+        process.exit()
+      `,
+    },
+  },
+  async ({ expect, exec }) => {
+    let output = await exec(`node index.mjs`)
+    expect(JSON.parse(output)).toMatchInlineSnapshot(`
+      [
+        "className",
+        "const",
+        "content-['src/index.js']",
+        "exports",
+      ]
+    `)
+  },
+)
+
+testFn(
+  '`@tailwindcss/oxide` falls back to the wasm build when no native binding is available',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "@tailwindcss/oxide": "workspace:^"
+          }
+        }
+      `,
+      'pnpm-workspace.yaml': yaml`
+        # Trick pnpm in only supporting an architecture that @tailwindcss/oxide
+        # doesn't support, and therefore should fallback to the wasm version.
+        supportedArchitectures:
+          os:
+            - openbsd
+          cpu:
+            - x64
+      `,
+      'src/index.js': js`
+        const className = "content-['src/index.js']"
+        module.exports = { className }
+      `,
+      'index.mjs': js`
+        import { createRequire } from 'node:module'
+        import { join } from 'node:path'
+
+        let require = createRequire(import.meta.url)
+        let { Scanner } = require('@tailwindcss/oxide')
+
+        let loaded = Object.keys(require.cache)
+
+        let scanner = new Scanner({
+          sources: [
+            {
+              base: join(process.cwd(), 'src'),
+              pattern: '**/*',
+              negated: false,
+            },
+          ],
+        })
+
+        console.log(
+          JSON.stringify({
+            native: loaded.filter((file) => file.endsWith('.node')),
+            wasi: loaded.some((file) => file.endsWith('tailwindcss-oxide.wasi.cjs')),
+            candidates: scanner.scan(),
+          }),
+        )
+        process.exit()
+      `,
+    },
+  },
+  async ({ expect, exec }) => {
+    // Since vitest runs under `pnpm run`, pnpm's bin shims export a NODE_PATH
+    // that includes the repository's hidden hoist directory
+    // (`node_modules/.pnpm/node_modules`), which links every workspace package,
+    // including all native `@tailwindcss/oxide-*` bindings.
+    //
+    // Node uses `NODE_PATH` exactly when the local `node_modules` lookup fails,
+    // which would defeat the simulated unsupported platform, so clear it.
+    let output = await exec(`node index.mjs`, { env: { NODE_PATH: '' } })
+    let { native, wasi, candidates } = JSON.parse(output)
+
+    // No native binding was installed or loaded, ...
+    expect(native).toEqual([])
+
+    // ... the wasm32-wasi binding is what actually loaded, ...
+    expect(wasi).toBe(true)
+
+    // ... and scanning real files on disk works through it.
+    expect(candidates).toMatchInlineSnapshot(`
+      [
+        "className",
+        "const",
+        "content-['src/index.js']",
+        "exports",
+      ]
+    `)
+  },
+)
+
+testFn(
+  'the wasm build loads even when preopening the filesystem root is denied',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "@tailwindcss/oxide": "workspace:^"
+          }
+        }
+      `,
+      'pnpm-workspace.yaml': yaml`
+        # Trick pnpm in only supporting an architecture that @tailwindcss/oxide
+        # doesn't support, and therefore should fallback to the wasm version.
+        supportedArchitectures:
+          os:
+            - openbsd
+          cpu:
+            - x64
+      `,
+      // The wasm bindings generated by `@napi-rs/cli` preopen the filesystem
+      // root, which sandboxed platforms (e.g. OpenHarmony, Android) deny with
+      // `UVWASI_EACCES`, making the wasm fallback fail to load on exactly the
+      // platforms that need it.
+      //
+      // We patch `@napi-rs/cli`'s templates to retry with narrower preopens
+      // (see `patches/@napi-rs__cli@3.7.4.patch`). Simulate such a sandbox by
+      // denying `/` preopens.
+      'preload.cjs': js`
+        const wasi = require('node:wasi')
+        const RealWASI = wasi.WASI
+
+        wasi.WASI = class WASI extends RealWASI {
+          constructor(options) {
+            if (options?.preopens?.['/'] !== undefined) {
+              const error = new Error('UVWASI_EACCES, uvwasi_init')
+              error.code = 'UVWASI_EACCES'
+              error.syscall = 'uvwasi_init'
+              throw error
+            }
+            super(options)
+          }
+        }
+      `,
+      'src/index.js': js`
+        const className = "content-['src/index.js']"
+        module.exports = { className }
+      `,
+      'index.mjs': js`
+        import { createRequire } from 'node:module'
+        import { join } from 'node:path'
+
+        let require = createRequire(import.meta.url)
+        let { Scanner } = require('@tailwindcss/oxide')
+
+        let loaded = Object.keys(require.cache)
+
+        let scanner = new Scanner({
+          sources: [
+            {
+              base: join(process.cwd(), 'src'),
+              pattern: '**/*',
+              negated: false,
+            },
+          ],
+        })
+
+        console.log(
+          JSON.stringify({
+            wasi: loaded.some((file) => file.endsWith('tailwindcss-oxide.wasi.cjs')),
+            candidates: scanner.scan(),
+          }),
+        )
+        process.exit()
+      `,
+    },
+  },
+  async ({ expect, exec }) => {
+    // See the note about NODE_PATH in the test above.
+    let output = await exec(`node --require ./preload.cjs index.mjs`, { env: { NODE_PATH: '' } })
+
+    // Only parse the first line, because Node prints an `ExperimentalWarning`
+    // about WASI to stderr, which `exec` appends to the output.
+    let { wasi, candidates } = JSON.parse(output.trim().split('\n')[0])
+
+    // The wasm32-wasi binding loaded despite `/` being denied, ...
+    expect(wasi).toBe(true)
+
+    // ... and scanning files under the current working directory still works
+    // through the narrower preopen.
+    expect(candidates).toMatchInlineSnapshot(`
+      [
+        "className",
+        "const",
+        "content-['src/index.js']",
+        "exports",
+      ]
+    `)
+  },
+)
diff --git a/integrations/oxide/workers.test.ts b/integrations/oxide/workers.test.ts
new file mode 100644
index 000000000..54d85f271
--- /dev/null
+++ b/integrations/oxide/workers.test.ts
@@ -0,0 +1,32 @@
+import { js, json, test } from '../utils'
+
+test(
+  '@tailwindcss/oxide can be loaded into a Node.js worker thread',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "@tailwindcss/oxide": "workspace:^"
+          }
+        }
+      `,
+      'start.js': js`
+        let { Worker } = require('worker_threads')
+        new Worker('./worker.js')
+      `,
+      'worker.js': js`
+        require('@tailwindcss/oxide')
+        process.on('exit', () => console.log('worker thread exited'))
+      `,
+    },
+  },
+  async ({ exec, expect }) => {
+    let output = await exec('node ./start.js').then(
+      (out) => out.trim(),
+      (err) => `${err}`,
+    )
+
+    expect(output).toEqual('worker thread exited')
+  },
+)
diff --git a/integrations/package.json b/integrations/package.json
index 8023842cd..ae337b5e4 100644
--- a/integrations/package.json
+++ b/integrations/package.json
@@ -3,7 +3,9 @@
   "version": "0.0.0",
   "private": true,
   "devDependencies": {
-    "dedent": "1.5.3",
-    "fast-glob": "^3.3.2"
+    "dedent": "catalog:",
+    "fast-glob": "^3.3.3",
+    "source-map-js": "^1.2.1",
+    "yaml": "^2.9.0"
   }
 }
diff --git a/integrations/postcss/core-as-postcss-plugin.test.ts b/integrations/postcss/core-as-postcss-plugin.test.ts
index 17545fea3..839c80e7b 100644
--- a/integrations/postcss/core-as-postcss-plugin.test.ts
+++ b/integrations/postcss/core-as-postcss-plugin.test.ts
@@ -48,9 +48,9 @@ describe.each(Object.keys(variantConfig))('%s', (variant) => {
       },
     },
     async ({ exec, expect }) => {
-      expect(
+      await expect(
         exec('pnpm postcss src/index.css --output dist/out.css', undefined, { ignoreStdErr: true }),
-      ).rejects.toThrowError(
+      ).rejects.toThrow(
         `It looks like you're trying to use \`tailwindcss\` directly as a PostCSS plugin. The PostCSS plugin has moved to a separate package, so to continue using Tailwind CSS with PostCSS you'll need to install \`@tailwindcss/postcss\` and update your PostCSS configuration.`,
       )
     },
diff --git a/integrations/postcss/index.test.ts b/integrations/postcss/index.test.ts
index 4da70ee1f..80025f945 100644
--- a/integrations/postcss/index.test.ts
+++ b/integrations/postcss/index.test.ts
@@ -1,4 +1,3 @@
-import dedent from 'dedent'
 import path from 'node:path'
 import { candidate, css, html, js, json, test, ts, yaml } from '../utils'
 
@@ -638,12 +637,12 @@ test(
 )
 
 test(
-  'auto source detection kitchen sink',
+  'rebuild error recovery',
   {
     fs: {
       'package.json': json`
         {
-          "dependencies": {
+          "devDependencies": {
             "postcss": "^8",
             "postcss-cli": "^10",
             "tailwindcss": "workspace:^",
@@ -658,120 +657,100 @@ test(
           },
         }
       `,
-      'index.css': css`
-        @import 'tailwindcss/theme' theme(reference);
-
-        /* (1) */
-        /* - Only './src' should be auto-scanned, not the current working directory */
-        /* - .gitignore'd paths should be ignored (node_modules) */
-        /* - Binary extensions should be ignored (jpg, zip) */
-        @import 'tailwindcss/utilities' source('./src');
-
-        /* (2) */
-        /* - All HTML and JSX files in 'ignored/components' should be scanned */
-        /* - All other extensions should be ignored */
-        @source "./ignored/components/*.{html,jsx}";
-
-        /* (3) */
-        /* - './components' should be auto-scanned in addition to './src' */
-        /* - './components/ignored.html' should still be ignored */
-        /* - Binary extensions in './components' should be ignored */
-        @source "./components";
-
-        /* (4) */
-        /* - './pages' should be auto-scanned */
-        /* - Only '.html' files should be included */
-        /* - './page/ignored.html' should be ignored */
-        @source "./pages/**/*.html";
+      'src/index.html': html`
+        <div class="underline"></div>
       `,
-
-      '.gitignore': dedent`
-        /src/ignored
-        /ignored
-        /components/ignored.html
-        /pages/ignored.html
+      'src/index.css': css` @import './tailwind.css'; `,
+      'src/tailwind.css': css`
+        @reference 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
       `,
-
-      // (1)
-      'index.html': 'content-["index.html"] content-["BAD"]', // "Root" source is in `./src`
-      'src/index.html': 'content-["src/index.html"]',
-      'src/nested/index.html': 'content-["src/nested/index.html"]',
-      'src/index.jpg': 'content-["src/index.jpg"] content-["BAD"]',
-      'src/nested/index.tar': 'content-["src/nested/index.tar"] content-["BAD"]',
-      'src/ignored/index.html': 'content-["src/ignored/index.html"] content-["BAD"]',
-
-      // (2)
-      'ignored/components/my-component.html': 'content-["ignored/components/my-component.html"]',
-      'ignored/components/my-component.jsx': 'content-["ignored/components/my-component.jsx"]',
-
-      // Ignored and not explicitly listed by (2)
-      'ignored/components/my-component.tsx':
-        'content-["ignored/components/my-component.tsx"] content-["BAD"]',
-      'ignored/components/nested/my-component.html':
-        'content-["ignored/components/nested/my-component.html"] content-["BAD"]',
-
-      // (3)
-      'components/my-component.tsx': 'content-["components/my-component.tsx"]',
-      'components/nested/my-component.tsx': 'content-["components/nested/my-component.tsx"]',
-      'components/ignored.html': 'content-["components/ignored.html"] content-["BAD"]',
-
-      // (4)
-      'pages/foo.html': 'content-["pages/foo.html"]',
-      'pages/nested/foo.html': 'content-["pages/nested/foo.html"]',
-      'pages/ignored.html': 'content-["pages/ignored.html"] content-["BAD"]',
-      'pages/foo.jsx': 'content-["pages/foo.jsx"] content-["BAD"]',
-      'pages/nested/foo.jsx': 'content-["pages/nested/foo.jsx"] content-["BAD"]',
     },
   },
-  async ({ fs, exec, expect }) => {
-    await exec('pnpm postcss index.css --output dist/out.css')
+  async ({ fs, expect, spawn }) => {
+    // 1. Start the watcher
+    //
+    // It must have valid CSS for the initial build
+    let process = await spawn('pnpm postcss src/index.css --output dist/out.css --watch --verbose')
 
-    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+    await process.onStderr((message) => message.includes('Waiting for file changes...'))
+
+    expect(await fs.dumpFiles('dist/*.css')).toMatchInlineSnapshot(`
       "
-      --- ./dist/out.css ---
-      .content-\\[\\"components\\/my-component\\.tsx\\"\\] {
-        --tw-content: "components/my-component.tsx";
-        content: var(--tw-content);
+      --- dist/out.css ---
+      .underline {
+        text-decoration-line: underline;
       }
-      .content-\\[\\"components\\/nested\\/my-component\\.tsx\\"\\] {
-        --tw-content: "components/nested/my-component.tsx";
-        content: var(--tw-content);
+      "
+    `)
+
+    // 2. Cause an error
+    await fs.write(
+      'src/tailwind.css',
+      css`
+        @reference 'tailwindcss/does-not-exist';
+        @import 'tailwindcss/utilities';
+      `,
+    )
+
+    // 2.5 Write to a content file
+    await fs.write('src/index.html', html`
+      <div class="flex underline"></div>
+    `)
+
+    await process.onStderr((message) => message.includes('"./does-not-exist" is not exported'))
+
+    expect(await fs.dumpFiles('dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- dist/out.css ---
+      .underline {
+        text-decoration-line: underline;
       }
-      .content-\\[\\"ignored\\/components\\/my-component\\.html\\"\\] {
-        --tw-content: "ignored/components/my-component.html";
-        content: var(--tw-content);
+      "
+    `)
+
+    // 3. Fix the CSS file
+    await fs.write(
+      'src/tailwind.css',
+      css`
+        @reference 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+    )
+
+    await process.onStderr((message) => message.includes('Waiting for file changes...'))
+
+    expect(await fs.dumpFiles('dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- dist/out.css ---
+      .flex {
+        display: flex;
       }
-      .content-\\[\\"ignored\\/components\\/my-component\\.jsx\\"\\] {
-        --tw-content: "ignored/components/my-component.jsx";
-        content: var(--tw-content);
+      .underline {
+        text-decoration-line: underline;
       }
-      .content-\\[\\"pages\\/foo\\.html\\"\\] {
-        --tw-content: "pages/foo.html";
-        content: var(--tw-content);
+      "
+    `)
+
+    // Now break the CSS file again
+    await fs.write(
+      'src/tailwind.css',
+      css`
+        @reference 'tailwindcss/does-not-exist';
+        @import 'tailwindcss/utilities';
+      `,
+    )
+
+    await process.onStderr((message) => message.includes('"./does-not-exist" is not exported'))
+
+    expect(await fs.dumpFiles('dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- dist/out.css ---
+      .flex {
+        display: flex;
       }
-      .content-\\[\\"pages\\/nested\\/foo\\.html\\"\\] {
-        --tw-content: "pages/nested/foo.html";
-        content: var(--tw-content);
-      }
-      .content-\\[\\"src\\/index\\.html\\"\\] {
-        --tw-content: "src/index.html";
-        content: var(--tw-content);
-      }
-      .content-\\[\\"src\\/nested\\/index\\.html\\"\\] {
-        --tw-content: "src/nested/index.html";
-        content: var(--tw-content);
-      }
-      @supports (-moz-orient: inline) {
-        @layer base {
-          *, ::before, ::after, ::backdrop {
-            --tw-content: "";
-          }
-        }
-      }
-      @property --tw-content {
-        syntax: "*";
-        inherits: false;
-        initial-value: "";
+      .underline {
+        text-decoration-line: underline;
       }
       "
     `)
@@ -779,16 +758,75 @@ test(
 )
 
 test(
-  'auto source detection in depth, source(…) and `@source` can be configured to use auto source detection (build + watch mode)',
+  'dev mode + source maps',
   {
     fs: {
-      'package.json': json`{}`,
-      'pnpm-workspace.yaml': yaml`
-        #
-        packages:
-          - project-a
+      'package.json': json`
+        {
+          "dependencies": {
+            "postcss": "^8",
+            "postcss-cli": "^11",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/postcss": "workspace:^"
+          }
+        }
       `,
-      'project-a/package.json': json`
+      'postcss.config.js': js`
+        module.exports = {
+          map: { inline: true },
+          plugins: {
+            '@tailwindcss/postcss': {},
+          },
+        }
+      `,
+      'src/index.html': html`
+        <div class="flex"></div>
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss/utilities';
+        @source not inline("inline");
+        /*  */
+      `,
+    },
+  },
+  async ({ fs, exec, expect, parseSourceMap }) => {
+    await exec('pnpm postcss src/index.css --output dist/out.css')
+
+    await fs.expectFileToContain('dist/out.css', [candidate`flex`])
+
+    let map = parseSourceMap(await fs.read('dist/out.css'))
+
+    expect(map.at(1, 0)).toMatchObject({
+      source: '<no source>',
+      original: '(none)',
+      generated: '/*! tailwi...',
+    })
+
+    expect(map.at(2, 0)).toMatchObject({
+      source: expect.stringContaining('utilities.css'),
+      original: '@tailwind...',
+      generated: '.flex {...',
+    })
+
+    expect(map.at(3, 2)).toMatchObject({
+      source: expect.stringContaining('utilities.css'),
+      original: '@tailwind...',
+      generated: 'display: f...',
+    })
+
+    expect(map.at(4, 0)).toMatchObject({
+      source: expect.stringContaining('utilities.css'),
+      original: ';...',
+      generated: '}...',
+    })
+  },
+)
+
+test(
+  'source(…) and `@source` are relative to the file they are in',
+  {
+    fs: {
+      'package.json': json`
         {
           "dependencies": {
             "postcss": "^8",
@@ -798,37 +836,23 @@ test(
           }
         }
       `,
-      'project-a/postcss.config.js': js`
+
+      'postcss.config.js': js`
         module.exports = {
           plugins: {
             '@tailwindcss/postcss': {},
           },
         }
       `,
-      'project-a/src/index.css': css`
-        @import 'tailwindcss/theme' theme(reference);
 
+      'index.css': css` @import './project-a/src/index.css'; `,
+
+      'project-a/src/index.css': css`
         /* Run auto-content detection in ../../project-b */
         @import 'tailwindcss/utilities' source('../../project-b');
 
         /* Explicitly using node_modules in the @source allows git ignored folders */
-        @source '../node_modules/{my-lib-1,my-lib-2}/src/**/*.html';
-
-        /* We typically ignore these extensions, but now include them explicitly */
-        @source './logo.{jpg,png}';
-
-        /* Project C should apply auto source detection */
         @source '../../project-c';
-
-        /* Project D should apply auto source detection rules, such as ignoring node_modules */
-        @source '../../project-d/**/*.{html,js}';
-        @source '../../project-d/**/*.bin';
-
-        /* Same as above, but my-lib-2 _should_ be includes */
-        @source '../../project-d/node_modules/my-lib-2/src/*.{html,js}';
-
-        /* bar.html is git ignored, but explicitly listed here to scan */
-        @source '../../project-d/src/bar.html';
       `,
 
       // Project A is the current folder, but we explicitly configured
@@ -840,27 +864,6 @@ test(
         ></div>
       `,
 
-      // Project A explicitly includes an extension we usually ignore,
-      // therefore it should be included in the output.
-      'project-a/src/logo.jpg': html`
-        <div
-          class="content-['project-a/src/logo.jpg']"
-        ></div>
-      `,
-
-      // Project A explicitly includes node_modules/{my-lib-1,my-lib-2},
-      // therefore these files should be included in the output.
-      'project-a/node_modules/my-lib-1/src/index.html': html`
-        <div
-          class="content-['project-a/node_modules/my-lib-1/src/index.html']"
-        ></div>
-      `,
-      'project-a/node_modules/my-lib-2/src/index.html': html`
-        <div
-          class="content-['project-a/node_modules/my-lib-2/src/index.html']"
-        ></div>
-      `,
-
       // Project B is the configured `source(…)`, therefore auto source
       // detection should include known extensions and folders in the output.
       'project-b/src/index.html': html`
@@ -869,15 +872,6 @@ test(
         ></div>
       `,
 
-      // Project B is the configured `source(…)`, therefore auto source
-      // detection should apply and node_modules should not be included in the
-      // output.
-      'project-b/node_modules/my-lib-3/src/index.html': html`
-        <div
-          class="content-['SHOULD-NOT-EXIST-IN-OUTPUT'] content-['project-b/node_modules/my-lib-3/src/index.html']"
-        ></div>
-      `,
-
       // Project C should apply auto source detection, therefore known
       // extensions and folders should be included in the output.
       'project-c/src/index.html': html`
@@ -885,361 +879,15 @@ test(
           class="content-['project-c/src/index.html']"
         ></div>
       `,
-
-      // Project C should apply auto source detection, therefore known ignored
-      // extensions should not be included in the output.
-      'project-c/src/logo.jpg': html`
-        <div
-          class="content-['SHOULD-NOT-EXIST-IN-OUTPUT'] content-['project-c/src/logo.jpg']"
-        ></div>
-      `,
-
-      // Project C should apply auto source detection, therefore node_modules
-      // should not be included in the output.
-      'project-c/node_modules/my-lib-1/src/index.html': html`
-        <div
-          class="content-['SHOULD-NOT-EXIST-IN-OUTPUT'] content-['project-c/node_modules/my-lib-1/src/index.html']"
-        ></div>
-      `,
-
-      // Project D should apply auto source detection rules, such as ignoring
-      // node_modules.
-      'project-d/node_modules/my-lib-1/src/index.html': html`
-        <div
-          class="content-['SHOULD-NOT-EXIST-IN-OUTPUT'] content-['project-d/node_modules/my-lib-1/src/index.html']"
-        ></div>
-      `,
-
-      // Project D has an explicit glob containing node_modules, thus should include the html file
-      'project-d/node_modules/my-lib-2/src/index.html': html`
-        <div
-          class="content-['project-d/node_modules/my-lib-2/src/index.html']"
-        ></div>
-      `,
-
-      'project-d/src/.gitignore': dedent`
-        foo.html
-        bar.html
-      `,
-
-      // Project D, foo.html is ignored by the gitignore file.
-      'project-d/src/foo.html': html`
-        <div
-          class="content-['SHOULD-NOT-EXIST-IN-OUTPUT'] content-['project-d/src/foo.html']"
-        ></div>
-      `,
-
-      // Project D, bar.html is ignored by the gitignore file. But explicitly
-      // listed as a `@source` glob.
-      'project-d/src/bar.html': html`
-        <div
-          class="content-['project-d/src/bar.html']"
-        ></div>
-      `,
-
-      // Project D should look for files with the extensions html and js.
-      'project-d/src/index.html': html`
-        <div
-          class="content-['project-d/src/index.html']"
-        ></div>
-      `,
-
-      // Project D should have a binary file even though we ignore binary files
-      // by default, but it's explicitly listed.
-      'project-d/my-binary-file.bin': html`
-        <div
-          class="content-['project-d/my-binary-file.bin']"
-        ></div>
-      `,
     },
   },
-  async ({ fs, exec, spawn, root, expect }) => {
-    await exec('pnpm postcss src/index.css --output dist/out.css --verbose', {
-      cwd: path.join(root, 'project-a'),
-    })
+  async ({ fs, exec, root, expect }) => {
+    await exec('pnpm postcss ./index.css --output dist/out.css', { cwd: root })
 
-    expect(await fs.dumpFiles('./project-a/dist/*.css')).toMatchInlineSnapshot(`
-      "
-      --- ./project-a/dist/out.css ---
-      .content-\\[\\'project-a\\/node_modules\\/my-lib-1\\/src\\/index\\.html\\'\\] {
-        --tw-content: 'project-a/node modules/my-lib-1/src/index.html';
-        content: var(--tw-content);
-      }
-      .content-\\[\\'project-a\\/node_modules\\/my-lib-2\\/src\\/index\\.html\\'\\] {
-        --tw-content: 'project-a/node modules/my-lib-2/src/index.html';
-        content: var(--tw-content);
-      }
-      .content-\\[\\'project-a\\/src\\/logo\\.jpg\\'\\] {
-        --tw-content: 'project-a/src/logo.jpg';
-        content: var(--tw-content);
-      }
-      .content-\\[\\'project-b\\/src\\/index\\.html\\'\\] {
-        --tw-content: 'project-b/src/index.html';
-        content: var(--tw-content);
-      }
-      .content-\\[\\'project-c\\/src\\/index\\.html\\'\\] {
-        --tw-content: 'project-c/src/index.html';
-        content: var(--tw-content);
-      }
-      .content-\\[\\'project-d\\/my-binary-file\\.bin\\'\\] {
-        --tw-content: 'project-d/my-binary-file.bin';
-        content: var(--tw-content);
-      }
-      .content-\\[\\'project-d\\/node_modules\\/my-lib-2\\/src\\/index\\.html\\'\\] {
-        --tw-content: 'project-d/node modules/my-lib-2/src/index.html';
-        content: var(--tw-content);
-      }
-      .content-\\[\\'project-d\\/src\\/bar\\.html\\'\\] {
-        --tw-content: 'project-d/src/bar.html';
-        content: var(--tw-content);
-      }
-      .content-\\[\\'project-d\\/src\\/index\\.html\\'\\] {
-        --tw-content: 'project-d/src/index.html';
-        content: var(--tw-content);
-      }
-      @supports (-moz-orient: inline) {
-        @layer base {
-          *, ::before, ::after, ::backdrop {
-            --tw-content: "";
-          }
-        }
-      }
-      @property --tw-content {
-        syntax: "*";
-        inherits: false;
-        initial-value: "";
-      }
-      "
-    `)
+    let content = await fs.dumpFiles('./dist/*.css')
 
-    // Watch mode tests
-    let process = await spawn(
-      'pnpm postcss src/index.css --output dist/out.css --watch --verbose',
-      {
-        cwd: path.join(root, 'project-a'),
-      },
-    )
-    await process.onStderr((message) => message.includes('Waiting for file changes...'))
-
-    // Changes to project-a should not be included in the output, we changed the
-    // base folder to project-b.
-    await fs.write(
-      'project-a/src/index.html',
-      html`<div class="[.changed_&]:content-['project-a/src/index.html']"></div>`,
-    )
-    await fs.expectFileNotToContain('./project-a/dist/out.css', [
-      candidate`[.changed_&]:content-['project-a/src/index.html']`,
-    ])
-
-    // Changes to this file should be included, because we explicitly listed
-    // them using `@source`.
-    await fs.write(
-      'project-a/src/logo.jpg',
-      html`<div class="[.changed_&]:content-['project-a/src/logo.jpg']"></div>`,
-    )
-    await fs.expectFileToContain('./project-a/dist/out.css', [
-      candidate`[.changed_&]:content-['project-a/src/logo.jpg']`,
-    ])
-
-    // Changes to these files should be included, because we explicitly listed
-    // them using `@source`.
-    await fs.write(
-      'project-a/node_modules/my-lib-1/src/index.html',
-      html`<div
-          class="[.changed_&]:content-['project-a/node_modules/my-lib-1/src/index.html']"
-        ></div>`,
-    )
-    await fs.expectFileToContain('./project-a/dist/out.css', [
-      candidate`[.changed_&]:content-['project-a/node_modules/my-lib-1/src/index.html']`,
-    ])
-
-    await fs.write(
-      'project-a/node_modules/my-lib-2/src/index.html',
-      html`<div
-          class="[.changed_&]:content-['project-a/node_modules/my-lib-2/src/index.html']"
-        ></div>`,
-    )
-    await fs.expectFileToContain('./project-a/dist/out.css', [
-      candidate`[.changed_&]:content-['project-a/node_modules/my-lib-2/src/index.html']`,
-    ])
-
-    // Changes to this file should be included, because we changed the base to
-    // `project-b`.
-    await fs.write(
-      'project-b/src/index.html',
-      html`<div class="[.changed_&]:content-['project-b/src/index.html']"></div>`,
-    )
-    await fs.expectFileToContain('./project-a/dist/out.css', [
-      candidate`[.changed_&]:content-['project-b/src/index.html']`,
-    ])
-
-    // Changes to this file should not be included. We did change the base to
-    // `project-b`, but we still apply the auto source detection rules which
-    // ignore `node_modules`.
-    await fs.write(
-      'project-b/node_modules/my-lib-3/src/index.html',
-      html`<div
-          class="[.changed_&]:content-['project-b/node_modules/my-lib-3/src/index.html']"
-        ></div>`,
-    )
-    await fs.expectFileNotToContain('./project-a/dist/out.css', [
-      candidate`[.changed_&]:content-['project-b/node_modules/my-lib-3/src/index.html']`,
-    ])
-
-    // Project C was added explicitly via `@source`, therefore changes to these
-    // files should be included.
-    await fs.write(
-      'project-c/src/index.html',
-      html`<div class="[.changed_&]:content-['project-c/src/index.html']"></div>`,
-    )
-    await fs.expectFileToContain('./project-a/dist/out.css', [
-      candidate`[.changed_&]:content-['project-c/src/index.html']`,
-    ])
-
-    // Except for these files, since they are ignored by the default auto source
-    // detection rules.
-    await fs.write(
-      'project-c/src/logo.jpg',
-      html`<div class="[.changed_&]:content-['project-c/src/logo.jpg']"></div>`,
-    )
-    await fs.expectFileNotToContain('./project-a/dist/out.css', [
-      candidate`[.changed_&]:content-['project-c/src/logo.jpg']`,
-    ])
-    await fs.write(
-      'project-c/node_modules/my-lib-1/src/index.html',
-      html`<div
-          class="[.changed_&]:content-['project-c/node_modules/my-lib-1/src/index.html']"
-        ></div>`,
-    )
-    await fs.expectFileNotToContain('./project-a/dist/out.css', [
-      candidate`[.changed_&]:content-['project-c/node_modules/my-lib-1/src/index.html']`,
-    ])
-
-    // Creating new files in the "root" of auto source detected folders
-    // We need to create the files and *then* update them because postcss-cli
-    // does not pick up new files — only changes to existing files.
-    await fs.create([
-      'project-b/new-file.html',
-      'project-b/new-folder/new-file.html',
-      'project-c/new-file.html',
-      'project-c/new-folder/new-file.html',
-    ])
-
-    // If we don't wait writes will be coalesced into a "add" event which
-    // isn't picked up by postcss-cli.
-    await new Promise((resolve) => setTimeout(resolve, 100))
-
-    await fs.write(
-      'project-b/new-file.html',
-      html`<div class="[.created_&]:content-['project-b/new-file.html']"></div>`,
-    )
-    await fs.write(
-      'project-b/new-folder/new-file.html',
-      html`<div class="[.created_&]:content-['project-b/new-folder/new-file.html']"></div>`,
-    )
-    await fs.write(
-      'project-c/new-file.html',
-      html`<div class="[.created_&]:content-['project-c/new-file.html']"></div>`,
-    )
-    await fs.write(
-      'project-c/new-folder/new-file.html',
-      html`<div class="[.created_&]:content-['project-c/new-folder/new-file.html']"></div>`,
-    )
-
-    await fs.expectFileToContain('./project-a/dist/out.css', [
-      candidate`[.created_&]:content-['project-b/new-file.html']`,
-      candidate`[.created_&]:content-['project-b/new-folder/new-file.html']`,
-      candidate`[.created_&]:content-['project-c/new-file.html']`,
-      candidate`[.created_&]:content-['project-c/new-folder/new-file.html']`,
-    ])
-  },
-)
-
-test(
-  'auto source detection disabled',
-  {
-    fs: {
-      'package.json': json`
-        {
-          "dependencies": {
-            "postcss": "^8",
-            "postcss-cli": "^10",
-            "tailwindcss": "workspace:^",
-            "@tailwindcss/postcss": "workspace:^"
-          }
-        }
-      `,
-      'postcss.config.js': js`
-        module.exports = {
-          plugins: {
-            '@tailwindcss/postcss': {},
-          },
-        }
-      `,
-      'index.css': css`
-        @import 'tailwindcss/theme' theme(reference);
-
-        /* (1) */
-        /* - Only './src' should be auto-scanned, not the current working directory */
-        /* - .gitignore'd paths should be ignored (node_modules) */
-        /* - Binary extensions should be ignored (jpg, zip) */
-        @import 'tailwindcss/utilities' source(none);
-
-        /* (2) */
-        /* - './pages' should be auto-scanned */
-        /* - Only '.html' files should be included */
-        /* - './page/ignored.html' should be ignored */
-        @source "./pages/**/*.html";
-      `,
-
-      '.gitignore': dedent`
-        /src/ignored
-        /pages/ignored.html
-      `,
-
-      // (1)
-      'index.html': 'content-["index.html"] content-["BAD"]', // "Root" source is in `./src`
-      'src/index.html': 'content-["src/index.html"] content-["BAD"]',
-      'src/nested/index.html': 'content-["src/nested/index.html"] content-["BAD"]',
-      'src/index.jpg': 'content-["src/index.jpg"] content-["BAD"]',
-      'src/nested/index.tar': 'content-["src/nested/index.tar"] content-["BAD"]',
-      'src/ignored/index.html': 'content-["src/ignored/index.html"] content-["BAD"]',
-
-      // (4)
-      'pages/foo.html': 'content-["pages/foo.html"]',
-      'pages/nested/foo.html': 'content-["pages/nested/foo.html"]',
-      'pages/ignored.html': 'content-["pages/ignored.html"] content-["BAD"]',
-      'pages/foo.jsx': 'content-["pages/foo.jsx"] content-["BAD"]',
-      'pages/nested/foo.jsx': 'content-["pages/nested/foo.jsx"] content-["BAD"]',
-    },
-  },
-  async ({ fs, exec, expect }) => {
-    await exec('pnpm postcss index.css --output dist/out.css')
-
-    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
-      "
-      --- ./dist/out.css ---
-      .content-\\[\\"pages\\/foo\\.html\\"\\] {
-        --tw-content: "pages/foo.html";
-        content: var(--tw-content);
-      }
-      .content-\\[\\"pages\\/nested\\/foo\\.html\\"\\] {
-        --tw-content: "pages/nested/foo.html";
-        content: var(--tw-content);
-      }
-      @supports (-moz-orient: inline) {
-        @layer base {
-          *, ::before, ::after, ::backdrop {
-            --tw-content: "";
-          }
-        }
-      }
-      @property --tw-content {
-        syntax: "*";
-        inherits: false;
-        initial-value: "";
-      }
-      "
-    `)
+    expect(content).not.toContain(candidate`content-['project-a/src/index.html']`)
+    expect(content).toContain(candidate`content-['project-b/src/index.html']`)
+    expect(content).toContain(candidate`content-['project-c/src/index.html']`)
   },
 )
diff --git a/integrations/postcss/multi-root.test.ts b/integrations/postcss/multi-root.test.ts
index bfd2340e5..c2c52c7e4 100644
--- a/integrations/postcss/multi-root.test.ts
+++ b/integrations/postcss/multi-root.test.ts
@@ -25,16 +25,16 @@ test(
         <div class="one:underline two:underline"></div>
       `,
       'src/shared.css': css`
-        @import 'tailwindcss/theme' theme(reference);
+        @reference 'tailwindcss/theme';
         @import 'tailwindcss/utilities';
       `,
       'src/root1.css': css`
         @import './shared.css';
-        @variant one (&:is([data-root='1']));
+        @custom-variant one (&:is([data-root='1']));
       `,
       'src/root2.css': css`
         @import './shared.css';
-        @variant two (&:is([data-root='2']));
+        @custom-variant two (&:is([data-root='2']));
       `,
     },
   },
diff --git a/integrations/postcss/next.test.ts b/integrations/postcss/next.test.ts
index b133a9752..7fc0ccdcf 100644
--- a/integrations/postcss/next.test.ts
+++ b/integrations/postcss/next.test.ts
@@ -1,5 +1,5 @@
 import { describe } from 'vitest'
-import { candidate, css, fetchStyles, js, json, retryAssertion, test } from '../utils'
+import { candidate, css, fetchStyles, js, json, jsx, retryAssertion, test, txt } from '../utils'
 
 test(
   'production build',
@@ -19,21 +19,13 @@ test(
         }
       `,
       'postcss.config.mjs': js`
-        /** @type {import('postcss-load-config').Config} */
-        const config = {
+        export default {
           plugins: {
             '@tailwindcss/postcss': {},
           },
         }
-
-        export default config
-      `,
-      'next.config.mjs': js`
-        /** @type {import('next').NextConfig} */
-        const nextConfig = {}
-
-        export default nextConfig
       `,
+      'next.config.mjs': js`export default {}`,
       'app/layout.js': js`
         import './globals.css'
 
@@ -46,12 +38,21 @@ test(
         }
       `,
       'app/page.js': js`
+        import styles from './page.module.css'
         export default function Page() {
-          return <h1 className="text-3xl font-bold underline">Hello, Next.js!</h1>
+          return (
+            <h1 className={styles.heading + ' text-3xl font-bold underline'}>Hello, Next.js!</h1>
+          )
+        }
+      `,
+      'app/page.module.css': css`
+        @reference './globals.css';
+        .heading {
+          @apply text-red-500 animate-ping skew-7;
         }
       `,
       'app/globals.css': css`
-        @import 'tailwindcss/theme' theme(reference);
+        @reference 'tailwindcss/theme';
         @import 'tailwindcss/utilities';
       `,
     },
@@ -60,14 +61,27 @@ test(
     await exec('pnpm next build')
 
     let files = await fs.glob('.next/static/css/**/*.css')
-    expect(files).toHaveLength(1)
-    let [filename] = files[0]
+    expect(files).toHaveLength(2)
 
-    await fs.expectFileToContain(filename, [
+    let globalCss: string | null = null
+    let moduleCss: string | null = null
+    for (let [filename, content] of files) {
+      if (content.includes('@keyframes page_ping')) moduleCss = filename
+      else globalCss = filename
+    }
+
+    await fs.expectFileToContain(globalCss!, [
       candidate`underline`,
       candidate`font-bold`,
       candidate`text-3xl`,
     ])
+
+    await fs.expectFileToContain(moduleCss!, [
+      'color:var(--color-red-500,oklch(63.7% .237 25.331)',
+      'animation:var(--animate-ping,ping 1s cubic-bezier(0,0,.2,1) infinite)',
+      /@keyframes page_ping.*{75%,to{transform:scale\(2\);opacity:0}/,
+      '--tw-skew-x:skewX(7deg);',
+    ])
   },
 )
 
@@ -90,21 +104,13 @@ describe.each(['turbo', 'webpack'])('%s', (bundler) => {
           }
         `,
         'postcss.config.mjs': js`
-          /** @type {import('postcss-load-config').Config} */
-          const config = {
+          export default {
             plugins: {
               '@tailwindcss/postcss': {},
             },
           }
-
-          export default config
-        `,
-        'next.config.mjs': js`
-          /** @type {import('next').NextConfig} */
-          const nextConfig = {}
-
-          export default nextConfig
         `,
+        'next.config.mjs': js`export default {}`,
         'app/layout.js': js`
           import './globals.css'
 
@@ -117,12 +123,19 @@ describe.each(['turbo', 'webpack'])('%s', (bundler) => {
           }
         `,
         'app/page.js': js`
+          import styles from './page.module.css'
           export default function Page() {
-            return <h1 className="underline">Hello, Next.js!</h1>
+            return <h1 className={styles.heading + ' underline'}>Hello, Next.js!</h1>
+          }
+        `,
+        'app/page.module.css': css`
+          @reference './globals.css';
+          .heading {
+            @apply text-red-500 animate-ping skew-7 content-['module'];
           }
         `,
         'app/globals.css': css`
-          @import 'tailwindcss/theme' theme(reference);
+          @reference 'tailwindcss/theme';
           @import 'tailwindcss/utilities';
         `,
       },
@@ -142,13 +155,16 @@ describe.each(['turbo', 'webpack'])('%s', (bundler) => {
       await retryAssertion(async () => {
         let css = await fetchStyles(url)
         expect(css).toContain(candidate`underline`)
+        expect(css).toContain('content: var(--tw-content)')
+        expect(css).toContain('@keyframes')
       })
 
       await fs.write(
         'app/page.js',
         js`
+          import styles from './page.module.css'
           export default function Page() {
-            return <h1 className="underline text-red-500">Hello, Next.js!</h1>
+            return <h1 className={styles.heading + ' underline bg-red-500'}>Hello, Next.js!</h1>
           }
         `,
       )
@@ -157,8 +173,314 @@ describe.each(['turbo', 'webpack'])('%s', (bundler) => {
       await retryAssertion(async () => {
         let css = await fetchStyles(url)
         expect(css).toContain(candidate`underline`)
-        expect(css).toContain(candidate`text-red-500`)
+        expect(css).toContain(candidate`bg-red-500`)
+        expect(css).toContain('--tw-skew-x: skewX(7deg);')
+        expect(css).toContain('content: var(--tw-content)')
+        expect(css).toContain('@keyframes')
       })
     },
   )
 })
+
+test(
+  'should scan dynamic route segments',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "react": "^18",
+            "react-dom": "^18",
+            "next": "^14"
+          },
+          "devDependencies": {
+            "@tailwindcss/postcss": "workspace:^",
+            "tailwindcss": "workspace:^"
+          }
+        }
+      `,
+      'postcss.config.mjs': js`
+        export default {
+          plugins: {
+            '@tailwindcss/postcss': {},
+          },
+        }
+      `,
+      'next.config.mjs': js`export default {}`,
+      'app/a/[slug]/page.js': js`
+        export default function Page() {
+          return <h1 className="content-['[slug]']">Hello, Next.js!</h1>
+        }
+      `,
+      'app/b/[...slug]/page.js': js`
+        export default function Page() {
+          return <h1 className="content-['[...slug]']">Hello, Next.js!</h1>
+        }
+      `,
+      'app/c/[[...slug]]/page.js': js`
+        export default function Page() {
+          return <h1 className="content-['[[...slug]]']">Hello, Next.js!</h1>
+        }
+      `,
+      'app/d/(theme)/page.js': js`
+        export default function Page() {
+          return <h1 className="content-['(theme)']">Hello, Next.js!</h1>
+        }
+      `,
+      'app/layout.js': js`
+        import './globals.css'
+
+        export default function RootLayout({ children }) {
+          return (
+            <html>
+              <body>{children}</body>
+            </html>
+          )
+        }
+      `,
+      'app/globals.css': css`
+        @import 'tailwindcss/utilities' source(none);
+        @source './**/*.{js,ts,jsx,tsx,mdx}';
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm next build')
+
+    let files = await fs.glob('.next/static/css/**/*.css')
+    expect(files).toHaveLength(1)
+    let [filename] = files[0]
+
+    await fs.expectFileToContain(filename, [
+      candidate`content-['[slug]']`,
+      candidate`content-['[...slug]']`,
+      candidate`content-['[[...slug]]']`,
+      candidate`content-['(theme)']`,
+    ])
+  },
+)
+
+test(
+  'changes to CSS files should pick up new CSS variables (if any)',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "react": "^18",
+            "react-dom": "^18",
+            "next": "^14"
+          },
+          "devDependencies": {
+            "@tailwindcss/postcss": "workspace:^",
+            "tailwindcss": "workspace:^"
+          }
+        }
+      `,
+      'postcss.config.mjs': js`
+        export default {
+          plugins: {
+            '@tailwindcss/postcss': {},
+          },
+        }
+      `,
+      'next.config.mjs': js`export default {}`,
+      'app/layout.js': js`
+        import './globals.css'
+
+        export default function RootLayout({ children }) {
+          return (
+            <html>
+              <body>{children}</body>
+            </html>
+          )
+        }
+      `,
+      'app/page.js': js`
+        export default function Page() {
+          return <div className="flex"></div>
+        }
+      `,
+      'unrelated.module.css': css`
+        .module {
+          color: var(--color-blue-500);
+        }
+      `,
+      'app/globals.css': css`
+        @import 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+    },
+  },
+  async ({ spawn, exec, fs, expect }) => {
+    // Generate the initial build so output CSS files exist on disk
+    await exec('pnpm next build')
+
+    // NOTE: We are writing to an output CSS file which is not being ignored by
+    // `.gitignore` nor marked with `@source not`. This should not result in an
+    // infinite loop.
+    let process = await spawn(`pnpm next dev`)
+
+    let url = ''
+    await process.onStdout((m) => {
+      let match = /Local:\s*(http.*)/.exec(m)
+      if (match) url = match[1]
+      return Boolean(url)
+    })
+
+    await process.onStdout((m) => m.includes('Ready in'))
+
+    await retryAssertion(async () => {
+      let css = await fetchStyles(url)
+      expect(css).toContain(candidate`flex`)
+      expect(css).toContain('--color-blue-500:')
+      expect(css).not.toContain('--color-red-500:')
+    })
+
+    await fs.write(
+      'unrelated.module.css',
+      css`
+        .module {
+          color: var(--color-blue-500);
+          background-color: var(--color-red-500);
+        }
+      `,
+    )
+    await process.onStdout((m) => m.includes('Compiled in'))
+
+    await retryAssertion(async () => {
+      let css = await fetchStyles(url)
+      expect(css).toContain(candidate`flex`)
+      expect(css).toContain('--color-blue-500:')
+      expect(css).toContain('--color-red-500:')
+    })
+  },
+)
+
+test(
+  'changes to `public/` should not trigger an infinite loop',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "react": "^18",
+            "react-dom": "^18",
+            "next": "^15",
+            "@ducanh2912/next-pwa": "^10.2.9"
+          },
+          "devDependencies": {
+            "@tailwindcss/postcss": "workspace:^",
+            "tailwindcss": "workspace:^"
+          }
+        }
+      `,
+      '.gitignore': txt`
+        .next/
+        public/workbox-*.js
+        public/sw.js
+      `,
+      'postcss.config.mjs': js`
+        export default {
+          plugins: {
+            '@tailwindcss/postcss': {},
+          },
+        }
+      `,
+      'next.config.mjs': js`
+        import withPWA from '@ducanh2912/next-pwa'
+
+        const pwaConfig = {
+          dest: 'public',
+          register: true,
+          skipWaiting: true,
+          reloadOnOnline: false,
+          cleanupOutdatedCaches: true,
+          clientsClaim: true,
+          maximumFileSizeToCacheInBytes: 20 * 1024 * 1024,
+        }
+
+        const nextConfig = {}
+
+        const configWithPWA = withPWA(pwaConfig)(nextConfig)
+
+        export default configWithPWA
+      `,
+      'app/layout.js': js`
+        import './globals.css'
+
+        export default function RootLayout({ children }) {
+          return (
+            <html>
+              <body>{children}</body>
+            </html>
+          )
+        }
+      `,
+      'app/page.js': js`
+        export default function Page() {
+          return <div className="flex"></div>
+        }
+      `,
+      'app/globals.css': css`
+        @import 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+    },
+  },
+  async ({ spawn, fs, expect }) => {
+    let process = await spawn('pnpm next dev')
+
+    let url = ''
+    await process.onStdout((m) => {
+      let match = /Local:\s*(http.*)/.exec(m)
+      if (match) url = match[1]
+      return Boolean(url)
+    })
+
+    await process.onStdout((m) => m.includes('Ready in'))
+
+    await retryAssertion(async () => {
+      let css = await fetchStyles(url)
+      expect(css).toContain(candidate`flex`)
+      expect(css).not.toContain(candidate`underline`)
+    })
+
+    await fs.write(
+      'app/page.js',
+      jsx`
+        export default function Page() {
+          return <div className="flex underline"></div>
+        }
+      `,
+    )
+    await process.onStdout((m) => m.includes('Compiled in'))
+
+    await retryAssertion(async () => {
+      let css = await fetchStyles(url)
+      expect(css).toContain(candidate`flex`)
+      expect(css).toContain(candidate`underline`)
+    })
+    // Flush all existing messages in the queue
+    process.flush()
+
+    // Fetch the styles one more time, to ensure we see the latest version of
+    // the CSS
+    await fetchStyles(url)
+
+    // At this point, no changes should trigger a compile step. If we see any
+    // changes, there is an infinite loop because we (the user) didn't write any
+    // files to disk.
+    //
+    // Ensure there are no more changes in stdout (signaling no infinite loop)
+    let result = await Promise.race([
+      // If this succeeds, it means that it saw another change which indicates
+      // an infinite loop.
+      process.onStdout((m) => m.includes('Compiled in')).then(() => 'infinite loop detected'),
+
+      // There should be no changes in stdout
+      new Promise((resolve) => setTimeout(() => resolve('no infinite loop detected'), 2_000)),
+    ])
+    expect(result).toBe('no infinite loop detected')
+  },
+)
diff --git a/integrations/postcss/plugins.test.ts b/integrations/postcss/plugins.test.ts
index 3081b7bfe..c36e8fd14 100644
--- a/integrations/postcss/plugins.test.ts
+++ b/integrations/postcss/plugins.test.ts
@@ -26,7 +26,7 @@ test(
         <div className="ui-open:flex"></div>
       `,
       'src/index.css': css`
-        @import 'tailwindcss/theme' theme(reference);
+        @reference 'tailwindcss/theme';
         @import 'tailwindcss/utilities';
         @plugin '@headlessui/tailwindcss';
       `,
@@ -65,7 +65,7 @@ test(
         <div className="ui-open:flex"></div>
       `,
       'src/index.css': css`
-        @import 'tailwindcss/theme' theme(reference);
+        @reference 'tailwindcss/theme';
         @import 'tailwindcss/utilities';
         @plugin '@headlessui/tailwindcss';
       `,
diff --git a/integrations/postcss/source.test.ts b/integrations/postcss/source.test.ts
new file mode 100644
index 000000000..e89d4bbdd
--- /dev/null
+++ b/integrations/postcss/source.test.ts
@@ -0,0 +1,831 @@
+import dedent from 'dedent'
+import path from 'node:path'
+import { candidate, css, html, js, json, test, yaml } from '../utils'
+
+test(
+  'auto source detection kitchen sink',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "postcss": "^8",
+            "postcss-cli": "^10",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/postcss": "workspace:^"
+          }
+        }
+      `,
+      'postcss.config.js': js`
+        module.exports = {
+          plugins: {
+            '@tailwindcss/postcss': {},
+          },
+        }
+      `,
+      'index.css': css`
+        @reference 'tailwindcss/theme';
+
+        /* (1) */
+        /* - Only './src' should be auto-scanned, not the current working directory */
+        /* - .gitignore'd paths should be ignored (node_modules) */
+        /* - Binary extensions should be ignored (jpg, zip) */
+        @import 'tailwindcss/utilities' source('./src');
+
+        /* (2) */
+        /* - All HTML and JSX files in 'ignored/components' should be scanned */
+        /* - All other extensions should be ignored */
+        @source "./ignored/components/*.{html,jsx}";
+
+        /* (3) */
+        /* - './components' should be auto-scanned in addition to './src' */
+        /* - './components/ignored.html' should still be ignored */
+        /* - Binary extensions in './components' should be ignored */
+        @source "./components";
+
+        /* (4) */
+        /* - './pages' should be auto-scanned */
+        /* - Only '.html' files should be included */
+        /* - './page/ignored.html' will not be ignored because of the specific pattern */
+        @source "./pages/**/*.html";
+      `,
+
+      '.gitignore': dedent`
+        /src/ignored
+        /ignored
+        /components/ignored.html
+        /pages/ignored.html
+      `,
+
+      // (1)
+      'index.html': 'content-["index.html"] content-["BAD"]', // "Root" source is in `./src`
+      'src/index.html': 'content-["src/index.html"]',
+      'src/nested/index.html': 'content-["src/nested/index.html"]',
+      'src/index.jpg': 'content-["src/index.jpg"] content-["BAD"]',
+      'src/nested/index.tar': 'content-["src/nested/index.tar"] content-["BAD"]',
+      'src/ignored/index.html': 'content-["src/ignored/index.html"] content-["BAD"]',
+
+      // (2)
+      'ignored/components/my-component.html': 'content-["ignored/components/my-component.html"]',
+      'ignored/components/my-component.jsx': 'content-["ignored/components/my-component.jsx"]',
+
+      // Ignored and not explicitly listed by (2)
+      'ignored/components/my-component.tsx':
+        'content-["ignored/components/my-component.tsx"] content-["BAD"]',
+      'ignored/components/nested/my-component.html':
+        'content-["ignored/components/nested/my-component.html"] content-["BAD"]',
+
+      // (3)
+      'components/my-component.tsx': 'content-["components/my-component.tsx"]',
+      'components/nested/my-component.tsx': 'content-["components/nested/my-component.tsx"]',
+      'components/ignored.html': 'content-["components/ignored.html"] content-["BAD"]',
+
+      // (4)
+      'pages/foo.html': 'content-["pages/foo.html"]',
+      'pages/nested/foo.html': 'content-["pages/nested/foo.html"]',
+      'pages/ignored.html': 'content-["pages/ignored.html"]',
+      'pages/foo.jsx': 'content-["pages/foo.jsx"] content-["BAD"]',
+      'pages/nested/foo.jsx': 'content-["pages/nested/foo.jsx"] content-["BAD"]',
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm postcss index.css --output dist/out.css')
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/out.css ---
+      @layer properties;
+      .content-\\[\\"components\\/my-component\\.tsx\\"\\] {
+        --tw-content: "components/my-component.tsx";
+        content: var(--tw-content);
+      }
+      .content-\\[\\"components\\/nested\\/my-component\\.tsx\\"\\] {
+        --tw-content: "components/nested/my-component.tsx";
+        content: var(--tw-content);
+      }
+      .content-\\[\\"ignored\\/components\\/my-component\\.html\\"\\] {
+        --tw-content: "ignored/components/my-component.html";
+        content: var(--tw-content);
+      }
+      .content-\\[\\"ignored\\/components\\/my-component\\.jsx\\"\\] {
+        --tw-content: "ignored/components/my-component.jsx";
+        content: var(--tw-content);
+      }
+      .content-\\[\\"pages\\/foo\\.html\\"\\] {
+        --tw-content: "pages/foo.html";
+        content: var(--tw-content);
+      }
+      .content-\\[\\"pages\\/ignored\\.html\\"\\] {
+        --tw-content: "pages/ignored.html";
+        content: var(--tw-content);
+      }
+      .content-\\[\\"pages\\/nested\\/foo\\.html\\"\\] {
+        --tw-content: "pages/nested/foo.html";
+        content: var(--tw-content);
+      }
+      .content-\\[\\"src\\/index\\.html\\"\\] {
+        --tw-content: "src/index.html";
+        content: var(--tw-content);
+      }
+      .content-\\[\\"src\\/nested\\/index\\.html\\"\\] {
+        --tw-content: "src/nested/index.html";
+        content: var(--tw-content);
+      }
+      @property --tw-content {
+        syntax: "*";
+        inherits: false;
+        initial-value: "";
+      }
+      @layer properties {
+        @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
+          *, ::before, ::after, ::backdrop {
+            --tw-content: "";
+          }
+        }
+      }
+      "
+    `)
+  },
+)
+
+test(
+  'auto source detection in depth, source(…) and `@source` can be configured to use auto source detection (build + watch mode)',
+  {
+    fs: {
+      'package.json': json`{}`,
+      'pnpm-workspace.yaml': yaml`
+        #
+        packages:
+          - project-a
+      `,
+      'project-a/package.json': json`
+        {
+          "dependencies": {
+            "postcss": "^8",
+            "postcss-cli": "^10",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/postcss": "workspace:^"
+          }
+        }
+      `,
+      'project-a/postcss.config.js': js`
+        module.exports = {
+          plugins: {
+            '@tailwindcss/postcss': {},
+          },
+        }
+      `,
+      'project-a/src/index.css': css`
+        @reference 'tailwindcss/theme';
+
+        /* Run auto-content detection in ../../project-b */
+        @import 'tailwindcss/utilities' source('../../project-b');
+
+        /* Explicitly using node_modules in the @source allows git ignored folders */
+        @source '../node_modules/{my-lib-1,my-lib-2}/src/**/*.html';
+
+        /* We typically ignore these extensions, but now include them explicitly */
+        @source './logo.{jpg,png}';
+
+        /* Project C should apply auto source detection */
+        @source '../../project-c';
+
+        /* Project D should apply auto source detection rules, such as ignoring node_modules */
+        @source '../../project-d/**/*.{html,js}';
+        @source '../../project-d/**/*.bin';
+
+        /* Same as above, but my-lib-2 _should_ be includes */
+        @source '../../project-d/node_modules/my-lib-2/src/*.{html,js}';
+
+        /* bar.html is git ignored, but explicitly listed here to scan */
+        @source '../../project-d/src/bar.html';
+      `,
+
+      // Project A is the current folder, but we explicitly configured
+      // `source(project-b)`, therefore project-a should not be included in
+      // the output.
+      'project-a/src/index.html': html`
+        <div
+          class="content-['SHOULD-NOT-EXIST-IN-OUTPUT'] content-['project-a/src/index.html']"
+        ></div>
+      `,
+
+      // Project A explicitly includes an extension we usually ignore,
+      // therefore it should be included in the output.
+      'project-a/src/logo.jpg': html`
+        <div
+          class="content-['project-a/src/logo.jpg']"
+        ></div>
+      `,
+
+      // Project A explicitly includes node_modules/{my-lib-1,my-lib-2},
+      // therefore these files should be included in the output.
+      'project-a/node_modules/my-lib-1/src/index.html': html`
+        <div
+          class="content-['project-a/node_modules/my-lib-1/src/index.html']"
+        ></div>
+      `,
+      'project-a/node_modules/my-lib-2/src/index.html': html`
+        <div
+          class="content-['project-a/node_modules/my-lib-2/src/index.html']"
+        ></div>
+      `,
+
+      // Project B is the configured `source(…)`, therefore auto source
+      // detection should include known extensions and folders in the output.
+      'project-b/src/index.html': html`
+        <div
+          class="content-['project-b/src/index.html']"
+        ></div>
+      `,
+
+      // Project B is the configured `source(…)`, therefore auto source
+      // detection should apply and node_modules should not be included in the
+      // output.
+      'project-b/node_modules/my-lib-3/src/index.html': html`
+        <div
+          class="content-['SHOULD-NOT-EXIST-IN-OUTPUT'] content-['project-b/node_modules/my-lib-3/src/index.html']"
+        ></div>
+      `,
+
+      // Project C should apply auto source detection, therefore known
+      // extensions and folders should be included in the output.
+      'project-c/src/index.html': html`
+        <div
+          class="content-['project-c/src/index.html']"
+        ></div>
+      `,
+
+      // Project C should apply auto source detection, therefore known ignored
+      // extensions should not be included in the output.
+      'project-c/src/logo.jpg': html`
+        <div
+          class="content-['SHOULD-NOT-EXIST-IN-OUTPUT'] content-['project-c/src/logo.jpg']"
+        ></div>
+      `,
+
+      // Project C should apply auto source detection, therefore node_modules
+      // should not be included in the output.
+      'project-c/node_modules/my-lib-1/src/index.html': html`
+        <div
+          class="content-['SHOULD-NOT-EXIST-IN-OUTPUT'] content-['project-c/node_modules/my-lib-1/src/index.html']"
+        ></div>
+      `,
+
+      // Project D should apply auto source detection rules, such as ignoring
+      // node_modules.
+      'project-d/node_modules/my-lib-1/src/index.html': html`
+        <div
+          class="content-['SHOULD-NOT-EXIST-IN-OUTPUT'] content-['project-d/node_modules/my-lib-1/src/index.html']"
+        ></div>
+      `,
+
+      // Project D has an explicit glob containing node_modules, thus should include the html file
+      'project-d/node_modules/my-lib-2/src/index.html': html`
+        <div
+          class="content-['project-d/node_modules/my-lib-2/src/index.html']"
+        ></div>
+      `,
+
+      'project-d/src/.gitignore': dedent`
+        foo.html
+        bar.html
+      `,
+
+      // Project D, foo.html is ignored by the gitignore file but the source rule is explicit about
+      // adding all `.html` files.
+      'project-d/src/foo.html': html`
+        <div
+          class="content-['project-d/src/foo.html']"
+        ></div>
+      `,
+
+      // Project D, bar.html is ignored by the gitignore file. But explicitly
+      // listed as a `@source` glob.
+      'project-d/src/bar.html': html`
+        <div
+          class="content-['project-d/src/bar.html']"
+        ></div>
+      `,
+
+      // Project D should look for files with the extensions html and js.
+      'project-d/src/index.html': html`
+        <div
+          class="content-['project-d/src/index.html']"
+        ></div>
+      `,
+
+      // Project D should have a binary file even though we ignore binary files
+      // by default, but it's explicitly listed.
+      'project-d/my-binary-file.bin': html`
+        <div
+          class="content-['project-d/my-binary-file.bin']"
+        ></div>
+      `,
+    },
+  },
+  async ({ fs, exec, spawn, root, expect }) => {
+    await exec('pnpm postcss src/index.css --output dist/out.css --verbose', {
+      cwd: path.join(root, 'project-a'),
+    })
+
+    expect(await fs.dumpFiles('./project-a/dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./project-a/dist/out.css ---
+      @layer properties;
+      .content-\\[\\'project-a\\/node_modules\\/my-lib-1\\/src\\/index\\.html\\'\\] {
+        --tw-content: 'project-a/node modules/my-lib-1/src/index.html';
+        content: var(--tw-content);
+      }
+      .content-\\[\\'project-a\\/node_modules\\/my-lib-2\\/src\\/index\\.html\\'\\] {
+        --tw-content: 'project-a/node modules/my-lib-2/src/index.html';
+        content: var(--tw-content);
+      }
+      .content-\\[\\'project-a\\/src\\/logo\\.jpg\\'\\] {
+        --tw-content: 'project-a/src/logo.jpg';
+        content: var(--tw-content);
+      }
+      .content-\\[\\'project-b\\/src\\/index\\.html\\'\\] {
+        --tw-content: 'project-b/src/index.html';
+        content: var(--tw-content);
+      }
+      .content-\\[\\'project-c\\/src\\/index\\.html\\'\\] {
+        --tw-content: 'project-c/src/index.html';
+        content: var(--tw-content);
+      }
+      .content-\\[\\'project-d\\/my-binary-file\\.bin\\'\\] {
+        --tw-content: 'project-d/my-binary-file.bin';
+        content: var(--tw-content);
+      }
+      .content-\\[\\'project-d\\/node_modules\\/my-lib-2\\/src\\/index\\.html\\'\\] {
+        --tw-content: 'project-d/node modules/my-lib-2/src/index.html';
+        content: var(--tw-content);
+      }
+      .content-\\[\\'project-d\\/src\\/bar\\.html\\'\\] {
+        --tw-content: 'project-d/src/bar.html';
+        content: var(--tw-content);
+      }
+      .content-\\[\\'project-d\\/src\\/foo\\.html\\'\\] {
+        --tw-content: 'project-d/src/foo.html';
+        content: var(--tw-content);
+      }
+      .content-\\[\\'project-d\\/src\\/index\\.html\\'\\] {
+        --tw-content: 'project-d/src/index.html';
+        content: var(--tw-content);
+      }
+      @property --tw-content {
+        syntax: "*";
+        inherits: false;
+        initial-value: "";
+      }
+      @layer properties {
+        @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
+          *, ::before, ::after, ::backdrop {
+            --tw-content: "";
+          }
+        }
+      }
+      "
+    `)
+
+    // Watch mode tests
+    let process = await spawn(
+      'pnpm postcss src/index.css --output dist/out.css --watch --verbose',
+      {
+        cwd: path.join(root, 'project-a'),
+      },
+    )
+    await process.onStderr((message) => message.includes('Waiting for file changes...'))
+
+    // Changes to project-a should not be included in the output, we changed the
+    // base folder to project-b.
+    await fs.write(
+      'project-a/src/index.html',
+      html`<div class="[.changed_&]:content-['project-a/src/index.html']"></div>`,
+    )
+    await fs.expectFileNotToContain('./project-a/dist/out.css', [
+      candidate`[.changed_&]:content-['project-a/src/index.html']`,
+    ])
+
+    // Changes to this file should be included, because we explicitly listed
+    // them using `@source`.
+    await fs.write(
+      'project-a/src/logo.jpg',
+      html`<div class="[.changed_&]:content-['project-a/src/logo.jpg']"></div>`,
+    )
+    await fs.expectFileToContain('./project-a/dist/out.css', [
+      candidate`[.changed_&]:content-['project-a/src/logo.jpg']`,
+    ])
+
+    // Changes to these files should be included, because we explicitly listed
+    // them using `@source`.
+    await fs.write(
+      'project-a/node_modules/my-lib-1/src/index.html',
+      html`<div
+          class="[.changed_&]:content-['project-a/node_modules/my-lib-1/src/index.html']"
+        ></div>`,
+    )
+    await fs.expectFileToContain('./project-a/dist/out.css', [
+      candidate`[.changed_&]:content-['project-a/node_modules/my-lib-1/src/index.html']`,
+    ])
+
+    await fs.write(
+      'project-a/node_modules/my-lib-2/src/index.html',
+      html`<div
+          class="[.changed_&]:content-['project-a/node_modules/my-lib-2/src/index.html']"
+        ></div>`,
+    )
+    await fs.expectFileToContain('./project-a/dist/out.css', [
+      candidate`[.changed_&]:content-['project-a/node_modules/my-lib-2/src/index.html']`,
+    ])
+
+    // Changes to this file should be included, because we changed the base to
+    // `project-b`.
+    await fs.write(
+      'project-b/src/index.html',
+      html`<div class="[.changed_&]:content-['project-b/src/index.html']"></div>`,
+    )
+    await fs.expectFileToContain('./project-a/dist/out.css', [
+      candidate`[.changed_&]:content-['project-b/src/index.html']`,
+    ])
+
+    // Changes to this file should not be included. We did change the base to
+    // `project-b`, but we still apply the auto source detection rules which
+    // ignore `node_modules`.
+    await fs.write(
+      'project-b/node_modules/my-lib-3/src/index.html',
+      html`<div
+          class="[.changed_&]:content-['project-b/node_modules/my-lib-3/src/index.html']"
+        ></div>`,
+    )
+    await fs.expectFileNotToContain('./project-a/dist/out.css', [
+      candidate`[.changed_&]:content-['project-b/node_modules/my-lib-3/src/index.html']`,
+    ])
+
+    // Project C was added explicitly via `@source`, therefore changes to these
+    // files should be included.
+    await fs.write(
+      'project-c/src/index.html',
+      html`<div class="[.changed_&]:content-['project-c/src/index.html']"></div>`,
+    )
+    await fs.expectFileToContain('./project-a/dist/out.css', [
+      candidate`[.changed_&]:content-['project-c/src/index.html']`,
+    ])
+
+    // Except for these files, since they are ignored by the default auto source
+    // detection rules.
+    await fs.write(
+      'project-c/src/logo.jpg',
+      html`<div class="[.changed_&]:content-['project-c/src/logo.jpg']"></div>`,
+    )
+    await fs.expectFileNotToContain('./project-a/dist/out.css', [
+      candidate`[.changed_&]:content-['project-c/src/logo.jpg']`,
+    ])
+    await fs.write(
+      'project-c/node_modules/my-lib-1/src/index.html',
+      html`<div
+          class="[.changed_&]:content-['project-c/node_modules/my-lib-1/src/index.html']"
+        ></div>`,
+    )
+    await fs.expectFileNotToContain('./project-a/dist/out.css', [
+      candidate`[.changed_&]:content-['project-c/node_modules/my-lib-1/src/index.html']`,
+    ])
+
+    // Creating new files in the "root" of auto source detected folders
+    // We need to create the files and *then* update them because postcss-cli
+    // does not pick up new files — only changes to existing files.
+    await fs.create([
+      'project-b/new-file.html',
+      'project-b/new-folder/new-file.html',
+      'project-c/new-file.html',
+      'project-c/new-folder/new-file.html',
+    ])
+
+    // If we don't wait writes will be coalesced into a "add" event which
+    // isn't picked up by postcss-cli.
+    await new Promise((resolve) => setTimeout(resolve, 100))
+
+    await fs.write(
+      'project-b/new-file.html',
+      html`<div class="[.created_&]:content-['project-b/new-file.html']"></div>`,
+    )
+    await fs.write(
+      'project-b/new-folder/new-file.html',
+      html`<div class="[.created_&]:content-['project-b/new-folder/new-file.html']"></div>`,
+    )
+    await fs.write(
+      'project-c/new-file.html',
+      html`<div class="[.created_&]:content-['project-c/new-file.html']"></div>`,
+    )
+    await fs.write(
+      'project-c/new-folder/new-file.html',
+      html`<div class="[.created_&]:content-['project-c/new-folder/new-file.html']"></div>`,
+    )
+
+    await fs.expectFileToContain('./project-a/dist/out.css', [
+      candidate`[.created_&]:content-['project-b/new-file.html']`,
+      candidate`[.created_&]:content-['project-b/new-folder/new-file.html']`,
+      candidate`[.created_&]:content-['project-c/new-file.html']`,
+      candidate`[.created_&]:content-['project-c/new-folder/new-file.html']`,
+    ])
+  },
+)
+
+test(
+  'auto source detection disabled',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "postcss": "^8",
+            "postcss-cli": "^10",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/postcss": "workspace:^"
+          }
+        }
+      `,
+      'postcss.config.js': js`
+        module.exports = {
+          plugins: {
+            '@tailwindcss/postcss': {},
+          },
+        }
+      `,
+      'index.css': css`
+        @reference 'tailwindcss/theme';
+
+        /* (1) */
+        /* - Only './src' should be auto-scanned, not the current working directory */
+        /* - .gitignore'd paths should be ignored (node_modules) */
+        /* - Binary extensions should be ignored (jpg, zip) */
+        @import 'tailwindcss/utilities' source(none);
+
+        /* (2) */
+        /* - './pages' should be auto-scanned */
+        /* - Only '.html' files should be included */
+        /* - './page/ignored.html' will not be ignored because of the specific pattern */
+        @source "./pages/**/*.html";
+      `,
+
+      '.gitignore': dedent`
+        /src/ignored
+        /pages/ignored.html
+      `,
+
+      // (1)
+      'index.html': 'content-["index.html"] content-["BAD"]', // "Root" source is in `./src`
+      'src/index.html': 'content-["src/index.html"] content-["BAD"]',
+      'src/nested/index.html': 'content-["src/nested/index.html"] content-["BAD"]',
+      'src/index.jpg': 'content-["src/index.jpg"] content-["BAD"]',
+      'src/nested/index.tar': 'content-["src/nested/index.tar"] content-["BAD"]',
+      'src/ignored/index.html': 'content-["src/ignored/index.html"] content-["BAD"]',
+
+      // (4)
+      'pages/foo.html': 'content-["pages/foo.html"]',
+      'pages/nested/foo.html': 'content-["pages/nested/foo.html"]',
+      'pages/ignored.html': 'content-["pages/ignored.html"]',
+      'pages/foo.jsx': 'content-["pages/foo.jsx"] content-["BAD"]',
+      'pages/nested/foo.jsx': 'content-["pages/nested/foo.jsx"] content-["BAD"]',
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm postcss index.css --output dist/out.css')
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/out.css ---
+      @layer properties;
+      .content-\\[\\"pages\\/foo\\.html\\"\\] {
+        --tw-content: "pages/foo.html";
+        content: var(--tw-content);
+      }
+      .content-\\[\\"pages\\/ignored\\.html\\"\\] {
+        --tw-content: "pages/ignored.html";
+        content: var(--tw-content);
+      }
+      .content-\\[\\"pages\\/nested\\/foo\\.html\\"\\] {
+        --tw-content: "pages/nested/foo.html";
+        content: var(--tw-content);
+      }
+      @property --tw-content {
+        syntax: "*";
+        inherits: false;
+        initial-value: "";
+      }
+      @layer properties {
+        @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
+          *, ::before, ::after, ::backdrop {
+            --tw-content: "";
+          }
+        }
+      }
+      "
+    `)
+  },
+)
+
+test(
+  '`@source not "…"`',
+  {
+    fs: {
+      'package.json': json`{}`,
+      'pnpm-workspace.yaml': yaml`
+        #
+        packages:
+          - project-a
+      `,
+      'project-a/package.json': json`
+        {
+          "dependencies": {
+            "postcss": "^8",
+            "postcss-cli": "^10",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/postcss": "workspace:^"
+          }
+        }
+      `,
+      'project-a/postcss.config.js': js`
+        module.exports = {
+          plugins: {
+            '@tailwindcss/postcss': {},
+          },
+        }
+      `,
+      'project-a/src/index.css': css`
+        @reference 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+
+        /* Ignore a specific file */
+        @source not "./ignore-me-file.html";
+
+        /* Ignore a entire folder */
+        @source not "./ignore-me-folder";
+
+        /* Ignore an extension */
+        @source not "**/*.ts";
+
+        /* Explicit source detection for 'project-b' */
+        @source "../../project-b/**/*.html";
+
+        /* Explicitly ignoring a file in 'project-b' */
+        @source not "../../project-b/src/ignore-me.html";
+      `,
+      'project-a/src/ignore-me-file.html': html`
+        <div>
+          <div class="content-['project-a/src/ignore-me-file.html']"></div>
+        </div>
+      `,
+      'project-a/src/ignore-me-folder/index.html': html`
+        <div>
+          <div class="content-['project-a/src/ignore-me-folder/index.html']"></div>
+        </div>
+      `,
+      'project-a/src/keep-me.html': html`<div class="content-['keep-me.html']"></div>`,
+      'project-a/src/ignore-me-extension.ts': html`
+        <div>
+          <div class="content-['ignore-me-extension.ts']"></div>
+        </div>
+      `,
+      'project-b/src/ignore-me.html': html`
+        <div>
+          <div class="content-['project-b/src/ignore-me.html']"></div>
+        </div>
+      `,
+      'project-b/src/keep-me.html': html`
+        <div>
+          <div class="content-['project-b/src/keep-me.html']"></div>
+        </div>
+      `,
+    },
+  },
+  async ({ fs, exec, spawn, root, expect }) => {
+    await exec('pnpm postcss src/index.css --output dist/out.css --verbose', {
+      cwd: path.join(root, 'project-a'),
+    })
+
+    expect(await fs.dumpFiles('./project-a/dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./project-a/dist/out.css ---
+      @layer properties;
+      .content-\\[\\'keep-me\\.html\\'\\] {
+        --tw-content: 'keep-me.html';
+        content: var(--tw-content);
+      }
+      .content-\\[\\'project-b\\/src\\/keep-me\\.html\\'\\] {
+        --tw-content: 'project-b/src/keep-me.html';
+        content: var(--tw-content);
+      }
+      @property --tw-content {
+        syntax: "*";
+        inherits: false;
+        initial-value: "";
+      }
+      @layer properties {
+        @supports ((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b)))) {
+          *, ::before, ::after, ::backdrop {
+            --tw-content: "";
+          }
+        }
+      }
+      "
+    `)
+
+    // Watch mode tests
+    let process = await spawn(
+      'pnpm postcss src/index.css --output dist/out.css --watch --verbose',
+      {
+        cwd: path.join(root, 'project-a'),
+      },
+    )
+    await process.onStderr((message) => message.includes('Waiting for file changes...'))
+
+    fs.expectFileNotToContain('./project-a/dist/out.css', [
+      candidate`content-['project-a/src/ignore-me-file.html']`,
+      candidate`content-['project-a/src/ignore-me-folder/index.html']`,
+      candidate`content-['project-b/src/ignore-me.html']`,
+    ])
+
+    // Changes to the keep-me files should be included
+    await fs.write(
+      'project-a/src/keep-me.html',
+      html`<div class="[.changed_&]:content-['project-a/src/keep-me.html']"></div>`,
+    )
+    await fs.expectFileToContain('./project-a/dist/out.css', [
+      candidate`[.changed_&]:content-['project-a/src/keep-me.html']`,
+    ])
+
+    await fs.write(
+      'project-b/src/keep-me.html',
+      html`<div class="[.changed_&]:content-['project-b/src/keep-me.html']"></div>`,
+    )
+    await fs.expectFileToContain('./project-a/dist/out.css', [
+      candidate`[.changed_&]:content-['project-b/src/keep-me.html']`,
+    ])
+
+    // Changes to the ignored files should not be included
+    await fs.write(
+      'project-a/src/ignore-me.html',
+      html`<div class="[.changed_&]:content-['project-a/src/ignore-me.html']"></div>`,
+    )
+    await fs.expectFileNotToContain('./project-a/dist/out.css', [
+      candidate`[.changed_&]:content-['project-a/src/ignore-me.html']`,
+    ])
+
+    await fs.write(
+      'project-b/src/ignore-me.html',
+      html`<div class="[.changed_&]:content-['project-b/src/ignore-me.html']"></div>`,
+    )
+    await fs.expectFileNotToContain('./project-a/dist/out.css', [
+      candidate`[.changed_&]:content-['project-b/src/ignore-me.html']`,
+    ])
+
+    fs.expectFileNotToContain('./project-a/dist/out.css', [
+      candidate`content-['project-a/src/ignore-me-file.html']`,
+      candidate`content-['project-a/src/ignore-me-folder/index.html']`,
+      candidate`content-['project-b/src/ignore-me.html']`,
+    ])
+
+    // Creating new files that match the source patterns should be included.
+    await fs.create([
+      'project-a/src/new-file.html',
+      'project-a/src/new-folder/new-file.html',
+      'project-b/src/new-file.html',
+      'project-b/src/new-folder/new-file.html',
+    ])
+
+    await fs.write(
+      'project-a/src/new-file.html',
+      html`<div class="[.created_&]:content-['project-a/src/new-file.html']"></div>`,
+    )
+    await fs.write(
+      'project-a/src/new-folder/new-file.html',
+      html`<div class="[.created_&]:content-['project-a/src/new-folder/new-file.html']"></div>`,
+    )
+    await fs.write(
+      'project-b/src/new-file.html',
+      html`<div class="[.created_&]:content-['project-b/src/new-file.html']"></div>`,
+    )
+    await fs.write(
+      'project-b/src/new-folder/new-file.html',
+      html`<div class="[.created_&]:content-['project-b/src/new-folder/new-file.html']"></div>`,
+    )
+
+    // If we don't wait writes will be coalesced into a "add" event which
+    // isn't picked up by postcss-cli.
+    await new Promise((resolve) => setTimeout(resolve, 100))
+
+    await fs.expectFileToContain('./project-a/dist/out.css', [
+      candidate`[.created_&]:content-['project-a/src/new-file.html']`,
+      candidate`[.created_&]:content-['project-a/src/new-folder/new-file.html']`,
+      candidate`[.created_&]:content-['project-b/src/new-file.html']`,
+      candidate`[.created_&]:content-['project-b/src/new-folder/new-file.html']`,
+    ])
+
+    fs.expectFileNotToContain('./project-a/dist/out.css', [
+      candidate`content-['project-a/src/ignore-me-file.html']`,
+      candidate`content-['project-a/src/ignore-me-folder/index.html']`,
+      candidate`content-['project-b/src/ignore-me.html']`,
+    ])
+  },
+)
diff --git a/integrations/postcss/url-rewriting.test.ts b/integrations/postcss/url-rewriting.test.ts
new file mode 100644
index 000000000..bac9d95d5
--- /dev/null
+++ b/integrations/postcss/url-rewriting.test.ts
@@ -0,0 +1,149 @@
+import { css, js, json, test } from '../utils'
+
+test(
+  'can rewrite urls in production builds',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "postcss": "^8",
+            "postcss-cli": "^10",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/postcss": "workspace:^"
+          }
+        }
+      `,
+      'postcss.config.js': js`
+        module.exports = {
+          plugins: {
+            '@tailwindcss/postcss': {},
+          },
+        }
+      `,
+      'src/index.css': css`
+        @reference 'tailwindcss';
+        @import './dir-1/bar.css';
+        @import './dir-1/dir-2/baz.css';
+        @import './dir-1/dir-2/vector.css';
+      `,
+      'src/dir-1/bar.css': css`
+        .test1 {
+          background-image: url('../../resources/image.png');
+        }
+      `,
+      'src/dir-1/dir-2/baz.css': css`
+        .test2 {
+          background-image: url('../../../resources/image.png');
+        }
+      `,
+      'src/dir-1/dir-2/vector.css': css`
+        @import './dir-3/vector.css';
+        .test3 {
+          background-image: url('../../../resources/vector.svg');
+        }
+      `,
+      'src/dir-1/dir-2/dir-3/vector.css': css`
+        .test4 {
+          background-image: url('./vector-2.svg');
+        }
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm postcss src/index.css --output dist/out.css')
+
+    expect(await fs.dumpFiles('dist/out.css')).toMatchInlineSnapshot(`
+      "
+      --- dist/out.css ---
+      .test1 {
+        background-image: url('../resources/image.png');
+      }
+      .test2 {
+        background-image: url('../resources/image.png');
+      }
+      .test4 {
+        background-image: url('./dir-1/dir-2/dir-3/vector-2.svg');
+      }
+      .test3 {
+        background-image: url('../resources/vector.svg');
+      }
+      "
+    `)
+  },
+)
+
+test(
+  'url rewriting can be disabled',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "postcss": "^8",
+            "postcss-cli": "^10",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/postcss": "workspace:^"
+          }
+        }
+      `,
+      'postcss.config.js': js`
+        module.exports = {
+          plugins: {
+            '@tailwindcss/postcss': {
+              transformAssetUrls: false,
+            },
+          },
+        }
+      `,
+      'src/index.css': css`
+        @reference 'tailwindcss';
+        @import './dir-1/bar.css';
+        @import './dir-1/dir-2/baz.css';
+        @import './dir-1/dir-2/vector.css';
+      `,
+      'src/dir-1/bar.css': css`
+        .test1 {
+          background-image: url('../../resources/image.png');
+        }
+      `,
+      'src/dir-1/dir-2/baz.css': css`
+        .test2 {
+          background-image: url('../../../resources/image.png');
+        }
+      `,
+      'src/dir-1/dir-2/vector.css': css`
+        @import './dir-3/vector.css';
+        .test3 {
+          background-image: url('../../../resources/vector.svg');
+        }
+      `,
+      'src/dir-1/dir-2/dir-3/vector.css': css`
+        .test4 {
+          background-image: url('./vector-2.svg');
+        }
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm postcss src/index.css --output dist/out.css')
+
+    expect(await fs.dumpFiles('dist/out.css')).toMatchInlineSnapshot(`
+      "
+      --- dist/out.css ---
+      .test1 {
+        background-image: url('../../resources/image.png');
+      }
+      .test2 {
+        background-image: url('../../../resources/image.png');
+      }
+      .test4 {
+        background-image: url('./vector-2.svg');
+      }
+      .test3 {
+        background-image: url('../../../resources/vector.svg');
+      }
+      "
+    `)
+  },
+)
diff --git a/integrations/turbopack/loader.test.ts b/integrations/turbopack/loader.test.ts
new file mode 100644
index 000000000..755cd60df
--- /dev/null
+++ b/integrations/turbopack/loader.test.ts
@@ -0,0 +1,83 @@
+import { candidate, css, fetchStyles, js, json, jsx, retryAssertion, test } from '../utils'
+
+test(
+  '@tailwindcss/turbopack loader (dev)',
+  {
+    timeout: 120_000,
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "next": "^16.2.7",
+            "react": "^19.2.7",
+            "react-dom": "^19.2.7",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/turbopack": "workspace:^"
+          }
+        }
+      `,
+      'next.config.mjs': js`
+        export default {
+          turbopack: {
+            rules: {
+              '*.css': {
+                loaders: ['@tailwindcss/turbopack'],
+                as: '*.css',
+              },
+            },
+          },
+        }
+      `,
+      'app/layout.js': jsx`
+        import './globals.css'
+
+        export default function RootLayout({ children }) {
+          return (
+            <html>
+              <body>{children}</body>
+            </html>
+          )
+        }
+      `,
+      'app/page.js': jsx`
+        export default function Page() {
+          return <div className="flex">Hello, Next.js!</div>
+        }
+      `,
+      'app/globals.css': css` @import 'tailwindcss'; `,
+    },
+  },
+  async ({ fs, spawn, expect }) => {
+    let process = await spawn('pnpm next dev')
+
+    let url = ''
+    await process.onStdout((message) => {
+      let match = /Local:\s*(http.*)/.exec(message)
+      if (match) url = match[1]
+      return Boolean(url)
+    })
+
+    await process.onStdout((message) => message.includes('Ready in'))
+
+    await retryAssertion(async () => {
+      let styles = await fetchStyles(url)
+      expect(styles).toContain(candidate`flex`)
+      expect(styles).not.toContain(candidate`underline`)
+    })
+
+    await fs.write(
+      'app/page.js',
+      jsx`
+        export default function Page() {
+          return <div className="flex underline">Hello, Next.js!</div>
+        }
+      `,
+    )
+
+    await retryAssertion(async () => {
+      let styles = await fetchStyles(url)
+      expect(styles).toContain(candidate`flex`)
+      expect(styles).toContain(candidate`underline`)
+    })
+  },
+)
diff --git a/integrations/upgrade/index.test.ts b/integrations/upgrade/index.test.ts
index e656253a9..efac411db 100644
--- a/integrations/upgrade/index.test.ts
+++ b/integrations/upgrade/index.test.ts
@@ -1,4 +1,6 @@
-import { candidate, css, html, js, json, test, ts } from '../utils'
+import path from 'node:path'
+import { isRepoDirty } from '../../packages/@tailwindcss-upgrade/src/utils/git'
+import { candidate, css, html, js, json, test, ts, txt, yaml } from '../utils'
 
 test(
   'error when no CSS file with @tailwind is used',
@@ -26,7 +28,7 @@ test(
     },
   },
   async ({ fs, exec, expect }) => {
-    let output = await exec('npx @tailwindcss/upgrade')
+    let output = await exec('pnpm exec upgrade')
     expect(output).toContain('Cannot find any CSS files that reference Tailwind CSS.')
 
     // Files should not be modified
@@ -80,6 +82,9 @@ test(
 
         <!-- Migrate to -3 -->
         <div class="ring"></div>
+
+        <!-- Migrate to -solid -->
+        <div class="outline"></div>
       `,
       'src/input.css': css`
         @tailwind base;
@@ -95,7 +100,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('./src/**/*.{css,html}')).toMatchInlineSnapshot(`
       "
@@ -116,11 +121,14 @@ test(
       <!-- Migrate to -3 -->
       <div class="ring-3"></div>
 
+      <!-- Migrate to -solid -->
+      <div class="outline-solid"></div>
+
       --- ./src/input.css ---
       @import 'tailwindcss';
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -133,7 +141,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -146,11 +154,11 @@ test(
     let packageJsonContent = await fs.read('package.json')
     let packageJson = JSON.parse(packageJsonContent)
     expect(packageJson.dependencies).toMatchObject({
-      tailwindcss: expect.stringContaining('4.0.0'),
+      tailwindcss: expect.stringMatching(/^\^4/),
     })
 
     // Ensure the v4 project compiles correctly
-    await exec('npx tailwindcss --input src/input.css --output dist/out.css')
+    await exec('pnpm exec tailwindcss --input src/input.css --output dist/out.css')
 
     await fs.expectFileToContain('dist/out.css', [
       candidate`flex!`,
@@ -163,9 +171,62 @@ test(
   },
 )
 
+test(
+  'only migrates files matched by `config.content` when upgrading from v3 to v4',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^3",
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      'tailwind.config.js': js`
+        /** @type {import('tailwindcss').Config} */
+        module.exports = {
+          content: ['./src/**/*.html'],
+        }
+      `,
+      'src/index.html': html`
+        <div class="order-[0] bg-[--my-red]"></div>
+      `,
+      'src/input.css': css`
+        @tailwind base;
+        @tailwind components;
+        @tailwind utilities;
+      `,
+      'templates/email.php': html`
+        <div class="order-[0] bg-[--my-red]"></div>
+      `,
+      'notes/unrelated.txt': `order-[0] bg-[--my-red]`,
+    },
+    retry: 0,
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm exec upgrade')
+
+    expect(await fs.dumpFiles('./**/*.{html,php,txt}')).toMatchInlineSnapshot(`
+      "
+      --- notes/unrelated.txt ---
+      order-[0] bg-[--my-red]
+
+      --- src/index.html ---
+      <div class="order-0 bg-(--my-red)"></div>
+
+      --- templates/email.php ---
+      <div class="order-[0] bg-[--my-red]"></div>
+      "
+    `)
+  },
+)
+
 test(
   `upgrades a v3 project with prefixes to v4`,
   {
+    // Somehow this test takes *way* longer than the rest (but not always?)
+    timeout: 180_000,
     fs: {
       'package.json': json`
         {
@@ -202,13 +263,13 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('./src/**/*.{css,html}')).toMatchInlineSnapshot(`
       "
       --- ./src/index.html ---
       <div
-        class="tw:flex! tw:sm:block! tw:bg-linear-to-t flex tw:[color:red] tw:in-[.tw\\:group]:flex"
+        class="tw:flex! tw:sm:block! tw:bg-linear-to-t flex tw:text-[red] tw:in-[.tw\\:group]:flex"
       ></div>
       <div
         class="tw:group tw:group/foo tw:peer tw:peer/foo tw:group-hover:flex tw:group-hover/foo:flex tw:peer-hover:flex tw:peer-hover/foo:flex"
@@ -218,7 +279,7 @@ test(
       @import 'tailwindcss' prefix(tw);
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -231,7 +292,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -274,7 +335,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('./src/**/*.css')).toMatchInlineSnapshot(`
       "
@@ -282,7 +343,7 @@ test(
       @import 'tailwindcss';
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -295,7 +356,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -346,7 +407,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('./src/**/*.css')).toMatchInlineSnapshot(`
       "
@@ -354,7 +415,7 @@ test(
       @import 'tailwindcss';
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -367,7 +428,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -423,7 +484,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('./src/**/*.css')).toMatchInlineSnapshot(`
       "
@@ -431,7 +492,7 @@ test(
       @import 'tailwindcss';
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -444,7 +505,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -526,7 +587,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('./src/**/*.css')).toMatchInlineSnapshot(`
       "
@@ -540,7 +601,7 @@ test(
       @import 'tailwindcss';
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -553,7 +614,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -593,6 +654,7 @@ test(
 test(
   'migrates a simple postcss setup',
   {
+    timeout: 120_000,
     fs: {
       'package.json': json`
         {
@@ -633,7 +695,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     await fs.expectFileToContain(
       'postcss.config.js',
@@ -657,12 +719,12 @@ test(
     let packageJsonContent = await fs.read('package.json')
     let packageJson = JSON.parse(packageJsonContent)
     expect(packageJson.dependencies).toMatchObject({
-      tailwindcss: expect.stringContaining('4.0.0'),
+      tailwindcss: expect.stringMatching(/^\^4/),
     })
     expect(packageJson.dependencies).not.toHaveProperty('autoprefixer')
     expect(packageJson.dependencies).not.toHaveProperty('postcss-import')
     expect(packageJson.dependencies).toMatchObject({
-      '@tailwindcss/postcss': expect.stringContaining('4.0.0'),
+      '@tailwindcss/postcss': expect.stringMatching(/^\^4/),
     })
   },
 )
@@ -704,12 +766,12 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     let packageJsonContent = await fs.read('package.json')
     let packageJson = JSON.parse(packageJsonContent)
     expect(packageJson.dependencies).toMatchObject({
-      '@tailwindcss/postcss': expect.stringContaining('4.0.0'),
+      '@tailwindcss/postcss': expect.stringMatching(/^\^4/),
     })
   },
 )
@@ -751,12 +813,12 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     let packageJsonContent = await fs.read('package.json')
     let packageJson = JSON.parse(packageJsonContent)
     expect(packageJson.devDependencies).toMatchObject({
-      '@tailwindcss/postcss': expect.stringContaining('4.0.0'),
+      '@tailwindcss/postcss': expect.stringMatching(/^\^4/),
     })
   },
 )
@@ -764,6 +826,7 @@ test(
 test(
   'migrates a postcss setup using package.json config',
   {
+    timeout: 120_000,
     fs: {
       'package.json': json`
         {
@@ -802,7 +865,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     await fs.expectFileToContain('src/index.css', css`@import 'tailwindcss';`)
     await fs.expectFileToContain(
@@ -824,12 +887,12 @@ test(
     `)
 
     expect(packageJson.dependencies).toMatchObject({
-      tailwindcss: expect.stringContaining('4.0.0'),
+      tailwindcss: expect.stringMatching(/^\^4/),
     })
     expect(packageJson.dependencies).not.toHaveProperty('autoprefixer')
     expect(packageJson.dependencies).not.toHaveProperty('postcss-import')
     expect(packageJson.dependencies).toMatchObject({
-      '@tailwindcss/postcss': expect.stringContaining('4.0.0'),
+      '@tailwindcss/postcss': expect.stringMatching(/^\^4/),
     })
   },
 )
@@ -837,6 +900,7 @@ test(
 test(
   'migrates a postcss setup using a json based config file',
   {
+    timeout: 120_000,
     fs: {
       'package.json': json`
         {
@@ -877,7 +941,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     await fs.expectFileToContain('src/index.css', css`@import 'tailwindcss';`)
     await fs.expectFileToContain(
@@ -901,12 +965,12 @@ test(
     let packageJsonContent = await fs.read('package.json')
     let packageJson = JSON.parse(packageJsonContent)
     expect(packageJson.dependencies).toMatchObject({
-      tailwindcss: expect.stringContaining('4.0.0'),
+      tailwindcss: expect.stringMatching(/^\^4/),
     })
     expect(packageJson.dependencies).not.toHaveProperty('autoprefixer')
     expect(packageJson.dependencies).not.toHaveProperty('postcss-import')
     expect(packageJson.dependencies).toMatchObject({
-      '@tailwindcss/postcss': expect.stringContaining('4.0.0'),
+      '@tailwindcss/postcss': expect.stringMatching(/^\^4/),
     })
   },
 )
@@ -944,7 +1008,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('./src/**/*.html')).toMatchInlineSnapshot(`
       "
@@ -991,7 +1055,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('./src/**/*.html')).toMatchInlineSnapshot(`
       "
@@ -1035,7 +1099,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade --force')
+    await exec('pnpm exec upgrade --force')
 
     expect(await fs.dumpFiles('./src/**/*.css')).toMatchInlineSnapshot(`
       "
@@ -1044,7 +1108,7 @@ test(
       @import './utilities.css';
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -1057,7 +1121,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -1105,9 +1169,10 @@ test(
         }
       `,
     },
+    retry: 0,
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade --force')
+    await exec('pnpm exec upgrade --force')
 
     expect(await fs.dumpFiles('./src/**/*.css')).toMatchInlineSnapshot(`
       "
@@ -1216,9 +1281,10 @@ test(
         }
       `,
     },
+    retry: 0,
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade --force')
+    await exec('pnpm exec upgrade --force')
 
     expect(await fs.dumpFiles('./src/**/*.css')).toMatchInlineSnapshot(`
       "
@@ -1265,7 +1331,6 @@ test(
 
       --- ./src/c.1.css ---
       @import './c.2.css' layer(utilities);
-
       .baz-from-c {
         color: green;
       }
@@ -1352,7 +1417,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    let output = await exec('npx @tailwindcss/upgrade --force')
+    let output = await exec('pnpm exec upgrade --force')
 
     expect(output).toMatch(
       /You have one or more stylesheets that are imported into a utility layer and non-utility layer./,
@@ -1433,7 +1498,7 @@ test(
         @tailwind components;
         @tailwind utilities;
 
-        @variant hocus (&:hover, &:focus);
+        @custom-variant hocus (&:hover, &:focus);
 
         @theme {
           --color-red-500: #f00;
@@ -1476,7 +1541,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade --force')
+    await exec('pnpm exec upgrade --force')
 
     expect(await fs.dumpFiles('./src/**/*.{html,css}')).toMatchInlineSnapshot(`
       "
@@ -1492,7 +1557,7 @@ test(
       @config './tailwind.config.ts';
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -1505,7 +1570,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -1516,7 +1581,7 @@ test(
       @config "../../tailwind.config.ts";
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -1529,7 +1594,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -1539,7 +1604,7 @@ test(
 
       @config './tailwind.config.ts';
 
-      @variant hocus (&:hover, &:focus);
+      @custom-variant hocus (&:hover, &:focus);
 
       @theme {
         --color-red-500: #f00;
@@ -1550,7 +1615,7 @@ test(
       }
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -1563,7 +1628,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -1579,7 +1644,7 @@ test(
       @import 'tailwindcss/preflight' layer(base);
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -1592,7 +1657,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -1610,7 +1675,7 @@ test(
       @config '../../tailwind.config.ts';
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -1623,7 +1688,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
       "
@@ -1675,7 +1740,7 @@ test(
         @tailwind components;
         @tailwind utilities;
 
-        @variant hocus (&:hover, &:focus);
+        @custom-variant hocus (&:hover, &:focus);
 
         @theme {
           --color-red-500: #f00;
@@ -1701,8 +1766,8 @@ test(
     },
   },
   async ({ exec, expect }) => {
-    let output = await exec('npx @tailwindcss/upgrade --force', {}, { ignoreStdErr: true }).catch(
-      (e) => e.toString(),
+    let output = await exec('pnpm exec upgrade --force', {}, { ignoreStdErr: true }).catch((e) =>
+      e.toString(),
     )
 
     expect(output).toMatch('Could not determine configuration file for:')
@@ -1773,7 +1838,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade --force')
+    await exec('pnpm exec upgrade --force')
 
     expect(await fs.dumpFiles('./src/**/*.{html,css}')).toMatchInlineSnapshot(`
       "
@@ -1790,7 +1855,7 @@ test(
       @import 'tailwindcss/preflight' layer(base);
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -1803,7 +1868,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -1909,7 +1974,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade --force')
+    await exec('pnpm exec upgrade --force')
 
     expect(await fs.dumpFiles('./src/**/*.{html,css}')).toMatchInlineSnapshot(`
       "
@@ -1926,7 +1991,7 @@ test(
       @import 'tailwindcss/preflight' layer(base);
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -1939,7 +2004,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -2029,7 +2094,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade --force')
+    await exec('pnpm exec upgrade --force')
 
     expect(await fs.dumpFiles('./src/**/*.{html,css}')).toMatchInlineSnapshot(`
       "
@@ -2043,7 +2108,7 @@ test(
       @import 'tailwindcss/preflight' layer(base);
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -2056,7 +2121,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -2109,7 +2174,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade --force')
+    await exec('pnpm exec upgrade --force')
 
     expect(await fs.dumpFiles('./src/**/*.css')).toMatchInlineSnapshot(`
       "
@@ -2118,7 +2183,7 @@ test(
       @import './styles/components.css' layer(components);
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -2131,7 +2196,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -2191,9 +2256,10 @@ test(
         }
       `,
     },
+    retry: 0,
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade --force')
+    await exec('pnpm exec upgrade --force')
 
     expect(await fs.dumpFiles('./src/**/*.css')).toMatchInlineSnapshot(`
       "
@@ -2247,7 +2313,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade --force')
+    await exec('pnpm exec upgrade --force')
 
     let pkg = JSON.parse(await fs.read('package.json'))
 
@@ -2326,7 +2392,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade --force')
+    await exec('pnpm exec upgrade --force')
 
     // Files should not be modified
     expect(await fs.dumpFiles('./*.{js,css,html}')).toMatchInlineSnapshot(`
@@ -2338,8 +2404,7 @@ test(
         --shadow-*: initial;
         --shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
 
-        --ring-width-*: initial;
-        --ring-width: 4px;
+        --default-ring-width: 4px;
 
         --blur: var(--custom-default-blur);
 
@@ -2349,7 +2414,7 @@ test(
       }
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -2362,7 +2427,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -2425,7 +2490,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade --force')
+    await exec('pnpm exec upgrade --force')
 
     // Files should not be modified
     expect(await fs.dumpFiles('./*.{js,css,html,tsx}')).toMatchInlineSnapshot(`
@@ -2434,7 +2499,7 @@ test(
       @import 'tailwindcss';
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -2447,7 +2512,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -2492,7 +2557,7 @@ test(
         @import './utilities.css';
         @import './generated/ignore-me.css';
       `,
-      'src/generated/.gitignore': `
+      'src/generated/.gitignore': txt`
         *
         !.gitignore
       `,
@@ -2532,7 +2597,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade ./src/index.css')
+    await exec('pnpm exec upgrade ./src/index.css')
 
     expect(await fs.dumpFiles('./src/**/*.{css,html}')).toMatchInlineSnapshot(`
       "
@@ -2547,7 +2612,7 @@ test(
       @import 'tailwindcss/preflight' layer(base);
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -2560,7 +2625,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -2595,40 +2660,6 @@ test(
   },
 )
 
-test(
-  'requires Tailwind v3 before attempting an upgrade',
-  {
-    fs: {
-      'package.json': json`
-        {
-          "dependencies": {
-            "tailwindcss": "workspace:^",
-            "@tailwindcss/upgrade": "workspace:^"
-          }
-        }
-      `,
-      'tailwind.config.ts': js` export default {} `,
-      'src/index.html': html`
-        <div class="underline"></div>
-      `,
-      'src/index.css': css`
-        @tailwind base;
-        @tailwind components;
-        @tailwind utilities;
-      `,
-    },
-  },
-  async ({ exec, expect }) => {
-    let output = await exec('npx @tailwindcss/upgrade', {}, { ignoreStdErr: true }).catch((e) =>
-      e.toString(),
-    )
-
-    expect(output).toMatch(
-      /Tailwind CSS v.* found. The migration tool can only be run on v3 projects./,
-    )
-  },
-)
-
 test(
   `upgrades opacity namespace values to percentages`,
   {
@@ -2692,7 +2723,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('./src/**/*.{css,html}')).toMatchInlineSnapshot(`
       "
@@ -2705,8 +2736,8 @@ test(
           text-red-500/10
           text-red-500/semitransparent
           text-red-500/transparent
-          text-red-500/50
-          text-red-500/50.5
+          text-red-500/semitransparent
+          text-red-500/50.50
           text-red-500/50.50
           text-red-500/50%
           text-red-500/100%"
@@ -2725,7 +2756,7 @@ test(
       }
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -2738,10 +2769,744 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
       "
     `)
   },
 )
+
+test(
+  `can read files with BOM`,
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^3",
+            "@tailwindcss/upgrade": "workspace:^"
+          },
+          "devDependencies": {
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'tailwind.config.js': js`
+        /** @type {import('tailwindcss').Config} */
+        module.exports = {
+          content: ['./src/**/*.{html,js}'],
+        }
+      `,
+      'src/index.html': withBOM(html`
+        <div class="ring"></div>
+      `),
+      'src/input.css': withBOM(css`
+        @tailwind base;
+        @tailwind components;
+        @tailwind utilities;
+      `),
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm exec upgrade')
+
+    expect(await fs.dumpFiles('./src/**/*.{css,html}')).toMatchInlineSnapshot(`
+      "
+      --- ./src/index.html ---
+      <div class="ring-3"></div>
+
+      --- ./src/input.css ---
+      @import 'tailwindcss';
+
+      /*
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
+        so we've added these compatibility styles to make sure everything still
+        looks the same as it did with Tailwind CSS v3.
+
+        If we ever want to remove these styles, we need to add an explicit border
+        color utility to any element that depends on these defaults.
+      */
+      @layer base {
+        *,
+        ::after,
+        ::before,
+        ::backdrop,
+        ::file-selector-button {
+          border-color: var(--color-gray-200, currentcolor);
+        }
+      }
+      "
+    `)
+  },
+)
+
+test(
+  'upgrades are idempotent, and can run on v4 projects',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^3",
+            "@tailwindcss/upgrade": "workspace:^"
+          },
+          "devDependencies": {
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'tailwind.config.js': js`
+        /** @type {import('tailwindcss').Config} */
+        module.exports = {
+          content: ['./src/**/*.{html,js}'],
+        }
+      `,
+      'src/index.html': html`
+        <div class="ring"></div>
+      `,
+      'src/input.css': css`
+        @tailwind base;
+        @tailwind components;
+        @tailwind utilities;
+
+        .foo {
+          @apply !bg-[var(--my-color)] rounded;
+        }
+      `,
+    },
+  },
+  async ({ exec, root, fs, expect }) => {
+    await exec('pnpm exec upgrade')
+
+    let before = await fs.dumpFiles('./src/**/*.{css,html}')
+    expect(before).toMatchInlineSnapshot(`
+      "
+      --- ./src/index.html ---
+      <div class="ring-3"></div>
+
+      --- ./src/input.css ---
+      @import 'tailwindcss';
+
+      /*
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
+        so we've added these compatibility styles to make sure everything still
+        looks the same as it did with Tailwind CSS v3.
+
+        If we ever want to remove these styles, we need to add an explicit border
+        color utility to any element that depends on these defaults.
+      */
+      @layer base {
+        *,
+        ::after,
+        ::before,
+        ::backdrop,
+        ::file-selector-button {
+          border-color: var(--color-gray-200, currentcolor);
+        }
+      }
+
+      .foo {
+        @apply bg-(--my-color)! rounded-sm;
+      }
+      "
+    `)
+
+    // Commit the changes
+    if (isRepoDirty(root)) {
+      await exec('git add .')
+      await exec('git commit -m "upgrade"')
+    }
+
+    // Run the upgrade again
+    let output = await exec('pnpm exec upgrade')
+    expect(output).toContain('No changes were made to your repository')
+
+    let after = await fs.dumpFiles('./src/**/*.{css,html}')
+    expect(after).toMatchInlineSnapshot(`
+      "
+      --- ./src/index.html ---
+      <div class="ring-3"></div>
+
+      --- ./src/input.css ---
+      @import 'tailwindcss';
+
+      /*
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
+        so we've added these compatibility styles to make sure everything still
+        looks the same as it did with Tailwind CSS v3.
+
+        If we ever want to remove these styles, we need to add an explicit border
+        color utility to any element that depends on these defaults.
+      */
+      @layer base {
+        *,
+        ::after,
+        ::before,
+        ::backdrop,
+        ::file-selector-button {
+          border-color: var(--color-gray-200, currentcolor);
+        }
+      }
+
+      .foo {
+        @apply bg-(--my-color)! rounded-sm;
+      }
+      "
+    `)
+
+    // Ensure the file system is in the same state
+    expect(before).toEqual(after)
+  },
+)
+
+test(
+  'upgrades run on v4 projects',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^4",
+            "@tailwindcss/upgrade": "workspace:^"
+          },
+          "devDependencies": {
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'src/index.html': html`
+        <!-- Migrating 'ring', 'rounded' and 'outline-none' are unsafe in v4 -> v4 migrations -->
+        <div class="ring rounded outline"></div>
+
+        <!-- Variant order is also unsafe to change in v4 projects -->
+        <div class="file:hover:flex *:hover:flex"></div>
+        <div class="hover:file:flex hover:*:flex"></div>
+
+        <!-- These are safe to migrate: -->
+        <div
+          class="!flex bg-red-500/[var(--my-opacity)] [@media(pointer:fine)]:flex bg-right-bottom object-left-top"
+        ></div>
+      `,
+      'src/input.css': css`
+        @import 'tailwindcss';
+
+        .foo {
+          @apply !bg-[var(--my-color)];
+        }
+      `,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm exec upgrade')
+
+    expect(await fs.dumpFiles('./src/**/*.{css,html}')).toMatchInlineSnapshot(`
+      "
+      --- ./src/index.html ---
+      <!-- Migrating 'ring', 'rounded' and 'outline-none' are unsafe in v4 -> v4 migrations -->
+      <div class="ring rounded outline"></div>
+
+      <!-- Variant order is also unsafe to change in v4 projects -->
+      <div class="file:hover:flex *:hover:flex"></div>
+      <div class="hover:file:flex hover:*:flex"></div>
+
+      <!-- These are safe to migrate: -->
+      <div
+        class="flex! bg-red-500/(--my-opacity) pointer-fine:flex bg-bottom-right object-top-left"
+      ></div>
+
+      --- ./src/input.css ---
+      @import 'tailwindcss';
+
+      .foo {
+        @apply bg-(--my-color)!;
+      }
+      "
+    `)
+  },
+)
+
+test(
+  'v4 ignores .env files during template migration',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^4",
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      'src/app.css': css`@import 'tailwindcss';`,
+      'src/index.html': html`
+        <div class="order-[0]"></div>
+      `,
+      'src/.env': `TW_TEST_CLASS=order-[0]`,
+      'src/.env.production': `TW_TEST_CLASS=order-[0]`,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm exec upgrade')
+
+    expect(await fs.dumpFiles('./src/**/{*,.env,.env.*}')).toMatchInlineSnapshot(`
+      "
+      --- ./src/index.html ---
+      <div class="order-0"></div>
+
+      --- ./src/.env ---
+      TW_TEST_CLASS=order-[0]
+
+      --- ./src/.env.production ---
+      TW_TEST_CLASS=order-[0]
+
+      --- ./src/app.css ---
+      @import 'tailwindcss';
+      "
+    `)
+  },
+)
+
+test(
+  'v4 linked configs respect `content` and still ignore gitignored files',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^4",
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      'tailwind.config.js': js`
+        /** @type {import('tailwindcss').Config} */
+        module.exports = {
+          content: ['./src/*.html', './src/*.less'],
+        }
+      `,
+      'src/app.css': css`
+        @import 'tailwindcss';
+        @config '../tailwind.config.js';
+      `,
+
+      // Ignore all .html files
+      'src/.gitignore': txt`
+        *.html
+      `,
+
+      // HTML files are in .gitignore, even though they are explicitly mentioned
+      // in the `content` array. Still ignore them
+      'src/do-not-migrate-me.html': html`
+        <div class="order-[0]"></div>
+      `,
+
+      // Should be picked up by auto-content detection
+      'templates/migrate-me.php': html`
+        <div class="order-[0]"></div>
+      `,
+
+      // Does not get picked up by auto content detection (because it's a less
+      // file), but was explicitly listed in the `content` array.
+      //
+      // A bit of a hacky way, I admit, but it allows us to differentiate
+      // between git ignored files, auto content detection and explicitly listed
+      // files.
+      'src/migrate-me.less': html`
+        <div class="order-[0]"></div>
+      `,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm exec upgrade')
+
+    expect(await fs.dumpFiles('./{src,templates}/**/*')).toMatchInlineSnapshot(`
+      "
+      --- ./src/app.css ---
+      @import 'tailwindcss';
+      @config '../tailwind.config.js';
+
+      --- ./src/do-not-migrate-me.html ---
+      <div class="order-[0]"></div>
+
+      --- ./src/migrate-me.less ---
+      <div class="order-0"></div>
+
+      --- ./templates/migrate-me.php ---
+      <div class="order-0"></div>
+      "
+    `)
+  },
+)
+
+test(
+  'interrupting template migration does not truncate files',
+  {
+    timeout: 180_000,
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^4",
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      'src/app.css': css` @import 'tailwindcss'; `,
+      'src/index.html': html`
+        <div class="order-[0]"></div>
+      `,
+      'hook.cjs': js`
+        let fs = require('node:fs/promises')
+        let path = require('node:path')
+        let originalWriteFile = fs.writeFile.bind(fs)
+
+        fs.writeFile = async (file, contents, ...rest) => {
+          // Mimic a bad write
+          await originalWriteFile(file, '') // As-if we truncated first
+          console.error('__TRUNCATED_TARGET__')
+          await new Promise((r) => setTimeout(r, 50)) // Wait 50ms to allow us to kill the process
+          await originalWriteFile(file, contents, ...rest) // Write the actual contents
+        }
+      `,
+      'src/keep.php': `
+        <?php
+
+        return [
+          'keep' => 'this file should never be truncated',
+        ];
+      `,
+    },
+  },
+  async ({ spawn, fs, expect }) => {
+    let repeatedCandidates = Array.from(
+      { length: 250 },
+      () => '<div class="order-[0]"></div>',
+    ).join('\n')
+
+    for (let i = 0; i < 100; i++) {
+      await fs.write(
+        `src/templates/template-${i}.php`,
+        `<?php\n\n${repeatedCandidates}\n\nreturn ['template' => ${i}];\n`,
+      )
+    }
+
+    let originalKeepFile = await fs.read('src/keep.php')
+    let originalTemplate = await fs.read('src/templates/template-0.php')
+
+    // NOTE: This test intentionally keeps `npx` instead of `pnpm exec`. It uses
+    // a `NODE_OPTIONS` hook that overrides `fs.writeFile` to simulate a bad
+    // write, and `pnpm exec` may write a bin shim on startup which would trip
+    // that hook before template migration begins.
+    let process = await spawn('npx @tailwindcss/upgrade --force', {
+      env: {
+        NODE_OPTIONS: '--require=./hook.cjs',
+      },
+    })
+
+    // We're only interested once we start migrating the templates
+    await process.onStderr((message) => message.includes('Migrating templates'))
+
+    // Wait for the trigger that we are mid-write
+    await process.onStderr((message) => message === '__TRUNCATED_TARGET__')
+
+    // Kill the process
+    await process.dispose()
+
+    expect(await fs.read('src/keep.php')).toBe(originalKeepFile)
+    expect(await fs.read('src/templates/template-0.php')).toBe(originalTemplate)
+
+    for (let [file, contents] of await fs.glob('src/**/*.{html,php,css}')) {
+      expect(contents.trim(), `${file} should not be empty after interruption`).not.toBe('')
+    }
+  },
+)
+
+test(
+  'upgrades can run in a pnpm workspace',
+  {
+    fs: {
+      'package.json': json`{}`,
+      'pnpm-workspace.yaml': yaml`
+        #
+        packages:
+          - project-a
+      `,
+      'project-a/package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^4"
+          },
+          "devDependencies": {
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      'project-a/src/index.html': html`
+        <!-- Migrating 'ring', 'rounded' and 'outline-none' are unsafe in v4 -> v4 migrations -->
+        <div class="ring rounded outline"></div>
+
+        <!-- Variant order is also unsafe to change in v4 projects -->
+        <div class="file:hover:flex *:hover:flex"></div>
+        <div class="hover:file:flex hover:*:flex"></div>
+
+        <!-- These are safe to migrate: -->
+        <div
+          class="!flex bg-red-500/[var(--my-opacity)] [@media(pointer:fine)]:flex bg-right-bottom object-left-top"
+        ></div>
+      `,
+      'project-a/src/input.css': css`
+        @import 'tailwindcss';
+
+        .foo {
+          @apply !bg-[var(--my-color)];
+        }
+      `,
+    },
+  },
+  async ({ root, exec, fs, expect }) => {
+    let stdout = await exec('pnpm exec upgrade', {
+      cwd: path.join(root, 'project-a'),
+    })
+
+    expect(/Path .*? is not in cwd/.test(stdout)).toBe(false)
+
+    expect(await fs.dumpFiles('./project-a/src/**/*.{css,html}')).toMatchInlineSnapshot(`
+      "
+      --- ./project-a/src/index.html ---
+      <!-- Migrating 'ring', 'rounded' and 'outline-none' are unsafe in v4 -> v4 migrations -->
+      <div class="ring rounded outline"></div>
+
+      <!-- Variant order is also unsafe to change in v4 projects -->
+      <div class="file:hover:flex *:hover:flex"></div>
+      <div class="hover:file:flex hover:*:flex"></div>
+
+      <!-- These are safe to migrate: -->
+      <div
+        class="flex! bg-red-500/(--my-opacity) pointer-fine:flex bg-bottom-right object-top-left"
+      ></div>
+
+      --- ./project-a/src/input.css ---
+      @import 'tailwindcss';
+
+      .foo {
+        @apply bg-(--my-color)!;
+      }
+      "
+    `)
+  },
+)
+
+test(
+  'upgrades can run in a pnpm workspace root',
+  {
+    fs: {
+      'pnpm-workspace.yaml': yaml`
+        #
+        packages:
+          - .
+      `,
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^4"
+          },
+          "devDependencies": {
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      'src/index.html': html`
+        <!-- Migrating 'ring', 'rounded' and 'outline-none' are unsafe in v4 -> v4 migrations -->
+        <div class="ring rounded outline"></div>
+
+        <!-- Variant order is also unsafe to change in v4 projects -->
+        <div class="file:hover:flex *:hover:flex"></div>
+        <div class="hover:file:flex hover:*:flex"></div>
+
+        <!-- These are safe to migrate: -->
+        <div
+          class="!flex bg-red-500/[var(--my-opacity)] [@media(pointer:fine)]:flex bg-right-bottom object-left-top"
+        ></div>
+      `,
+      'src/input.css': css`
+        @import 'tailwindcss';
+
+        .foo {
+          @apply !bg-[var(--my-color)];
+        }
+      `,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    let stdout = await exec('pnpm exec upgrade')
+
+    expect(stdout).not.toContain(
+      'Running this command will add the dependency to the workspace root',
+    )
+
+    expect(await fs.dumpFiles('./src/**/*.{css,html}')).toMatchInlineSnapshot(`
+      "
+      --- ./src/index.html ---
+      <!-- Migrating 'ring', 'rounded' and 'outline-none' are unsafe in v4 -> v4 migrations -->
+      <div class="ring rounded outline"></div>
+
+      <!-- Variant order is also unsafe to change in v4 projects -->
+      <div class="file:hover:flex *:hover:flex"></div>
+      <div class="hover:file:flex hover:*:flex"></div>
+
+      <!-- These are safe to migrate: -->
+      <div
+        class="flex! bg-red-500/(--my-opacity) pointer-fine:flex bg-bottom-right object-top-left"
+      ></div>
+
+      --- ./src/input.css ---
+      @import 'tailwindcss';
+
+      .foo {
+        @apply bg-(--my-color)!;
+      }
+      "
+    `)
+  },
+)
+
+// https://github.com/tailwindlabs/tailwindcss/issues/20328
+test(
+  'ignored files should not be touched when upgrading from a nested directory',
+  {
+    fs: {
+      'pnpm-workspace.yaml': yaml`
+        #
+        packages:
+          - packages/*
+      `,
+      'package.json': json`
+        {
+          "name": "root",
+          "private": true
+        }
+      `,
+      'packages/css/package.json': json`
+        {
+          "name": "css-pkg",
+          "private": true,
+          "devDependencies": {
+            "tailwindcss": "^4",
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      'packages/css/src/input.css': css`
+        @import 'tailwindcss/utilities.css' layer(utilities) source(none);
+      `,
+      'packages/css/src/index.html': html`<div class="flex text-red-500">Hi</div>`,
+
+      // Ensure files/folders ignored by a `.gitignore` in the root take effect
+      // when executing the upgrade tool from a sub-package.
+      '.gitignore': txt`
+        node_modules/
+      `,
+    },
+  },
+  async ({ root, exec, fs, expect }) => {
+    await exec('git init', { cwd: root })
+
+    await exec('pnpm exec upgrade --force', {
+      cwd: path.join(root, 'packages/css'),
+    })
+
+    expect(await fs.dumpFiles('packages/css/node_modules/tailwindcss/utilities.css'))
+      .toMatchInlineSnapshot(`
+        "
+        --- packages/css/node_modules/tailwindcss/utilities.css ---
+        @tailwind utilities;
+        "
+    `)
+  },
+)
+
+test(
+  'upgrade <style> blocks carefully',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^4",
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      'src/index.vue': html`
+        <template>
+          <div class="!flex"></div>
+        </template>
+
+        <style>
+          @reference "./input.css";
+
+          .foo {
+            @apply !bg-red-500;
+          }
+
+          .bar {
+            /* Do not upgrade the key: */
+            flex-shrink: 0;
+          }
+        </style>
+      `,
+      'src/input.css': css`
+        @import 'tailwindcss';
+
+        .foo {
+          flex-shrink: 1;
+        }
+
+        .bar {
+          @apply !underline;
+        }
+      `,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm exec upgrade')
+
+    expect(await fs.dumpFiles('./src/**/*.{css,vue}')).toMatchInlineSnapshot(`
+      "
+      --- ./src/index.vue ---
+      <template>
+        <div class="flex!"></div>
+      </template>
+
+      <style>
+        @reference "./input.css";
+
+        .foo {
+          @apply !bg-red-500;
+        }
+
+        .bar {
+          /* Do not upgrade the key: */
+          flex-shrink: 0;
+        }
+      </style>
+
+      --- ./src/input.css ---
+      @import 'tailwindcss';
+
+      .foo {
+        flex-shrink: 1;
+      }
+
+      .bar {
+        @apply underline!;
+      }
+      "
+    `)
+  },
+)
+
+function withBOM(text: string): string {
+  return '\uFEFF' + text
+}
diff --git a/integrations/upgrade/js-config.test.ts b/integrations/upgrade/js-config.test.ts
index f2643143a..cab0d3d62 100644
--- a/integrations/upgrade/js-config.test.ts
+++ b/integrations/upgrade/js-config.test.ts
@@ -1,6 +1,6 @@
 import path from 'node:path'
 import { describe } from 'vitest'
-import { css, html, json, test, ts } from '../utils'
+import { css, html, json, test, ts, txt } from '../utils'
 
 test(
   `upgrade JS config files with flat theme values, darkMode, and content fields`,
@@ -30,13 +30,23 @@ test(
                 400: '#f87171',
                 500: 'red',
               },
+              superRed: '#ff0000',
               steel: 'rgb(70 130 180 / <alpha-value>)',
               smoke: 'rgba(245, 245, 245, var(--smoke-alpha, <alpha-value>))',
             },
+            ringColor: {
+              DEFAULT: '#c0ffee',
+            },
+            opacity: {
+              superOpaque: '0.95',
+            },
             fontSize: {
               xs: ['0.75rem', { lineHeight: '1rem' }],
               sm: ['0.875rem', { lineHeight: '1.5rem' }],
               base: ['1rem', { lineHeight: '2rem' }],
+              lg: ['1.125rem', '2.5rem'],
+              xl: ['1.5rem', '3rem', 'invalid'],
+              '2xl': ['2rem'],
             },
             width: {
               px: '1px',
@@ -137,12 +147,14 @@ test(
       'src/test.js': ts`
         export default {
           'shouldNotMigrate': !border.test + '',
+          'filter': 'drop-shadow(0 0 0.5rem #000)',
         }
       `,
       'src/index.html': html`
-       <div
+        <div
           class="[letter-spacing:theme(letterSpacing.superWide)] [line-height:theme(lineHeight.superLoose)]"
         ></div>
+        <div class="text-superRed/superOpaque leading-superLoose"></div>
       `,
       'node_modules/my-external-lib/src/template.html': html`
         <div class="text-red-500">
@@ -152,21 +164,22 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('src/**/*.{css,js,html}')).toMatchInlineSnapshot(`
       "
       --- src/index.html ---
       <div
-         class="[letter-spacing:var(--tracking-super-wide)] [line-height:var(--leading-super-loose)]"
-       ></div>
+        class="tracking-superWide leading-superLoose"
+      ></div>
+      <div class="text-superRed/superOpaque leading-superLoose"></div>
 
       --- src/input.css ---
       @import 'tailwindcss';
 
       @source '../node_modules/my-external-lib/**/*.{html}';
 
-      @variant dark (&:where(.dark, .dark *));
+      @custom-variant dark (&:where(.dark, .dark *));
 
       @theme {
         --shadow-*: initial;
@@ -177,9 +190,15 @@ test(
         --color-red-500: #ef4444;
         --color-red-600: #dc2626;
 
+        --color-superRed: #ff0000;
         --color-steel: rgb(70 130 180);
         --color-smoke: rgba(245, 245, 245, var(--smoke-alpha, 1));
 
+        --default-ring-color: #c0ffee;
+
+        --opacity-*: initial;
+        --opacity-superOpaque: 95%;
+
         --text-*: initial;
         --text-xs: 0.75rem;
         --text-xs--line-height: 1rem;
@@ -187,6 +206,11 @@ test(
         --text-sm--line-height: 1.5rem;
         --text-base: 1rem;
         --text-base--line-height: 2rem;
+        --text-lg: 1.125rem;
+        --text-lg--line-height: 2.5rem;
+        --text-xl: 1.5rem;
+        --text-xl--line-height: 3rem;
+        --text-2xl: 2rem;
 
         --width-*: initial;
         --width-0: 0%;
@@ -237,17 +261,18 @@ test(
         --width-225px: 225px;
 
         --font-sans: Inter, system-ui, sans-serif;
-        --font-display: Cabinet Grotesk, ui-sans-serif, system-ui, sans-serif,
-          'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+        --font-display:
+          Cabinet Grotesk, ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji',
+          'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
 
         --radius-4xl: 2rem;
 
         --animate-spin-clockwise: spin-clockwise 1s linear infinite;
         --animate-spin-counterclockwise: spin-counterclockwise 1s linear infinite;
 
-        --tracking-super-wide: 0.25em;
+        --tracking-superWide: 0.25em;
 
-        --leading-super-loose: 3;
+        --leading-superLoose: 3;
 
         @keyframes spin-clockwise {
           0% {
@@ -268,7 +293,7 @@ test(
       }
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -281,13 +306,14 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
       --- src/test.js ---
       export default {
         'shouldNotMigrate': !border.test + '',
+        'filter': 'drop-shadow(0 0 0.5rem #000)',
       }
       "
     `)
@@ -296,6 +322,105 @@ test(
   },
 )
 
+test(
+  'skips gitignored template files even when they are explicitly referenced in `content`',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^3",
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      '.gitignore': txt`
+        node_modules
+        src/ignored
+      `,
+      'tailwind.config.ts': ts`
+        import { type Config } from 'tailwindcss'
+
+        module.exports = {
+          content: [
+            './src/migrate-me.html',
+            './src/ignored/do-not-migrate-me.html',
+            './node_modules/my-external-lib/template.html',
+          ],
+          theme: {},
+          plugins: [],
+        } satisfies Config
+      `,
+      'src/input.css': css`
+        @tailwind base;
+        @tailwind components;
+        @tailwind utilities;
+      `,
+      'src/migrate-me.html': html`
+        <div class="order-[0]"></div>
+      `,
+      'src/ignored/do-not-migrate-me.html': html`
+        <div class="order-[0]"></div>
+      `,
+      'node_modules/my-external-lib/template.html': html`
+        <div
+          class="order-[0]"
+        ></div>
+      `,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm exec upgrade')
+
+    expect(
+      await fs.dumpFiles(
+        '{src/**/*.{css,html},node_modules/my-external-lib/template.html,.gitignore}',
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      --- .gitignore ---
+      node_modules
+      src/ignored
+
+      --- src/input.css ---
+      @import 'tailwindcss';
+
+      @source './ignored/do-not-migrate-me.html';
+      @source '../node_modules/my-external-lib/template.html';
+
+      /*
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
+        so we've added these compatibility styles to make sure everything still
+        looks the same as it did with Tailwind CSS v3.
+
+        If we ever want to remove these styles, we need to add an explicit border
+        color utility to any element that depends on these defaults.
+      */
+      @layer base {
+        *,
+        ::after,
+        ::before,
+        ::backdrop,
+        ::file-selector-button {
+          border-color: var(--color-gray-200, currentcolor);
+        }
+      }
+
+      --- src/migrate-me.html ---
+      <div class="order-0"></div>
+
+      --- node_modules/my-external-lib/template.html ---
+      <div
+        class="order-[0]"
+      ></div>
+
+      --- src/ignored/do-not-migrate-me.html ---
+      <div class="order-[0]"></div>
+      "
+    `)
+  },
+)
+
 test(
   'upgrades JS config files with plugins',
   {
@@ -315,6 +440,14 @@ test(
         import customPlugin from './custom-plugin'
 
         export default {
+          darkMode: [
+            'variant',
+            [
+              '@media not print { .dark & }',
+              '@media not eink { .dark & }',
+              '&:where(.dark, .dark *)',
+            ],
+          ],
           plugins: [
             typography,
             customPlugin({
@@ -351,7 +484,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('src/**/*.css')).toMatchInlineSnapshot(`
       "
@@ -376,8 +509,24 @@ test(
         is-arr-mixed: null, true, false, 1234567, 1.35, 'foo', 'bar', 'true';
       }
 
+      @custom-variant dark {
+        @media not print {
+          .dark & {
+            @slot;
+          }
+        }
+        @media not eink {
+          .dark & {
+            @slot;
+          }
+        }
+        &:where(.dark, .dark *) {
+          @slot;
+        }
+      }
+
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -390,7 +539,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
       "
@@ -437,7 +586,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('src/**/*.{css,ts}')).toMatchInlineSnapshot(`
       "
@@ -445,21 +594,21 @@ test(
       @import 'tailwindcss';
 
       @theme {
-        --color-gray-50: oklch(0.985 0 0);
-        --color-gray-100: oklch(0.97 0 0);
-        --color-gray-200: oklch(0.922 0 0);
-        --color-gray-300: oklch(0.87 0 0);
-        --color-gray-400: oklch(0.708 0 0);
-        --color-gray-500: oklch(0.556 0 0);
-        --color-gray-600: oklch(0.439 0 0);
-        --color-gray-700: oklch(0.371 0 0);
-        --color-gray-800: oklch(0.269 0 0);
-        --color-gray-900: oklch(0.205 0 0);
-        --color-gray-950: oklch(0.145 0 0);
+        --color-gray-50: oklch(98.5% 0 none);
+        --color-gray-100: oklch(97% 0 none);
+        --color-gray-200: oklch(92.2% 0 none);
+        --color-gray-300: oklch(87% 0 none);
+        --color-gray-400: oklch(70.8% 0 none);
+        --color-gray-500: oklch(55.6% 0 none);
+        --color-gray-600: oklch(43.9% 0 none);
+        --color-gray-700: oklch(37.1% 0 none);
+        --color-gray-800: oklch(26.9% 0 none);
+        --color-gray-900: oklch(20.5% 0 none);
+        --color-gray-950: oklch(14.5% 0 none);
       }
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -472,7 +621,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
       "
@@ -523,7 +672,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('src/**/*.css')).toMatchInlineSnapshot(`
       "
@@ -533,7 +682,7 @@ test(
       @config '../tailwind.config.ts';
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -546,7 +695,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
       "
@@ -601,7 +750,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('src/**/*.css')).toMatchInlineSnapshot(`
       "
@@ -611,7 +760,7 @@ test(
       @config '../tailwind.config.ts';
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -624,7 +773,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
       "
@@ -675,7 +824,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('src/**/*.css')).toMatchInlineSnapshot(`
       "
@@ -685,7 +834,7 @@ test(
       @config '../tailwind.config.ts';
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -698,7 +847,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
       "
@@ -785,7 +934,7 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade')
+    await exec('pnpm exec upgrade')
 
     expect(await fs.dumpFiles('project-{a,b}/**/*.{css,ts}')).toMatchInlineSnapshot(`
       "
@@ -797,7 +946,7 @@ test(
       }
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -810,7 +959,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
 
@@ -822,7 +971,7 @@ test(
       }
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -835,7 +984,7 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
       "
@@ -883,7 +1032,7 @@ test(
     },
   },
   async ({ root, exec, fs, expect }) => {
-    await exec('npx @tailwindcss/upgrade', {
+    await exec('pnpm exec upgrade', {
       cwd: path.join(root, 'frontend'),
     })
 
@@ -899,7 +1048,7 @@ test(
       }
 
       /*
-        The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
         so we've added these compatibility styles to make sure everything still
         looks the same as it did with Tailwind CSS v3.
 
@@ -912,7 +1061,253 @@ test(
         ::before,
         ::backdrop,
         ::file-selector-button {
-          border-color: var(--color-gray-200, currentColor);
+          border-color: var(--color-gray-200, currentcolor);
+        }
+      }
+      "
+    `)
+  },
+)
+
+test(
+  'migrate aria theme keys to custom variants',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^3",
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      'tailwind.config.ts': ts`
+        export default {
+          content: {
+            relative: true,
+            files: ['./src/**/*.html'],
+          },
+          theme: {
+            extend: {
+              aria: {
+                // Built-in (not really, but visible because of intellisense)
+                busy: 'busy="true"',
+
+                // Automatically handled by bare values
+                foo: 'foo="true"',
+
+                // Quotes are optional in CSS for these kinds of attribute
+                // selectors
+                bar: 'bar=true',
+
+                // Not automatically handled by bare values because names differ
+                baz: 'qux="true"',
+
+                // Completely custom
+                asc: 'sort="ascending"',
+                desc: 'sort="descending"',
+              },
+            },
+          },
+        }
+      `,
+      'src/input.css': css`
+        @tailwind base;
+        @tailwind components;
+        @tailwind utilities;
+      `,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm exec upgrade')
+
+    expect(await fs.dumpFiles('src/*.css')).toMatchInlineSnapshot(`
+      "
+      --- src/input.css ---
+      @import 'tailwindcss';
+
+      @custom-variant aria-baz (&[aria-qux="true"]);
+      @custom-variant aria-asc (&[aria-sort="ascending"]);
+      @custom-variant aria-desc (&[aria-sort="descending"]);
+
+      /*
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
+        so we've added these compatibility styles to make sure everything still
+        looks the same as it did with Tailwind CSS v3.
+
+        If we ever want to remove these styles, we need to add an explicit border
+        color utility to any element that depends on these defaults.
+      */
+      @layer base {
+        *,
+        ::after,
+        ::before,
+        ::backdrop,
+        ::file-selector-button {
+          border-color: var(--color-gray-200, currentcolor);
+        }
+      }
+      "
+    `)
+  },
+)
+
+test(
+  'migrate data theme keys to custom variants',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^3",
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      'tailwind.config.ts': ts`
+        export default {
+          content: {
+            relative: true,
+            files: ['./src/**/*.html'],
+          },
+          theme: {
+            extend: {
+              data: {
+                // Automatically handled by bare values
+                foo: 'foo',
+
+                // Not automatically handled by bare values because names differ
+                bar: 'baz',
+
+                // Custom
+                checked: 'ui~="checked"',
+              },
+            },
+          },
+        }
+      `,
+      'src/input.css': css`
+        @tailwind base;
+        @tailwind components;
+        @tailwind utilities;
+      `,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm exec upgrade')
+
+    expect(await fs.dumpFiles('src/*.css')).toMatchInlineSnapshot(`
+      "
+      --- src/input.css ---
+      @import 'tailwindcss';
+
+      @custom-variant data-bar (&[data-baz]);
+      @custom-variant data-checked (&[data-ui~="checked"]);
+
+      /*
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
+        so we've added these compatibility styles to make sure everything still
+        looks the same as it did with Tailwind CSS v3.
+
+        If we ever want to remove these styles, we need to add an explicit border
+        color utility to any element that depends on these defaults.
+      */
+      @layer base {
+        *,
+        ::after,
+        ::before,
+        ::backdrop,
+        ::file-selector-button {
+          border-color: var(--color-gray-200, currentcolor);
+        }
+      }
+      "
+    `)
+  },
+)
+
+test(
+  'migrate supports theme keys to custom variants',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^3",
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      'tailwind.config.ts': ts`
+        export default {
+          content: {
+            relative: true,
+            files: ['./src/**/*.html'],
+          },
+          theme: {
+            extend: {
+              supports: {
+                // Automatically handled by bare values (using CSS variable as the value)
+                foo: 'foo: var(--foo)', // parentheses are optional
+                bar: '(bar: var(--bar))',
+
+                // Not automatically handled by bare values because names differ
+                foo: 'bar: var(--foo)', // parentheses are optional
+                bar: '(qux: var(--bar))',
+
+                // Custom
+                grid: 'display: grid',
+              },
+            },
+          },
+        }
+      `,
+      'src/input.css': css`
+        @tailwind base;
+        @tailwind components;
+        @tailwind utilities;
+      `,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm exec upgrade')
+
+    expect(await fs.dumpFiles('src/*.css')).toMatchInlineSnapshot(`
+      "
+      --- src/input.css ---
+      @import 'tailwindcss';
+
+      @custom-variant supports-foo {
+        @supports (bar: var(--foo)) {
+          @slot;
+        }
+      }
+      @custom-variant supports-bar {
+        @supports ((qux: var(--bar))) {
+          @slot;
+        }
+      }
+      @custom-variant supports-grid {
+        @supports (display: grid) {
+          @slot;
+        }
+      }
+
+      /*
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
+        so we've added these compatibility styles to make sure everything still
+        looks the same as it did with Tailwind CSS v3.
+
+        If we ever want to remove these styles, we need to add an explicit border
+        color utility to any element that depends on these defaults.
+      */
+      @layer base {
+        *,
+        ::after,
+        ::before,
+        ::backdrop,
+        ::file-selector-button {
+          border-color: var(--color-gray-200, currentcolor);
         }
       }
       "
@@ -951,7 +1346,7 @@ describe('border compatibility', () => {
       },
     },
     async ({ exec, fs, expect }) => {
-      await exec('npx @tailwindcss/upgrade')
+      await exec('pnpm exec upgrade')
 
       expect(await fs.dumpFiles('src/**/*.css')).toMatchInlineSnapshot(`
         "
@@ -959,7 +1354,7 @@ describe('border compatibility', () => {
         @import 'tailwindcss';
 
         /*
-          The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+          The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
           so we've added these compatibility styles to make sure everything still
           looks the same as it did with Tailwind CSS v3.
 
@@ -972,7 +1367,7 @@ describe('border compatibility', () => {
           ::before,
           ::backdrop,
           ::file-selector-button {
-            border-color: var(--color-gray-200, currentColor);
+            border-color: var(--color-gray-200, currentcolor);
           }
         }
         "
@@ -1013,7 +1408,7 @@ describe('border compatibility', () => {
       },
     },
     async ({ exec, fs, expect }) => {
-      await exec('npx @tailwindcss/upgrade')
+      await exec('pnpm exec upgrade')
 
       expect(await fs.dumpFiles('src/**/*.css')).toMatchInlineSnapshot(`
         "
@@ -1021,7 +1416,7 @@ describe('border compatibility', () => {
         @import 'tailwindcss';
 
         /*
-          The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+          The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
           so we've added these compatibility styles to make sure everything still
           looks the same as it did with Tailwind CSS v3.
 
@@ -1034,7 +1429,7 @@ describe('border compatibility', () => {
           ::before,
           ::backdrop,
           ::file-selector-button {
-            border-color: oklch(0.623 0.214 259.815);
+            border-color: oklch(62.3% 0.214 259.815);
           }
         }
         "
@@ -1061,7 +1456,7 @@ describe('border compatibility', () => {
             theme: {
               extend: {
                 borderColor: ({ colors }) => ({
-                  DEFAULT: 'currentColor',
+                  DEFAULT: 'currentcolor',
                 }),
               },
             },
@@ -1075,7 +1470,7 @@ describe('border compatibility', () => {
       },
     },
     async ({ exec, fs, expect }) => {
-      await exec('npx @tailwindcss/upgrade')
+      await exec('pnpm exec upgrade')
 
       expect(await fs.dumpFiles('src/**/*.css')).toMatchInlineSnapshot(`
         "
@@ -1114,7 +1509,7 @@ describe('border compatibility', () => {
       },
     },
     async ({ exec, fs, expect }) => {
-      await exec('npx @tailwindcss/upgrade')
+      await exec('pnpm exec upgrade')
 
       expect(await fs.dumpFiles('src/**/*.css')).toMatchInlineSnapshot(`
         "
@@ -1125,7 +1520,7 @@ describe('border compatibility', () => {
         @import 'tailwindcss';
 
         /*
-          The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+          The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
           so we've added these compatibility styles to make sure everything still
           looks the same as it did with Tailwind CSS v3.
 
@@ -1138,7 +1533,7 @@ describe('border compatibility', () => {
           ::before,
           ::backdrop,
           ::file-selector-button {
-            border-color: var(--color-gray-200, currentColor);
+            border-color: var(--color-gray-200, currentcolor);
           }
         }
         "
@@ -1185,7 +1580,7 @@ describe('border compatibility', () => {
       },
     },
     async ({ exec, fs, expect }) => {
-      await exec('npx @tailwindcss/upgrade')
+      await exec('pnpm exec upgrade')
 
       expect(await fs.dumpFiles('src/**/*.css')).toMatchInlineSnapshot(`
         "
@@ -1194,7 +1589,7 @@ describe('border compatibility', () => {
         @import 'tailwindcss/preflight' layer(base);
 
         /*
-          The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+          The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
           so we've added these compatibility styles to make sure everything still
           looks the same as it did with Tailwind CSS v3.
 
@@ -1207,7 +1602,7 @@ describe('border compatibility', () => {
           ::before,
           ::backdrop,
           ::file-selector-button {
-            border-color: var(--color-gray-200, currentColor);
+            border-color: var(--color-gray-200, currentcolor);
           }
         }
 
@@ -1288,18 +1683,18 @@ describe('border compatibility', () => {
       },
     },
     async ({ exec, fs, expect }) => {
-      await exec('npx @tailwindcss/upgrade')
+      await exec('pnpm exec upgrade')
 
       expect(await fs.dumpFiles('src/**/*.{css,html}')).toMatchInlineSnapshot(`
         "
         --- src/index.html ---
         <div
-          class="[width:calc(var(--spacing)*2)]
-            [width:calc(var(--spacing)*4.5)]
-            [width:var(--spacing-5_5)]
-            [width:calc(var(--spacing)*13)]
-            [width:var(--spacing-100)]
-            [width:var(--spacing-miami)]"
+          class="w-2
+            w-4.5
+            w-5.5
+            w-13
+            w-100
+            w-miami"
         ></div>
 
         --- src/input.css ---
@@ -1312,7 +1707,7 @@ describe('border compatibility', () => {
         }
 
         /*
-          The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+          The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
           so we've added these compatibility styles to make sure everything still
           looks the same as it did with Tailwind CSS v3.
 
@@ -1325,15 +1720,15 @@ describe('border compatibility', () => {
           ::before,
           ::backdrop,
           ::file-selector-button {
-            border-color: var(--color-gray-200, currentColor);
+            border-color: var(--color-gray-200, currentcolor);
           }
         }
 
         .container {
-          width: calc(var(--spacing) * 2);
-          width: calc(var(--spacing) * 4.5);
+          width: --spacing(2);
+          width: --spacing(4.5);
           width: var(--spacing-5_5);
-          width: calc(var(--spacing) * 13);
+          width: --spacing(13);
           width: var(--spacing-100);
           width: var(--spacing-miami);
         }
@@ -1398,18 +1793,18 @@ describe('border compatibility', () => {
       },
     },
     async ({ exec, fs, expect }) => {
-      await exec('npx @tailwindcss/upgrade')
+      await exec('pnpm exec upgrade')
 
       expect(await fs.dumpFiles('src/**/*.{css,html}')).toMatchInlineSnapshot(`
         "
         --- src/index.html ---
         <div
-          class="[width:var(--spacing-2)]
-            [width:var(--spacing-4_5)]
-            [width:var(--spacing-5_5)]
-            [width:var(--spacing-13)]
-            [width:var(--spacing-100)]
-            [width:var(--spacing-miami)]"
+          class="w-2
+            w-4.5
+            w-5.5
+            w-13
+            w-100
+            w-miami"
         ></div>
 
         --- src/input.css ---
@@ -1426,7 +1821,7 @@ describe('border compatibility', () => {
         }
 
         /*
-          The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+          The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
           so we've added these compatibility styles to make sure everything still
           looks the same as it did with Tailwind CSS v3.
 
@@ -1439,7 +1834,7 @@ describe('border compatibility', () => {
           ::before,
           ::backdrop,
           ::file-selector-button {
-            border-color: var(--color-gray-200, currentColor);
+            border-color: var(--color-gray-200, currentcolor);
           }
         }
 
@@ -1500,7 +1895,7 @@ describe('border compatibility', () => {
       },
     },
     async ({ exec, fs, expect }) => {
-      await exec('npx @tailwindcss/upgrade')
+      await exec('pnpm exec upgrade')
 
       expect(await fs.dumpFiles('src/**/*.{css,html}')).toMatchInlineSnapshot(`
         "
@@ -1513,7 +1908,7 @@ describe('border compatibility', () => {
         @utility container {
           margin-inline: auto;
           padding-inline: 2rem;
-          @media (width >= theme(--breakpoint-sm)) {
+          @media (width >= --theme(--breakpoint-sm)) {
             max-width: none;
           }
           @media (width >= 48rem) {
@@ -1529,7 +1924,7 @@ describe('border compatibility', () => {
         }
 
         /*
-          The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+          The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
           so we've added these compatibility styles to make sure everything still
           looks the same as it did with Tailwind CSS v3.
 
@@ -1542,7 +1937,7 @@ describe('border compatibility', () => {
           ::before,
           ::backdrop,
           ::file-selector-button {
-            border-color: var(--color-gray-200, currentColor);
+            border-color: var(--color-gray-200, currentcolor);
           }
         }
         "
@@ -1550,3 +1945,243 @@ describe('border compatibility', () => {
     },
   )
 })
+
+test(
+  `future and experimental keys are supported`,
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^3",
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      'tailwind.config.ts': ts`
+        import { type Config } from 'tailwindcss'
+        import defaultTheme from 'tailwindcss/defaultTheme'
+
+        module.exports = {
+          darkMode: 'selector',
+          content: ['./src/**/*.{html,js}'],
+          future: {
+            hoverOnlyWhenSupported: true,
+            respectDefaultRingColorOpacity: true,
+            disableColorOpacityUtilitiesByDefault: true,
+            relativeContentPathsByDefault: true,
+          },
+          experimental: {
+            generalizedModifiers: true,
+          },
+          theme: {
+            colors: {
+              red: {
+                400: '#f87171',
+                500: 'red',
+              },
+            },
+          },
+          plugins: [],
+        } satisfies Config
+      `,
+      'src/input.css': css`
+        @tailwind base;
+        @tailwind components;
+        @tailwind utilities;
+      `,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm exec upgrade')
+
+    expect(await fs.dumpFiles('src/**/*.css')).toMatchInlineSnapshot(`
+      "
+      --- src/input.css ---
+      @import 'tailwindcss';
+
+      @custom-variant dark (&:where(.dark, .dark *));
+
+      @theme {
+        --color-*: initial;
+        --color-red-400: #f87171;
+        --color-red-500: red;
+      }
+
+      /*
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
+        so we've added these compatibility styles to make sure everything still
+        looks the same as it did with Tailwind CSS v3.
+
+        If we ever want to remove these styles, we need to add an explicit border
+        color utility to any element that depends on these defaults.
+      */
+      @layer base {
+        *,
+        ::after,
+        ::before,
+        ::backdrop,
+        ::file-selector-button {
+          border-color: var(--color-gray-200, currentcolor);
+        }
+      }
+      "
+    `)
+
+    expect((await fs.dumpFiles('tailwind.config.ts')).trim()).toBe('')
+  },
+)
+
+test(
+  `unknown future keys dont migrate the config`,
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^3",
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      'tailwind.config.ts': ts`
+        import { type Config } from 'tailwindcss'
+        import defaultTheme from 'tailwindcss/defaultTheme'
+
+        module.exports = {
+          darkMode: 'selector',
+          content: ['./src/**/*.{html,js}'],
+          future: {
+            something: true,
+          },
+        } satisfies Config
+      `,
+      'src/input.css': css`
+        @tailwind base;
+        @tailwind components;
+        @tailwind utilities;
+      `,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm exec upgrade')
+
+    expect(await fs.dumpFiles('src/**/*.css')).toMatchInlineSnapshot(`
+      "
+      --- src/input.css ---
+      @import 'tailwindcss';
+
+      @config '../tailwind.config.ts';
+
+      /*
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
+        so we've added these compatibility styles to make sure everything still
+        looks the same as it did with Tailwind CSS v3.
+
+        If we ever want to remove these styles, we need to add an explicit border
+        color utility to any element that depends on these defaults.
+      */
+      @layer base {
+        *,
+        ::after,
+        ::before,
+        ::backdrop,
+        ::file-selector-button {
+          border-color: var(--color-gray-200, currentcolor);
+        }
+      }
+      "
+    `)
+
+    expect((await fs.dumpFiles('tailwind.config.ts')).trim()).toMatchInlineSnapshot(`
+      "--- tailwind.config.ts ---
+      import { type Config } from 'tailwindcss'
+      import defaultTheme from 'tailwindcss/defaultTheme'
+
+      module.exports = {
+        darkMode: 'selector',
+        content: ['./src/**/*.{html,js}'],
+        future: {
+          something: true,
+        },
+      } satisfies Config"
+    `)
+  },
+)
+
+test(
+  `unknown experimental keys dont migrate the config`,
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^3",
+            "@tailwindcss/upgrade": "workspace:^"
+          }
+        }
+      `,
+      'tailwind.config.ts': ts`
+        import { type Config } from 'tailwindcss'
+        import defaultTheme from 'tailwindcss/defaultTheme'
+
+        module.exports = {
+          darkMode: 'selector',
+          content: ['./src/**/*.{html,js}'],
+          experimental: {
+            something: true,
+          },
+        } satisfies Config
+      `,
+      'src/input.css': css`
+        @tailwind base;
+        @tailwind components;
+        @tailwind utilities;
+      `,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm exec upgrade')
+
+    expect(await fs.dumpFiles('src/**/*.css')).toMatchInlineSnapshot(`
+      "
+      --- src/input.css ---
+      @import 'tailwindcss';
+
+      @config '../tailwind.config.ts';
+
+      /*
+        The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
+        so we've added these compatibility styles to make sure everything still
+        looks the same as it did with Tailwind CSS v3.
+
+        If we ever want to remove these styles, we need to add an explicit border
+        color utility to any element that depends on these defaults.
+      */
+      @layer base {
+        *,
+        ::after,
+        ::before,
+        ::backdrop,
+        ::file-selector-button {
+          border-color: var(--color-gray-200, currentcolor);
+        }
+      }
+      "
+    `)
+
+    expect((await fs.dumpFiles('tailwind.config.ts')).trim()).toMatchInlineSnapshot(`
+      "--- tailwind.config.ts ---
+      import { type Config } from 'tailwindcss'
+      import defaultTheme from 'tailwindcss/defaultTheme'
+
+      module.exports = {
+        darkMode: 'selector',
+        content: ['./src/**/*.{html,js}'],
+        experimental: {
+          something: true,
+        },
+      } satisfies Config"
+    `)
+  },
+)
diff --git a/integrations/upgrade/upgrade-errors.test.ts b/integrations/upgrade/upgrade-errors.test.ts
new file mode 100644
index 000000000..fdc60828e
--- /dev/null
+++ b/integrations/upgrade/upgrade-errors.test.ts
@@ -0,0 +1,254 @@
+import { stripVTControlCharacters } from 'node:util'
+import { css, html, js, json, test } from '../utils'
+
+test(
+  'upgrades half-upgraded v3 project to v4 (pnpm)',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^3",
+            "@tailwindcss/upgrade": "workspace:^"
+          },
+          "devDependencies": {
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'tailwind.config.js': js`
+        /** @type {import('tailwindcss').Config} */
+        module.exports = {
+          content: ['./src/**/*.{html,js}'],
+        }
+      `,
+      'src/index.html': html`
+        <div class="!flex">Hello World</div>
+      `,
+      'src/input.css': css`
+        @tailwind base;
+        @tailwind components;
+        @tailwind utilities;
+      `,
+    },
+    retry: 0,
+  },
+  async ({ exec, expect }) => {
+    // Ensure we are in a git repo
+    await exec('git init')
+    await exec('git add --all')
+    await exec('git commit -m "before migration"')
+
+    // Fully upgrade to v4
+    await exec('pnpm exec upgrade')
+
+    // Undo all changes to the current repo. This will bring the repo back to a
+    // v3 state, but the `node_modules` will now have v4 installed.
+    await exec('git reset --hard HEAD')
+
+    // Re-running the upgrade should result in an error
+    return expect(() => {
+      return exec('pnpm exec upgrade', {}, { ignoreStdErr: true }).catch((e) => {
+        // Replacing the current version with a hardcoded `v4` to make it stable
+        // when we release new minor/patch versions.
+        return Promise.reject(
+          stripVTControlCharacters(e.message.replace(/\d+\.\d+\.\d+/g, '4.0.0')),
+        )
+      })
+    }).rejects.toThrowErrorMatchingInlineSnapshot(`
+      "Command failed: pnpm exec upgrade
+      ≈ tailwindcss v4.0.0
+
+      │ ↳ Upgrading from Tailwind CSS \`v4.0.0\` 
+
+      │ ↳ Version mismatch 
+      │    
+      │   \`\`\`diff 
+      │   - "tailwindcss": "^3" (expected version in \`package.json\`) 
+      │   + "tailwindcss": "4.0.0" (installed version in \`node_modules\`) 
+      │   \`\`\` 
+      │    
+      │   Make sure to run \`pnpm install\` and try again. 
+
+      "
+    `)
+  },
+)
+
+test(
+  'upgrades half-upgraded v3 project to v4 (bun)',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^3",
+            "@tailwindcss/upgrade": "workspace:^"
+          },
+          "devDependencies": {
+            "@tailwindcss/cli": "workspace:^",
+            "bun": "^1.0.0"
+          }
+        }
+      `,
+      'tailwind.config.js': js`
+        /** @type {import('tailwindcss').Config} */
+        module.exports = {
+          content: ['./src/**/*.{html,js}'],
+        }
+      `,
+      'src/index.html': html`
+        <div class="!flex">Hello World</div>
+      `,
+      'src/input.css': css`
+        @tailwind base;
+        @tailwind components;
+        @tailwind utilities;
+      `,
+    },
+    retry: 0,
+  },
+  async ({ exec, expect }) => {
+    // Use `bun` to install dependencies
+    await exec('rm ./pnpm-lock.yaml')
+    try {
+      await exec('npx bun install', {}, { ignoreStdErr: true })
+    } catch (e) {
+      // When preparing for a release, the version in `package.json` will point
+      // to a non-existent version because it's not published yet.
+      // TODO: Find a better approach to handle this and actually test it even
+      // on release branches. Note: the pnpm version _does_ work because of
+      // overrides in the package.json file.
+      if (`${e}`.includes('No version matching')) return
+      throw e
+    }
+
+    // Ensure we are in a git repo
+    await exec('git init')
+    await exec('git add --all')
+    await exec('git commit -m "before migration"')
+
+    // Fully upgrade to v4
+    await exec('npx @tailwindcss/upgrade')
+
+    // Undo all changes to the current repo. This will bring the repo back to a
+    // v3 state, but the `node_modules` will now have v4 installed.
+    await exec('git reset --hard HEAD')
+
+    // Re-running the upgrade should result in an error
+    return expect(() => {
+      return exec('npx @tailwindcss/upgrade', {}, { ignoreStdErr: true }).catch((e) => {
+        // Replacing the current version with a hardcoded `v4` to make it stable
+        // when we release new minor/patch versions.
+        return Promise.reject(
+          stripVTControlCharacters(e.message.replace(/\d+\.\d+\.\d+/g, '4.0.0')),
+        )
+      })
+    }).rejects.toThrowErrorMatchingInlineSnapshot(`
+      "Command failed: npx @tailwindcss/upgrade
+      ≈ tailwindcss v4.0.0
+
+      │ ↳ Upgrading from Tailwind CSS \`v4.0.0\` 
+
+      │ ↳ Version mismatch 
+      │    
+      │   \`\`\`diff 
+      │   - "tailwindcss": "^3" (expected version in \`package.json\`) 
+      │   + "tailwindcss": "4.0.0" (installed version in \`node_modules\`) 
+      │   \`\`\` 
+      │    
+      │   Make sure to run \`bun install\` and try again. 
+
+      "
+    `)
+  },
+)
+
+test(
+  'upgrades half-upgraded v3 project to v4 (npm)',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "dependencies": {
+            "tailwindcss": "^3",
+            "@tailwindcss/upgrade": "workspace:^"
+          },
+          "devDependencies": {
+            "@tailwindcss/cli": "workspace:^"
+          }
+        }
+      `,
+      'tailwind.config.js': js`
+        /** @type {import('tailwindcss').Config} */
+        module.exports = {
+          content: ['./src/**/*.{html,js}'],
+        }
+      `,
+      'src/index.html': html`
+        <div class="!flex">Hello World</div>
+      `,
+      'src/input.css': css`
+        @tailwind base;
+        @tailwind components;
+        @tailwind utilities;
+      `,
+    },
+    retry: 0,
+  },
+  async ({ exec, expect }) => {
+    // Use `npm` to install dependencies
+    await exec('rm ./pnpm-lock.yaml')
+    await exec('rm -rf ./node_modules')
+    try {
+      await exec('npm install', {}, { ignoreStdErr: true })
+    } catch (e) {
+      // When preparing for a release, the version in `package.json` will point
+      // to a non-existent version because it's not published yet.
+      // TODO: Find a better approach to handle this and actually test it even
+      // on release branches. Note: the pnpm version _does_ work because of
+      // overrides in the package.json file.
+      if (`${e}`.includes('npm error code ETARGET')) return
+      throw e
+    }
+
+    // Ensure we are in a git repo
+    await exec('git init')
+    await exec('git add --all')
+    await exec('git commit -m "before migration"')
+
+    // Fully upgrade to v4
+    await exec('npx @tailwindcss/upgrade')
+
+    // Undo all changes to the current repo. This will bring the repo back to a
+    // v3 state, but the `node_modules` will now have v4 installed.
+    await exec('git reset --hard HEAD')
+
+    // Re-running the upgrade should result in an error
+    return expect(() => {
+      return exec('npx @tailwindcss/upgrade', {}, { ignoreStdErr: true }).catch((e) => {
+        // Replacing the current version with a hardcoded `v4` to make it stable
+        // when we release new minor/patch versions.
+        return Promise.reject(
+          stripVTControlCharacters(e.message.replace(/\d+\.\d+\.\d+/g, '4.0.0')),
+        )
+      })
+    }).rejects.toThrowErrorMatchingInlineSnapshot(`
+      "Command failed: npx @tailwindcss/upgrade
+      ≈ tailwindcss v4.0.0
+
+      │ ↳ Upgrading from Tailwind CSS \`v4.0.0\` 
+
+      │ ↳ Version mismatch 
+      │    
+      │   \`\`\`diff 
+      │   - "tailwindcss": "^3" (expected version in \`package.json\`) 
+      │   + "tailwindcss": "4.0.0" (installed version in \`node_modules\`) 
+      │   \`\`\` 
+      │    
+      │   Make sure to run \`npm install\` and try again. 
+
+      "
+    `)
+  },
+)
diff --git a/integrations/utils.ts b/integrations/utils.ts
index 8f916a3d0..9863918d1 100644
--- a/integrations/utils.ts
+++ b/integrations/utils.ts
@@ -1,19 +1,28 @@
 import dedent from 'dedent'
 import fastGlob from 'fast-glob'
-import { exec, spawn } from 'node:child_process'
+import { exec, execFile, spawn, type ChildProcess } from 'node:child_process'
 import fs from 'node:fs/promises'
+import { createServer } from 'node:net'
 import { platform, tmpdir } from 'node:os'
 import path from 'node:path'
-import { stripVTControlCharacters } from 'node:util'
+import { promisify, stripVTControlCharacters } from 'node:util'
+import { RawSourceMap, SourceMapConsumer } from 'source-map-js'
 import { test as defaultTest, type ExpectStatic } from 'vitest'
+import * as Yaml from 'yaml'
+import { createLineTable } from '../packages/tailwindcss/src/source-maps/line-table'
+import { escape } from '../packages/tailwindcss/src/utils/escape'
 
 const REPO_ROOT = path.join(__dirname, '..')
+const ROOT_PNPM_WORKSPACE = Yaml.parse(
+  await fs.readFile(path.join(REPO_ROOT, 'pnpm-workspace.yaml'), 'utf8'),
+)
 const PUBLIC_PACKAGES = (await fs.readdir(path.join(REPO_ROOT, 'dist'))).map((name) =>
   name.replace('tailwindcss-', '@tailwindcss/').replace('.tgz', ''),
 )
 
 interface SpawnedProcess {
-  dispose: () => void
+  dispose: () => Promise<void>
+  flush: () => void
   onStdout: (predicate: (message: string) => boolean) => Promise<void>
   onStderr: (predicate: (message: string) => boolean) => Promise<void>
 }
@@ -25,29 +34,37 @@ interface ChildProcessOptions {
 
 interface ExecOptions {
   ignoreStdErr?: boolean
+  stdin?: string
 }
 
 interface TestConfig {
   fs: {
     [filePath: string]: string | Uint8Array
   }
+
+  timeout?: number
+  installDependencies?: boolean
+  retry?: number
 }
 interface TestContext {
   root: string
   expect: ExpectStatic
   exec(command: string, options?: ChildProcessOptions, execOptions?: ExecOptions): Promise<string>
   spawn(command: string, options?: ChildProcessOptions): Promise<SpawnedProcess>
+  parseSourceMap(opts: string | SourceMapOptions): SourceMap
   fs: {
-    write(filePath: string, content: string): Promise<void>
+    write(filePath: string, content: string, encoding?: BufferEncoding): Promise<void>
+    symlink(dst: string, src: string): Promise<void>
     create(filePaths: string[]): Promise<void>
     read(filePath: string): Promise<string>
+    delete(filePath: string): Promise<void>
     glob(pattern: string): Promise<[string, string][]>
     dumpFiles(pattern: string): Promise<string>
     expectFileToContain(
       filePath: string,
       contents: string | RegExp | (string | RegExp)[],
     ): Promise<void>
-    expectFileNotToContain(filePath: string, contents: string | string[]): Promise<void>
+    expectFileNotToContain(filePath: string, contents: string[]): Promise<void>
   }
 }
 type TestCallback = (context: TestContext) => Promise<void> | void
@@ -55,11 +72,14 @@ interface TestFlags {
   only?: boolean
   skip?: boolean
   debug?: boolean
+  concurrent?: boolean
 }
 
 type SpawnActor = { predicate: (message: string) => boolean; resolve: () => void }
 
-const IS_WINDOWS = platform() === 'win32'
+export const IS_WINDOWS = platform() === 'win32'
+
+const execFileAsync = promisify(execFile)
 
 const TEST_TIMEOUT = IS_WINDOWS ? 120000 : 60000
 const ASSERTION_TIMEOUT = IS_WINDOWS ? 10000 : 5000
@@ -73,16 +93,16 @@ export function test(
   name: string,
   config: TestConfig,
   testCallback: TestCallback,
-  { only = false, skip = false, debug = false }: TestFlags = {},
+  { only = false, skip = false, debug = false, concurrent = false }: TestFlags = {},
 ) {
   return defaultTest(
     name,
     {
-      timeout: TEST_TIMEOUT,
-      retry: process.env.CI ? 2 : 0,
+      timeout: config.timeout ?? TEST_TIMEOUT,
+      retry: config.retry ?? (process.env.CI ? 2 : 0),
       only: only || (!process.env.CI && debug),
       skip,
-      concurrent: true,
+      concurrent,
     },
     async (options) => {
       let rootDir = debug ? path.join(REPO_ROOT, '.debug') : TMP_ROOT
@@ -99,12 +119,46 @@ export function test(
       let context = {
         root,
         expect: options.expect,
+        parseSourceMap,
         async exec(
           command: string,
           childProcessOptions: ChildProcessOptions = {},
           execOptions: ExecOptions = {},
         ) {
           let cwd = childProcessOptions.cwd ?? root
+          let originalCommand = command
+
+          // Avoid `pnpm exec upgrade` on Windows because the upgrader runs
+          // `pnpm add`, which rewrites Windows `.cmd` shims while the current
+          // shim is still executing.
+          //
+          // Pretty sure this is a pnpm v11 bug on Windows.
+          if (IS_WINDOWS && command.includes('pnpm exec upgrade')) {
+            for (let base = cwd; ; base = path.dirname(base)) {
+              let upgradeBin = path.join(
+                base,
+                'node_modules',
+                '@tailwindcss',
+                'upgrade',
+                'dist',
+                'index.mjs',
+              )
+
+              try {
+                await fs.access(upgradeBin)
+                command = command.replace('pnpm exec upgrade', `node "${upgradeBin}"`)
+                break
+              } catch (error: any) {
+                if (error?.code !== 'ENOENT') throw error
+              }
+
+              let parent = path.dirname(base)
+              if (parent === base) {
+                throw new Error(`Unable to resolve @tailwindcss/upgrade from ${cwd}`)
+              }
+            }
+          }
+
           if (debug && cwd !== root) {
             let relative = path.relative(root, cwd)
             if (relative[0] !== '.') relative = `./${relative}`
@@ -112,15 +166,23 @@ export function test(
           }
           if (debug) console.log(`> ${command}`)
           return new Promise((resolve, reject) => {
-            exec(
+            let child = exec(
               command,
               {
                 cwd,
                 ...childProcessOptions,
-                env: childProcessOptions.env,
+                env: {
+                  ...process.env,
+                  ...childProcessOptions.env,
+                },
               },
               (error, stdout, stderr) => {
                 if (error) {
+                  if (command !== originalCommand) {
+                    error.message = error.message.replace(command, originalCommand)
+                    let mappedError = error as any
+                    mappedError.cmd = originalCommand
+                  }
                   if (execOptions.ignoreStdErr !== true) console.error(stderr)
                   if (only || debug) {
                     console.error(stdout)
@@ -134,6 +196,10 @@ export function test(
                 }
               },
             )
+            if (execOptions.stdin) {
+              child.stdin?.write(execOptions.stdin)
+              child.stdin?.end()
+            }
           })
         },
         async spawn(command: string, childProcessOptions: ChildProcessOptions = {}) {
@@ -153,6 +219,7 @@ export function test(
           if (debug) console.log(`>& ${command}`)
           let child = spawn(command, {
             cwd,
+            detached: !IS_WINDOWS,
             shell: true,
             ...childProcessOptions,
             env: {
@@ -161,22 +228,26 @@ export function test(
             },
           })
 
-          function dispose() {
-            if (!child.kill()) {
-              child.kill('SIGKILL')
-            }
+          let disposed = false
 
-            let timer = setTimeout(
-              () =>
-                rejectDisposal?.(new Error(`spawned process (${command}) did not exit in time`)),
-              ASSERTION_TIMEOUT,
+          async function dispose() {
+            if (disposed) return disposePromise
+            disposed = true
+
+            await killProcessTree(child)
+
+            let timer = setTimeout(() => {
+              forceKillProcessTree(child)
+              rejectDisposal?.(new Error(`spawned process (${command}) did not exit in time`))
+            }, ASSERTION_TIMEOUT)
+            disposePromise.then(
+              () => clearTimeout(timer),
+              () => clearTimeout(timer),
             )
-            disposePromise.finally(() => {
-              clearTimeout(timer)
-            })
             return disposePromise
           }
           disposables.push(dispose)
+
           function onExit() {
             resolveDisposal?.()
           }
@@ -245,6 +316,13 @@ export function test(
 
           return {
             dispose,
+            flush() {
+              stdoutActors.splice(0)
+              stderrActors.splice(0)
+
+              stdoutMessages.splice(0)
+              stderrMessages.splice(0)
+            },
             onStdout(predicate: (message: string) => boolean) {
               return new Promise<void>((resolve) => {
                 stdoutActors.push({ predicate, resolve })
@@ -260,7 +338,7 @@ export function test(
           }
         },
         fs: {
-          async write(filename: string, content: string | Uint8Array): Promise<void> {
+          async write(filename, content, encoding = 'utf8') {
             let full = path.join(root, filename)
             let dir = path.dirname(full)
             await fs.mkdir(dir, { recursive: true })
@@ -271,6 +349,8 @@ export function test(
 
             if (filename.endsWith('package.json')) {
               content = await overwriteVersionsInPackageJson(content)
+            } else if (filename.endsWith('pnpm-workspace.yaml')) {
+              content = overwriteVersionsInPnpmWorkspace(content)
             }
 
             // Ensure that files written on Windows use \r\n line ending
@@ -278,10 +358,22 @@ export function test(
               content = content.replace(/\n/g, '\r\n')
             }
 
-            await fs.writeFile(full, content, 'utf-8')
+            await fs.writeFile(full, content, encoding)
           },
 
-          async create(filenames: string[]): Promise<void> {
+          async symlink(target, src) {
+            let targetAbsolute = path.join(root, target)
+            let targetParent = path.dirname(targetAbsolute)
+            await fs.mkdir(targetParent, { recursive: true })
+
+            let srcAbsolute = path.join(root, src)
+            let srcParent = path.dirname(srcAbsolute)
+            await fs.mkdir(srcParent, { recursive: true })
+
+            await fs.symlink(targetAbsolute, srcAbsolute)
+          },
+
+          async create(filenames) {
             for (let filename of filenames) {
               let full = path.join(root, filename)
 
@@ -291,7 +383,11 @@ export function test(
             }
           },
 
-          async read(filePath: string) {
+          async delete(filename) {
+            await fs.unlink(path.join(root, filename))
+          },
+
+          async read(filePath) {
             let content = await fs.readFile(path.resolve(root, filePath), 'utf8')
 
             // Ensure that files read on Windows have \r\n line endings removed
@@ -301,7 +397,7 @@ export function test(
 
             return content
           },
-          async glob(pattern: string) {
+          async glob(pattern) {
             let files = await fastGlob(pattern, { cwd: root })
             return Promise.all(
               files.map(async (file) => {
@@ -309,12 +405,12 @@ export function test(
                 return [
                   file,
                   // Drop license comment
-                  content.replace(/[\s\n]*\/\*! tailwindcss .*? \*\/[\s\n]*/g, ''),
+                  content.replace(/[\s\n]*\/\*![\s\S]*?\*\/[\s\n]*/g, ''),
                 ]
               }),
             )
           },
-          async dumpFiles(pattern: string) {
+          async dumpFiles(pattern) {
             let files = await context.fs.glob(pattern)
             return `\n${files
               .slice()
@@ -373,18 +469,45 @@ export function test(
         node_modules/
       `
 
+      // Disable Git's automatic line ending conversion in these throwaway test
+      // repositories. Tools like pnpm write files (e.g. `pnpm-lock.yaml`) with
+      // LF endings, which on Windows (where `core.autocrlf=true` is common)
+      // makes Git emit noisy "LF will be replaced by CRLF" warnings when it
+      // touches those files.
+      config.fs['.gitattributes'] ??= txt`
+        * -text
+      `
+
+      // Ensure there is always a root `pnpm-workspace.yaml` so that transitive
+      // dependency overrides (and the build allow list) are injected into it.
+      // As of pnpm v10, these can no longer live in the `pnpm.overrides` field
+      // of `package.json`.
+      config.fs['pnpm-workspace.yaml'] ??= ''
+
       for (let [filename, content] of Object.entries(config.fs)) {
-        await context.fs.write(filename, content)
+        if (content.toString().startsWith('symlink:')) {
+          // The symlink path is relative to the target destination's path
+          let target = path.join(
+            filename,
+            content.toString().slice('symlink:'.length), // Relative path
+          )
+
+          await context.fs.symlink(target, filename)
+        } else {
+          await context.fs.write(filename, content)
+        }
       }
 
+      let shouldInstallDependencies = config.installDependencies ?? true
+
       try {
-        // In debug mode, the directory is going to be inside the pnpm workspace
-        // of the tailwindcss package. This means that `pnpm install` will run
-        // pnpm install on the workspace instead (expect if the root dir defines
-        // a separate workspace). We work around this by using the
-        // `--ignore-workspace` flag.
-        let ignoreWorkspace = debug && !config.fs['pnpm-workspace.yaml']
-        await context.exec(`pnpm install${ignoreWorkspace ? ' --ignore-workspace' : ''}`)
+        // Every test project gets its own root `pnpm-workspace.yaml` (see
+        // above). This makes the test directory its own workspace root, so even
+        // in debug mode — where the directory lives inside this repository's
+        // pnpm workspace — `pnpm install` won't attach to the parent workspace.
+        if (shouldInstallDependencies) {
+          await context.exec(`pnpm install`)
+        }
       } catch (error: any) {
         console.error(error)
         console.error(error.stdout?.toString())
@@ -395,11 +518,18 @@ export function test(
       let disposables: (() => Promise<void>)[] = []
 
       async function dispose() {
-        await Promise.all(disposables.map((dispose) => dispose()))
+        let results = await Promise.allSettled(disposables.map((dispose) => dispose()))
 
         if (!debug) {
           await gracefullyRemove(root)
         }
+
+        let errors = results.flatMap((result) =>
+          result.status === 'rejected' ? [result.reason] : [],
+        )
+        if (errors.length > 0) {
+          throw new AggregateError(errors, 'Failed to clean up spawned processes')
+        }
       }
 
       options.onTestFinished(dispose)
@@ -409,7 +539,7 @@ export function test(
         try {
           await context.exec('git init', { cwd: root })
           await context.exec('git add --all', { cwd: root })
-          await context.exec('git commit -m "before migration"', { cwd: root })
+          await context.exec('git commit -m "before migration" --allow-empty', { cwd: root })
         } catch (error: any) {
           console.error(error)
           console.error(error.stdout?.toString())
@@ -428,6 +558,9 @@ test.only = (name: string, config: TestConfig, testCallback: TestCallback) => {
 test.skip = (name: string, config: TestConfig, testCallback: TestCallback) => {
   return test(name, config, testCallback, { skip: true })
 }
+test.concurrent = (name: string, config: TestConfig, testCallback: TestCallback) => {
+  return test(name, config, testCallback, { concurrent: true })
+}
 test.debug = (name: string, config: TestConfig, testCallback: TestCallback) => {
   return test(name, config, testCallback, { debug: true })
 }
@@ -451,27 +584,43 @@ async function overwriteVersionsInPackageJson(content: string): Promise<string>
     }
   }
 
+  return JSON.stringify(json, null, 2)
+}
+
+function overwriteVersionsInPnpmWorkspace(content: string): string {
+  let workspace = content.trim() === '' ? {} : Yaml.parse(content)
+
+  // Inherit information from the root workspace
+  workspace.allowBuilds = {
+    ...ROOT_PNPM_WORKSPACE.allowBuilds,
+    ...workspace.allowBuilds,
+  }
+
   // Inject transitive dependency overwrite. This is necessary because
   // @tailwindcss/vite internally depends on a specific version of
   // @tailwindcss/oxide and we instead want to resolve it to the locally built
   // version.
-  json.pnpm ||= {}
-  json.pnpm.overrides ||= {}
+  //
+  // As of pnpm v10, the `pnpm.overrides` field in `package.json` is no longer
+  // read. Overrides have to be defined in `pnpm-workspace.yaml` instead.
+  workspace.overrides ||= {}
   for (let pkg of PUBLIC_PACKAGES) {
     if (pkg === 'tailwindcss') {
       // We want to be explicit about the `tailwindcss` package so our tests can
       // also import v3 without conflicting v4 tarballs.
-      json.pnpm.overrides['@tailwindcss/node>tailwindcss'] = resolveVersion(pkg)
-      json.pnpm.overrides['@tailwindcss/upgrade>tailwindcss'] = resolveVersion(pkg)
-      json.pnpm.overrides['@tailwindcss/cli>tailwindcss'] = resolveVersion(pkg)
-      json.pnpm.overrides['@tailwindcss/postcss>tailwindcss'] = resolveVersion(pkg)
-      json.pnpm.overrides['@tailwindcss/vite>tailwindcss'] = resolveVersion(pkg)
+      workspace.overrides['@tailwindcss/node>tailwindcss'] = resolveVersion(pkg)
+      workspace.overrides['@tailwindcss/upgrade>tailwindcss'] = resolveVersion(pkg)
+      workspace.overrides['@tailwindcss/cli>tailwindcss'] = resolveVersion(pkg)
+      workspace.overrides['@tailwindcss/postcss>tailwindcss'] = resolveVersion(pkg)
+      workspace.overrides['@tailwindcss/turbopack>tailwindcss'] = resolveVersion(pkg)
+      workspace.overrides['@tailwindcss/vite>tailwindcss'] = resolveVersion(pkg)
+      workspace.overrides['@tailwindcss/webpack>tailwindcss'] = resolveVersion(pkg)
     } else {
-      json.pnpm.overrides[pkg] = resolveVersion(pkg)
+      workspace.overrides[pkg] = resolveVersion(pkg)
     }
   }
 
-  return JSON.stringify(json, null, 2)
+  return Yaml.stringify(workspace)
 }
 
 function resolveVersion(dependency: string) {
@@ -488,6 +637,7 @@ export let css = dedent
 export let html = dedent
 export let ts = dedent
 export let js = dedent
+export let jsx = dedent
 export let json = dedent
 export let yaml = dedent
 export let txt = dedent
@@ -510,80 +660,6 @@ export function candidate(strings: TemplateStringsArray, ...values: any[]) {
   return `.${escape(output.join('').trim())}`
 }
 
-// https://drafts.csswg.org/cssom/#serialize-an-identifier
-export function escape(value: string) {
-  if (arguments.length == 0) {
-    throw new TypeError('`CSS.escape` requires an argument.')
-  }
-  var string = String(value)
-  var length = string.length
-  var index = -1
-  var codeUnit
-  var result = ''
-  var firstCodeUnit = string.charCodeAt(0)
-
-  if (
-    // If the character is the first character and is a `-` (U+002D), and
-    // there is no second character, […]
-    length == 1 &&
-    firstCodeUnit == 0x002d
-  ) {
-    return '\\' + string
-  }
-
-  while (++index < length) {
-    codeUnit = string.charCodeAt(index)
-    // Note: there’s no need to special-case astral symbols, surrogate
-    // pairs, or lone surrogates.
-
-    // If the character is NULL (U+0000), then the REPLACEMENT CHARACTER
-    // (U+FFFD).
-    if (codeUnit == 0x0000) {
-      result += '\uFFFD'
-      continue
-    }
-
-    if (
-      // If the character is in the range [\1-\1F] (U+0001 to U+001F) or is
-      // U+007F, […]
-      (codeUnit >= 0x0001 && codeUnit <= 0x001f) ||
-      codeUnit == 0x007f ||
-      // If the character is the first character and is in the range [0-9]
-      // (U+0030 to U+0039), […]
-      (index == 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
-      // If the character is the second character and is in the range [0-9]
-      // (U+0030 to U+0039) and the first character is a `-` (U+002D), […]
-      (index == 1 && codeUnit >= 0x0030 && codeUnit <= 0x0039 && firstCodeUnit == 0x002d)
-    ) {
-      // https://drafts.csswg.org/cssom/#escape-a-character-as-code-point
-      result += '\\' + codeUnit.toString(16) + ' '
-      continue
-    }
-
-    // If the character is not handled by one of the above rules and is
-    // greater than or equal to U+0080, is `-` (U+002D) or `_` (U+005F), or
-    // is in one of the ranges [0-9] (U+0030 to U+0039), [A-Z] (U+0041 to
-    // U+005A), or [a-z] (U+0061 to U+007A), […]
-    if (
-      codeUnit >= 0x0080 ||
-      codeUnit == 0x002d ||
-      codeUnit == 0x005f ||
-      (codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
-      (codeUnit >= 0x0041 && codeUnit <= 0x005a) ||
-      (codeUnit >= 0x0061 && codeUnit <= 0x007a)
-    ) {
-      // the character itself
-      result += string.charAt(index)
-      continue
-    }
-
-    // Otherwise, the escaped character.
-    // https://drafts.csswg.org/cssom/#escape-a-character
-    result += '\\' + string.charAt(index)
-  }
-  return result
-}
-
 export async function retryAssertion<T>(
   fn: () => Promise<T>,
   { timeout = ASSERTION_TIMEOUT, delay = 5 }: { timeout?: number; delay?: number } = {},
@@ -594,6 +670,7 @@ export async function retryAssertion<T>(
     try {
       return await fn()
     } catch (err) {
+      Error.captureStackTrace(err, retryAssertion)
       error = err
       await new Promise((resolve) => setTimeout(resolve, delay))
     }
@@ -609,7 +686,7 @@ export async function fetchStyles(base: string, path = '/'): Promise<string> {
   let index = await fetch(`${base}${path}`)
   let html = await index.text()
 
-  let linkRegex = /<link rel="stylesheet" href="([a-zA-Z0-9\/_\.\?=%-]+)"/gi
+  let linkRegex = /<link rel="stylesheet" href="([a-zA-Z0-9/_.?=%-]+)"/gi
   let styleRegex = /<style\b[^>]*>([\s\S]*?)<\/style>/gi
 
   let stylesheets: string[] = []
@@ -640,13 +717,155 @@ export async function fetchStyles(base: string, path = '/'): Promise<string> {
   }
 
   return stylesheets.reduce((acc, css) => {
-    return acc + '\n' + css
+    if (acc.length > 0) acc += '\n'
+    acc += css
+    return acc
   }, '')
 }
 
+export async function getRandomPort() {
+  return new Promise<number>((resolve, reject) => {
+    let server = createServer()
+    server.unref()
+    server.on('error', reject)
+    server.listen(0, '127.0.0.1', () => {
+      let address = server.address()
+      server.close(() => {
+        if (address && typeof address === 'object') {
+          resolve(address.port)
+        } else {
+          reject(new Error('Unable to allocate random port'))
+        }
+      })
+    })
+  })
+}
+
+async function killProcessTree(child: ChildProcess) {
+  if (child.exitCode !== null || child.signalCode !== null || child.pid === undefined) {
+    return
+  }
+
+  if (IS_WINDOWS) {
+    await execFileAsync('taskkill', ['/pid', String(child.pid), '/T', '/F'], {
+      timeout: ASSERTION_TIMEOUT,
+      windowsHide: true,
+    }).catch(() => {})
+    return
+  }
+
+  try {
+    process.kill(-child.pid, 'SIGTERM')
+  } catch (error: any) {
+    if (error?.code !== 'ESRCH') {
+      child.kill()
+    }
+  }
+}
+
+function forceKillProcessTree(child: ChildProcess) {
+  if (child.exitCode !== null || child.signalCode !== null || child.pid === undefined) {
+    return
+  }
+
+  if (IS_WINDOWS) {
+    execFile('taskkill', ['/pid', String(child.pid), '/T', '/F'], { windowsHide: true }, () => {})
+    return
+  }
+
+  try {
+    process.kill(-child.pid, 'SIGKILL')
+  } catch (error: any) {
+    if (error?.code !== 'ESRCH') {
+      child.kill('SIGKILL')
+    }
+  }
+}
+
 async function gracefullyRemove(dir: string) {
   // Skip removing the directory in CI because it can stall on Windows
   if (!process.env.CI) {
-    await fs.rm(dir, { recursive: true, force: true })
+    await fs.rm(dir, { recursive: true, force: true }).catch((error) => {
+      console.log(`Failed to remove ${dir}`, error)
+    })
+  }
+}
+
+const SOURCE_MAP_COMMENT = /^\/\*# sourceMappingURL=data:application\/json;base64,(.*) \*\/$/
+
+export interface SourceMap {
+  at(
+    line: number,
+    column: number,
+  ): {
+    source: string | null
+    original: string
+    generated: string
+  }
+}
+
+interface SourceMapOptions {
+  /**
+   * A raw source map
+   *
+   * This may be a string or an object. Strings will be decoded.
+   */
+  map: string | object
+
+  /**
+   * The content of the generated file the source map is for
+   */
+  content: string
+
+  /**
+   * The encoding of the source map
+   *
+   * Can be used to decode a base64 map (e.g. an inline source map URI)
+   */
+  encoding?: BufferEncoding
+}
+
+function parseSourceMap(opts: string | SourceMapOptions): SourceMap {
+  if (typeof opts === 'string') {
+    let lines = opts.trimEnd().split('\n')
+    let comment = lines.at(-1) ?? ''
+    let map = String(comment).match(SOURCE_MAP_COMMENT)?.[1] ?? null
+    if (!map) throw new Error('No source map comment found')
+
+    return parseSourceMap({
+      map,
+      content: lines.slice(0, -1).join('\n'),
+      encoding: 'base64',
+    })
+  }
+
+  let rawMap: RawSourceMap
+  let content = opts.content
+
+  if (typeof opts.map === 'object') {
+    rawMap = opts.map as RawSourceMap
+  } else {
+    rawMap = JSON.parse(Buffer.from(opts.map, opts.encoding ?? 'utf-8').toString())
+  }
+
+  let map = new SourceMapConsumer(rawMap)
+  let generatedTable = createLineTable(content)
+
+  return {
+    at(line: number, column: number) {
+      let pos = map.originalPositionFor({ line, column })
+      let source = pos.source ? map.sourceContentFor(pos.source) : null
+      let originalTable = createLineTable(source ?? '')
+      let originalOffset = originalTable.findOffset(pos)
+      let generatedOffset = generatedTable.findOffset({ line, column })
+
+      return {
+        source: pos.source,
+        original: source
+          ? source.slice(originalOffset, originalOffset + 10).trim() + '...'
+          : '(none)',
+        generated: content.slice(generatedOffset, generatedOffset + 10).trim() + '...',
+      }
+    },
   }
 }
diff --git a/integrations/vite/astro.test.ts b/integrations/vite/astro.test.ts
index 5b7407e47..f828b5071 100644
--- a/integrations/vite/astro.test.ts
+++ b/integrations/vite/astro.test.ts
@@ -1,4 +1,4 @@
-import { candidate, fetchStyles, html, json, retryAssertion, test, ts } from '../utils'
+import { candidate, css, fetchStyles, html, js, json, retryAssertion, test, ts } from '../utils'
 
 test(
   'dev mode',
@@ -20,9 +20,8 @@ test(
 
         // https://astro.build/config
         export default defineConfig({
-          vite: {
-            plugins: [tailwindcss()],
-          },
+          vite: { plugins: [tailwindcss()] },
+          build: { inlineStylesheets: 'never' },
         })
       `,
       'src/pages/index.astro': html`
@@ -70,3 +69,133 @@ test(
     })
   },
 )
+
+test(
+  'build mode',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "astro": "^4.15.2",
+            "react": "^19",
+            "react-dom": "^19",
+            "@astrojs/react": "^4",
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          }
+        }
+      `,
+      'astro.config.mjs': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import react from '@astrojs/react'
+        import { defineConfig } from 'astro/config'
+
+        // https://astro.build/config
+        export default defineConfig({
+          vite: { plugins: [tailwindcss()] },
+          integrations: [react()],
+          build: { inlineStylesheets: 'never' },
+        })
+      `,
+      // prettier-ignore
+      'src/pages/index.astro': html`
+        ---
+        import ClientOnly from './client-only';
+        ---
+
+        <div class="underline">Hello, world!</div>
+
+        <ClientOnly client:only="react" />
+
+        <style is:global>
+          @import 'tailwindcss';
+        </style>
+      `,
+      'src/pages/client-only.jsx': js`
+        export default function ClientOnly() {
+          return <div className="overline">Hello, world!</div>
+        }
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm astro build')
+
+    let files = await fs.glob('dist/**/*.css')
+    expect(files).toHaveLength(1)
+
+    await fs.expectFileToContain(files[0][0], [candidate`underline`, candidate`overline`])
+  },
+)
+
+// https://github.com/tailwindlabs/tailwindcss/issues/19677
+test(
+  'import aliases should work in <style> blocks',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "astro": "^5",
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          }
+        }
+      `,
+      'astro.config.mjs': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'astro/config'
+
+        // https://astro.build/config
+        export default defineConfig({
+          vite: { plugins: [tailwindcss()] },
+        })
+      `,
+      'tsconfig.json': json`
+        {
+          "extends": "astro/tsconfigs/strict",
+          "include": [".astro/types.d.ts", "**/*"],
+          "exclude": ["dist"],
+          "compilerOptions": {
+            "paths": {
+              "@styles/*": ["./src/styles/*"]
+            }
+          }
+        }
+      `,
+      // prettier-ignore
+      'src/pages/index.astro': html`
+        ---
+        import '@styles/global.css'
+        ---
+
+        <html lang="en">
+          <head>
+            <meta charset="utf-8" />
+            <meta name="viewport" content="width=device-width" />
+            <meta name="generator" content={Astro.generator} />
+            <title>Astro</title>
+            <style>
+              @reference "@styles/global.css";
+            </style>
+          </head>
+          <body>
+            <h1 class="underline">Astro</h1>
+          </body>
+        </html>
+      `,
+      'src/styles/global.css': css`@import 'tailwindcss';`,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm astro build')
+
+    let files = await fs.glob('dist/**/*.css')
+    expect(files).toHaveLength(1)
+
+    await fs.expectFileToContain(files[0][0], [candidate`underline`])
+  },
+)
diff --git a/integrations/vite/bundled-dev.test.ts b/integrations/vite/bundled-dev.test.ts
new file mode 100644
index 000000000..8ba1b6b73
--- /dev/null
+++ b/integrations/vite/bundled-dev.test.ts
@@ -0,0 +1,193 @@
+import path from 'node:path'
+import { candidate, css, html, json, retryAssertion, test, ts, txt, yaml } from '../utils'
+
+// Vite's experimental `bundledDev` mode invokes the `hotUpdate` hook without a
+// `server`, which used to crash the plugin on every file edit.
+//
+// - https://github.com/tailwindlabs/tailwindcss/issues/20378
+// - https://vite.dev/blog/announcing-vite8-1#experimental-bundled-dev-mode
+test(
+  'dev mode (experimental `bundledDev`)',
+  {
+    fs: {
+      'package.json': json`{}`,
+      'pnpm-workspace.yaml': yaml`
+        #
+        packages:
+          - project-a
+      `,
+      'project-a/package.json': txt`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "vite": "^8.1"
+          }
+        }
+      `,
+      'project-a/vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          experimental: {
+            bundledDev: true,
+          },
+          plugins: [tailwindcss()],
+        })
+      `,
+      'project-a/index.html': html`
+        <head>
+          <link rel="stylesheet" href="./src/index.css" />
+        </head>
+        <body>
+          <div class="underline">Hello, world!</div>
+        </body>
+      `,
+      'project-a/src/index.css': css`
+        @reference 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+        @source '../../project-b/src/**/*.html';
+      `,
+      'project-b/src/index.html': html`
+        <div class="flex" />
+      `,
+    },
+  },
+  async ({ root, spawn, fs, expect }) => {
+    let process = await spawn('pnpm vite dev', {
+      cwd: path.join(root, 'project-a'),
+      env: {
+        // Some CI machines have an upstream rolldown bug where its file watcher
+        // never delivers a single event. The debug output is the only way to
+        // tell that apart from a real regression (see below).
+        DEBUG: 'vite:full-bundle-mode',
+      },
+    })
+
+    // Any debug output beyond the "INITIAL:" startup lines proves rolldown's
+    // watcher delivered at least one file event.
+    let watcherAlive = false
+
+    // `hotUpdate` errors don't kill the dev server, they are only printed to
+    // stderr. Track them explicitly so a crash fails the test even if the
+    // rebuild happens to succeed anyway.
+    let pluginErrors: string[] = []
+    process.onStderr((message) => {
+      if (message.includes('vite:full-bundle-mode')) {
+        if (!message.includes('INITIAL:')) watcherAlive = true
+      } else if (message.includes('@tailwindcss/vite')) {
+        pluginErrors.push(message)
+      }
+      return false
+    })
+
+    let url = ''
+    await process.onStdout((m) => {
+      let match = /Local:\s*(http.*)\//.exec(m)
+      if (match) url = match[1]
+      return Boolean(url)
+    })
+
+    // In `bundledDev` mode the stylesheet is not served separately. Instead the
+    // generated CSS is embedded in the bundled JS and injected at runtime, so
+    // extract the bundle from the served HTML. While the bundle is being built,
+    // Vite serves a temporary fallback page instead.
+    //
+    // The bundle can be split into multiple chunks (e.g. the HMR client runtime
+    // and the app itself), and the chunk containing the CSS is not always the
+    // first one, so fetch every referenced script and stylesheet.
+    async function fetchBundledStyles(): Promise<string> {
+      let index = await fetch(`${url}/`)
+      let html = await index.text()
+      if (html.includes('__vite_is_fallback_page__')) {
+        throw new Error('Bundling still in progress')
+      }
+
+      let sources = [
+        ...html.matchAll(/<script[^>]*\ssrc="([^"]+)"/g),
+        ...html.matchAll(/<link[^>]*\srel="stylesheet"[^>]*\shref="([^"]+)"/g),
+      ].map((match) => match[1])
+      if (sources.length === 0) throw new Error(`No scripts or stylesheets found in:\n\n${html}`)
+
+      let contents = await Promise.all(
+        sources.map(async (src) => {
+          let response = await fetch(new URL(src, `${url}/`))
+          return await response.text()
+        }),
+      )
+      return contents.join('\n')
+    }
+
+    await retryAssertion(
+      async () => {
+        let styles = await fetchBundledStyles()
+        expect(styles).toContain(candidate`underline`)
+        expect(styles).toContain(candidate`flex`)
+      },
+      { timeout: 10_000, delay: 100 },
+    )
+
+    // Edit a module file and a manually `@source`d file. Without a connected
+    // HMR websocket client (this test only uses HTTP fetches), a file change
+    // does not trigger an eager rebuild — it only marks the bundle as stale,
+    // and the next fetch kicks off the rebuild. So poll with fetches without
+    // touching the files again: rewriting would re-mark the bundle stale right
+    // before each fetch and the rebuild could never be observed.
+    await fs.write(
+      'project-a/index.html',
+      html`
+        <head>
+          <link rel="stylesheet" href="./src/index.css" />
+        </head>
+        <body>
+          <div class="underline m-2">Hello, world!</div>
+        </body>
+      `,
+    )
+
+    await fs.write('project-b/src/index.html', html`
+      <div class="flex font-bold" />
+    `)
+
+    try {
+      await retryAssertion(
+        async () => {
+          let styles = await fetchBundledStyles()
+          expect(styles).toContain(candidate`underline`)
+          expect(styles).toContain(candidate`flex`)
+          expect(styles).toContain(candidate`m-2`)
+          expect(styles).toContain(candidate`font-bold`)
+        },
+        { timeout: 15_000, delay: 100 },
+      )
+    } catch (error) {
+      // If rolldown's watcher delivered any file event, the updates were
+      // genuinely dropped somewhere along the way — a real failure.
+      if (watcherAlive) throw error
+
+      // Otherwise the watcher never delivered a single event, so the updates
+      // can never be observed no matter how long we wait — an upstream
+      // rolldown bug on some CI machines, not a plugin regression. The crash
+      // regression this test guards is still covered: `hotUpdate` is driven
+      // by Vite's own (working) chokidar watcher and asserted via
+      // `pluginErrors` below.
+      //
+      // Skipping is only sound while the server still healthily serves the
+      // original bundle. If it stopped serving (crashed, or wedged on the
+      // fallback page), that's real breakage a silent watcher must not mask.
+      console.log(error)
+      let styles = await fetchBundledStyles()
+      expect(styles).toContain(candidate`underline`)
+      expect(styles).toContain(candidate`flex`)
+      console.warn(
+        'Skipping update assertions: rolldown’s file watcher delivered no events on this machine.',
+      )
+    }
+
+    expect(pluginErrors).toEqual([])
+  },
+)
diff --git a/integrations/vite/config.test.ts b/integrations/vite/config.test.ts
index 3bf560e07..0ac68f5e9 100644
--- a/integrations/vite/config.test.ts
+++ b/integrations/vite/config.test.ts
@@ -12,7 +12,7 @@ test(
             "tailwindcss": "workspace:^"
           },
           "devDependencies": {
-            "vite": "^6"
+            "vite": "^7"
           }
         }
       `,
@@ -76,7 +76,7 @@ test(
             "tailwindcss": "workspace:^"
           },
           "devDependencies": {
-            "vite": "^6"
+            "vite": "^7"
           }
         }
       `,
@@ -140,7 +140,7 @@ test(
             "tailwindcss": "workspace:^"
           },
           "devDependencies": {
-            "vite": "^6"
+            "vite": "^7"
           }
         }
       `,
@@ -219,7 +219,7 @@ test(
             "tailwindcss": "workspace:^"
           },
           "devDependencies": {
-            "vite": "^6"
+            "vite": "^7"
           }
         }
       `,
diff --git a/integrations/vite/css-modules.test.ts b/integrations/vite/css-modules.test.ts
index 668281cb4..a680ab9b7 100644
--- a/integrations/vite/css-modules.test.ts
+++ b/integrations/vite/css-modules.test.ts
@@ -14,8 +14,8 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
               "tailwindcss": "workspace:^"
             },
             "devDependencies": {
-              ${transformer === 'lightningcss' ? `"lightningcss": "^1.26.0",` : ''}
-              "vite": "^6"
+              ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
+              "vite": "^7"
             }
           }
         `,
diff --git a/integrations/vite/html-style-blocks.test.ts b/integrations/vite/html-style-blocks.test.ts
new file mode 100644
index 000000000..22bb91d78
--- /dev/null
+++ b/integrations/vite/html-style-blocks.test.ts
@@ -0,0 +1,58 @@
+import { html, json, test, ts } from '../utils'
+
+test(
+  'transforms html style blocks',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "vite": "^7"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import { defineConfig } from 'vite'
+        import tailwindcss from '@tailwindcss/vite'
+
+        export default defineConfig({
+          plugins: [tailwindcss()],
+        })
+      `,
+      'index.html': html`
+        <!doctype html>
+        <html>
+          <body>
+            <div class="foo"></div>
+            <style>
+              .foo {
+                @apply underline;
+              }
+            </style>
+          </body>
+        </html>
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm vite build')
+
+    expect(await fs.dumpFiles('dist/*.html')).toMatchInlineSnapshot(`
+      "
+      --- dist/index.html ---
+      <!doctype html>
+      <html>
+        <body>
+          <div class="foo"></div>
+          <style>.foo{text-decoration-line:underline}</style>
+        </body>
+      </html>
+      "
+    `)
+  },
+)
diff --git a/integrations/vite/ignored-packages.test.ts b/integrations/vite/ignored-packages.test.ts
new file mode 100644
index 000000000..1efa9dc61
--- /dev/null
+++ b/integrations/vite/ignored-packages.test.ts
@@ -0,0 +1,81 @@
+import { candidate, css, fetchStyles, html, js, retryAssertion, test, ts, txt } from '../utils'
+
+const WORKSPACE = {
+  fs: {
+    'package.json': txt`
+    {
+      "type": "module",
+      "dependencies": {
+        "tailwind-merge": "^2",
+        "@tailwindcss/vite": "workspace:^",
+        "tailwindcss": "workspace:^"
+      },
+      "devDependencies": {
+        "vite": "^7"
+      }
+    }
+  `,
+    'vite.config.ts': ts`
+      import tailwindcss from '@tailwindcss/vite'
+      import { defineConfig } from 'vite'
+
+      export default defineConfig({
+        build: { cssMinify: false },
+        plugins: [tailwindcss()],
+      })
+    `,
+    'index.html': html`
+      <head>
+        <link rel="stylesheet" href="./src/index.css" />
+        <script type="module" src="./src/index.js"></script>
+      </head>
+    `,
+    'src/index.js': js`
+      import { twMerge } from 'tailwind-merge'
+
+      twMerge('underline')
+
+      console.log('underline')
+    `,
+    'src/index.css': css`@import 'tailwindcss/utilities' layer(utilities);`,
+  },
+}
+
+test(
+  'does not scan tailwind-merge in production builds',
+  WORKSPACE,
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm vite build')
+
+    let files = await fs.glob('dist/**/*.css')
+    expect(files).toHaveLength(1)
+    let [, content] = files[0]
+
+    expect(content).toMatchInlineSnapshot(`
+      "@layer utilities {
+        .underline {
+          text-decoration-line: underline;
+        }
+      }
+      "
+    `)
+  },
+)
+
+test('does not scan tailwind-merge in dev builds', WORKSPACE, async ({ spawn, expect }) => {
+  let process = await spawn('pnpm vite dev')
+  await process.onStdout((m) => m.includes('ready in'))
+
+  let url = ''
+  await process.onStdout((m) => {
+    let match = /Local:\s*(http.*)\//.exec(m)
+    if (match) url = match[1]
+    return Boolean(url)
+  })
+
+  await retryAssertion(async () => {
+    let styles = await fetchStyles(url, '/index.html')
+
+    expect(styles).not.toContain(candidate`flex`)
+  })
+})
diff --git a/integrations/vite/index.test.ts b/integrations/vite/index.test.ts
index eebe11127..c346f8e37 100644
--- a/integrations/vite/index.test.ts
+++ b/integrations/vite/index.test.ts
@@ -7,6 +7,7 @@ import {
   html,
   js,
   json,
+  jsx,
   retryAssertion,
   test,
   ts,
@@ -33,8 +34,8 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
               "tailwindcss": "workspace:^"
             },
             "devDependencies": {
-              ${transformer === 'lightningcss' ? `"lightningcss": "^1.26.0",` : ''}
-              "vite": "^6"
+              ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
+              "vite": "^7"
             }
           }
         `,
@@ -62,7 +63,7 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
           }
         `,
         'project-a/src/index.css': css`
-          @import 'tailwindcss/theme' theme(reference);
+          @reference 'tailwindcss/theme';
           @import 'tailwindcss/utilities';
           @config '../tailwind.config.js';
           @source '../../project-b/src/**/*.html';
@@ -110,8 +111,8 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
               "tailwindcss": "workspace:^"
             },
             "devDependencies": {
-              ${transformer === 'lightningcss' ? `"lightningcss": "^1.26.0",` : ''}
-              "vite": "^6"
+              ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
+              "vite": "^7"
             }
           }
         `,
@@ -147,11 +148,17 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
           }
         `,
         'project-a/src/index.css': css`
-          @import 'tailwindcss/theme' theme(reference);
+          @reference 'tailwindcss/theme';
           @import 'tailwindcss/utilities';
+          @import './imported.css';
           @config '../tailwind.config.js';
           @source '../../project-b/src/**/*.html';
         `,
+        'project-a/src/imported.css': css`
+          .imported {
+            color: red;
+          }
+        `,
         'project-b/src/index.html': html`
           <div class="flex" />
         `,
@@ -174,22 +181,12 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
         return Boolean(url)
       })
 
-      // Candidates are resolved lazily, so the first visit of index.html
-      // will only have candidates from this file.
       await retryAssertion(async () => {
         let styles = await fetchStyles(url, '/index.html')
         expect(styles).toContain(candidate`underline`)
         expect(styles).toContain(candidate`flex`)
-        expect(styles).not.toContain(candidate`font-bold`)
-      })
-
-      // Going to about.html will extend the candidate list to include
-      // candidates from about.html.
-      await retryAssertion(async () => {
-        let styles = await fetchStyles(url, '/about.html')
-        expect(styles).toContain(candidate`underline`)
-        expect(styles).toContain(candidate`flex`)
         expect(styles).toContain(candidate`font-bold`)
+        expect(styles).toContain(candidate`imported`)
       })
 
       await retryAssertion(async () => {
@@ -210,6 +207,7 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
         expect(styles).toContain(candidate`underline`)
         expect(styles).toContain(candidate`flex`)
         expect(styles).toContain(candidate`font-bold`)
+        expect(styles).toContain(candidate`imported`)
         expect(styles).toContain(candidate`m-2`)
       })
 
@@ -227,6 +225,7 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
         expect(styles).toContain(candidate`underline`)
         expect(styles).toContain(candidate`flex`)
         expect(styles).toContain(candidate`font-bold`)
+        expect(styles).toContain(candidate`imported`)
         expect(styles).toContain(candidate`m-2`)
         expect(styles).toContain(candidate`[.changed_&]:content-['project-b/src/index.js']`)
       })
@@ -248,11 +247,157 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
         let styles = await fetchStyles(url)
         expect(styles).toContain(candidate`red`)
         expect(styles).toContain(candidate`flex`)
+        expect(styles).toContain(candidate`imported`)
         expect(styles).toContain(candidate`m-2`)
         expect(styles).toContain(candidate`underline`)
         expect(styles).toContain(candidate`[.changed_&]:content-['project-b/src/index.js']`)
         expect(styles).toContain(candidate`font-bold`)
       })
+
+      await retryAssertion(async () => {
+        // Trigger a partial rebuild for the next test
+        await fs.write(
+          'project-a/index.html',
+          html`
+            <head>
+              <link rel="stylesheet" href="./src/index.css" />
+            </head>
+            <body>
+              <div class="m-4">Hello, world!</div>
+            </body>
+          `,
+        )
+        let styles = await fetchStyles(url)
+        expect(styles).toContain(candidate`m-4`)
+      })
+
+      await retryAssertion(async () => {
+        // Changing an `@imported` CSS file after a partial rebuild also triggers the correct update
+        await fs.write(
+          'project-a/src/imported.css',
+          css`
+            .imported-updated {
+              color: red;
+            }
+          `,
+        )
+
+        let styles = await fetchStyles(url)
+        expect(styles).toContain(candidate`red`)
+        expect(styles).toContain(candidate`flex`)
+        expect(styles).toContain(candidate`m-2`)
+        expect(styles).toContain(candidate`underline`)
+        expect(styles).toContain(candidate`[.changed_&]:content-['project-b/src/index.js']`)
+        expect(styles).toContain(candidate`font-bold`)
+        expect(styles).toContain(candidate`imported-updated`)
+      })
+    },
+  )
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/20346
+  test(
+    'dev mode + symlinked `@source` files pick up changes to the real file',
+    {
+      fs: {
+        'package.json': json`{}`,
+        'pnpm-workspace.yaml': yaml`
+          #
+          packages:
+            - project-a
+            - packages/*
+        `,
+        'project-a/package.json': txt`
+          {
+            "type": "module",
+            "dependencies": {
+              "@tailwindcss/vite": "workspace:^",
+              "repro-package": "workspace:*",
+              "tailwindcss": "workspace:^"
+            },
+            "devDependencies": {
+              ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
+              "vite": "^7"
+            }
+          }
+        `,
+        'project-a/vite.config.ts': ts`
+          import tailwindcss from '@tailwindcss/vite'
+          import { defineConfig } from 'vite'
+
+          export default defineConfig({
+            css: ${transformer === 'postcss' ? '{}' : "{ transformer: 'lightningcss' }"},
+            build: { cssMinify: false },
+            plugins: [tailwindcss()],
+          })
+        `,
+        'project-a/index.html': html`
+          <head>
+            <link rel="stylesheet" href="./src/index.css" />
+          </head>
+          <body>
+            <div class="underline">Hello, world!</div>
+          </body>
+        `,
+
+        // The `@source` points through the `node_modules` symlink that pnpm
+        // creates for the workspace package. Vite's file watcher ignores
+        // `node_modules` by default, so the symlinked path can not be watched.
+        // The real file (in `packages/repro-package`) has to be watched
+        // instead.
+        'project-a/src/index.css': css`
+          @reference 'tailwindcss/theme';
+          @import 'tailwindcss/utilities';
+          @source '../node_modules/repro-package/source.html';
+        `,
+        'packages/repro-package/package.json': json`
+          {
+            "name": "repro-package",
+            "private": true,
+            "version": "1.0.0"
+          }
+        `,
+        'packages/repro-package/source.html': html`
+          <div class="content-['v1']">
+            Hello, world!
+          </div>
+        `,
+      },
+    },
+    async ({ root, spawn, fs, expect }) => {
+      let process = await spawn('pnpm vite dev', {
+        cwd: path.join(root, 'project-a'),
+      })
+      await process.onStdout((m) => m.includes('ready in'))
+
+      let url = ''
+      await process.onStdout((m) => {
+        let match = /Local:\s*(http.*)\//.exec(m)
+        if (match) url = match[1]
+        return Boolean(url)
+      })
+
+      await retryAssertion(async () => {
+        let styles = await fetchStyles(url, '/index.html')
+        expect(styles).toContain(candidate`underline`)
+        expect(styles).toContain(candidate`content-['v1']`)
+      })
+
+      await retryAssertion(async () => {
+        // Changes to the real file (behind the symlink) should be picked up
+        await fs.write(
+          'packages/repro-package/source.html',
+          html`
+            <div class="content-['v1'] content-['v2']">
+              Hello, world!
+            </div>
+          `,
+        )
+
+        let styles = await fetchStyles(url)
+        expect(styles).toContain(candidate`underline`)
+        expect(styles).toContain(candidate`content-['v1']`)
+        expect(styles).toContain(candidate`content-['v2']`)
+      })
     },
   )
 
@@ -274,8 +419,8 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
               "tailwindcss": "workspace:^"
             },
             "devDependencies": {
-              ${transformer === 'lightningcss' ? `"lightningcss": "^1.26.0",` : ''}
-              "vite": "^6"
+              ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
+              "vite": "^7"
             }
           }
         `,
@@ -302,7 +447,7 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
           }
         `,
         'project-a/src/index.css': css`
-          @import 'tailwindcss/theme' theme(reference);
+          @reference 'tailwindcss/theme';
           @import 'tailwindcss/utilities';
           @import './custom-theme.css';
           @config '../tailwind.config.js';
@@ -435,6 +580,352 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
     },
   )
 
+  describe.each([['^6'], ['7.0.8'], ['7.1.12'], ['7.3.1'], ['8.0.0']])(
+    'Using Vite %s',
+    (version) => {
+      test(
+        'external source file changes update the CSS',
+        {
+          fs: {
+            'package.json': json`{}`,
+            'pnpm-workspace.yaml': yaml`
+              #
+              packages:
+                - project-a
+            `,
+            'project-a/package.json': json`
+            {
+              "type": "module",
+              "dependencies": {
+                "@tailwindcss/vite": "workspace:^",
+                "tailwindcss": "workspace:^"
+              },
+              "devDependencies": {
+                ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
+                "vite": "${version}"
+              }
+            }
+          `,
+            'project-a/vite.config.ts': ts`
+              import fs from 'node:fs'
+              import path from 'node:path'
+              import tailwindcss from '@tailwindcss/vite'
+              import { defineConfig } from 'vite'
+
+              export default defineConfig({
+                css: ${transformer === 'postcss' ? '{}' : "{ transformer: 'lightningcss' }"},
+                build: { cssMinify: false },
+                plugins: [tailwindcss()],
+                logLevel: 'info',
+              })
+            `,
+            'project-a/index.html': html`
+              <html>
+                <head>
+                  <link rel="stylesheet" href="./src/index.css" />
+                </head>
+                <body>
+                  <div id="app"></div>
+                  <script type="module" src="./src/main.ts"></script>
+                </body>
+              </html>
+            `,
+            'project-a/src/main.ts': jsx`import { classes } from './app'`,
+            'project-a/src/app.ts': jsx`export let classes = "content-['project-a/src/app.ts']"`,
+            'project-a/src/index.css': css`
+              @import 'tailwindcss';
+              @source '../../project-b/**/*.php';
+            `,
+            'project-b/src/index.php': html`
+              <div
+                class="content-['project-b/src/index.php']"
+              ></div>
+            `,
+          },
+        },
+        async ({ root, spawn, fs, expect }) => {
+          let process = await spawn('pnpm vite dev --debug hmr', {
+            cwd: path.join(root, 'project-a'),
+          })
+          await process.onStdout((m) => m.includes('ready in'))
+
+          let url = ''
+          await process.onStdout((m) => {
+            let match = /Local:\s*(http.*)\//.exec(m)
+            if (match) url = match[1]
+            return Boolean(url)
+          })
+
+          await retryAssertion(async () => {
+            let styles = await fetchStyles(url, '/index.html')
+            expect(styles).toContain(candidate`content-['project-b/src/index.php']`)
+          })
+
+          // Flush all messages so that we can be sure the next messages are
+          // from the file changes we're about to make
+          process.flush()
+
+          // Changing an external .php file hot-updates the generated CSS
+          {
+            await fs.write(
+              'project-b/src/index.php',
+              txt`<div class="content-['updated:project-b/src/index.php']"></div>`,
+            )
+
+            // On Vite < 7.1, Vite itself hard-invalidates watched files that
+            // aren't part of the module graph and reloads the page.
+            //
+            // On newer versions nothing reloads the page: the CSS hot-updates
+            // through the regular pipeline because the changed file is a
+            // watch dependency of the CSS root.
+            //
+            // Reloading the page for external template changes is the
+            // responsibility of the backend integration (e.g. `laravel-vite-plugin`'s `refresh` option, or `vite-plugin-full-reload`).
+            //
+            // https://github.com/tailwindlabs/tailwindcss/issues/20411
+            if (version === '^6' || version === '7.0.8') {
+              await process.onStdout((m) => m.includes('page reload') && m.includes('index.php'))
+            } else {
+              await process.onStdout((m) => m.includes('hmr update') && m.includes('index.css'))
+            }
+
+            // Ensure the styles were regenerated with the new content
+            let styles = await fetchStyles(url, '/index.html')
+            expect(styles).toContain(candidate`content-['updated:project-b/src/index.php']`)
+          }
+        },
+      )
+    },
+  )
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/20320
+  // https://github.com/tailwindlabs/tailwindcss/issues/19903
+  test(
+    'editing scanned files that Vite can process as modules does not trigger a full reload',
+    {
+      fs: {
+        'package.json': json`{}`,
+        'pnpm-workspace.yaml': yaml`
+          #
+          packages:
+            - project-a
+        `,
+        'project-a/package.json': json`
+          {
+            "type": "module",
+            "dependencies": {
+              "@tailwindcss/vite": "workspace:^",
+              "tailwindcss": "workspace:^"
+            },
+            "devDependencies": {
+              ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
+              "vite": "^8"
+            }
+          }
+        `,
+        'project-a/vite.config.ts': ts`
+          import fs from 'node:fs'
+          import path from 'node:path'
+          import tailwindcss from '@tailwindcss/vite'
+          import { defineConfig } from 'vite'
+
+          export default defineConfig({
+            css: ${transformer === 'postcss' ? '{}' : "{ transformer: 'lightningcss' }"},
+            build: { cssMinify: false },
+            plugins: [
+              tailwindcss(),
+              {
+                // A plugin that processes a custom file type into a JS
+                // module, similar to e.g. \`.vue\` or \`.svelte\` files
+                name: 'custom-file-type',
+                transform(code, id) {
+                  if (id.endsWith('.custom')) {
+                    return { code: 'export default ' + JSON.stringify(code), map: null }
+                  }
+                },
+              },
+              {
+                // Log all HMR payloads to a file so the test can assert on
+                // them
+                name: 'hmr-wiretap',
+                configureServer(server) {
+                  let logFile = path.resolve('hmr.log')
+                  fs.writeFileSync(logFile, '')
+                  for (let environment of Object.values(server.environments)) {
+                    let send = environment.hot.send.bind(environment.hot)
+                    environment.hot.send = (payload) => {
+                      fs.appendFileSync(logFile, JSON.stringify(payload) + '\\n')
+                      return send(payload)
+                    }
+                  }
+                },
+              },
+            ],
+          })
+        `,
+        'project-a/index.html': html`
+          <html>
+            <head>
+              <link rel="stylesheet" href="./src/index.css" />
+            </head>
+            <body>
+              <div id="app"></div>
+              <script type="module" src="./src/main.ts"></script>
+            </body>
+          </html>
+        `,
+        'project-a/src/main.ts': ts`
+          import compA from './comp-a.custom'
+          import snippet from './snippet.php?raw'
+          console.log(compA, snippet)
+        `,
+        'project-a/src/snippet.php': html`
+          <div
+            class="content-['src/snippet.php']"
+          ></div>
+        `,
+        'project-a/src/comp-a.custom': html`
+          <div
+            class="content-['src/comp-a.custom']"
+          ></div>
+        `,
+        'project-a/src/comp-b.custom': html`
+          <div
+            class="content-['src/comp-b.custom']"
+          ></div>
+        `,
+        'project-a/src/lazy.tsx': jsx`
+          export default function Lazy() {
+            return <div className="content-['src/lazy.tsx']" />
+          }
+        `,
+        'project-a/src/unimported.css': css`
+          .unimported {
+            color: red;
+          }
+        `,
+        'project-a/src/index.css': css`
+          @import 'tailwindcss';
+          @source '../../project-b/**/*.php';
+        `,
+        'project-b/src/index.php': html`
+          <div
+            class="content-['project-b/src/index.php']"
+          ></div>
+        `,
+      },
+    },
+    async ({ root, spawn, fs, expect }) => {
+      let process = await spawn('pnpm vite dev', {
+        cwd: path.join(root, 'project-a'),
+      })
+      await process.onStdout((m) => m.includes('ready in'))
+
+      let url = ''
+      await process.onStdout((m) => {
+        let match = /Local:\s*(http.*)\//.exec(m)
+        if (match) url = match[1]
+        return Boolean(url)
+      })
+
+      await retryAssertion(async () => {
+        let styles = await fetchStyles(url, '/index.html')
+        expect(styles).toContain(candidate`content-['src/lazy.tsx']`)
+        expect(styles).toContain(candidate`content-['src/comp-b.custom']`)
+        expect(styles).toContain(candidate`content-['project-b/src/index.php']`)
+      })
+
+      // Load `main.ts`, `comp-a.custom`, and `snippet.php?raw` as real
+      // modules, like a browser visiting the page would
+      await fetch(`${url}/src/main.ts`)
+      await fetch(`${url}/src/comp-a.custom?import`)
+      await fetch(`${url}/src/snippet.php?raw`)
+
+      // Changing a scanned `.tsx` file that is not part of the module graph
+      // (e.g. a lazily-loaded route that hasn't been visited yet) should not
+      // trigger a full reload, but new classes should still apply
+      //
+      // https://github.com/tailwindlabs/tailwindcss/issues/20320
+      {
+        await fs.write(
+          'project-a/src/lazy.tsx',
+          jsx`
+            export default function Lazy() {
+              return <div className="content-['updated:src/lazy.tsx']" />
+            }
+          `,
+        )
+
+        await retryAssertion(async () => {
+          let styles = await fetchStyles(url, '/index.html')
+          expect(styles).toContain(candidate`content-['updated:src/lazy.tsx']`)
+        })
+      }
+
+      // The same holds for a custom file type as long as some file of the
+      // same type was processed as a module before
+      {
+        await fs.write(
+          'project-a/src/comp-b.custom',
+          html`<div class="content-['updated:src/comp-b.custom']"></div>`,
+        )
+
+        await retryAssertion(async () => {
+          let styles = await fetchStyles(url, '/index.html')
+          expect(styles).toContain(candidate`content-['updated:src/comp-b.custom']`)
+        })
+      }
+
+      // Changing a scanned stylesheet that is not part of the module graph
+      // (e.g. a component stylesheet that a framework plugin compiles into
+      // the component) should not trigger a full reload either
+      //
+      // https://github.com/tailwindlabs/tailwindcss/issues/19903
+      {
+        let updates = (await fs.read('project-a/hmr.log')).split('"type":"update"').length
+
+        await fs.write(
+          'project-a/src/unimported.css',
+          css`
+            .unimported {
+              color: blue;
+            }
+          `,
+        )
+
+        // Wait until the change was handled and an update was pushed
+        await retryAssertion(async () => {
+          let log = await fs.read('project-a/hmr.log')
+          expect(log.split('"type":"update"').length).toBeGreaterThan(updates)
+        })
+      }
+
+      // Changing an external file (e.g. a PHP template) hot-updates the
+      // generated CSS but does not trigger a full reload either. Reloading the
+      // page for external template changes is the responsibility of the backend
+      // integration (e.g. `laravel-vite-plugin`'s `refresh` option, or
+      // `vite-plugin-full-reload`).
+      //
+      // https://github.com/tailwindlabs/tailwindcss/issues/20411
+      {
+        let updates = (await fs.read('project-a/hmr.log')).split('"type":"update"').length
+
+        await fs.write(
+          'project-b/src/index.php',
+          html`<div class="content-['updated:project-b/src/index.php']"></div>`,
+        )
+
+        await retryAssertion(async () => {
+          let log = await fs.read('project-a/hmr.log')
+          expect(log.split('"type":"update"').length).toBeGreaterThan(updates)
+        })
+
+        let styles = await fetchStyles(url, '/index.html')
+        expect(styles).toContain(candidate`content-['updated:project-b/src/index.php']`)
+      }
+    },
+  )
+
   test(
     `source(none) disables looking at the module graph`,
     {
@@ -453,8 +944,8 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
               "tailwindcss": "workspace:^"
             },
             "devDependencies": {
-              ${transformer === 'lightningcss' ? `"lightningcss": "^1.26.0",` : ''}
-              "vite": "^6"
+              ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
+              "vite": "^7"
             }
           }
         `,
@@ -539,8 +1030,8 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
               "tailwindcss": "workspace:^"
             },
             "devDependencies": {
-              ${transformer === 'lightningcss' ? `"lightningcss": "^1.26.0",` : ''}
-              "vite": "^6"
+              ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
+              "vite": "^7"
             }
           }
         `,
@@ -641,8 +1132,8 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
               "tailwindcss": "workspace:^"
             },
             "devDependencies": {
-              ${transformer === 'lightningcss' ? `"lightningcss": "^1.26.0",` : ''}
-              "vite": "^6"
+              ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
+              "vite": "^7"
             }
           }
         `,
@@ -687,16 +1178,96 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
     async ({ root, fs, exec, expect }) => {
       await expect(() =>
         exec('pnpm vite build', { cwd: path.join(root, 'project-a') }, { ignoreStdErr: true }),
-      ).rejects.toThrowError('The `source(../i-do-not-exist)` does not exist')
+      ).rejects.toThrow('The `source(../i-do-not-exist)` does not exist')
 
       let files = await fs.glob('project-a/dist/**/*.css')
       expect(files).toHaveLength(0)
     },
   )
+
+  test(
+    'source(…) and `@source` are relative to the file they are in',
+    {
+      fs: {
+        'package.json': json`
+          {
+            "type": "module",
+            "dependencies": {
+              "@tailwindcss/vite": "workspace:^",
+              "tailwindcss": "workspace:^"
+            },
+            "devDependencies": {
+              ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
+              "vite": "^7"
+            }
+          }
+        `,
+        'vite.config.ts': ts`
+          import tailwindcss from '@tailwindcss/vite'
+          import { defineConfig } from 'vite'
+
+          export default defineConfig({
+            css: ${transformer === 'postcss' ? '{}' : "{ transformer: 'lightningcss' }"},
+            build: { cssMinify: false },
+            plugins: [tailwindcss()],
+          })
+        `,
+        'index.html': html`
+          <head>
+            <link rel="stylesheet" href="/index.css" />
+          </head>
+          <body></body>
+        `,
+        'index.css': css` @import './project-a/src/index.css'; `,
+
+        'project-a/src/index.css': css`
+          /* Run auto-content detection in ../../project-b */
+          @import 'tailwindcss/utilities' source('../../project-b');
+
+          /* Explicitly using node_modules in the @source allows git ignored folders */
+          @source '../../project-c';
+        `,
+
+        // Project A is the current folder, but we explicitly configured
+        // `source(project-b)`, therefore project-a should not be included in
+        // the output.
+        'project-a/src/index.html': html`
+          <div
+            class="content-['SHOULD-NOT-EXIST-IN-OUTPUT'] content-['project-a/src/index.html']"
+          ></div>
+        `,
+
+        // Project B is the configured `source(…)`, therefore auto source
+        // detection should include known extensions and folders in the output.
+        'project-b/src/index.html': html`
+          <div
+            class="content-['project-b/src/index.html']"
+          ></div>
+        `,
+
+        // Project C should apply auto source detection, therefore known
+        // extensions and folders should be included in the output.
+        'project-c/src/index.html': html`
+          <div
+            class="content-['project-c/src/index.html']"
+          ></div>
+        `,
+      },
+    },
+    async ({ fs, exec, spawn, root, expect }) => {
+      await exec('pnpm vite build', { cwd: root })
+
+      let content = await fs.dumpFiles('./dist/assets/*.css')
+
+      expect(content).not.toContain(candidate`content-['project-a/src/index.html']`)
+      expect(content).toContain(candidate`content-['project-b/src/index.html']`)
+      expect(content).toContain(candidate`content-['project-c/src/index.html']`)
+    },
+  )
 })
 
 test(
-  `demote Tailwind roots to regular CSS files and back to Tailwind roots while restoring all candidates`,
+  `demote Tailwind roots to regular CSS files and back to Tailwind roots`,
   {
     fs: {
       'package.json': json`
@@ -707,7 +1278,7 @@ test(
             "tailwindcss": "workspace:^"
           },
           "devDependencies": {
-            "vite": "^6"
+            "vite": "^7"
           }
         }
       `,
@@ -750,19 +1321,9 @@ test(
       return Boolean(url)
     })
 
-    // Candidates are resolved lazily, so the first visit of index.html
-    // will only have candidates from this file.
     await retryAssertion(async () => {
       let styles = await fetchStyles(url, '/index.html')
       expect(styles).toContain(candidate`underline`)
-      expect(styles).not.toContain(candidate`font-bold`)
-    })
-
-    // Going to about.html will extend the candidate list to include
-    // candidates from about.html.
-    await retryAssertion(async () => {
-      let styles = await fetchStyles(url, '/about.html')
-      expect(styles).toContain(candidate`underline`)
       expect(styles).toContain(candidate`font-bold`)
     })
 
@@ -789,7 +1350,7 @@ test(
             "tailwindcss": "workspace:^"
           },
           "devDependencies": {
-            "vite": "^6"
+            "vite": "^7"
           }
         }
       `,
@@ -841,6 +1402,325 @@ test(
   },
 )
 
+test(
+  `does not interfere with ?commonjs-proxy modules`,
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^",
+            "plotly.js": "^3",
+            "vite": "^7"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          build: { cssMinify: false },
+          plugins: [tailwindcss()],
+        })
+      `,
+      'index.html': html`
+        <head>
+          <script type="module" src="./src/index.js"></script>
+        </head>
+      `,
+      'src/index.js': js`import Plotly from 'plotly.js/lib/core'`,
+
+      // `plotly.js` pulls in `es5-ext`, which has a build script. As of pnpm
+      // v10, build scripts only run when explicitly allowed.
+      'pnpm-workspace.yaml': yaml`
+        #
+        allowBuilds:
+          es5-ext: true
+      `,
+    },
+  },
+  async ({ exec, expect, fs }) => {
+    await exec('pnpm vite build')
+
+    let files = await fs.glob('dist/**/*.css')
+    expect(files).toHaveLength(1)
+    let [filename] = files[0]
+
+    await fs.expectFileToContain(filename, [candidate`maplibregl-map`])
+  },
+)
+
 function firstLine(str: string) {
   return str.split('\n')[0]
 }
+
+test(
+  'optimize option: disabled',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "vite": "^7"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          build: { cssMinify: false },
+          plugins: [tailwindcss({ optimize: false })],
+        })
+      `,
+      'index.html': html`
+        <head>
+          <link rel="stylesheet" href="./src/index.css" />
+        </head>
+        <body>
+          <div class="focus:text-[black]">Hello, world!</div>
+        </body>
+      `,
+      'src/index.css': css`
+        @reference 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+    },
+  },
+  async ({ exec, expect, fs }) => {
+    await exec('pnpm vite build')
+
+    // Should not be minified when optimize is disabled
+    expect((await fs.dumpFiles('dist/**/*.css')).replace(/-([-_a-zA-Z0-9]*?)\.css/g, '-<hash>.css'))
+      .toMatchInlineSnapshot(`
+        "
+        --- dist/assets/index-<hash>.css ---
+        .focus\\:text-\\[black\\]:focus {
+          color: black;
+        }
+        "
+      `)
+  },
+)
+
+test(
+  'optimize option: enabled with minify disabled',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "vite": "^7"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          build: { cssMinify: false },
+          plugins: [tailwindcss({ optimize: { minify: false } })],
+        })
+      `,
+      'index.html': html`
+        <head>
+          <link rel="stylesheet" href="./src/index.css" />
+        </head>
+        <body>
+          <div class="hover:text-[black]">Hello, world!</div>
+        </body>
+      `,
+      'src/index.css': css`
+        @reference 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+    },
+  },
+  async ({ exec, expect, fs }) => {
+    await exec('pnpm vite build')
+
+    expect((await fs.dumpFiles('dist/**/*.css')).replace(/-([-_a-zA-Z0-9]*?)\.css/g, '-<hash>.css'))
+      .toMatchInlineSnapshot(`
+      "
+      --- dist/assets/index-<hash>.css ---
+      @media (hover: hover) {
+        .hover\\:text-\\[black\\]:hover {
+          color: #000;
+        }
+      }
+      "
+    `)
+  },
+)
+
+test(
+  `the plugin works when using the environment API`,
+  {
+    fs: {
+      'package.json': txt`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "vite": "^7"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          plugins: [tailwindcss()],
+          builder: {},
+          environments: {
+            server: {
+              build: {
+                cssMinify: false,
+                emitAssets: true,
+                rollupOptions: { input: './src/server.ts' },
+              },
+            },
+          },
+        })
+      `,
+      // Has to exist or the build fails
+      'index.html': html`
+        <div class="content-['index.html']"></div>
+      `,
+      'src/server.ts': js`
+        // Import the stylesheet in the server build
+        import a from './index.css?url'
+        console.log(a)
+      `,
+      'src/index.css': css`
+        @reference 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+    },
+  },
+  async ({ root, fs, exec, expect }) => {
+    await exec('pnpm vite build', { cwd: root })
+
+    let files = await fs.glob('dist/**/*.css')
+    expect(files).toHaveLength(1)
+    let [filename] = files[0]
+
+    await fs.expectFileToContain(filename, [candidate`content-['index.html']`])
+  },
+)
+
+// https://github.com/tailwindlabs/tailwindcss/issues/17532
+test(
+  'deleting a file should not crash Vite',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "vite": "6.2.5"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          plugins: [tailwindcss()],
+        })
+      `,
+      'index.html': html`
+        <body>
+          <div id="app" class="underline"></div>
+          <script type="module" src="./src/main.js"></script>
+        </body>
+      `,
+      'src/index.css': css`@import 'tailwindcss';`,
+      'src/main.js': js`
+        import iconUrl from './assets/icon.svg?url'
+        import './index.css'
+
+        document.querySelector('#app').innerHTML = iconUrl
+      `,
+      'src/assets/icon.svg': html`
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1">
+          <rect class="fill-red-500" width="1" height="1" />
+        </svg>
+       `,
+    },
+  },
+  async ({ fs, spawn, expect }) => {
+    let process = await spawn('pnpm vite dev')
+    await process.onStdout((m) => m.includes('ready in'))
+
+    let url = ''
+    await process.onStdout((m) => {
+      let match = /Local:\s*(http.*)\//.exec(m)
+      if (match) url = match[1]
+      return Boolean(url)
+    })
+
+    await retryAssertion(async () => {
+      let [main, css] = await Promise.all([
+        fetch(`${url}/src/main.js`).then((r) => r.text()),
+        fetch(`${url}/src/index.css`).then((r) => r.text()),
+      ])
+
+      expect(main).toContain('/src/assets/icon.svg?import&url')
+      expect(main).toContain('/src/index.css')
+      expect(css).toContain('.fill-red-500')
+    })
+
+    process.flush()
+
+    let unexpectedError = process.onStderr((m) => {
+      return /error|crash|panic/i.test(m)
+    })
+
+    await fs.write(
+      'src/main.js',
+      js`
+        import './index.css'
+        document.querySelector('#app').innerHTML = 'Hello World'
+      `,
+    )
+
+    await fs.delete('src/assets/icon.svg')
+
+    let result = await Promise.race([
+      unexpectedError.then(() => 'stderr'),
+      new Promise((resolve) => setTimeout(() => resolve('timeout'), 500)),
+    ])
+
+    expect(result).toBe('timeout')
+
+    await retryAssertion(async () => {
+      let response = await fetch(`${url}/src/index.css?t=${Date.now()}`)
+      expect(response.status).toBe(200)
+    })
+  },
+)
diff --git a/integrations/vite/multi-root.test.ts b/integrations/vite/multi-root.test.ts
index 39da43690..4020aff0f 100644
--- a/integrations/vite/multi-root.test.ts
+++ b/integrations/vite/multi-root.test.ts
@@ -12,7 +12,7 @@ test(
             "tailwindcss": "workspace:^"
           },
           "devDependencies": {
-            "vite": "^6"
+            "vite": "^7"
           }
         }
       `,
@@ -43,12 +43,12 @@ test(
         </body>
       `,
       'src/shared.css': css`
-        @import 'tailwindcss/theme' theme(reference);
+        @reference 'tailwindcss/theme';
         @import 'tailwindcss/utilities';
       `,
       'src/root1.css': css`
         @import './shared.css';
-        @variant one (&:is([data-root='1']));
+        @custom-variant one (&:is([data-root='1']));
       `,
       'root2.html': html`
         <head>
@@ -60,7 +60,7 @@ test(
       `,
       'src/root2.css': css`
         @import './shared.css';
-        @variant two (&:is([data-root='2']));
+        @custom-variant two (&:is([data-root='2']));
       `,
     },
   },
@@ -96,7 +96,7 @@ test(
             "tailwindcss": "workspace:^"
           },
           "devDependencies": {
-            "vite": "^6"
+            "vite": "^7"
           }
         }
       `,
@@ -119,12 +119,12 @@ test(
         </body>
       `,
       'src/shared.css': css`
-        @import 'tailwindcss/theme' theme(reference);
+        @reference 'tailwindcss/theme';
         @import 'tailwindcss/utilities';
       `,
       'src/root1.css': css`
         @import './shared.css';
-        @variant one (&:is([data-root='1']));
+        @custom-variant one (&:is([data-root='1']));
       `,
       'root2.html': html`
         <head>
@@ -136,7 +136,7 @@ test(
       `,
       'src/root2.css': css`
         @import './shared.css';
-        @variant two (&:is([data-root='2']));
+        @custom-variant two (&:is([data-root='2']));
       `,
     },
   },
diff --git a/integrations/vite/nuxt.test.ts b/integrations/vite/nuxt.test.ts
index 1b834525c..20f367020 100644
--- a/integrations/vite/nuxt.test.ts
+++ b/integrations/vite/nuxt.test.ts
@@ -1,4 +1,15 @@
-import { candidate, css, fetchStyles, html, json, retryAssertion, test, ts } from '../utils'
+import {
+  candidate,
+  css,
+  fetchStyles,
+  getRandomPort,
+  html,
+  json,
+  retryAssertion,
+  test,
+  ts,
+  yaml,
+} from '../utils'
 
 const SETUP = {
   fs: {
@@ -7,12 +18,18 @@ const SETUP = {
         "type": "module",
         "dependencies": {
           "@tailwindcss/vite": "workspace:^",
-          "nuxt": "^3.13.1",
+          "nuxt": "3.16.0",
+          "nitropack": "2.11.0",
           "tailwindcss": "workspace:^",
           "vue": "latest"
         }
       }
     `,
+    'pnpm-workspace.yaml': yaml`
+      #
+      overrides:
+        nuxi: 3.28.0
+    `,
     'nuxt.config.ts': ts`
       import tailwindcss from '@tailwindcss/vite'
 
@@ -76,7 +93,10 @@ test('dev mode', SETUP, async ({ fs, spawn, expect }) => {
 
 test('build', SETUP, async ({ spawn, exec, expect }) => {
   await exec('pnpm nuxt build')
-  let process = await spawn('pnpm nuxt preview', {
+  // The Nuxt preview server does not automatically assign a free port if 3000
+  // is taken, so we use a random port instead.
+  let port = await getRandomPort()
+  let process = await spawn(`pnpm nuxt preview --port ${port}`, {
     env: {
       TEST: 'false',
       NODE_ENV: 'development',
diff --git a/integrations/vite/other-transforms.test.ts b/integrations/vite/other-transforms.test.ts
index 6aef096a7..d56396065 100644
--- a/integrations/vite/other-transforms.test.ts
+++ b/integrations/vite/other-transforms.test.ts
@@ -13,8 +13,8 @@ function createSetup(transformer: 'postcss' | 'lightningcss') {
             "tailwindcss": "workspace:^"
           },
           "devDependencies": {
-            ${transformer === 'lightningcss' ? `"lightningcss": "^1.26.0",` : ''}
-            "vite": "^6"
+            ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
+            "vite": "^7"
           }
         }
       `,
@@ -47,7 +47,7 @@ function createSetup(transformer: 'postcss' | 'lightningcss') {
         </body>
       `,
       'src/index.css': css`
-        @import 'tailwindcss/theme' theme(reference);
+        @reference 'tailwindcss/theme';
         @import 'tailwindcss/utilities';
 
         .foo {
@@ -111,7 +111,7 @@ describe.each(['postcss', 'lightningcss'] as const)('%s', (transformer) => {
       await fs.write(
         'src/index.css',
         css`
-          @import 'tailwindcss/theme' theme(reference);
+          @reference 'tailwindcss/theme';
           @import 'tailwindcss/utilities';
 
           .foo {
@@ -155,7 +155,7 @@ describe.each(['postcss', 'lightningcss'] as const)('%s', (transformer) => {
       await fs.write(
         'src/index.css',
         css`
-          @import 'tailwindcss/theme' theme(reference);
+          @reference 'tailwindcss/theme';
           @import 'tailwindcss/utilities';
 
           .foo {
diff --git a/integrations/vite/preact.test.ts b/integrations/vite/preact.test.ts
new file mode 100644
index 000000000..8e4deec2b
--- /dev/null
+++ b/integrations/vite/preact.test.ts
@@ -0,0 +1,165 @@
+import { candidate, css, fetchStyles, html, json, retryAssertion, test, ts, txt } from '../utils'
+
+test(
+  'dev mode',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "preact": "^10"
+          },
+          "devDependencies": {
+            "@preact/preset-vite": "^2",
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^",
+            "vite": "^8"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import fs from 'node:fs'
+        import path from 'node:path'
+        import preact from '@preact/preset-vite'
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          plugins: [
+            tailwindcss(),
+            preact(),
+            {
+              // Log all HMR payloads to a file so the test can assert on them
+              name: 'hmr-wiretap',
+              configureServer(server) {
+                let logFile = path.resolve('hmr.log')
+                fs.writeFileSync(logFile, '')
+                for (let environment of Object.values(server.environments)) {
+                  let send = environment.hot.send.bind(environment.hot)
+                  environment.hot.send = (payload) => {
+                    fs.appendFileSync(logFile, JSON.stringify(payload) + '\\n')
+                    return send(payload)
+                  }
+                }
+              },
+            },
+          ],
+        })
+      `,
+      'index.html': html`
+        <html>
+          <head>
+            <link rel="stylesheet" href="./src/index.css" />
+          </head>
+          <body>
+            <div id="app"></div>
+            <script type="module" src="./src/main.tsx"></script>
+          </body>
+        </html>
+      `,
+      'src/main.tsx': ts`
+        import { render } from 'preact'
+        import { App } from './app'
+
+        render(<App />, document.getElementById('app')!)
+      `,
+      'src/app.tsx': ts`
+        import { useState } from 'preact/hooks'
+
+        export function App() {
+          const [count, setCount] = useState(0)
+          return (
+            <button className="underline" onClick={() => setCount((c) => c + 1)}>
+              Count: {count}
+            </button>
+          )
+        }
+      `,
+      'src/index.css': css`@import 'tailwindcss';`,
+    },
+  },
+  async ({ fs, spawn, expect }) => {
+    let process = await spawn('pnpm vite dev')
+    await process.onStdout((m) => m.includes('ready in'))
+
+    let url = ''
+    await process.onStdout((m) => {
+      let match = /Local:\s*(http.*)\//.exec(m)
+      if (match) url = match[1]
+      return Boolean(url)
+    })
+
+    await retryAssertion(async () => {
+      let styles = await fetchStyles(url)
+      expect(styles).toContain(candidate`underline`)
+    })
+
+    // Load the component modules, like a browser visiting the page would
+    await fetch(`${url}/src/main.tsx`)
+    await fetch(`${url}/src/app.tsx`)
+
+    // Editing a component keeps HMR intact: new classes are delivered through
+    // a regular update, not a full page reload (which would lose all state)
+    {
+      await fs.write(
+        'src/app.tsx',
+        ts`
+          import { useState } from 'preact/hooks'
+
+          export function App() {
+            const [count, setCount] = useState(0)
+            return (
+              <button className="underline flex" onClick={() => setCount((c) => c + 1)}>
+                Count: {count}
+              </button>
+            )
+          }
+        `,
+      )
+
+      await retryAssertion(async () => {
+        let styles = await fetchStyles(url)
+        expect(styles).toContain(candidate`underline`)
+        expect(styles).toContain(candidate`flex`)
+      })
+      expect(await fs.read('hmr.log')).toContain('"type":"update"')
+      expect(await fs.read('hmr.log')).not.toContain('full-reload')
+    }
+
+    // Changing a scanned file that is not part of the module graph (e.g.
+    // `package.json`, which package managers and other tooling write to while
+    // the dev server is running) should not trigger a full reload either —
+    // that would destroy client state. New candidates should still be picked
+    // up because the file is a watch dependency of the CSS root, so the CSS
+    // hot-updates through Vite's regular pipeline.
+    //
+    // https://github.com/tailwindlabs/tailwindcss/issues/20411
+    {
+      await fs.write(
+        'package.json',
+        txt`
+          {
+            "type": "module",
+            "description": "content-['package.json']",
+            "dependencies": {
+              "preact": "^10"
+            },
+            "devDependencies": {
+              "@preact/preset-vite": "^2",
+              "@tailwindcss/vite": "workspace:^",
+              "tailwindcss": "workspace:^",
+              "vite": "^8"
+            }
+          }
+        `,
+      )
+
+      await retryAssertion(async () => {
+        let styles = await fetchStyles(url)
+        expect(styles).toContain(candidate`content-['package.json']`)
+      })
+      expect(await fs.read('hmr.log')).not.toContain('full-reload')
+    }
+  },
+)
diff --git a/integrations/vite/qwik.test.ts b/integrations/vite/qwik.test.ts
new file mode 100644
index 000000000..42db6563a
--- /dev/null
+++ b/integrations/vite/qwik.test.ts
@@ -0,0 +1,100 @@
+import { candidate, css, fetchStyles, json, retryAssertion, test, ts } from '../utils'
+
+test(
+  'dev mode',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@builder.io/qwik": "^1",
+            "@builder.io/qwik-city": "^1",
+            "vite": "^5",
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import { defineConfig } from 'vite'
+        import { qwikVite } from '@builder.io/qwik/optimizer'
+        import { qwikCity } from '@builder.io/qwik-city/vite'
+        import tailwindcss from '@tailwindcss/vite'
+
+        export default defineConfig(() => {
+          return {
+            plugins: [tailwindcss(), qwikCity(), qwikVite()],
+          }
+        })
+      `,
+      'src/root.tsx': ts`
+        import { component$ } from '@builder.io/qwik'
+        import { QwikCityProvider, RouterOutlet } from '@builder.io/qwik-city'
+
+        import './global.css'
+
+        export default component$(() => {
+          return (
+            <QwikCityProvider>
+              <head></head>
+              <body>
+                <RouterOutlet />
+              </body>
+            </QwikCityProvider>
+          )
+        })
+      `,
+      'src/global.css': css`@import 'tailwindcss/utilities.css';`,
+      'src/entry.ssr.tsx': ts`
+        import { renderToStream, type RenderToStreamOptions } from '@builder.io/qwik/server'
+        import Root from './root'
+
+        export default function (opts: RenderToStreamOptions) {
+          return renderToStream(<Root />, opts)
+        }
+      `,
+      'src/routes/index.tsx': ts`
+        import { component$ } from '@builder.io/qwik'
+
+        export default component$(() => {
+          return <h1 class="underline">Hello World!</h1>
+        })
+      `,
+    },
+  },
+  async ({ fs, spawn, expect }) => {
+    let process = await spawn('pnpm vite --mode ssr')
+    await process.onStdout((m) => m.includes('ready in'))
+
+    let url = ''
+    await process.onStdout((m) => {
+      console.log(m)
+      let match = /Local:\s*(http.*)\//.exec(m)
+      if (match) url = match[1]
+      return Boolean(url)
+    })
+
+    await retryAssertion(async () => {
+      let css = await fetchStyles(url)
+      expect(css).toContain(candidate`underline`)
+    })
+
+    await retryAssertion(async () => {
+      await fs.write(
+        'src/routes/index.tsx',
+        ts`
+          import { component$ } from '@builder.io/qwik'
+
+          export default component$(() => {
+            return <h1 class="underline flex">Hello World!</h1>
+          })
+        `,
+      )
+
+      let css = await fetchStyles(url)
+      expect(css).toContain(candidate`underline`)
+      expect(css).toContain(candidate`flex`)
+    })
+  },
+)
diff --git a/integrations/vite/react-router.test.ts b/integrations/vite/react-router.test.ts
new file mode 100644
index 000000000..98b0c928d
--- /dev/null
+++ b/integrations/vite/react-router.test.ts
@@ -0,0 +1,266 @@
+import { candidate, css, fetchStyles, json, retryAssertion, test, ts, txt } from '../utils'
+
+const WORKSPACE = {
+  'package.json': json`
+    {
+      "type": "module",
+      "dependencies": {
+        "@react-router/dev": "^7",
+        "@react-router/node": "^7",
+        "@react-router/serve": "^7",
+        "@tailwindcss/vite": "workspace:^",
+        "@types/node": "^20",
+        "@types/react-dom": "^19",
+        "@types/react": "^19",
+        "isbot": "^5",
+        "react-dom": "^19",
+        "react-router": "^7",
+        "react": "^19",
+        "tailwindcss": "workspace:^",
+        "vite": "^5"
+      }
+    }
+  `,
+  'react-router.config.ts': ts`
+    import type { Config } from '@react-router/dev/config'
+    export default { ssr: true } satisfies Config
+  `,
+  'vite.config.ts': ts`
+    import { defineConfig } from 'vite'
+    import { reactRouter } from '@react-router/dev/vite'
+    import tailwindcss from '@tailwindcss/vite'
+
+    export default defineConfig({
+      plugins: [tailwindcss(), reactRouter()],
+    })
+  `,
+  'app/routes/home.tsx': ts`
+    export default function Home() {
+      return <h1 className="font-bold">Welcome to React Router</h1>
+    }
+  `,
+  'app/app.css': css`@import 'tailwindcss';`,
+  'app/routes.ts': ts`
+    import { type RouteConfig, index } from '@react-router/dev/routes'
+    export default [index('routes/home.tsx')] satisfies RouteConfig
+  `,
+  'app/root.tsx': ts`
+    import { Links, Meta, Outlet, Scripts, ScrollRestoration } from 'react-router'
+    import './app.css'
+    export function Layout({ children }: { children: React.ReactNode }) {
+      return (
+        <html lang="en">
+          <head>
+            <meta charSet="utf-8" />
+            <meta name="viewport" content="width=device-width, initial-scale=1" />
+            <Meta />
+            <Links />
+          </head>
+          <body>
+            {children}
+            <ScrollRestoration />
+            <Scripts />
+          </body>
+        </html>
+      )
+    }
+
+    export default function App() {
+      return <Outlet />
+    }
+  `,
+}
+
+test('dev mode', { fs: WORKSPACE }, async ({ fs, spawn, expect }) => {
+  let process = await spawn('pnpm react-router dev')
+
+  let url = ''
+  await process.onStdout((m) => {
+    let match = /Local:\s*(http.*)\//.exec(m)
+    if (match) url = match[1]
+    return Boolean(url)
+  })
+
+  await retryAssertion(async () => {
+    let css = await fetchStyles(url)
+    expect(css).toContain(candidate`font-bold`)
+  })
+
+  await retryAssertion(async () => {
+    await fs.write(
+      'app/routes/home.tsx',
+      ts`
+        export default function Home() {
+          return <h1 className="font-bold underline">Welcome to React Router</h1>
+        }
+      `,
+    )
+
+    let css = await fetchStyles(url)
+    expect(css).toContain(candidate`underline`)
+    expect(css).toContain(candidate`font-bold`)
+  })
+})
+
+test(
+  // cf. https://github.com/remix-run/react-router/blob/00cb4d7b310663b2e84152700c05d3b503005e83/integration/vite-hmr-hdr-test.ts#L311-L318
+  'dev mode, editing a server-only loader dependency triggers HDR instead of a full reload',
+  {
+    fs: {
+      ...WORKSPACE,
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@react-router/dev": "^7",
+            "@react-router/node": "^7",
+            "@react-router/serve": "^7",
+            "@tailwindcss/vite": "workspace:^",
+            "@types/node": "^20",
+            "@types/react-dom": "^19",
+            "@types/react": "^19",
+            "isbot": "^5",
+            "react-dom": "^19",
+            "react-router": "^7",
+            "react": "^19",
+            "tailwindcss": "workspace:^",
+            "vite": "^7"
+          }
+        }
+      `,
+      'app/routes/home.tsx': ts`
+        import type { Route } from './+types/home'
+        import { direct } from '../direct-hdr-dep'
+
+        export async function loader() {
+          return { message: direct }
+        }
+
+        export default function Home({ loaderData }: Route.ComponentProps) {
+          return (
+            <div>
+              <h1 className="font-bold">{loaderData.message}</h1>
+              <input data-testinput />
+            </div>
+          )
+        }
+      `,
+      'app/direct-hdr-dep.ts': ts` export const direct = 'HDR: 0' `,
+    },
+  },
+  async ({ fs, spawn, expect }) => {
+    let process = await spawn('pnpm react-router dev')
+
+    let url = ''
+    await process.onStdout((m) => {
+      let match = /Local:\s*(http.*)\//.exec(m)
+      if (match) url = match[1]
+      return Boolean(url)
+    })
+
+    // check initial state
+    await retryAssertion(async () => {
+      let html = await (await fetch(url)).text()
+      expect(html).toContain('HDR: 0')
+
+      let css = await fetchStyles(url)
+      expect(css).toContain(candidate`font-bold`)
+    })
+
+    // Flush stdout so we only see messages triggered by the edit below.
+    process.flush()
+
+    // Edit the server-only module. The client environment watches this file
+    // but it only exists in the server module graph. Without the fix, the
+    // Tailwind CSS plugin would trigger a full page reload on the client
+    // instead of letting react-router handle HDR.
+    await fs.write('app/direct-hdr-dep.ts', ts` export const direct = 'HDR: 1' `)
+
+    // check update
+    await retryAssertion(async () => {
+      let html = await (await fetch(url)).text()
+      expect(html).toContain('HDR: 1')
+
+      let css = await fetchStyles(url)
+      expect(css).toContain(candidate`font-bold`)
+    })
+
+    // Assert the client receives an HMR update (not a full page reload).
+    await process.onStdout((m) => m.includes('(client) hmr update'))
+  },
+)
+
+test('build mode', { fs: WORKSPACE }, async ({ spawn, exec, expect }) => {
+  await exec('pnpm react-router build')
+  let process = await spawn('pnpm react-router-serve ./build/server/index.js')
+
+  let url = ''
+  await process.onStdout((m) => {
+    let match = /\[react-router-serve\]\s*(http.*) \/?/.exec(m)
+    if (match) url = match[1]
+    return url != ''
+  })
+
+  await retryAssertion(async () => {
+    let css = await fetchStyles(url)
+    expect(css).toContain(candidate`font-bold`)
+  })
+})
+
+test(
+  'build mode using ?url stylesheet imports should only build one stylesheet (requires `file-system` scanner)',
+  {
+    fs: {
+      ...WORKSPACE,
+      'app/root.tsx': ts`
+        import { Links, Meta, Outlet, Scripts, ScrollRestoration } from 'react-router'
+        import styles from './app.css?url'
+        export const links: Route.LinksFunction = () => [{ rel: 'stylesheet', href: styles }]
+        export function Layout({ children }: { children: React.ReactNode }) {
+          return (
+            <html lang="en">
+              <head>
+                <meta charSet="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1" />
+                <Meta />
+                <Links />
+              </head>
+              <body class="dark">
+                {children}
+                <ScrollRestoration />
+                <Scripts />
+              </body>
+            </html>
+          )
+        }
+
+        export default function App() {
+          return <Outlet />
+        }
+      `,
+      'vite.config.ts': ts`
+        import { defineConfig } from 'vite'
+        import { reactRouter } from '@react-router/dev/vite'
+        import tailwindcss from '@tailwindcss/vite'
+
+        export default defineConfig({
+          plugins: [tailwindcss(), reactRouter()],
+        })
+      `,
+      '.gitignore': txt`
+        node_modules/
+        build/
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm react-router build')
+
+    let files = await fs.glob('build/client/assets/**/*.css')
+
+    expect(files).toHaveLength(1)
+    let [filename] = files[0]
+
+    await fs.expectFileToContain(filename, [candidate`font-bold`])
+  },
+)
diff --git a/integrations/vite/resolvers.test.ts b/integrations/vite/resolvers.test.ts
index 040f84391..fc9aca5c7 100644
--- a/integrations/vite/resolvers.test.ts
+++ b/integrations/vite/resolvers.test.ts
@@ -1,5 +1,661 @@
 import { describe } from 'vitest'
-import { candidate, css, fetchStyles, html, js, retryAssertion, test, ts, txt } from '../utils'
+import {
+  candidate,
+  css,
+  fetchStyles,
+  html,
+  js,
+  json,
+  retryAssertion,
+  test,
+  ts,
+  txt,
+  yaml,
+} from '../utils'
+
+test(
+  'resolves tsconfig paths in production build',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "vite": "^8"
+          }
+        }
+      `,
+      'tsconfig.json': json`
+        {
+          "compilerOptions": {
+            "baseUrl": ".",
+            "paths": {
+              "@/*": ["./src/*"]
+            }
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          build: { cssMinify: false },
+          plugins: [tailwindcss()],
+          resolve: {
+            tsconfigPaths: true,
+          },
+        })
+      `,
+      'index.html': html`
+        <head>
+          <link rel="stylesheet" href="./src/index.css" />
+        </head>
+        <body>
+          <div class="underline custom-underline">Hello, world!</div>
+        </body>
+      `,
+      'src/index.css': css`
+        @import '@/styles/base.css';
+        @plugin '@/plugin.js';
+      `,
+      'src/styles/base.css': css`
+        @reference 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+      'src/plugin.js': js`
+        export default function ({ addUtilities }) {
+          addUtilities({ '.custom-underline': { 'border-bottom': '1px solid green' } })
+        }
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm vite build')
+
+    let files = await fs.glob('dist/**/*.css')
+    expect(files).toHaveLength(1)
+    let [filename] = files[0]
+
+    await fs.expectFileToContain(filename, [candidate`underline`, candidate`custom-underline`])
+  },
+)
+
+test(
+  'resolves tsconfig paths in dev mode',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "vite": "^8"
+          }
+        }
+      `,
+      'tsconfig.json': json`
+        {
+          "compilerOptions": {
+            "baseUrl": ".",
+            "paths": {
+              "@/*": ["./src/*"]
+            }
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          build: { cssMinify: false },
+          plugins: [tailwindcss()],
+          resolve: {
+            tsconfigPaths: true,
+          },
+        })
+      `,
+      'index.html': html`
+        <head>
+          <link rel="stylesheet" href="./src/index.css" />
+        </head>
+        <body>
+          <div class="underline custom-underline">Hello, world!</div>
+        </body>
+      `,
+      'src/index.css': css`
+        @import '@/styles/base.css';
+        @plugin '@/plugin.js';
+      `,
+      'src/styles/base.css': css`
+        @reference 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+      'src/plugin.js': js`
+        export default function ({ addUtilities }) {
+          addUtilities({ '.custom-underline': { 'border-bottom': '1px solid green' } })
+        }
+      `,
+    },
+  },
+  async ({ spawn, expect }) => {
+    let process = await spawn('pnpm vite dev')
+    await process.onStdout((m) => m.includes('ready in'))
+
+    let url = ''
+    await process.onStdout((m) => {
+      let match = /Local:\s*(http.*)\//.exec(m)
+      if (match) url = match[1]
+      return Boolean(url)
+    })
+
+    await retryAssertion(async () => {
+      let styles = await fetchStyles(url, '/index.html')
+      expect(styles).toContain(candidate`underline`)
+      expect(styles).toContain(candidate`custom-underline`)
+    })
+  },
+)
+
+test(
+  'resolves at-sign aliases in production build',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "vite": "^8"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+        import { fileURLToPath } from 'node:url'
+
+        export default defineConfig({
+          build: { cssMinify: false },
+          plugins: [tailwindcss()],
+          resolve: {
+            alias: [{ find: '@', replacement: fileURLToPath(new URL('.', import.meta.url)) }],
+          },
+        })
+      `,
+      'index.html': html`
+        <head>
+          <link rel="stylesheet" href="./src/index.css" />
+        </head>
+        <body>
+          <div class="underline custom-underline">Hello, world!</div>
+        </body>
+      `,
+      'src/index.css': css`
+        @import '@/src/styles/base.css';
+        @plugin '@/src/plugin.js';
+      `,
+      'src/styles/base.css': css`
+        @reference 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+      'src/plugin.js': js`
+        export default function ({ addUtilities }) {
+          addUtilities({ '.custom-underline': { 'border-bottom': '1px solid green' } })
+        }
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm vite build')
+
+    let files = await fs.glob('dist/**/*.css')
+    expect(files).toHaveLength(1)
+    let [filename] = files[0]
+
+    await fs.expectFileToContain(filename, [candidate`underline`, candidate`custom-underline`])
+  },
+)
+
+test(
+  'resolves package plugins in production build with at-sign aliases',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "tailwind-scrollbar": "^4.0.2",
+            "tailwindcss-motion": "^1.1.1",
+            "vite": "^8"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+        import { fileURLToPath } from 'node:url'
+
+        export default defineConfig({
+          build: { cssMinify: false },
+          plugins: [tailwindcss()],
+          resolve: {
+            alias: [{ find: '@', replacement: fileURLToPath(new URL('.', import.meta.url)) }],
+          },
+        })
+      `,
+      'index.html': html`
+        <head>
+          <link rel="stylesheet" href="./src/index.css" />
+        </head>
+        <body>
+          <div class="scrollbar scrollbar-thumb-red-500 motion-preset-fade">Hello, world!</div>
+        </body>
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss';
+        @plugin 'tailwind-scrollbar';
+        @plugin 'tailwindcss-motion';
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm vite build')
+
+    let files = await fs.glob('dist/**/*.css')
+    expect(files).toHaveLength(1)
+    let [filename] = files[0]
+
+    await fs.expectFileToContain(filename, [
+      candidate`scrollbar`,
+      candidate`scrollbar-thumb-red-500`,
+      candidate`motion-preset-fade`,
+    ])
+  },
+)
+
+test(
+  'resolves package plugins to JS entries in production build when browser points to CSS',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "plugin-browser-css": "workspace:*",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "vite": "^8"
+          }
+        }
+      `,
+      'pnpm-workspace.yaml': yaml`
+        #
+        packages:
+          - packages/*
+      `,
+      'packages/plugin-browser-css/package.json': json`
+        {
+          "name": "plugin-browser-css",
+          "version": "1.0.0",
+          "type": "module",
+          "main": "./index.js",
+          "module": "./index.js",
+          "browser": "./browser.css"
+        }
+      `,
+      'packages/plugin-browser-css/index.js': js`
+        export default function ({ addUtilities }) {
+          addUtilities({ '.browser-css-plugin': { 'border-bottom': '1px solid green' } })
+        }
+      `,
+      'packages/plugin-browser-css/browser.css': css`
+        .should-not-be-loaded-as-a-plugin {
+          display: none;
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          build: { cssMinify: false },
+          plugins: [tailwindcss()],
+        })
+      `,
+      'index.html': html`
+        <html>
+          <head>
+            <link rel="stylesheet" href="./src/index.css" />
+          </head>
+          <body>
+            <div class="browser-css-plugin">Hello, world!</div>
+          </body>
+        </html>
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss';
+        @plugin 'plugin-browser-css';
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm vite build')
+
+    let files = await fs.glob('dist/**/*.css')
+    expect(files).toHaveLength(1)
+    let [filename] = files[0]
+
+    await fs.expectFileToContain(filename, [candidate`browser-css-plugin`])
+  },
+)
+
+test(
+  'resolves package plugins to JS entries in dev mode when browser points to CSS',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "plugin-browser-css": "workspace:*",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "vite": "^8"
+          }
+        }
+      `,
+      'pnpm-workspace.yaml': yaml`
+        #
+        packages:
+          - packages/*
+      `,
+      'packages/plugin-browser-css/package.json': json`
+        {
+          "name": "plugin-browser-css",
+          "version": "1.0.0",
+          "type": "module",
+          "main": "./index.js",
+          "module": "./index.js",
+          "browser": "./browser.css"
+        }
+      `,
+      'packages/plugin-browser-css/index.js': js`
+        export default function ({ addUtilities }) {
+          addUtilities({ '.browser-css-plugin': { 'border-bottom': '1px solid green' } })
+        }
+      `,
+      'packages/plugin-browser-css/browser.css': css`
+        .should-not-be-loaded-as-a-plugin {
+          display: none;
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          build: { cssMinify: false },
+          plugins: [tailwindcss()],
+        })
+      `,
+      'index.html': html`
+        <html>
+          <head>
+            <link rel="stylesheet" href="./src/index.css" />
+          </head>
+          <body>
+            <div class="browser-css-plugin">Hello, world!</div>
+          </body>
+        </html>
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss';
+        @plugin 'plugin-browser-css';
+      `,
+    },
+  },
+  async ({ spawn, expect }) => {
+    let process = await spawn('pnpm vite dev')
+    await process.onStdout((m) => m.includes('ready in'))
+
+    let url = ''
+    await process.onStdout((m) => {
+      let match = /Local:\s*(http.*)\//.exec(m)
+      if (match) url = match[1]
+      return Boolean(url)
+    })
+
+    await retryAssertion(async () => {
+      let styles = await fetchStyles(url, '/index.html')
+      expect(styles).toContain(candidate`browser-css-plugin`)
+    })
+  },
+)
+
+test(
+  'resolves package plugins in dev mode when package exports CSS files',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "daisyui": "^5",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "vite": "^8"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          build: { cssMinify: false },
+          plugins: [tailwindcss()],
+        })
+      `,
+      'index.html': html`
+        <html>
+          <head>
+            <link rel="stylesheet" href="./src/index.css" />
+          </head>
+          <body>
+            <button class="btn btn-primary">Hello, world!</button>
+          </body>
+        </html>
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss';
+        @plugin 'daisyui';
+      `,
+    },
+  },
+  async ({ spawn, expect }) => {
+    let process = await spawn('pnpm vite dev')
+    await process.onStdout((m) => m.includes('ready in'))
+
+    let url = ''
+    await process.onStdout((m) => {
+      let match = /Local:\s*(http.*)\//.exec(m)
+      if (match) url = match[1]
+      return Boolean(url)
+    })
+
+    await retryAssertion(async () => {
+      let styles = await fetchStyles(url, '/index.html')
+      expect(styles).toContain('.btn')
+      expect(styles).toContain('.btn-primary')
+    })
+  },
+)
+
+test(
+  'resolve relative CSS files correctly',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "vite": "^8"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          build: { cssMinify: false },
+          plugins: [tailwindcss()],
+        })
+      `,
+      'index.html': html`
+        <html>
+          <head>
+            <link rel="stylesheet" href="./src/index.css" />
+          </head>
+          <body></body>
+        </html>
+      `,
+      'src/index.css': css`
+        @reference 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+        @import './themes/glow.css';
+      `,
+      // References a file in the current folder, which names happens to match a
+      // file in the parent folder as well.
+      'src/themes/glow.css': css`@import './entry.css';`,
+      'src/themes/entry.css': css`
+        .do-include-me {
+          color: green;
+        }
+      `,
+
+      // Never rerefenced, so should not be included
+      'src/entry.css': css`
+        .do-not-include-me {
+          color: red;
+        }
+      `,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm vite build')
+
+    expect(
+      (await fs.dumpFiles('./dist/**/*.css')).replace(/-([-_a-zA-Z0-9]*?)\.css/g, '-<hash>.css'),
+    ).toMatchInlineSnapshot(`
+      "
+      --- ./dist/assets/index-<hash>.css ---
+      .do-include-me {
+        color: green;
+      }
+      "
+    `)
+  },
+)
+
+test(
+  'resolve relative JS files correctly',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "vite": "^8"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          build: { cssMinify: false },
+          plugins: [tailwindcss()],
+        })
+      `,
+      'index.html': html`
+        <html>
+          <head>
+            <link rel="stylesheet" href="./src/index.css" />
+          </head>
+          <body></body>
+        </html>
+      `,
+      'src/index.css': css`
+        @reference 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+        @import './themes/glow.css';
+      `,
+      // References a file in the current folder, which names happens to match a
+      // file in the parent folder as well.
+      'src/themes/glow.css': css`@plugin "./my-plugin.js";`,
+      'src/themes/my-plugin.js': ts`
+        export default function ({ addBase }) {
+          addBase({ '.do-include-me': { color: 'green' } })
+        }
+      `,
+
+      // Never rerefenced, so should not be included
+      'src/my-plugin.js': css`
+        export default function ({ addBase }) {
+          addBase({ '.do-not-include-me': { 'color': 'red' } })
+        }
+      `,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm vite build')
+
+    expect(
+      (await fs.dumpFiles('./dist/**/*.css')).replace(/-([-_a-zA-Z0-9]*?)\.css/g, '-<hash>.css'),
+    ).toMatchInlineSnapshot(`
+        "
+        --- ./dist/assets/index-<hash>.css ---
+        @layer base {
+          .do-include-me {
+            color: green;
+          }
+        }
+        "
+      `)
+  },
+)
 
 describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
   test(
@@ -14,7 +670,7 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
               "tailwindcss": "workspace:^"
             },
             "devDependencies": {
-              ${transformer === 'lightningcss' ? `"lightningcss": "^1.26.0",` : ''}
+              ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
               "vite": "^5.3.5"
             }
           }
@@ -49,7 +705,7 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
           @plugin '#js-alias';
         `,
         'src/alias.css': css`
-          @import 'tailwindcss/theme' theme(reference);
+          @reference 'tailwindcss/theme';
           @import 'tailwindcss/utilities';
         `,
         'src/plugin.js': js`
@@ -82,7 +738,7 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
               "tailwindcss": "workspace:^"
             },
             "devDependencies": {
-              ${transformer === 'lightningcss' ? `"lightningcss": "^1.26.0",` : ''}
+              ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
               "vite": "^5.3.5"
             }
           }
@@ -117,7 +773,7 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
           @plugin '#js-alias';
         `,
         'src/alias.css': css`
-          @import 'tailwindcss/theme' theme(reference);
+          @reference 'tailwindcss/theme';
           @import 'tailwindcss/utilities';
         `,
         'src/plugin.js': js`
diff --git a/integrations/vite/solidstart.test.ts b/integrations/vite/solidstart.test.ts
new file mode 100644
index 000000000..bbe9ccc88
--- /dev/null
+++ b/integrations/vite/solidstart.test.ts
@@ -0,0 +1,108 @@
+import { candidate, css, fetchStyles, js, json, retryAssertion, test, ts } from '../utils'
+
+const WORKSPACE = {
+  'package.json': json`
+    {
+      "type": "module",
+      "dependencies": {
+        "@solidjs/start": "^1",
+        "solid-js": "^1",
+        "vinxi": "^0",
+        "@tailwindcss/vite": "workspace:^",
+        "tailwindcss": "workspace:^"
+      }
+    }
+  `,
+  'jsconfig.json': json`
+    {
+      "compilerOptions": {
+        "jsx": "preserve",
+        "jsxImportSource": "solid-js"
+      }
+    }
+  `,
+  'app.config.js': ts`
+    import { defineConfig } from '@solidjs/start/config'
+    import tailwindcss from '@tailwindcss/vite'
+
+    export default defineConfig({
+      vite: {
+        plugins: [tailwindcss()],
+      },
+    })
+  `,
+  'src/entry-server.jsx': js`
+    // @refresh reload
+    import { createHandler, StartServer } from '@solidjs/start/server'
+
+    export default createHandler(() => (
+      <StartServer
+        document={({ assets, children, scripts }) => (
+          <html lang="en">
+            <head>{assets}</head>
+            <body>
+              <div id="app">{children}</div>
+              {scripts}
+            </body>
+          </html>
+        )}
+      />
+    ))
+  `,
+  'src/entry-client.jsx': js`
+    // @refresh reload
+    import { mount, StartClient } from '@solidjs/start/client'
+
+    mount(() => <StartClient />, document.getElementById('app'))
+  `,
+  'src/app.jsx': js`
+    import './app.css'
+    export default function App() {
+      return <h1 class="underline">Hello world!</h1>
+    }
+  `,
+  'src/app.css': css`@import 'tailwindcss';`,
+}
+
+test(
+  'dev mode',
+  {
+    fs: WORKSPACE,
+  },
+  async ({ fs, spawn, expect }) => {
+    let process = await spawn('pnpm vinxi dev', {
+      env: {
+        TEST: 'false', // VERY IMPORTANT OTHERWISE YOU WON'T GET OUTPUT
+        NODE_ENV: 'development',
+      },
+    })
+
+    let url = ''
+    await process.onStdout((m) => {
+      let match = /Local:\s*(http.*)\//.exec(m)
+      if (match) url = match[1]
+      return Boolean(url)
+    })
+
+    await retryAssertion(async () => {
+      let css = await fetchStyles(url)
+      expect(css).toContain(candidate`underline`)
+    })
+
+    await retryAssertion(async () => {
+      await fs.write(
+        'src/app.jsx',
+        js`
+          import './app.css'
+          export default function App() {
+            return <h1 class="underline font-bold">Hello world!</h1>
+          }
+        `,
+      )
+
+      let css = await fetchStyles(url)
+      expect(css).toContain(candidate`underline`)
+      expect(css).toContain(candidate`font-bold`)
+    })
+  },
+)
diff --git a/integrations/vite/source-maps.test.ts b/integrations/vite/source-maps.test.ts
new file mode 100644
index 000000000..fe26d9a7c
--- /dev/null
+++ b/integrations/vite/source-maps.test.ts
@@ -0,0 +1,157 @@
+import { candidate, css, fetchStyles, html, json, retryAssertion, test, ts } from '../utils'
+
+test(
+  `dev build`,
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "lightningcss": "^1",
+            "vite": "^7"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          plugins: [tailwindcss()],
+          css: {
+            devSourcemap: true,
+          },
+        })
+      `,
+      'index.html': html`
+        <head>
+          <link rel="stylesheet" href="./src/index.css" />
+        </head>
+        <body>
+          <div class="flex">Hello, world!</div>
+        </body>
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss/utilities';
+        /*  */
+      `,
+    },
+  },
+  async ({ fs, spawn, expect, parseSourceMap }) => {
+    // Source maps only work in development mode in Vite
+    let process = await spawn('pnpm vite dev')
+    await process.onStdout((m) => m.includes('ready in'))
+
+    let url = ''
+    await process.onStdout((m) => {
+      let match = /Local:\s*(http.*)\//.exec(m)
+      if (match) url = match[1]
+      return Boolean(url)
+    })
+
+    let styles = await retryAssertion(async () => {
+      let styles = await fetchStyles(url, '/index.html')
+
+      // Wait until we have the right CSS
+      expect(styles).toContain(candidate`flex`)
+
+      return styles
+    })
+
+    // Make sure we can find a source map
+    let map = parseSourceMap(styles)
+
+    expect(map.at(1, 0)).toMatchObject({
+      source: null,
+      original: '(none)',
+      generated: '/*! tailwi...',
+    })
+
+    expect(map.at(2, 0)).toMatchObject({
+      source: expect.stringContaining('utilities.css'),
+      original: '@tailwind...',
+      generated: '.flex {...',
+    })
+
+    expect(map.at(3, 2)).toMatchObject({
+      source: expect.stringContaining('utilities.css'),
+      original: '@tailwind...',
+      generated: 'display: f...',
+    })
+
+    expect(map.at(4, 0)).toMatchObject({
+      source: null,
+      original: '(none)',
+      generated: '}...',
+    })
+  },
+)
+
+// https://github.com/tailwindlabs/tailwindcss/issues/19930
+test(
+  'production build without Tailwind roots should not result in source map warnings',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "@tailwindcss/vite": "workspace:^",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "vite": "^7"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import { defineConfig } from 'vite'
+        import tailwindcss from '@tailwindcss/vite'
+
+        export default defineConfig({
+          plugins: [
+            tailwindcss(),
+            {
+              name: 'inspect-source-map-chain',
+              enforce: 'pre',
+              transform(_, id) {
+                if (id.includes('.css')) {
+                  // Force Rollup to collapse the sourcemap chain during this build.
+                  this.getCombinedSourcemap()
+                }
+              },
+            },
+          ],
+          css: {
+            devSourcemap: true,
+          },
+          build: {
+            sourcemap: true,
+          },
+        })
+      `,
+      'index.html': html`
+        <body>
+          <script type="module" src="./src/index.js"></script>
+          <div>Hello, world!</div>
+        </body>
+      `,
+      'src/index.js': ts` import './index.css' `,
+      'src/index.css': css`
+        body {
+          color: red;
+        }
+      `,
+    },
+  },
+  async ({ exec, expect }) => {
+    let output = await exec('pnpm vite build')
+
+    expect(output).not.toContain('Sourcemap is likely to be incorrect')
+  },
+)
diff --git a/integrations/vite/ssr.test.ts b/integrations/vite/ssr.test.ts
index 3c3f1cc4b..a1d660816 100644
--- a/integrations/vite/ssr.test.ts
+++ b/integrations/vite/ssr.test.ts
@@ -1,138 +1,72 @@
+import { describe } from 'vitest'
 import { candidate, css, html, json, test, ts } from '../utils'
 
-test(
-  'Vite 5',
-  {
-    fs: {
-      'package.json': json`
-        {
-          "type": "module",
-          "dependencies": {
-            "@tailwindcss/vite": "workspace:^",
-            "tailwindcss": "workspace:^"
-          },
-          "_comment": "This test uses Vite 5.3 on purpose. Do not upgrade it to Vite 6.",
-          "devDependencies": {
-            "vite": "^5.3"
+describe.each([['^5.3'], ['^6.0'], ['^7'], ['^8']])('Using Vite %s', (version) => {
+  test(
+    `SSR build`,
+    {
+      fs: {
+        'package.json': json`
+          {
+            "type": "module",
+            "dependencies": {
+              "@tailwindcss/vite": "workspace:^",
+              "tailwindcss": "workspace:^"
+            },
+            "devDependencies": {
+              "vite": "${version}"
+            }
           }
-        }
-      `,
-      'vite.config.ts': ts`
-        import tailwindcss from '@tailwindcss/vite'
-        import { defineConfig } from 'vite'
+        `,
+        'vite.config.ts': ts`
+          import tailwindcss from '@tailwindcss/vite'
+          import { defineConfig } from 'vite'
 
-        export default defineConfig({
-          build: {
-            cssMinify: false,
-            ssrEmitAssets: true,
-          },
-          plugins: [tailwindcss()],
-          ssr: { resolve: { conditions: [] } },
-        })
-      `,
-      'index.html': html`
-        <body>
-          <div id="app"></div>
-          <script type="module" src="./src/index.ts"></script>
-        </body>
-      `,
-      'src/index.css': css`@import 'tailwindcss';`,
-      'src/index.ts': ts`
-        import './index.css'
+          export default defineConfig({
+            build: {
+              cssMinify: false,
+              ssrEmitAssets: true,
+            },
+            plugins: [tailwindcss()],
+          })
+        `,
+        'index.html': html`
+          <body>
+            <div id="app"></div>
+            <script type="module" src="./src/index.ts"></script>
+          </body>
+        `,
+        'src/index.css': css`@import 'tailwindcss';`,
+        'src/index.ts': ts`
+          import './index.css'
 
-        document.querySelector('#app').innerHTML = \`
-          <div class="underline m-2">Hello, world!</div>
-        \`
-      `,
-      'server.ts': ts`
-        import css from './src/index.css?url'
+          document.querySelector('#app').innerHTML = \`
+            <div class="underline m-2">Hello, world!</div>
+          \`
+        `,
+        'server.ts': ts`
+          import css from './src/index.css?url'
 
-        document.querySelector('#app').innerHTML = \`
-          <link rel="stylesheet" href="\${css}">
-          <div class="underline m-2">Hello, world!</div>
-        \`
-      `,
+          document.querySelector('#app').innerHTML = \`
+            <link rel="stylesheet" href="\${css}">
+            <div class="overline m-3">Hello, world!</div>
+          \`
+        `,
+      },
     },
-  },
-  async ({ fs, exec, expect }) => {
-    await exec('pnpm vite build --ssr server.ts')
+    async ({ fs, exec, expect }) => {
+      await exec('pnpm vite build --ssr server.ts')
 
-    let files = await fs.glob('dist/**/*.css')
-    expect(files).toHaveLength(1)
-    let [filename] = files[0]
+      let files = await fs.glob('dist/**/*.css')
+      expect(files).toHaveLength(1)
+      let [filename] = files[0]
 
-    await fs.expectFileToContain(filename, [
-      //
-      candidate`underline`,
-      candidate`m-2`,
-    ])
-  },
-)
-
-test(
-  `Vite 6`,
-  {
-    fs: {
-      'package.json': json`
-        {
-          "type": "module",
-          "dependencies": {
-            "@tailwindcss/vite": "workspace:^",
-            "tailwindcss": "workspace:^"
-          },
-          "devDependencies": {
-            "vite": "^6.0"
-          }
-        }
-      `,
-      'vite.config.ts': ts`
-        import tailwindcss from '@tailwindcss/vite'
-        import { defineConfig } from 'vite'
-
-        export default defineConfig({
-          build: {
-            cssMinify: false,
-            ssrEmitAssets: true,
-          },
-          plugins: [tailwindcss()],
-          ssr: { resolve: { conditions: [] } },
-        })
-      `,
-      'index.html': html`
-        <body>
-          <div id="app"></div>
-          <script type="module" src="./src/index.ts"></script>
-        </body>
-      `,
-      'src/index.css': css`@import 'tailwindcss';`,
-      'src/index.ts': ts`
-        import './index.css'
-
-        document.querySelector('#app').innerHTML = \`
-          <div class="underline m-2">Hello, world!</div>
-        \`
-      `,
-      'server.ts': ts`
-        import css from './src/index.css?url'
-
-        document.querySelector('#app').innerHTML = \`
-          <link rel="stylesheet" href="\${css}">
-          <div class="underline m-2">Hello, world!</div>
-        \`
-      `,
+      await fs.expectFileToContain(filename, [
+        candidate`underline`,
+        candidate`m-2`,
+        candidate`overline`,
+        candidate`m-3`,
+      ])
     },
-  },
-  async ({ fs, exec, expect }) => {
-    await exec('pnpm vite build --ssr server.ts')
-
-    let files = await fs.glob('dist/**/*.css')
-    expect(files).toHaveLength(1)
-    let [filename] = files[0]
-
-    await fs.expectFileToContain(filename, [
-      //
-      candidate`underline`,
-      candidate`m-2`,
-    ])
-  },
-)
+  )
+})
diff --git a/integrations/vite/svelte.test.ts b/integrations/vite/svelte.test.ts
index 33eca5a13..e186c3f85 100644
--- a/integrations/vite/svelte.test.ts
+++ b/integrations/vite/svelte.test.ts
@@ -14,7 +14,7 @@ test(
           "devDependencies": {
             "@sveltejs/vite-plugin-svelte": "^5",
             "@tailwindcss/vite": "workspace:^",
-            "vite": "^6"
+            "vite": "^7"
           }
         }
       `,
@@ -57,19 +57,19 @@ test(
         <h1 class="global local underline">Hello {name}!</h1>
 
         <style>
-          @import 'tailwindcss' reference;
           @import './other.css';
+          @reference 'tailwindcss';
         </style>
       `,
       'src/other.css': css`
         .local {
           @apply text-red-500;
-          animation: 2s ease-in-out 0s infinite localKeyframes;
+          animation: 2s ease-in-out infinite localKeyframes;
         }
 
         :global(.global) {
           @apply text-green-500;
-          animation: 2s ease-in-out 0s infinite globalKeyframes;
+          animation: 2s ease-in-out infinite globalKeyframes;
         }
 
         @keyframes -global-globalKeyframes {
@@ -93,18 +93,21 @@ test(
     },
   },
   async ({ exec, fs, expect }) => {
-    await exec('pnpm vite build')
+    let output = await exec('pnpm vite build')
 
     let files = await fs.glob('dist/**/*.css')
     expect(files).toHaveLength(1)
 
     await fs.expectFileToContain(files[0][0], [
       candidate`underline`,
-      '.global{color:var(--color-green-500);animation:2s ease-in-out 0s infinite globalKeyframes}',
-      /\.local.svelte-.*\{color:var\(--color-red-500\);animation:2s ease-in-out 0s infinite svelte-.*-localKeyframes\}/,
+      '.global{color:var(--color-green-500,oklch(72.3% .219 149.579));animation:2s ease-in-out infinite globalKeyframes}',
+      /\.local.svelte-.*\{color:var\(--color-red-500,oklch\(63\.7% \.237 25\.331\)\);animation:2s ease-in-out infinite svelte-.*-localKeyframes\}/,
       /@keyframes globalKeyframes\{/,
       /@keyframes svelte-.*-localKeyframes\{/,
     ])
+
+    // Should not print any warnings
+    expect(output).not.toContain('vite-plugin-svelte')
   },
 )
 
@@ -122,7 +125,7 @@ test(
           "devDependencies": {
             "@sveltejs/vite-plugin-svelte": "^5",
             "@tailwindcss/vite": "workspace:^",
-            "vite": "^6"
+            "vite": "^7"
           }
         }
       `,
@@ -164,20 +167,20 @@ test(
         <h1 class="local global underline">Hello {name}!</h1>
 
         <style>
-          @import 'tailwindcss' reference;
           @import './other.css';
+          @reference 'tailwindcss';
         </style>
       `,
       'src/index.css': css` @import 'tailwindcss'; `,
       'src/other.css': css`
         .local {
           @apply text-red-500;
-          animation: 2s ease-in-out 0s infinite localKeyframes;
+          animation: 2s ease-in-out infinite localKeyframes;
         }
 
         :global(.global) {
           @apply text-green-500;
-          animation: 2s ease-in-out 0s infinite globalKeyframes;
+          animation: 2s ease-in-out infinite globalKeyframes;
         }
 
         @keyframes -global-globalKeyframes {
@@ -210,10 +213,10 @@ test(
       let [, css] = files[0]
       expect(css).toContain(candidate`underline`)
       expect(css).toContain(
-        '.global{color:var(--color-green-500);animation:2s ease-in-out 0s infinite globalKeyframes}',
+        '.global{color:var(--color-green-500,oklch(72.3% .219 149.579));animation:2s ease-in-out infinite globalKeyframes}',
       )
       expect(css).toMatch(
-        /\.local.svelte-.*\{color:var\(--color-red-500\);animation:2s ease-in-out 0s infinite svelte-.*-localKeyframes\}/,
+        /\.local.svelte-.*\{color:var\(--color-red-500,oklch\(63\.7% \.237 25\.331\)\);animation:2s ease-in-out infinite svelte-.*-localKeyframes\}/,
       )
       expect(css).toMatch(/@keyframes globalKeyframes\{/)
       expect(css).toMatch(/@keyframes svelte-.*-localKeyframes\{/)
@@ -235,14 +238,16 @@ test(
       let [, css] = files[0]
       expect(css).toContain(candidate`font-bold`)
       expect(css).toContain(
-        '.global{color:var(--color-green-500);animation:2s ease-in-out 0s infinite globalKeyframes}',
+        '.global{color:var(--color-green-500,oklch(72.3% .219 149.579));animation:2s ease-in-out infinite globalKeyframes}',
       )
       expect(css).toMatch(
-        /\.local.svelte-.*\{color:var\(--color-red-500\);animation:2s ease-in-out 0s infinite svelte-.*-localKeyframes\}/,
+        /\.local.svelte-.*\{color:var\(--color-red-500,oklch\(63\.7% \.237 25\.331\)\);animation:2s ease-in-out infinite svelte-.*-localKeyframes\}/,
       )
       expect(css).toMatch(/@keyframes globalKeyframes\{/)
       expect(css).toMatch(/@keyframes svelte-.*-localKeyframes\{/)
-      expect(css).toMatch(/\.bar.svelte-.*\{color:var\(--color-pink-500\)\}/)
+      expect(css).toMatch(
+        /\.bar.svelte-.*\{color:var\(--color-pink-500,oklch\(65\.6% \.241 354\.308\)\)\}/,
+      )
     })
   },
 )
diff --git a/integrations/vite/sveltekit.test.ts b/integrations/vite/sveltekit.test.ts
new file mode 100644
index 000000000..92e855da9
--- /dev/null
+++ b/integrations/vite/sveltekit.test.ts
@@ -0,0 +1,80 @@
+import { candidate, css, html, js, json, test, ts } from '../utils'
+
+test(
+  'sveltekit build resolves package plugins',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "scripts": {
+            "prepare": "svelte-kit sync || echo ''"
+          },
+          "dependencies": {
+            "svelte": "^5",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "@sveltejs/adapter-auto": "^6",
+            "@sveltejs/kit": "^2",
+            "@tailwindcss/forms": "^0.5.11",
+            "@tailwindcss/vite": "workspace:^",
+            "vite": "^8"
+          }
+        }
+      `,
+      'svelte.config.js': js`
+        import adapter from '@sveltejs/adapter-auto'
+
+        export default {
+          kit: {
+            adapter: adapter(),
+          },
+        }
+      `,
+      'vite.config.ts': ts`
+        import tailwindcss from '@tailwindcss/vite'
+        import { sveltekit } from '@sveltejs/kit/vite'
+        import { defineConfig } from 'vite'
+
+        export default defineConfig({
+          build: { cssMinify: false },
+          plugins: [tailwindcss(), sveltekit()],
+        })
+      `,
+      'src/app.html': html`
+        <!doctype html>
+        <html lang="en">
+          <head>
+            %sveltekit.head%
+          </head>
+          <body data-sveltekit-preload-data="hover">
+            <div style="display: contents">%sveltekit.body%</div>
+          </body>
+        </html>
+      `,
+      'src/routes/+layout.svelte': html`
+        <script>
+          import '../app.css'
+        </script>
+
+        <slot />
+      `,
+      'src/routes/+page.svelte': html`
+        <div class="form-input">Hello, world!</div>
+      `,
+      'src/app.css': css`
+        @import 'tailwindcss';
+        @plugin '@tailwindcss/forms';
+      `,
+    },
+  },
+  async ({ exec, fs, expect }) => {
+    await exec('pnpm vite build')
+
+    let files = await fs.glob('.svelte-kit/output/client/**/*.css')
+    expect(files.length).toBeGreaterThan(0)
+
+    await fs.expectFileToContain(files[0][0], [candidate`form-input`])
+  },
+)
diff --git a/integrations/vite/url-rewriting.test.ts b/integrations/vite/url-rewriting.test.ts
index a7c6433d4..500fe6d71 100644
--- a/integrations/vite/url-rewriting.test.ts
+++ b/integrations/vite/url-rewriting.test.ts
@@ -15,9 +15,9 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
               "tailwindcss": "workspace:^"
             },
             "devDependencies": {
-              ${transformer === 'lightningcss' ? `"lightningcss": "^1.26.0",` : ''}
+              ${transformer === 'lightningcss' ? `"lightningcss": "^1",` : ''}
               "@tailwindcss/vite": "workspace:^",
-              "vite": "^6"
+              "vite": "^7"
             }
           }
         `,
@@ -42,31 +42,36 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
             </head>
             <body>
               <div id="app"></div>
-              <script type="module" src="./src/main.ts"></script>
             </body>
           </html>
         `,
-        'src/main.ts': ts``,
         'src/app.css': css`
+          @reference 'tailwindcss';
           @import './dir-1/bar.css';
           @import './dir-1/dir-2/baz.css';
           @import './dir-1/dir-2/vector.css';
         `,
         'src/dir-1/bar.css': css`
-          .bar {
+          .test1 {
             background-image: url('../../resources/image.png');
           }
         `,
         'src/dir-1/dir-2/baz.css': css`
-          .baz {
+          .test2 {
             background-image: url('../../../resources/image.png');
           }
         `,
         'src/dir-1/dir-2/vector.css': css`
-          .baz {
+          @import './dir-3/vector.css';
+          .test3 {
             background-image: url('../../../resources/vector.svg');
           }
         `,
+        'src/dir-1/dir-2/dir-3/vector.css': css`
+          .test4 {
+            background-image: url('./vector-2.svg');
+          }
+        `,
         'resources/image.png': binary(SIMPLE_IMAGE),
         'resources/vector.svg': svg`
           <svg width="400" height="400" xmlns="http://www.w3.org/2000/svg">
@@ -76,6 +81,14 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
             <circle cx="200" cy="100" r="80" fill="green" />
           </svg>
         `,
+        'src/dir-1/dir-2/dir-3/vector-2.svg': svg`
+          <svg width="400" height="400" xmlns="http://www.w3.org/2000/svg">
+            <rect width="100%" height="100%" fill="blue" />
+            <circle cx="200" cy="100" r="80" fill="green" />
+            <rect width="100%" height="100%" fill="red" />
+            <circle cx="200" cy="100" r="80" fill="pink" />
+          </svg>
+       `,
       },
     },
     async ({ fs, exec, expect }) => {
@@ -87,7 +100,7 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => {
       await fs.expectFileToContain(files[0][0], [SIMPLE_IMAGE])
 
       let images = await fs.glob('dist/**/*.svg')
-      expect(images).toHaveLength(1)
+      expect(images).toHaveLength(2)
 
       await fs.expectFileToContain(files[0][0], [/\/assets\/vector-.*?\.svg/])
     },
diff --git a/integrations/vite/virtual-modules.test.ts b/integrations/vite/virtual-modules.test.ts
new file mode 100644
index 000000000..12eadb6c7
Binary files /dev/null and b/integrations/vite/virtual-modules.test.ts differ
diff --git a/integrations/vite/vue.test.ts b/integrations/vite/vue.test.ts
index 7b5da2904..b04f57c6b 100644
--- a/integrations/vite/vue.test.ts
+++ b/integrations/vite/vue.test.ts
@@ -1,4 +1,5 @@
-import { candidate, html, json, test, ts } from '../utils'
+import { stripVTControlCharacters } from 'node:util'
+import { candidate, css, fetchStyles, html, json, retryAssertion, test, ts } from '../utils'
 
 test(
   'production build',
@@ -14,7 +15,7 @@ test(
           "devDependencies": {
             "@vitejs/plugin-vue": "^5.1.2",
             "@tailwindcss/vite": "workspace:^",
-            "vite": "^6"
+            "vite": "^7"
           }
         }
       `,
@@ -71,3 +72,309 @@ test(
     await fs.expectFileToContain(files[0][0], ['.bar{'])
   },
 )
+
+{
+  const VUE_COMPONENT_COUNT = 1_000
+
+  let vueComponentsWithReferences = Object.fromEntries(
+    Array.from({ length: VUE_COMPONENT_COUNT }, (_, idx) => [
+      `src/components/Component${idx}.vue`,
+      html`
+        <template>
+          <div class="content-['component-${idx}']">Component ${idx}</div>
+        </template>
+
+        <style>
+          @reference '../main.css';
+
+          .component-${idx} {
+            @apply text-red-500;
+          }
+        </style>
+      `,
+    ]),
+  )
+
+  let vueComponentImports = Array.from(
+    { length: VUE_COMPONENT_COUNT },
+    (_, idx) => `import Component${idx} from './components/Component${idx}.vue'`,
+  ).join('\n')
+
+  let vueComponentUsages = Array.from(
+    { length: VUE_COMPONENT_COUNT },
+    (_, idx) => `<Component${idx} class="component-${idx}" />`,
+  ).join('\n')
+
+  test(
+    'production build with many Vue style blocks referencing the main stylesheet',
+    {
+      fs: {
+        'package.json': json`
+          {
+            "type": "module",
+            "dependencies": {
+              "vue": "^3.4.37",
+              "tailwindcss": "workspace:^"
+            },
+            "devDependencies": {
+              "@vitejs/plugin-vue": "^5.1.2",
+              "@tailwindcss/vite": "workspace:^",
+              "vite": "^7"
+            }
+          }
+        `,
+        'vite.config.ts': ts`
+          import { defineConfig } from 'vite'
+          import vue from '@vitejs/plugin-vue'
+          import tailwindcss from '@tailwindcss/vite'
+
+          export default defineConfig({
+            plugins: [vue(), tailwindcss()],
+          })
+        `,
+        'index.html': html`
+          <!doctype html>
+          <html>
+            <body>
+              <div id="app"></div>
+              <script type="module" src="./src/main.ts"></script>
+            </body>
+          </html>
+        `,
+        'src/main.css': css`@import 'tailwindcss';`,
+        'src/main.ts': ts`
+          import { createApp } from 'vue'
+          import './main.css'
+          import App from './App.vue'
+
+          createApp(App).mount('#app')
+        `,
+        'src/App.vue': html`
+          <script setup>
+            ${vueComponentImports}
+          </script>
+
+          <template>${vueComponentUsages}</template>
+        `,
+        ...vueComponentsWithReferences,
+      },
+    },
+    async ({ fs, exec, expect }) => {
+      await exec('pnpm vite build')
+
+      let files = await fs.glob('dist/**/*.css')
+      expect(files).toHaveLength(1)
+
+      await fs.expectFileToContain(files[0][0], [
+        candidate`content-['component-0']`,
+        candidate`component-0`,
+        candidate`content-['component-99']`,
+        candidate`component-99`,
+        candidate`content-['component-999']`,
+        candidate`component-999`,
+      ])
+    },
+  )
+}
+
+test(
+  'error when using `@apply` without `@reference`',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "vue": "^3.4.37",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "@vitejs/plugin-vue": "^5.1.2",
+            "@tailwindcss/vite": "workspace:^",
+            "vite": "^7"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import { defineConfig } from 'vite'
+        import vue from '@vitejs/plugin-vue'
+        import tailwindcss from '@tailwindcss/vite'
+
+        export default defineConfig({
+          plugins: [vue(), tailwindcss()],
+        })
+      `,
+      'index.html': html`
+        <!doctype html>
+        <html>
+          <body>
+            <div id="app"></div>
+            <script type="module" src="./src/main.ts"></script>
+          </body>
+        </html>
+      `,
+      'src/main.ts': ts`
+        import { createApp } from 'vue'
+        import App from './App.vue'
+
+        createApp(App).mount('#app')
+      `,
+      'src/App.vue': html`
+        <template>
+          <div class="foo">Hello Vue!</div>
+        </template>
+
+        <style>
+          .foo {
+            @apply text-red-500;
+          }
+        </style>
+      `,
+    },
+  },
+  async ({ exec, expect }) => {
+    expect.assertions(1)
+
+    try {
+      await exec('pnpm vite build', {}, { ignoreStdErr: true })
+    } catch (error) {
+      let [, message] =
+        /error during build:([\s\S]*?)file:/g.exec(
+          stripVTControlCharacters(error.message.replace(/\r?\n/g, '\n')),
+        ) ?? []
+      expect(message.trim()).toMatchInlineSnapshot(
+        `"[@tailwindcss/vite:generate:build] Cannot apply unknown utility class \`text-red-500\`. Are you using CSS modules or similar and missing \`@reference\`? https://tailwindcss.com/docs/functions-and-directives#reference-directive"`,
+      )
+    }
+  },
+)
+
+// https://github.com/tailwindlabs/tailwindcss/issues/20320
+test(
+  'editing a scanned `.vue` file that is not loaded as a module does not trigger a full reload',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "type": "module",
+          "dependencies": {
+            "vue": "^3.4.37",
+            "tailwindcss": "workspace:^"
+          },
+          "devDependencies": {
+            "@vitejs/plugin-vue": "^6",
+            "@tailwindcss/vite": "workspace:^",
+            "vite": "^8"
+          }
+        }
+      `,
+      'vite.config.ts': ts`
+        import fs from 'node:fs'
+        import path from 'node:path'
+        import { defineConfig } from 'vite'
+        import vue from '@vitejs/plugin-vue'
+        import tailwindcss from '@tailwindcss/vite'
+
+        export default defineConfig({
+          plugins: [
+            vue(),
+            tailwindcss(),
+            {
+              // Log update and full-reload HMR payloads to a file so the
+              // test can assert on them. Custom events are not logged
+              // because \`@vitejs/plugin-vue\` sends a \`file-changed\` event
+              // for every file change, including changes to the log file
+              // itself, which would cause an infinite feedback loop.
+              name: 'hmr-wiretap',
+              configureServer(server) {
+                let logFile = path.resolve('hmr.log')
+                fs.writeFileSync(logFile, '')
+                for (let environment of Object.values(server.environments)) {
+                  let send = environment.hot.send.bind(environment.hot)
+                  environment.hot.send = (payload) => {
+                    if (payload.type === 'update' || payload.type === 'full-reload') {
+                      fs.appendFileSync(logFile, JSON.stringify(payload) + '\\n')
+                    }
+                    return send(payload)
+                  }
+                }
+              },
+            },
+          ],
+        })
+      `,
+      'index.html': html`
+        <!doctype html>
+        <html>
+          <head>
+            <link rel="stylesheet" href="./src/index.css" />
+          </head>
+          <body>
+            <div id="app"></div>
+            <script type="module" src="./src/main.ts"></script>
+          </body>
+        </html>
+      `,
+      'src/index.css': css`@import 'tailwindcss';`,
+      'src/main.ts': ts`
+        import { createApp } from 'vue'
+        import App from './App.vue'
+
+        createApp(App).mount('#app')
+      `,
+      'src/App.vue': html`
+        <template>
+          <div class="content-['src/App.vue']">Hello Vue!</div>
+        </template>
+      `,
+
+      // This file is scanned by Tailwind but never imported, so it is not
+      // part of the loaded module graph (e.g. a lazy route that hasn't been
+      // visited yet)
+      'src/LazyRoute.vue': html`
+        <template>
+          <div class="content-['src/LazyRoute.vue']">Lazy</div>
+        </template>
+      `,
+    },
+  },
+  async ({ spawn, fs, expect }) => {
+    let process = await spawn('pnpm vite dev')
+    await process.onStdout((m) => m.includes('ready in'))
+
+    let url = ''
+    await process.onStdout((m) => {
+      let match = /Local:\s*(http.*)\//.exec(m)
+      if (match) url = match[1]
+      return Boolean(url)
+    })
+
+    await retryAssertion(async () => {
+      let styles = await fetchStyles(url, '/index.html')
+      expect(styles).toContain(candidate`content-['src/App.vue']`)
+      expect(styles).toContain(candidate`content-['src/LazyRoute.vue']`)
+    })
+
+    // Load `main.ts` and `App.vue` as real modules, like a browser visiting
+    // the page would
+    await fetch(`${url}/src/main.ts`)
+    await fetch(`${url}/src/App.vue`)
+
+    // Changing the scanned but unloaded `.vue` file should not trigger a
+    // full reload, but new classes should still apply
+    await fs.write(
+      'src/LazyRoute.vue',
+      html`
+        <template>
+          <div class="content-['updated:src/LazyRoute.vue']">Lazy</div>
+        </template>
+      `,
+    )
+
+    await retryAssertion(async () => {
+      let styles = await fetchStyles(url, '/index.html')
+      expect(styles).toContain(candidate`content-['updated:src/LazyRoute.vue']`)
+    })
+    expect(await fs.read('hmr.log')).not.toContain('full-reload')
+  },
+)
diff --git a/integrations/vitest.config.ts b/integrations/vitest.config.mts
similarity index 100%
rename from integrations/vitest.config.ts
rename to integrations/vitest.config.mts
diff --git a/integrations/webpack/index.test.ts b/integrations/webpack/index.test.ts
new file mode 100644
index 000000000..2a91411d2
--- /dev/null
+++ b/integrations/webpack/index.test.ts
@@ -0,0 +1,110 @@
+import { css, html, js, json, test } from '../utils'
+
+test(
+  'webpack + PostCSS (watch)',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "main": "./src/index.js",
+          "browser": "./src/index.js",
+          "dependencies": {
+            "css-loader": "^6",
+            "postcss": "^8",
+            "postcss-loader": "^7",
+            "webpack": "^5",
+            "webpack-cli": "^5",
+            "mini-css-extract-plugin": "^2",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/postcss": "workspace:^"
+          }
+        }
+      `,
+      'postcss.config.js': js`
+        /** @type {import('postcss-load-config').Config} */
+        module.exports = {
+          plugins: {
+            '@tailwindcss/postcss': {},
+          },
+        }
+      `,
+      'webpack.config.js': js`
+        let MiniCssExtractPlugin = require('mini-css-extract-plugin')
+
+        module.exports = {
+          output: {
+            clean: true,
+          },
+          plugins: [new MiniCssExtractPlugin()],
+          module: {
+            rules: [
+              {
+                test: /.css$/i,
+                use: [MiniCssExtractPlugin.loader, 'css-loader', 'postcss-loader'],
+              },
+            ],
+          },
+        }
+      `,
+      'src/index.js': js`import './index.css'`,
+      'src/index.html': html`
+        <div class="flex"></div>
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+      'src/unrelated.module.css': css`
+        .module {
+          color: var(--color-blue-500);
+        }
+      `,
+    },
+  },
+  async ({ fs, spawn, exec, expect }) => {
+    // Generate the initial build so output CSS files exist on disk
+    await exec('pnpm webpack --mode=development')
+
+    // NOTE: We are writing to an output CSS file which is not being ignored by
+    // `.gitignore` nor marked with `@source not`. This should not result in an
+    // infinite loop.
+    let process = await spawn('pnpm webpack --mode=development --watch')
+    await process.onStdout((m) => m.includes('compiled successfully in'))
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/main.css ---
+      :root, :host {
+        --color-blue-500: oklch(62.3% 0.214 259.815);
+      }
+      .flex {
+        display: flex;
+      }
+      "
+    `)
+
+    await fs.write(
+      'src/unrelated.module.css',
+      css`
+        .module {
+          color: var(--color-blue-500);
+          background-color: var(--color-red-500);
+        }
+      `,
+    )
+    await process.onStdout((m) => m.includes('compiled successfully in'))
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/main.css ---
+      :root, :host {
+        --color-red-500: oklch(63.7% 0.237 25.331);
+        --color-blue-500: oklch(62.3% 0.214 259.815);
+      }
+      .flex {
+        display: flex;
+      }
+      "
+    `)
+  },
+)
diff --git a/integrations/webpack/loader.test.ts b/integrations/webpack/loader.test.ts
new file mode 100644
index 000000000..9c3d870af
--- /dev/null
+++ b/integrations/webpack/loader.test.ts
@@ -0,0 +1,495 @@
+import { css, html, js, json, test } from '../utils'
+
+test(
+  '@tailwindcss/webpack loader (build)',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "main": "./src/index.js",
+          "browser": "./src/index.js",
+          "dependencies": {
+            "css-loader": "^6",
+            "webpack": "^5",
+            "webpack-cli": "^5",
+            "mini-css-extract-plugin": "^2",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/webpack": "workspace:^"
+          }
+        }
+      `,
+      'webpack.config.js': js`
+        let MiniCssExtractPlugin = require('mini-css-extract-plugin')
+
+        module.exports = {
+          output: {
+            clean: true,
+          },
+          plugins: [new MiniCssExtractPlugin()],
+          module: {
+            rules: [
+              {
+                test: /.css$/i,
+                use: [MiniCssExtractPlugin.loader, 'css-loader', '@tailwindcss/webpack'],
+              },
+            ],
+          },
+        }
+      `,
+      'src/index.js': js`import './index.css'`,
+      'src/index.html': html`
+        <div class="flex"></div>
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm webpack --mode=development')
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/main.css ---
+      .flex {
+        display: flex;
+      }
+      "
+    `)
+  },
+)
+
+test(
+  '@tailwindcss/webpack loader (watch)',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "main": "./src/index.js",
+          "browser": "./src/index.js",
+          "dependencies": {
+            "css-loader": "^6",
+            "webpack": "^5",
+            "webpack-cli": "^5",
+            "mini-css-extract-plugin": "^2",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/webpack": "workspace:^"
+          }
+        }
+      `,
+      'webpack.config.js': js`
+        let MiniCssExtractPlugin = require('mini-css-extract-plugin')
+
+        module.exports = {
+          output: {
+            clean: true,
+          },
+          plugins: [new MiniCssExtractPlugin()],
+          module: {
+            rules: [
+              {
+                test: /.css$/i,
+                use: [MiniCssExtractPlugin.loader, 'css-loader', '@tailwindcss/webpack'],
+              },
+            ],
+          },
+        }
+      `,
+      'src/index.js': js`import './index.css'`,
+      'src/index.html': html`
+        <div class="flex"></div>
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+    },
+  },
+  async ({ fs, spawn, exec, expect }) => {
+    // Generate the initial build so output CSS files exist on disk
+    await exec('pnpm webpack --mode=development')
+
+    let process = await spawn('pnpm webpack --mode=development --watch')
+    await process.onStdout((m) => m.includes('compiled successfully in'))
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/main.css ---
+      .flex {
+        display: flex;
+      }
+      "
+    `)
+
+    // Add a new Tailwind class to the HTML file
+    await fs.write('src/index.html', html`
+        <div class="flex underline"></div>
+      `)
+    await process.onStdout((m) => m.includes('compiled successfully in'))
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/main.css ---
+      .flex {
+        display: flex;
+      }
+      .underline {
+        text-decoration-line: underline;
+      }
+      "
+    `)
+  },
+)
+
+test(
+  '@tailwindcss/webpack loader with @apply',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "main": "./src/index.js",
+          "browser": "./src/index.js",
+          "dependencies": {
+            "css-loader": "^6",
+            "webpack": "^5",
+            "webpack-cli": "^5",
+            "mini-css-extract-plugin": "^2",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/webpack": "workspace:^"
+          }
+        }
+      `,
+      'webpack.config.js': js`
+        let MiniCssExtractPlugin = require('mini-css-extract-plugin')
+
+        module.exports = {
+          output: {
+            clean: true,
+          },
+          plugins: [new MiniCssExtractPlugin()],
+          module: {
+            rules: [
+              {
+                test: /.css$/i,
+                use: [MiniCssExtractPlugin.loader, 'css-loader', '@tailwindcss/webpack'],
+              },
+            ],
+          },
+        }
+      `,
+      'src/index.js': js`import './index.css'`,
+      'src/index.css': css`
+        @import 'tailwindcss/theme';
+
+        .btn {
+          @apply flex items-center px-4 py-2 rounded-md;
+        }
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm webpack --mode=development')
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/main.css ---
+      :root, :host {
+        --spacing: 0.25rem;
+        --radius-md: 0.375rem;
+      }
+      .btn {
+        display: flex;
+        align-items: center;
+        border-radius: var(--radius-md);
+        padding-inline: calc(var(--spacing) * 4);
+        padding-block: calc(var(--spacing) * 2);
+      }
+      "
+    `)
+  },
+)
+
+test(
+  '@tailwindcss/webpack loader with optimization',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "main": "./src/index.js",
+          "browser": "./src/index.js",
+          "dependencies": {
+            "css-loader": "^6",
+            "webpack": "^5",
+            "webpack-cli": "^5",
+            "mini-css-extract-plugin": "^2",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/webpack": "workspace:^"
+          }
+        }
+      `,
+      'webpack.config.js': js`
+        let MiniCssExtractPlugin = require('mini-css-extract-plugin')
+
+        module.exports = {
+          output: {
+            clean: true,
+          },
+          plugins: [new MiniCssExtractPlugin()],
+          module: {
+            rules: [
+              {
+                test: /.css$/i,
+                use: [
+                  MiniCssExtractPlugin.loader,
+                  'css-loader',
+                  {
+                    loader: '@tailwindcss/webpack',
+                    options: {
+                      optimize: true,
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        }
+      `,
+      'src/index.js': js`import './index.css'`,
+      'src/index.html': html`
+        <div class="flex"></div>
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm webpack --mode=development')
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/main.css ---
+      .flex{display:flex}
+      "
+    `)
+  },
+)
+
+test(
+  '@tailwindcss/webpack loader with CSS @import',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "main": "./src/index.js",
+          "browser": "./src/index.js",
+          "dependencies": {
+            "css-loader": "^6",
+            "webpack": "^5",
+            "webpack-cli": "^5",
+            "mini-css-extract-plugin": "^2",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/webpack": "workspace:^"
+          }
+        }
+      `,
+      'webpack.config.js': js`
+        let MiniCssExtractPlugin = require('mini-css-extract-plugin')
+
+        module.exports = {
+          output: {
+            clean: true,
+          },
+          plugins: [new MiniCssExtractPlugin()],
+          module: {
+            rules: [
+              {
+                test: /.css$/i,
+                use: [MiniCssExtractPlugin.loader, 'css-loader', '@tailwindcss/webpack'],
+              },
+            ],
+          },
+        }
+      `,
+      'src/index.js': js`import './index.css'`,
+      'src/index.html': html`
+        <div class="flex custom-util"></div>
+      `,
+      'src/index.css': css`
+        @import './custom.css';
+        @import 'tailwindcss/theme';
+        @import 'tailwindcss/utilities';
+      `,
+      'src/custom.css': css`
+        /**/
+        @utility custom-util {
+          color: var(--color-red-500);
+        }
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm webpack --mode=development')
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/main.css ---
+      :root, :host {
+        --color-red-500: oklch(63.7% 0.237 25.331);
+      }
+      .flex {
+        display: flex;
+      }
+      .custom-util {
+        color: var(--color-red-500);
+      }
+      "
+    `)
+  },
+)
+
+test(
+  '@tailwindcss/webpack loader with @plugin',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "main": "./src/index.js",
+          "browser": "./src/index.js",
+          "dependencies": {
+            "css-loader": "^6",
+            "webpack": "^5",
+            "webpack-cli": "^5",
+            "mini-css-extract-plugin": "^2",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/webpack": "workspace:^"
+          }
+        }
+      `,
+      'webpack.config.js': js`
+        let MiniCssExtractPlugin = require('mini-css-extract-plugin')
+
+        module.exports = {
+          output: {
+            clean: true,
+          },
+          plugins: [new MiniCssExtractPlugin()],
+          module: {
+            rules: [
+              {
+                test: /.css$/i,
+                use: [MiniCssExtractPlugin.loader, 'css-loader', '@tailwindcss/webpack'],
+              },
+            ],
+          },
+        }
+      `,
+      'src/index.js': js`import './index.css'`,
+      'src/index.html': html`
+        <div class="custom-underline"></div>
+      `,
+      'src/index.css': css`
+        @import 'tailwindcss/utilities';
+        @plugin './plugin.js';
+      `,
+      'src/plugin.js': js`
+        export default function ({ addUtilities }) {
+          addUtilities({
+            '.custom-underline': {
+              'border-bottom': '1px solid green',
+            },
+          })
+        }
+      `,
+    },
+  },
+  async ({ fs, exec, expect }) => {
+    await exec('pnpm webpack --mode=development')
+
+    expect(await fs.dumpFiles('./dist/*.css')).toMatchInlineSnapshot(`
+      "
+      --- ./dist/main.css ---
+      .custom-underline {
+        border-bottom: 1px solid green;
+      }
+      "
+    `)
+  },
+)
+
+test(
+  '@tailwindcss/webpack loader isolates cache by resource including query',
+  {
+    fs: {
+      'package.json': json`
+        {
+          "main": "./src/index.js",
+          "browser": "./src/index.js",
+          "dependencies": {
+            "css-loader": "^6",
+            "webpack": "^5",
+            "webpack-cli": "^5",
+            "mini-css-extract-plugin": "^2",
+            "tailwindcss": "workspace:^",
+            "@tailwindcss/webpack": "workspace:^"
+          }
+        }
+      `,
+      'webpack.config.js': js`
+        let MiniCssExtractPlugin = require('mini-css-extract-plugin')
+        let path = require('node:path')
+
+        module.exports = {
+          mode: 'development',
+          entry: {
+            a: './src/a.js',
+            b: './src/b.js',
+          },
+          output: {
+            clean: true,
+          },
+          plugins: [new MiniCssExtractPlugin()],
+          module: {
+            rules: [
+              {
+                test: /.css$/i,
+                use: [
+                  MiniCssExtractPlugin.loader,
+                  'css-loader',
+                  '@tailwindcss/webpack',
+                  path.resolve(__dirname, 'query-loader.js'),
+                ],
+              },
+            ],
+          },
+        }
+      `,
+      'query-loader.js': js`
+        module.exports = function (source) {
+          if (this.resourceQuery.includes('a')) {
+            return '@import "tailwindcss/utilities"; @utility only-a {color: var(--color-red-500);}'
+          }
+
+          if (this.resourceQuery.includes('b')) {
+            return '@import "tailwindcss/utilities"; @utility only-b {color: var(--color-blue-500);}'
+          }
+
+          return source
+        }
+      `,
+      'src/a.js': js`import './index.css?a'`,
+      'src/b.js': js`import './index.css?b'`,
+      'src/index.css': css``,
+    },
+  },
+  async ({ fs, exec }) => {
+    await exec('pnpm webpack --mode=development')
+
+    await fs.expectFileToContain('dist/a.css', ['only-a', '--color-red-500'])
+    await fs.expectFileToContain('dist/b.css', ['only-b', '--color-blue-500'])
+    await fs.expectFileNotToContain('dist/a.css', ['only-b', '--color-blue-500'])
+    await fs.expectFileNotToContain('dist/b.css', ['only-a', '--color-red-500'])
+  },
+)
diff --git a/package.json b/package.json
index 75befd109..7d41a469e 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "dev": "turbo dev --filter=!./playgrounds/*",
     "test": "cargo test && vitest run --hideSkippedTests",
     "test:integrations": "vitest --root=./integrations",
-    "test:ui": "pnpm run --filter=tailwindcss test:ui",
+    "test:ui": "pnpm run --filter=tailwindcss test:ui && pnpm run --filter=@tailwindcss/browser test:ui",
     "tdd": "vitest --hideSkippedTests",
     "bench": "vitest bench",
     "version-packages": "node ./scripts/version-packages.mjs",
@@ -48,23 +48,17 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@playwright/test": "^1.49.0",
+    "@playwright/test": "^1.62.1",
     "@types/node": "catalog:",
-    "postcss": "8.4.49",
-    "postcss-import": "^16.1.0",
-    "prettier": "^3.3.3",
-    "prettier-plugin-embed": "^0.4.15",
-    "prettier-plugin-organize-imports": "^4.0.0",
-    "tsup": "^8.2.4",
-    "turbo": "^2.2.3",
-    "typescript": "^5.5.4",
-    "vitest": "^2.0.5"
+    "postcss": "catalog:",
+    "postcss-import": "^16.1.1",
+    "prettier": "catalog:",
+    "prettier-plugin-embed": "^0.5.1",
+    "prettier-plugin-organize-imports": "^4.3.0",
+    "tsup": "^8.5.1",
+    "turbo": "^2.10.8",
+    "typescript": "^5.9.3",
+    "vitest": "^4.1.10"
   },
-  "packageManager": "pnpm@9.6.0",
-  "pnpm": {
-    "patchedDependencies": {
-      "lightningcss@1.26.0": "patches/lightningcss@1.26.0.patch",
-      "@parcel/watcher@2.5.0": "patches/@parcel__watcher@2.5.0.patch"
-    }
-  }
+  "packageManager": "pnpm@11.9.0"
 }
diff --git a/packages/@tailwindcss-browser/README.md b/packages/@tailwindcss-browser/README.md
new file mode 100644
index 000000000..5f532607d
--- /dev/null
+++ b/packages/@tailwindcss-browser/README.md
@@ -0,0 +1,36 @@
+<p align="center">
+  <a href="https://tailwindcss.com" target="_blank">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-dark.svg">
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-light.svg">
+      <img alt="Tailwind CSS" src="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-light.svg" width="350" height="70" style="max-width: 100%;">
+    </picture>
+  </a>
+</p>
+
+<p align="center">
+  A utility-first CSS framework for rapidly building custom user interfaces.
+</p>
+
+<p align="center">
+    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=main" alt="Build Status"></a>
+    <a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
+</p>
+
+---
+
+## Documentation
+
+For full documentation, visit [tailwindcss.com](https://tailwindcss.com).
+
+## Community
+
+For help, discussion about best practices, or feature ideas:
+
+[Discuss Tailwind CSS on GitHub](https://github.com/tailwindlabs/tailwindcss/discussions)
+
+## Contributing
+
+If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindlabs/tailwindcss/blob/main/.github/CONTRIBUTING.md) **before submitting a pull request**.
diff --git a/packages/@tailwindcss-browser/package.json b/packages/@tailwindcss-browser/package.json
new file mode 100644
index 000000000..70af78c1e
--- /dev/null
+++ b/packages/@tailwindcss-browser/package.json
@@ -0,0 +1,37 @@
+{
+  "name": "@tailwindcss/browser",
+  "version": "4.3.3",
+  "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
+  "license": "MIT",
+  "main": "./dist/index.global.js",
+  "browser": "./dist/index.global.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tailwindlabs/tailwindcss.git",
+    "directory": "packages/@tailwindcss-browser"
+  },
+  "bugs": "https://github.com/tailwindlabs/tailwindcss/issues",
+  "homepage": "https://tailwindcss.com",
+  "scripts": {
+    "lint": "tsc --noEmit",
+    "build": "tsup-node",
+    "dev": "pnpm run build -- --watch",
+    "test:ui": "playwright test"
+  },
+  "exports": {
+    ".": "./dist/index.global.js",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "dist"
+  ],
+  "publishConfig": {
+    "provenance": true,
+    "access": "public"
+  },
+  "devDependencies": {
+    "h3": "^1.15.11",
+    "listhen": "^1.10.1",
+    "tailwindcss": "workspace:*"
+  }
+}
diff --git a/packages/@tailwindcss-browser/playwright.config.ts b/packages/@tailwindcss-browser/playwright.config.ts
new file mode 100644
index 000000000..c6059dd82
--- /dev/null
+++ b/packages/@tailwindcss-browser/playwright.config.ts
@@ -0,0 +1,67 @@
+import { defineConfig, devices } from '@playwright/test'
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+  testDir: './tests',
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: [['html', { open: 'never' }]],
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    // baseURL: 'http://127.0.0.1:3000',
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: 'on-first-retry',
+  },
+
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+    // Playwright 1.60's Windows WebKit worker hangs on shutdown after all tests
+    // pass, causing CI to fail with a worker force-kill error.
+    ...(process.platform === 'win32'
+      ? []
+      : [{ name: 'webkit', use: { ...devices['Desktop Safari'] } }]),
+    {
+      name: 'firefox',
+      use: {
+        ...devices['Desktop Firefox'],
+        // https://playwright.dev/docs/test-use-options#more-browser-and-context-options
+        launchOptions: {
+          // https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-firefox-user-prefs
+          firefoxUserPrefs: {
+            // By default, headless Firefox runs as though no pointers
+            // capabilities are available.
+            // https://github.com/microsoft/playwright/issues/7769#issuecomment-966098074
+            //
+            // This impacts our `hover` variant implementation which uses an
+            // '(hover: hover)' media query to determine if hover is available.
+            //
+            // Available values for pointer capabilities:
+            // NO_POINTER            = 0x00;
+            // COARSE_POINTER        = 0x01;
+            // FINE_POINTER          = 0x02;
+            // HOVER_CAPABLE_POINTER = 0x04;
+            //
+            // Setting to 0x02 | 0x04 says the system supports a mouse
+            'ui.primaryPointerCapabilities': 0x02 | 0x04,
+            'ui.allPointerCapabilities': 0x02 | 0x04,
+          },
+        },
+      },
+    },
+  ],
+})
diff --git a/packages/@tailwindcss-browser/src/assets.ts b/packages/@tailwindcss-browser/src/assets.ts
new file mode 100644
index 000000000..e72d47658
--- /dev/null
+++ b/packages/@tailwindcss-browser/src/assets.ts
@@ -0,0 +1,11 @@
+import index from 'tailwindcss/index.css'
+import preflight from 'tailwindcss/preflight.css'
+import theme from 'tailwindcss/theme.css'
+import utilities from 'tailwindcss/utilities.css'
+
+export const css = {
+  index,
+  preflight,
+  theme,
+  utilities,
+}
diff --git a/packages/@tailwindcss-browser/src/index.ts b/packages/@tailwindcss-browser/src/index.ts
new file mode 100644
index 000000000..49c7e4675
--- /dev/null
+++ b/packages/@tailwindcss-browser/src/index.ts
@@ -0,0 +1,294 @@
+import * as tailwindcss from 'tailwindcss'
+import * as assets from './assets'
+import { Instrumentation } from './instrumentation'
+
+/**
+ * The type used by `<style>` tags that contain input CSS.
+ */
+const STYLE_TYPE = 'text/tailwindcss'
+
+/**
+ * The current Tailwind CSS compiler.
+ *
+ * This gets recreated:
+ * - When stylesheets change
+ */
+let compiler: Awaited<ReturnType<typeof tailwindcss.compile>>
+
+/**
+ * The list of all seen classes on the page so far. The compiler already has a
+ * cache of classes but this lets us only pass new classes to `build(…)`.
+ */
+let classes = new Set<string>()
+
+/**
+ * The last input CSS that was compiled. If stylesheets "change" without
+ * actually changing, we can avoid a full rebuild.
+ */
+let lastCss = ''
+
+/**
+ * The stylesheet that we use to inject the compiled CSS into the page.
+ */
+let sheet = document.createElement('style')
+
+/**
+ * The queue of build tasks that need to be run. This is used to ensure that we
+ * don't run multiple builds concurrently.
+ */
+let buildQueue = Promise.resolve()
+
+/**
+ * What build this is
+ */
+let nextBuildId = 1
+
+/**
+ * Used for instrumenting the build process. This data shows up in the
+ * performance tab of the browser's devtools.
+ */
+let I = new Instrumentation()
+
+/**
+ * Create the Tailwind CSS compiler
+ *
+ * This handles loading imports, plugins, configs, etc…
+ *
+ * This does **not** imply that the CSS is actually built. That happens in the
+ * `build` function and is a separate scheduled task.
+ */
+async function createCompiler() {
+  I.start(`Create compiler`)
+  I.start('Reading Stylesheets')
+
+  // The stylesheets may have changed causing a full rebuild so we'll need to
+  // gather the latest list of stylesheets.
+  let stylesheets: Iterable<HTMLStyleElement> = document.querySelectorAll(
+    `style[type="${STYLE_TYPE}"]`,
+  )
+
+  let css = ''
+  for (let sheet of stylesheets) {
+    observeSheet(sheet)
+    css += sheet.textContent + '\n'
+  }
+
+  // The user might have no stylesheets, or a some stylesheets without `@import`
+  // because they want to customize their theme so we'll inject the main import
+  // for them. However, if they start using `@import` we'll let them control
+  // the build completely.
+  if (!css.includes('@import')) {
+    css = `@import "tailwindcss";${css}`
+  }
+
+  I.end('Reading Stylesheets', {
+    size: css.length,
+    changed: lastCss !== css,
+  })
+
+  // The input CSS did not change so the compiler does not need to be recreated
+  if (lastCss === css) return
+
+  lastCss = css
+
+  I.start('Compile CSS')
+  try {
+    compiler = await tailwindcss.compile(css, {
+      base: '/',
+      loadStylesheet,
+      loadModule,
+    })
+  } finally {
+    I.end('Compile CSS')
+    I.end(`Create compiler`)
+  }
+
+  classes.clear()
+}
+
+async function loadStylesheet(id: string, base: string) {
+  function load() {
+    if (id === 'tailwindcss') {
+      return {
+        path: 'virtual:tailwindcss/index.css',
+        base,
+        content: assets.css.index,
+      }
+    } else if (
+      id === 'tailwindcss/preflight' ||
+      id === 'tailwindcss/preflight.css' ||
+      id === './preflight.css'
+    ) {
+      return {
+        path: 'virtual:tailwindcss/preflight.css',
+        base,
+        content: assets.css.preflight,
+      }
+    } else if (
+      id === 'tailwindcss/theme' ||
+      id === 'tailwindcss/theme.css' ||
+      id === './theme.css'
+    ) {
+      return {
+        path: 'virtual:tailwindcss/theme.css',
+        base,
+        content: assets.css.theme,
+      }
+    } else if (
+      id === 'tailwindcss/utilities' ||
+      id === 'tailwindcss/utilities.css' ||
+      id === './utilities.css'
+    ) {
+      return {
+        path: 'virtual:tailwindcss/utilities.css',
+        base,
+        content: assets.css.utilities,
+      }
+    }
+
+    throw new Error(`The browser build does not support @import for "${id}"`)
+  }
+
+  try {
+    let sheet = load()
+
+    I.hit(`Loaded stylesheet`, {
+      id,
+      base,
+      size: sheet.content.length,
+    })
+
+    return sheet
+  } catch (err) {
+    I.hit(`Failed to load stylesheet`, {
+      id,
+      base,
+      error: (err as Error).message ?? err,
+    })
+
+    throw err
+  }
+}
+
+async function loadModule(): Promise<never> {
+  throw new Error(`The browser build does not support plugins or config files.`)
+}
+
+async function build(kind: 'full' | 'incremental') {
+  if (!compiler) return
+
+  // 1. Refresh the known list of classes
+  let newClasses = new Set<string>()
+
+  I.start(`Collect classes`)
+
+  for (let element of document.querySelectorAll('[class]')) {
+    for (let c of element.classList) {
+      if (classes.has(c)) continue
+
+      classes.add(c)
+      newClasses.add(c)
+    }
+  }
+
+  I.end(`Collect classes`, {
+    count: newClasses.size,
+  })
+
+  if (newClasses.size === 0 && kind === 'incremental') return
+
+  // 2. Compile the CSS
+  I.start(`Build utilities`)
+
+  sheet.textContent = compiler.build(Array.from(newClasses))
+
+  I.end(`Build utilities`)
+}
+
+function rebuild(kind: 'full' | 'incremental') {
+  async function run() {
+    if (!compiler && kind !== 'full') {
+      return
+    }
+
+    let buildId = nextBuildId++
+
+    I.start(`Build #${buildId} (${kind})`)
+
+    if (kind === 'full') {
+      await createCompiler()
+    }
+
+    I.start(`Build`)
+    await build(kind)
+    I.end(`Build`)
+
+    I.end(`Build #${buildId} (${kind})`)
+  }
+
+  buildQueue = buildQueue.then(run).catch((err) => I.error(err))
+}
+
+// Handle changes to known stylesheets
+let styleObserver = new MutationObserver(() => rebuild('full'))
+
+function observeSheet(sheet: HTMLStyleElement) {
+  styleObserver.observe(sheet, {
+    attributes: true,
+    attributeFilter: ['type'],
+    characterData: true,
+    subtree: true,
+    childList: true,
+  })
+}
+
+// Handle changes to the document that could affect the styles
+// - Changes to any element's class attribute
+// - New stylesheets being added to the page
+// - New elements (with classes) being added to the page
+new MutationObserver((records) => {
+  let full = 0
+  let incremental = 0
+
+  for (let record of records) {
+    // New stylesheets == tracking + full rebuild
+    for (let node of record.addedNodes as Iterable<HTMLElement>) {
+      if (node.nodeType !== Node.ELEMENT_NODE) continue
+      if (node.tagName !== 'STYLE') continue
+      if (node.getAttribute('type') !== STYLE_TYPE) continue
+
+      observeSheet(node as HTMLStyleElement)
+      full++
+    }
+
+    // New nodes require an incremental rebuild
+    for (let node of record.addedNodes) {
+      if (node.nodeType !== 1) continue
+
+      // Skip the output stylesheet itself to prevent loops
+      if (node === sheet) continue
+
+      incremental++
+    }
+
+    // Changes to class attributes require an incremental rebuild
+    if (record.type === 'attributes') {
+      incremental++
+    }
+  }
+
+  if (full > 0) {
+    return rebuild('full')
+  } else if (incremental > 0) {
+    return rebuild('incremental')
+  }
+}).observe(document.documentElement, {
+  attributes: true,
+  attributeFilter: ['class'],
+  childList: true,
+  subtree: true,
+})
+
+rebuild('full')
+
+document.head.append(sheet)
diff --git a/packages/@tailwindcss-browser/src/instrumentation.ts b/packages/@tailwindcss-browser/src/instrumentation.ts
new file mode 100644
index 000000000..0f04e6fea
--- /dev/null
+++ b/packages/@tailwindcss-browser/src/instrumentation.ts
@@ -0,0 +1,29 @@
+export class Instrumentation {
+  start(label: string) {
+    performance.mark(`${label} (start)`)
+  }
+
+  end(label: string, detail?: any) {
+    performance.mark(`${label} (end)`)
+
+    performance.measure(label, {
+      start: `${label} (start)`,
+      end: `${label} (end)`,
+      detail,
+    })
+  }
+
+  hit(label: string, detail?: any) {
+    performance.mark(label, {
+      detail,
+    })
+  }
+
+  error(error: any) {
+    performance.mark(`(error)`, {
+      detail: { error: `${error}` },
+    })
+
+    throw error
+  }
+}
diff --git a/packages/@tailwindcss-browser/src/types.d.ts b/packages/@tailwindcss-browser/src/types.d.ts
new file mode 100644
index 000000000..8be70dffc
--- /dev/null
+++ b/packages/@tailwindcss-browser/src/types.d.ts
@@ -0,0 +1,4 @@
+declare module '*.css' {
+  const content: string
+  export default content
+}
diff --git a/packages/@tailwindcss-browser/tests/ui.spec.ts b/packages/@tailwindcss-browser/tests/ui.spec.ts
new file mode 100644
index 000000000..241322daa
--- /dev/null
+++ b/packages/@tailwindcss-browser/tests/ui.spec.ts
@@ -0,0 +1,176 @@
+import { expect, test, type Page } from '@playwright/test'
+import { readFile } from 'node:fs/promises'
+
+const html = String.raw
+
+let server: Awaited<ReturnType<typeof createServer>>
+
+test.beforeAll(async ({}, info) => {
+  server = await createServer()
+})
+
+test.afterAll(async () => {
+  await server.close()
+})
+
+test('basic', async ({ page }) => {
+  await server.render({
+    page,
+    body: html`<div data-test class="w-32 h-32 bg-red"></div>`,
+  })
+
+  await expect(page.locator('[data-test]')).toHaveCSS('background-color', 'rgb(255, 0, 0)')
+})
+
+test('observer', async ({ page }) => {
+  await server.render({
+    page,
+    body: html`<div data-test class="w-32 h-32 bg-red"></div>`,
+  })
+
+  await page.evaluate(() => {
+    document.querySelector('[data-test]')!.classList.replace('bg-red', 'bg-blue')
+  })
+
+  await expect(page.locator('[data-test]')).toHaveCSS('background-color', 'rgb(0, 0, 255)')
+})
+
+test('custom css', async ({ page }) => {
+  await server.render({
+    page,
+    head: html`
+      <style data-css type="text/tailwindcss">
+        .foo {
+          @apply bg-red;
+        }
+      </style>
+    `,
+    body: html`<div data-test class="w-32 h-32 foo"></div>`,
+  })
+
+  await expect(page.locator('[data-test]')).toHaveCSS('background-color', 'rgb(255, 0, 0)')
+
+  await page.evaluate(() => {
+    document.querySelector('[data-css]')!.textContent = `
+      .foo {
+        @apply bg-blue;
+      }
+    `
+  })
+
+  await expect(page.locator('[data-test]')).toHaveCSS('background-color', 'rgb(0, 0, 255)')
+})
+
+test('changes to `@theme`', async ({ page }) => {
+  await server.render({
+    page,
+    head: html`
+      <style data-css type="text/tailwindcss">
+        @theme {
+          --color-primary: #ff0000;
+        }
+      </style>
+    `,
+    body: html`<div data-test class="w-32 h-32 bg-primary"></div>`,
+  })
+
+  await expect(page.locator('[data-test]')).toHaveCSS('background-color', 'rgb(255, 0, 0)')
+
+  await page.evaluate(() => {
+    document.querySelector('[data-css]')!.textContent = `
+      @theme {
+        --color-primary: #0000ff;
+      }
+    `
+  })
+
+  await expect(page.locator('[data-test]')).toHaveCSS('background-color', 'rgb(0, 0, 255)')
+})
+
+test('no classes', async ({ page }) => {
+  await server.render({
+    page,
+    body: html`<div data-test>test</div>`,
+  })
+
+  await expect(page.locator('body')).toHaveCSS('margin', '0px')
+})
+
+test('html classes', async ({ page }) => {
+  await server.render({
+    page,
+    htmlClasses: 'h-4',
+  })
+
+  await expect(page.locator('html')).toHaveCSS('height', '16px')
+})
+
+async function createServer() {
+  const { createApp, createRouter, defineEventHandler, toNodeListener } = await import('h3')
+  const { listen } = await import('listhen')
+
+  interface PageOptions {
+    page: Page
+    head?: string
+    body?: string
+    htmlClasses?: string
+  }
+
+  async function render({ page, htmlClasses, head, body }: PageOptions) {
+    let content = html`
+      <!doctype html>
+      <html lang="en" class="${htmlClasses ?? ''}">
+        <head>
+          <meta charset="UTF-8" />
+          <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+          <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+          <title>Document</title>
+          <script src="/tailwindcss.js"></script>
+          <style type="text/tailwindcss">
+            @theme {
+              --color-red: #ff0000;
+              --color-green: #00ff00;
+              --color-blue: #0000ff;
+            }
+          </style>
+          ${head ?? ''}
+        </head>
+        <body>
+          ${body ?? ''}
+        </body>
+      </html>
+    `
+
+    router.get(
+      '/',
+      defineEventHandler(() => content),
+    )
+
+    await page.goto(server.url)
+  }
+
+  const app = createApp()
+  const router = createRouter()
+
+  router.get(
+    '/tailwindcss.js',
+    defineEventHandler(() => readFile(require.resolve('@tailwindcss/browser'))),
+  )
+
+  app.use(router)
+
+  let workerIndex = Number(process.env.TEST_WORKER_INDEX ?? 0)
+
+  let listener = await listen(toNodeListener(app), {
+    port: 3000 + workerIndex,
+    showURL: false,
+    open: false,
+  })
+
+  return {
+    app,
+    url: listener.url,
+    close: listener.close,
+    render,
+  }
+}
diff --git a/packages/@tailwindcss-browser/tsconfig.json b/packages/@tailwindcss-browser/tsconfig.json
new file mode 100644
index 000000000..8ea040daf
--- /dev/null
+++ b/packages/@tailwindcss-browser/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "lib": ["es2022", "esnext.disposable", "dom", "dom.iterable"],
+  },
+}
diff --git a/packages/@tailwindcss-browser/tsup.config.ts b/packages/@tailwindcss-browser/tsup.config.ts
new file mode 100644
index 000000000..10a73f2b7
--- /dev/null
+++ b/packages/@tailwindcss-browser/tsup.config.ts
@@ -0,0 +1,32 @@
+import { defineConfig } from 'tsup'
+
+export default defineConfig({
+  format: ['iife'],
+  clean: true,
+  minify: true,
+  entry: ['src/index.ts'],
+  noExternal: [/.*/],
+  loader: {
+    '.css': 'text',
+  },
+  define: {
+    'process.env.NODE_ENV': '"production"',
+    'process.env.FEATURES_ENV': '"stable"',
+  },
+  esbuildPlugins: [
+    {
+      name: 'patch-intellisense-apis',
+      setup(build) {
+        build.onLoad({ filter: /intellisense.ts$/ }, () => {
+          return {
+            contents: `
+              export function getClassList() { return [] }
+              export function getVariants() { return [] }
+              export function canonicalizeCandidates() { return [] }
+            `,
+          }
+        })
+      },
+    },
+  ],
+})
diff --git a/packages/@tailwindcss-browser/vitest.config.mts b/packages/@tailwindcss-browser/vitest.config.mts
new file mode 100644
index 000000000..f6f91227d
--- /dev/null
+++ b/packages/@tailwindcss-browser/vitest.config.mts
@@ -0,0 +1,7 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    exclude: ['**/*.spec.?(c|m)[jt]s?(x)', '**/node_modules/**'],
+  },
+})
diff --git a/packages/@tailwindcss-cli/README.md b/packages/@tailwindcss-cli/README.md
index 95ec9d87d..5f532607d 100644
--- a/packages/@tailwindcss-cli/README.md
+++ b/packages/@tailwindcss-cli/README.md
@@ -13,10 +13,10 @@
 </p>
 
 <p align="center">
-    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=next" alt="Build Status"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=main" alt="Build Status"></a>
     <a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
 </p>
 
 ---
@@ -27,14 +27,10 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com).
 
 ## Community
 
-For help, discussion about best practices, or any other conversation that would benefit from being searchable:
+For help, discussion about best practices, or feature ideas:
 
-[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions)
-
-For chatting with others using the framework:
-
-[Join the Tailwind CSS Discord Server](https://discord.gg/7NF8GNe)
+[Discuss Tailwind CSS on GitHub](https://github.com/tailwindlabs/tailwindcss/discussions)
 
 ## Contributing
 
-If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindcss/tailwindcss/blob/next/.github/CONTRIBUTING.md) **before submitting a pull request**.
+If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindlabs/tailwindcss/blob/main/.github/CONTRIBUTING.md) **before submitting a pull request**.
diff --git a/packages/@tailwindcss-cli/package.json b/packages/@tailwindcss-cli/package.json
index 4a71f0724..7fa5b5500 100644
--- a/packages/@tailwindcss-cli/package.json
+++ b/packages/@tailwindcss-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/cli",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "repository": {
@@ -29,11 +29,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@parcel/watcher": "^2.5.0",
-    "@tailwindcss/node": "workspace:^",
-    "@tailwindcss/oxide": "workspace:^",
-    "enhanced-resolve": "^5.17.1",
-    "lightningcss": "catalog:",
+    "@parcel/watcher": "catalog:",
+    "@tailwindcss/node": "workspace:*",
+    "@tailwindcss/oxide": "workspace:*",
+    "enhanced-resolve": "catalog:",
     "mri": "^1.2.0",
     "picocolors": "^1.1.1",
     "tailwindcss": "workspace:*"
diff --git a/packages/@tailwindcss-cli/src/commands/build/index.ts b/packages/@tailwindcss-cli/src/commands/build/index.ts
index bf1066e90..ffef2ae8b 100644
--- a/packages/@tailwindcss-cli/src/commands/build/index.ts
+++ b/packages/@tailwindcss-cli/src/commands/build/index.ts
@@ -1,8 +1,13 @@
-import watcher from '@parcel/watcher'
-import { compile, env, Instrumentation } from '@tailwindcss/node'
+import {
+  compile,
+  env,
+  Instrumentation,
+  optimize,
+  toSourceMap,
+  type SourceMap,
+} from '@tailwindcss/node'
 import { clearRequireCache } from '@tailwindcss/node/require-cache'
 import { Scanner, type ChangedContent } from '@tailwindcss/oxide'
-import { Features, transform } from 'lightningcss'
 import { existsSync, type Stats } from 'node:fs'
 import fs from 'node:fs/promises'
 import path from 'node:path'
@@ -15,11 +20,13 @@ import {
   highlight,
   println,
   relative,
+  wordWrap,
 } from '../../utils/renderer'
 import { drainStdin, outputFile } from './utils'
 
 const css = String.raw
 const DEBUG = env.DEBUG
+const DEFAULT_POLL_INTERVAL_MS = 250
 
 export function options() {
   return {
@@ -32,11 +39,20 @@ export function options() {
       type: 'string',
       description: 'Output file',
       alias: '-o',
+      default: '-',
     },
     '--watch': {
       type: 'boolean | string',
-      description: 'Watch for changes and rebuild as needed',
+      description:
+        'Watch for changes and rebuild as needed, and use `always` to keep watching when stdin is closed',
       alias: '-w',
+      values: ['always'],
+    },
+    '--poll': {
+      type: 'boolean | number',
+      description: 'Use polling instead of filesystem events when watching',
+      default: false,
+      values: ['ms'],
     },
     '--minify': {
       type: 'boolean',
@@ -52,28 +68,73 @@ export function options() {
       description: 'The current working directory',
       default: '.',
     },
+    '--map': {
+      type: 'boolean | string',
+      description: 'Generate a source map',
+      default: false,
+    },
+    '--silent': {
+      type: 'boolean',
+      description: 'Suppress non-error output',
+    },
   } satisfies Arg
 }
 
+function formatError(error: unknown): string {
+  let seen = new Set() // Track seen errors to prevent circular errors
+  function render(err: unknown, depth: number): string[] {
+    let indent = '  '.repeat(depth)
+    let width = (process.stderr.columns ?? Infinity) - 2 * (depth + 1)
+
+    let output = [
+      `${indent}${red(depth === 0 ? 'Error:' : 'Caused by:')}`,
+      `${indent}${dim('\u250C')}`,
+    ]
+
+    for (let line of `${err}`.split('\n')) {
+      let wrapped = wordWrap(line, width)
+      if (wrapped.length === 0) wrapped = ['']
+      for (let chunk of wrapped) {
+        output.push(`${indent}${dim('\u2502')} ${chunk}`)
+      }
+    }
+
+    output.push(`${indent}${dim('\u2514')}`)
+
+    if (typeof err === 'object' && err !== null && 'cause' in err && err.cause != null) {
+      if (!seen.add(err).has(err.cause)) {
+        output.push(...render(err.cause, depth + 1))
+      }
+    }
+
+    return output
+  }
+
+  return render(error, 0).join('\n')
+}
+
 async function handleError<T>(fn: () => T): Promise<T> {
   try {
     return await fn()
   } catch (err) {
-    if (err instanceof Error) {
-      eprintln(err.toString())
-    }
+    eprintln(formatError(err))
     process.exit(1)
   }
 }
 
 export async function handle(args: Result<ReturnType<typeof options>>) {
+  if (!args['--silent']) eprintln(header())
+  if (!args['--silent']) eprintln()
+
   using I = new Instrumentation()
   DEBUG && I.start('[@tailwindcss/cli] (initial build)')
 
   let base = path.resolve(args['--cwd'])
 
-  // Resolve the output as an absolute path.
-  if (args['--output']) {
+  // Resolve the output as an absolute path. If the output is a `-`, then we
+  // don't need to resolve it because this is a flag to indicate that we want to
+  // use `stdout` instead.
+  if (args['--output'] && args['--output'] !== '-') {
     args['--output'] = path.resolve(base, args['--output'])
   }
 
@@ -85,13 +146,43 @@ export async function handle(args: Result<ReturnType<typeof options>>) {
 
     // Ensure the provided `--input` exists.
     if (!existsSync(args['--input'])) {
-      eprintln(header())
-      eprintln()
       eprintln(`Specified input file ${highlight(relative(args['--input']))} does not exist.`)
       process.exit(1)
     }
   }
 
+  // Check if the input and output file paths are identical, otherwise return an
+  // error to the user.
+  if (args['--input'] === args['--output'] && args['--input'] !== '-') {
+    eprintln(
+      `Specified input file ${highlight(relative(args['--input']))} and output file ${highlight(relative(args['--output']))} are identical.`,
+    )
+    process.exit(1)
+  }
+
+  // If the user passes `{bin} build --map -` then this likely means they want to output the map inline
+  // this is the default behavior of `{bin build} --map` to inform the user of that
+  if (args['--map'] === '-') {
+    eprintln(`Use --map without a value to inline the source map.`)
+    process.exit(1)
+  }
+
+  if (args['--poll'] === undefined) {
+    eprintln(`Use --poll with a non-zero value in milliseconds.`)
+    process.exit(1)
+  }
+  let pollInterval = args['--poll'] === true ? DEFAULT_POLL_INTERVAL_MS : args['--poll']
+  if (pollInterval !== false && pollInterval <= 0) {
+    eprintln(`Specified polling interval must be a positive number.`)
+    process.exit(1)
+  }
+
+  // Resolve the map as an absolute path. If the output is true then we
+  // don't need to resolve it because it'll be an inline source map
+  if (args['--map'] && args['--map'] !== true) {
+    args['--map'] = path.resolve(base, args['--map'])
+  }
+
   let start = process.hrtime.bigint()
 
   let input = args['--input']
@@ -105,36 +196,75 @@ export async function handle(args: Result<ReturnType<typeof options>>) {
   let previous = {
     css: '',
     optimizedCss: '',
+    output: null as string | null,
   }
 
-  async function write(css: string, args: Result<ReturnType<typeof options>>, I: Instrumentation) {
+  async function write(
+    css: string,
+    map: SourceMap | null,
+    args: Result<ReturnType<typeof options>>,
+    I: Instrumentation,
+  ) {
     let output = css
 
     // Optimize the output
     if (args['--minify'] || args['--optimize']) {
       if (css !== previous.css) {
         DEBUG && I.start('Optimize CSS')
-        let optimizedCss = optimizeCss(css, {
+        let optimized = optimize(css, {
           file: args['--input'] ?? 'input.css',
           minify: args['--minify'] ?? false,
+          map: map?.raw ?? undefined,
         })
         DEBUG && I.end('Optimize CSS')
         previous.css = css
-        previous.optimizedCss = optimizedCss
-        output = optimizedCss
+        previous.optimizedCss = optimized.code
+        if (optimized.map) {
+          map = toSourceMap(optimized.map)
+        }
+        output = optimized.code
       } else {
         output = previous.optimizedCss
       }
     }
 
     // Write the output
+    if (map) {
+      // Inline the source map
+      if (args['--map'] === true) {
+        output += `\n`
+        output += map.inline
+      } else if (typeof args['--map'] === 'string') {
+        let basePath =
+          args['--output'] && args['--output'] !== '-'
+            ? path.dirname(path.resolve(args['--output']))
+            : process.cwd()
+
+        let mapPath = path.resolve(args['--map'])
+
+        let relativePath = path.relative(basePath, mapPath)
+
+        output += `\n`
+        output += map.comment(relativePath)
+
+        DEBUG && I.start('Write source map')
+        await outputFile(args['--map'], map.raw)
+        DEBUG && I.end('Write source map')
+      }
+    }
+
+    let didChange = output !== previous.output
+
     DEBUG && I.start('Write output')
-    if (args['--output']) {
+    if (args['--output'] && args['--output'] !== '-') {
       await outputFile(args['--output'], output)
-    } else {
+    } else if (didChange) {
       println(output)
     }
     DEBUG && I.end('Write output')
+
+    previous.output = output
+    return didChange
   }
 
   let inputFilePath =
@@ -143,10 +273,12 @@ export async function handle(args: Result<ReturnType<typeof options>>) {
   let inputBasePath = inputFilePath ? path.dirname(inputFilePath) : process.cwd()
 
   let fullRebuildPaths: string[] = inputFilePath ? [inputFilePath] : []
+  let backupRebuildPaths = fullRebuildPaths
 
   async function createCompiler(css: string, I: Instrumentation) {
     DEBUG && I.start('Setup compiler')
     let compiler = await compile(css, {
+      from: args['--output'] ? (inputFilePath ?? 'stdin.css') : undefined,
       base: inputBasePath,
       onDependency(path) {
         fullRebuildPaths.push(path)
@@ -161,12 +293,30 @@ export async function handle(args: Result<ReturnType<typeof options>>) {
 
       // No root specified, use the base directory
       if (compiler.root === null) {
-        return [{ base, pattern: '**/*' }]
+        return [{ base, pattern: '**/*', negated: false }]
       }
 
       // Use the specified root
-      return [compiler.root]
-    })().concat(compiler.globs)
+      return [{ ...compiler.root, negated: false }]
+    })().concat(compiler.sources)
+
+    // Do not scan the current executable. Otherwise when using the standalone
+    // CLI, if the CLI lives in the current repo we would be scanning that file.
+    //
+    // This is also immune against renames of the executable file.
+    sources.push({
+      base: path.dirname(process.execPath),
+      pattern: path.basename(process.execPath),
+      negated: true,
+    })
+
+    if (inputFilePath !== null) {
+      sources.push({
+        base: path.dirname(inputFilePath),
+        pattern: path.basename(inputFilePath),
+        negated: false,
+      })
+    }
 
     let scanner = new Scanner({ sources })
     DEBUG && I.end('Setup compiler')
@@ -175,12 +325,16 @@ export async function handle(args: Result<ReturnType<typeof options>>) {
   }
 
   let [compiler, scanner] = await handleError(() => createCompiler(input, I))
+  let cleanupWatchers: (() => Promise<void>)[] = []
 
   // Watch for changes
-  if (args['--watch']) {
-    let cleanupWatchers = await createWatchers(
-      watchDirectories(scanner),
-      async function handle(files) {
+  if (args['--watch'] && pollInterval === false) {
+    // Ensure the file watcher can be loaded before setting up any watchers,
+    // such that we can present a helpful error message if needed.
+    await handleError(() => loadWatcher())
+
+    cleanupWatchers.push(
+      await createWatchers(await watchDirectories(scanner), async function handle(files) {
         try {
           // If the only change happened to the output file, then we don't want to
           // trigger a rebuild because that will result in an infinite loop.
@@ -192,35 +346,15 @@ export async function handle(args: Result<ReturnType<typeof options>>) {
           // Re-compile the input
           let start = process.hrtime.bigint()
 
-          let changedFiles: ChangedContent[] = []
-          let rebuildStrategy: 'incremental' | 'full' = 'incremental'
-
           let resolvedFullRebuildPaths = fullRebuildPaths
-
-          for (let file of files) {
-            // If one of the changed files is related to the input CSS or JS
-            // config/plugin files, then we need to do a full rebuild because
-            // the theme might have changed.
-            if (resolvedFullRebuildPaths.includes(file)) {
-              rebuildStrategy = 'full'
-
-              // No need to check the rest of the events, because we already know we
-              // need to do a full rebuild.
-              break
-            }
-
-            // Track new and updated files for incremental rebuilds.
-            changedFiles.push({
-              file,
-              extension: path.extname(file).slice(1),
-            } satisfies ChangedContent)
-          }
+          let rebuildStrategy = getRebuildStrategy(files, resolvedFullRebuildPaths)
 
           // Track the compiled CSS
           let compiledCss = ''
+          let compiledMap: SourceMap | null = null
 
           // Scan the entire `base` directory for full rebuilds.
-          if (rebuildStrategy === 'full') {
+          if (rebuildStrategy.kind === 'full') {
             // Read the new `input`.
             let input = args['--input']
               ? args['--input'] === '-'
@@ -230,11 +364,23 @@ export async function handle(args: Result<ReturnType<typeof options>>) {
                   @import 'tailwindcss';
                 `
             clearRequireCache(resolvedFullRebuildPaths)
+
+            // Track current rebuild paths in case something goes wrong when
+            // performing a full rebuild.
+            backupRebuildPaths = fullRebuildPaths.slice()
+
+            // The `inputFilePath`, if provided, will be the only known full
+            // rebuild path before the compiler is re-created.
             fullRebuildPaths = inputFilePath ? [inputFilePath] : []
 
             // Create a new compiler, given the new `input`
             ;[compiler, scanner] = await createCompiler(input, I)
 
+            // Successfully created a new compiler, so the `fullRebuildPaths`
+            // will be updated. If other errors occur, we should be able to
+            // restore the paths unconditionally.
+            backupRebuildPaths = fullRebuildPaths.slice()
+
             // Scan the directory for candidates
             DEBUG && I.start('Scan for candidates')
             let candidates = scanner.scan()
@@ -242,60 +388,107 @@ export async function handle(args: Result<ReturnType<typeof options>>) {
 
             // Setup new watchers
             DEBUG && I.start('Setup new watchers')
-            let newCleanupWatchers = await createWatchers(watchDirectories(scanner), handle)
+            let newCleanupFunction = await createWatchers(await watchDirectories(scanner), handle)
             DEBUG && I.end('Setup new watchers')
 
             // Clear old watchers
             DEBUG && I.start('Cleanup old watchers')
-            await cleanupWatchers()
+            await Promise.all(cleanupWatchers.splice(0).map((cleanup) => cleanup()))
             DEBUG && I.end('Cleanup old watchers')
 
-            cleanupWatchers = newCleanupWatchers
+            cleanupWatchers.push(newCleanupFunction)
 
             // Re-compile the CSS
             DEBUG && I.start('Build CSS')
             compiledCss = compiler.build(candidates)
             DEBUG && I.end('Build CSS')
+
+            if (args['--map']) {
+              DEBUG && I.start('Build Source Map')
+              compiledMap = toSourceMap(compiler.buildSourceMap())
+              DEBUG && I.end('Build Source Map')
+            }
           }
 
           // Scan changed files only for incremental rebuilds.
-          else if (rebuildStrategy === 'incremental') {
+          else if (rebuildStrategy.kind === 'incremental') {
             DEBUG && I.start('Scan for candidates')
-            let newCandidates = scanner.scanFiles(changedFiles)
+            let newCandidates = scanner.scanFiles(rebuildStrategy.changedFiles)
             DEBUG && I.end('Scan for candidates')
 
             // No new candidates found which means we don't need to write to
             // disk, and can return early.
             if (newCandidates.length <= 0) {
               let end = process.hrtime.bigint()
-              eprintln(`Done in ${formatDuration(end - start)}`)
+              if (!args['--silent']) eprintln(`Done in ${formatDuration(end - start)}`)
               return
             }
 
             DEBUG && I.start('Build CSS')
             compiledCss = compiler.build(newCandidates)
             DEBUG && I.end('Build CSS')
+
+            if (args['--map']) {
+              DEBUG && I.start('Build Source Map')
+              compiledMap = toSourceMap(compiler.buildSourceMap())
+              DEBUG && I.end('Build Source Map')
+            }
           }
 
-          await write(compiledCss, args, I)
+          await write(compiledCss, compiledMap, args, I)
 
           let end = process.hrtime.bigint()
-          eprintln(`Done in ${formatDuration(end - start)}`)
+          if (!args['--silent']) eprintln(`Done in ${formatDuration(end - start)}`)
         } catch (err) {
+          // It's important that we perform a full rebuild when any of the
+          // dependencies tracked in `fullRebuildPaths` has been changed.
+          //
+          // If we remove one of those files, then a subsequent build will be
+          // triggered, but it will fail because the dependency is gone. The
+          // compiler itself will be in a broken state and won't be able to
+          // register any dependencies therefore we want to restore all the
+          // dependencies from before. If we don't do that, then we won't be
+          // able to recover from a bug in a transitive dependency.
+          //
+          // E.g.:
+          // ```css
+          // /* input.css — known full rebuild path */
+          // @import 'tailwindcss';
+          // @config "./tailwind.config.js";
+          // ```
+          //
+          // ```js
+          // // tailwind.config.js
+          // const theme = require('./my-theme.js');
+          //
+          // module.exports = {
+          //   theme
+          // }
+          // ```
+          // In this case `my-theme.js` is a transitive dependency of
+          // `input.css` via `tailwind.config.js`. Removing `my-theme.js` will
+          // result in an error, restoring `my-theme.js` should trigger a
+          // fresh build even though the compiler didn't restore.
+          //
+          // Once the build error is fixed, a fresh full rebuild will happen
+          // which in turn will fixup the full rebuild paths.
+          fullRebuildPaths = backupRebuildPaths
+
           // Catch any errors and print them to stderr, but don't exit the process
           // and keep watching.
-          if (err instanceof Error) {
-            eprintln(err.toString())
-          }
+          eprintln(formatError(err))
+
+          let end = process.hrtime.bigint()
+          if (!args['--silent']) eprintln(`Done in ${formatDuration(end - start)}`)
         }
-      },
+      }),
     )
 
     // Abort the watcher if `stdin` is closed to avoid zombie processes. You can
     // disable this behavior with `--watch=always`.
     if (args['--watch'] !== 'always') {
       process.stdin.on('end', () => {
-        cleanupWatchers().then(
+        Promise.all(cleanupWatchers.map((fn) => fn())).then(
           () => process.exit(0),
           () => process.exit(1),
         )
@@ -312,27 +505,197 @@ export async function handle(args: Result<ReturnType<typeof options>>) {
   DEBUG && I.start('Build CSS')
   let output = await handleError(() => compiler.build(candidates))
   DEBUG && I.end('Build CSS')
-  await write(output, args, I)
+
+  let map: SourceMap | null = null
+
+  if (args['--map']) {
+    DEBUG && I.start('Build Source Map')
+    map = await handleError(() => toSourceMap(compiler.buildSourceMap()))
+    DEBUG && I.end('Build Source Map')
+  }
+
+  await write(output, map, args, I)
 
   let end = process.hrtime.bigint()
-  eprintln(header())
-  eprintln()
-  eprintln(`Done in ${formatDuration(end - start)}`)
+  if (!args['--silent']) eprintln(`Done in ${formatDuration(end - start)}`)
+
+  // Watch for changes, using polling
+  if (args['--watch'] && pollInterval !== false) {
+    let cleanupPollingIndicator = () => {}
+
+    function logPollingMessage(message: string) {
+      if (!args['--silent']) {
+        process.stderr.write('\r\x1B[2K')
+      }
+
+      eprintln(message)
+
+      if (!args['--silent']) {
+        process.stderr.write(`\r\x1B[2K${dim(`Polling for changes…`)}`)
+      }
+    }
+
+    async function fullRebuild(I: Instrumentation) {
+      clearRequireCache(fullRebuildPaths)
+      backupRebuildPaths = fullRebuildPaths.slice()
+      fullRebuildPaths = inputFilePath ? [inputFilePath] : []
+
+      let input = args['--input']
+        ? args['--input'] === '-'
+          ? await drainStdin()
+          : await fs.readFile(args['--input'], 'utf-8')
+        : css`
+            @import 'tailwindcss';
+          `
+
+      ;[compiler, scanner] = await createCompiler(input, I)
+      backupRebuildPaths = fullRebuildPaths.slice()
+
+      DEBUG && I.start('Scan for candidates')
+      let candidates = scanner.scan()
+      DEBUG && I.end('Scan for candidates')
+
+      DEBUG && I.start('Build CSS')
+      let output = compiler.build(candidates)
+      DEBUG && I.end('Build CSS')
+
+      let map: SourceMap | null = null
+
+      if (args['--map']) {
+        DEBUG && I.start('Build Source Map')
+        map = toSourceMap(compiler.buildSourceMap())
+        DEBUG && I.end('Build Source Map')
+      }
+
+      await write(output, map, args, I)
+    }
+
+    if (!args['--silent']) {
+      let restored = false
+
+      function restoreCursor() {
+        if (restored) return
+        restored = true
+        process.stderr.write('\r\x1B[2K\x1B[?25h')
+        process.off('exit', restoreCursor)
+        process.off('SIGINT', onSigint)
+        process.off('SIGTERM', onSigterm)
+      }
+
+      function onSigint() {
+        restoreCursor()
+        process.exit(130)
+      }
+
+      function onSigterm() {
+        restoreCursor()
+        process.exit(143)
+      }
+
+      process.stderr.write('\x1B[?25l')
+      process.on('exit', restoreCursor)
+      process.on('SIGINT', onSigint)
+      process.on('SIGTERM', onSigterm)
+
+      cleanupPollingIndicator = restoreCursor
+      cleanupWatchers.push(async () => cleanupPollingIndicator())
+    }
+
+    cleanupWatchers.push(
+      createPollingWatcher(async () => {
+        using I = new Instrumentation()
+
+        DEBUG && I.start('Scan for candidates')
+        let candidates = scanner.scan()
+        DEBUG && I.end('Scan for candidates')
+
+        let files = scanner.scannedFiles.filter(
+          (file) => file !== args['--output'] && file !== args['--map'],
+        )
+
+        if (files.length <= 0) return
+
+        let start = process.hrtime.bigint()
+
+        let strategy = getRebuildStrategy(files, fullRebuildPaths)
+
+        if (strategy.kind === 'full') {
+          try {
+            await fullRebuild(I)
+          } catch (err) {
+            fullRebuildPaths = backupRebuildPaths
+
+            logPollingMessage(formatError(err))
+          }
+
+          if (!args['--silent']) {
+            logPollingMessage(`Done in ${formatDuration(process.hrtime.bigint() - start)}`)
+          }
+          return
+        }
+
+        // No candidates found which means we don't need to write to disk, and
+        // can return early.
+        if (candidates.length <= 0) {
+          if (!args['--silent']) {
+            logPollingMessage(`Done in ${formatDuration(process.hrtime.bigint() - start)}`)
+          }
+          return
+        }
+
+        DEBUG && I.start('Build CSS')
+        let output = compiler.build(candidates)
+        DEBUG && I.end('Build CSS')
+
+        let map: SourceMap | null = null
+
+        if (args['--map']) {
+          DEBUG && I.start('Build Source Map')
+          map = toSourceMap(compiler.buildSourceMap())
+          DEBUG && I.end('Build Source Map')
+        }
+
+        await write(output, map, args, I)
+
+        if (!args['--silent']) {
+          logPollingMessage(`Done in ${formatDuration(process.hrtime.bigint() - start)}`)
+        }
+      }, pollInterval),
+    )
+
+    if (args['--watch'] !== 'always') {
+      process.stdin.on('end', () => {
+        Promise.all(cleanupWatchers.map((fn) => fn())).then(
+          () => process.exit(0),
+          () => process.exit(1),
+        )
+      })
+    }
+
+    process.stdin.resume()
+    if (!args['--silent']) {
+      process.stderr.write(`\r\x1B[2K${dim(`Polling for changes…`)}`)
+    }
+  }
 }
 
-function watchDirectories(scanner: Scanner) {
-  return scanner.globs.flatMap((globEntry) => {
-    // We don't want a watcher for negated globs.
-    if (globEntry.pattern[0] === '!') return []
-
-    // We don't want a watcher for files, only directories.
-    if (globEntry.pattern === '') return []
-
-    return globEntry.base
-  })
+// Load `@parcel/watcher` lazily so a missing or broken native binding only
+// affects `--watch` (without `--poll`), instead of crashing one-off builds and
+// polling mode as well.
+async function loadWatcher(): Promise<typeof import('@parcel/watcher')> {
+  try {
+    return (await import('@parcel/watcher')).default
+  } catch (err) {
+    throw new Error(
+      `Failed to load the file watcher. Your platform may not be supported by \`@parcel/watcher\`. As a workaround, you can use polling instead by passing the \`--watch --poll\` flags.`,
+      { cause: err },
+    )
+  }
 }
 
 async function createWatchers(dirs: string[], cb: (files: string[]) => void) {
+  let watcher = await loadWatcher()
+
   // Remove any directories that are children of an already watched directory.
   // If we don't we may not get notified of certain filesystem events regardless
   // of whether or not they are for the directory that is duplicated.
@@ -394,10 +757,16 @@ async function createWatchers(dirs: string[], cb: (files: string[]) => void) {
 
       await Promise.all(
         events.map(async (event) => {
-          // We currently don't handle deleted files because it doesn't influence
-          // the CSS output. This is because we currently keep all scanned
-          // candidates in a cache for performance reasons.
-          if (event.type === 'delete') return
+          // When a file is deleted, a rebuild should be triggered such that we
+          // can figure out whether this file must trigger a fresh build or not.
+          //
+          // If it must trigger a fresh build, then we will temporarily end up
+          // in a broken state, but an error will be shown to the user. Once the
+          // user resolves the issue, the CLI will recover.
+          if (event.type === 'delete') {
+            files.add(event.path)
+            return
+          }
 
           // Ignore directory changes. We only care about file changes
           let stats: Stats | null = null
@@ -428,35 +797,78 @@ async function createWatchers(dirs: string[], cb: (files: string[]) => void) {
   }
 }
 
-function optimizeCss(
-  input: string,
-  { file = 'input.css', minify = false }: { file?: string; minify?: boolean } = {},
-) {
-  function optimize(code: Buffer | Uint8Array) {
-    return transform({
-      filename: file,
-      code,
-      minify,
-      sourceMap: false,
-      drafts: {
-        customMedia: true,
-      },
-      nonStandard: {
-        deepSelectorCombinator: true,
-      },
-      include: Features.Nesting,
-      exclude: Features.LogicalProperties | Features.DirSelector,
-      targets: {
-        safari: (16 << 16) | (4 << 8),
-        ios_saf: (16 << 16) | (4 << 8),
-        firefox: 128 << 16,
-        chrome: 111 << 16,
-      },
-      errorRecovery: true,
-    }).code
+function getRebuildStrategy(
+  files: string[],
+  fullRebuildPaths: string[],
+): { kind: 'incremental'; changedFiles: ChangedContent[] } | { kind: 'full' } {
+  let changedFiles: ChangedContent[] = []
+
+  for (let file of files) {
+    // If one of the changed files is related to the input CSS or JS
+    // config/plugin files, then we need to do a full rebuild because
+    // the theme might have changed.
+    if (fullRebuildPaths.includes(file)) {
+      return { kind: 'full' }
+    }
+
+    // Track new and updated files for incremental rebuilds.
+    changedFiles.push({
+      file,
+      extension: path.extname(file).slice(1),
+    } satisfies ChangedContent)
   }
 
-  // Running Lightning CSS twice to ensure that adjacent rules are merged after
-  // nesting is applied. This creates a more optimized output.
-  return optimize(optimize(Buffer.from(input))).toString()
+  return { kind: 'incremental', changedFiles }
+}
+
+function createPollingWatcher(cb: () => Promise<void>, pollInterval: number) {
+  let disposed = false
+  let timer: ReturnType<typeof setTimeout> | null = null
+
+  async function poll() {
+    if (disposed) return
+
+    try {
+      await cb()
+    } catch (err) {
+      console.error(err)
+    } finally {
+      if (!disposed) {
+        timer = setTimeout(poll, pollInterval)
+      }
+    }
+  }
+
+  timer = setTimeout(poll, pollInterval)
+
+  return async () => {
+    disposed = true
+    if (timer) clearTimeout(timer)
+  }
+}
+
+async function watchDirectories(scanner: Scanner) {
+  let directories = (
+    await Promise.all(
+      scanner.normalizedSources.map(async (globEntry) => {
+        let resolvedPath = path.resolve(globEntry.base)
+        let realPath = await fs.realpath(resolvedPath).catch(() => resolvedPath)
+
+        return fs
+          .stat(realPath)
+          .then((stat) => (stat.isDirectory() ? [realPath] : []))
+          .catch(() => [])
+      }),
+    )
+  ).flat(1)
+
+  return Array.from(new Set(directories))
+}
+
+function dim(str: string) {
+  return `\x1B[2m${str}\x1B[22m`
+}
+
+function red(str: string) {
+  return `\x1B[31m${str}\x1B[39m`
 }
diff --git a/packages/@tailwindcss-cli/src/commands/build/utils.ts b/packages/@tailwindcss-cli/src/commands/build/utils.ts
index b41a74358..ecdd96726 100644
--- a/packages/@tailwindcss-cli/src/commands/build/utils.ts
+++ b/packages/@tailwindcss-cli/src/commands/build/utils.ts
@@ -13,10 +13,19 @@ export function drainStdin() {
 }
 
 export async function outputFile(file: string, contents: string) {
-  try {
-    let currentContents = await fs.readFile(file, 'utf8')
-    if (currentContents === contents) return // Skip writing the file
-  } catch {}
+  // Check for special files like `/dev/stdout` or pipes. We don't want to read from these as that
+  // will hang the process until the file descriptors are closed.
+  let isSpecialFile = await fs
+    .stat(file)
+    .then((stats) => stats.isCharacterDevice() || stats.isFIFO())
+    .catch(() => false)
+
+  if (!isSpecialFile) {
+    try {
+      let currentContents = await fs.readFile(file, 'utf8')
+      if (currentContents === contents) return // Skip writing the file
+    } catch {}
+  }
 
   // Ensure the parent directories exist
   await fs.mkdir(path.dirname(file), { recursive: true })
diff --git a/packages/@tailwindcss-cli/src/commands/canonicalize/canonicalize.test.ts b/packages/@tailwindcss-cli/src/commands/canonicalize/canonicalize.test.ts
new file mode 100644
index 000000000..4392380a5
--- /dev/null
+++ b/packages/@tailwindcss-cli/src/commands/canonicalize/canonicalize.test.ts
@@ -0,0 +1,175 @@
+import path from 'node:path'
+import { PassThrough, Readable } from 'node:stream'
+import { fileURLToPath } from 'node:url'
+import { describe, expect, test } from 'vitest'
+import { runCommandLine, streamStdin } from '.'
+import { normalizeWindowsSeparators } from '../../utils/test-helpers'
+
+let css = normalizeWindowsSeparators(
+  path.resolve(path.dirname(fileURLToPath(import.meta.url)), 'fixtures/input.css'),
+)
+
+describe('runCommandLine', { timeout: 30_000 }, () => {
+  test('canonicalizes, collapses, and sorts candidate groups from positional arguments', async () => {
+    let result = await runCommandLine({
+      argv: ['--css', css, 'py-3 p-1 px-3'],
+      stdinIsTTY: true,
+      stdoutIsTTY: false,
+    })
+
+    expect(result).toEqual({
+      exitCode: 0,
+      stdout: 'p-3',
+      stderr: '',
+    })
+  })
+
+  test('falls back to the default tailwind import when --css is omitted', async () => {
+    let result = await runCommandLine({
+      argv: ['py-3 p-1 px-3'],
+      cwd: path.dirname(css),
+      stdinIsTTY: true,
+      stdoutIsTTY: false,
+    })
+
+    expect(result).toEqual({
+      exitCode: 0,
+      stdout: 'p-3',
+      stderr: '',
+    })
+  })
+
+  test('canonicalizes, collapses, and sorts multiple groups from stdin lines', async () => {
+    let result = await runCommandLine({
+      argv: ['--css', css],
+      stdin: '[display:_flex_] py-3 p-1 px-3\nmt-2 mr-2 mb-2 ml-2 focus:hover:p-3 hover:p-1 py-3\n',
+      stdinIsTTY: false,
+      stdoutIsTTY: false,
+    })
+
+    expect(result).toEqual({
+      exitCode: 0,
+      stdout: 'flex p-3\nm-2 py-3 hover:p-1 focus:hover:p-3',
+      stderr: '',
+    })
+  })
+
+  test('collapses equivalent candidates', async () => {
+    let result = await runCommandLine({
+      argv: ['--css', css, 'mt-2 mr-2 mb-2 ml-2'],
+      stdinIsTTY: true,
+      stdoutIsTTY: false,
+    })
+
+    expect(result).toEqual({
+      exitCode: 0,
+      stdout: 'm-2',
+      stderr: '',
+    })
+  })
+
+  test('renders json output for processed candidate groups', async () => {
+    let result = await runCommandLine({
+      argv: ['--css', css, '--format', 'json', 'py-3 p-1 px-3'],
+      stdinIsTTY: true,
+      stdoutIsTTY: false,
+    })
+
+    expect(result.exitCode).toBe(0)
+    expect(JSON.parse(result.stdout)).toEqual([
+      {
+        input: 'py-3 p-1 px-3',
+        output: 'p-3',
+        changed: true,
+      },
+    ])
+    expect(result.stderr).toBe('')
+  })
+
+  test('splits candidate lists with segment-aware spacing', async () => {
+    let result = await runCommandLine({
+      argv: ['--css', css, '--format', 'json', "content-['hello world'] p-1"],
+      stdinIsTTY: true,
+      stdoutIsTTY: false,
+    })
+
+    expect(result.exitCode).toBe(0)
+    expect(JSON.parse(result.stdout)).toEqual([
+      {
+        input: "content-['hello world'] p-1",
+        output: "p-1 content-['hello_world']",
+        changed: true,
+      },
+    ])
+    expect(result.stderr).toBe('')
+  })
+
+  test('shows a usage error when no candidate groups are provided', async () => {
+    let result = await runCommandLine({
+      argv: ['--css', css],
+      stdinIsTTY: true,
+      stdoutIsTTY: false,
+    })
+
+    expect(result.exitCode).toBe(1)
+    expect(result.stderr).toBe('No candidate groups provided')
+    expect(result.stdout).toContain('Usage:')
+  })
+
+  test('streams canonicalized output line by line', async () => {
+    let input = Readable.from('py-3 p-1 px-3\nmt-2 mr-2 mb-2 ml-2\n')
+    let { stream: output, collect: collectOutput } = createOutput()
+
+    await streamStdin({ css, cwd: path.dirname(css), format: 'text', input, output })
+
+    expect(collectOutput()).toBe('p-3\nm-2\n')
+  })
+
+  test('streams empty lines as empty lines', async () => {
+    let input = Readable.from('py-3 p-1 px-3\n\nmt-2 mr-2 mb-2 ml-2\n')
+    let { stream: output, collect: collectOutput } = createOutput()
+
+    await streamStdin({ css, cwd: path.dirname(css), format: 'text', input, output })
+
+    expect(collectOutput()).toBe('p-3\n\nm-2\n')
+  })
+
+  test('streams json output when requested', async () => {
+    let input = Readable.from('py-3 p-1 px-3\nmt-2 mr-2 mb-2 ml-2\n')
+    let { stream: output, collect: collectOutput } = createOutput()
+
+    await streamStdin({ css, cwd: path.dirname(css), format: 'json', input, output })
+
+    expect(JSON.parse(collectOutput())).toEqual([
+      {
+        input: 'py-3 p-1 px-3',
+        output: 'p-3',
+        changed: true,
+      },
+      {
+        input: 'mt-2 mr-2 mb-2 ml-2',
+        output: 'm-2',
+        changed: true,
+      },
+    ])
+  })
+
+  test('streams jsonl output when requested', async () => {
+    let input = Readable.from('py-3 p-1 px-3\nmt-2 mr-2 mb-2 ml-2\n')
+    let { stream: output, collect: collectOutput } = createOutput()
+
+    await streamStdin({ css, cwd: path.dirname(css), format: 'jsonl', input, output })
+
+    expect(collectOutput()).toBe(
+      '{"input":"py-3 p-1 px-3","output":"p-3","changed":true}\n' +
+        '{"input":"mt-2 mr-2 mb-2 ml-2","output":"m-2","changed":true}\n',
+    )
+  })
+})
+
+function createOutput() {
+  let stream = new PassThrough()
+  let chunks: Buffer[] = []
+  stream.on('data', (chunk) => chunks.push(chunk))
+  return { stream, collect: () => Buffer.concat(chunks).toString() }
+}
diff --git a/packages/@tailwindcss-cli/src/commands/canonicalize/fixtures/input.css b/packages/@tailwindcss-cli/src/commands/canonicalize/fixtures/input.css
new file mode 100644
index 000000000..d4b507858
--- /dev/null
+++ b/packages/@tailwindcss-cli/src/commands/canonicalize/fixtures/input.css
@@ -0,0 +1 @@
+@import 'tailwindcss';
diff --git a/packages/@tailwindcss-cli/src/commands/canonicalize/index.ts b/packages/@tailwindcss-cli/src/commands/canonicalize/index.ts
new file mode 100644
index 000000000..5aecfe51e
--- /dev/null
+++ b/packages/@tailwindcss-cli/src/commands/canonicalize/index.ts
@@ -0,0 +1,362 @@
+import { __unstable__loadDesignSystem } from '@tailwindcss/node'
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import { createInterface } from 'node:readline'
+import type { Readable, Writable } from 'node:stream'
+import { compare } from '../../../../tailwindcss/src/utils/compare'
+import { segment } from '../../../../tailwindcss/src/utils/segment'
+import { args, type Arg } from '../../utils/args'
+import { help } from '../help'
+
+const css = String.raw
+export type OutputFormat = 'text' | 'json' | 'jsonl'
+
+export interface CandidateGroupResult {
+  input: string
+  output: string
+  changed: boolean
+}
+
+export interface RunCommandLineOptions {
+  argv?: string[]
+  cwd?: string
+  stdin?: string | null
+  stdinIsTTY?: boolean
+  stdoutIsTTY?: boolean
+}
+
+export interface RunCommandLineResult {
+  exitCode: number
+  stdout: string
+  stderr: string
+}
+
+export function usage() {
+  return 'tailwindcss canonicalize [classes...]'
+}
+
+function usageWithCss() {
+  return 'tailwindcss canonicalize --css input.css [classes...]'
+}
+
+function usageWithStream() {
+  return 'tailwindcss canonicalize --stream [--css input.css]'
+}
+
+export function options() {
+  return {
+    '--css': {
+      type: 'string',
+      description:
+        'CSS entry file used to load the Tailwind design system (defaults to `@import "tailwindcss";`)',
+    },
+    '--format': {
+      type: 'string',
+      description: 'Output format',
+      default: 'text',
+      values: ['text', 'json', 'jsonl'],
+    },
+    '--stream': {
+      type: 'boolean',
+      description: 'Read candidate groups from stdin line by line and write results to stdout',
+      default: false,
+    },
+  } satisfies Arg
+}
+
+const sharedOptions = {
+  '--help': {
+    type: 'boolean',
+    description: 'Display usage information',
+    alias: '-h',
+    default: false,
+  },
+} satisfies Arg
+
+export async function runCommandLine({
+  argv = process.argv.slice(2),
+  cwd = process.cwd(),
+  stdin = null,
+  stdinIsTTY = process.stdin.isTTY,
+  stdoutIsTTY = process.stdout.isTTY,
+}: RunCommandLineOptions = {}): Promise<RunCommandLineResult> {
+  try {
+    let flags = args(
+      {
+        ...options(),
+        ...sharedOptions,
+      },
+      argv,
+    )
+
+    let format = parseFormat(flags['--format'] ?? 'text')
+
+    if ((stdoutIsTTY && argv.length === 0) || flags['--help']) {
+      return {
+        exitCode: 0,
+        stdout: helpMessage() ?? '',
+        stderr: '',
+      }
+    }
+
+    if (flags['--stream']) {
+      await streamStdin({
+        css: flags['--css'],
+        cwd,
+        format,
+        input: process.stdin,
+        output: process.stdout,
+      })
+      return { exitCode: 0, stdout: '', stderr: '' }
+    }
+
+    let inputs = flags._.length > 0 ? flags._ : await readCandidateGroups({ stdin, stdinIsTTY })
+
+    if (inputs.length === 0) {
+      return usageError('No candidate groups provided')
+    }
+
+    let results = await processCandidateGroups({
+      css: flags['--css'],
+      cwd,
+      inputs,
+    })
+
+    return {
+      exitCode: 0,
+      stdout: formatCandidateResults(results, format),
+      stderr: '',
+    }
+  } catch (error) {
+    return {
+      exitCode: 1,
+      stdout: '',
+      stderr: error instanceof Error ? error.message : String(error),
+    }
+  }
+}
+
+export async function streamStdin({
+  css: cssFile,
+  cwd,
+  format,
+  input,
+  output,
+}: {
+  css: string | null
+  cwd: string
+  format: OutputFormat
+  input: Readable
+  output: Writable
+}): Promise<void> {
+  let designSystem = await loadDesignSystem(cssFile, cwd)
+  let rl = createInterface({ input })
+  let first = true
+
+  if (format === 'json') {
+    output.write('[')
+  }
+
+  for await (let line of rl) {
+    let result = createCandidateGroupResult(designSystem, line)
+
+    switch (format) {
+      case 'text': {
+        output.write(result.output + '\n')
+        break
+      }
+
+      case 'jsonl': {
+        output.write(JSON.stringify(result) + '\n')
+        break
+      }
+
+      case 'json': {
+        if (first) {
+          output.write('\n')
+        } else {
+          output.write(',\n')
+        }
+
+        output.write(indent(JSON.stringify(result, null, 2), 2))
+        first = false
+        break
+      }
+    }
+  }
+
+  if (format === 'json') {
+    output.write(first ? ']' : '\n]')
+  }
+}
+
+export function readCandidateGroups({
+  stdin,
+  stdinIsTTY,
+}: {
+  stdin: string | null
+  stdinIsTTY: boolean
+}) {
+  if (stdin !== null) {
+    return Promise.resolve(splitCandidateGroups(stdin))
+  }
+
+  if (stdinIsTTY) {
+    return Promise.resolve([])
+  }
+
+  return drainStdin().then(splitCandidateGroups)
+}
+
+export async function drainStdin() {
+  return new Promise<string>((resolve, reject) => {
+    let result = ''
+
+    process.stdin.on('data', (chunk) => {
+      result += chunk
+    })
+
+    process.stdin.on('end', () => resolve(result))
+    process.stdin.on('error', (err) => reject(err))
+  })
+}
+
+export async function processCandidateGroups({
+  css,
+  cwd = process.cwd(),
+  inputs,
+}: {
+  css: string | null
+  cwd?: string
+  inputs: string[]
+}): Promise<CandidateGroupResult[]> {
+  let designSystem = await loadDesignSystem(css, cwd)
+
+  return inputs.map((input) => createCandidateGroupResult(designSystem, input))
+}
+
+export function formatCandidateResults(results: CandidateGroupResult[], format: OutputFormat) {
+  switch (format) {
+    case 'json':
+      return JSON.stringify(results, null, 2)
+    case 'jsonl':
+      return results.map((result) => JSON.stringify(result)).join('\n')
+    case 'text':
+      return results.map((result) => result.output).join('\n')
+  }
+}
+
+function helpMessage() {
+  return help({
+    render: false,
+    usage: [usage(), usageWithCss(), usageWithStream()],
+    options: {
+      ...options(),
+      ...sharedOptions,
+    },
+  })
+}
+
+async function loadDesignSystem(cssFile: string | null, cwd: string) {
+  if (cssFile === null) {
+    return __unstable__loadDesignSystem(
+      css`
+        @import 'tailwindcss';
+      `,
+      { base: cwd },
+    )
+  }
+
+  let resolvedCssFile = path.resolve(cwd, cssFile)
+  let content = await fs.readFile(resolvedCssFile, 'utf8')
+  return __unstable__loadDesignSystem(content, {
+    base: path.dirname(resolvedCssFile),
+  })
+}
+
+function splitCandidateGroups(input: string) {
+  return input
+    .split(/\r?\n/g)
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0)
+}
+
+function parseFormat(input: string): OutputFormat {
+  if (input === 'text' || input === 'json' || input === 'jsonl') {
+    return input
+  }
+
+  throw new Error(`Invalid value for --format: ${input}`)
+}
+
+function usageError(message: string): RunCommandLineResult {
+  return {
+    exitCode: 1,
+    stdout: helpMessage() ?? '',
+    stderr: message,
+  }
+}
+
+function splitCandidates(input: string) {
+  let trimmedInput = input.trim()
+  if (trimmedInput.length === 0) return []
+
+  return segment(trimmedInput, ' ')
+    .map((candidate) => candidate.trim())
+    .filter((candidate) => candidate.length > 0)
+}
+
+function canonicalize(
+  designSystem: Awaited<ReturnType<typeof __unstable__loadDesignSystem>>,
+  input: string,
+) {
+  let candidates = splitCandidates(input)
+  candidates = designSystem.canonicalizeCandidates(candidates, {
+    collapse: true,
+    logicalToPhysical: true,
+  })
+  return defaultSort(designSystem.getClassOrder(candidates)).join(' ')
+}
+
+function createCandidateGroupResult(
+  designSystem: Awaited<ReturnType<typeof __unstable__loadDesignSystem>>,
+  input: string,
+): CandidateGroupResult {
+  let output = canonicalize(designSystem, input)
+
+  return {
+    input,
+    output,
+    changed: output !== input,
+  }
+}
+
+function indent(input: string, size: number) {
+  let prefix = ' '.repeat(size)
+  return input
+    .split('\n')
+    .map((line) => prefix + line)
+    .join('\n')
+}
+
+function defaultSort(entries: [string, bigint | null][]) {
+  return entries
+    .slice()
+    .sort(([candidateA, orderA], [candidateZ, orderZ]) => {
+      if (orderA === orderZ) return compare(candidateA, candidateZ)
+      if (orderA === null) return -1
+      if (orderZ === null) return 1
+      return bigSign(orderA - orderZ) || compare(candidateA, candidateZ)
+    })
+    .map(([candidate]) => candidate)
+}
+
+function bigSign(value: bigint) {
+  if (value > 0n) {
+    return 1
+  } else if (value === 0n) {
+    return 0
+  } else {
+    return -1
+  }
+}
diff --git a/packages/@tailwindcss-cli/src/commands/help/index.ts b/packages/@tailwindcss-cli/src/commands/help/index.ts
index 20ee78208..b557d03e0 100644
--- a/packages/@tailwindcss-cli/src/commands/help/index.ts
+++ b/packages/@tailwindcss-cli/src/commands/help/index.ts
@@ -3,30 +3,34 @@ import type { Arg } from '../../utils/args'
 import { UI, header, highlight, indent, println, wordWrap } from '../../utils/renderer'
 
 export function help({
+  render = true,
   invalid,
   usage,
   options,
 }: {
+  render?: boolean
   invalid?: string
   usage?: string[]
   options?: Arg
 }) {
   // Available terminal width
-  let width = process.stdout.columns
+  let width = process.stdout.columns ?? 80
+  let lines: string[] = []
+  let writeLine = render ? println : (value = '') => void lines.push(value)
 
   // Render header
-  println(header())
+  writeLine(header())
 
   // Render the invalid command
   if (invalid) {
-    println()
-    println(`${pc.dim('Invalid command:')} ${invalid}`)
+    writeLine()
+    writeLine(`${pc.dim('Invalid command:')} ${invalid}`)
   }
 
   // Render usage
   if (usage && usage.length > 0) {
-    println()
-    println(pc.dim('Usage:'))
+    writeLine()
+    writeLine(pc.dim('Usage:'))
     for (let [idx, example] of usage.entries()) {
       // Split the usage example into the command and its options. This allows
       // us to wrap the options based on the available width of the terminal.
@@ -65,7 +69,7 @@ export function help({
       //     tailwindcss other [--watch] [options...]
       // ```
       if (lines.length > 1 && idx !== 0) {
-        println()
+        writeLine()
       }
 
       // Print the usage examples based on available width of the terminal.
@@ -86,9 +90,9 @@ export function help({
       // ```
       //
       // > Note how the second line is indented to align with the first line.
-      println(indent(`${command}${lines.shift()}`))
+      writeLine(indent(`${command}${lines.shift()}`))
       for (let line of lines) {
-        println(indent(line, command.length))
+        writeLine(indent(line, command.length))
       }
     }
   }
@@ -112,7 +116,11 @@ export function help({
     // `alias` followed by `, ` and followed by the `flag`.
     let maxOptionLength = 0
 
-    for (let [flag, { alias }] of Object.entries(options)) {
+    for (let [flag, { alias, values }] of Object.entries(options)) {
+      if (values?.length) {
+        flag += `[=${values.join(', ')}]`
+      }
+
       // The option string, which is the combination of the alias and the flag
       // but already properly indented based on the other aliases to ensure
       // everything is aligned properly.
@@ -127,8 +135,8 @@ export function help({
       maxOptionLength = Math.max(maxOptionLength, option.length)
     }
 
-    println()
-    println(pc.dim('Options:'))
+    writeLine()
+    writeLine(pc.dim('Options:'))
 
     // The minimum amount of dots between the option and the description.
     let minimumGap = 8
@@ -156,15 +164,19 @@ export function help({
       )
 
       // Print the option, the spacer dots and the start of the description.
-      println(
+      writeLine(
         indent(`${pc.blue(option)} ${pc.dim(pc.gray('\u00B7')).repeat(dotCount)} ${lines.shift()}`),
       )
 
       // Print the remaining lines of the description, indenting them to align
       // with the start of the description.
       for (let line of lines) {
-        println(indent(`${' '.repeat(option.length + dotCount + spaces)}${line}`))
+        writeLine(indent(`${' '.repeat(option.length + dotCount + spaces)}${line}`))
       }
     }
   }
+
+  if (!render) {
+    return lines.join('\n')
+  }
 }
diff --git a/packages/@tailwindcss-cli/src/index.ts b/packages/@tailwindcss-cli/src/index.ts
index 511781759..1543f7d13 100644
--- a/packages/@tailwindcss-cli/src/index.ts
+++ b/packages/@tailwindcss-cli/src/index.ts
@@ -3,46 +3,80 @@
 import { args, type Arg } from './utils/args'
 
 import * as build from './commands/build'
+import * as canonicalize from './commands/canonicalize'
 import { help } from './commands/help'
 
 const sharedOptions = {
   '--help': { type: 'boolean', description: 'Display usage information', alias: '-h' },
 } satisfies Arg
 
-const flags = args({
-  ...build.options(),
-  ...sharedOptions,
-})
-const command = flags._[0]
-
-// Right now we don't support any sub-commands. Let's show the help message
-// instead.
-if (command) {
-  help({
-    invalid: command,
-    usage: ['tailwindcss [options]'],
-    options: { ...build.options(), ...sharedOptions },
-  })
-  process.exit(1)
+function buildUsage(command = 'tailwindcss') {
+  return `${command} [--input input.css] [--output output.css] [--watch] [--poll=ms] [options…]`
 }
 
-// Display main help message if no command is being used.
-//
-// E.g.:
-//
-//   - `tailwindcss`                // should show the help message
-//
-// E.g.: implicit `build` command
-//
-//   - `tailwindcss -o output.css`  // should run the build command, not show the help message
-//   - `tailwindcss > output.css`   // should run the build command, not show the help message
-if ((process.stdout.isTTY && !flags['--output']) || flags['--help']) {
+function rootHelp({ invalid }: { invalid?: string } = {}) {
   help({
-    usage: ['tailwindcss [--input input.css] [--output output.css] [--watch] [options…]'],
+    invalid,
+    usage: [buildUsage('tailwindcss'), buildUsage('tailwindcss build'), canonicalize.usage()],
+    commands: {
+      build: 'Build your CSS',
+      canonicalize: 'Canonicalize candidate lists',
+    },
     options: { ...build.options(), ...sharedOptions },
   })
-  process.exit(0)
 }
 
-// Handle the build command
-build.handle(flags)
+async function run() {
+  let argv = process.argv.slice(2)
+  let command = argv[0]
+  let rootFlags = args({ ...build.options(), ...sharedOptions }, argv)
+
+  if (command === 'build') {
+    let flags = args({ ...build.options(), ...sharedOptions }, argv.slice(1))
+
+    if ((process.stdout.isTTY && argv.length === 1) || flags['--help']) {
+      help({
+        usage: [buildUsage('tailwindcss build')],
+        options: { ...build.options(), ...sharedOptions },
+      })
+      process.exit(0)
+    }
+
+    await build.handle(flags)
+    return
+  }
+
+  if (command === 'canonicalize') {
+    let result = await canonicalize.runCommandLine({ argv: argv.slice(1) })
+
+    if (result.stdout.length > 0) {
+      process.stdout.write(`${result.stdout}\n`)
+    }
+
+    if (result.stderr.length > 0) {
+      process.stderr.write(`${result.stderr}\n`)
+    }
+
+    process.exitCode = result.exitCode
+    return
+  }
+
+  if ((process.stdout.isTTY && command === undefined) || rootFlags['--help']) {
+    rootHelp()
+    process.exit(0)
+  }
+
+  if (command && !command.startsWith('-')) {
+    rootHelp({ invalid: command })
+    process.exit(1)
+  }
+
+  let flags = args({
+    ...build.options(),
+    ...sharedOptions,
+  })
+
+  await build.handle(flags)
+}
+
+await run()
diff --git a/packages/@tailwindcss-cli/src/utils/args.test.ts b/packages/@tailwindcss-cli/src/utils/args.test.ts
index 51d2c4747..249fb23eb 100644
--- a/packages/@tailwindcss-cli/src/utils/args.test.ts
+++ b/packages/@tailwindcss-cli/src/utils/args.test.ts
@@ -17,6 +17,38 @@ it('should be possible to parse a single argument', () => {
   `)
 })
 
+it('should only return the last value for duplicate arguments', () => {
+  expect(
+    args(
+      {
+        '--output': { type: 'string', description: 'Output file' },
+      },
+      ['--output', 'output.css', '--output', 'override.css'],
+    ),
+  ).toMatchInlineSnapshot(`
+    {
+      "--output": "override.css",
+      "_": [],
+    }
+  `)
+})
+
+it('uses last value when flag with "-" is supplied multiple times', () => {
+  let result = args(
+    {
+      '--output': { type: 'string', description: 'Output file', alias: '-o' },
+    },
+    ['--output', 'output.css', '--output', '-'],
+  )
+
+  expect(result).toMatchInlineSnapshot(`
+    {
+      "--output": "-",
+      "_": [],
+    }
+  `)
+})
+
 it('should fallback to the default value if no flag is passed', () => {
   expect(
     args(
@@ -121,3 +153,34 @@ it('should be possible to provide multiple types, and convert the value to that
     }
   `)
 })
+
+it('should be possible to provide boolean or number arguments', () => {
+  let options = {
+    '--poll': {
+      type: 'boolean | number',
+      description: 'Use polling instead of filesystem events when watching',
+      default: false,
+    },
+  } satisfies Arg
+
+  expect(args(options, ['--poll'])).toMatchInlineSnapshot(`
+    {
+      "--poll": true,
+      "_": [],
+    }
+  `)
+
+  expect(args(options, ['--poll=50'])).toMatchInlineSnapshot(`
+    {
+      "--poll": 50,
+      "_": [],
+    }
+  `)
+
+  expect(args(options, ['--poll=foo'])).toMatchInlineSnapshot(`
+    {
+      "--poll": undefined,
+      "_": [],
+    }
+  `)
+})
diff --git a/packages/@tailwindcss-cli/src/utils/args.ts b/packages/@tailwindcss-cli/src/utils/args.ts
index 81bd847d5..88b306b05 100644
--- a/packages/@tailwindcss-cli/src/utils/args.ts
+++ b/packages/@tailwindcss-cli/src/utils/args.ts
@@ -7,6 +7,7 @@ export type Arg = {
     description: string
     alias?: `-${string}`
     default?: Types[keyof Types]
+    values?: string[]
   }
 }
 
@@ -67,8 +68,28 @@ export type Result<T extends Arg> = {
 }
 
 export function args<const T extends Arg>(options: T, argv = process.argv.slice(2)): Result<T> {
+  for (let [idx, value] of argv.entries()) {
+    if (value === '-') {
+      argv[idx] = '__IO_DEFAULT_VALUE__'
+    }
+  }
+
   let parsed = parse(argv)
 
+  for (let key in parsed) {
+    let value = parsed[key]
+
+    if (key !== '_' && Array.isArray(value)) {
+      value = value[value.length - 1]
+    }
+
+    if (value === '__IO_DEFAULT_VALUE__') {
+      value = '-'
+    }
+
+    parsed[key] = value
+  }
+
   let result: { _: string[]; [key: string]: unknown } = {
     _: parsed._,
   }
diff --git a/packages/@tailwindcss-cli/src/utils/renderer.test.ts b/packages/@tailwindcss-cli/src/utils/renderer.test.ts
index b9950655f..7acef4551 100644
--- a/packages/@tailwindcss-cli/src/utils/renderer.test.ts
+++ b/packages/@tailwindcss-cli/src/utils/renderer.test.ts
@@ -1,29 +1,29 @@
 import path from 'node:path'
 import { describe, expect, it } from 'vitest'
 import { relative, wordWrap } from './renderer'
-import { normalizeWindowsSeperators } from './test-helpers'
+import { normalizeWindowsSeparators } from './test-helpers'
 
 describe('relative', () => {
   it('should print an absolute path relative to the current working directory', () => {
-    expect(normalizeWindowsSeperators(relative(path.resolve('index.css')))).toMatchInlineSnapshot(
+    expect(normalizeWindowsSeparators(relative(path.resolve('index.css')))).toMatchInlineSnapshot(
       `"./index.css"`,
     )
   })
 
   it('should prefer the shortest value by default', () => {
     // Shortest between absolute and relative paths
-    expect(normalizeWindowsSeperators(relative('index.css'))).toMatchInlineSnapshot(`"index.css"`)
+    expect(normalizeWindowsSeparators(relative('index.css'))).toMatchInlineSnapshot(`"index.css"`)
   })
 
   it('should be possible to override the current working directory', () => {
-    expect(normalizeWindowsSeperators(relative('../utils/index.css', '..'))).toMatchInlineSnapshot(
+    expect(normalizeWindowsSeparators(relative('../utils/index.css', '..'))).toMatchInlineSnapshot(
       `"./utils/index.css"`,
     )
   })
 
   it('should be possible to always prefer the relative path', () => {
     expect(
-      normalizeWindowsSeperators(
+      normalizeWindowsSeparators(
         relative('index.css', process.cwd(), { preferAbsoluteIfShorter: false }),
       ),
     ).toMatchInlineSnapshot(`"./index.css"`)
diff --git a/packages/@tailwindcss-cli/src/utils/renderer.ts b/packages/@tailwindcss-cli/src/utils/renderer.ts
index 6b0098586..da817dda7 100644
--- a/packages/@tailwindcss-cli/src/utils/renderer.ts
+++ b/packages/@tailwindcss-cli/src/utils/renderer.ts
@@ -49,7 +49,9 @@ export function wordWrap(text: string, width: number) {
   for (let word of words) {
     let wordLength = stripVTControlCharacters(word).length
 
-    if (lineLength + wordLength + 1 > width) {
+    // A word longer than `width` is kept on its own line rather than
+    // introducing an empty line before it.
+    if (lineLength > 0 && lineLength + wordLength + 1 > width) {
       lines.push(line)
       line = ''
       lineLength = 0
diff --git a/packages/@tailwindcss-cli/src/utils/test-helpers.ts b/packages/@tailwindcss-cli/src/utils/test-helpers.ts
index 8e61b0a13..30f4fc777 100644
--- a/packages/@tailwindcss-cli/src/utils/test-helpers.ts
+++ b/packages/@tailwindcss-cli/src/utils/test-helpers.ts
@@ -1,5 +1,5 @@
 import path from 'node:path'
 
-export function normalizeWindowsSeperators(p: string) {
+export function normalizeWindowsSeparators(p: string) {
   return path.sep === '\\' ? p.replaceAll('\\', '/') : p
 }
diff --git a/packages/@tailwindcss-node/README.md b/packages/@tailwindcss-node/README.md
index 95ec9d87d..5f532607d 100644
--- a/packages/@tailwindcss-node/README.md
+++ b/packages/@tailwindcss-node/README.md
@@ -13,10 +13,10 @@
 </p>
 
 <p align="center">
-    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=next" alt="Build Status"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=main" alt="Build Status"></a>
     <a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
 </p>
 
 ---
@@ -27,14 +27,10 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com).
 
 ## Community
 
-For help, discussion about best practices, or any other conversation that would benefit from being searchable:
+For help, discussion about best practices, or feature ideas:
 
-[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions)
-
-For chatting with others using the framework:
-
-[Join the Tailwind CSS Discord Server](https://discord.gg/7NF8GNe)
+[Discuss Tailwind CSS on GitHub](https://github.com/tailwindlabs/tailwindcss/discussions)
 
 ## Contributing
 
-If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindcss/tailwindcss/blob/next/.github/CONTRIBUTING.md) **before submitting a pull request**.
+If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindlabs/tailwindcss/blob/main/.github/CONTRIBUTING.md) **before submitting a pull request**.
diff --git a/packages/@tailwindcss-node/package.json b/packages/@tailwindcss-node/package.json
index 4776236c6..0eced7366 100644
--- a/packages/@tailwindcss-node/package.json
+++ b/packages/@tailwindcss-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/node",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "repository": {
@@ -19,26 +19,46 @@
   ],
   "publishConfig": {
     "provenance": true,
-    "access": "public"
+    "access": "public",
+    "exports": {
+      ".": {
+        "types": "./dist/index.d.ts",
+        "import": "./dist/index.mjs",
+        "require": "./dist/index.js"
+      },
+      "./require-cache": {
+        "types": "./dist/require-cache.d.ts",
+        "default": "./dist/require-cache.js"
+      },
+      "./esm-cache-loader": {
+        "types": "./dist/esm-cache.loader.d.mts",
+        "default": "./dist/esm-cache.loader.mjs"
+      }
+    }
   },
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "types": "./src/index.ts",
+      "import": "./src/index.ts",
+      "require": "./src/index.cts"
     },
     "./require-cache": {
-      "types": "./dist/require-cache.d.ts",
-      "default": "./dist/require-cache.js"
+      "types": "./src/require-cache.ts",
+      "import": "./src/require-cache.ts",
+      "require": "./src/require-cache.cts"
     },
     "./esm-cache-loader": {
-      "types": "./dist/esm-cache.loader.d.mts",
-      "default": "./dist/esm-cache.loader.mjs"
+      "types": "./src/esm-cache.loader.mts",
+      "default": "./src/esm-cache.loader.mts"
     }
   },
   "dependencies": {
-    "enhanced-resolve": "^5.17.1",
-    "jiti": "^2.4.0",
+    "@jridgewell/remapping": "^2.3.5",
+    "enhanced-resolve": "catalog:",
+    "jiti": "^2.7.0",
+    "lightningcss": "catalog:",
+    "magic-string": "^1.1.0",
+    "source-map-js": "^1.2.1",
     "tailwindcss": "workspace:*"
   }
 }
diff --git a/packages/@tailwindcss-node/src/compile.ts b/packages/@tailwindcss-node/src/compile.ts
index b946c79de..e5f8782c8 100644
--- a/packages/@tailwindcss-node/src/compile.ts
+++ b/packages/@tailwindcss-node/src/compile.ts
@@ -2,26 +2,29 @@ import EnhancedResolve from 'enhanced-resolve'
 import { createJiti, type Jiti } from 'jiti'
 import fs from 'node:fs'
 import fsPromises from 'node:fs/promises'
-import path, { dirname } from 'node:path'
+import path from 'node:path'
 import { pathToFileURL } from 'node:url'
 import {
   __unstable__loadDesignSystem as ___unstable__loadDesignSystem,
   compile as _compile,
   compileAst as _compileAst,
   Features,
+  Polyfills,
 } from 'tailwindcss'
 import type { AstNode } from '../../tailwindcss/src/ast'
 import { getModuleDependencies } from './get-module-dependencies'
 import { rewriteUrls } from './urls'
 
-export { Features }
+export { Features, Polyfills }
 
 export type Resolver = (id: string, base: string) => Promise<string | false | undefined>
 
 export interface CompileOptions {
   base: string
+  from?: string
   onDependency: (path: string) => void
   shouldRewriteUrls?: boolean
+  polyfills?: Polyfills
 
   customCssResolver?: Resolver
   customJsResolver?: Resolver
@@ -29,6 +32,8 @@ export interface CompileOptions {
 
 function createCompileOptions({
   base,
+  from,
+  polyfills,
   onDependency,
   shouldRewriteUrls,
 
@@ -37,11 +42,13 @@ function createCompileOptions({
 }: CompileOptions) {
   return {
     base,
+    polyfills,
+    from,
     async loadModule(id: string, base: string) {
       return loadModule(id, base, onDependency, customJsResolver)
     },
-    async loadStylesheet(id: string, base: string) {
-      let sheet = await loadStylesheet(id, base, onDependency, customCssResolver)
+    async loadStylesheet(id: string, sheetBase: string) {
+      let sheet = await loadStylesheet(id, sheetBase, onDependency, customCssResolver)
 
       if (shouldRewriteUrls) {
         sheet.content = await rewriteUrls({
@@ -56,10 +63,9 @@ function createCompileOptions({
   }
 }
 
-async function ensureSourceDetectionRootExists(
-  compiler: { root: Awaited<ReturnType<typeof compile>>['root'] },
-  base: string,
-) {
+async function ensureSourceDetectionRootExists(compiler: {
+  root: Awaited<ReturnType<typeof compile>>['root']
+}) {
   // Verify if the `source(…)` path exists (until the glob pattern starts)
   if (compiler.root && compiler.root !== 'none') {
     let globSymbols = /[*{]/
@@ -73,25 +79,27 @@ async function ensureSourceDetectionRootExists(
     }
 
     let exists = await fsPromises
-      .stat(path.resolve(base, basePath.join('/')))
+      .stat(path.resolve(compiler.root.base, basePath.join('/')))
       .then((stat) => stat.isDirectory())
       .catch(() => false)
 
     if (!exists) {
-      throw new Error(`The \`source(${compiler.root.pattern})\` does not exist`)
+      throw new Error(
+        `The \`source(${compiler.root.pattern})\` does not exist or is not a directory.`,
+      )
     }
   }
 }
 
 export async function compileAst(ast: AstNode[], options: CompileOptions) {
   let compiler = await _compileAst(ast, createCompileOptions(options))
-  await ensureSourceDetectionRootExists(compiler, options.base)
+  await ensureSourceDetectionRootExists(compiler)
   return compiler
 }
 
 export async function compile(css: string, options: CompileOptions) {
   let compiler = await _compile(css, createCompileOptions(options))
-  await ensureSourceDetectionRootExists(compiler, options.base)
+  await ensureSourceDetectionRootExists(compiler)
   return compiler
 }
 
@@ -121,7 +129,8 @@ export async function loadModule(
 
     let module = await importModule(pathToFileURL(resolvedPath).href)
     return {
-      base: dirname(resolvedPath),
+      path: resolvedPath,
+      base: path.dirname(resolvedPath),
       module: module.default ?? module,
     }
   }
@@ -140,7 +149,8 @@ export async function loadModule(
     onDependency(file)
   }
   return {
-    base: dirname(resolvedPath),
+    path: resolvedPath,
+    base: path.dirname(resolvedPath),
     module: module.default ?? module,
   }
 }
@@ -156,18 +166,9 @@ async function loadStylesheet(
 
   onDependency(resolvedPath)
 
-  if (typeof globalThis.__tw_readFile === 'function') {
-    let file = await globalThis.__tw_readFile(resolvedPath, 'utf-8')
-    if (file) {
-      return {
-        base: path.dirname(resolvedPath),
-        content: file,
-      }
-    }
-  }
-
   let file = await fsPromises.readFile(resolvedPath, 'utf-8')
   return {
+    path: resolvedPath,
     base: path.dirname(resolvedPath),
     content: file,
   }
@@ -193,12 +194,18 @@ async function importModule(path: string): Promise<any> {
   }
 }
 
+const modules = [
+  'node_modules',
+  ...(process.env.NODE_PATH ? [...process.env.NODE_PATH.split(path.delimiter)] : []),
+]
+
 const cssResolver = EnhancedResolve.ResolverFactory.createResolver({
   fileSystem: new EnhancedResolve.CachedInputFileSystem(fs, 4000),
   useSyncFileSystemCalls: true,
   extensions: ['.css'],
   mainFields: ['style'],
   conditionNames: ['style'],
+  modules,
 })
 async function resolveCssId(
   id: string,
@@ -227,6 +234,7 @@ const esmResolver = EnhancedResolve.ResolverFactory.createResolver({
   useSyncFileSystemCalls: true,
   extensions: ['.js', '.json', '.node', '.ts'],
   conditionNames: ['node', 'import'],
+  modules,
 })
 
 const cjsResolver = EnhancedResolve.ResolverFactory.createResolver({
@@ -234,6 +242,7 @@ const cjsResolver = EnhancedResolve.ResolverFactory.createResolver({
   useSyncFileSystemCalls: true,
   extensions: ['.js', '.json', '.node', '.ts'],
   conditionNames: ['node', 'require'],
+  modules,
 })
 
 async function resolveJsId(
diff --git a/packages/@tailwindcss-node/src/env.ts b/packages/@tailwindcss-node/src/env.ts
index 517ccc6c5..3b1a1b726 100644
--- a/packages/@tailwindcss-node/src/env.ts
+++ b/packages/@tailwindcss-node/src/env.ts
@@ -1,6 +1,10 @@
 export const DEBUG = resolveDebug(process.env.DEBUG)
 
 function resolveDebug(debug: typeof process.env.DEBUG) {
+  if (typeof debug === 'boolean') {
+    return debug
+  }
+
   if (debug === undefined) {
     return false
   }
diff --git a/packages/@tailwindcss-node/src/esm-cache.loader.mts b/packages/@tailwindcss-node/src/esm-cache.loader.mts
index edcfc8d77..96d297a29 100644
--- a/packages/@tailwindcss-node/src/esm-cache.loader.mts
+++ b/packages/@tailwindcss-node/src/esm-cache.loader.mts
@@ -1,22 +1,40 @@
-import { isBuiltin, type ResolveHook } from 'node:module'
+import {
+  isBuiltin,
+  type ResolveFnOutput,
+  type ResolveHook,
+  type ResolveHookContext,
+  type ResolveHookSync,
+} from 'node:module'
 
 export let resolve: ResolveHook = async (specifier, context, nextResolve) => {
   let result = await nextResolve(specifier, context)
+  return processResolve(context, result)
+}
 
-  if (result.url === import.meta.url) return result
-  if (isBuiltin(result.url)) return result
-  if (!context.parentURL) return result
+export let resolveSync: ResolveHookSync = (specifier, context, nextResolve) => {
+  let result = nextResolve(specifier, context)
+  return processResolve(context, result)
+}
 
-  let parent = new URL(context.parentURL)
+function processResolve(context: ResolveHookContext, result: ResolveFnOutput) {
+  try {
+    if (result.url === import.meta.url) return result
+    if (isBuiltin(result.url)) return result
+    if (!context.parentURL) return result
 
-  let id = parent.searchParams.get('id')
-  if (id === null) return result
+    let parent = new URL(context.parentURL)
 
-  let url = new URL(result.url)
-  url.searchParams.set('id', id)
+    let id = parent.searchParams.get('id')
+    if (id === null) return result
 
-  return {
-    ...result,
-    url: `${url}`,
+    let url = new URL(result.url)
+    url.searchParams.set('id', id)
+
+    return {
+      ...result,
+      url: `${url}`,
+    }
+  } catch {
+    return result
   }
 }
diff --git a/packages/@tailwindcss-node/src/index.cts b/packages/@tailwindcss-node/src/index.cts
index 2e79e25c7..9f2788933 100644
--- a/packages/@tailwindcss-node/src/index.cts
+++ b/packages/@tailwindcss-node/src/index.cts
@@ -1,17 +1,26 @@
 import * as Module from 'node:module'
 import { pathToFileURL } from 'node:url'
 import * as env from './env'
+import { resolveSync } from './esm-cache.loader.mjs'
 export * from './compile'
 export * from './instrumentation'
 export * from './normalize-path'
+export * from './optimize'
+export * from './source-maps'
 export { env }
 
 // In Bun, ESM modules will also populate `require.cache`, so the module hook is
 // not necessary.
 if (!process.versions.bun) {
   // `Module#register` was added in Node v18.19.0 and v20.6.0
+  // `Module#registerHooks` was added in Node v22.15.0 and v23.5.0 and is the preferred API since v25.9.0,
+  // runtime-deprecating `Module#register` since v26
   //
   // Not calling it means that while ESM dependencies don't get reloaded, the
   // actual included files will because they cache bust directly via `?id=…`
-  Module.register?.(pathToFileURL(require.resolve('@tailwindcss/node/esm-cache-loader')))
+  if (Module.registerHooks) {
+    Module.registerHooks({ resolve: resolveSync })
+  } else {
+    Module.register?.(pathToFileURL(require.resolve('@tailwindcss/node/esm-cache-loader')))
+  }
 }
diff --git a/packages/@tailwindcss-node/src/index.ts b/packages/@tailwindcss-node/src/index.ts
index 4ee2fe805..8eff1466a 100644
--- a/packages/@tailwindcss-node/src/index.ts
+++ b/packages/@tailwindcss-node/src/index.ts
@@ -1,19 +1,27 @@
 import * as Module from 'node:module'
 import { pathToFileURL } from 'node:url'
 import * as env from './env'
-export { __unstable__loadDesignSystem, compile, compileAst, Features } from './compile'
+import { resolveSync } from './esm-cache.loader.mjs'
+export * from './compile'
 export * from './instrumentation'
 export * from './normalize-path'
+export * from './optimize'
+export * from './source-maps'
 export { env }
 
 // In Bun, ESM modules will also populate `require.cache`, so the module hook is
 // not necessary.
 if (!process.versions.bun) {
-  let localRequire = Module.createRequire(import.meta.url)
-
   // `Module#register` was added in Node v18.19.0 and v20.6.0
+  // `Module#registerHooks` was added in Node v22.15.0 and v23.5.0 and is the preferred API since v25.9.0,
+  // runtime-deprecating `Module#register` since v26
   //
   // Not calling it means that while ESM dependencies don't get reloaded, the
   // actual included files will because they cache bust directly via `?id=…`
-  Module.register?.(pathToFileURL(localRequire.resolve('@tailwindcss/node/esm-cache-loader')))
+  if (Module.registerHooks) {
+    Module.registerHooks({ resolve: resolveSync })
+  } else {
+    let localRequire = Module.createRequire(import.meta.url)
+    Module.register?.(pathToFileURL(localRequire.resolve('@tailwindcss/node/esm-cache-loader')))
+  }
 }
diff --git a/packages/@tailwindcss-node/src/instrumentation.test.ts b/packages/@tailwindcss-node/src/instrumentation.test.ts
index 1f06796fd..102c7ed8e 100644
--- a/packages/@tailwindcss-node/src/instrumentation.test.ts
+++ b/packages/@tailwindcss-node/src/instrumentation.test.ts
@@ -2,7 +2,7 @@ import { stripVTControlCharacters } from 'util'
 import { expect, it } from 'vitest'
 import { Instrumentation } from './instrumentation'
 
-it('should add instrumentation', () => {
+it('should add instrumentation using start/end markers', () => {
   let I = new Instrumentation()
 
   I.start('Foo')
@@ -35,6 +35,83 @@ it('should add instrumentation', () => {
   })
 })
 
+it('should measure callbacks via the `span` api', () => {
+  let I = new Instrumentation()
+
+  I.span('Foo', () => {
+    let x = 1
+    for (let i = 0; i < 100; i++) {
+      I.span('Bar', () => {
+        x **= 2
+      })
+    }
+  })
+
+  expect.assertions(1)
+
+  I.report((output) => {
+    expect(stripVTControlCharacters(output).replace(/\[.*\]/g, '[0.xxms]')).toMatchInlineSnapshot(`
+      "
+      [0.xxms] Foo
+      [0.xxms]   ↳ Bar × 100
+      "
+    `)
+  })
+})
+
+it('should measure async callbacks via the `span` api', async () => {
+  let I = new Instrumentation()
+
+  await I.span('Foo', async () => {
+    let x = 1
+    for (let i = 0; i < 100; i++) {
+      I.span('Bar', () => {
+        x **= 2
+      })
+    }
+    await new Promise((r) => setTimeout(r, 500))
+  })
+
+  expect.assertions(2)
+
+  I.report((output) => {
+    expect(stripVTControlCharacters(output).replace(/\[.*\]/g, '[0.xxms]')).toMatchInlineSnapshot(`
+      "
+      [0.xxms] Foo
+      [0.xxms]   ↳ Bar × 100
+      "
+    `)
+
+    let [, duration] = stripVTControlCharacters(output).match(/\[(.*)\]/)!
+    expect(parseFloat(duration)).toBeGreaterThanOrEqual(500 - 2 /* Margin of error */)
+  })
+})
+
+it('should measure blocks until they go out of scope via `using`', () => {
+  let I = new Instrumentation()
+
+  {
+    using _ = I.track('Foo')
+
+    let x = 1
+    for (let i = 0; i < 100; i++) {
+      using _ = I.track('Bar')
+      x **= 2
+    }
+  }
+
+  expect.assertions(1)
+
+  I.report((output) => {
+    expect(stripVTControlCharacters(output).replace(/\[.*\]/g, '[0.xxms]')).toMatchInlineSnapshot(`
+      "
+      [0.xxms] Foo
+      [0.xxms]   ↳ Bar × 100
+      "
+    `)
+  })
+})
+
 it('should auto end pending timers when reporting', () => {
   let I = new Instrumentation()
 
diff --git a/packages/@tailwindcss-node/src/instrumentation.ts b/packages/@tailwindcss-node/src/instrumentation.ts
index c408c4db7..e454e6744 100644
--- a/packages/@tailwindcss-node/src/instrumentation.ts
+++ b/packages/@tailwindcss-node/src/instrumentation.ts
@@ -1,12 +1,21 @@
 import { DefaultMap } from '../../tailwindcss/src/utils/default-map'
 import * as env from './env'
 
+// See: https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-2.html#:~:text=Symbol.dispose,-??=%20Symbol(%22Symbol.dispose
+// @ts-expect-error — Ensure Symbol.dispose exists
+Symbol.dispose ??= Symbol('Symbol.dispose')
+// @ts-expect-error — Ensure Symbol.asyncDispose exists
+Symbol.asyncDispose ??= Symbol('Symbol.asyncDispose')
+
 export class Instrumentation implements Disposable {
   #hits = new DefaultMap(() => ({ value: 0 }))
   #timers = new DefaultMap(() => ({ value: 0n }))
   #timerStack: { id: string; label: string; namespace: string; value: bigint }[] = []
 
-  constructor(private defaultFlush = (message: string) => process.stderr.write(`${message}\n`)) {}
+  constructor(
+    private shouldReport = env.DEBUG,
+    private defaultFlush = (message: string) => void process.stderr.write(`${message}\n`),
+  ) {}
 
   hit(label: string) {
     this.#hits.get(label).value++
@@ -40,6 +49,41 @@ export class Instrumentation implements Disposable {
     this.#timers.get(parent.id).value += elapsed
   }
 
+  track(label: string) {
+    this.start(label)
+    let done = false
+
+    return {
+      [Symbol.dispose]: () => {
+        if (!done) {
+          this.end(label)
+          done = true
+        }
+      },
+      [Symbol.asyncDispose]: () => {
+        if (!done) {
+          this.end(label)
+          done = true
+        }
+      },
+    }
+  }
+
+  span<T>(label: string, fn: () => T): T {
+    this.start(label)
+    let isPromise = false
+    try {
+      let result = fn()
+
+      isPromise = result && typeof (result as any).then === 'function'
+
+      // @ts-expect-error — TS can't infer that result is a Promise here
+      return isPromise ? result.finally(() => this.end(label)) : result
+    } finally {
+      if (!isPromise) this.end(label)
+    }
+  }
+
   reset() {
     this.#hits.clear()
     this.#timers.clear()
@@ -92,7 +136,7 @@ export class Instrumentation implements Disposable {
   }
 
   [Symbol.dispose]() {
-    env.DEBUG && this.report()
+    this.shouldReport && this.report()
   }
 }
 
diff --git a/packages/@tailwindcss-node/src/optimize.ts b/packages/@tailwindcss-node/src/optimize.ts
new file mode 100644
index 000000000..2f0d39589
--- /dev/null
+++ b/packages/@tailwindcss-node/src/optimize.ts
@@ -0,0 +1,155 @@
+import remapping from '@jridgewell/remapping'
+import { Features, transform } from 'lightningcss'
+import MagicString from 'magic-string'
+
+export interface OptimizeOptions {
+  /**
+   * The file being transformed
+   */
+  file?: string
+
+  /**
+   * Enabled minified output
+   */
+  minify?: boolean
+
+  /**
+   * The output source map before optimization
+   *
+   * If omitted a resulting source map will not be available
+   */
+  map?: string
+}
+
+export interface TransformResult {
+  code: string
+  map: string | undefined
+}
+
+export function optimize(
+  input: string,
+  { file = 'input.css', minify = false, map }: OptimizeOptions = {},
+): TransformResult {
+  function optimize(code: Buffer | Uint8Array, map: string | undefined) {
+    return transform({
+      filename: file,
+      code,
+      minify,
+      sourceMap: typeof map !== 'undefined',
+      inputSourceMap: map,
+      drafts: {
+        customMedia: true,
+      },
+      nonStandard: {
+        deepSelectorCombinator: true,
+      },
+      include: Features.Nesting | Features.MediaQueries,
+      exclude: Features.LogicalProperties | Features.DirSelector | Features.LightDark,
+      targets: {
+        safari: (16 << 16) | (4 << 8),
+        ios_saf: (16 << 16) | (4 << 8),
+        firefox: 128 << 16,
+        chrome: 111 << 16,
+      },
+      errorRecovery: true,
+    })
+  }
+
+  // Running Lightning CSS twice to ensure that adjacent rules are merged after
+  // nesting is applied. This creates a more optimized output.
+  let result = optimize(Buffer.from(input), map)
+  map = result.map?.toString()
+
+  result.warnings = result.warnings.filter((warning) => {
+    // Ignore warnings about unknown pseudo-classes that are used in frameworks
+    // such as Vue or Angular and are handled by their own compilers, before
+    // reaching the browser.
+    if (
+      /'(deep|slotted|global|ng-deep|host-context)' is not recognized as a valid pseudo-/.test(
+        warning.message,
+      )
+    ) {
+      return false
+    }
+
+    return true
+  })
+
+  // Because of `errorRecovery: true`, there could be warnings, so let's let the
+  // user know about them.
+  if (process.env.NODE_ENV !== 'test' && result.warnings.length > 0) {
+    let lines = input.split('\n')
+
+    let output = [
+      `Found ${result.warnings.length} ${result.warnings.length === 1 ? 'warning' : 'warnings'} while optimizing generated CSS:`,
+    ]
+
+    for (let [idx, warning] of result.warnings.entries()) {
+      output.push('')
+      if (result.warnings.length > 1) {
+        output.push(`Issue #${idx + 1}:`)
+      }
+
+      let context = 2
+
+      let start = Math.max(0, warning.loc.line - context - 1)
+      let end = Math.min(lines.length, warning.loc.line + context)
+
+      let snippet = lines.slice(start, end).map((line, idx) => {
+        if (start + idx + 1 === warning.loc.line) {
+          return `${dim(`\u2502`)} ${line}`
+        } else {
+          return dim(`\u2502 ${line}`)
+        }
+      })
+
+      snippet.splice(
+        warning.loc.line - start,
+        0,
+        `${dim('\u2506')}${' '.repeat(warning.loc.column - 1)} ${yellow(`${dim('^--')} ${warning.message}`)}`,
+        `${dim('\u2506')}`,
+      )
+
+      output.push(...snippet)
+    }
+    output.push('')
+
+    console.warn(output.join('\n'))
+  }
+
+  result = optimize(result.code, map)
+  map = result.map?.toString()
+
+  let code = result.code.toString()
+
+  // Work around an issue where the media query range syntax transpilation
+  // generates code that is invalid with `@media` queries level 3.
+  let magic = new MagicString(code)
+  magic.replaceAll('@media not (', '@media not all and (')
+
+  // We have to use a source-map-preserving method of replacing the content
+  // which requires the use of Magic String + remapping(…) to make sure
+  // the resulting map is correct
+  if (map !== undefined && magic.hasChanged()) {
+    let magicMap = magic.generateMap({ source: 'original', hires: 'boundary' }).toString()
+
+    let remapped = remapping([magicMap, map], () => null)
+
+    map = remapped.toString()
+  }
+
+  code = magic.toString()
+
+  return {
+    code,
+    map,
+  }
+}
+
+function dim(str: string) {
+  return `\x1B[2m${str}\x1B[22m`
+}
+
+function yellow(str: string) {
+  return `\x1B[33m${str}\x1B[39m`
+}
diff --git a/packages/@tailwindcss-node/src/require-cache.ts b/packages/@tailwindcss-node/src/require-cache.ts
new file mode 100644
index 000000000..ea0562019
--- /dev/null
+++ b/packages/@tailwindcss-node/src/require-cache.ts
@@ -0,0 +1,5 @@
+export function clearRequireCache(files: string[]) {
+  for (let key of files) {
+    delete require.cache[key]
+  }
+}
diff --git a/packages/@tailwindcss-node/src/source-maps.test.ts b/packages/@tailwindcss-node/src/source-maps.test.ts
new file mode 100644
index 000000000..96ff8f05c
--- /dev/null
+++ b/packages/@tailwindcss-node/src/source-maps.test.ts
@@ -0,0 +1,8 @@
+import { expect, it } from 'vitest'
+import { toSourceMap } from './source-maps'
+
+it('should emit source maps', () => {
+  let map = toSourceMap('{"version":3,"sources":[],"names":[],"mappings":""}')
+
+  expect(map.comment('app.css.map')).toBe('/*# sourceMappingURL=app.css.map */\n')
+})
diff --git a/packages/@tailwindcss-node/src/source-maps.ts b/packages/@tailwindcss-node/src/source-maps.ts
new file mode 100644
index 000000000..58b79cb25
--- /dev/null
+++ b/packages/@tailwindcss-node/src/source-maps.ts
@@ -0,0 +1,60 @@
+import { SourceMapGenerator } from 'source-map-js'
+import type { DecodedSource, DecodedSourceMap } from '../../tailwindcss/src/source-maps/source-map'
+import { DefaultMap } from '../../tailwindcss/src/utils/default-map'
+
+export type { DecodedSource, DecodedSourceMap }
+export interface SourceMap {
+  readonly raw: string
+  readonly inline: string
+  comment(url: string): string
+}
+
+function serializeSourceMap(map: DecodedSourceMap): string {
+  let generator = new SourceMapGenerator()
+
+  let id = 1
+  let sourceTable = new DefaultMap<
+    DecodedSource | null,
+    {
+      url: string
+      content: string
+    }
+  >((src) => {
+    return {
+      url: src?.url ?? `<unknown ${id++}>`,
+      content: src?.content ?? '<none>',
+    }
+  })
+
+  for (let mapping of map.mappings) {
+    let original = sourceTable.get(mapping.originalPosition?.source ?? null)
+
+    generator.addMapping({
+      generated: mapping.generatedPosition,
+      original: mapping.originalPosition,
+      source: original.url,
+      name: mapping.name,
+    })
+
+    generator.setSourceContent(original.url, original.content)
+  }
+
+  return generator.toString()
+}
+
+export function toSourceMap(map: DecodedSourceMap | string): SourceMap {
+  let raw = typeof map === 'string' ? map : serializeSourceMap(map)
+
+  function comment(url: string) {
+    return `/*# sourceMappingURL\x3d${url} */\n`
+  }
+
+  return {
+    raw,
+    get inline() {
+      let inlined = Buffer.from(raw, 'utf-8').toString('base64')
+      return comment(`data:application/json;base64,${inlined}`)
+    },
+    comment,
+  }
+}
diff --git a/packages/@tailwindcss-node/src/urls.test.ts b/packages/@tailwindcss-node/src/urls.test.ts
index 3378e45ed..16ba352a7 100644
--- a/packages/@tailwindcss-node/src/urls.test.ts
+++ b/packages/@tailwindcss-node/src/urls.test.ts
@@ -24,6 +24,20 @@ test('URLs can be rewritten', async () => {
         background: url('/image.jpg');
         background: url("/image.jpg");
 
+        /* Potentially Vite-aliased URLs: ignored */
+        background: url(~/image.jpg);
+        background: url(~/foo/image.jpg);
+        background: url('~/image.jpg');
+        background: url("~/image.jpg");
+        background: url(#/image.jpg);
+        background: url(#/foo/image.jpg);
+        background: url('#/image.jpg');
+        background: url("#/image.jpg");
+        background: url(@/image.jpg);
+        background: url(@/foo/image.jpg);
+        background: url('@/image.jpg');
+        background: url("@/image.jpg");
+
         /* External URL: ignored */
         background: url(http://example.com/image.jpg);
         background: url('http://example.com/image.jpg');
@@ -109,6 +123,18 @@ test('URLs can be rewritten', async () => {
       background: url(/foo/image.jpg);
       background: url('/image.jpg');
       background: url("/image.jpg");
+      background: url(~/image.jpg);
+      background: url(~/foo/image.jpg);
+      background: url('~/image.jpg');
+      background: url("~/image.jpg");
+      background: url(#/image.jpg);
+      background: url(#/foo/image.jpg);
+      background: url('#/image.jpg');
+      background: url("#/image.jpg");
+      background: url(@/image.jpg);
+      background: url(@/foo/image.jpg);
+      background: url('@/image.jpg');
+      background: url("@/image.jpg");
       background: url(http://example.com/image.jpg);
       background: url('http://example.com/image.jpg');
       background: url("http://example.com/image.jpg");
diff --git a/packages/@tailwindcss-node/src/urls.ts b/packages/@tailwindcss-node/src/urls.ts
index c4d56deb7..61695a9d1 100644
--- a/packages/@tailwindcss-node/src/urls.ts
+++ b/packages/@tailwindcss-node/src/urls.ts
@@ -5,8 +5,9 @@
 // Minor modifications have been made to work with the Tailwind CSS codebase
 
 import * as path from 'node:path'
-import { toCss, walk } from '../../tailwindcss/src/ast'
+import { toCss } from '../../tailwindcss/src/ast'
 import { parse } from '../../tailwindcss/src/css-parser'
+import { walk } from '../../tailwindcss/src/walk'
 import { normalizePath } from './normalize-path'
 
 const cssUrlRE =
@@ -149,9 +150,12 @@ async function doUrlReplace(
   return `${funcName}(${wrap}${newUrl}${wrap})`
 }
 
-function skipUrlReplacer(rawUrl: string) {
+function skipUrlReplacer(rawUrl: string, aliases?: string[]) {
   return (
-    isExternalUrl(rawUrl) || isDataUrl(rawUrl) || rawUrl[0] === '#' || functionCallRE.test(rawUrl)
+    isExternalUrl(rawUrl) ||
+    isDataUrl(rawUrl) ||
+    !rawUrl[0].match(/[.a-zA-Z0-9_]/) ||
+    functionCallRE.test(rawUrl)
   )
 }
 
diff --git a/packages/@tailwindcss-node/tsconfig.json b/packages/@tailwindcss-node/tsconfig.json
index 6ae022f65..d2131cbeb 100644
--- a/packages/@tailwindcss-node/tsconfig.json
+++ b/packages/@tailwindcss-node/tsconfig.json
@@ -1,3 +1,6 @@
 {
   "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "verbatimModuleSyntax": false,
+  },
 }
diff --git a/packages/@tailwindcss-node/tsup.config.ts b/packages/@tailwindcss-node/tsup.config.ts
index 0f2ac5855..3f2d184d5 100644
--- a/packages/@tailwindcss-node/tsup.config.ts
+++ b/packages/@tailwindcss-node/tsup.config.ts
@@ -6,23 +6,35 @@ export default defineConfig([
     minify: true,
     dts: true,
     entry: ['src/index.cts'],
+    define: {
+      'process.env.NODE_ENV': '"production"',
+    },
   },
   {
     format: ['esm'],
     minify: true,
     dts: true,
     entry: ['src/index.ts'],
+    define: {
+      'process.env.NODE_ENV': '"production"',
+    },
   },
   {
     format: ['esm'],
     minify: true,
     dts: true,
     entry: ['src/esm-cache.loader.mts'],
+    define: {
+      'process.env.NODE_ENV': '"production"',
+    },
   },
   {
     format: ['cjs'],
     minify: true,
     dts: true,
     entry: ['src/require-cache.cts'],
+    define: {
+      'process.env.NODE_ENV': '"production"',
+    },
   },
 ])
diff --git a/packages/@tailwindcss-postcss/README.md b/packages/@tailwindcss-postcss/README.md
index 95ec9d87d..3facf2887 100644
--- a/packages/@tailwindcss-postcss/README.md
+++ b/packages/@tailwindcss-postcss/README.md
@@ -13,10 +13,10 @@
 </p>
 
 <p align="center">
-    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=next" alt="Build Status"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=main" alt="Build Status"></a>
     <a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
 </p>
 
 ---
@@ -27,14 +27,85 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com).
 
 ## Community
 
-For help, discussion about best practices, or any other conversation that would benefit from being searchable:
+For help, discussion about best practices, or feature ideas:
 
-[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions)
-
-For chatting with others using the framework:
-
-[Join the Tailwind CSS Discord Server](https://discord.gg/7NF8GNe)
+[Discuss Tailwind CSS on GitHub](https://github.com/tailwindlabs/tailwindcss/discussions)
 
 ## Contributing
 
-If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindcss/tailwindcss/blob/next/.github/CONTRIBUTING.md) **before submitting a pull request**.
+If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindlabs/tailwindcss/blob/main/.github/CONTRIBUTING.md) **before submitting a pull request**.
+
+---
+
+## `@tailwindcss/postcss` plugin API
+
+### Changing where the plugin searches for source files
+
+You can use the `base` option (defaults to the current working directory) to change the directory in which the plugin searches for source files:
+
+```js
+import tailwindcss from '@tailwindcss/postcss'
+
+export default {
+  plugins: [
+    tailwindcss({
+      base: path.resolve(__dirname, './path'),
+    }),
+  ],
+}
+```
+
+### Enabling or disabling Lightning CSS
+
+By default, this plugin detects whether or not the CSS is being built for production by checking the `NODE_ENV` environment variable. When building for production Lightning CSS will be enabled otherwise it is disabled.
+
+If you want to always enable or disable Lightning CSS the `optimize` option may be used:
+
+```js
+import tailwindcss from '@tailwindcss/postcss'
+
+export default {
+  plugins: [
+    tailwindcss({
+      // Enable or disable Lightning CSS
+      optimize: false,
+    }),
+  ],
+}
+```
+
+It's also possible to keep Lightning CSS enabled but disable minification:
+
+```js
+import tailwindcss from '@tailwindcss/postcss'
+
+export default {
+  plugins: [
+    tailwindcss({
+      optimize: { minify: false },
+    }),
+  ],
+}
+```
+
+### Enabling or disabling `url(…)` rewriting
+
+Our PostCSS plugin can rewrite `url(…)`s for you since it also handles `@import` (no `postcss-import` is needed). This feature is enabled by default.
+
+In some situations the bundler or framework you're using may provide this feature itself. In this case you can set `transformAssetUrls` to `false` to disable this feature:
+
+```js
+import tailwindcss from '@tailwindcss/postcss'
+
+export default {
+  plugins: [
+    tailwindcss({
+      // Disable `url(…)` rewriting
+      transformAssetUrls: false,
+
+      // Enable `url(…)` rewriting (the default)
+      transformAssetUrls: true,
+    }),
+  ],
+}
+```
diff --git a/packages/@tailwindcss-postcss/package.json b/packages/@tailwindcss-postcss/package.json
index 7e567a8d0..891578509 100644
--- a/packages/@tailwindcss-postcss/package.json
+++ b/packages/@tailwindcss-postcss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/postcss",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "description": "PostCSS plugin for Tailwind CSS, a utility-first CSS framework for rapidly building custom user interfaces",
   "license": "MIT",
   "repository": {
@@ -24,24 +24,28 @@
   },
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
     }
   },
   "dependencies": {
     "@alloc/quick-lru": "^5.2.0",
-    "@tailwindcss/node": "workspace:^",
-    "@tailwindcss/oxide": "workspace:^",
-    "lightningcss": "catalog:",
-    "postcss": "^8.4.41",
+    "@tailwindcss/node": "workspace:*",
+    "@tailwindcss/oxide": "workspace:*",
+    "postcss": "catalog:",
     "tailwindcss": "workspace:*"
   },
   "devDependencies": {
     "@types/node": "catalog:",
     "@types/postcss-import": "14.0.3",
-    "dedent": "1.5.3",
+    "dedent": "catalog:",
     "internal-example-plugin": "workspace:*",
-    "postcss-import": "^16.1.0"
+    "postcss-import": "^16.1.1"
   }
 }
diff --git a/packages/@tailwindcss-postcss/src/__snapshots__/index.test.ts.snap b/packages/@tailwindcss-postcss/src/__snapshots__/index.test.ts.snap
index cf0794ff2..05087fa39 100644
--- a/packages/@tailwindcss-postcss/src/__snapshots__/index.test.ts.snap
+++ b/packages/@tailwindcss-postcss/src/__snapshots__/index.test.ts.snap
@@ -1,373 +1,27 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
-"@layer theme {
-  :root {
-    --font-sans: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-    --font-serif: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif;
-    --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-    --color-red-50: oklch(.971 .013 17.38);
-    --color-red-100: oklch(.936 .032 17.717);
-    --color-red-200: oklch(.885 .062 18.334);
-    --color-red-300: oklch(.808 .114 19.571);
-    --color-red-400: oklch(.704 .191 22.216);
-    --color-red-500: oklch(.637 .237 25.331);
-    --color-red-600: oklch(.577 .245 27.325);
-    --color-red-700: oklch(.505 .213 27.518);
-    --color-red-800: oklch(.444 .177 26.899);
-    --color-red-900: oklch(.396 .141 25.723);
-    --color-red-950: oklch(.258 .092 26.042);
-    --color-orange-50: oklch(.98 .016 73.684);
-    --color-orange-100: oklch(.954 .038 75.164);
-    --color-orange-200: oklch(.901 .076 70.697);
-    --color-orange-300: oklch(.837 .128 66.29);
-    --color-orange-400: oklch(.75 .183 55.934);
-    --color-orange-500: oklch(.705 .213 47.604);
-    --color-orange-600: oklch(.646 .222 41.116);
-    --color-orange-700: oklch(.553 .195 38.402);
-    --color-orange-800: oklch(.47 .157 37.304);
-    --color-orange-900: oklch(.408 .123 38.172);
-    --color-orange-950: oklch(.266 .079 36.259);
-    --color-amber-50: oklch(.987 .022 95.277);
-    --color-amber-100: oklch(.962 .059 95.617);
-    --color-amber-200: oklch(.924 .12 95.746);
-    --color-amber-300: oklch(.879 .169 91.605);
-    --color-amber-400: oklch(.828 .189 84.429);
-    --color-amber-500: oklch(.769 .188 70.08);
-    --color-amber-600: oklch(.666 .179 58.318);
-    --color-amber-700: oklch(.555 .163 48.998);
-    --color-amber-800: oklch(.473 .137 46.201);
-    --color-amber-900: oklch(.414 .112 45.904);
-    --color-amber-950: oklch(.279 .077 45.635);
-    --color-yellow-50: oklch(.987 .026 102.212);
-    --color-yellow-100: oklch(.973 .071 103.193);
-    --color-yellow-200: oklch(.945 .129 101.54);
-    --color-yellow-300: oklch(.905 .182 98.111);
-    --color-yellow-400: oklch(.852 .199 91.936);
-    --color-yellow-500: oklch(.795 .184 86.047);
-    --color-yellow-600: oklch(.681 .162 75.834);
-    --color-yellow-700: oklch(.554 .135 66.442);
-    --color-yellow-800: oklch(.476 .114 61.907);
-    --color-yellow-900: oklch(.421 .095 57.708);
-    --color-yellow-950: oklch(.286 .066 53.813);
-    --color-lime-50: oklch(.986 .031 120.757);
-    --color-lime-100: oklch(.967 .067 122.328);
-    --color-lime-200: oklch(.938 .127 124.321);
-    --color-lime-300: oklch(.897 .196 126.665);
-    --color-lime-400: oklch(.841 .238 128.85);
-    --color-lime-500: oklch(.768 .233 130.85);
-    --color-lime-600: oklch(.648 .2 131.684);
-    --color-lime-700: oklch(.532 .157 131.589);
-    --color-lime-800: oklch(.453 .124 130.933);
-    --color-lime-900: oklch(.405 .101 131.063);
-    --color-lime-950: oklch(.274 .072 132.109);
-    --color-green-50: oklch(.982 .018 155.826);
-    --color-green-100: oklch(.962 .044 156.743);
-    --color-green-200: oklch(.925 .084 155.995);
-    --color-green-300: oklch(.871 .15 154.449);
-    --color-green-400: oklch(.792 .209 151.711);
-    --color-green-500: oklch(.723 .219 149.579);
-    --color-green-600: oklch(.627 .194 149.214);
-    --color-green-700: oklch(.527 .154 150.069);
-    --color-green-800: oklch(.448 .119 151.328);
-    --color-green-900: oklch(.393 .095 152.535);
-    --color-green-950: oklch(.266 .065 152.934);
-    --color-emerald-50: oklch(.979 .021 166.113);
-    --color-emerald-100: oklch(.95 .052 163.051);
-    --color-emerald-200: oklch(.905 .093 164.15);
-    --color-emerald-300: oklch(.845 .143 164.978);
-    --color-emerald-400: oklch(.765 .177 163.223);
-    --color-emerald-500: oklch(.696 .17 162.48);
-    --color-emerald-600: oklch(.596 .145 163.225);
-    --color-emerald-700: oklch(.508 .118 165.612);
-    --color-emerald-800: oklch(.432 .095 166.913);
-    --color-emerald-900: oklch(.378 .077 168.94);
-    --color-emerald-950: oklch(.262 .051 172.552);
-    --color-teal-50: oklch(.984 .014 180.72);
-    --color-teal-100: oklch(.953 .051 180.801);
-    --color-teal-200: oklch(.91 .096 180.426);
-    --color-teal-300: oklch(.855 .138 181.071);
-    --color-teal-400: oklch(.777 .152 181.912);
-    --color-teal-500: oklch(.704 .14 182.503);
-    --color-teal-600: oklch(.6 .118 184.704);
-    --color-teal-700: oklch(.511 .096 186.391);
-    --color-teal-800: oklch(.437 .078 188.216);
-    --color-teal-900: oklch(.386 .063 188.416);
-    --color-teal-950: oklch(.277 .046 192.524);
-    --color-cyan-50: oklch(.984 .019 200.873);
-    --color-cyan-100: oklch(.956 .045 203.388);
-    --color-cyan-200: oklch(.917 .08 205.041);
-    --color-cyan-300: oklch(.865 .127 207.078);
-    --color-cyan-400: oklch(.789 .154 211.53);
-    --color-cyan-500: oklch(.715 .143 215.221);
-    --color-cyan-600: oklch(.609 .126 221.723);
-    --color-cyan-700: oklch(.52 .105 223.128);
-    --color-cyan-800: oklch(.45 .085 224.283);
-    --color-cyan-900: oklch(.398 .07 227.392);
-    --color-cyan-950: oklch(.302 .056 229.695);
-    --color-sky-50: oklch(.977 .013 236.62);
-    --color-sky-100: oklch(.951 .026 236.824);
-    --color-sky-200: oklch(.901 .058 230.902);
-    --color-sky-300: oklch(.828 .111 230.318);
-    --color-sky-400: oklch(.746 .16 232.661);
-    --color-sky-500: oklch(.685 .169 237.323);
-    --color-sky-600: oklch(.588 .158 241.966);
-    --color-sky-700: oklch(.5 .134 242.749);
-    --color-sky-800: oklch(.443 .11 240.79);
-    --color-sky-900: oklch(.391 .09 240.876);
-    --color-sky-950: oklch(.293 .066 243.157);
-    --color-blue-50: oklch(.97 .014 254.604);
-    --color-blue-100: oklch(.932 .032 255.585);
-    --color-blue-200: oklch(.882 .059 254.128);
-    --color-blue-300: oklch(.809 .105 251.813);
-    --color-blue-400: oklch(.707 .165 254.624);
-    --color-blue-500: oklch(.623 .214 259.815);
-    --color-blue-600: oklch(.546 .245 262.881);
-    --color-blue-700: oklch(.488 .243 264.376);
-    --color-blue-800: oklch(.424 .199 265.638);
-    --color-blue-900: oklch(.379 .146 265.522);
-    --color-blue-950: oklch(.282 .091 267.935);
-    --color-indigo-50: oklch(.962 .018 272.314);
-    --color-indigo-100: oklch(.93 .034 272.788);
-    --color-indigo-200: oklch(.87 .065 274.039);
-    --color-indigo-300: oklch(.785 .115 274.713);
-    --color-indigo-400: oklch(.673 .182 276.935);
-    --color-indigo-500: oklch(.585 .233 277.117);
-    --color-indigo-600: oklch(.511 .262 276.966);
-    --color-indigo-700: oklch(.457 .24 277.023);
-    --color-indigo-800: oklch(.398 .195 277.366);
-    --color-indigo-900: oklch(.359 .144 278.697);
-    --color-indigo-950: oklch(.257 .09 281.288);
-    --color-violet-50: oklch(.969 .016 293.756);
-    --color-violet-100: oklch(.943 .029 294.588);
-    --color-violet-200: oklch(.894 .057 293.283);
-    --color-violet-300: oklch(.811 .111 293.571);
-    --color-violet-400: oklch(.702 .183 293.541);
-    --color-violet-500: oklch(.606 .25 292.717);
-    --color-violet-600: oklch(.541 .281 293.009);
-    --color-violet-700: oklch(.491 .27 292.581);
-    --color-violet-800: oklch(.432 .232 292.759);
-    --color-violet-900: oklch(.38 .189 293.745);
-    --color-violet-950: oklch(.283 .141 291.089);
-    --color-purple-50: oklch(.977 .014 308.299);
-    --color-purple-100: oklch(.946 .033 307.174);
-    --color-purple-200: oklch(.902 .063 306.703);
-    --color-purple-300: oklch(.827 .119 306.383);
-    --color-purple-400: oklch(.714 .203 305.504);
-    --color-purple-500: oklch(.627 .265 303.9);
-    --color-purple-600: oklch(.558 .288 302.321);
-    --color-purple-700: oklch(.496 .265 301.924);
-    --color-purple-800: oklch(.438 .218 303.724);
-    --color-purple-900: oklch(.381 .176 304.987);
-    --color-purple-950: oklch(.291 .149 302.717);
-    --color-fuchsia-50: oklch(.977 .017 320.058);
-    --color-fuchsia-100: oklch(.952 .037 318.852);
-    --color-fuchsia-200: oklch(.903 .076 319.62);
-    --color-fuchsia-300: oklch(.833 .145 321.434);
-    --color-fuchsia-400: oklch(.74 .238 322.16);
-    --color-fuchsia-500: oklch(.667 .295 322.15);
-    --color-fuchsia-600: oklch(.591 .293 322.896);
-    --color-fuchsia-700: oklch(.518 .253 323.949);
-    --color-fuchsia-800: oklch(.452 .211 324.591);
-    --color-fuchsia-900: oklch(.401 .17 325.612);
-    --color-fuchsia-950: oklch(.293 .136 325.661);
-    --color-pink-50: oklch(.971 .014 343.198);
-    --color-pink-100: oklch(.948 .028 342.258);
-    --color-pink-200: oklch(.899 .061 343.231);
-    --color-pink-300: oklch(.823 .12 346.018);
-    --color-pink-400: oklch(.718 .202 349.761);
-    --color-pink-500: oklch(.656 .241 354.308);
-    --color-pink-600: oklch(.592 .249 .584);
-    --color-pink-700: oklch(.525 .223 3.958);
-    --color-pink-800: oklch(.459 .187 3.815);
-    --color-pink-900: oklch(.408 .153 2.432);
-    --color-pink-950: oklch(.284 .109 3.907);
-    --color-rose-50: oklch(.969 .015 12.422);
-    --color-rose-100: oklch(.941 .03 12.58);
-    --color-rose-200: oklch(.892 .058 10.001);
-    --color-rose-300: oklch(.81 .117 11.638);
-    --color-rose-400: oklch(.712 .194 13.428);
-    --color-rose-500: oklch(.645 .246 16.439);
-    --color-rose-600: oklch(.586 .253 17.585);
-    --color-rose-700: oklch(.514 .222 16.935);
-    --color-rose-800: oklch(.455 .188 13.697);
-    --color-rose-900: oklch(.41 .159 10.272);
-    --color-rose-950: oklch(.271 .105 12.094);
-    --color-slate-50: oklch(.984 .003 247.858);
-    --color-slate-100: oklch(.968 .007 247.896);
-    --color-slate-200: oklch(.929 .013 255.508);
-    --color-slate-300: oklch(.869 .022 252.894);
-    --color-slate-400: oklch(.704 .04 256.788);
-    --color-slate-500: oklch(.554 .046 257.417);
-    --color-slate-600: oklch(.446 .043 257.281);
-    --color-slate-700: oklch(.372 .044 257.287);
-    --color-slate-800: oklch(.279 .041 260.031);
-    --color-slate-900: oklch(.208 .042 265.755);
-    --color-slate-950: oklch(.129 .042 264.695);
-    --color-gray-50: oklch(.985 .002 247.839);
-    --color-gray-100: oklch(.967 .003 264.542);
-    --color-gray-200: oklch(.928 .006 264.531);
-    --color-gray-300: oklch(.872 .01 258.338);
-    --color-gray-400: oklch(.707 .022 261.325);
-    --color-gray-500: oklch(.551 .027 264.364);
-    --color-gray-600: oklch(.446 .03 256.802);
-    --color-gray-700: oklch(.373 .034 259.733);
-    --color-gray-800: oklch(.278 .033 256.848);
-    --color-gray-900: oklch(.21 .034 264.665);
-    --color-gray-950: oklch(.13 .028 261.692);
-    --color-zinc-50: oklch(.985 0 0);
-    --color-zinc-100: oklch(.967 .001 286.375);
-    --color-zinc-200: oklch(.92 .004 286.32);
-    --color-zinc-300: oklch(.871 .006 286.286);
-    --color-zinc-400: oklch(.705 .015 286.067);
-    --color-zinc-500: oklch(.552 .016 285.938);
-    --color-zinc-600: oklch(.442 .017 285.786);
-    --color-zinc-700: oklch(.37 .013 285.805);
-    --color-zinc-800: oklch(.274 .006 286.033);
-    --color-zinc-900: oklch(.21 .006 285.885);
-    --color-zinc-950: oklch(.141 .005 285.823);
-    --color-neutral-50: oklch(.985 0 0);
-    --color-neutral-100: oklch(.97 0 0);
-    --color-neutral-200: oklch(.922 0 0);
-    --color-neutral-300: oklch(.87 0 0);
-    --color-neutral-400: oklch(.708 0 0);
-    --color-neutral-500: oklch(.556 0 0);
-    --color-neutral-600: oklch(.439 0 0);
-    --color-neutral-700: oklch(.371 0 0);
-    --color-neutral-800: oklch(.269 0 0);
-    --color-neutral-900: oklch(.205 0 0);
-    --color-neutral-950: oklch(.145 0 0);
-    --color-stone-50: oklch(.985 .001 106.423);
-    --color-stone-100: oklch(.97 .001 106.424);
-    --color-stone-200: oklch(.923 .003 48.717);
-    --color-stone-300: oklch(.869 .005 56.366);
-    --color-stone-400: oklch(.709 .01 56.259);
-    --color-stone-500: oklch(.553 .013 58.071);
-    --color-stone-600: oklch(.444 .011 73.639);
-    --color-stone-700: oklch(.374 .01 67.558);
-    --color-stone-800: oklch(.268 .007 34.298);
-    --color-stone-900: oklch(.216 .006 56.043);
-    --color-stone-950: oklch(.147 .004 49.25);
+"
+@layer properties {
+  @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+    *, :before, :after, ::backdrop {
+      --tw-font-weight: initial;
+    }
+  }
+}
+
+@layer theme {
+  :root, :host {
+    --font-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", Arial,
+    sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+    --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
+    monospace;
     --color-black: #000;
-    --color-white: #fff;
-    --spacing: .25rem;
-    --breakpoint-sm: 40rem;
-    --breakpoint-md: 48rem;
-    --breakpoint-lg: 64rem;
-    --breakpoint-xl: 80rem;
-    --breakpoint-2xl: 96rem;
-    --container-3xs: 16rem;
-    --container-2xs: 18rem;
-    --container-xs: 20rem;
-    --container-sm: 24rem;
-    --container-md: 28rem;
-    --container-lg: 32rem;
-    --container-xl: 36rem;
-    --container-2xl: 42rem;
-    --container-3xl: 48rem;
-    --container-4xl: 56rem;
-    --container-5xl: 64rem;
-    --container-6xl: 72rem;
-    --container-7xl: 80rem;
-    --container-prose: 65ch;
-    --text-xs: .75rem;
-    --text-xs--line-height: calc(1 / .75);
-    --text-sm: .875rem;
-    --text-sm--line-height: calc(1.25 / .875);
-    --text-base: 1rem;
-    --text-base--line-height: calc(1.5 / 1);
-    --text-lg: 1.125rem;
-    --text-lg--line-height: calc(1.75 / 1.125);
-    --text-xl: 1.25rem;
-    --text-xl--line-height: calc(1.75 / 1.25);
     --text-2xl: 1.5rem;
     --text-2xl--line-height: calc(2 / 1.5);
-    --text-3xl: 1.875rem;
-    --text-3xl--line-height: calc(2.25 / 1.875);
-    --text-4xl: 2.25rem;
-    --text-4xl--line-height: calc(2.5 / 2.25);
-    --text-5xl: 3rem;
-    --text-5xl--line-height: 1;
-    --text-6xl: 3.75rem;
-    --text-6xl--line-height: 1;
-    --text-7xl: 4.5rem;
-    --text-7xl--line-height: 1;
-    --text-8xl: 6rem;
-    --text-8xl--line-height: 1;
-    --text-9xl: 8rem;
-    --text-9xl--line-height: 1;
-    --font-weight-thin: 100;
-    --font-weight-extralight: 200;
-    --font-weight-light: 300;
-    --font-weight-normal: 400;
-    --font-weight-medium: 500;
-    --font-weight-semibold: 600;
     --font-weight-bold: 700;
-    --font-weight-extrabold: 800;
-    --font-weight-black: 900;
-    --tracking-tighter: -.05em;
-    --tracking-tight: -.025em;
-    --tracking-normal: 0em;
-    --tracking-wide: .025em;
-    --tracking-wider: .05em;
-    --tracking-widest: .1em;
-    --leading-tight: 1.25;
-    --leading-snug: 1.375;
-    --leading-normal: 1.5;
-    --leading-relaxed: 1.625;
-    --leading-loose: 2;
-    --radius-xs: .125rem;
-    --radius-sm: .25rem;
-    --radius-md: .375rem;
-    --radius-lg: .5rem;
-    --radius-xl: .75rem;
-    --radius-2xl: 1rem;
-    --radius-3xl: 1.5rem;
-    --radius-4xl: 2rem;
-    --shadow-2xs: 0 1px #0000000d;
-    --shadow-xs: 0 1px 2px 0 #0000000d;
-    --shadow-sm: 0 1px 3px 0 #0000001a, 0 1px 2px -1px #0000001a;
-    --shadow-md: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
-    --shadow-lg: 0 10px 15px -3px #0000001a, 0 4px 6px -4px #0000001a;
-    --shadow-xl: 0 20px 25px -5px #0000001a, 0 8px 10px -6px #0000001a;
-    --shadow-2xl: 0 25px 50px -12px #00000040;
-    --inset-shadow-2xs: inset 0 1px #0000000d;
-    --inset-shadow-xs: inset 0 1px 1px #0000000d;
-    --inset-shadow-sm: inset 0 2px 4px #0000000d;
-    --drop-shadow-xs: 0 1px 1px #0000000d;
-    --drop-shadow-sm: 0 1px 2px #00000026;
-    --drop-shadow-md: 0 3px 3px #0000001f;
-    --drop-shadow-lg: 0 4px 4px #00000026;
-    --drop-shadow-xl: 0 9px 7px #0000001a;
-    --drop-shadow-2xl: 0 25px 25px #00000026;
-    --ease-in: cubic-bezier(.4, 0, 1, 1);
-    --ease-out: cubic-bezier(0, 0, .2, 1);
-    --ease-in-out: cubic-bezier(.4, 0, .2, 1);
-    --animate-spin: spin 1s linear infinite;
-    --animate-ping: ping 1s cubic-bezier(0, 0, .2, 1) infinite;
-    --animate-pulse: pulse 2s cubic-bezier(.4, 0, .6, 1) infinite;
-    --animate-bounce: bounce 1s infinite;
-    --blur-xs: 4px;
-    --blur-sm: 8px;
-    --blur-md: 12px;
-    --blur-lg: 16px;
-    --blur-xl: 24px;
-    --blur-2xl: 40px;
-    --blur-3xl: 64px;
-    --perspective-dramatic: 100px;
-    --perspective-near: 300px;
-    --perspective-normal: 500px;
-    --perspective-midrange: 800px;
-    --perspective-distant: 1200px;
-    --aspect-video: 16 / 9;
-    --default-transition-duration: .15s;
-    --default-transition-timing-function: cubic-bezier(.4, 0, .2, 1);
     --default-font-family: var(--font-sans);
-    --default-font-feature-settings: var(--font-sans--font-feature-settings);
-    --default-font-variation-settings: var(--font-sans--font-variation-settings);
     --default-mono-font-family: var(--font-mono);
-    --default-mono-font-feature-settings: var(--font-mono--font-feature-settings);
-    --default-mono-font-variation-settings: var(--font-mono--font-variation-settings);
   }
 }
 
@@ -390,20 +44,16 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
     -webkit-text-size-adjust: 100%;
     tab-size: 4;
     line-height: 1.5;
-    font-family: var(--default-font-family, ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji");
+    font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji");
     font-feature-settings: var(--default-font-feature-settings, normal);
     font-variation-settings: var(--default-font-variation-settings, normal);
     -webkit-tap-highlight-color: transparent;
   }
 
-  body {
-    line-height: inherit;
-  }
-
   hr {
+    height: 0;
     color: inherit;
     border-top-width: 1px;
-    height: 0;
   }
 
   abbr:where([title]) {
@@ -460,7 +110,7 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
     border-collapse: collapse;
   }
 
-  :-moz-focusring {
+  :-moz-focusring:where(:not(iframe)) {
     outline: auto;
   }
 
@@ -522,7 +172,18 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
 
   ::placeholder {
     opacity: 1;
-    color: color-mix(in oklab, currentColor 50%, transparent);
+  }
+
+  @supports (not ((-webkit-appearance: -apple-pay-button))) or (contain-intrinsic-size: 1px) {
+    ::placeholder {
+      color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      ::placeholder {
+        color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
   }
 
   textarea {
@@ -534,8 +195,8 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
   }
 
   ::-webkit-date-and-time-value {
-    text-align: inherit;
     min-height: 1lh;
+    text-align: inherit;
   }
 
   ::-webkit-datetime-edit {
@@ -582,6 +243,10 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
     padding-block: 0;
   }
 
+  ::-webkit-calendar-picker-indicator {
+    line-height: 1;
+  }
+
   :-moz-ui-invalid {
     box-shadow: none;
   }
@@ -616,14 +281,20 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
   }
 
   .text-black\\/50 {
-    color: color-mix(in oklab, var(--color-black) 50%, transparent);
+    color: #00000080;
+  }
+
+  @supports (color: color-mix(in lab, red, red)) {
+    .text-black\\/50 {
+      color: color-mix(in oklab, var(--color-black) 50%, transparent);
+    }
   }
 
   .underline {
     text-decoration-line: underline;
   }
 
-  @media (width >= 96rem) {
+  @media (min-width: 96rem) {
     .\\32 xl\\:font-bold {
       --tw-font-weight: var(--font-weight-bold);
       font-weight: var(--font-weight-bold);
@@ -631,47 +302,9 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
   }
 }
 
-@supports (-moz-orient: inline) {
-  @layer base {
-    *, :before, :after, ::backdrop {
-      --tw-font-weight: initial;
-    }
-  }
-}
-
-@keyframes spin {
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-@keyframes ping {
-  75%, 100% {
-    opacity: 0;
-    transform: scale(2);
-  }
-}
-
-@keyframes pulse {
-  50% {
-    opacity: .5;
-  }
-}
-
-@keyframes bounce {
-  0%, 100% {
-    animation-timing-function: cubic-bezier(.8, 0, 1, 1);
-    transform: translateY(-25%);
-  }
-
-  50% {
-    animation-timing-function: cubic-bezier(0, 0, .2, 1);
-    transform: none;
-  }
-}
-
 @property --tw-font-weight {
   syntax: "*";
   inherits: false
-}"
+}
+"
 `;
diff --git a/packages/@tailwindcss-postcss/src/ast.test.ts b/packages/@tailwindcss-postcss/src/ast.test.ts
index dd7095428..8a2a5b019 100644
--- a/packages/@tailwindcss-postcss/src/ast.test.ts
+++ b/packages/@tailwindcss-postcss/src/ast.test.ts
@@ -84,7 +84,7 @@ it('should convert a Tailwind CSS AST into a PostCSS AST', () => {
   `
 
   let ast = parse(input)
-  let transformedAst = cssAstToPostCssAst(ast)
+  let transformedAst = cssAstToPostCssAst(postcss, ast)
 
   expect(transformedAst.toString()).toMatchInlineSnapshot(`
     "@charset "UTF-8";
diff --git a/packages/@tailwindcss-postcss/src/ast.ts b/packages/@tailwindcss-postcss/src/ast.ts
index 201dd4bf8..7ca9e2add 100644
--- a/packages/@tailwindcss-postcss/src/ast.ts
+++ b/packages/@tailwindcss-postcss/src/ast.ts
@@ -1,18 +1,67 @@
-import postcss, {
-  type ChildNode as PostCssChildNode,
-  type Container as PostCssContainerNode,
-  type Root as PostCssRoot,
-  type Source as PostcssSource,
-} from 'postcss'
+import type * as postcss from 'postcss'
 import { atRule, comment, decl, rule, type AstNode } from '../../tailwindcss/src/ast'
+import { createLineTable, type LineTable } from '../../tailwindcss/src/source-maps/line-table'
+import type { Source, SourceLocation } from '../../tailwindcss/src/source-maps/source'
+import { DefaultMap } from '../../tailwindcss/src/utils/default-map'
 
 const EXCLAMATION_MARK = 0x21
 
-export function cssAstToPostCssAst(ast: AstNode[], source: PostcssSource | undefined): PostCssRoot {
+export function cssAstToPostCssAst(
+  postcss: postcss.Postcss,
+  ast: AstNode[],
+  source?: postcss.Source,
+): postcss.Root {
+  let inputMap = new DefaultMap<Source, postcss.Input>((src) => {
+    return new postcss.Input(src.code, {
+      map: source?.input.map,
+      from: src.file ?? undefined,
+    })
+  })
+
+  let lineTables = new DefaultMap<Source, LineTable>((src) => createLineTable(src.code))
+
   let root = postcss.root()
   root.source = source
 
-  function transform(node: AstNode, parent: PostCssContainerNode) {
+  function toSource(loc: SourceLocation | undefined): postcss.Source | undefined {
+    // Use the fallback if this node has no location info in the AST
+    if (!loc) return
+    if (!loc[0]) return
+
+    let table = lineTables.get(loc[0])
+    let start = table.find(loc[1])
+    let end = table.find(loc[2])
+
+    return {
+      input: inputMap.get(loc[0]),
+      start: {
+        line: start.line,
+        column: start.column + 1,
+        offset: loc[1],
+      },
+      end: {
+        line: end.line,
+        column: end.column + 1,
+        offset: loc[2],
+      },
+    }
+  }
+
+  function updateSource(astNode: postcss.ChildNode, loc: SourceLocation | undefined) {
+    let source = toSource(loc)
+
+    // The `source` property on PostCSS nodes must be defined if present because
+    // `toJSON()` reads each property and tries to read from source.input if it
+    // sees a `source` property. This means for a missing or otherwise absent
+    // source it must be *missing* from the object rather than just `undefined`
+    if (source) {
+      astNode.source = source
+    } else {
+      delete astNode.source
+    }
+  }
+
+  function transform(node: AstNode, parent: postcss.Container) {
     // Declaration
     if (node.kind === 'declaration') {
       let astNode = postcss.decl({
@@ -20,14 +69,14 @@ export function cssAstToPostCssAst(ast: AstNode[], source: PostcssSource | undef
         value: node.value ?? '',
         important: node.important,
       })
-      astNode.source = source
+      updateSource(astNode, node.src)
       parent.append(astNode)
     }
 
     // Rule
     else if (node.kind === 'rule') {
       let astNode = postcss.rule({ selector: node.selector })
-      astNode.source = source
+      updateSource(astNode, node.src)
       astNode.raws.semicolon = true
       parent.append(astNode)
       for (let child of node.nodes) {
@@ -38,7 +87,7 @@ export function cssAstToPostCssAst(ast: AstNode[], source: PostcssSource | undef
     // AtRule
     else if (node.kind === 'at-rule') {
       let astNode = postcss.atRule({ name: node.name.slice(1), params: node.params })
-      astNode.source = source
+      updateSource(astNode, node.src)
       astNode.raws.semicolon = true
       parent.append(astNode)
       for (let child of node.nodes) {
@@ -53,7 +102,7 @@ export function cssAstToPostCssAst(ast: AstNode[], source: PostcssSource | undef
       // spaces.
       astNode.raws.left = ''
       astNode.raws.right = ''
-      astNode.source = source
+      updateSource(astNode, node.src)
       parent.append(astNode)
     }
 
@@ -74,19 +123,39 @@ export function cssAstToPostCssAst(ast: AstNode[], source: PostcssSource | undef
   return root
 }
 
-export function postCssAstToCssAst(root: PostCssRoot): AstNode[] {
+export function postCssAstToCssAst(root: postcss.Root): AstNode[] {
+  let inputMap = new DefaultMap<postcss.Input, Source>((input) => ({
+    file: input.file ?? input.id ?? null,
+    code: input.css,
+  }))
+
+  function toSource(node: postcss.ChildNode): SourceLocation | undefined {
+    let source = node.source
+    if (!source) return
+
+    let input = source.input
+    if (!input) return
+    if (source.start === undefined) return
+    if (source.end === undefined) return
+
+    return [inputMap.get(input), source.start.offset, source.end.offset]
+  }
+
   function transform(
-    node: PostCssChildNode,
+    node: postcss.ChildNode,
     parent: Extract<AstNode, { nodes: AstNode[] }>['nodes'],
   ) {
     // Declaration
     if (node.type === 'decl') {
-      parent.push(decl(node.prop, node.value, node.important))
+      let astNode = decl(node.prop, node.value, node.important)
+      astNode.src = toSource(node)
+      parent.push(astNode)
     }
 
     // Rule
     else if (node.type === 'rule') {
       let astNode = rule(node.selector)
+      astNode.src = toSource(node)
       node.each((child) => transform(child, astNode.nodes))
       parent.push(astNode)
     }
@@ -94,6 +163,7 @@ export function postCssAstToCssAst(root: PostCssRoot): AstNode[] {
     // AtRule
     else if (node.type === 'atrule') {
       let astNode = atRule(`@${node.name}`, node.params)
+      astNode.src = toSource(node)
       node.each((child) => transform(child, astNode.nodes))
       parent.push(astNode)
     }
@@ -101,7 +171,9 @@ export function postCssAstToCssAst(root: PostCssRoot): AstNode[] {
     // Comment
     else if (node.type === 'comment') {
       if (node.text.charCodeAt(0) !== EXCLAMATION_MARK) return
-      parent.push(comment(node.text))
+      let astNode = comment(node.text)
+      astNode.src = toSource(node)
+      parent.push(astNode)
     }
 
     // Unknown
diff --git a/packages/@tailwindcss-postcss/src/fixtures/example-project/input.css b/packages/@tailwindcss-postcss/src/fixtures/example-project/input.css
new file mode 100644
index 000000000..f1af498fc
--- /dev/null
+++ b/packages/@tailwindcss-postcss/src/fixtures/example-project/input.css
@@ -0,0 +1 @@
+/* the content for this file is set in the tests */
diff --git a/packages/@tailwindcss-postcss/src/index.test.ts b/packages/@tailwindcss-postcss/src/index.test.ts
index 50f72a13d..b393cc382 100644
--- a/packages/@tailwindcss-postcss/src/index.test.ts
+++ b/packages/@tailwindcss-postcss/src/index.test.ts
@@ -1,7 +1,10 @@
 import dedent from 'dedent'
-import { unlink, writeFile } from 'node:fs/promises'
+import { mkdir, mkdtemp, readFile, rm, unlink, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import path from 'path'
 import postcss from 'postcss'
-import { afterEach, beforeEach, describe, expect, test } from 'vitest'
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
+import { pretty } from '../../tailwindcss/src/test-utils/run'
 import tailwindcss from './index'
 
 // We give this file path to PostCSS for processing.
@@ -17,6 +20,16 @@ function inputCssFilePath() {
 
 const css = dedent
 
+async function run(plugin: any, from: string, input: string): Promise<string> {
+  let ast = postcss.parse(input)
+  for (let runner of plugin.plugins) {
+    if (runner.Once) {
+      await runner.Once(ast, { postcss, result: { opts: { from }, messages: [] } })
+    }
+  }
+  return ast.toString()
+}
+
 test("`@import 'tailwindcss'` is replaced with the generated CSS", async () => {
   let processor = postcss([
     tailwindcss({ base: `${__dirname}/fixtures/example-project`, optimize: { minify: false } }),
@@ -24,7 +37,7 @@ test("`@import 'tailwindcss'` is replaced with the generated CSS", async () => {
 
   let result = await processor.process(`@import 'tailwindcss'`, { from: inputCssFilePath() })
 
-  expect(result.css.trim()).toMatchSnapshot()
+  expect(pretty(result.css)).toMatchSnapshot()
 
   // Check for dependency messages
   expect(result.messages).toContainEqual({
@@ -41,7 +54,7 @@ test("`@import 'tailwindcss'` is replaced with the generated CSS", async () => {
   })
   expect(result.messages).toContainEqual({
     type: 'dir-dependency',
-    dir: expect.stringMatching(/example-project[\/|\\]src$/g),
+    dir: expect.stringMatching(/example-project[/|\\]src$/g),
     glob: expect.stringMatching(/^\*\*\/\*/g),
     parent: expect.any(String),
     plugin: expect.any(String),
@@ -70,8 +83,9 @@ test('output is optimized by Lightning CSS', async () => {
     { from: inputCssFilePath() },
   )
 
-  expect(result.css.trim()).toMatchInlineSnapshot(`
-    "@layer utilities {
+  expect(pretty(result.css)).toMatchInlineSnapshot(`
+    "
+    @layer utilities {
       .foo {
         color: #000;
       }
@@ -79,7 +93,8 @@ test('output is optimized by Lightning CSS', async () => {
       .bar {
         color: red;
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -90,7 +105,7 @@ test('@apply can be used without emitting the theme in the CSS file', async () =
 
   let result = await processor.process(
     css`
-      @import 'tailwindcss/theme.css' theme(reference);
+      @reference 'tailwindcss/theme.css';
       .foo {
         @apply text-red-500;
       }
@@ -98,22 +113,31 @@ test('@apply can be used without emitting the theme in the CSS file', async () =
     { from: inputCssFilePath() },
   )
 
-  expect(result.css.trim()).toMatchInlineSnapshot(`
-    ".foo {
-      color: var(--color-red-500);
-    }"
+  expect(pretty(result.css)).toMatchInlineSnapshot(`
+    "
+    .foo {
+      color: var(--color-red-500, oklch(63.7% .237 25.331));
+    }
+    "
   `)
 })
 
 describe('processing without specifying a base path', () => {
-  let filepath = `${process.cwd()}/my-test-file.html`
+  let filepath: string
+  let dir: string
 
-  beforeEach(() =>
-    writeFile(filepath, `<div class="md:[&:hover]:content-['testing_default_base_path']">`),
-  )
+  beforeEach(async () => {
+    dir = await mkdtemp(path.join(tmpdir(), 'tw-postcss'))
+    await mkdir(dir, { recursive: true })
+    filepath = path.join(dir, 'my-test-file.html')
+    await writeFile(filepath, `<div class="md:[&:hover]:content-['testing_default_base_path']">`)
+  })
   afterEach(() => unlink(filepath))
 
   test('the current working directory is used by default', async () => {
+    using spy = vi.spyOn(process, 'cwd')
+    spy.mockReturnValue(dir)
+
     let processor = postcss([tailwindcss({ optimize: { minify: false } })])
 
     let result = await processor.process(`@import "tailwindcss"`, { from: inputCssFilePath() })
@@ -131,6 +155,18 @@ describe('processing without specifying a base path', () => {
   })
 })
 
+test('fallback to `base` directory when `result.opts.from` is not provided', async () => {
+  using _ = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+  let processor = postcss([
+    tailwindcss({ base: `${__dirname}/fixtures/example-project`, optimize: { minify: false } }),
+  ])
+
+  let result = await processor.process(`@import 'tailwindcss'`)
+
+  expect(result.css.length).toBeGreaterThan(0)
+})
+
 describe('plugins', () => {
   test('local CJS plugin', async () => {
     let processor = postcss([
@@ -145,8 +181,9 @@ describe('plugins', () => {
       { from: inputCssFilePath() },
     )
 
-    expect(result.css.trim()).toMatchInlineSnapshot(`
-      ".underline {
+    expect(pretty(result.css)).toMatchInlineSnapshot(`
+      "
+      .underline {
         text-decoration-line: underline;
       }
 
@@ -158,7 +195,8 @@ describe('plugins', () => {
 
       .hocus\\:underline:focus, .hocus\\:underline:hover {
         text-decoration-line: underline;
-      }"
+      }
+      "
     `)
   })
 
@@ -175,8 +213,9 @@ describe('plugins', () => {
       { from: `${__dirname}/fixtures/another-project/input.css` },
     )
 
-    expect(result.css.trim()).toMatchInlineSnapshot(`
-      ".underline {
+    expect(pretty(result.css)).toMatchInlineSnapshot(`
+      "
+      .underline {
         text-decoration-line: underline;
       }
 
@@ -188,7 +227,8 @@ describe('plugins', () => {
 
       .hocus\\:underline:focus, .hocus\\:underline:hover {
         text-decoration-line: underline;
-      }"
+      }
+      "
     `)
   })
 
@@ -205,8 +245,9 @@ describe('plugins', () => {
       { from: inputCssFilePath() },
     )
 
-    expect(result.css.trim()).toMatchInlineSnapshot(`
-      ".underline {
+    expect(pretty(result.css)).toMatchInlineSnapshot(`
+      "
+      .underline {
         text-decoration-line: underline;
       }
 
@@ -218,7 +259,8 @@ describe('plugins', () => {
 
       .hocus\\:underline:focus, .hocus\\:underline:hover {
         text-decoration-line: underline;
-      }"
+      }
+      "
     `)
   })
 })
@@ -241,10 +283,66 @@ test('bail early when Tailwind is not used', async () => {
   // didn't use `@tailwind utilities` we didn't scan for utilities.
   expect(result.css).not.toContain('.underline {')
 
-  expect(result.css.trim()).toMatchInlineSnapshot(`
-    ".custom-css {
+  expect(pretty(result.css)).toMatchInlineSnapshot(`
+    "
+    .custom-css {
       color: red;
-    }"
+    }
+    "
+  `)
+})
+
+test('handle CSS when only using a `@reference` (we should not bail early)', async () => {
+  let processor = postcss([
+    tailwindcss({ base: `${__dirname}/fixtures/example-project`, optimize: { minify: false } }),
+  ])
+
+  let result = await processor.process(
+    css`
+      @reference "tailwindcss/theme.css";
+
+      .foo {
+        @variant md {
+          bar: baz;
+        }
+      }
+    `,
+    { from: inputCssFilePath() },
+  )
+
+  expect(pretty(result.css)).toMatchInlineSnapshot(`
+    "
+    @media (min-width: 48rem) {
+      .foo {
+        bar: baz;
+      }
+    }
+    "
+  `)
+})
+
+test('handle CSS when using a `@variant` using variants that do not rely on the `@theme`', async () => {
+  let processor = postcss([
+    tailwindcss({ base: `${__dirname}/fixtures/example-project`, optimize: { minify: false } }),
+  ])
+
+  let result = await processor.process(
+    css`
+      .foo {
+        @variant data-is-hoverable {
+          bar: baz;
+        }
+      }
+    `,
+    { from: inputCssFilePath() },
+  )
+
+  expect(pretty(result.css)).toMatchInlineSnapshot(`
+    "
+    .foo[data-is-hoverable] {
+      bar: baz;
+    }
+    "
   `)
 })
 
@@ -279,30 +377,142 @@ test('runs `Once` plugins in the right order', async () => {
     { from: inputCssFilePath() },
   )
 
-  expect(result.css.trim()).toMatchInlineSnapshot(`
-    ":root {
-      --color-red-500: red;
-    }
-
+  expect(pretty(result.css)).toMatchInlineSnapshot(`
+    "
     .custom-css {
       color: red;
-    }"
+    }
+    "
   `)
-  expect(before).toMatchInlineSnapshot(`
-    "@theme {
+  expect(pretty(before)).toMatchInlineSnapshot(`
+    "
+    @theme {
       --color-red-500: red;
     }
     .custom-css {
       color: theme(--color-red-500);
-    }"
-  `)
-  expect(after).toMatchInlineSnapshot(`
-    ":root {
-      --color-red-500: red;
     }
-
+    "
+  `)
+  expect(pretty(after)).toMatchInlineSnapshot(`
+    "
     .custom-css {
       color: red;
-    }"
+    }
+    "
   `)
 })
+
+describe('concurrent builds', () => {
+  let dir: string
+  beforeEach(async () => {
+    dir = await mkdtemp(path.join(tmpdir(), 'tw-postcss'))
+    await writeFile(path.join(dir, 'index.html'), `<div class="underline"></div>`)
+    await writeFile(
+      path.join(dir, 'index.css'),
+      css`
+        @import './dependency.css';
+      `,
+    )
+    await writeFile(
+      path.join(dir, 'dependency.css'),
+      css`
+        @tailwind utilities;
+      `,
+    )
+  })
+  afterEach(() => rm(dir, { recursive: true, force: true }))
+
+  test('does experience a race-condition when calling the plugin two times for the same change', async () => {
+    using spy = vi.spyOn(process, 'cwd')
+    spy.mockReturnValue(dir)
+
+    let from = path.join(dir, 'index.css')
+    let input = (await readFile(path.join(dir, 'index.css'))).toString()
+
+    let plugin = tailwindcss({ optimize: { minify: false } })
+
+    let result = await run(plugin, from, input)
+
+    expect(result).toContain('.underline')
+
+    // Ensure that the mtime is updated
+    await new Promise((resolve) => setTimeout(resolve, 100))
+    await writeFile(
+      path.join(dir, 'dependency.css'),
+      css`
+        @tailwind utilities;
+        .red {
+          color: red;
+        }
+      `,
+    )
+
+    let promise1 = run(plugin, from, input)
+    let promise2 = run(plugin, from, input)
+
+    expect(await promise1).toContain('.red')
+    expect(await promise2).toContain('.red')
+  })
+})
+
+test('rebuilds when the input CSS changes even if the `from` file on disk did not', async () => {
+  let dir = await mkdtemp(path.join(tmpdir(), 'tw-postcss'))
+  // The `from` file exists on disk with a stable mtime. The input CSS is handed
+  // to the plugin directly (as a preprocessor like Sass would produce it), so it
+  // can change without `from`'s mtime ever changing.
+  await writeFile(path.join(dir, 'index.css'), '')
+
+  let from = path.join(dir, 'index.css')
+  let plugin = tailwindcss({ base: dir, optimize: { minify: false } })
+
+  let first = await run(
+    plugin,
+    from,
+    css`
+      @tailwind utilities;
+      .first {
+        @apply underline;
+      }
+    `,
+  )
+  let second = await run(
+    plugin,
+    from,
+    css`
+      @tailwind utilities;
+      .second {
+        @apply line-through;
+      }
+    `,
+  )
+
+  expect(first).toContain('.first')
+  expect(second).toContain('.second')
+
+  await rm(dir, { recursive: true, force: true })
+})
+
+test('does not register the input file as a dependency, even if it is passed in as relative path', async () => {
+  let processor = postcss([
+    tailwindcss({ base: `${__dirname}/fixtures/example-project`, optimize: { minify: false } }),
+  ])
+
+  let result = await processor.process(`@tailwind utilities`, { from: './input.css' })
+
+  expect(pretty(result.css)).toMatchInlineSnapshot(`
+    "
+    .underline {
+      text-decoration-line: underline;
+    }
+    "
+  `)
+
+  // Check for dependency messages
+  expect(result.messages).not.toContainEqual({
+    type: 'dependency',
+    file: expect.stringMatching(/input.css$/g),
+    parent: expect.any(String),
+    plugin: expect.any(String),
+  })
+})
diff --git a/packages/@tailwindcss-postcss/src/index.ts b/packages/@tailwindcss-postcss/src/index.ts
index c69b9a875..a4a8d9326 100644
--- a/packages/@tailwindcss-postcss/src/index.ts
+++ b/packages/@tailwindcss-postcss/src/index.ts
@@ -1,11 +1,17 @@
 import QuickLRU from '@alloc/quick-lru'
-import { compileAst, env, Features, Instrumentation } from '@tailwindcss/node'
+import {
+  compileAst,
+  env,
+  Features,
+  Instrumentation,
+  optimize as optimizeCss,
+  Polyfills,
+} from '@tailwindcss/node'
 import { clearRequireCache } from '@tailwindcss/node/require-cache'
 import { Scanner } from '@tailwindcss/oxide'
-import { Features as LightningCssFeatures, transform } from 'lightningcss'
 import fs from 'node:fs'
 import path, { relative } from 'node:path'
-import postcss, { type AcceptedPlugin, type PluginCreator } from 'postcss'
+import type { AcceptedPlugin, PluginCreator, Postcss, Root } from 'postcss'
 import { toCss, type AstNode } from '../../tailwindcss/src/ast'
 import { cssAstToPostCssAst, postCssAstToCssAst } from './ast'
 import fixRelativePathsPlugin from './postcss-fix-relative-paths'
@@ -14,20 +20,22 @@ const DEBUG = env.DEBUG
 
 interface CacheEntry {
   mtimes: Map<string, number>
-  compiler: null | Awaited<ReturnType<typeof compileAst>>
+  inputCss: string
+  compiler: null | ReturnType<typeof compileAst>
   scanner: null | Scanner
   tailwindCssAst: AstNode[]
-  cachedPostCssAst: postcss.Root
-  optimizedPostCssAst: postcss.Root
+  cachedPostCssAst: Root
+  optimizedPostCssAst: Root
   fullRebuildPaths: string[]
 }
 const cache = new QuickLRU<string, CacheEntry>({ maxSize: 50 })
 
-function getContextFromCache(inputFile: string, opts: PluginOptions): CacheEntry {
+function getContextFromCache(postcss: Postcss, inputFile: string, opts: PluginOptions): CacheEntry {
   let key = `${inputFile}:${opts.base ?? ''}:${JSON.stringify(opts.optimize)}`
   if (cache.has(key)) return cache.get(key)!
   let entry = {
     mtimes: new Map<string, number>(),
+    inputCss: '',
     compiler: null,
     scanner: null,
 
@@ -42,16 +50,30 @@ function getContextFromCache(inputFile: string, opts: PluginOptions): CacheEntry
 }
 
 export type PluginOptions = {
-  // The base directory to scan for class candidates.
+  /**
+   * The base directory to scan for class candidates.
+   *
+   * Defaults to the current working directory.
+   */
   base?: string
 
-  // Optimize and minify the output CSS.
+  /**
+   * Optimize and minify the output CSS.
+   */
   optimize?: boolean | { minify?: boolean }
+
+  /**
+   * Enable or disable asset URL rewriting.
+   *
+   * Defaults to `true`.
+   */
+  transformAssetUrls?: boolean
 }
 
 function tailwindcss(opts: PluginOptions = {}): AcceptedPlugin {
   let base = opts.base ?? process.cwd()
   let optimize = opts.optimize ?? process.env.NODE_ENV === 'production'
+  let shouldRewriteUrls = opts.transformAssetUrls ?? true
 
   return {
     postcssPlugin: '@tailwindcss/postcss',
@@ -63,10 +85,11 @@ function tailwindcss(opts: PluginOptions = {}): AcceptedPlugin {
 
       {
         postcssPlugin: 'tailwindcss',
-        async Once(root, { result }) {
+        async Once(root, { result, postcss }) {
           using I = new Instrumentation()
 
           let inputFile = result.opts.from ?? ''
+          let isCSSModuleFile = inputFile.endsWith('.module.css')
 
           DEBUG && I.start(`[@tailwindcss/postcss] ${relative(base, inputFile)}`)
 
@@ -77,10 +100,13 @@ function tailwindcss(opts: PluginOptions = {}): AcceptedPlugin {
             root.walkAtRules((node) => {
               if (
                 node.name === 'import' ||
+                node.name === 'reference' ||
                 node.name === 'theme' ||
+                node.name === 'variant' ||
                 node.name === 'config' ||
                 node.name === 'plugin' ||
-                node.name === 'apply'
+                node.name === 'apply' ||
+                node.name === 'tailwind'
               ) {
                 canBail = false
                 return false
@@ -90,8 +116,12 @@ function tailwindcss(opts: PluginOptions = {}): AcceptedPlugin {
             DEBUG && I.end('Quick bail check')
           }
 
-          let context = getContextFromCache(inputFile, opts)
-          let inputBasePath = path.dirname(path.resolve(inputFile))
+          let context = getContextFromCache(postcss, inputFile, opts)
+          let inputBasePath = inputFile ? path.dirname(path.resolve(inputFile)) : base
+
+          // Whether this is the first build or not, if it is, then we can
+          // optimize the build by not creating the compiler until we need it.
+          let isInitialBuild = context.compiler === null
 
           async function createCompiler() {
             DEBUG && I.start('Setup compiler')
@@ -107,10 +137,14 @@ function tailwindcss(opts: PluginOptions = {}): AcceptedPlugin {
 
             DEBUG && I.start('Create compiler')
             let compiler = await compileAst(ast, {
+              from: result.opts.from,
               base: inputBasePath,
-              onDependency: (path) => {
-                context.fullRebuildPaths.push(path)
-              },
+              shouldRewriteUrls,
+              onDependency: (path) => context.fullRebuildPaths.push(path),
+              // In CSS Module files, we have to disable the `@property` polyfill since these will
+              // emit global `*` rules which are considered to be non-pure and will cause builds
+              // to fail.
+              polyfills: isCSSModuleFile ? Polyfills.All ^ Polyfills.AtProperty : Polyfills.All,
             })
             DEBUG && I.end('Create compiler')
 
@@ -118,23 +152,203 @@ function tailwindcss(opts: PluginOptions = {}): AcceptedPlugin {
             return compiler
           }
 
-          // Whether this is the first build or not, if it is, then we can
-          // optimize the build by not creating the compiler until we need it.
-          let isInitialBuild = context.compiler === null
+          try {
+            // Setup the compiler if it doesn't exist yet. This way we can
+            // guarantee a `build()` function is available.
+            context.compiler ??= createCompiler()
 
-          // Setup the compiler if it doesn't exist yet. This way we can
-          // guarantee a `build()` function is available.
-          context.compiler ??= await createCompiler()
+            if ((await context.compiler).features === Features.None) {
+              return
+            }
 
-          if (context.compiler.features === Features.None) {
-            return
-          }
+            let rebuildStrategy: 'full' | 'incremental' = 'incremental'
 
-          let rebuildStrategy: 'full' | 'incremental' = 'incremental'
+            // Track file modification times to CSS files
+            DEBUG && I.start('Register full rebuild paths')
+            {
+              for (let file of context.fullRebuildPaths) {
+                result.messages.push({
+                  type: 'dependency',
+                  plugin: '@tailwindcss/postcss',
+                  file: path.resolve(file),
+                  parent: result.opts.from,
+                })
+              }
 
-          // Track file modification times to CSS files
-          DEBUG && I.start('Register full rebuild paths')
-          {
+              let files = result.messages.flatMap((message) => {
+                if (message.type !== 'dependency') return []
+                return message.file
+              })
+              files.push(inputFile)
+
+              for (let file of files) {
+                let changedTime = fs.statSync(file, { throwIfNoEntry: false })?.mtimeMs ?? null
+                if (changedTime === null) {
+                  if (file === inputFile) {
+                    rebuildStrategy = 'full'
+                  }
+                  continue
+                }
+
+                let prevTime = context.mtimes.get(file)
+                if (prevTime === changedTime) continue
+
+                rebuildStrategy = 'full'
+                context.mtimes.set(file, changedTime)
+              }
+
+              // The mtimes above only track files on disk. When the input CSS is
+              // generated by another tool (e.g. Sass) and passed to `process()`,
+              // it can change without any tracked file's mtime changing, so also
+              // rebuild when the input CSS itself differs from the last build.
+              let inputCss = root.source?.input.css ?? root.toString()
+              if (context.inputCss !== inputCss) {
+                rebuildStrategy = 'full'
+                context.inputCss = inputCss
+              }
+            }
+            DEBUG && I.end('Register full rebuild paths')
+
+            if (
+              rebuildStrategy === 'full' &&
+              // We can reuse the compiler if it was created during the
+              // initial build. If it wasn't, we need to create a new one.
+              !isInitialBuild
+            ) {
+              context.compiler = createCompiler()
+            }
+
+            let compiler = await context.compiler
+
+            if (context.scanner === null || rebuildStrategy === 'full') {
+              DEBUG && I.start('Setup scanner')
+              let sources = (() => {
+                // Disable auto source detection
+                if (compiler.root === 'none') {
+                  return []
+                }
+
+                // No root specified, use the base directory
+                if (compiler.root === null) {
+                  return [{ base, pattern: '**/*', negated: false }]
+                }
+
+                // Use the specified root
+                return [{ ...compiler.root, negated: false }]
+              })().concat(compiler.sources)
+
+              // Look for candidates used to generate the CSS
+              context.scanner = new Scanner({ sources })
+              DEBUG && I.end('Setup scanner')
+            }
+
+            DEBUG && I.start('Scan for candidates')
+            let candidates = compiler.features & Features.Utilities ? context.scanner.scan() : []
+            DEBUG && I.end('Scan for candidates')
+
+            if (compiler.features & Features.Utilities) {
+              DEBUG && I.start('Register dependency messages')
+              // Add all found files as direct dependencies
+              // Note: With Turbopack, the input file might not be a resolved path
+              let resolvedInputFile = path.resolve(base, inputFile)
+              for (let file of context.scanner.files) {
+                let absolutePath = path.resolve(file)
+                // The CSS file cannot be a dependency of itself
+                if (absolutePath === resolvedInputFile) {
+                  continue
+                }
+                result.messages.push({
+                  type: 'dependency',
+                  plugin: '@tailwindcss/postcss',
+                  file: absolutePath,
+                  parent: result.opts.from,
+                })
+              }
+
+              // Register dependencies so changes in `base` cause a rebuild while
+              // giving tools like Vite or Parcel a glob that can be used to limit
+              // the files that cause a rebuild to only those that match it.
+              for (let { base: globBase, pattern } of context.scanner.globs) {
+                // Avoid adding a dependency on the base directory itself, since it
+                // causes Next.js to start an endless recursion if the `distDir` is
+                // configured to anything other than the default `.next` dir.
+                if (pattern === '*' && base === globBase) {
+                  continue
+                }
+
+                if (pattern === '') {
+                  result.messages.push({
+                    type: 'dependency',
+                    plugin: '@tailwindcss/postcss',
+                    file: path.resolve(globBase),
+                    parent: result.opts.from,
+                  })
+                } else {
+                  result.messages.push({
+                    type: 'dir-dependency',
+                    plugin: '@tailwindcss/postcss',
+                    dir: path.resolve(globBase),
+                    glob: pattern,
+                    parent: result.opts.from,
+                  })
+                }
+              }
+              DEBUG && I.end('Register dependency messages')
+            }
+
+            DEBUG && I.start('Build utilities')
+            let tailwindCssAst = compiler.build(candidates)
+            DEBUG && I.end('Build utilities')
+
+            if (context.tailwindCssAst !== tailwindCssAst) {
+              if (optimize) {
+                DEBUG && I.start('Optimization')
+
+                DEBUG && I.start('AST -> CSS')
+                let css = toCss(tailwindCssAst)
+                DEBUG && I.end('AST -> CSS')
+
+                DEBUG && I.start('Lightning CSS')
+                let optimized = optimizeCss(css, {
+                  minify: typeof optimize === 'object' ? optimize.minify : true,
+                })
+                DEBUG && I.end('Lightning CSS')
+
+                DEBUG && I.start('CSS -> PostCSS AST')
+                context.optimizedPostCssAst = postcss.parse(optimized.code, result.opts)
+                DEBUG && I.end('CSS -> PostCSS AST')
+
+                DEBUG && I.end('Optimization')
+              } else {
+                // Convert our AST to a PostCSS AST
+                DEBUG && I.start('Transform Tailwind CSS AST into PostCSS AST')
+                context.cachedPostCssAst = cssAstToPostCssAst(postcss, tailwindCssAst, root.source)
+                DEBUG && I.end('Transform Tailwind CSS AST into PostCSS AST')
+              }
+            }
+
+            context.tailwindCssAst = tailwindCssAst
+
+            DEBUG && I.start('Update PostCSS AST')
+            root.removeAll()
+            root.append(
+              optimize
+                ? context.optimizedPostCssAst.clone().nodes
+                : context.cachedPostCssAst.clone().nodes,
+            )
+
+            // Trick PostCSS into thinking the indent is 2 spaces, so it uses that
+            // as the default instead of 4.
+            root.raws.indent = '  '
+            DEBUG && I.end('Update PostCSS AST')
+
+            DEBUG && I.end(`[@tailwindcss/postcss] ${relative(base, inputFile)}`)
+          } catch (error) {
+            // An error requires a full rebuild to fix
+            context.compiler = null
+
+            // Ensure all dependencies we have collected thus far are included so that the rebuild
+            // is correctly triggered
             for (let file of context.fullRebuildPaths) {
               result.messages.push({
                 type: 'dependency',
@@ -144,193 +358,20 @@ function tailwindcss(opts: PluginOptions = {}): AcceptedPlugin {
               })
             }
 
-            let files = result.messages.flatMap((message) => {
-              if (message.type !== 'dependency') return []
-              return message.file
-            })
-            files.push(inputFile)
+            // We found that throwing the error will cause PostCSS to no longer watch for changes
+            // in some situations so we instead log the error and continue with an empty stylesheet.
+            console.error(error)
 
-            for (let file of files) {
-              let changedTime = fs.statSync(file, { throwIfNoEntry: false })?.mtimeMs ?? null
-              if (changedTime === null) {
-                if (file === inputFile) {
-                  rebuildStrategy = 'full'
-                }
-                continue
-              }
-
-              let prevTime = context.mtimes.get(file)
-              if (prevTime === changedTime) continue
-
-              rebuildStrategy = 'full'
-              context.mtimes.set(file, changedTime)
-            }
-          }
-          DEBUG && I.end('Register full rebuild paths')
-
-          if (
-            rebuildStrategy === 'full' &&
-            // We can re-use the compiler if it was created during the
-            // initial build. If it wasn't, we need to create a new one.
-            !isInitialBuild
-          ) {
-            context.compiler = await createCompiler()
-          }
-
-          if (context.scanner === null || rebuildStrategy === 'full') {
-            DEBUG && I.start('Setup scanner')
-            let sources = (() => {
-              // Disable auto source detection
-              if (context.compiler.root === 'none') {
-                return []
-              }
-
-              // No root specified, use the base directory
-              if (context.compiler.root === null) {
-                return [{ base, pattern: '**/*' }]
-              }
-
-              // Use the specified root
-              return [context.compiler.root]
-            })().concat(context.compiler.globs)
-
-            // Look for candidates used to generate the CSS
-            context.scanner = new Scanner({ sources })
-            DEBUG && I.end('Setup scanner')
-          }
-
-          DEBUG && I.start('Scan for candidates')
-          let candidates =
-            context.compiler.features & Features.Utilities ? context.scanner.scan() : []
-          DEBUG && I.end('Scan for candidates')
-
-          if (context.compiler.features & Features.Utilities) {
-            DEBUG && I.start('Register dependency messages')
-            // Add all found files as direct dependencies
-            for (let file of context.scanner.files) {
-              result.messages.push({
-                type: 'dependency',
-                plugin: '@tailwindcss/postcss',
-                file: path.resolve(file),
-                parent: result.opts.from,
-              })
+            if (error && typeof error === 'object' && 'message' in error) {
+              throw root.error(`${error.message}`)
             }
 
-            // Register dependencies so changes in `base` cause a rebuild while
-            // giving tools like Vite or Parcel a glob that can be used to limit
-            // the files that cause a rebuild to only those that match it.
-            for (let { base: globBase, pattern } of context.scanner.globs) {
-              // Avoid adding a dependency on the base directory itself, since it
-              // causes Next.js to start an endless recursion if the `distDir` is
-              // configured to anything other than the default `.next` dir.
-              if (pattern === '*' && base === globBase) {
-                continue
-              }
-
-              if (pattern === '') {
-                result.messages.push({
-                  type: 'dependency',
-                  plugin: '@tailwindcss/postcss',
-                  file: path.resolve(globBase),
-                  parent: result.opts.from,
-                })
-              } else {
-                result.messages.push({
-                  type: 'dir-dependency',
-                  plugin: '@tailwindcss/postcss',
-                  dir: path.resolve(globBase),
-                  glob: pattern,
-                  parent: result.opts.from,
-                })
-              }
-            }
-            DEBUG && I.end('Register dependency messages')
+            throw root.error(`${error}`)
           }
-
-          DEBUG && I.start('Build utilities')
-          let tailwindCssAst = context.compiler.build(candidates)
-          DEBUG && I.end('Build utilities')
-
-          if (context.tailwindCssAst !== tailwindCssAst) {
-            if (optimize) {
-              DEBUG && I.start('Optimization')
-
-              DEBUG && I.start('AST -> CSS')
-              let css = toCss(tailwindCssAst)
-              DEBUG && I.end('AST -> CSS')
-
-              DEBUG && I.start('Lightning CSS')
-              let ast = optimizeCss(css, {
-                minify: typeof optimize === 'object' ? optimize.minify : true,
-              })
-              DEBUG && I.end('Lightning CSS')
-
-              DEBUG && I.start('CSS -> PostCSS AST')
-              context.optimizedPostCssAst = postcss.parse(ast, result.opts)
-              DEBUG && I.end('CSS -> PostCSS AST')
-
-              DEBUG && I.end('Optimization')
-            } else {
-              // Convert our AST to a PostCSS AST
-              DEBUG && I.start('Transform Tailwind CSS AST into PostCSS AST')
-              context.cachedPostCssAst = cssAstToPostCssAst(tailwindCssAst, root.source)
-              DEBUG && I.end('Transform Tailwind CSS AST into PostCSS AST')
-            }
-          }
-
-          context.tailwindCssAst = tailwindCssAst
-
-          DEBUG && I.start('Update PostCSS AST')
-          root.removeAll()
-          root.append(
-            optimize
-              ? context.optimizedPostCssAst.clone().nodes
-              : context.cachedPostCssAst.clone().nodes,
-          )
-
-          // Trick PostCSS into thinking the indent is 2 spaces, so it uses that
-          // as the default instead of 4.
-          root.raws.indent = '  '
-          DEBUG && I.end('Update PostCSS AST')
-
-          DEBUG && I.end(`[@tailwindcss/postcss] ${relative(base, inputFile)}`)
         },
       },
     ],
   }
 }
 
-function optimizeCss(
-  input: string,
-  { file = 'input.css', minify = false }: { file?: string; minify?: boolean } = {},
-) {
-  function optimize(code: Buffer | Uint8Array) {
-    return transform({
-      filename: file,
-      code,
-      minify,
-      sourceMap: false,
-      drafts: {
-        customMedia: true,
-      },
-      nonStandard: {
-        deepSelectorCombinator: true,
-      },
-      include: LightningCssFeatures.Nesting,
-      exclude: LightningCssFeatures.LogicalProperties | LightningCssFeatures.DirSelector,
-      targets: {
-        safari: (16 << 16) | (4 << 8),
-        ios_saf: (16 << 16) | (4 << 8),
-        firefox: 128 << 16,
-        chrome: 111 << 16,
-      },
-      errorRecovery: true,
-    }).code
-  }
-
-  // Running Lightning CSS twice to ensure that adjacent rules are merged after
-  // nesting is applied. This creates a more optimized output.
-  return optimize(optimize(Buffer.from(input))).toString()
-}
-
 export default Object.assign(tailwindcss, { postcss: true }) as PluginCreator<PluginOptions>
diff --git a/packages/@tailwindcss-postcss/src/postcss-fix-relative-paths/index.test.ts b/packages/@tailwindcss-postcss/src/postcss-fix-relative-paths/index.test.ts
index d2f72f664..fd90c483e 100644
--- a/packages/@tailwindcss-postcss/src/postcss-fix-relative-paths/index.test.ts
+++ b/packages/@tailwindcss-postcss/src/postcss-fix-relative-paths/index.test.ts
@@ -4,6 +4,7 @@ import postcss from 'postcss'
 import atImport from 'postcss-import'
 import { describe, expect, test } from 'vitest'
 import fixRelativePathsPlugin from '.'
+import { pretty } from '../../../tailwindcss/src/test-utils/run'
 
 describe('fixRelativePathsPlugin', () => {
   test('rewrites @source and @plugin to be relative to the initial css file', async () => {
@@ -14,11 +15,13 @@ describe('fixRelativePathsPlugin', () => {
 
     let result = await processor.process(css, { from: cssPath })
 
-    expect(result.css.trim()).toMatchInlineSnapshot(`
-      "@source "../../example-project/src/**/*.ts";
+    expect(pretty(result.css)).toMatchInlineSnapshot(`
+      "
+      @source "../../example-project/src/**/*.ts";
       @source "!../../example-project/src/**/*.ts";
       @plugin "../../example-project/src/plugin.js";
-      @plugin "../../example-project/src/what\\"s-this.js";"
+      @plugin "../../example-project/src/what\\"s-this.js";
+      "
     `)
   })
 
@@ -30,11 +33,13 @@ describe('fixRelativePathsPlugin', () => {
 
     let result = await processor.process(css, { from: cssPath })
 
-    expect(result.css.trim()).toMatchInlineSnapshot(`
-      "@plugin "/absolute/paths";
+    expect(pretty(result.css)).toMatchInlineSnapshot(`
+      "
+      @plugin "/absolute/paths";
       @plugin "C:\\Program Files\\HAL 9000";
       @plugin "\\\\Media\\Pictures\\Worth\\1000 words";
-      @plugin "some-node-dep";"
+      @plugin "some-node-dep";
+      "
     `)
   })
 
@@ -46,13 +51,16 @@ describe('fixRelativePathsPlugin', () => {
 
     let result = await processor.process(css, { from: cssPath })
 
-    expect(result.css.trim()).toMatchInlineSnapshot(`
-      "@plugin './plugin-in-sibling.ts';
+    expect(pretty(result.css)).toMatchInlineSnapshot(`
+      "
+      @plugin './plugin-in-sibling.ts';
       @plugin '../plugin-in-sibling.ts';
       @plugin 'plugin-in-sibling';
+
       @plugin './plugin-in-root.ts';
       @plugin '../plugin-in-root.ts';
-      @plugin 'plugin-in-root';"
+      @plugin 'plugin-in-root';
+      "
     `)
   })
 })
diff --git a/packages/@tailwindcss-postcss/tsconfig.json b/packages/@tailwindcss-postcss/tsconfig.json
index 6ae022f65..d2131cbeb 100644
--- a/packages/@tailwindcss-postcss/tsconfig.json
+++ b/packages/@tailwindcss-postcss/tsconfig.json
@@ -1,3 +1,6 @@
 {
   "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "verbatimModuleSyntax": false,
+  },
 }
diff --git a/packages/@tailwindcss-standalone/package.json b/packages/@tailwindcss-standalone/package.json
index 704ed563e..24f8c93c7 100644
--- a/packages/@tailwindcss-standalone/package.json
+++ b/packages/@tailwindcss-standalone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/standalone",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "private": true,
   "description": "Standalone CLI for Tailwind CSS",
   "license": "MIT",
@@ -26,30 +26,30 @@
   ],
   "dependencies": {
     "@tailwindcss/aspect-ratio": "^0.4.2",
-    "@tailwindcss/cli": "workspace:^",
-    "@tailwindcss/forms": "^0.5.9",
-    "@tailwindcss/typography": "^0.5.15",
+    "@tailwindcss/cli": "workspace:*",
+    "@tailwindcss/forms": "^0.5.11",
+    "@tailwindcss/typography": "^0.5.20",
     "detect-libc": "1.0.3",
-    "enhanced-resolve": "^5.17.1",
-    "tailwindcss": "workspace:^"
+    "enhanced-resolve": "catalog:",
+    "tailwindcss": "workspace:*"
   },
   "__notes": "These binary packages must be included so Bun can build the CLI for all supported platforms. We also rely on Lightning CSS and Parcel being patched so Bun can statically analyze the executables.",
   "devDependencies": {
-    "@parcel/watcher-darwin-arm64": "^2.5.0",
-    "@parcel/watcher-darwin-x64": "^2.5.0",
-    "@parcel/watcher-linux-arm64-glibc": "^2.5.0",
-    "@parcel/watcher-linux-arm64-musl": "^2.5.0",
-    "@parcel/watcher-linux-x64-glibc": "^2.5.0",
-    "@parcel/watcher-linux-x64-musl": "^2.5.0",
-    "@parcel/watcher-win32-x64": "^2.5.0",
-    "@types/bun": "^1.1.13",
-    "bun": "1.1.29",
-    "lightningcss-darwin-arm64": "^1.25.1",
-    "lightningcss-darwin-x64": "^1.25.1",
-    "lightningcss-linux-arm64-gnu": "^1.25.1",
-    "lightningcss-linux-arm64-musl": "^1.25.1",
-    "lightningcss-linux-x64-gnu": "^1.25.1",
-    "lightningcss-linux-x64-musl": "^1.25.1",
-    "lightningcss-win32-x64-msvc": "^1.25.1"
+    "@parcel/watcher-darwin-arm64": "catalog:",
+    "@parcel/watcher-darwin-x64": "catalog:",
+    "@parcel/watcher-linux-arm64-glibc": "catalog:",
+    "@parcel/watcher-linux-arm64-musl": "catalog:",
+    "@parcel/watcher-linux-x64-glibc": "catalog:",
+    "@parcel/watcher-linux-x64-musl": "catalog:",
+    "@parcel/watcher-win32-x64": "catalog:",
+    "@types/bun": "^1.3.14",
+    "bun": "^1.3.14",
+    "lightningcss-darwin-arm64": "catalog:",
+    "lightningcss-darwin-x64": "catalog:",
+    "lightningcss-linux-arm64-gnu": "catalog:",
+    "lightningcss-linux-arm64-musl": "catalog:",
+    "lightningcss-linux-x64-gnu": "catalog:",
+    "lightningcss-linux-x64-musl": "catalog:",
+    "lightningcss-win32-x64-msvc": "catalog:"
   }
 }
diff --git a/packages/@tailwindcss-standalone/scripts/build.ts b/packages/@tailwindcss-standalone/scripts/build.ts
index 83f3b20a9..0aee26435 100644
--- a/packages/@tailwindcss-standalone/scripts/build.ts
+++ b/packages/@tailwindcss-standalone/scripts/build.ts
@@ -1,4 +1,3 @@
-import { $ } from 'bun'
 import { createHash } from 'node:crypto'
 import { mkdir, readFile, writeFile } from 'node:fs/promises'
 import * as path from 'node:path'
@@ -6,66 +5,107 @@ import { fileURLToPath } from 'node:url'
 
 const __dirname = fileURLToPath(new URL('.', import.meta.url))
 
-async function buildForPlatform(triple: string, outfile: string) {
-  // We wrap this in a retry because occasionally the atomic rename fails for some reason
-  for (let i = 0; i < 5; ++i) {
-    try {
-      return await $`bun build --compile --target=${triple} ./src/index.ts --outfile=${outfile}`
-    } catch (err) {
-      if (i < 5) continue
+// Workaround for Bun binary downloads failing on Windows CI when
+// USERPROFILE is passed through by Turborepo.
+//
+// Unfortunately, setting this at runtime doesn't appear to work so we have to
+// spawn a new process without the env var.
+if (process.env.NESTED_BUILD !== '1' && process.env.USERPROFILE && process.env.USERPROFILE !== '') {
+  let result = await Bun.$`bun ${fileURLToPath(import.meta.url)}`.env({
+    USERPROFILE: '',
+    NESTED_BUILD: '1',
+  })
 
-      throw new Error(`Failed to build for platform ${triple}`, { cause: err })
-    }
-  }
+  process.exit(result.exitCode)
 }
 
-async function build(triple: string, file: string) {
-  let start = process.hrtime.bigint()
+// We use baseline builds for all x64 platforms to ensure compatibility with
+// older hardware.
+let builds: { target: Bun.Build.Target; name: string }[] = [
+  { name: 'tailwindcss-linux-arm64', target: 'bun-linux-arm64' },
+  { name: 'tailwindcss-linux-arm64-musl', target: 'bun-linux-arm64-musl' },
+  // @ts-expect-error: Either the types are wrong or the runtime needs to be updated
+  // to accept a `-glibc` at the end like the types suggest.
+  { name: 'tailwindcss-linux-x64', target: 'bun-linux-x64-baseline' },
+  { name: 'tailwindcss-linux-x64-musl', target: 'bun-linux-x64-baseline-musl' },
+  { name: 'tailwindcss-macos-arm64', target: 'bun-darwin-arm64' },
+  { name: 'tailwindcss-macos-x64', target: 'bun-darwin-x64-baseline' },
+  { name: 'tailwindcss-windows-x64.exe', target: 'bun-windows-x64-baseline' },
+]
 
-  let outfile = path.resolve(__dirname, `../dist/${file}`)
+let summary: { target: Bun.Build.Target; name: string; sum: string }[] = []
 
-  await buildForPlatform(triple, outfile)
+// Build platform binaries and checksum them.
+let start = process.hrtime.bigint()
+for (let { target, name } of builds) {
+  let outfile = path.resolve(__dirname, `../dist/${name}`)
 
-  await new Promise((resolve) => setTimeout(resolve, 100))
+  let result = await Bun.build({
+    entrypoints: ['./src/index.ts'],
+    target: 'node',
+    minify: {
+      whitespace: false,
+      syntax: true,
+      identifiers: false,
+      keepNames: true,
+    },
+
+    define: {
+      // This ensures only necessary binaries are bundled for linux targets
+      // It reduces binary size since no runtime selection is necessary
+      'process.env.PLATFORM_LIBC': JSON.stringify(target.includes('-musl') ? 'musl' : 'glibc'),
+
+      // This prevents the WASI build from being bundled with the binary
+      'process.env.NAPI_RS_FORCE_WASI': JSON.stringify(''),
+
+      // This simplifies the Oxide loading code a small amount
+      'process.env.NAPI_RS_NATIVE_LIBRARY_PATH': JSON.stringify(''),
+    },
+
+    compile: {
+      target,
+      outfile,
+
+      // Disable .env loading
+      autoloadDotenv: false,
+
+      // Disable bunfig.toml loading
+      autoloadBunfig: false,
+    },
+
+    plugins: [
+      {
+        name: 'tailwindcss-plugin',
+        setup(build) {
+          build.onLoad({ filter: /tailwindcss-oxide\.wasi\.cjs$/ }, async (args) => {
+            return { contents: '' }
+          })
+        },
+      },
+    ],
+  })
+
+  let entry = result.outputs.find((output) => output.kind === 'entry-point')
+  if (!entry) throw new Error(`Build failed for ${target}`)
 
   let content = await readFile(outfile)
-  let sum = createHash('sha256').update(content).digest('hex')
 
-  let elapsed = process.hrtime.bigint() - start
-
-  return {
-    triple,
-    file,
-    sum,
-    elapsed,
-  }
+  summary.push({
+    target,
+    name,
+    sum: createHash('sha256').update(content).digest('hex'),
+  })
 }
 
 await mkdir(path.resolve(__dirname, '../dist'), { recursive: true })
 
-// Build platform binaries and checksum them
-let results = await Promise.all([
-  build('bun-linux-arm64', './tailwindcss-linux-arm64'),
-  build('bun-linux-x64', './tailwindcss-linux-x64'),
-  // build('linux-armv7', 'tailwindcss-linux-armv7'),
-  build('bun-darwin-arm64', './tailwindcss-macos-arm64'),
-  build('bun-darwin-x64', './tailwindcss-macos-x64'),
-  // The Windows x64 build uses `bun-baseline` instead of the regular bun build.
-  // This enables support for running inside the ARM emulation mode.
-  build('bun-windows-x64-baseline', './tailwindcss-windows-x64.exe'),
-  // buildForPlatform('win32-arm64', 'tailwindcss-windows-arm64'),
-])
-
 // Write the checksums to a file
 let sumsFile = path.resolve(__dirname, '../dist/sha256sums.txt')
-let sums = results.map(({ file, sum }) => `${sum}  ${file}`)
-
-console.table(
-  results.map(({ triple, sum, elapsed }) => ({
-    triple,
-    sum,
-    elapsed: `${(Number(elapsed) / 1e6).toFixed(0)}ms`,
-  })),
-)
+let sums = summary.map(({ name, sum }) => `${sum}  ./${name}`)
 
 await writeFile(sumsFile, sums.join('\n') + '\n')
+
+console.table(summary.map(({ target, sum }) => ({ target, sum })))
+
+let elapsed = process.hrtime.bigint() - start
+console.log(`Build completed in ${(Number(elapsed) / 1e6).toFixed(0)}ms`)
diff --git a/packages/@tailwindcss-standalone/src/index.ts b/packages/@tailwindcss-standalone/src/index.ts
index 98e75c3dc..23a928f8b 100644
--- a/packages/@tailwindcss-standalone/src/index.ts
+++ b/packages/@tailwindcss-standalone/src/index.ts
@@ -1,4 +1,3 @@
-import fs from 'node:fs'
 import { createRequire } from 'node:module'
 import packageJson from 'tailwindcss/package.json'
 
@@ -61,14 +60,39 @@ globalThis.__tw_load = async (id) => {
   }
 }
 globalThis.__tw_version = packageJson.version
-globalThis.__tw_readFile = async (path, encoding) => {
-  // When reading a file from the `$bunfs`, we need to use the synchronous
-  // `readFileSync` API
-  let isEmbeddedFileBase = path.includes('/$bunfs/root') || path.includes(':/~BUN/root')
-  if (!isEmbeddedFileBase) {
-    return
-  }
-  return fs.readFileSync(path, encoding)
-}
+
+// We use a plugin to make sure that the JS APIs are bundled with the standalone
+// CLI and can be imported inside configs and plugins
+Bun.plugin({
+  name: 'bundle-tailwindcss-apis',
+  target: 'bun',
+  async setup(build) {
+    // These imports must be static strings otherwise they won't be bundled
+    let bundled = {
+      tailwindcss: await import('tailwindcss'),
+      'tailwindcss/colors': await import('tailwindcss/colors'),
+      'tailwindcss/colors.js': await import('tailwindcss/colors'),
+      'tailwindcss/plugin': await import('tailwindcss/plugin'),
+      'tailwindcss/plugin.js': await import('tailwindcss/plugin'),
+      'tailwindcss/package.json': await import('tailwindcss/package.json'),
+      'tailwindcss/lib/util/flattenColorPalette':
+        await import('tailwindcss/lib/util/flattenColorPalette'),
+      'tailwindcss/lib/util/flattenColorPalette.js':
+        await import('tailwindcss/lib/util/flattenColorPalette'),
+      'tailwindcss/defaultTheme': await import('tailwindcss/defaultTheme'),
+      'tailwindcss/defaultTheme.js': await import('tailwindcss/defaultTheme'),
+    }
+
+    for (let [id, exports] of Object.entries(bundled)) {
+      build.module(id, () => ({
+        loader: 'object',
+        exports: {
+          ...exports,
+          __esModule: true,
+        },
+      }))
+    }
+  },
+})
 
 await import('../../@tailwindcss-cli/src/index.ts')
diff --git a/packages/@tailwindcss-standalone/src/types.d.ts b/packages/@tailwindcss-standalone/src/types.d.ts
index 3212ac5b6..0b5deb6ea 100644
--- a/packages/@tailwindcss-standalone/src/types.d.ts
+++ b/packages/@tailwindcss-standalone/src/types.d.ts
@@ -6,6 +6,5 @@ declare module '*.css' {
 declare var __tw_version: string | undefined
 declare var __tw_resolve: undefined | ((id: string, base?: string) => string | false)
 declare var __tw_readFile:
-  | undefined
-  | ((path: string, encoding: BufferEncoding) => Promise<string | undefined>)
+  undefined | ((path: string, encoding: BufferEncoding) => Promise<string | undefined>)
 declare var __tw_load: undefined | ((path: string) => Promise<object | undefined>)
diff --git a/packages/@tailwindcss-turbopack/README.md b/packages/@tailwindcss-turbopack/README.md
new file mode 100644
index 000000000..ee54b4d03
--- /dev/null
+++ b/packages/@tailwindcss-turbopack/README.md
@@ -0,0 +1,99 @@
+<p align="center">
+  <a href="https://tailwindcss.com" target="_blank">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-dark.svg">
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-light.svg">
+      <img alt="Tailwind CSS" src="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-light.svg" width="350" height="70" style="max-width: 100%;">
+    </picture>
+  </a>
+</p>
+
+<p align="center">
+  A utility-first CSS framework for rapidly building custom user interfaces.
+</p>
+
+<p align="center">
+    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=main" alt="Build Status"></a>
+    <a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
+</p>
+
+---
+
+## Documentation
+
+For full documentation, visit [tailwindcss.com](https://tailwindcss.com).
+
+## Community
+
+For help, discussion about best practices, or feature ideas:
+
+[Discuss Tailwind CSS on GitHub](https://github.com/tailwindlabs/tailwindcss/discussions)
+
+## Contributing
+
+If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindlabs/tailwindcss/blob/main/.github/CONTRIBUTING.md) **before submitting a pull request**.
+
+---
+
+## @tailwindcss/turbopack
+
+A Turbopack loader for Tailwind CSS v4.
+
+## Installation
+
+```sh
+npm install @tailwindcss/turbopack
+```
+
+### Usage
+
+```javascript
+// next.config.js
+module.exports = {
+  turbopack: {
+    rules: {
+      '*.css': {
+        loaders: ['@tailwindcss/turbopack'],
+        as: '*.css',
+      },
+    },
+  },
+}
+```
+
+Then create a CSS file that imports Tailwind:
+
+```css
+/* src/index.css */
+@import 'tailwindcss';
+```
+
+### Options
+
+#### `base`
+
+The base directory to scan for class candidates. Defaults to the current working directory.
+
+```javascript
+{
+  loader: '@tailwindcss/turbopack',
+  options: {
+    base: process.cwd(),
+  },
+}
+```
+
+#### `optimize`
+
+Whether to optimize and minify the output CSS. Defaults to `true` in production mode.
+
+```javascript
+{
+  loader: '@tailwindcss/turbopack',
+  options: {
+    optimize: true, // or { minify: true }
+  },
+}
+```
diff --git a/packages/@tailwindcss-turbopack/package.json b/packages/@tailwindcss-turbopack/package.json
new file mode 100644
index 000000000..abdbbe90e
--- /dev/null
+++ b/packages/@tailwindcss-turbopack/package.json
@@ -0,0 +1,43 @@
+{
+  "name": "@tailwindcss/turbopack",
+  "version": "4.3.3",
+  "description": "A Turbopack loader for Tailwind CSS v4.",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tailwindlabs/tailwindcss.git",
+    "directory": "packages/@tailwindcss-turbopack"
+  },
+  "bugs": "https://github.com/tailwindlabs/tailwindcss/issues",
+  "homepage": "https://tailwindcss.com",
+  "scripts": {
+    "build": "tsup-node",
+    "dev": "pnpm run build -- --watch"
+  },
+  "files": [
+    "dist/"
+  ],
+  "publishConfig": {
+    "provenance": true,
+    "access": "public"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js"
+    }
+  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "dependencies": {
+    "@alloc/quick-lru": "^5.2.0",
+    "@tailwindcss/node": "workspace:*",
+    "@tailwindcss/oxide": "workspace:*",
+    "tailwindcss": "workspace:*"
+  },
+  "devDependencies": {
+    "@types/node": "catalog:",
+    "webpack": "catalog:"
+  }
+}
diff --git a/packages/@tailwindcss-turbopack/src/index.cts b/packages/@tailwindcss-turbopack/src/index.cts
new file mode 100644
index 000000000..dbdded748
--- /dev/null
+++ b/packages/@tailwindcss-turbopack/src/index.cts
@@ -0,0 +1,5 @@
+import tailwindLoader from './index.ts'
+
+// CommonJS export for webpack loaders - must be the function directly
+// @ts-ignore
+export = tailwindLoader
diff --git a/packages/@tailwindcss-turbopack/src/index.ts b/packages/@tailwindcss-turbopack/src/index.ts
new file mode 100644
index 000000000..a70f28871
--- /dev/null
+++ b/packages/@tailwindcss-turbopack/src/index.ts
@@ -0,0 +1,287 @@
+import QuickLRU from '@alloc/quick-lru'
+import {
+  compile,
+  env,
+  Features,
+  Instrumentation,
+  normalizePath,
+  optimize,
+  Polyfills,
+} from '@tailwindcss/node'
+import { clearRequireCache } from '@tailwindcss/node/require-cache'
+import { Scanner } from '@tailwindcss/oxide'
+import fs from 'node:fs'
+import path from 'node:path'
+import type { LoaderContext } from 'webpack'
+
+const DEBUG = env.DEBUG
+
+export interface LoaderOptions {
+  /**
+   * The base directory to scan for class candidates.
+   *
+   * Defaults to the current working directory.
+   */
+  base?: string
+
+  /**
+   * Optimize and minify the output CSS.
+   */
+  optimize?: boolean | { minify?: boolean }
+}
+
+interface CacheEntry {
+  mtimes: Map<string, number>
+  compiler: null | Awaited<ReturnType<typeof compile>>
+  scanner: null | Scanner
+  candidates: Set<string>
+  fullRebuildPaths: string[]
+}
+
+const cache = new QuickLRU<string, CacheEntry>({ maxSize: 50 })
+
+function getCacheKey(resourceId: string, opts: LoaderOptions): string {
+  return `${resourceId}:${opts.base ?? ''}:${JSON.stringify(opts.optimize)}`
+}
+
+function getContextFromCache(resourceId: string, opts: LoaderOptions): CacheEntry {
+  let key = getCacheKey(resourceId, opts)
+  if (cache.has(key)) return cache.get(key)!
+  let entry: CacheEntry = {
+    mtimes: new Map<string, number>(),
+    compiler: null,
+    scanner: null,
+    candidates: new Set<string>(),
+    fullRebuildPaths: [],
+  }
+  cache.set(key, entry)
+  return entry
+}
+
+export default async function tailwindLoader(
+  this: LoaderContext<LoaderOptions>,
+  source: string,
+): Promise<void> {
+  let callback = this.async()
+  let options = this.getOptions() ?? {}
+  let inputFile = this.resourcePath
+  let resourceId = this.resource
+  let base = options.base ?? process.cwd()
+  let shouldOptimize = options.optimize ?? process.env.NODE_ENV === 'production'
+  let isCSSModuleFile = inputFile.endsWith('.module.css')
+
+  using I = new Instrumentation()
+
+  DEBUG && I.start(`[@tailwindcss/turbopack] ${path.relative(base, inputFile)}`)
+
+  // Bail out early if this is guaranteed to be a non-Tailwind CSS file.
+  {
+    DEBUG && I.start('Quick bail check')
+    let canBail = !/@(import|reference|theme|variant|config|plugin|apply|tailwind)\b/.test(source)
+    if (canBail) {
+      DEBUG && I.end('Quick bail check')
+      DEBUG && I.end(`[@tailwindcss/turbopack] ${path.relative(base, inputFile)}`)
+      callback(null, source)
+      return
+    }
+    DEBUG && I.end('Quick bail check')
+  }
+
+  try {
+    let context = getContextFromCache(resourceId, options)
+    let inputBasePath = path.dirname(path.resolve(inputFile))
+
+    // Whether this is the first build or not
+    let isInitialBuild = context.compiler === null
+
+    async function createCompiler() {
+      DEBUG && I.start('Setup compiler')
+      if (context.fullRebuildPaths.length > 0 && !isInitialBuild) {
+        clearRequireCache(context.fullRebuildPaths)
+      }
+
+      context.fullRebuildPaths = []
+
+      DEBUG && I.start('Create compiler')
+      let compiler = await compile(source, {
+        from: inputFile,
+        base: inputBasePath,
+        shouldRewriteUrls: true,
+        onDependency: (depPath) => context.fullRebuildPaths.push(depPath),
+        // In CSS Module files, we have to disable the `@property` polyfill since these will
+        // emit global `*` rules which are considered to be non-pure and will cause builds
+        // to fail.
+        polyfills: isCSSModuleFile ? Polyfills.All ^ Polyfills.AtProperty : Polyfills.All,
+      })
+      DEBUG && I.end('Create compiler')
+
+      DEBUG && I.end('Setup compiler')
+      return compiler
+    }
+
+    // Setup the compiler if it doesn't exist yet
+    context.compiler ??= await createCompiler()
+
+    // Early exit if no Tailwind features are used
+    if (context.compiler.features === Features.None) {
+      DEBUG && I.end(`[@tailwindcss/turbopack] ${path.relative(base, inputFile)}`)
+      callback(null, source)
+      return
+    }
+
+    let rebuildStrategy: 'full' | 'incremental' = 'incremental'
+
+    // Track file modification times to CSS files
+    DEBUG && I.start('Register full rebuild paths')
+    {
+      // Report dependencies for config files, plugins, etc.
+      for (let file of context.fullRebuildPaths) {
+        this.addDependency(path.resolve(file))
+      }
+
+      let files = [...context.fullRebuildPaths, inputFile]
+
+      for (let file of files) {
+        let changedTime: number | null = null
+        try {
+          changedTime = fs.statSync(file)?.mtimeMs ?? null
+        } catch {
+          // File might not exist
+        }
+
+        if (changedTime === null) {
+          if (file === inputFile) {
+            rebuildStrategy = 'full'
+          }
+          continue
+        }
+
+        let prevTime = context.mtimes.get(file)
+        if (prevTime === changedTime) continue
+
+        rebuildStrategy = 'full'
+        context.mtimes.set(file, changedTime)
+      }
+    }
+    DEBUG && I.end('Register full rebuild paths')
+
+    if (rebuildStrategy === 'full' && !isInitialBuild) {
+      context.compiler = await createCompiler()
+    }
+
+    let compiler = context.compiler
+
+    // Check if we need to process this file at all
+    if (
+      !(
+        compiler.features &
+        (Features.AtApply | Features.JsPluginCompat | Features.ThemeFunction | Features.Utilities)
+      )
+    ) {
+      DEBUG && I.end(`[@tailwindcss/turbopack] ${path.relative(base, inputFile)}`)
+      callback(null, source)
+      return
+    }
+
+    // Setup or update scanner if needed
+    if (context.scanner === null || rebuildStrategy === 'full') {
+      DEBUG && I.start('Setup scanner')
+      let sources = (() => {
+        // Disable auto source detection
+        if (compiler.root === 'none') {
+          return []
+        }
+
+        // No root specified, use the base directory
+        if (compiler.root === null) {
+          return [{ base, pattern: '**/*', negated: false }]
+        }
+
+        // Use the specified root
+        return [{ ...compiler.root, negated: false }]
+      })().concat(compiler.sources)
+
+      context.scanner = new Scanner({ sources })
+      DEBUG && I.end('Setup scanner')
+    }
+
+    // Scan for candidates if utilities are used
+    if (compiler.features & Features.Utilities) {
+      DEBUG && I.start('Scan for candidates')
+      for (let candidate of context.scanner.scan()) {
+        context.candidates.add(candidate)
+      }
+      DEBUG && I.end('Scan for candidates')
+
+      DEBUG && I.start('Register dependency messages')
+      // Add all found files as direct dependencies
+      let resolvedInputFile = path.resolve(base, inputFile)
+      for (let file of context.scanner.files) {
+        let absolutePath = path.resolve(file)
+        // The CSS file cannot be a dependency of itself
+        if (absolutePath === resolvedInputFile) {
+          continue
+        }
+        this.addDependency(absolutePath)
+      }
+
+      // Register context dependencies for glob patterns
+      for (let glob of context.scanner.globs) {
+        // Skip negated patterns
+        if (glob.pattern[0] === '!') continue
+
+        // Avoid adding a dependency on the base directory itself
+        if (glob.pattern === '*' && base === glob.base) {
+          continue
+        }
+
+        this.addContextDependency(path.resolve(glob.base))
+      }
+
+      // Validate that source(...) paths are directories
+      let root = compiler.root
+      if (root !== 'none' && root !== null) {
+        let basePath = normalizePath(path.resolve(root.base, root.pattern))
+        try {
+          let stats = fs.statSync(basePath)
+          if (!stats.isDirectory()) {
+            throw new Error(
+              `The path given to \`source(…)\` must be a directory but got \`source(${basePath})\` instead.`,
+            )
+          }
+        } catch (err) {
+          if ((err as NodeJS.ErrnoException).code !== 'ENOENT') {
+            throw err
+          }
+          // Directory doesn't exist yet, which is fine
+        }
+      }
+      DEBUG && I.end('Register dependency messages')
+    }
+
+    DEBUG && I.start('Build utilities')
+    let css = compiler.build([...context.candidates])
+    DEBUG && I.end('Build utilities')
+
+    // Optionally optimize the output
+    let result = css
+    if (shouldOptimize) {
+      DEBUG && I.start('Optimization')
+      let optimized = optimize(css, {
+        minify: typeof shouldOptimize === 'object' ? shouldOptimize.minify : true,
+      })
+      result = optimized.code
+      DEBUG && I.end('Optimization')
+    }
+
+    DEBUG && I.end(`[@tailwindcss/turbopack] ${path.relative(base, inputFile)}`)
+    callback(null, result)
+  } catch (error) {
+    // Clear the cache entry on error to force a full rebuild next time
+    let key = getCacheKey(resourceId, options)
+    cache.delete(key)
+
+    DEBUG && I.end(`[@tailwindcss/turbopack] ${path.relative(base, inputFile)}`)
+    callback(error as Error)
+  }
+}
diff --git a/packages/@tailwindcss-turbopack/tsconfig.json b/packages/@tailwindcss-turbopack/tsconfig.json
new file mode 100644
index 000000000..d2131cbeb
--- /dev/null
+++ b/packages/@tailwindcss-turbopack/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "verbatimModuleSyntax": false,
+  },
+}
diff --git a/packages/@tailwindcss-turbopack/tsup.config.ts b/packages/@tailwindcss-turbopack/tsup.config.ts
new file mode 100644
index 000000000..998eebe4f
--- /dev/null
+++ b/packages/@tailwindcss-turbopack/tsup.config.ts
@@ -0,0 +1,19 @@
+import { defineConfig } from 'tsup'
+
+export default defineConfig([
+  {
+    format: ['esm'],
+    clean: true,
+    minify: true,
+    cjsInterop: true,
+    dts: true,
+    entry: ['src/index.ts'],
+  },
+  {
+    format: ['cjs'],
+    minify: true,
+    cjsInterop: true,
+    dts: true,
+    entry: ['src/index.cts'],
+  },
+])
diff --git a/packages/@tailwindcss-upgrade/README.md b/packages/@tailwindcss-upgrade/README.md
index 95ec9d87d..5f532607d 100644
--- a/packages/@tailwindcss-upgrade/README.md
+++ b/packages/@tailwindcss-upgrade/README.md
@@ -13,10 +13,10 @@
 </p>
 
 <p align="center">
-    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=next" alt="Build Status"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=main" alt="Build Status"></a>
     <a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
 </p>
 
 ---
@@ -27,14 +27,10 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com).
 
 ## Community
 
-For help, discussion about best practices, or any other conversation that would benefit from being searchable:
+For help, discussion about best practices, or feature ideas:
 
-[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions)
-
-For chatting with others using the framework:
-
-[Join the Tailwind CSS Discord Server](https://discord.gg/7NF8GNe)
+[Discuss Tailwind CSS on GitHub](https://github.com/tailwindlabs/tailwindcss/discussions)
 
 ## Contributing
 
-If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindcss/tailwindcss/blob/next/.github/CONTRIBUTING.md) **before submitting a pull request**.
+If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindlabs/tailwindcss/blob/main/.github/CONTRIBUTING.md) **before submitting a pull request**.
diff --git a/packages/@tailwindcss-upgrade/package.json b/packages/@tailwindcss-upgrade/package.json
index 7183ec3d5..e960d7677 100644
--- a/packages/@tailwindcss-upgrade/package.json
+++ b/packages/@tailwindcss-upgrade/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/upgrade",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "repository": {
@@ -27,26 +27,26 @@
     "access": "public"
   },
   "dependencies": {
-    "@tailwindcss/node": "workspace:^",
-    "@tailwindcss/oxide": "workspace:^",
-    "braces": "^3.0.3",
-    "dedent": "1.5.3",
-    "enhanced-resolve": "^5.17.1",
-    "globby": "^14.0.2",
-    "jiti": "^2.0.0-beta.3",
+    "@tailwindcss/node": "workspace:*",
+    "@tailwindcss/oxide": "workspace:*",
+    "dedent": "catalog:",
+    "enhanced-resolve": "catalog:",
+    "globby": "^16.2.2",
+    "jiti": "^2.7.0",
     "mri": "^1.2.0",
     "picocolors": "^1.1.1",
-    "postcss": "^8.4.41",
-    "postcss-import": "^16.1.0",
-    "postcss-selector-parser": "^7.0.0",
-    "prettier": "^3.3.3",
-    "tree-sitter": "^0.22.1",
-    "tree-sitter-typescript": "^0.23.2",
-    "tailwindcss": "workspace:*"
+    "postcss": "catalog:",
+    "postcss-import": "^16.1.1",
+    "postcss-selector-parser": "^7.1.4",
+    "prettier": "catalog:",
+    "semver": "^7.8.5",
+    "tailwindcss": "workspace:*",
+    "tree-sitter": "^0.25.1",
+    "tree-sitter-typescript": "^0.23.2"
   },
   "devDependencies": {
-    "@types/braces": "^3.0.4",
     "@types/node": "catalog:",
-    "@types/postcss-import": "^14.0.3"
+    "@types/postcss-import": "^14.0.3",
+    "@types/semver": "^7.8.0"
   }
 }
diff --git a/packages/@tailwindcss-upgrade/src/migrate-js-config.ts b/packages/@tailwindcss-upgrade/src/codemods/config/migrate-js-config.ts
similarity index 59%
rename from packages/@tailwindcss-upgrade/src/migrate-js-config.ts
rename to packages/@tailwindcss-upgrade/src/codemods/config/migrate-js-config.ts
index 6a8a7f401..6a451333e 100644
--- a/packages/@tailwindcss-upgrade/src/migrate-js-config.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/config/migrate-js-config.ts
@@ -2,27 +2,31 @@ import { Scanner } from '@tailwindcss/oxide'
 import fs from 'node:fs/promises'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { loadModule } from '../../@tailwindcss-node/src/compile'
-import defaultTheme from '../../tailwindcss/dist/default-theme'
-import { atRule, toCss, type AstNode } from '../../tailwindcss/src/ast'
+import { loadModule } from '../../../../@tailwindcss-node/src/compile'
+import defaultTheme from '../../../../tailwindcss/dist/default-theme'
+import { atRule, toCss, type AstNode } from '../../../../tailwindcss/src/ast'
 import {
   keyPathToCssProperty,
   themeableValues,
-} from '../../tailwindcss/src/compat/apply-config-to-theme'
-import { keyframesToRules } from '../../tailwindcss/src/compat/apply-keyframes-to-theme'
-import { resolveConfig, type ConfigFile } from '../../tailwindcss/src/compat/config/resolve-config'
-import type { ResolvedConfig, ThemeConfig } from '../../tailwindcss/src/compat/config/types'
-import { buildCustomContainerUtilityRules } from '../../tailwindcss/src/compat/container'
-import { darkModePlugin } from '../../tailwindcss/src/compat/dark-mode'
-import type { Config } from '../../tailwindcss/src/compat/plugin-api'
-import type { DesignSystem } from '../../tailwindcss/src/design-system'
-import { escape } from '../../tailwindcss/src/utils/escape'
+} from '../../../../tailwindcss/src/compat/apply-config-to-theme'
+import { keyframesToRules } from '../../../../tailwindcss/src/compat/apply-keyframes-to-theme'
+import {
+  resolveConfig,
+  type ConfigFile,
+} from '../../../../tailwindcss/src/compat/config/resolve-config'
+import type { ResolvedConfig, ThemeConfig } from '../../../../tailwindcss/src/compat/config/types'
+import { buildCustomContainerUtilityRules } from '../../../../tailwindcss/src/compat/container'
+import { darkModePlugin } from '../../../../tailwindcss/src/compat/dark-mode'
+import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+import { escape } from '../../../../tailwindcss/src/utils/escape'
 import {
   isValidOpacityValue,
   isValidSpacingMultiplier,
-} from '../../tailwindcss/src/utils/infer-data-type'
-import { findStaticPlugins, type StaticPluginOptions } from './utils/extract-static-plugins'
-import { highlight, info, relative } from './utils/renderer'
+} from '../../../../tailwindcss/src/utils/infer-data-type'
+import * as ValueParser from '../../../../tailwindcss/src/value-parser'
+import { findStaticPlugins, type StaticPluginOptions } from '../../utils/extract-static-plugins'
+import { highlight, info, relative } from '../../utils/renderer'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -94,12 +98,14 @@ async function migrateTheme(
   designSystem: DesignSystem,
   unresolvedConfig: Config,
   base: string,
-): Promise<string | null> {
+): Promise<string> {
   // Resolve the config file without applying plugins and presets, as these are
   // migrated to CSS separately.
   let configToResolve: ConfigFile = {
     base,
     config: { ...unresolvedConfig, plugins: [], presets: undefined },
+    reference: false,
+    src: undefined,
   }
   let { resolvedConfig, replacedThemeKeys } = resolveConfig(designSystem, [configToResolve])
 
@@ -109,10 +115,88 @@ async function migrateTheme(
 
   removeUnnecessarySpacingKeys(designSystem, resolvedConfig, replacedThemeKeys)
 
+  let css = ''
   let prevSectionKey = ''
-  let css = '\n@tw-bucket theme {\n'
-  css += `\n@theme {\n`
-  let containsThemeKeys = false
+  let themeSection: string[] = []
+  let keyframesCss = ''
+  let variants = new Map<string, string>()
+
+  // Special handling of specific theme keys:
+  {
+    if ('keyframes' in resolvedConfig.theme) {
+      keyframesCss += keyframesToCss(resolvedConfig.theme.keyframes)
+      delete resolvedConfig.theme.keyframes
+    }
+
+    if ('container' in resolvedConfig.theme) {
+      let rules = buildCustomContainerUtilityRules(resolvedConfig.theme.container, designSystem)
+      if (rules.length > 0) {
+        // Using `theme` instead of `utility` so it sits before the `@layer
+        // base` with compatibility CSS. While this is technically a utility, it
+        // makes a bit more sense to emit this closer to the `@theme` values
+        // since it is needed for backwards compatibility.
+        css += `\n@tw-bucket theme {\n`
+        css += toCss([atRule('@utility', 'container', rules)])
+        css += '}\n' // @tw-bucket
+      }
+      delete resolvedConfig.theme.container
+    }
+
+    if ('aria' in resolvedConfig.theme) {
+      for (let [key, value] of Object.entries(resolvedConfig.theme.aria ?? {})) {
+        // Will be handled by bare values if the names match.
+        // E.g.: `aria-foo:flex` should produce `[aria-foo="true"]`
+        if (new RegExp(`^${key}=(['"]?)true\\1$`).test(`${value}`)) continue
+
+        // Create custom variant
+        variants.set(`aria-${key}`, `&[aria-${value}]`)
+      }
+      delete resolvedConfig.theme.aria
+    }
+
+    if ('data' in resolvedConfig.theme) {
+      for (let [key, value] of Object.entries(resolvedConfig.theme.data ?? {})) {
+        // Will be handled by bare values if the names match.
+        // E.g.: `data-foo:flex` should produce `[data-foo]`
+        if (key === value) continue
+
+        // Create custom variant
+        variants.set(`data-${key}`, `&[data-${value}]`)
+      }
+      delete resolvedConfig.theme.data
+    }
+
+    if ('supports' in resolvedConfig.theme) {
+      for (let [key, value] of Object.entries(resolvedConfig.theme.supports ?? {})) {
+        // Will be handled by bare values if the value of the declaration is a
+        // CSS variable.
+        let parsed = ValueParser.parse(`${value}`)
+
+        // Unwrap the parens, e.g.: `(foo: var(--bar))` → `foo: var(--bar)`
+        if (parsed.length === 1 && parsed[0].kind === 'function' && parsed[0].value === '') {
+          parsed = parsed[0].nodes
+        }
+
+        // Verify structure: `foo: var(--bar)`
+        //                    ^^^ ← must match the `key`
+        if (
+          parsed.length === 3 &&
+          parsed[0].kind === 'word' &&
+          parsed[0].value === key &&
+          parsed[2].kind === 'function' &&
+          parsed[2].value === 'var'
+        ) {
+          continue
+        }
+
+        // Create custom variant
+        variants.set(`supports-${key}`, `{@supports(${value}){@slot;}}`)
+      }
+      delete resolvedConfig.theme.supports
+    }
+  }
+
+  // Convert theme values to CSS custom properties
   for (let [key, value] of themeableValues(resolvedConfig.theme)) {
     if (typeof value !== 'string' && typeof value !== 'number') {
       continue
@@ -147,56 +231,66 @@ async function migrateTheme(
       }
     }
 
-    if (key[0] === 'keyframes') {
-      continue
-    }
-    containsThemeKeys = true
-
     let sectionKey = createSectionKey(key)
     if (sectionKey !== prevSectionKey) {
-      css += `\n`
+      themeSection.push('')
       prevSectionKey = sectionKey
     }
 
-    if (resetNamespaces.has(key[0]) && resetNamespaces.get(key[0]) === false) {
-      resetNamespaces.set(key[0], true)
-      let property = keyPathToCssProperty([key[0]])
-      if (property !== null) {
-        css += `  ${escape(`--${property}`)}-*: initial;\n`
+    let property = keyPathToCssProperty(key)
+
+    if (property !== null) {
+      if (
+        !property.startsWith('default-') &&
+        resetNamespaces.has(key[0]) &&
+        resetNamespaces.get(key[0]) === false
+      ) {
+        resetNamespaces.set(key[0], true)
+        let ns = keyPathToCssProperty([key[0]])
+        if (ns !== null) {
+          themeSection.push(`  ${escape(`--${ns}`)}-*: initial;`)
+        }
+      }
+
+      themeSection.push(`  ${escape(`--${property}`)}: ${value};`)
+    }
+  }
+
+  if (keyframesCss) {
+    themeSection.push('', keyframesCss)
+  }
+
+  if (themeSection.length > 0) {
+    css += `\n@tw-bucket theme {\n`
+    css += `\n@theme {\n`
+    css += themeSection.join('\n') + '\n'
+    css += '}\n' // @theme
+    css += '}\n' // @tw-bucket
+  }
+
+  if (variants.size > 0) {
+    css += '\n@tw-bucket custom-variant {\n'
+
+    let previousRoot = ''
+    for (let [name, selector] of variants) {
+      let root = name.split('-')[0]
+      if (previousRoot !== root) css += '\n'
+      previousRoot = root
+
+      if (selector.startsWith('{')) {
+        css += `@custom-variant ${name} ${selector}\n`
+      } else {
+        css += `@custom-variant ${name} (${selector});\n`
       }
     }
-
-    let property = keyPathToCssProperty(key)
-    if (property !== null) {
-      css += `  ${escape(`--${property}`)}: ${value};\n`
-    }
+    css += '}\n'
   }
 
-  if ('keyframes' in resolvedConfig.theme) {
-    containsThemeKeys = true
-    css += '\n' + keyframesToCss(resolvedConfig.theme.keyframes)
-  }
-
-  if (!containsThemeKeys) {
-    return null
-  }
-
-  css += '}\n' // @theme
-
-  if ('container' in resolvedConfig.theme) {
-    let rules = buildCustomContainerUtilityRules(resolvedConfig.theme.container, designSystem)
-    if (rules.length > 0) {
-      css += '\n' + toCss([atRule('@utility', 'container', rules)])
-    }
-  }
-
-  css += '}\n' // @tw-bucket
-
   return css
 }
 
 function migrateDarkMode(unresolvedConfig: Config & { darkMode: any }): string {
-  let variant: string = ''
+  let variant: string | string[] = ''
   let addVariant = (_name: string, _variant: string) => (variant = _variant)
   let config = () => unresolvedConfig.darkMode
   darkModePlugin({ config, addVariant })
@@ -204,7 +298,30 @@ function migrateDarkMode(unresolvedConfig: Config & { darkMode: any }): string {
   if (variant === '') {
     return ''
   }
-  return `\n@tw-bucket variant {\n@variant dark (${variant});\n}\n`
+
+  if (!Array.isArray(variant)) {
+    variant = [variant]
+  }
+
+  if (variant.length === 1 && !variant[0].includes('{')) {
+    return `\n@tw-bucket custom-variant {\n@custom-variant dark (${variant[0]});\n}\n`
+  }
+
+  let customVariant = ''
+  for (let variantName of variant) {
+    // Convert to the block syntax if a block is used
+    if (variantName.includes('{')) {
+      customVariant += variantName.replace('}', '{ @slot }}') + '\n'
+    } else {
+      customVariant += variantName + '{ @slot }\n'
+    }
+  }
+
+  if (customVariant !== '') {
+    return `\n@tw-bucket custom-variant {\n@custom-variant dark {${customVariant}};\n}\n`
+  }
+
+  return ''
 }
 
 // Returns a string identifier used to section theme declarations
@@ -251,7 +368,11 @@ async function migrateContent(
       throw new Error('Unsupported content value: ' + pattern)
     }
 
-    let sourceFiles = patternSourceFiles({ base, pattern })
+    let sourceFiles = patternSourceFiles({
+      base,
+      pattern: pattern[0] === '!' ? pattern.slice(1) : pattern,
+      negated: pattern[0] === '!',
+    })
 
     let autoContentContainsAllSourceFiles = true
     for (let sourceFile of sourceFiles) {
@@ -286,7 +407,7 @@ function canMigrateConfig(unresolvedConfig: Config, source: string): boolean {
     return false
   }
 
-  // The file may only contain known-migrateable top-level properties
+  // The file may only contain known-migratable top-level properties
   let knownProperties = [
     'darkMode',
     'content',
@@ -295,6 +416,8 @@ function canMigrateConfig(unresolvedConfig: Config, source: string): boolean {
     'presets',
     'prefix', // Prefix is handled in the dedicated prefix migrator
     'corePlugins',
+    'future',
+    'experimental',
   ]
 
   if (Object.keys(unresolvedConfig).some((key) => !knownProperties.includes(key))) {
@@ -309,6 +432,29 @@ function canMigrateConfig(unresolvedConfig: Config, source: string): boolean {
     return false
   }
 
+  // If there are unknown "future" flags we should bail
+  if (unresolvedConfig.future && unresolvedConfig.future !== 'all') {
+    let knownFlags = [
+      'hoverOnlyWhenSupported',
+      'respectDefaultRingColorOpacity',
+      'disableColorOpacityUtilitiesByDefault',
+      'relativeContentPathsByDefault',
+    ]
+
+    if (Object.keys(unresolvedConfig.future).some((key) => !knownFlags.includes(key))) {
+      return false
+    }
+  }
+
+  // If there are unknown "experimental" flags we should bail
+  if (unresolvedConfig.experimental && unresolvedConfig.experimental !== 'all') {
+    let knownFlags = ['generalizedModifiers']
+
+    if (Object.keys(unresolvedConfig.experimental).some((key) => !knownFlags.includes(key))) {
+      return false
+    }
+  }
+
   // Only migrate the config file if all top-level theme keys are allowed to be
   // migrated
   if (theme && typeof theme === 'object') {
@@ -325,15 +471,11 @@ const ALLOWED_THEME_KEYS = [
   // Used by @tailwindcss/container-queries
   'containers',
 ]
-const BLOCKED_THEME_KEYS = ['supports', 'data', 'aria']
 function onlyAllowedThemeValues(theme: ThemeConfig): boolean {
   for (let key of Object.keys(theme)) {
     if (!ALLOWED_THEME_KEYS.includes(key)) {
       return false
     }
-    if (BLOCKED_THEME_KEYS.includes(key)) {
-      return false
-    }
   }
 
   if ('screens' in theme && typeof theme.screens === 'object' && theme.screens !== null) {
@@ -352,12 +494,20 @@ function keyframesToCss(keyframes: Record<string, unknown>): string {
 }
 
 function autodetectedSourceFiles(base: string) {
-  let scanner = new Scanner({ sources: [{ base, pattern: '**/*' }] })
+  let scanner = new Scanner({
+    sources: [
+      {
+        base,
+        pattern: '**/*',
+        negated: false,
+      },
+    ],
+  })
   scanner.scan()
   return scanner.files
 }
 
-function patternSourceFiles(source: { base: string; pattern: string }): string[] {
+function patternSourceFiles(source: { base: string; pattern: string; negated: boolean }): string[] {
   let scanner = new Scanner({ sources: [source] })
   scanner.scan()
   return scanner.files
diff --git a/packages/@tailwindcss-upgrade/src/migrate-postcss.ts b/packages/@tailwindcss-upgrade/src/codemods/config/migrate-postcss.ts
similarity index 93%
rename from packages/@tailwindcss-upgrade/src/migrate-postcss.ts
rename to packages/@tailwindcss-upgrade/src/codemods/config/migrate-postcss.ts
index 2804bae10..e16f52287 100644
--- a/packages/@tailwindcss-upgrade/src/migrate-postcss.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/config/migrate-postcss.ts
@@ -1,7 +1,8 @@
 import fs from 'node:fs/promises'
 import path from 'node:path'
-import { pkg } from './utils/packages'
-import { highlight, info, relative, success, warn } from './utils/renderer'
+import { pkg } from '../../utils/packages'
+import { highlight, info, relative, success, warn } from '../../utils/renderer'
+import { writeFileSafely } from '../../utils/write-file-safely'
 
 // Migrates simple PostCSS setups. This is to cover non-dynamic config files
 // similar to the ones we have all over our docs:
@@ -15,6 +16,7 @@ import { highlight, info, relative, success, warn } from './utils/renderer'
 //     autoprefixer: {},
 //   }
 // }
+// ```
 export async function migratePostCSSConfig(base: string) {
   let ranMigration = false
   let didMigrate = false
@@ -49,7 +51,7 @@ export async function migratePostCSSConfig(base: string) {
       ranMigration = true
 
       if (result) {
-        await fs.writeFile(
+        await writeFileSafely(
           packageJsonPath,
           JSON.stringify({ ...packageJson, postcss: result?.json }, null, 2),
         )
@@ -75,7 +77,7 @@ export async function migratePostCSSConfig(base: string) {
         ranMigration = true
 
         if (result) {
-          await fs.writeFile(jsonConfigPath, JSON.stringify(result.json, null, 2))
+          await writeFileSafely(jsonConfigPath, JSON.stringify(result.json, null, 2))
 
           didMigrate = true
           didAddPostcssClient = result.didAddPostcssClient
@@ -102,7 +104,7 @@ export async function migratePostCSSConfig(base: string) {
 
     if (location !== null) {
       try {
-        await pkg(base).add(['@tailwindcss/postcss@next'], location)
+        await pkg(base).add(['@tailwindcss/postcss@latest'], location)
         success(`Installed package: ${highlight('@tailwindcss/postcss')}`, { prefix: '↳ ' })
       } catch {}
     }
@@ -135,16 +137,16 @@ async function migratePostCSSJSConfig(configPath: string): Promise<{
   didRemovePostCSSImport: boolean
 } | null> {
   function isTailwindCSSPlugin(line: string) {
-    return /['"]?tailwindcss['"]?\: ?\{\}/.test(line)
+    return /['"]?tailwindcss['"]?: ?\{\}/.test(line)
   }
   function isPostCSSImportPlugin(line: string) {
-    return /['"]?postcss-import['"]?\: ?\{\}/.test(line)
+    return /['"]?postcss-import['"]?: ?\{\}/.test(line)
   }
   function isAutoprefixerPlugin(line: string) {
-    return /['"]?autoprefixer['"]?\: ?\{\}/.test(line)
+    return /['"]?autoprefixer['"]?: ?\{\}/.test(line)
   }
   function isTailwindCSSNestingPlugin(line: string) {
-    return /['"]tailwindcss\/nesting['"]\: ?(\{\}|['"]postcss-nesting['"])/.test(line)
+    return /['"]tailwindcss\/nesting['"]: ?(\{\}|['"]postcss-nesting['"])/.test(line)
   }
 
   info('Migrating PostCSS configuration…')
@@ -205,7 +207,7 @@ async function migratePostCSSJSConfig(configPath: string): Promise<{
       newLines.push(line)
     }
   }
-  await fs.writeFile(configPath, newLines.join('\n'))
+  await writeFileSafely(configPath, newLines.join('\n'))
 
   return { didAddPostcssClient, didRemoveAutoprefixer, didRemovePostCSSImport }
 }
diff --git a/packages/@tailwindcss-upgrade/src/codemods/css/analyze.ts b/packages/@tailwindcss-upgrade/src/codemods/css/analyze.ts
new file mode 100644
index 000000000..c7058df54
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/analyze.ts
@@ -0,0 +1,303 @@
+import { isGitIgnored } from 'globby'
+import path from 'node:path'
+import postcss, { type Result } from 'postcss'
+import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map'
+import { segment } from '../../../../tailwindcss/src/utils/segment'
+import { Stylesheet, type StylesheetConnection } from '../../stylesheet'
+import { gitRoot } from '../../utils/git'
+import { error, highlight, relative } from '../../utils/renderer'
+import { resolveCssId } from '../../utils/resolve'
+
+export async function analyze(stylesheets: Stylesheet[], { base }: { base: string }) {
+  // Use the project's git root, instead of the `base` to ensure all
+  // `.gitignore` rules are being used.
+  let isIgnored = await isGitIgnored({ cwd: gitRoot(base) ?? base })
+  let processingQueue: (() => Promise<Result>)[] = []
+  let stylesheetsByFile = new DefaultMap<string, Stylesheet | null>((file) => {
+    // We don't want to process ignored files (like node_modules)
+    try {
+      if (isIgnored(file)) {
+        return null
+      }
+    } catch {
+      // If the file is not part of the current working directory (which can
+      // happen if you import `tailwindcss` and it's loading a shared file from
+      // pnpm) then this will throw.
+      return null
+    }
+
+    try {
+      let sheet = Stylesheet.loadSync(file)
+
+      // Mutate incoming stylesheets to include the newly discovered sheet
+      stylesheets.push(sheet)
+
+      // Queue up the processing of this stylesheet
+      processingQueue.push(() => processor.process(sheet.root, { from: sheet.file! }))
+
+      return sheet
+    } catch {
+      return null
+    }
+  })
+
+  // Step 1: Record which `@import` rules point to which stylesheets
+  // and which stylesheets are parents/children of each other
+  let processor = postcss([
+    {
+      postcssPlugin: 'mark-import-nodes',
+      AtRule: {
+        import(node) {
+          // Find what the import points to
+          let id = node.params.match(/['"](.*?)['"]/)?.[1]
+          if (!id) return
+
+          let basePath = node.source?.input.file
+            ? path.dirname(node.source.input.file)
+            : process.cwd()
+
+          // Resolve the import to a file path
+          let resolvedPath: string | false = false
+          try {
+            // We first try to resolve the file as relative to the current file
+            // to mimic the behavior of `postcss-import` since that's what was
+            // used to resolve imports in Tailwind CSS v3.
+            if (id[0] !== '.') {
+              try {
+                resolvedPath = resolveCssId(`./${id}`, basePath)
+              } catch {}
+            }
+
+            if (!resolvedPath) {
+              resolvedPath = resolveCssId(id, basePath)
+            }
+          } catch (err) {
+            // Import is a URL, we don't want to process these, but also don't
+            // want to show an error message for them.
+            if (id.startsWith('http://') || id.startsWith('https://') || id.startsWith('//')) {
+              return
+            }
+
+            // Something went wrong, we can't resolve the import.
+            error(
+              `Failed to resolve import: ${highlight(id)} in ${highlight(relative(node.source?.input.file!, basePath))}. Skipping.`,
+              { prefix: '↳ ' },
+            )
+            return
+          }
+
+          if (!resolvedPath) return
+
+          // Find the stylesheet pointing to the resolved path
+          let stylesheet = stylesheetsByFile.get(resolvedPath)
+
+          // If it _does not_ exist in stylesheets we don't care and skip it
+          // this is likely because its in node_modules or a workspace package
+          // that we don't want to modify
+          if (!stylesheet) return
+
+          // Mark the import node with the ID of the stylesheet it points to
+          // We will use these later to build lookup tables and modify the AST
+          node.raws.tailwind_destination_sheet_id = stylesheet.id
+
+          let parent = node.source?.input.file
+            ? stylesheetsByFile.get(node.source.input.file)
+            : undefined
+
+          let layers: string[] = []
+
+          for (let part of segment(node.params, ' ')) {
+            if (!part.startsWith('layer(')) continue
+            if (!part.endsWith(')')) continue
+
+            layers.push(part.slice(6, -1).trim())
+          }
+
+          // Connect sheets together in a dependency graph
+          if (parent) {
+            let meta = { layers }
+            stylesheet.parents.add({ item: parent, meta })
+            parent.children.add({ item: stylesheet, meta })
+          }
+        },
+      },
+    },
+  ])
+
+  // Seed the map with all the known stylesheets, and queue up the processing of
+  // each incoming stylesheet.
+  for (let sheet of stylesheets) {
+    if (sheet.file) {
+      stylesheetsByFile.set(sheet.file, sheet)
+      processingQueue.push(() => processor.process(sheet.root, { from: sheet.file ?? undefined }))
+    }
+  }
+
+  // Process all the stylesheets from step 1
+  while (processingQueue.length > 0) {
+    let task = processingQueue.shift()!
+    await task()
+  }
+
+  // ---
+
+  let commonPath = process.cwd()
+
+  function pathToString(path: StylesheetConnection[]) {
+    let parts: string[] = []
+
+    for (let connection of path) {
+      if (!connection.item.file) continue
+
+      let filePath = connection.item.file.replace(commonPath, '')
+      let layers = connection.meta.layers.join(', ')
+
+      if (layers.length > 0) {
+        parts.push(`${filePath} (layers: ${layers})`)
+      } else {
+        parts.push(filePath)
+      }
+    }
+
+    return parts.join(' <- ')
+  }
+
+  let lines: string[] = []
+
+  for (let sheet of stylesheets) {
+    if (!sheet.file) continue
+
+    let { convertiblePaths, nonConvertiblePaths } = sheet.analyzeImportPaths()
+    let isAmbiguous = convertiblePaths.length > 0 && nonConvertiblePaths.length > 0
+
+    if (!isAmbiguous) continue
+
+    sheet.canMigrate = false
+
+    let filePath = sheet.file.replace(commonPath, '')
+
+    for (let path of convertiblePaths) {
+      lines.push(`- ${filePath} <- ${pathToString(path)}`)
+    }
+
+    for (let path of nonConvertiblePaths) {
+      lines.push(`- ${filePath} <- ${pathToString(path)}`)
+    }
+  }
+
+  if (lines.length === 0) {
+    let tailwindRootLeafs = new Set<Stylesheet>()
+
+    for (let sheet of stylesheets) {
+      // If the current file already contains `@config`, then we can assume it's
+      // a Tailwind CSS root file.
+      sheet.root.walkAtRules('config', () => {
+        sheet.isTailwindRoot = true
+        return false
+      })
+      if (sheet.isTailwindRoot) continue
+
+      // If an `@tailwind` at-rule, or `@import "tailwindcss"` is present,
+      // then we can assume it's a file where Tailwind CSS might be configured.
+      //
+      // However, if 2 or more stylesheets exist with these rules that share a
+      // common parent, then we want to mark the common parent as the root
+      // stylesheet instead.
+      sheet.root.walkAtRules((node) => {
+        if (
+          node.name === 'tailwind' ||
+          (node.name === 'import' && node.params.match(/^["']tailwindcss["']/)) ||
+          (node.name === 'import' && node.params.match(/^["']tailwindcss\/.*?["']$/))
+        ) {
+          sheet.isTailwindRoot = true
+          tailwindRootLeafs.add(sheet)
+        }
+      })
+    }
+
+    // Only a single Tailwind CSS root file exists, no need to do anything else.
+    if (tailwindRootLeafs.size <= 1) {
+      return
+    }
+
+    // Mark the common parent as the root file
+    {
+      // Group each sheet from tailwindRootLeafs by their common parent
+      let commonParents = new DefaultMap<Stylesheet, Set<Stylesheet>>(() => new Set<Stylesheet>())
+
+      // Seed common parents with leafs
+      for (let sheet of tailwindRootLeafs) {
+        commonParents.get(sheet).add(sheet)
+      }
+
+      // If any 2 common parents come from the same tree, then all children of
+      // parent A and parent B will be moved to the parent of parent A and
+      // parent B. Parent A and parent B will be removed.
+      let repeat = true
+      repeat: while (repeat) {
+        repeat = false
+
+        for (let [sheetA, childrenA] of commonParents) {
+          for (let [sheetB, childrenB] of commonParents) {
+            if (sheetA === sheetB) continue
+
+            // Ancestors from self to root. Reversed order so we find the
+            // nearest common parent first
+            //
+            // Including self because if you compare a sheet with its parent,
+            // then the parent is still the common sheet between the two. In
+            // this case, the parent is the root file.
+            let ancestorsA = [sheetA].concat(Array.from(sheetA.ancestors()).reverse())
+            let ancestorsB = [sheetB].concat(Array.from(sheetB.ancestors()).reverse())
+
+            for (let parentA of ancestorsA) {
+              for (let parentB of ancestorsB) {
+                if (parentA !== parentB) continue
+
+                // Found the parent
+                let parent = parentA
+
+                commonParents.delete(sheetA)
+                commonParents.delete(sheetB)
+
+                for (let child of childrenA) {
+                  commonParents.get(parent).add(child)
+                }
+
+                for (let child of childrenB) {
+                  commonParents.get(parent).add(child)
+                }
+
+                // Found a common parent between sheet A and sheet B. We can
+                // stop looking for more common parents between A and B, and
+                // continue with the next sheet.
+                repeat = true
+                continue repeat
+              }
+            }
+          }
+        }
+      }
+
+      // Mark the common parent as the Tailwind CSS root file, and remove the
+      // flag from each leaf.
+      for (let [parent, children] of commonParents) {
+        parent.isTailwindRoot = true
+
+        for (let child of children) {
+          if (parent === child) continue
+
+          child.isTailwindRoot = false
+        }
+      }
+      return
+    }
+  }
+
+  {
+    let error = `You have one or more stylesheets that are imported into a utility layer and non-utility layer.\n`
+    error += `We cannot convert stylesheets under these conditions. Please look at the following stylesheets:\n`
+
+    throw new Error(error + lines.join('\n'))
+  }
+}
diff --git a/packages/@tailwindcss-upgrade/src/codemods/fixtures/test.css b/packages/@tailwindcss-upgrade/src/codemods/css/fixtures/test.css
similarity index 100%
rename from packages/@tailwindcss-upgrade/src/codemods/fixtures/test.css
rename to packages/@tailwindcss-upgrade/src/codemods/css/fixtures/test.css
diff --git a/packages/@tailwindcss-upgrade/src/codemods/format-nodes.test.ts b/packages/@tailwindcss-upgrade/src/codemods/css/format-nodes.test.ts
similarity index 100%
rename from packages/@tailwindcss-upgrade/src/codemods/format-nodes.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/format-nodes.test.ts
diff --git a/packages/@tailwindcss-upgrade/src/codemods/format-nodes.ts b/packages/@tailwindcss-upgrade/src/codemods/css/format-nodes.ts
similarity index 98%
rename from packages/@tailwindcss-upgrade/src/codemods/format-nodes.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/format-nodes.ts
index a5c980505..489f2d349 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/format-nodes.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/format-nodes.ts
@@ -1,6 +1,6 @@
 import postcss, { type ChildNode, type Plugin, type Root } from 'postcss'
 import { format, type Options } from 'prettier'
-import { walk } from '../utils/walk'
+import { walk } from '../../utils/walk'
 
 const FORMAT_OPTIONS: Options = {
   parser: 'css',
diff --git a/packages/@tailwindcss-upgrade/src/codemods/css/link.ts b/packages/@tailwindcss-upgrade/src/codemods/css/link.ts
new file mode 100644
index 000000000..04c2dd770
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/link.ts
@@ -0,0 +1,122 @@
+import { normalizePath } from '@tailwindcss/node'
+import path from 'node:path'
+import postcss from 'postcss'
+import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map'
+import { Stylesheet } from '../../stylesheet'
+import { error, highlight, relative, success } from '../../utils/renderer'
+import { detectConfigPath } from '../template/prepare-config'
+
+export async function linkConfigs(
+  stylesheets: Stylesheet[],
+  { configPath, base }: { configPath: string | null; base: string },
+) {
+  let rootStylesheets = stylesheets.filter((sheet) => sheet.isTailwindRoot)
+  if (rootStylesheets.length === 0) {
+    throw new Error(
+      `Cannot find any CSS files that reference Tailwind CSS.\nBefore your project can be upgraded you need to create a CSS file that imports Tailwind CSS or uses ${highlight('@tailwind')}.`,
+    )
+  }
+  let withoutAtConfig = rootStylesheets.filter((sheet) => {
+    let hasConfig = false
+    sheet.root.walkAtRules('config', (node) => {
+      let configPath = path.resolve(path.dirname(sheet.file!), node.params.slice(1, -1))
+      sheet.linkedConfigPath = configPath
+      hasConfig = true
+      return false
+    })
+    return !hasConfig
+  })
+
+  // All stylesheets have a `@config` directives
+  if (withoutAtConfig.length === 0) return
+
+  // Find the config file path for each stylesheet
+  let configPathBySheet = new Map<Stylesheet, string>()
+  let sheetByConfigPath = new DefaultMap<string, Set<Stylesheet>>(() => new Set())
+  for (let sheet of withoutAtConfig) {
+    if (!sheet.file) continue
+
+    let localConfigPath = configPath as string
+    if (configPath === null) {
+      localConfigPath = await detectConfigPath(path.dirname(sheet.file), base)
+    } else if (!path.isAbsolute(localConfigPath)) {
+      localConfigPath = path.resolve(base, localConfigPath)
+    }
+
+    configPathBySheet.set(sheet, localConfigPath)
+    sheetByConfigPath.get(localConfigPath).add(sheet)
+  }
+
+  let problematicStylesheets = new Set<Stylesheet>()
+  for (let sheets of sheetByConfigPath.values()) {
+    if (sheets.size > 1) {
+      for (let sheet of sheets) {
+        problematicStylesheets.add(sheet)
+      }
+    }
+  }
+
+  // There are multiple "root" files without `@config` directives. Manual
+  // intervention is needed to link to the correct Tailwind config files.
+  if (problematicStylesheets.size > 1) {
+    for (let sheet of problematicStylesheets) {
+      error(
+        `Could not determine configuration file for: ${highlight(relative(sheet.file!, base))}\nUpdate your stylesheet to use ${highlight('@config')} to specify the correct configuration file explicitly and then run the upgrade tool again.`,
+        { prefix: '↳ ' },
+      )
+    }
+
+    process.exit(1)
+  }
+
+  let relativePath = relative
+  for (let [sheet, configPath] of configPathBySheet) {
+    try {
+      if (!sheet || !sheet.file) return
+      success(
+        `Linked ${highlight(relativePath(configPath, base))} to ${highlight(relativePath(sheet.file, base))}`,
+        { prefix: '↳ ' },
+      )
+
+      // Link the `@config` directive to the root stylesheets
+
+      // Track the config file path on the stylesheet itself for easy access
+      // without traversing the CSS ast and finding the corresponding
+      // `@config` later.
+      sheet.linkedConfigPath = configPath
+
+      // Create a relative path from the current file to the config file.
+      let relative = path.relative(path.dirname(sheet.file), configPath)
+
+      // If the path points to a file in the same directory, `path.relative` will
+      // remove the leading `./` and we need to add it back in order to still
+      // consider the path relative
+      if (!relative.startsWith('.') && !path.isAbsolute(relative)) {
+        relative = './' + relative
+      }
+
+      relative = normalizePath(relative)
+
+      // Add the `@config` directive to the root stylesheet.
+      {
+        let target = sheet.root as postcss.Root | postcss.AtRule
+        let atConfig = postcss.atRule({ name: 'config', params: `'${relative}'` })
+
+        sheet.root.walkAtRules((node) => {
+          if (node.name === 'tailwind' || node.name === 'import') {
+            target = node
+          }
+        })
+
+        if (target.type === 'root') {
+          sheet.root.prepend(atConfig)
+        } else if (target.type === 'atrule') {
+          target.after(atConfig)
+        }
+      }
+    } catch (e: any) {
+      error('Could not load the configuration file: ' + e.message, { prefix: '↳ ' })
+      process.exit(1)
+    }
+  }
+}
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-at-apply.test.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-apply.test.ts
similarity index 53%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-at-apply.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-apply.test.ts
index 362f52054..9f6a92008 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-at-apply.test.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-apply.test.ts
@@ -1,9 +1,11 @@
 import { __unstable__loadDesignSystem } from '@tailwindcss/node'
 import dedent from 'dedent'
 import postcss from 'postcss'
-import { expect, it } from 'vitest'
-import type { Config } from '../../../tailwindcss/src/compat/plugin-api'
+import { expect, it, vi } from 'vitest'
+import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
+import * as versions from '../../utils/version'
 import { migrateAtApply } from './migrate-at-apply'
+vi.spyOn(versions, 'isMajor').mockReturnValue(true)
 
 const css = dedent
 
@@ -11,6 +13,11 @@ async function migrate(input: string, config: Config = {}) {
   let designSystem = await __unstable__loadDesignSystem(
     css`
       @import 'tailwindcss';
+
+      /* TODO(perf): Only here to speed up the tests */
+      @theme {
+        --*: initial;
+      }
     `,
     { base: __dirname },
   )
@@ -54,21 +61,6 @@ it('should append `!` to each utility, when using `!important`', async () => {
   `)
 })
 
-// TODO: Handle SCSS syntax
-it.skip('should append `!` to each utility, when using `#{!important}`', async () => {
-  expect(
-    await migrate(css`
-      .foo {
-        @apply flex flex-col #{!important};
-      }
-    `),
-  ).toMatchInlineSnapshot(`
-    ".foo {
-      @apply flex! flex-col!;
-    }"
-  `)
-})
-
 it('should move the legacy `!` prefix, to the new `!` postfix notation', async () => {
   expect(
     await migrate(css`
@@ -83,35 +75,44 @@ it('should move the legacy `!` prefix, to the new `!` postfix notation', async (
   `)
 })
 
-it('should apply all candidate migration when migrating with a config', async () => {
-  async function migrateWithPrefix(input: string) {
-    return postcss()
-      .use(
-        migrateAtApply({
-          designSystem: await __unstable__loadDesignSystem(
-            css`
-              @import 'tailwindcss' prefix(tw);
-            `,
-            { base: __dirname },
-          ),
-          userConfig: {
-            prefix: 'tw_',
-          },
-        }),
-      )
-      .process(input, { from: expect.getState().testPath })
-      .then((result) => result.css)
-  }
+it(
+  'should apply all candidate migration when migrating with a config',
+  { timeout: 10_000 },
+  async () => {
+    async function migrateWithPrefix(input: string) {
+      return postcss()
+        .use(
+          migrateAtApply({
+            designSystem: await __unstable__loadDesignSystem(
+              css`
+                @import 'tailwindcss' prefix(tw);
 
-  expect(
-    await migrateWithPrefix(css`
-      .foo {
-        @apply !tw_flex [color:--my-color] tw_bg-gradient-to-t;
-      }
-    `),
-  ).toMatchInlineSnapshot(`
+                /* TODO(perf): Only here to speed up the tests */
+                @theme {
+                  --*: initial;
+                }
+              `,
+              { base: __dirname },
+            ),
+            userConfig: {
+              prefix: 'tw_',
+            },
+          }),
+        )
+        .process(input, { from: expect.getState().testPath })
+        .then((result) => result.css)
+    }
+
+    expect(
+      await migrateWithPrefix(css`
+        .foo {
+          @apply !tw_flex [color:--my-color] tw_bg-gradient-to-t;
+        }
+      `),
+    ).toMatchInlineSnapshot(`
     ".foo {
-      @apply tw:flex! tw:[color:var(--my-color)] tw:bg-linear-to-t;
+      @apply tw:flex! tw:text-(--my-color) tw:bg-linear-to-t;
     }"
   `)
-})
+  },
+)
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-at-apply.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-apply.ts
similarity index 83%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-at-apply.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-apply.ts
index 0d3a1f035..69f92688d 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-at-apply.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-apply.ts
@@ -1,15 +1,15 @@
 import type { AtRule, Plugin } from 'postcss'
-import type { Config } from '../../../tailwindcss/src/compat/plugin-api'
-import type { DesignSystem } from '../../../tailwindcss/src/design-system'
-import { segment } from '../../../tailwindcss/src/utils/segment'
+import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+import { segment } from '../../../../tailwindcss/src/utils/segment'
 import { migrateCandidate } from '../template/migrate'
 
 export function migrateAtApply({
   designSystem,
   userConfig,
 }: {
-  designSystem: DesignSystem
-  userConfig: Config
+  designSystem: DesignSystem | null
+  userConfig: Config | null
 }): Plugin {
   function migrate(atRule: AtRule) {
     let utilities = atRule.params.split(/(\s+)/)
@@ -35,6 +35,8 @@ export function migrateAtApply({
     })
 
     return async () => {
+      if (!designSystem) return
+
       // If we have a valid designSystem and config setup, we can run all
       // candidate migrations on each utility
       params = await Promise.all(
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-at-layer-utilities.test.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-layer-utilities.test.ts
similarity index 88%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-at-layer-utilities.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-layer-utilities.test.ts
index 17aeb8577..e115951d3 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-at-layer-utilities.test.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-layer-utilities.test.ts
@@ -1,10 +1,12 @@
 import dedent from 'dedent'
 import postcss from 'postcss'
-import { describe, expect, it } from 'vitest'
-import { Stylesheet } from '../stylesheet'
+import { describe, expect, it, vi } from 'vitest'
+import { Stylesheet } from '../../stylesheet'
+import * as versions from '../../utils/version'
 import { formatNodes } from './format-nodes'
 import { migrateAtLayerUtilities } from './migrate-at-layer-utilities'
 import { sortBuckets } from './sort-buckets'
+vi.spyOn(versions, 'isMajor').mockReturnValue(true)
 
 const css = dedent
 
@@ -37,7 +39,7 @@ async function migrate(
     .use(sortBuckets())
     .use(formatNodes())
     .process(stylesheet.root!, { from: expect.getState().testPath })
-    .then((result) => result.css)
+    .then((result) => `\n${result.css.trim()}\n`)
 }
 
 it('should migrate simple `@layer utilities` to `@utility`', async () => {
@@ -50,9 +52,11 @@ it('should migrate simple `@layer utilities` to `@utility`', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility foo {
+    "
+    @utility foo {
       color: red;
-    }"
+    }
+    "
   `)
 })
 
@@ -67,13 +71,15 @@ it('should split multiple selectors in separate utilities', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility foo {
+    "
+    @utility foo {
       color: red;
     }
 
     @utility bar {
       color: red;
-    }"
+    }
+    "
   `)
 })
 
@@ -97,14 +103,16 @@ it('should merge `@utility` with the same name', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility foo {
+    "
+    @utility foo {
       color: red;
       font-weight: bold;
     }
 
     .bar {
       color: blue;
-    }"
+    }
+    "
   `)
 })
 
@@ -147,7 +155,8 @@ it('should leave non-class utilities alone', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility foo {
+    "
+    @utility foo {
       /* 2. */
       /* 2.1. */
       color: red;
@@ -180,7 +189,58 @@ it('should leave non-class utilities alone', async () => {
           font-weight: bold;
         }
       }
-    }"
+    }
+    "
+  `)
+})
+
+it('should not convert empty classes into `@utility` since that would make them invalid', async () => {
+  expect(
+    await migrate(css`
+      @layer utilities {
+        .good {
+          color: red;
+        }
+
+        .bad-empty {
+        }
+
+        /* Comment above */
+        .bad-with-comment-above {
+        }
+
+        .bad-with-comment-inside {
+          /* Comment inside */
+        }
+
+        .bad-with-comment-below {
+        }
+        /* Comment below */
+      }
+    `),
+  ).toMatchInlineSnapshot(`
+    "
+    @utility good {
+      color: red;
+    }
+
+    @layer utilities {
+      .bad-empty {
+      }
+
+      /* Comment above */
+      .bad-with-comment-above {
+      }
+
+      .bad-with-comment-inside {
+        /* Comment inside */
+      }
+
+      .bad-with-comment-below {
+      }
+      /* Comment below */
+    }
+    "
   `)
 })
 
@@ -202,7 +262,8 @@ it('should migrate simple `@layer utilities` with nesting to `@utility`', async
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility foo {
+    "
+    @utility foo {
       color: red;
 
       &:hover {
@@ -212,7 +273,8 @@ it('should migrate simple `@layer utilities` with nesting to `@utility`', async
       &:focus {
         color: green;
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -230,13 +292,15 @@ it('should migrate multiple simple `@layer utilities` to `@utility`', async () =
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility foo {
+    "
+    @utility foo {
       color: red;
     }
 
     @utility bar {
       color: blue;
-    }"
+    }
+    "
   `)
 })
 
@@ -258,7 +322,8 @@ it('should not migrate Rules inside of Rules to a `@utility`', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility foo {
+    "
+    @utility foo {
       color: red;
     }
 
@@ -268,7 +333,8 @@ it('should not migrate Rules inside of Rules to a `@utility`', async () => {
       .baz {
         color: green;
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -284,11 +350,13 @@ it('should invert at-rules to make them migrate-able', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility foo {
+    "
+    @utility foo {
       @media (min-width: 640px) {
         color: red;
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -312,7 +380,8 @@ it('should migrate at-rules with multiple utilities and invert them', async () =
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility foo {
+    "
+    @utility foo {
       @media (min-width: 640px) {
         color: red;
       }
@@ -322,7 +391,8 @@ it('should migrate at-rules with multiple utilities and invert them', async () =
       @media (min-width: 640px) {
         color: blue;
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -354,7 +424,8 @@ it('should migrate deeply nested at-rules with multiple utilities and invert the
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility foo {
+    "
+    @utility foo {
       @media (min-width: 640px) {
         color: red;
       }
@@ -382,7 +453,8 @@ it('should migrate deeply nested at-rules with multiple utilities and invert the
           }
         }
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -396,11 +468,13 @@ it('should migrate classes with pseudo elements', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility no-scrollbar {
+    "
+    @utility no-scrollbar {
       &::-webkit-scrollbar {
         display: none;
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -414,11 +488,13 @@ it('should migrate classes with attribute selectors', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility no-scrollbar {
+    "
+    @utility no-scrollbar {
       &[data-checked=''] {
         display: none;
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -432,11 +508,13 @@ it('should migrate classes with element selectors', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility no-scrollbar {
+    "
+    @utility no-scrollbar {
       & main {
         display: none;
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -450,11 +528,13 @@ it('should migrate classes attached to an element selector', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility no-scrollbar {
+    "
+    @utility no-scrollbar {
       &main {
         display: none;
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -468,11 +548,13 @@ it('should migrate classes with id selectors', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility no-scrollbar {
+    "
+    @utility no-scrollbar {
       &#main {
         display: none;
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -486,7 +568,8 @@ it('should migrate classes with another attached class', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility no-scrollbar {
+    "
+    @utility no-scrollbar {
       &.main {
         display: none;
       }
@@ -496,7 +579,8 @@ it('should migrate classes with another attached class', async () => {
       &.no-scrollbar {
         display: none;
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -510,7 +594,8 @@ it('should migrate a selector with multiple classes to multiple @utility definit
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility foo {
+    "
+    @utility foo {
       & .bar:hover .baz:focus {
         display: none;
       }
@@ -526,7 +611,8 @@ it('should migrate a selector with multiple classes to multiple @utility definit
       .foo .bar:hover &:focus {
         display: none;
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -546,7 +632,8 @@ it('should merge `@utility` definitions with the same name', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility step {
+    "
+    @utility step {
       counter-increment: step;
 
       &:before {
@@ -554,7 +641,8 @@ it('should merge `@utility` definitions with the same name', async () => {
         @apply ml-[-41px];
         content: counter(step);
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -568,7 +656,8 @@ it('should not migrate nested classes inside a `:not(…)`', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility foo {
+    "
+    @utility foo {
       & .bar:not(.qux):has(.baz) {
         display: none;
       }
@@ -584,7 +673,8 @@ it('should not migrate nested classes inside a `:not(…)`', async () => {
       .foo .bar:not(.qux):has(&) {
         display: none;
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -618,7 +708,8 @@ it('should migrate advanced combinations', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@utility foo {
+    "
+    @utility foo {
       @media (width >= 100px) {
         @supports (display: none) {
           & .bar:not(.qux):has(.baz) {
@@ -657,7 +748,8 @@ it('should migrate advanced combinations', async () => {
           }
         }
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -675,12 +767,15 @@ describe('comments', () => {
         }
       `),
     ).toMatchInlineSnapshot(`
-      "/* Start of utilities: */
+      "
+      /* Start of utilities: */
+
       @utility foo {
         /* Utility #1 */
         /* Declarations: */
         color: red;
-      }"
+      }
+      "
     `)
   })
 
@@ -697,7 +792,9 @@ describe('comments', () => {
         }
       `),
     ).toMatchInlineSnapshot(`
-      "/* Start of utilities: */
+      "
+      /* Start of utilities: */
+
       @utility foo {
         /* Foo & Bar */
         & .bar {
@@ -705,13 +802,15 @@ describe('comments', () => {
           color: red;
         }
       }
+
       @utility bar {
         /* Foo & Bar */
         .foo & {
           /* Declarations: */
           color: red;
         }
-      }"
+      }
+      "
     `)
   })
 
@@ -731,7 +830,9 @@ describe('comments', () => {
         }
       `),
     ).toMatchInlineSnapshot(`
-      "/* Start of utilities: */
+      "
+      /* Start of utilities: */
+
       @utility foo {
         /* Mobile only */
         @media (width <= 640px) {
@@ -739,7 +840,8 @@ describe('comments', () => {
           /* Declarations: */
           color: red;
         }
-      }"
+      }
+      "
     `)
   })
 
@@ -778,7 +880,9 @@ describe('comments', () => {
         /* After */
       `),
     ).toMatchInlineSnapshot(`
-      "/* Tailwind Utilities: */
+      "
+      /* Tailwind Utilities: */
+
       @utility no-scrollbar {
         /* Chrome, Safari and Opera */
         /* Second comment */
@@ -805,7 +909,8 @@ describe('comments', () => {
       .after {
         /* Inside */
       }
-      /* After */"
+      /* After */
+      "
     `)
   })
 })
@@ -830,7 +935,8 @@ it('should not lose attribute selectors', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@layer components {
+    "
+    @layer components {
       #TableOfContents {
         .toc a {
           @apply block max-w-full truncate py-1 pl-2 hover:font-medium hover:no-underline;
@@ -843,7 +949,8 @@ it('should not lose attribute selectors', async () => {
           }
         }
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -861,11 +968,13 @@ describe('layered stylesheets', () => {
         layers: ['utilities'],
       }),
     ).toMatchInlineSnapshot(`
-      "@utility foo {
+      "
+      @utility foo {
         /* Utility #1 */
         /* Declarations: */
         color: red;
-      }"
+      }
+      "
     `)
   })
 
@@ -882,11 +991,13 @@ describe('layered stylesheets', () => {
         layers: ['components'],
       }),
     ).toMatchInlineSnapshot(`
-      "@utility foo {
+      "
+      @utility foo {
         /* Utility #1 */
         /* Declarations: */
         color: red;
-      }"
+      }
+      "
     `)
   })
 
@@ -903,11 +1014,13 @@ describe('layered stylesheets', () => {
         layers: ['foo'],
       }),
     ).toMatchInlineSnapshot(`
-      "/* Utility #1 */
+      "
+      /* Utility #1 */
       .foo {
         /* Declarations: */
         color: red;
-      }"
+      }
+      "
     `)
   })
 
@@ -927,7 +1040,8 @@ describe('layered stylesheets', () => {
         layers: ['utilities'],
       }),
     ).toMatchInlineSnapshot(`
-      "@utility foo {
+      "
+      @utility foo {
         /* Utility #1 */
         /* Declarations: */
         color: red;
@@ -935,7 +1049,8 @@ describe('layered stylesheets', () => {
 
       #main {
         color: red;
-      }"
+      }
+      "
     `)
   })
 
@@ -976,7 +1091,8 @@ describe('layered stylesheets', () => {
         layers: ['utilities'],
       }),
     ).toMatchInlineSnapshot(`
-      "@utility foo {
+      "
+      @utility foo {
         @layer utilities {
           @layer utilities {
             /* Utility #1 */
@@ -1009,7 +1125,8 @@ describe('layered stylesheets', () => {
 
       #secondary {
         color: red;
-      }"
+      }
+      "
     `)
   })
 
@@ -1026,11 +1143,13 @@ describe('layered stylesheets', () => {
         layers: ['utilities'],
       }),
     ).toMatchInlineSnapshot(`
-      "@import 'thing';
+      "
+      @import 'thing';
 
       @utility foo {
         color: red;
-      }"
+      }
+      "
     `)
   })
 
@@ -1047,11 +1166,13 @@ describe('layered stylesheets', () => {
         layers: ['utilities'],
       }),
     ).toMatchInlineSnapshot(`
-      "@charset "utf-8";
+      "
+      @charset "utf-8";
 
       @utility foo {
         color: red;
-      }"
+      }
+      "
     `)
   })
 })
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-at-layer-utilities.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-layer-utilities.ts
similarity index 83%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-at-layer-utilities.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-layer-utilities.ts
index f0f11d3d6..6bcb72d47 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-at-layer-utilities.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-layer-utilities.ts
@@ -1,11 +1,17 @@
-import { type AtRule, type Comment, type Plugin, type Rule } from 'postcss'
+import { type AtRule, type Comment, type Container, type Plugin, type Rule } from 'postcss'
 import SelectorParser from 'postcss-selector-parser'
-import { segment } from '../../../tailwindcss/src/utils/segment'
-import { Stylesheet } from '../stylesheet'
-import { walk, WalkAction, walkDepth } from '../utils/walk'
+import { segment } from '../../../../tailwindcss/src/utils/segment'
+import { Stylesheet } from '../../stylesheet'
+import * as version from '../../utils/version'
+import { walk, WalkAction, walkDepth } from '../../utils/walk'
 
 export function migrateAtLayerUtilities(stylesheet: Stylesheet): Plugin {
   function migrate(atRule: AtRule) {
+    // Migrating `@layer utilities` to `@utility` is only supported in Tailwind
+    // CSS v3 projects. Tailwind CSS v4 projects could also have `@layer
+    // utilities` but those aren't actual utilities.
+    if (!version.isMajor(3)) return
+
     // Only migrate `@layer utilities` and `@layer components`.
     if (atRule.params !== 'utilities' && atRule.params !== 'components') return
 
@@ -37,6 +43,7 @@ export function migrateAtLayerUtilities(stylesheet: Stylesheet): Plugin {
 
     walk(atRule, (node) => {
       if (node.type !== 'rule') return
+      if (isEmpty(node)) return
 
       // Find all the classes in the selector
       SelectorParser((selectors) => {
@@ -178,6 +185,18 @@ export function migrateAtLayerUtilities(stylesheet: Stylesheet): Plugin {
                 toRemove.push(node.parent?.nodes.at(i) as Comment)
               }
             }
+
+            let commentsAfter: Comment[] = []
+            for (let i = idx + 1; i < (node.parent?.nodes.length ?? 0); i++) {
+              if (node.parent?.nodes.at(i)?.type === 'rule') {
+                commentsAfter = []
+                break
+              }
+              if (node.parent?.nodes.at(i)?.type === 'comment') {
+                commentsAfter.push(node.parent?.nodes.at(i) as Comment)
+              }
+            }
+            toRemove.push(...commentsAfter)
           }
           for (let node of toRemove) {
             node.remove()
@@ -225,8 +244,12 @@ export function migrateAtLayerUtilities(stylesheet: Stylesheet): Plugin {
           }
         }
 
-        // Remove empty rules
-        if ((node.type === 'rule' || node.type === 'atrule') && node.nodes?.length === 0) {
+        // Remove empty rules from `@utility` clones and empty wrapper at-rules
+        // from the default `@layer` clone.
+        if (
+          (node.type === 'atrule' && node.nodes?.length === 0) ||
+          (clone !== defaultsAtRule && node.type === 'rule' && node.nodes?.length === 0)
+        ) {
           node.remove()
         }
 
@@ -255,6 +278,11 @@ export function migrateAtLayerUtilities(stylesheet: Stylesheet): Plugin {
       // Remove empty clones entirely
       if (clone.nodes?.length === 0) {
         clones.splice(idx, 1)
+      } else if (clone === defaultsAtRule) {
+        let first = clone.nodes?.[0]
+        if (first) {
+          first.raws.before = first.raws.before?.replace(/\n\s*\n/g, '\n')
+        }
       }
     }
 
@@ -310,3 +338,17 @@ export function migrateAtLayerUtilities(stylesheet: Stylesheet): Plugin {
     },
   }
 }
+
+function isEmpty(node: Container): boolean {
+  // We have no body
+  if (node.nodes === undefined) return false
+
+  // We have a body, but no nodes
+  if (node.nodes.length === 0) return true
+
+  // We have nodes, but they are only comments which we consider empty
+  if (node.nodes.every((child) => child.type === 'comment')) return true
+
+  // Not empty
+  return false
+}
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-config.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-config.ts
similarity index 90%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-config.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-config.ts
index b54fec34c..2004d0969 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-config.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-config.ts
@@ -1,8 +1,8 @@
 import path from 'node:path'
 import postcss, { AtRule, type Plugin } from 'postcss'
-import { normalizePath } from '../../../@tailwindcss-node/src/normalize-path'
-import type { JSConfigMigration } from '../migrate-js-config'
-import type { Stylesheet } from '../stylesheet'
+import { normalizePath } from '../../../../@tailwindcss-node/src/normalize-path'
+import type { Stylesheet } from '../../stylesheet'
+import type { JSConfigMigration } from '../config/migrate-js-config'
 
 const ALREADY_INJECTED = new WeakMap<Stylesheet, string[]>()
 
@@ -11,10 +11,11 @@ export function migrateConfig(
   {
     configFilePath,
     jsConfigMigration,
-  }: { configFilePath: string; jsConfigMigration: JSConfigMigration },
+  }: { configFilePath: string | null; jsConfigMigration: JSConfigMigration | null },
 ): Plugin {
   function migrate() {
     if (!sheet.isTailwindRoot) return
+    if (!configFilePath) return
 
     let alreadyInjected = ALREADY_INJECTED.get(sheet)
     if (alreadyInjected && alreadyInjected.includes(configFilePath)) {
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-import.test.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-import.test.ts
similarity index 100%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-import.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-import.test.ts
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-import.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-import.ts
similarity index 85%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-import.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-import.ts
index cfdf00ee6..419f5aa32 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-import.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-import.ts
@@ -1,9 +1,9 @@
 import fs from 'node:fs/promises'
 import { dirname, resolve } from 'node:path'
 import { type Plugin, type Root } from 'postcss'
-import { parseImportParams } from '../../../tailwindcss/src/at-import'
-import { segment } from '../../../tailwindcss/src/utils/segment'
-import * as ValueParser from '../../../tailwindcss/src/value-parser'
+import { parseImportParams } from '../../../../tailwindcss/src/at-import'
+import { segment } from '../../../../tailwindcss/src/utils/segment'
+import * as ValueParser from '../../../../tailwindcss/src/value-parser'
 
 export function migrateImport(): Plugin {
   async function migrate(root: Root) {
@@ -16,6 +16,7 @@ export function migrateImport(): Plugin {
         let [firstParam, ...rest] = segment(rule.params, ' ')
 
         let params = parseImportParams(ValueParser.parse(firstParam))
+        if (!params) return
 
         let isRelative = params.uri[0] === '.'
         let hasCssExtension = params.uri.endsWith('.css')
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-media-screen.test.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-media-screen.test.ts
similarity index 97%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-media-screen.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-media-screen.test.ts
index f4afd15fa..18ce72e8b 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-media-screen.test.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-media-screen.test.ts
@@ -2,7 +2,7 @@ import { __unstable__loadDesignSystem } from '@tailwindcss/node'
 import dedent from 'dedent'
 import postcss from 'postcss'
 import { expect, it } from 'vitest'
-import type { UserConfig } from '../../../tailwindcss/src/compat/config/types'
+import type { UserConfig } from '../../../../tailwindcss/src/compat/config/types'
 import { formatNodes } from './format-nodes'
 import { migrateMediaScreen } from './migrate-media-screen'
 import { sortBuckets } from './sort-buckets'
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-media-screen.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-media-screen.ts
similarity index 64%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-media-screen.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-media-screen.ts
index 40fe29c3c..c10e9ee99 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-media-screen.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-media-screen.ts
@@ -1,25 +1,27 @@
 import { type Plugin, type Root } from 'postcss'
-import { resolveConfig } from '../../../tailwindcss/src/compat/config/resolve-config'
-import type { Config } from '../../../tailwindcss/src/compat/plugin-api'
-import { buildMediaQuery } from '../../../tailwindcss/src/compat/screens-config'
-import type { DesignSystem } from '../../../tailwindcss/src/design-system'
-import { DefaultMap } from '../../../tailwindcss/src/utils/default-map'
+import { resolveConfig } from '../../../../tailwindcss/src/compat/config/resolve-config'
+import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
+import { buildMediaQuery } from '../../../../tailwindcss/src/compat/screens-config'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map'
 
 export function migrateMediaScreen({
   designSystem,
   userConfig,
 }: {
-  designSystem?: DesignSystem
-  userConfig?: Config
+  designSystem?: DesignSystem | null
+  userConfig?: Config | null
 } = {}): Plugin {
   function migrate(root: Root) {
     if (!designSystem || !userConfig) return
 
-    let { resolvedConfig } = resolveConfig(designSystem, [{ base: '', config: userConfig }])
+    let { resolvedConfig } = resolveConfig(designSystem, [
+      { base: '', config: userConfig, reference: false, src: undefined },
+    ])
     let screens = resolvedConfig?.theme?.screens || {}
 
     let mediaQueries = new DefaultMap<string, string | null>((name) => {
-      let value = designSystem?.resolveThemeValue(`--breakpoint-${name}`) ?? screens?.[name]
+      let value = designSystem?.resolveThemeValue(`--breakpoint-${name}`, true) ?? screens?.[name]
       if (typeof value === 'string') return `(width >= theme(--breakpoint-${name}))`
       return value ? buildMediaQuery(value) : null
     })
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-missing-layers.test.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-missing-layers.test.ts
similarity index 100%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-missing-layers.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-missing-layers.test.ts
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-missing-layers.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-missing-layers.ts
similarity index 97%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-missing-layers.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-missing-layers.ts
index 7dad26e73..10c9d55de 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-missing-layers.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-missing-layers.ts
@@ -1,5 +1,5 @@
 import { AtRule, type ChildNode, type Plugin, type Root } from 'postcss'
-import { segment } from '../../../tailwindcss/src/utils/segment'
+import { segment } from '../../../../tailwindcss/src/utils/segment'
 
 export function migrateMissingLayers(): Plugin {
   function migrate(root: Root) {
@@ -16,6 +16,7 @@ export function migrateMissingLayers(): Plugin {
           node.name === 'source' ||
           node.name === 'theme' ||
           node.name === 'utility' ||
+          node.name === 'custom-variant' ||
           node.name === 'variant'
         ) {
           if (bucket.length > 0) {
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-preflight.test.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-preflight.test.ts
similarity index 85%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-preflight.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-preflight.test.ts
index 21793e1ed..2d8b70041 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-preflight.test.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-preflight.test.ts
@@ -1,10 +1,12 @@
 import { __unstable__loadDesignSystem } from '@tailwindcss/node'
 import dedent from 'dedent'
 import postcss from 'postcss'
-import { expect, it } from 'vitest'
+import { expect, it, vi } from 'vitest'
+import * as versions from '../../utils/version'
 import { formatNodes } from './format-nodes'
 import { migratePreflight } from './migrate-preflight'
 import { sortBuckets } from './sort-buckets'
+vi.spyOn(versions, 'isMajor').mockReturnValue(true)
 
 const css = dedent
 
@@ -33,7 +35,7 @@ it("should add compatibility CSS after the `@import 'tailwindcss'`", async () =>
     "@import 'tailwindcss';
 
     /*
-      The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+      The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
       so we've added these compatibility styles to make sure everything still
       looks the same as it did with Tailwind CSS v3.
 
@@ -46,7 +48,7 @@ it("should add compatibility CSS after the `@import 'tailwindcss'`", async () =>
       ::before,
       ::backdrop,
       ::file-selector-button {
-        border-color: var(--color-gray-200, currentColor);
+        border-color: var(--color-gray-200, currentcolor);
       }
     }"
   `)
@@ -65,7 +67,7 @@ it('should add the compatibility CSS after the last `@import`', async () => {
     @import './bar.css';
 
     /*
-      The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+      The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
       so we've added these compatibility styles to make sure everything still
       looks the same as it did with Tailwind CSS v3.
 
@@ -78,7 +80,7 @@ it('should add the compatibility CSS after the last `@import`', async () => {
       ::before,
       ::backdrop,
       ::file-selector-button {
-        border-color: var(--color-gray-200, currentColor);
+        border-color: var(--color-gray-200, currentcolor);
       }
     }"
   `)
@@ -111,7 +113,7 @@ it('should add the compatibility CSS after the last import, even if a body-less
     @import './bar.css';
 
     /*
-      The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+      The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
       so we've added these compatibility styles to make sure everything still
       looks the same as it did with Tailwind CSS v3.
 
@@ -124,7 +126,7 @@ it('should add the compatibility CSS after the last import, even if a body-less
       ::before,
       ::backdrop,
       ::file-selector-button {
-        border-color: var(--color-gray-200, currentColor);
+        border-color: var(--color-gray-200, currentcolor);
       }
     }"
   `)
@@ -135,7 +137,7 @@ it('should add the compatibility CSS before the first `@layer base` (if the "tai
     await migrate(css`
       @import 'tailwindcss';
 
-      @variant foo {
+      @custom-variant foo {
       }
 
       @utility bar {
@@ -153,11 +155,11 @@ it('should add the compatibility CSS before the first `@layer base` (if the "tai
   ).toMatchInlineSnapshot(`
     "@import 'tailwindcss';
 
-    @variant foo {
+    @custom-variant foo {
     }
 
     /*
-      The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+      The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
       so we've added these compatibility styles to make sure everything still
       looks the same as it did with Tailwind CSS v3.
 
@@ -170,7 +172,7 @@ it('should add the compatibility CSS before the first `@layer base` (if the "tai
       ::before,
       ::backdrop,
       ::file-selector-button {
-        border-color: var(--color-gray-200, currentColor);
+        border-color: var(--color-gray-200, currentcolor);
       }
     }
 
@@ -193,7 +195,7 @@ it('should add the compatibility CSS before the first `@layer base` (if the "tai
     await migrate(css`
       @import 'tailwindcss/preflight';
 
-      @variant foo {
+      @custom-variant foo {
       }
 
       @utility bar {
@@ -211,11 +213,11 @@ it('should add the compatibility CSS before the first `@layer base` (if the "tai
   ).toMatchInlineSnapshot(`
     "@import 'tailwindcss/preflight';
 
-    @variant foo {
+    @custom-variant foo {
     }
 
     /*
-      The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+      The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
       so we've added these compatibility styles to make sure everything still
       looks the same as it did with Tailwind CSS v3.
 
@@ -228,7 +230,7 @@ it('should add the compatibility CSS before the first `@layer base` (if the "tai
       ::before,
       ::backdrop,
       ::file-selector-button {
-        border-color: var(--color-gray-200, currentColor);
+        border-color: var(--color-gray-200, currentcolor);
       }
     }
 
@@ -249,7 +251,7 @@ it('should add the compatibility CSS before the first `@layer base` (if the "tai
 it('should not add the backwards compatibility CSS when no `@import "tailwindcss"` or `@import "tailwindcss/preflight"` exists', async () => {
   expect(
     await migrate(css`
-      @variant foo {
+      @custom-variant foo {
       }
 
       @utility bar {
@@ -265,7 +267,7 @@ it('should not add the backwards compatibility CSS when no `@import "tailwindcss
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@variant foo {
+    "@custom-variant foo {
     }
 
     @utility bar {
@@ -287,7 +289,7 @@ it('should not add the backwards compatibility CSS when another `@import "tailwi
     await migrate(css`
       @import 'tailwindcss/theme';
 
-      @variant foo {
+      @custom-variant foo {
       }
 
       @utility bar {
@@ -305,7 +307,7 @@ it('should not add the backwards compatibility CSS when another `@import "tailwi
   ).toMatchInlineSnapshot(`
     "@import 'tailwindcss/theme';
 
-    @variant foo {
+    @custom-variant foo {
     }
 
     @utility bar {
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-preflight.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-preflight.ts
similarity index 81%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-preflight.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-preflight.ts
index 8677d6af6..d32d96979 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-preflight.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-preflight.ts
@@ -1,18 +1,20 @@
 import dedent from 'dedent'
 import postcss, { type Plugin, type Root } from 'postcss'
-import { keyPathToCssProperty } from '../../../tailwindcss/src/compat/apply-config-to-theme'
-import type { Config } from '../../../tailwindcss/src/compat/plugin-api'
-import type { DesignSystem } from '../../../tailwindcss/src/design-system'
-import { toKeyPath } from '../../../tailwindcss/src/utils/to-key-path'
-import * as ValueParser from '../../../tailwindcss/src/value-parser'
+import { keyPathToCssProperty } from '../../../../tailwindcss/src/compat/apply-config-to-theme'
+import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+import { toKeyPath } from '../../../../tailwindcss/src/utils/to-key-path'
+import * as ValueParser from '../../../../tailwindcss/src/value-parser'
+import { walk, WalkAction } from '../../../../tailwindcss/src/walk'
+import * as version from '../../utils/version'
 
 // Defaults in v4
-const DEFAULT_BORDER_COLOR = 'currentColor'
+const DEFAULT_BORDER_COLOR = 'currentcolor'
 
 const css = dedent
 const BORDER_COLOR_COMPATIBILITY_CSS = css`
   /*
-    The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+    The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
     so we've added these compatibility styles to make sure everything still
     looks the same as it did with Tailwind CSS v3.
 
@@ -34,18 +36,23 @@ export function migratePreflight({
   designSystem,
   userConfig,
 }: {
-  designSystem: DesignSystem
-  userConfig?: Config
+  designSystem: DesignSystem | null
+  userConfig?: Config | null
 }): Plugin {
   // @ts-expect-error
   let defaultBorderColor = userConfig?.theme?.borderColor?.DEFAULT
 
   function canResolveThemeValue(path: string) {
+    if (!designSystem) return false
     let variable = `--${keyPathToCssProperty(toKeyPath(path))}` as const
     return Boolean(designSystem.theme.get([variable]))
   }
 
   function migrate(root: Root) {
+    // CSS for backwards compatibility with v3 should only injected in v3
+    // projects and not v4 projects.
+    if (!version.isMajor(3)) return
+
     let isTailwindRoot = false
     root.walkAtRules('import', (node) => {
       if (
@@ -78,7 +85,7 @@ export function migratePreflight({
             return defaultBorderColor
           } else {
             if (path === 'borderColor.DEFAULT') {
-              return 'var(--color-gray-200, currentColor)'
+              return 'var(--color-gray-200, currentcolor)'
             }
           }
           return null
@@ -111,7 +118,7 @@ function substituteFunctionsInValue(
   ast: ValueParser.ValueAstNode[],
   handle: (value: string, fallback?: string) => string | null,
 ) {
-  ValueParser.walk(ast, (node, { replaceWith }) => {
+  walk(ast, (node) => {
     if (node.kind === 'function' && node.value === 'theme') {
       if (node.nodes.length < 1) return
 
@@ -149,7 +156,7 @@ function substituteFunctionsInValue(
         fallbackValues.length > 0 ? handle(path, ValueParser.toCss(fallbackValues)) : handle(path)
       if (replacement === null) return
 
-      replaceWith(ValueParser.parse(replacement))
+      return WalkAction.Replace(ValueParser.parse(replacement))
     }
   })
 
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-tailwind-directives.test.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-tailwind-directives.test.ts
similarity index 100%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-tailwind-directives.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-tailwind-directives.test.ts
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-tailwind-directives.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-tailwind-directives.ts
similarity index 100%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-tailwind-directives.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-tailwind-directives.ts
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-theme-to-var.test.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-theme-to-var.test.ts
similarity index 89%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-theme-to-var.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-theme-to-var.test.ts
index ce3940bc9..f0b4844ad 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-theme-to-var.test.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-theme-to-var.test.ts
@@ -35,11 +35,11 @@ it('should migrate `theme(…)` to `var(…)`', async () => {
       }
     `),
   ).toMatchInlineSnapshot(`
-    "@media theme(--breakpoint-sm) {
+    "@media --theme(--breakpoint-sm) {
       .foo {
         background-color: var(--color-red-900);
-        color: theme(--color-red-900 / 75%);
-        border-color: theme(--color-red-200 / 75%);
+        color: --theme(--color-red-900 / 75%);
+        border-color: --theme(--color-red-200 / 75%);
       }
     }"
   `)
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-theme-to-var.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-theme-to-var.ts
similarity index 80%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-theme-to-var.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-theme-to-var.ts
index 558e6d0cb..8285def1e 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/migrate-theme-to-var.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-theme-to-var.ts
@@ -1,11 +1,11 @@
 import { type Plugin } from 'postcss'
-import type { DesignSystem } from '../../../tailwindcss/src/design-system'
-import { Convert, createConverter } from '../template/codemods/theme-to-var'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+import { Convert, createConverter } from '../template/migrate-theme-to-var'
 
 export function migrateThemeToVar({
   designSystem,
 }: {
-  designSystem?: DesignSystem
+  designSystem?: DesignSystem | null
 } = {}): Plugin {
   return {
     postcssPlugin: '@tailwindcss/upgrade/migrate-theme-to-var',
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-variants-directive.test.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-variants-directive.test.ts
similarity index 100%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-variants-directive.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-variants-directive.test.ts
diff --git a/packages/@tailwindcss-upgrade/src/codemods/migrate-variants-directive.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-variants-directive.ts
similarity index 100%
rename from packages/@tailwindcss-upgrade/src/codemods/migrate-variants-directive.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/migrate-variants-directive.ts
diff --git a/packages/@tailwindcss-upgrade/src/codemods/css/migrate.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate.ts
new file mode 100644
index 000000000..cb9150851
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate.ts
@@ -0,0 +1,57 @@
+import postcss from 'postcss'
+import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+import { Stylesheet } from '../../stylesheet'
+import type { JSConfigMigration } from '../config/migrate-js-config'
+import { migrateAtApply } from './migrate-at-apply'
+import { migrateAtLayerUtilities } from './migrate-at-layer-utilities'
+import { migrateConfig } from './migrate-config'
+import { migrateImport } from './migrate-import'
+import { migrateMediaScreen } from './migrate-media-screen'
+import { migrateMissingLayers } from './migrate-missing-layers'
+import { migratePreflight } from './migrate-preflight'
+import { migrateTailwindDirectives } from './migrate-tailwind-directives'
+import { migrateThemeToVar } from './migrate-theme-to-var'
+import { migrateVariantsDirective } from './migrate-variants-directive'
+
+export interface MigrateOptions {
+  newPrefix: string | null
+  designSystem: DesignSystem | null
+  userConfig: Config | null
+  configFilePath: string | null
+  jsConfigMigration: JSConfigMigration | null
+}
+
+export async function migrate(stylesheet: Stylesheet, options: MigrateOptions) {
+  if (!stylesheet.file) {
+    throw new Error('Cannot migrate a stylesheet without a file path')
+  }
+
+  if (!stylesheet.canMigrate) return
+
+  await migrateContents(stylesheet, options)
+}
+
+export async function migrateContents(
+  stylesheet: Stylesheet | string,
+  options: MigrateOptions,
+  file?: string,
+) {
+  if (typeof stylesheet === 'string') {
+    stylesheet = await Stylesheet.fromString(stylesheet)
+    stylesheet.file = file ?? null
+  }
+
+  return postcss()
+    .use(migrateImport())
+    .use(migrateAtApply(options))
+    .use(migrateMediaScreen(options))
+    .use(migrateVariantsDirective())
+    .use(migrateAtLayerUtilities(stylesheet))
+    .use(migrateMissingLayers())
+    .use(migrateTailwindDirectives(options))
+    .use(migrateConfig(stylesheet, options))
+    .use(migratePreflight(options))
+    .use(migrateThemeToVar(options))
+    .process(stylesheet.root, { from: stylesheet.file ?? undefined })
+}
diff --git a/packages/@tailwindcss-upgrade/src/codemods/sort-buckets.ts b/packages/@tailwindcss-upgrade/src/codemods/css/sort-buckets.ts
similarity index 94%
rename from packages/@tailwindcss-upgrade/src/codemods/sort-buckets.ts
rename to packages/@tailwindcss-upgrade/src/codemods/css/sort-buckets.ts
index b99badeb0..22b0581dd 100644
--- a/packages/@tailwindcss-upgrade/src/codemods/sort-buckets.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/sort-buckets.ts
@@ -1,6 +1,6 @@
 import postcss, { type AtRule, type ChildNode, type Comment, type Plugin, type Root } from 'postcss'
-import { DefaultMap } from '../../../tailwindcss/src/utils/default-map'
-import { walk, WalkAction } from '../utils/walk'
+import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map'
+import { walk, WalkAction } from '../../utils/walk'
 
 const BUCKET_ORDER = [
   // Imports
@@ -10,7 +10,7 @@ const BUCKET_ORDER = [
   'config', // @config
   'plugin', // @plugin
   'source', // @source
-  'variant', // @variant
+  'custom-variant', // @custom-variant
   'theme', // @theme
 
   // Styles
@@ -75,7 +75,7 @@ export function sortBuckets(): Plugin {
         // Known at-rules
         else if (
           node.type === 'atrule' &&
-          ['config', 'plugin', 'source', 'theme', 'utility', 'variant'].includes(node.name)
+          ['config', 'plugin', 'source', 'theme', 'utility', 'custom-variant'].includes(node.name)
         ) {
           injectInto(node.name, node)
         }
diff --git a/packages/@tailwindcss-upgrade/src/codemods/css/split.ts b/packages/@tailwindcss-upgrade/src/codemods/css/split.ts
new file mode 100644
index 000000000..146d30733
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/css/split.ts
@@ -0,0 +1,257 @@
+import postcss from 'postcss'
+import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map'
+import { Stylesheet, type StylesheetId } from '../../stylesheet'
+import { walk, WalkAction } from '../../utils/walk'
+
+export async function split(stylesheets: Stylesheet[]) {
+  let stylesheetsById = new Map<StylesheetId, Stylesheet>()
+  let stylesheetsByFile = new Map<string, Stylesheet>()
+
+  for (let sheet of stylesheets) {
+    stylesheetsById.set(sheet.id, sheet)
+
+    if (sheet.file) {
+      stylesheetsByFile.set(sheet.file, sheet)
+    }
+  }
+
+  // Keep track of sheets that contain `@utility` rules
+  let requiresSplit = new Set<Stylesheet>()
+
+  for (let sheet of stylesheets) {
+    // Root files don't need to be split
+    if (sheet.isTailwindRoot) continue
+
+    let containsUtility = false
+    let containsUnsafe = sheet.layers().size > 0
+
+    walk(sheet.root, (node) => {
+      if (node.type === 'atrule' && node.name === 'utility') {
+        containsUtility = true
+      }
+
+      // Safe to keep without splitting
+      else if (
+        // An `@import "…" layer(…)` is safe
+        (node.type === 'atrule' && node.name === 'import' && node.params.includes('layer(')) ||
+        // @layer blocks are safe
+        (node.type === 'atrule' && node.name === 'layer') ||
+        // Comments are safe
+        node.type === 'comment'
+      ) {
+        return WalkAction.Skip
+      }
+
+      // Everything else is not safe, and requires a split
+      else {
+        containsUnsafe = true
+      }
+
+      // We already know we need to split this sheet
+      if (containsUtility && containsUnsafe) {
+        return WalkAction.Stop
+      }
+
+      return WalkAction.Skip
+    })
+
+    if (containsUtility && containsUnsafe) {
+      requiresSplit.add(sheet)
+    }
+  }
+
+  // Split every imported stylesheet into two parts
+  let utilitySheets = new Map<Stylesheet, Stylesheet>()
+
+  for (let sheet of stylesheets) {
+    // Ignore stylesheets that were not imported
+    if (!sheet.file) continue
+    if (sheet.parents.size === 0) continue
+
+    // Skip stylesheets that don't have utilities
+    // and don't have any children that have utilities
+    if (!requiresSplit.has(sheet)) {
+      if (!Array.from(sheet.descendants()).some((child) => requiresSplit.has(child))) {
+        continue
+      }
+    }
+
+    let utilities = postcss.root()
+
+    walk(sheet.root, (node) => {
+      if (node.type !== 'atrule') return
+      if (node.name !== 'utility') return
+
+      // `append` will move this node from the original sheet
+      // to the new utilities sheet
+      utilities.append(node)
+
+      return WalkAction.Skip
+    })
+
+    let newFileName = sheet.file.replace(/\.css$/, '.utilities.css')
+
+    let counter = 0
+
+    // If we already have a utility sheet with this name, we need to rename it
+    while (stylesheetsByFile.has(newFileName)) {
+      counter += 1
+      newFileName = sheet.file.replace(/\.css$/, `.utilities.${counter}.css`)
+    }
+
+    let utilitySheet = await Stylesheet.fromRoot(utilities, newFileName)
+
+    utilitySheet.extension = counter > 0 ? `.utilities.${counter}.css` : `.utilities.css`
+
+    utilitySheets.set(sheet, utilitySheet)
+    stylesheetsById.set(utilitySheet.id, utilitySheet)
+  }
+
+  // Make sure the utility sheets are linked to one another
+  for (let [normalSheet, utilitySheet] of utilitySheets) {
+    for (let parent of normalSheet.parents) {
+      let utilityParent = utilitySheets.get(parent.item)
+      if (!utilityParent) continue
+      utilitySheet.parents.add({
+        item: utilityParent,
+        meta: parent.meta,
+      })
+    }
+
+    for (let child of normalSheet.children) {
+      let utilityChild = utilitySheets.get(child.item)
+      if (!utilityChild) continue
+      utilitySheet.children.add({
+        item: utilityChild,
+        meta: child.meta,
+      })
+    }
+  }
+
+  for (let sheet of stylesheets) {
+    let utilitySheet = utilitySheets.get(sheet)
+    let utilityImports: Set<postcss.AtRule> = new Set()
+
+    for (let node of sheet.importRules) {
+      let sheetId = node.raws.tailwind_destination_sheet_id as StylesheetId | undefined
+
+      // This import rule does not point to a stylesheet
+      // which likely means it points to `node_modules`
+      if (!sheetId) continue
+
+      let originalDestination = stylesheetsById.get(sheetId)
+
+      // This import points to a stylesheet that no longer exists which likely
+      // means it was removed by the optimizer this will be cleaned up later
+      if (!originalDestination) continue
+
+      let utilityDestination = utilitySheets.get(originalDestination)
+
+      // A utility sheet doesn't exist for this import so it doesn't need
+      // to be processed
+      if (!utilityDestination) continue
+
+      let match = node.params.match(/(['"])(.*)\1/)
+      if (!match) return
+
+      let quote = match[1]
+      let id = match[2]
+
+      let newFile = id.replace(/\.css$/, utilityDestination.extension!)
+
+      // The import will just point to the new file without any media queries,
+      // layers, or other conditions because `@utility` MUST be top-level.
+      let newImport = node.clone({
+        params: `${quote}${newFile}${quote}`,
+        raws: {
+          tailwind_injected_layer: node.raws.tailwind_injected_layer,
+          tailwind_original_params: `${quote}${id}${quote}`,
+          tailwind_destination_sheet_id: utilityDestination.id,
+        },
+      })
+
+      if (utilitySheet) {
+        // If this import is intended to go into the utility sheet
+        // we'll collect it into a list to add later. If we don't'
+        // we'll end up adding them in reverse order.
+        utilityImports.add(newImport)
+      } else {
+        // This import will go immediately after the original import
+        node.after(newImport)
+      }
+    }
+
+    // Add imports to the top of the utility sheet if necessary
+    if (utilitySheet && utilityImports.size > 0) {
+      utilitySheet.root.prepend(Array.from(utilityImports))
+    }
+  }
+
+  // Tracks the at rules that import a given stylesheet
+  let importNodes = new DefaultMap<Stylesheet, Set<postcss.AtRule>>(() => new Set())
+
+  for (let sheet of stylesheetsById.values()) {
+    for (let node of sheet.importRules) {
+      let sheetId = node.raws.tailwind_destination_sheet_id as StylesheetId | undefined
+
+      // This import rule does not point to a stylesheet
+      if (!sheetId) continue
+
+      let destination = stylesheetsById.get(sheetId)
+
+      // This import rule does not point to a stylesheet that exists
+      // We'll remove it later
+      if (!destination) continue
+
+      importNodes.get(destination).add(node)
+    }
+  }
+
+  // At this point we've created many `{name}.utilities.css` files.
+  // If the original file _becomes_ empty after splitting that means that
+  // dedicated utility file is not required and we can move the utilities
+  // back to the original file.
+  //
+  // This could be done in one step but separating them makes it easier to
+  // reason about since the stylesheets are in a consistent state before we
+  // perform any cleanup tasks.
+  let list: Stylesheet[] = []
+
+  for (let sheet of stylesheets.slice()) {
+    for (let child of sheet.descendants()) {
+      list.push(child)
+    }
+
+    list.push(sheet)
+  }
+
+  for (let sheet of list) {
+    let utilitySheet = utilitySheets.get(sheet)
+
+    // This sheet was not split so there's nothing to do
+    if (!utilitySheet) continue
+
+    // This sheet did not become empty
+    if (!sheet.isEmpty) continue
+
+    // We have a sheet that became empty after splitting
+    // 1. Replace the sheet with it's utility sheet content
+    sheet.root = utilitySheet.root
+
+    // 2. Rewrite imports in parent sheets to point to the original sheet
+    // Ideally this wouldn't need to be _undone_ but instead only done once at the end
+    for (let node of importNodes.get(utilitySheet)) {
+      node.params = node.raws.tailwind_original_params as any
+    }
+
+    // 3. Remove the original import from the non-utility sheet
+    for (let node of importNodes.get(sheet)) {
+      node.remove()
+    }
+
+    // 3. Mark the utility sheet for removal
+    utilitySheets.delete(sheet)
+  }
+
+  stylesheets.push(...utilitySheets.values())
+}
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/candidates.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/candidates.test.ts
new file mode 100644
index 000000000..2e4d150aa
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/candidates.test.ts
@@ -0,0 +1,84 @@
+import { __unstable__loadDesignSystem } from '@tailwindcss/node'
+import { expect, test } from 'vitest'
+import { spliceChangesIntoString } from '../../utils/splice-changes-into-string'
+import { extractRawCandidates } from './candidates'
+
+let html = String.raw
+
+test('extracts candidates with positions from a template', async () => {
+  let content = html`
+    <div class="bg-blue-500 hover:focus:text-white [color:red]">
+      <button class="bg-blue-500 text-white">My button</button>
+    </div>
+  `
+  let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', {
+    base: __dirname,
+  })
+
+  let candidates = await extractRawCandidates(content, 'html')
+  let validCandidates = candidates.filter(
+    ({ rawCandidate }) => designSystem.parseCandidate(rawCandidate).length > 0,
+  )
+
+  expect(validCandidates).toMatchInlineSnapshot(`
+    [
+      {
+        "end": 28,
+        "rawCandidate": "bg-blue-500",
+        "start": 17,
+      },
+      {
+        "end": 51,
+        "rawCandidate": "hover:focus:text-white",
+        "start": 29,
+      },
+      {
+        "end": 63,
+        "rawCandidate": "[color:red]",
+        "start": 52,
+      },
+      {
+        "end": 98,
+        "rawCandidate": "bg-blue-500",
+        "start": 87,
+      },
+      {
+        "end": 109,
+        "rawCandidate": "text-white",
+        "start": 99,
+      },
+    ]
+  `)
+})
+
+test('replaces the right positions for a candidate', async () => {
+  let content = html`
+    <h1>🤠👋</h1>
+    <div class="bg-blue-500" />
+  `
+
+  let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', {
+    base: __dirname,
+  })
+
+  let candidates = await extractRawCandidates(content, 'html')
+
+  let candidate = candidates.find(
+    ({ rawCandidate }) => designSystem.parseCandidate(rawCandidate).length > 0,
+  )!
+
+  let migrated = spliceChangesIntoString(content, [
+    {
+      start: candidate.start,
+      end: candidate.end,
+      replacement: 'flex',
+    },
+  ])
+
+  expect(migrated).toMatchInlineSnapshot(`
+    "
+        <h1>🤠👋</h1>
+        <div class="flex" />
+      "
+  `)
+})
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/candidates.ts b/packages/@tailwindcss-upgrade/src/codemods/template/candidates.ts
new file mode 100644
index 000000000..88b1e4e03
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/candidates.ts
@@ -0,0 +1,43 @@
+import { Scanner } from '@tailwindcss/oxide'
+import { cloneCandidate, type Candidate } from '../../../../tailwindcss/src/candidate'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+
+export async function extractRawCandidates(
+  content: string,
+  extension: string = 'html',
+): Promise<{ rawCandidate: string; start: number; end: number }[]> {
+  let scanner = new Scanner({})
+  let result = scanner.getCandidatesWithPositions({ content, extension })
+
+  let candidates: { rawCandidate: string; start: number; end: number }[] = []
+  for (let { candidate: rawCandidate, position: start } of result) {
+    candidates.push({ rawCandidate, start, end: start + rawCandidate.length })
+  }
+  return candidates
+}
+
+// Create a basic stripped candidate without variants or important flag
+export function baseCandidate<T extends Candidate>(candidate: T) {
+  let base = cloneCandidate(candidate)
+
+  base.important = false
+  base.variants = []
+
+  return base
+}
+
+export function parseCandidate(designSystem: DesignSystem, input: string) {
+  return designSystem.parseCandidate(
+    designSystem.theme.prefix && !input.startsWith(`${designSystem.theme.prefix}:`)
+      ? `${designSystem.theme.prefix}:${input}`
+      : input,
+  )
+}
+
+export function printUnprefixedCandidate(designSystem: DesignSystem, candidate: Candidate) {
+  let candidateString = designSystem.printCandidate(candidate)
+
+  return designSystem.theme.prefix && candidateString.startsWith(`${designSystem.theme.prefix}:`)
+    ? candidateString.slice(designSystem.theme.prefix.length + 1)
+    : candidateString
+}
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/is-safe-migration.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/is-safe-migration.test.ts
new file mode 100644
index 000000000..7cfb16c75
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/is-safe-migration.test.ts
@@ -0,0 +1,154 @@
+import { __unstable__loadDesignSystem } from '@tailwindcss/node'
+import { describe, expect, test, vi } from 'vitest'
+import * as versions from '../../utils/version'
+import { migrateCandidate } from './migrate'
+vi.spyOn(versions, 'isMajor').mockReturnValue(true)
+
+const css = String.raw
+
+describe('is-safe-migration', async () => {
+  let designSystem = await __unstable__loadDesignSystem(
+    css`
+      @import 'tailwindcss';
+
+      /* TODO(perf): Only here to speed up the tests */
+      @theme {
+        --*: initial;
+        --shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
+        --shadow-sm: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
+      }
+    `,
+    { base: __dirname },
+  )
+
+  test.each([
+    [`let notBorder = !border    \n`, '!border'],
+    [`{ "foo": !border.something + ""}\n`, '!border'],
+    [`<div v-if="something && !border"></div>\n`, '!border'],
+    [`<div v-else-if="something && !border"></div>\n`, '!border'],
+    [`<div v-show="something && !border"></div>\n`, '!border'],
+    [`<div v-if="!border || !border"></div>\n`, '!border'],
+    [`<div v-else-if="!border || !border"></div>\n`, '!border'],
+    [`<div v-show="!border || !border"></div>\n`, '!border'],
+    [`<div v-if="!border"></div>\n`, '!border'],
+    [`<div v-else-if="!border"></div>\n`, '!border'],
+    [`<div v-show="!border"></div>\n`, '!border'],
+    [`<div x-if="!border"></div>\n`, '!border'],
+
+    [`let notShadow = shadow    \n`, 'shadow'],
+    [`{ "foo": shadow.something + ""}\n`, 'shadow'],
+    [`<div v-if="something && shadow"></div>\n`, 'shadow'],
+    [`<div v-else-if="something && shadow"></div>\n`, 'shadow'],
+    [`<div v-show="something && shadow"></div>\n`, 'shadow'],
+    [`<div v-if="shadow || shadow"></div>\n`, 'shadow'],
+    [`<div v-else-if="shadow || shadow"></div>\n`, 'shadow'],
+    [`<div v-show="shadow || shadow"></div>\n`, 'shadow'],
+    [`<div v-if="shadow"></div>\n`, 'shadow'],
+    [`<div v-else-if="shadow"></div>\n`, 'shadow'],
+    [`<div v-show="shadow"></div>\n`, 'shadow'],
+    [`<div x-if="shadow"></div>\n`, 'shadow'],
+    [`<div style={{filter: 'drop-shadow(30px 10px 4px #4444dd)'}}/>\n`, 'shadow'],
+    [`<div style="flex-grow: 1"></div>\n`, 'flex-grow'],
+    [`<div style='flex-shrink: 0'></div>\n`, 'flex-shrink'],
+    [`<div style="  flex-shrink: 0"></div>\n`, 'flex-shrink'],
+    [`<div style="\nflex-shrink: 0\n"></div>\n`, 'flex-shrink'],
+
+    // Next.js Image placeholder cases
+    [`<Image placeholder="blur" src="/image.jpg" />`, 'blur'],
+    [`<Image placeholder={'blur'} src="/image.jpg" />`, 'blur'],
+    [`<Image placeholder={blur} src="/image.jpg" />`, 'blur'],
+
+    // https://github.com/tailwindlabs/tailwindcss/issues/17974
+    ['<div v-if="!duration">', '!duration'],
+    ['<div :active="!duration">', '!duration'],
+    ['<div :active="!visible">', '!visible'],
+
+    // Alpine/Livewire wire:…
+    ['<x-input.number required="foo" wire:model.blur="coins" />', 'blur'],
+
+    // Vue 3 events
+    [`emit('blur', props.modelValue)\n`, 'blur'],
+    [`$emit('blur', props.modelValue)\n`, 'blur'],
+
+    // JavaScript / TypeScript
+    [`document.addEventListener('blur',handleBlur)`, 'blur'],
+    [`document.addEventListener('blur', handleBlur)`, 'blur'],
+
+    [`function foo({ outline = true })`, 'outline'],
+    [`function foo({ before = false, outline = true })`, 'outline'],
+    [`function foo({before=false,outline=true })`, 'outline'],
+    [`function foo({outline=true })`, 'outline'],
+    // https://github.com/tailwindlabs/tailwindcss/issues/18675
+    [
+      // With default value
+      `function foo({ size = "1.25rem", digit, outline = true, textClass = "", className = "" })`,
+      'outline',
+    ],
+    [
+      // Without default value
+      `function foo({ size = "1.25rem", digit, outline, textClass = "", className = "" })`,
+      'outline',
+    ],
+    [
+      // As the last argument
+      `function foo({ size = "1.25rem", digit, outline })`,
+      'outline',
+    ],
+    [
+      // As the last argument, but there is technically another `"` on the same line
+      `function foo({ size = "1.25rem", digit, outline }): { return "foo" }`,
+      'outline',
+    ],
+    [
+      // Tricky quote balancing
+      `function foo({ before = "'", outline, after = "'" }): { return "foo" }`,
+      'outline',
+    ],
+
+    [`function foo(blur, foo)`, 'blur'],
+    [`function foo(blur,foo)`, 'blur'],
+
+    // shadcn/ui variants
+    [`<Button variant="outline" />`, 'outline'],
+    [`<Button variant='outline' />`, 'outline'],
+    [`<Button variant={"outline"} />`, 'outline'],
+    [`<Button variant={'outline'} />`, 'outline'],
+    [`function Button({ variant = "outline" }) {}`, 'outline'],
+    [`function Button({ variant = 'outline' }) {}`, 'outline'],
+    [`function Button({ variant="outline" }) {}`, 'outline'],
+    [`function Button({ variant='outline' }) {}`, 'outline'],
+    [`Button({ variant: "outline" })`, 'outline'],
+    [`Button({ variant: 'outline' })`, 'outline'],
+  ])('does not replace classes in invalid positions #%#', async (example, candidate) => {
+    expect(
+      await migrateCandidate(designSystem, {}, candidate, {
+        contents: example,
+        start: example.indexOf(candidate),
+        end: example.indexOf(candidate) + candidate.length,
+      }),
+    ).toEqual(candidate)
+  })
+
+  test.each([
+    // Vue classes
+    [`<div class="shadow"></div>`, 'shadow', 'shadow-sm'],
+    [`<div :class="{ shadow: true }"></div>`, 'shadow', 'shadow-sm'],
+    [`<div enter-class="shadow"></div>`, 'shadow', 'shadow-sm'],
+    [`<div :enter-class="{ shadow: true }"></div>`, 'shadow', 'shadow-sm'],
+
+    // React classes
+    [`<div className="shadow"></div>`, 'shadow', 'shadow-sm'],
+    [`<div enterClassName="shadow"></div>`, 'shadow', 'shadow-sm'],
+
+    // Preact-style
+    [`<div enterClass="shadow"></div>`, 'shadow', 'shadow-sm'],
+  ])('replaces classes in valid positions #%#', async (example, candidate, expected) => {
+    expect(
+      await migrateCandidate(designSystem, {}, candidate, {
+        contents: example,
+        start: example.indexOf(candidate),
+        end: example.indexOf(candidate) + candidate.length,
+      }),
+    ).toEqual(expected)
+  })
+})
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/is-safe-migration.ts b/packages/@tailwindcss-upgrade/src/codemods/template/is-safe-migration.ts
new file mode 100644
index 000000000..2c09f299f
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/is-safe-migration.ts
@@ -0,0 +1,367 @@
+import { parseCandidate } from '../../../../tailwindcss/src/candidate'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map'
+import * as version from '../../utils/version'
+
+const LOGICAL_OPERATORS = ['&&', '||', '?', '===', '==', '!=', '!==', '>', '>=', '<', '<=']
+const CONDITIONAL_TEMPLATE_SYNTAX = [
+  // Skip any generic attributes like `xxx="shadow"`,
+  // including Vue conditions like `v-if="something && shadow"`
+  // and Alpine conditions like `x-if="shadow"`,
+  // but allow Vue and React classes
+  /(?<!:?class|className)=['"]$/i,
+
+  // JavaScript / TypeScript
+  /addEventListener\(['"`]$/,
+
+  // Alpine
+  /wire:[^\s]*?$/,
+
+  // shadcn/ui variants
+  /variant\s*[:=]\s*\{?['"`]$/,
+]
+const NEXT_PLACEHOLDER_PROP = /placeholder=\{?['"`]$/
+const VUE_3_EMIT = /\b\$?emit\(['"`]$/
+
+export function isSafeMigration(
+  rawCandidate: string,
+  location: { contents: string; start: number; end: number },
+  designSystem: DesignSystem,
+): boolean {
+  // Ensure we are not migrating a candidate in a `<style>` block. The heuristic
+  // would be if the candidate is preceded by a whitespace and followed by a
+  // colon and whitespace.
+  //
+  // E.g.:
+  // ```vue
+  // <template>
+  //   <div class="foo"></div>
+  // </template>
+  //
+  //
+  // <style>
+  // .foo {
+  //   flex-shrink: 0;
+  //  ^           ^^
+  // }
+  // </style>
+  // ```
+  if (
+    // Whitespace before the candidate
+    location.contents[location.start - 1]?.match(/\s/) &&
+    // A colon followed by whitespace after the candidate
+    location.contents.slice(location.end, location.end + 2)?.match(/^:\s/)
+  ) {
+    // Compute all `<style>` ranges once and cache it for the current files
+    let ranges = styleBlockRanges.get(location.contents)
+
+    for (let i = 0; i < ranges.length; i += 2) {
+      let start = ranges[i]
+      let end = ranges[i + 1]
+
+      // Check if the candidate is inside a `<style>` block
+      if (location.start >= start && location.end <= end) {
+        return false
+      }
+    }
+  }
+
+  let currentLineBeforeCandidate = ''
+  for (let i = location.start - 1; i >= 0; i--) {
+    let char = location.contents.at(i)!
+    if (char === '\n') {
+      break
+    }
+    currentLineBeforeCandidate = char + currentLineBeforeCandidate
+  }
+  let currentLineAfterCandidate = ''
+  for (let i = location.end; i < location.contents.length; i++) {
+    let char = location.contents.at(i)!
+    if (char === '\n') {
+      break
+    }
+    currentLineAfterCandidate += char
+  }
+
+  // Inline `style="..."` attributes can contain CSS property names that look
+  // like valid utility candidates, such as `flex-grow`.
+  {
+    let ranges = inlineStyleAttributeValueRanges.get(location.contents)
+
+    for (let i = 0; i < ranges.length; i += 2) {
+      let start = ranges[i]
+      let end = ranges[i + 1]
+
+      if (location.start >= start && location.end <= end) {
+        return false
+      }
+    }
+  }
+
+  let [candidate] = parseCandidate(rawCandidate, designSystem)
+
+  // If we can't parse the candidate, then it's not a candidate at all. However,
+  // we could be dealing with legacy classes like `tw__flex` in Tailwind CSS v3
+  // land, which also wouldn't parse.
+  //
+  // So let's only skip if we couldn't parse and we are not in Tailwind CSS v3.
+  //
+  if (!candidate && version.isGreaterThan(3)) {
+    return false
+  }
+
+  // Parsed a candidate successfully, verify if it's a valid candidate
+  else if (candidate) {
+    // When we have variants, we can assume that the candidate is safe to migrate
+    // because that requires colons.
+    //
+    // E.g.: `hover:focus:flex`
+    if (candidate.variants.length > 0) {
+      return true
+    }
+
+    // When we have an arbitrary property, the candidate has such a particular
+    // structure it's very likely to be safe.
+    //
+    // E.g.: `[color:red]`
+    if (candidate.kind === 'arbitrary') {
+      return true
+    }
+
+    // A static candidate is very likely safe if it contains a dash.
+    //
+    // E.g.: `items-center`
+    if (candidate.kind === 'static' && candidate.root.includes('-')) {
+      return true
+    }
+
+    // A functional candidate is very likely safe if it contains a value (which
+    // implies a `-`). Or if the root contains a dash.
+    //
+    // E.g.: `bg-red-500`, `bg-position-20`
+    if (
+      (candidate.kind === 'functional' && candidate.value !== null) ||
+      (candidate.kind === 'functional' && candidate.root.includes('-'))
+    ) {
+      return true
+    }
+
+    // If the candidate contains a modifier, it's very likely to be safe because
+    // it implies that it contains a `/`.
+    //
+    // E.g.: `text-sm/7`
+    if (candidate.kind === 'functional' && candidate.modifier) {
+      return true
+    }
+  }
+
+  // Heuristic: Require the candidate to be inside quotes
+  let isQuoteBeforeCandidate = isMiddleOfString(currentLineBeforeCandidate)
+  let isQuoteAfterCandidate = isMiddleOfString(currentLineAfterCandidate)
+  if (!isQuoteBeforeCandidate || !isQuoteAfterCandidate) {
+    return false
+  }
+
+  // Heuristic: Disallow object access immediately following the candidate
+  if (currentLineAfterCandidate[0] === '.') {
+    return false
+  }
+
+  // Heuristic: Disallow function call expressions immediately following the candidate
+  if (currentLineAfterCandidate.trim().startsWith('(')) {
+    return false
+  }
+
+  // Heuristic: Disallow logical operators preceding or following the candidate
+  for (let operator of LOGICAL_OPERATORS) {
+    if (
+      currentLineAfterCandidate.trim().startsWith(operator) ||
+      currentLineBeforeCandidate.trim().endsWith(operator)
+    ) {
+      return false
+    }
+  }
+
+  // Heuristic: Disallow conditional template syntax
+  for (let rule of CONDITIONAL_TEMPLATE_SYNTAX) {
+    if (rule.test(currentLineBeforeCandidate)) {
+      return false
+    }
+  }
+
+  // Heuristic: Disallow Next.js Image `placeholder` prop
+  if (NEXT_PLACEHOLDER_PROP.test(currentLineBeforeCandidate)) {
+    return false
+  }
+
+  // Heuristic: Disallow replacements inside `emit('…', …)`
+  if (VUE_3_EMIT.test(currentLineBeforeCandidate)) {
+    return false
+  }
+
+  return true
+}
+
+// Assumptions:
+// - All `<style` tags appear before the next `</style>` tag
+// - All `<style` tags are closed with `</style>`
+// - No nested `<style>` tags
+const styleBlockRanges = new DefaultMap((source: string) => {
+  let ranges: number[] = []
+  let offset = 0
+
+  while (true) {
+    let startTag = source.indexOf('<style', offset)
+    if (startTag === -1) return ranges
+
+    offset = startTag + 1
+
+    // Ensure the style looks like:
+    // - `<style>`   (closed)
+    // - `<style …>` (with attributes)
+    if (!source[startTag + 6].match(/[>\s]/)) continue
+
+    let endTag = source.indexOf('</style>', offset)
+    if (endTag === -1) return ranges
+    offset = endTag + 1
+
+    ranges.push(startTag, endTag)
+  }
+})
+
+const BACKSLASH = 0x5c
+const DOUBLE_QUOTE = 0x22
+const SINGLE_QUOTE = 0x27
+const BACKTICK = 0x60
+const TAB = 0x09
+const NEWLINE = 0x0a
+const FORM_FEED = 0x0c
+const CARRIAGE_RETURN = 0x0d
+const SPACE = 0x20
+const SLASH = 0x2f
+const EQUALS = 0x3d
+const GREATER_THAN = 0x3e
+
+function isMiddleOfString(line: string): boolean {
+  let currentQuote: number | null = null
+
+  for (let i = 0; i < line.length; i++) {
+    let char = line.charCodeAt(i)
+    switch (char) {
+      // Escaped character, skip the next character
+      case BACKSLASH:
+        i++
+        break
+
+      case SINGLE_QUOTE:
+      case DOUBLE_QUOTE:
+      case BACKTICK:
+        // Found matching quote, we are outside of a string
+        if (currentQuote === char) {
+          currentQuote = null
+        }
+
+        // Found a quote, we are inside a string
+        else if (currentQuote === null) {
+          currentQuote = char
+        }
+        break
+    }
+  }
+
+  return currentQuote !== null
+}
+
+const inlineStyleAttributeValueRanges = new DefaultMap((source: string) => {
+  let ranges: number[] = []
+  let offset = 0
+
+  while (true) {
+    let tagStart = source.indexOf('<', offset)
+    if (tagStart === -1) return ranges
+
+    let tagEnd = source.indexOf('>', tagStart + 1)
+    if (tagEnd === -1) return ranges
+
+    offset = tagEnd + 1
+
+    for (let i = tagStart + 1; i < tagEnd; i++) {
+      let char = source.charCodeAt(i)
+
+      if (
+        char === SPACE ||
+        char === TAB ||
+        char === NEWLINE ||
+        char === CARRIAGE_RETURN ||
+        char === FORM_FEED
+      ) {
+        continue
+      }
+
+      let start = i
+      while (i < tagEnd) {
+        let char = source.charCodeAt(i)
+        if (
+          char === SPACE ||
+          char === TAB ||
+          char === NEWLINE ||
+          char === CARRIAGE_RETURN ||
+          char === FORM_FEED ||
+          char === EQUALS ||
+          char === GREATER_THAN ||
+          char === SLASH
+        ) {
+          break
+        }
+
+        i++
+      }
+
+      let attribute = source.slice(start, i).toLowerCase()
+      if (attribute !== 'style' && attribute !== ':style') continue
+
+      while (i < tagEnd) {
+        let char = source.charCodeAt(i)
+        if (
+          char !== SPACE &&
+          char !== TAB &&
+          char !== NEWLINE &&
+          char !== CARRIAGE_RETURN &&
+          char !== FORM_FEED
+        ) {
+          break
+        }
+
+        i++
+      }
+
+      if (source[i] !== '=') continue
+
+      i++
+      while (i < tagEnd) {
+        let char = source.charCodeAt(i)
+        if (
+          char !== SPACE &&
+          char !== TAB &&
+          char !== NEWLINE &&
+          char !== CARRIAGE_RETURN &&
+          char !== FORM_FEED
+        ) {
+          break
+        }
+
+        i++
+      }
+
+      let quote = source[i]
+      if (quote !== '"' && quote !== "'") continue
+
+      let valueStart = i + 1
+      let valueEnd = source.indexOf(quote, valueStart)
+      if (valueEnd === -1 || valueEnd > tagEnd) break
+
+      ranges.push(valueStart, valueEnd)
+      i = valueEnd
+    }
+  }
+})
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-variants.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-variants.ts
new file mode 100644
index 000000000..258ba1b33
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-variants.ts
@@ -0,0 +1,55 @@
+import { cloneCandidate } from '../../../../tailwindcss/src/candidate'
+import {
+  PRE_COMPUTED_VARIANTS_KEY,
+  prepareDesignSystemStorage,
+  VARIANT_SIGNATURE_KEY,
+} from '../../../../tailwindcss/src/canonicalize-candidates'
+import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+import type { Writable } from '../../../../tailwindcss/src/types'
+import { replaceObject } from '../../../../tailwindcss/src/utils/replace-object'
+import { walkVariants } from '../../utils/walk-variants'
+
+export function migrateArbitraryVariants(
+  baseDesignSystem: DesignSystem,
+  _userConfig: Config | null,
+  rawCandidate: string,
+): string {
+  let designSystem = prepareDesignSystemStorage(baseDesignSystem)
+  let signatures = designSystem.storage[VARIANT_SIGNATURE_KEY].get(null)
+  let variants = designSystem.storage[PRE_COMPUTED_VARIANTS_KEY].get(null)
+
+  for (let readonlyCandidate of designSystem.parseCandidate(rawCandidate)) {
+    // We are only interested in the variants
+    if (readonlyCandidate.variants.length <= 0) return rawCandidate
+
+    // The below logic makes use of mutation. Since candidates in the
+    // DesignSystem are cached, we can't mutate them directly.
+    let candidate = cloneCandidate(readonlyCandidate) as Writable<typeof readonlyCandidate>
+
+    for (let [variant] of walkVariants(candidate)) {
+      if (variant.kind === 'compound') continue
+
+      let targetString = designSystem.printVariant(variant)
+      let targetSignature = signatures.get(targetString)
+      if (typeof targetSignature !== 'string') continue
+
+      let foundVariants = variants.get(targetSignature)
+      if (foundVariants.length === 0) continue
+
+      // The variant is already in a canonical form, e.g.: `min-lg` and `lg`
+      // produce the same CSS, but both are valid so we keep them as-is.
+      if (foundVariants.includes(targetString)) continue
+
+      let foundVariant = foundVariants[0]
+      let parsedVariant = designSystem.parseVariant(foundVariant)
+      if (parsedVariant === null) continue
+
+      replaceObject(variant, parsedVariant)
+    }
+
+    return designSystem.printCandidate(candidate)
+  }
+
+  return rawCandidate
+}
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/automatic-var-injection.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-automatic-var-injection.test.ts
similarity index 82%
rename from packages/@tailwindcss-upgrade/src/template/codemods/automatic-var-injection.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-automatic-var-injection.test.ts
index d9e714e9e..5da651d51 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/automatic-var-injection.test.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-automatic-var-injection.test.ts
@@ -1,6 +1,6 @@
 import { __unstable__loadDesignSystem } from '@tailwindcss/node'
 import { expect, test } from 'vitest'
-import { automaticVarInjection } from './automatic-var-injection'
+import { migrateAutomaticVarInjection } from './migrate-automatic-var-injection'
 
 test.each([
   // Arbitrary candidates
@@ -36,6 +36,15 @@ test.each([
   ['supports-[--test]:flex', 'supports-(--test):flex'],
   ['supports-[_--test]:flex', 'supports-[--test]:flex'],
 
+  // Custom CSS functions that look like variables should not be converted
+  ['w-[--spacing(5)]', 'w-[--spacing(5)]'],
+  ['bg-[--theme(--color-red-500)]', 'bg-[--theme(--color-red-500)]'],
+
+  // Fallback values should be included inside the `var(…)` function
+  ['bg-[--my-color,red]', 'bg-(--my-color,red)'],
+  // Fallback values can contain CSS functions
+  ['bg-[--my-color,theme(spacing.1)]', 'bg-(--my-color,theme(spacing.1))'],
+
   // Some properties never had var() injection in v3.
   ['[scroll-timeline-name:--myTimeline]', '[scroll-timeline-name:--myTimeline]'],
   ['[timeline-scope:--myScope]', '[timeline-scope:--myScope]'],
@@ -54,6 +63,6 @@ test.each([
     base: __dirname,
   })
 
-  let migrated = automaticVarInjection(designSystem, {}, candidate)
+  let migrated = migrateAutomaticVarInjection(designSystem, {}, candidate)
   expect(migrated).toEqual(result)
 })
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/automatic-var-injection.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-automatic-var-injection.ts
similarity index 79%
rename from packages/@tailwindcss-upgrade/src/template/codemods/automatic-var-injection.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-automatic-var-injection.ts
index 33995c04a..0ea3bd691 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/automatic-var-injection.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-automatic-var-injection.ts
@@ -1,18 +1,19 @@
-import { walk, WalkAction } from '../../../../tailwindcss/src/ast'
-import { type Candidate, type Variant } from '../../../../tailwindcss/src/candidate'
+import { cloneCandidate, type Candidate, type Variant } from '../../../../tailwindcss/src/candidate'
 import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
 import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
-import { printCandidate } from '../candidates'
+import type { Writable } from '../../../../tailwindcss/src/types'
+import * as ValueParser from '../../../../tailwindcss/src/value-parser'
+import { walk, WalkAction } from '../../../../tailwindcss/src/walk'
 
-export function automaticVarInjection(
+export function migrateAutomaticVarInjection(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
   for (let readonlyCandidate of designSystem.parseCandidate(rawCandidate)) {
     // The below logic makes extended use of mutation. Since candidates in the
     // DesignSystem are cached, we can't mutate them directly.
-    let candidate = structuredClone(readonlyCandidate) as Candidate
+    let candidate = cloneCandidate(readonlyCandidate) as Writable<Candidate>
 
     let didChange = false
 
@@ -66,7 +67,7 @@ export function automaticVarInjection(
     }
 
     if (didChange) {
-      return printCandidate(designSystem, candidate)
+      return designSystem.printCandidate(candidate)
     }
   }
   return rawCandidate
@@ -75,12 +76,27 @@ export function automaticVarInjection(
 function injectVar(value: string): { value: string; didChange: boolean } {
   let didChange = false
   if (value.startsWith('--')) {
-    value = `var(${value})`
-    didChange = true
+    // E.g.:
+    //
+    // - `--my-color` → `var(--my-color)`             Convert variable
+    // - `--my-color,red` → `var(--my-color,red)`     Convert variable with fallback
+    // - `--theme(color.red)` → `--theme(color.red)`  Do not convert functions
+    //
+    if (
+      // No `(` definitely means there is no function
+      !value.includes('(') ||
+      // There could be a function call in the fallback value, but it cannot be
+      // top-level, so we can safely check the first part
+      ValueParser.parse(value)[0]?.kind !== 'function'
+    ) {
+      value = `var(${value})`
+      didChange = true
+    }
   } else if (value.startsWith(' --')) {
     value = value.slice(1)
     didChange = true
   }
+
   return { value, didChange }
 }
 
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-camelcase-in-named-value.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-camelcase-in-named-value.test.ts
new file mode 100644
index 000000000..ed5be23c0
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-camelcase-in-named-value.test.ts
@@ -0,0 +1,24 @@
+import { __unstable__loadDesignSystem } from '@tailwindcss/node'
+import { expect, test, vi } from 'vitest'
+import * as versions from '../../utils/version'
+import { migrateCamelcaseInNamedValue } from './migrate-camelcase-in-named-value'
+vi.spyOn(versions, 'isMajor').mockReturnValue(true)
+
+test.each([
+  ['text-superRed', 'text-super-red'],
+  ['text-red/superOpaque', 'text-red/super-opaque'],
+  ['text-superRed/superOpaque', 'text-super-red/super-opaque'],
+
+  // Should not migrate named values in modifiers
+  ['group-hover/superGroup:underline', 'group-hover/superGroup:underline'],
+
+  ['hover:text-superRed', 'hover:text-super-red'],
+  ['hover:text-red/superOpaque', 'hover:text-red/super-opaque'],
+  ['hover:text-superRed/superOpaque', 'hover:text-super-red/super-opaque'],
+])('%s => %s', async (candidate, result) => {
+  let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', {
+    base: __dirname,
+  })
+
+  expect(migrateCamelcaseInNamedValue(designSystem, {}, candidate)).toEqual(result)
+})
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-camelcase-in-named-value.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-camelcase-in-named-value.ts
new file mode 100644
index 000000000..9cfbc7de0
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-camelcase-in-named-value.ts
@@ -0,0 +1,54 @@
+import { cloneCandidate } from '../../../../tailwindcss/src/candidate'
+import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+import * as version from '../../utils/version'
+
+// Converts named values to use kebab-case. This is necessary because the
+// upgrade tool also renames the theme values to kebab-case, so `text-superRed`
+// will have its theme value renamed to `--color-super-red` and thus the utility
+// will be renamed to `text-super-red`.
+export function migrateCamelcaseInNamedValue(
+  designSystem: DesignSystem,
+  _userConfig: Config | null,
+  rawCandidate: string,
+): string {
+  if (!version.isMajor(3)) return rawCandidate
+
+  for (let candidate of designSystem.parseCandidate(rawCandidate)) {
+    if (candidate.kind !== 'functional') continue
+    let clone = cloneCandidate(candidate)
+    let didChange = false
+
+    if (
+      candidate.value &&
+      clone.value &&
+      candidate.value.kind === 'named' &&
+      clone.value.kind === 'named' &&
+      candidate.value.value.match(/[A-Z]/)
+    ) {
+      clone.value.value = camelToKebab(candidate.value.value)
+      didChange = true
+    }
+
+    if (
+      candidate.modifier &&
+      clone.modifier &&
+      candidate.modifier.kind === 'named' &&
+      clone.modifier.kind === 'named' &&
+      candidate.modifier.value.match(/[A-Z]/)
+    ) {
+      clone.modifier.value = camelToKebab(candidate.modifier.value)
+      didChange = true
+    }
+
+    if (didChange) {
+      return designSystem.printCandidate(clone)
+    }
+  }
+
+  return rawCandidate
+}
+
+function camelToKebab(str: string): string {
+  return str.replace(/([A-Z])/g, '-$1').toLowerCase()
+}
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-canonicalize-candidate.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-canonicalize-candidate.test.ts
new file mode 100644
index 000000000..57fe80c22
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-canonicalize-candidate.test.ts
@@ -0,0 +1,27 @@
+import { __unstable__loadDesignSystem } from '@tailwindcss/node'
+import { expect, test, vi } from 'vitest'
+import * as versions from '../../utils/version'
+import { migrateCanonicalizeCandidate } from './migrate-canonicalize-candidate'
+vi.spyOn(versions, 'isMajor').mockReturnValue(true)
+
+test.each([
+  // Normalize whitespace in arbitrary properties
+  ['[display:flex]', '[display:flex]'],
+  ['[display:_flex]', '[display:flex]'],
+  ['[display:flex_]', '[display:flex]'],
+  ['[display:_flex_]', '[display:flex]'],
+
+  // Normalize whitespace in `calc` expressions
+  ['w-[calc(100%-2rem)]', 'w-[calc(100%-2rem)]'],
+  ['w-[calc(100%_-_2rem)]', 'w-[calc(100%-2rem)]'],
+
+  // Normalize the important modifier
+  ['!flex', 'flex!'],
+  ['flex!', 'flex!'],
+])('%s => %s', async (candidate, result) => {
+  let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', {
+    base: __dirname,
+  })
+
+  expect(migrateCanonicalizeCandidate(designSystem, {}, candidate)).toEqual(result)
+})
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-canonicalize-candidate.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-canonicalize-candidate.ts
new file mode 100644
index 000000000..32d126467
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-canonicalize-candidate.ts
@@ -0,0 +1,29 @@
+import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+
+// Canonicalize the value to its minimal form. This will normalize whitespace,
+// and print the important modifier `!` in the correct place.
+//
+// E.g.:
+//
+// ```
+// [display:_flex_] => [display:flex]
+// [display:_flex]  => [display:flex]
+// [display:flex_]  => [display:flex]
+// [display:flex]   => [display:flex]
+// ```
+//
+export function migrateCanonicalizeCandidate(
+  designSystem: DesignSystem,
+  _userConfig: Config | null,
+  rawCandidate: string,
+) {
+  for (let readonlyCandidate of designSystem.parseCandidate(rawCandidate)) {
+    let canonicalizedCandidate = designSystem.printCandidate(readonlyCandidate)
+    if (canonicalizedCandidate !== rawCandidate) {
+      return canonicalizedCandidate
+    }
+  }
+
+  return rawCandidate
+}
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/handle-empty-arbitrary-values.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-handle-empty-arbitrary-values.test.ts
similarity index 68%
rename from packages/@tailwindcss-upgrade/src/template/codemods/handle-empty-arbitrary-values.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-handle-empty-arbitrary-values.test.ts
index b451fbf86..bebd43343 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/handle-empty-arbitrary-values.test.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-handle-empty-arbitrary-values.test.ts
@@ -1,7 +1,9 @@
 import { __unstable__loadDesignSystem } from '@tailwindcss/node'
-import { expect, test } from 'vitest'
-import { handleEmptyArbitraryValues } from './handle-empty-arbitrary-values'
-import { prefix } from './prefix'
+import { expect, test, vi } from 'vitest'
+import * as versions from '../../utils/version'
+import { migrateEmptyArbitraryValues } from './migrate-handle-empty-arbitrary-values'
+import { migratePrefix } from './migrate-prefix'
+vi.spyOn(versions, 'isMajor').mockReturnValue(true)
 
 test.each([
   ['group-[]:flex', 'group-[&]:flex'],
@@ -14,7 +16,7 @@ test.each([
     base: __dirname,
   })
 
-  expect(handleEmptyArbitraryValues(designSystem, {}, candidate)).toEqual(result)
+  expect(migrateEmptyArbitraryValues(designSystem, {}, candidate)).toEqual(result)
 })
 
 test.each([
@@ -29,7 +31,7 @@ test.each([
   })
 
   expect(
-    [handleEmptyArbitraryValues, prefix].reduce(
+    [migrateEmptyArbitraryValues, migratePrefix].reduce(
       (acc, step) => step(designSystem, { prefix: 'tw-' }, acc),
       candidate,
     ),
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/handle-empty-arbitrary-values.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-handle-empty-arbitrary-values.ts
similarity index 91%
rename from packages/@tailwindcss-upgrade/src/template/codemods/handle-empty-arbitrary-values.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-handle-empty-arbitrary-values.ts
index 8f7dc5e6e..0058814d9 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/handle-empty-arbitrary-values.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-handle-empty-arbitrary-values.ts
@@ -1,9 +1,9 @@
 import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
 import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
 
-export function handleEmptyArbitraryValues(
+export function migrateEmptyArbitraryValues(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
   // We can parse the candidate, nothing to do
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/legacy-arbitrary-values.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-arbitrary-values.test.ts
similarity index 72%
rename from packages/@tailwindcss-upgrade/src/template/codemods/legacy-arbitrary-values.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-arbitrary-values.test.ts
index 974cd0ca3..8bb193b43 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/legacy-arbitrary-values.test.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-arbitrary-values.test.ts
@@ -1,6 +1,6 @@
 import { __unstable__loadDesignSystem } from '@tailwindcss/node'
 import { expect, test } from 'vitest'
-import { legacyArbitraryValues } from './legacy-arbitrary-values'
+import { migrateLegacyArbitraryValues } from './migrate-legacy-arbitrary-values'
 
 test.each([
   ['grid-cols-[auto,1fr]', 'grid-cols-[auto_1fr]'],
@@ -11,5 +11,5 @@ test.each([
     base: __dirname,
   })
 
-  expect(legacyArbitraryValues(designSystem, {}, candidate)).toEqual(result)
+  expect(migrateLegacyArbitraryValues(designSystem, {}, candidate)).toEqual(result)
 })
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/legacy-arbitrary-values.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-arbitrary-values.ts
similarity index 72%
rename from packages/@tailwindcss-upgrade/src/template/codemods/legacy-arbitrary-values.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-arbitrary-values.ts
index 1c60526fd..2bd7d2fd5 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/legacy-arbitrary-values.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-arbitrary-values.ts
@@ -1,16 +1,15 @@
-import { parseCandidate } from '../../../../tailwindcss/src/candidate'
+import { cloneCandidate, parseCandidate } from '../../../../tailwindcss/src/candidate'
 import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
 import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
 import { segment } from '../../../../tailwindcss/src/utils/segment'
-import { printCandidate } from '../candidates'
 
-export function legacyArbitraryValues(
+export function migrateLegacyArbitraryValues(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
   for (let candidate of parseCandidate(rawCandidate, designSystem)) {
-    let clone = structuredClone(candidate)
+    let clone = cloneCandidate(candidate)
     let changed = false
 
     // Convert commas to spaces. E.g.: [auto,1fr] to [auto_1fr]
@@ -23,7 +22,7 @@ export function legacyArbitraryValues(
       clone.value.value = segment(clone.value.value, ',').join(' ')
     }
 
-    return changed ? printCandidate(designSystem, clone) : rawCandidate
+    return changed ? designSystem.printCandidate(clone) : rawCandidate
   }
 
   return rawCandidate
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/legacy-classes.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-classes.test.ts
similarity index 74%
rename from packages/@tailwindcss-upgrade/src/template/codemods/legacy-classes.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-classes.test.ts
index 5d29c1b71..5b204386f 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/legacy-classes.test.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-classes.test.ts
@@ -1,6 +1,8 @@
 import { __unstable__loadDesignSystem } from '@tailwindcss/node'
-import { expect, test } from 'vitest'
-import { legacyClasses } from './legacy-classes'
+import { expect, test, vi } from 'vitest'
+import * as versions from '../../utils/version'
+import { migrateLegacyClasses } from './migrate-legacy-classes'
+vi.spyOn(versions, 'isMajor').mockReturnValue(true)
 
 test.each([
   ['shadow', 'shadow-sm'],
@@ -25,6 +27,8 @@ test.each([
 
   ['ring', 'ring-3'],
 
+  ['outline', 'outline-solid'],
+
   ['blur!', 'blur-sm!'],
   ['hover:blur', 'hover:blur-sm'],
   ['hover:blur!', 'hover:blur-sm!'],
@@ -37,5 +41,5 @@ test.each([
     base: __dirname,
   })
 
-  expect(await legacyClasses(designSystem, {}, candidate)).toEqual(result)
+  expect(await migrateLegacyClasses(designSystem, {}, candidate)).toEqual(result)
 })
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/legacy-classes.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-classes.ts
similarity index 69%
rename from packages/@tailwindcss-upgrade/src/template/codemods/legacy-classes.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-classes.ts
index adf31e7f4..2b088aa2e 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/legacy-classes.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-classes.ts
@@ -1,12 +1,12 @@
 import { __unstable__loadDesignSystem } from '@tailwindcss/node'
 import path from 'node:path'
 import url from 'node:url'
-import type { Candidate } from '../../../../tailwindcss/src/candidate'
+import { cloneCandidate, type Candidate } from '../../../../tailwindcss/src/candidate'
 import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
 import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
 import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map'
-import { printCandidate } from '../candidates'
-import { isSafeMigration } from '../is-safe-migration'
+import * as version from '../../utils/version'
+import { baseCandidate } from './candidates'
 
 const __filename = url.fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -33,6 +33,8 @@ const LEGACY_CLASS_MAP = new Map([
   ['backdrop-blur-sm', 'backdrop-blur-xs'],
 
   ['ring', 'ring-3'],
+
+  ['outline', 'outline-solid'],
 ])
 
 const THEME_KEYS = new Map([
@@ -57,7 +59,7 @@ const THEME_KEYS = new Map([
   ['backdrop-blur-sm', '--backdrop-blur-sm'],
   ['backdrop-blur-xs', '--backdrop-blur-xs'],
 
-  ['ring', '--ring-width'],
+  ['ring', '--default-ring-width'],
   ['ring-3', '--ring-width-3'],
 ])
 
@@ -65,26 +67,28 @@ const DESIGN_SYSTEMS = new DefaultMap((base) => {
   return __unstable__loadDesignSystem('@import "tailwindcss";', { base })
 })
 
-export async function legacyClasses(
+export async function migrateLegacyClasses(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
-  location?: {
-    contents: string
-    start: number
-    end: number
-  },
 ): Promise<string> {
+  // These migrations are only safe when migrating from v3 to v4.
+  //
+  // Migrating from `rounded` to `rounded-sm` once is fine (v3 -> v4). But if we
+  // migrate again (v4 -> v4), then `rounded-sm` would be migrated to
+  // `rounded-xs` which is incorrect because we already migrated this.
+  if (!version.isMajor(3)) {
+    return rawCandidate
+  }
+
   let defaultDesignSystem = await DESIGN_SYSTEMS.get(__dirname)
 
   function* migrate(rawCandidate: string) {
     for (let candidate of designSystem.parseCandidate(rawCandidate)) {
       // Create a base candidate string from the candidate.
       // E.g.: `hover:blur!` -> `blur`
-      let baseCandidate = structuredClone(candidate) as Candidate
-      baseCandidate.variants = []
-      baseCandidate.important = false
-      let baseCandidateString = printCandidate(designSystem, baseCandidate)
+      let base = baseCandidate(candidate)
+      let baseCandidateString = designSystem.printCandidate(base)
 
       // Find the new base candidate string. `blur` -> `blur-sm`
       let newBaseCandidateString = LEGACY_CLASS_MAP.get(baseCandidateString)
@@ -96,12 +100,11 @@ export async function legacyClasses(
 
       // Re-apply the variants and important flag from the original candidate.
       // E.g.: `hover:blur!` -> `blur` -> `blur-sm` -> `hover:blur-sm!`
-      let newCandidate = structuredClone(newBaseCandidate) as Candidate
+      let newCandidate = cloneCandidate(newBaseCandidate) as Candidate
       newCandidate.variants = candidate.variants
       newCandidate.important = candidate.important
 
       yield [
-        candidate,
         newCandidate,
         THEME_KEYS.get(baseCandidateString),
         THEME_KEYS.get(newBaseCandidateString),
@@ -109,39 +112,12 @@ export async function legacyClasses(
     }
   }
 
-  for (let [fromCandidate, toCandidate, fromThemeKey, toThemeKey] of migrate(rawCandidate)) {
-    // Every utility that has a simple representation (e.g.: `blur`, `radius`,
-    // etc.`) without variants or special characters _could_ be a potential
-    // problem during the migration.
-    let isPotentialProblematicClass = (() => {
-      if (fromCandidate.variants.length > 0) {
-        return false
-      }
-
-      if (fromCandidate.kind === 'arbitrary') {
-        return false
-      }
-
-      if (fromCandidate.kind === 'static') {
-        return !fromCandidate.root.includes('-')
-      }
-
-      if (fromCandidate.kind === 'functional') {
-        return fromCandidate.value === null || !fromCandidate.root.includes('-')
-      }
-
-      return false
-    })()
-
-    if (location && isPotentialProblematicClass && !isSafeMigration(location)) {
-      continue
-    }
-
+  for (let [toCandidate, fromThemeKey, toThemeKey] of migrate(rawCandidate)) {
     if (fromThemeKey && toThemeKey) {
       // Migrating something that resolves to a value in the theme.
-      let customFrom = designSystem.resolveThemeValue(fromThemeKey)
-      let defaultFrom = defaultDesignSystem.resolveThemeValue(fromThemeKey)
-      let customTo = designSystem.resolveThemeValue(toThemeKey)
+      let customFrom = designSystem.resolveThemeValue(fromThemeKey, true)
+      let defaultFrom = defaultDesignSystem.resolveThemeValue(fromThemeKey, true)
+      let customTo = designSystem.resolveThemeValue(toThemeKey, true)
       let defaultTo = defaultDesignSystem.resolveThemeValue(toThemeKey)
 
       // The new theme value is not defined, which means we can't safely
@@ -161,7 +137,7 @@ export async function legacyClasses(
       }
     }
 
-    return printCandidate(designSystem, toCandidate)
+    return designSystem.printCandidate(toCandidate)
   }
 
   return rawCandidate
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/max-width-screen.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-max-width-screen.test.ts
similarity index 74%
rename from packages/@tailwindcss-upgrade/src/template/codemods/max-width-screen.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-max-width-screen.test.ts
index 3e3151cbc..91b57b3db 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/max-width-screen.test.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-max-width-screen.test.ts
@@ -1,12 +1,12 @@
 import { __unstable__loadDesignSystem } from '@tailwindcss/node'
 import { expect, test } from 'vitest'
-import { maxWidthScreen } from './max-width-screen'
+import { migrateMaxWidthScreen } from './migrate-max-width-screen'
 
 test('converts max-w-screen-* to max-w-[theme(screens.*)] (so it will later be converted to the var injection)', async () => {
   let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', {
     base: __dirname,
   })
 
-  let migrated = maxWidthScreen(designSystem, {}, 'max-w-screen-md')
+  let migrated = migrateMaxWidthScreen(designSystem, {}, 'max-w-screen-md')
   expect(migrated).toMatchInlineSnapshot(`"max-w-[theme(screens.md)]"`)
 })
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/max-width-screen.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-max-width-screen.ts
similarity index 81%
rename from packages/@tailwindcss-upgrade/src/template/codemods/max-width-screen.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-max-width-screen.ts
index 4a14e5aad..cc9b7e9e2 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/max-width-screen.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-max-width-screen.ts
@@ -1,10 +1,9 @@
 import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
 import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
-import { printCandidate } from '../candidates'
 
-export function maxWidthScreen(
+export function migrateMaxWidthScreen(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
   for (let candidate of designSystem.parseCandidate(rawCandidate)) {
@@ -13,7 +12,7 @@ export function maxWidthScreen(
       candidate.root === 'max-w' &&
       candidate.value?.value.startsWith('screen-')
     ) {
-      return printCandidate(designSystem, {
+      return designSystem.printCandidate({
         ...candidate,
         value: {
           ...candidate.value,
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-modernize-arbitrary-values.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-modernize-arbitrary-values.test.ts
new file mode 100644
index 000000000..b1887ae0b
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-modernize-arbitrary-values.test.ts
@@ -0,0 +1,91 @@
+import { __unstable__loadDesignSystem } from '@tailwindcss/node'
+import { expect, test, vi } from 'vitest'
+import type { UserConfig } from '../../../../tailwindcss/src/compat/config/types'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+import * as versions from '../../utils/version'
+import { migrateArbitraryVariants } from './migrate-arbitrary-variants'
+import { migrateEmptyArbitraryValues } from './migrate-handle-empty-arbitrary-values'
+import { migrateModernizeArbitraryValues } from './migrate-modernize-arbitrary-values'
+import { migratePrefix } from './migrate-prefix'
+vi.spyOn(versions, 'isMajor').mockReturnValue(true)
+
+const css = String.raw
+
+function migrate(designSystem: DesignSystem, userConfig: UserConfig | null, rawCandidate: string) {
+  for (let migration of [
+    migrateEmptyArbitraryValues,
+    migratePrefix,
+    migrateModernizeArbitraryValues,
+    migrateArbitraryVariants,
+    (designSystem: DesignSystem, _: UserConfig | null, rawCandidate: string) => {
+      return designSystem.canonicalizeCandidates([rawCandidate]).pop() ?? rawCandidate
+    },
+  ]) {
+    rawCandidate = migration(designSystem, userConfig, rawCandidate)
+  }
+  return rawCandidate
+}
+
+test.each([
+  // Some extreme examples of what happens in the wild:
+  ['group-[]:flex', 'in-[.group]:flex'],
+  ['group-[]/name:flex', 'in-[.group\\/name]:flex'],
+
+  // Migrate `peer-[]` to a parsable `peer-[&]` instead:
+  ['peer-[]:flex', 'peer-[&]:flex'],
+  ['peer-[]/name:flex', 'peer-[&]/name:flex'],
+
+  // These shouldn't happen in the real world (because compound variants are
+  // new). But this could happen once we allow codemods to run in v4+ projects.
+  ['has-group-[]:flex', 'has-in-[.group]:flex'],
+  ['has-group-[]/name:flex', 'has-in-[.group\\/name]:flex'],
+  ['not-group-[]:flex', 'not-in-[.group]:flex'],
+  ['not-group-[]/name:flex', 'not-in-[.group\\/name]:flex'],
+])('%s => %s (%#)', async (candidate, result) => {
+  let designSystem = await __unstable__loadDesignSystem(
+    css`
+      @import 'tailwindcss';
+      @theme {
+        --*: initial;
+      }
+    `,
+    { base: __dirname },
+  )
+
+  expect(migrate(designSystem, {}, candidate)).toEqual(result)
+})
+
+test.each([
+  // Should not prefix classes in arbitrary values
+  ['[.foo_&]:tw-flex', 'tw:in-[.foo]:flex'],
+
+  // Should migrate `.group` classes
+  ['group-[]:tw-flex', 'tw:in-[.tw\\:group]:flex'],
+  ['group-[]/name:tw-flex', 'tw:in-[.tw\\:group\\/name]:flex'],
+
+  // Migrate `peer-[]` to a parsable `peer-[&]` instead:
+  ['peer-[]:tw-flex', 'tw:peer-[&]:flex'],
+  ['peer-[]/name:tw-flex', 'tw:peer-[&]/name:flex'],
+
+  // However, `.group` inside of an arbitrary variant should not be prefixed:
+  ['[.group_&]:tw-flex', 'tw:in-[.group]:flex'],
+
+  // These shouldn't happen in the real world (because compound variants are
+  // new). But this could happen once we allow codemods to run in v4+ projects.
+  ['has-group-[]:tw-flex', 'tw:has-in-[.tw\\:group]:flex'],
+  ['has-group-[]/name:tw-flex', 'tw:has-in-[.tw\\:group\\/name]:flex'],
+  ['not-group-[]:tw-flex', 'tw:not-in-[.tw\\:group]:flex'],
+  ['not-group-[]/name:tw-flex', 'tw:not-in-[.tw\\:group\\/name]:flex'],
+])('%s => %s (%#)', async (candidate, result) => {
+  let designSystem = await __unstable__loadDesignSystem(
+    css`
+      @import 'tailwindcss' prefix(tw);
+      @theme {
+        --*: initial;
+      }
+    `,
+    { base: __dirname },
+  )
+
+  expect(migrate(designSystem, { prefix: 'tw-' }, candidate)).toEqual(result)
+})
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-modernize-arbitrary-values.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-modernize-arbitrary-values.ts
new file mode 100644
index 000000000..91718b323
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-modernize-arbitrary-values.ts
@@ -0,0 +1,72 @@
+import { cloneCandidate, parseCandidate } from '../../../../tailwindcss/src/candidate'
+import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+import { replaceObject } from '../../../../tailwindcss/src/utils/replace-object'
+import { walkVariants } from '../../utils/walk-variants'
+
+export function migrateModernizeArbitraryValues(
+  designSystem: DesignSystem,
+  _userConfig: Config | null,
+  rawCandidate: string,
+): string {
+  for (let candidate of parseCandidate(rawCandidate, designSystem)) {
+    let clone = cloneCandidate(candidate)
+    let changed = false
+
+    for (let [variant] of walkVariants(clone)) {
+      // Forward modifier from the root to the compound variant
+      if (
+        variant.kind === 'compound' &&
+        (variant.root === 'has' || variant.root === 'not' || variant.root === 'in')
+      ) {
+        if (variant.modifier !== null) {
+          if ('modifier' in variant.variant) {
+            variant.variant.modifier = variant.modifier
+            variant.modifier = null
+          }
+        }
+      }
+
+      // Promote `group-[]:flex` to `in-[.group]:flex`
+      //                ^^ Yes, this is empty
+      // Promote `group-[]/name:flex` to `in-[.group\/name]:flex`
+      if (
+        variant.kind === 'compound' &&
+        variant.root === 'group' &&
+        variant.variant.kind === 'arbitrary' &&
+        variant.variant.selector === '&'
+      ) {
+        // `group-[]`
+        if (variant.modifier === null) {
+          changed = true
+          replaceObject(
+            variant,
+            designSystem.parseVariant(
+              designSystem.theme.prefix
+                ? `in-[.${designSystem.theme.prefix}\\:group]`
+                : 'in-[.group]',
+            ),
+          )
+        }
+
+        // `group-[]/name`
+        else if (variant.modifier.kind === 'named') {
+          changed = true
+          replaceObject(
+            variant,
+            designSystem.parseVariant(
+              designSystem.theme.prefix
+                ? `in-[.${designSystem.theme.prefix}\\:group\\/${variant.modifier.value}]`
+                : `in-[.group\\/${variant.modifier.value}]`,
+            ),
+          )
+        }
+        continue
+      }
+    }
+
+    return changed ? designSystem.printCandidate(clone) : rawCandidate
+  }
+
+  return rawCandidate
+}
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/prefix.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-prefix.test.ts
similarity index 75%
rename from packages/@tailwindcss-upgrade/src/template/codemods/prefix.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-prefix.test.ts
index a7ad6a03e..f47e181af 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/prefix.test.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-prefix.test.ts
@@ -1,6 +1,8 @@
 import { __unstable__loadDesignSystem } from '@tailwindcss/node'
-import { describe, expect, test } from 'vitest'
-import { prefix } from './prefix'
+import { describe, expect, test, vi } from 'vitest'
+import * as versions from '../../utils/version'
+import { migratePrefix } from './migrate-prefix'
+vi.spyOn(versions, 'isMajor').mockReturnValue(true)
 
 describe('for projects with configured prefix', () => {
   test.each([
@@ -31,7 +33,7 @@ describe('for projects with configured prefix', () => {
       base: __dirname,
     })
 
-    expect(prefix(designSystem, { prefix: 'tw-' }, candidate)).toEqual(result)
+    expect(migratePrefix(designSystem, { prefix: 'tw-' }, candidate)).toEqual(result)
   })
 })
 
@@ -40,7 +42,7 @@ test('can handle complex prefix separators', async () => {
     base: __dirname,
   })
 
-  expect(prefix(designSystem, { prefix: 'tw__' }, 'tw__flex')).toEqual('tw:flex')
+  expect(migratePrefix(designSystem, { prefix: 'tw__' }, 'tw__flex')).toEqual('tw:flex')
 })
 
 describe('for projects without configured prefix', () => {
@@ -49,6 +51,6 @@ describe('for projects without configured prefix', () => {
       base: __dirname,
     })
 
-    expect(prefix(designSystem, {}, 'tw-flex')).toEqual('tw-flex')
+    expect(migratePrefix(designSystem, {}, 'tw-flex')).toEqual('tw-flex')
   })
 })
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/prefix.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-prefix.ts
similarity index 79%
rename from packages/@tailwindcss-upgrade/src/template/codemods/prefix.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-prefix.ts
index 47a377239..776032850 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/prefix.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-prefix.ts
@@ -1,21 +1,34 @@
+import { decl } from '../../../../tailwindcss/src/ast'
 import { parseCandidate, type Candidate } from '../../../../tailwindcss/src/candidate'
 import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
 import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
 import { segment } from '../../../../tailwindcss/src/utils/segment'
-import { printCandidate } from '../candidates'
+import * as version from '../../utils/version'
 
 let seenDesignSystems = new WeakSet<DesignSystem>()
 
-export function prefix(
+export function migratePrefix(
   designSystem: DesignSystem,
-  userConfig: Config,
+  userConfig: Config | null,
   rawCandidate: string,
 ): string {
   if (!designSystem.theme.prefix) return rawCandidate
+  if (!userConfig) return rawCandidate
+  if (!version.isMajor(3)) return rawCandidate
 
   if (!seenDesignSystems.has(designSystem)) {
-    designSystem.utilities.functional('group', () => null)
-    designSystem.utilities.functional('peer', () => null)
+    designSystem.utilities.functional('group', (value) => [
+      // To ensure that `@apply group` works when computing a signature
+      decl('--phantom-class', 'group'),
+      // To ensure `group` and `group/foo` are considered different classes
+      decl('--phantom-modifier', value.modifier?.value),
+    ])
+    designSystem.utilities.functional('peer', (value) => [
+      // To ensure that `@apply peer` works when computing a signature
+      decl('--phantom-class', 'peer'),
+      // To ensure `peer` and `peer/foo` are considered different classes
+      decl('--phantom-modifier', value.modifier?.value),
+    ])
     seenDesignSystems.add(designSystem)
   }
 
@@ -45,7 +58,7 @@ export function prefix(
 
   if (!candidate) return rawCandidate
 
-  return printCandidate(designSystem, candidate)
+  return designSystem.printCandidate(candidate)
 }
 
 // Parses a raw candidate with v3 compatible prefix syntax. This won't match if
@@ -115,7 +128,7 @@ function extractV3Base(
 }
 
 const VALID_PREFIX = /([a-z]+)/
-export function migratePrefix(prefix: string): string {
+export function migratePrefixValue(prefix: string): string {
   let result = VALID_PREFIX.exec(prefix.toLocaleLowerCase())
   if (!result) {
     console.warn(
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/simple-legacy-classes.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-simple-legacy-classes.test.ts
similarity index 73%
rename from packages/@tailwindcss-upgrade/src/template/codemods/simple-legacy-classes.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-simple-legacy-classes.test.ts
index a9da9e54e..456671dd7 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/simple-legacy-classes.test.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-simple-legacy-classes.test.ts
@@ -1,6 +1,8 @@
 import { __unstable__loadDesignSystem } from '@tailwindcss/node'
-import { expect, test } from 'vitest'
-import { simpleLegacyClasses } from './simple-legacy-classes'
+import { expect, test, vi } from 'vitest'
+import * as versions from '../../utils/version'
+import { migrateSimpleLegacyClasses } from './migrate-simple-legacy-classes'
+vi.spyOn(versions, 'isMajor').mockReturnValue(true)
 
 test.each([
   ['overflow-ellipsis', 'text-ellipsis'],
@@ -24,5 +26,5 @@ test.each([
     base: __dirname,
   })
 
-  expect(simpleLegacyClasses(designSystem, {}, candidate)).toEqual(result)
+  expect(migrateSimpleLegacyClasses(designSystem, {}, candidate)).toEqual(result)
 })
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/simple-legacy-classes.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-simple-legacy-classes.ts
similarity index 56%
rename from packages/@tailwindcss-upgrade/src/template/codemods/simple-legacy-classes.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-simple-legacy-classes.ts
index 1251d0f2d..415ed524c 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/simple-legacy-classes.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-simple-legacy-classes.ts
@@ -1,10 +1,10 @@
 import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
 import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
-import { printCandidate } from '../candidates'
+import * as version from '../../utils/version'
 
 // Classes that used to exist in Tailwind CSS v3, but do not exist in Tailwind
 // CSS v4 anymore.
-const LEGACY_CLASS_MAP = {
+const LEGACY_CLASS_MAP: Record<string, string> = {
   'overflow-ellipsis': 'text-ellipsis',
 
   'flex-grow': 'grow',
@@ -15,16 +15,33 @@ const LEGACY_CLASS_MAP = {
   'decoration-clone': 'box-decoration-clone',
   'decoration-slice': 'box-decoration-slice',
 
-  'outline-none': 'outline-hidden',
+  // Since v4.1.0
+  'bg-left-top': 'bg-top-left',
+  'bg-left-bottom': 'bg-bottom-left',
+  'bg-right-top': 'bg-top-right',
+  'bg-right-bottom': 'bg-bottom-right',
+  'object-left-top': 'object-top-left',
+  'object-left-bottom': 'object-bottom-left',
+  'object-right-top': 'object-top-right',
+  'object-right-bottom': 'object-bottom-right',
 }
 
 let seenDesignSystems = new WeakSet<DesignSystem>()
 
-export function simpleLegacyClasses(
+export function migrateSimpleLegacyClasses(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
+  // `outline-none` in v3 has the same meaning as `outline-hidden` in v4. However,
+  // `outline-none` in v4 _also_ exists but has a different meaning.
+  //
+  // We can only migrate `outline-none` to `outline-hidden` if we are migrating a
+  // v3 project to v4.
+  if (version.isMajor(3)) {
+    LEGACY_CLASS_MAP['outline-none'] = 'outline-hidden'
+  }
+
   // Prepare design system with the unknown legacy classes
   if (!seenDesignSystems.has(designSystem)) {
     for (let old in LEGACY_CLASS_MAP) {
@@ -35,7 +52,7 @@ export function simpleLegacyClasses(
 
   for (let candidate of designSystem.parseCandidate(rawCandidate)) {
     if (candidate.kind === 'static' && Object.hasOwn(LEGACY_CLASS_MAP, candidate.root)) {
-      return printCandidate(designSystem, {
+      return designSystem.printCandidate({
         ...candidate,
         root: LEGACY_CLASS_MAP[candidate.root as keyof typeof LEGACY_CLASS_MAP],
       })
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/theme-to-var.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-theme-to-var.ts
similarity index 70%
rename from packages/@tailwindcss-upgrade/src/template/codemods/theme-to-var.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-theme-to-var.ts
index b83e5add1..e566e7d6e 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/theme-to-var.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-theme-to-var.ts
@@ -1,17 +1,11 @@
-import {
-  parseCandidate,
-  type Candidate,
-  type CandidateModifier,
-  type Variant,
-} from '../../../../tailwindcss/src/candidate'
+import { type CandidateModifier } from '../../../../tailwindcss/src/candidate'
 import { keyPathToCssProperty } from '../../../../tailwindcss/src/compat/apply-config-to-theme'
-import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
 import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
 import { isValidSpacingMultiplier } from '../../../../tailwindcss/src/utils/infer-data-type'
 import { segment } from '../../../../tailwindcss/src/utils/segment'
 import { toKeyPath } from '../../../../tailwindcss/src/utils/to-key-path'
 import * as ValueParser from '../../../../tailwindcss/src/value-parser'
-import { printCandidate } from '../candidates'
+import { walk, WalkAction } from '../../../../tailwindcss/src/walk'
 
 export const enum Convert {
   All = 0,
@@ -19,68 +13,6 @@ export const enum Convert {
   MigrateThemeOnly = 1 << 1,
 }
 
-export function themeToVar(
-  designSystem: DesignSystem,
-  _userConfig: Config,
-  rawCandidate: string,
-): string {
-  let convert = createConverter(designSystem)
-
-  for (let candidate of parseCandidate(rawCandidate, designSystem)) {
-    let clone = structuredClone(candidate)
-    let changed = false
-
-    if (clone.kind === 'arbitrary') {
-      let [newValue, modifier] = convert(
-        clone.value,
-        clone.modifier === null ? Convert.MigrateModifier : Convert.All,
-      )
-      if (newValue !== clone.value) {
-        changed = true
-        clone.value = newValue
-
-        if (modifier !== null) {
-          clone.modifier = modifier
-        }
-      }
-    } else if (clone.kind === 'functional' && clone.value?.kind === 'arbitrary') {
-      let [newValue, modifier] = convert(
-        clone.value.value,
-        clone.modifier === null ? Convert.MigrateModifier : Convert.All,
-      )
-      if (newValue !== clone.value.value) {
-        changed = true
-        clone.value.value = newValue
-
-        if (modifier !== null) {
-          clone.modifier = modifier
-        }
-      }
-    }
-
-    // Handle variants
-    for (let variant of variants(clone)) {
-      if (variant.kind === 'arbitrary') {
-        let [newValue] = convert(variant.selector, Convert.MigrateThemeOnly)
-        if (newValue !== variant.selector) {
-          changed = true
-          variant.selector = newValue
-        }
-      } else if (variant.kind === 'functional' && variant.value?.kind === 'arbitrary') {
-        let [newValue] = convert(variant.value.value, Convert.MigrateThemeOnly)
-        if (newValue !== variant.value.value) {
-          changed = true
-          variant.value.value = newValue
-        }
-      }
-    }
-
-    return changed ? printCandidate(designSystem, clone) : rawCandidate
-  }
-
-  return rawCandidate
-}
-
 export function createConverter(designSystem: DesignSystem, { prettyPrint = false } = {}) {
   function convert(input: string, options = Convert.All): [string, CandidateModifier | null] {
     let ast = ValueParser.parse(input)
@@ -96,7 +28,7 @@ export function createConverter(designSystem: DesignSystem, { prettyPrint = fals
     let themeModifierCount = 0
 
     // Analyze AST
-    ValueParser.walk(ast, (node) => {
+    walk(ast, (node) => {
       if (node.kind !== 'function') return
       if (node.value !== 'theme') return
 
@@ -104,19 +36,19 @@ export function createConverter(designSystem: DesignSystem, { prettyPrint = fals
       themeUsageCount += 1
 
       // Figure out if a modifier is used
-      ValueParser.walk(node.nodes, (child) => {
+      walk(node.nodes, (child) => {
         // If we see a `,`, it means that we have a fallback value
         if (child.kind === 'separator' && child.value.includes(',')) {
-          return ValueParser.ValueWalkAction.Stop
+          return WalkAction.Stop
         }
 
         // If we see a `/`, we have a modifier
-        else if (child.kind === 'separator' && child.value.trim() === '/') {
+        else if (child.kind === 'word' && child.value === '/') {
           themeModifierCount += 1
-          return ValueParser.ValueWalkAction.Stop
+          return WalkAction.Stop
         }
 
-        return ValueParser.ValueWalkAction.Skip
+        return WalkAction.Skip
       })
     })
 
@@ -148,9 +80,7 @@ export function createConverter(designSystem: DesignSystem, { prettyPrint = fals
       let parts = segment(path, '/').map((part) => part.trim())
 
       // Multiple `/` separators, which makes this an invalid path
-      if (parts.length > 2) {
-        return null
-      }
+      if (parts.length > 2) return null
 
       // The path contains a `/`, which means that there is a modifier such as
       // `theme(colors.red.500/50%)`.
@@ -200,6 +130,10 @@ export function createConverter(designSystem: DesignSystem, { prettyPrint = fals
     let variable = `--${keyPathToCssProperty(toKeyPath(path))}` as const
     if (!designSystem.theme.get([variable])) return null
 
+    if (designSystem.theme.prefix) {
+      return `--${designSystem.theme.prefix}-${variable.slice(2)}`
+    }
+
     return variable
   }
 
@@ -212,7 +146,7 @@ export function createConverter(designSystem: DesignSystem, { prettyPrint = fals
       let multiplier = keyPath[1]
       if (!isValidSpacingMultiplier(multiplier)) return null
 
-      return 'calc(var(--spacing) * ' + multiplier + ')'
+      return `--spacing(${multiplier})`
     }
 
     return null
@@ -227,7 +161,9 @@ export function createConverter(designSystem: DesignSystem, { prettyPrint = fals
 
     let modifier =
       parts.length > 0 ? (prettyPrint ? ` / ${parts.join(' / ')}` : `/${parts.join('/')}`) : ''
-    return fallback ? `theme(${variable}${modifier}, ${fallback})` : `theme(${variable}${modifier})`
+    return fallback
+      ? `--theme(${variable}${modifier}, ${fallback})`
+      : `--theme(${variable}${modifier})`
   }
 
   return convert
@@ -237,7 +173,7 @@ function substituteFunctionsInValue(
   ast: ValueParser.ValueAstNode[],
   handle: (value: string, fallback?: string) => string | null,
 ) {
-  ValueParser.walk(ast, (node, { replaceWith }) => {
+  walk(ast, (node, ctx) => {
     if (node.kind === 'function' && node.value === 'theme') {
       if (node.nodes.length < 1) return
 
@@ -275,7 +211,38 @@ function substituteFunctionsInValue(
         fallbackValues.length > 0 ? handle(path, ValueParser.toCss(fallbackValues)) : handle(path)
       if (replacement === null) return
 
-      replaceWith(ValueParser.parse(replacement))
+      {
+        let idx = ctx.index - 1
+        while (idx !== -1) {
+          let previous = ctx.siblings[idx]
+          // Skip the space separator
+          if (previous.kind === 'separator' && previous.value.trim() === '') {
+            idx -= 1
+            continue
+          }
+
+          // If the previous node is a word and contains an operator, we need to
+          // wrap the replacement in parentheses to make the output less
+          // ambiguous.
+          //
+          // Input:
+          // - `calc(100dvh-theme(spacing.2))`
+          //
+          // Output:
+          // - `calc(100dvh-(--spacing(2)))`
+          //
+          // Not:
+          // -`calc(100dvh---spacing(2))`
+          //
+          if (/^[-+*/]$/.test(previous.value.trim())) {
+            replacement = `(${replacement})`
+          }
+
+          break
+        }
+      }
+
+      return WalkAction.Replace(ValueParser.parse(replacement))
     }
   })
 
@@ -301,16 +268,3 @@ function eventuallyUnquote(value: string) {
 
   return unquoted
 }
-
-function* variants(candidate: Candidate) {
-  function* inner(variant: Variant): Iterable<Variant> {
-    yield variant
-    if (variant.kind === 'compound') {
-      yield* inner(variant.variant)
-    }
-  }
-
-  for (let variant of candidate.variants) {
-    yield* inner(variant)
-  }
-}
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/variant-order.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-variant-order.test.ts
similarity index 84%
rename from packages/@tailwindcss-upgrade/src/template/codemods/variant-order.test.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-variant-order.test.ts
index e42595645..1b14d533f 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/variant-order.test.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-variant-order.test.ts
@@ -1,7 +1,9 @@
 import { __unstable__loadDesignSystem } from '@tailwindcss/node'
 import dedent from 'dedent'
-import { expect, test } from 'vitest'
-import { variantOrder } from './variant-order'
+import { expect, test, vi } from 'vitest'
+import * as versions from '../../utils/version'
+import { migrateVariantOrder } from './migrate-variant-order'
+vi.spyOn(versions, 'isMajor').mockReturnValue(true)
 
 let css = dedent
 
@@ -53,26 +55,26 @@ test.each([
     base: __dirname,
   })
 
-  expect(variantOrder(designSystem, {}, candidate)).toEqual(result)
+  expect(migrateVariantOrder(designSystem, {}, candidate)).toEqual(result)
 })
 
 test('it works with custom variants', async () => {
   let designSystem = await __unstable__loadDesignSystem(
     css`
       @import 'tailwindcss';
-      @variant atrule {
+      @custom-variant atrule {
         @media (print) {
           @slot;
         }
       }
 
-      @variant combinator {
+      @custom-variant combinator {
         > * {
           @slot;
         }
       }
 
-      @variant pseudo {
+      @custom-variant pseudo {
         &::before {
           @slot;
         }
@@ -83,7 +85,7 @@ test('it works with custom variants', async () => {
     },
   )
 
-  expect(variantOrder(designSystem, {}, 'combinator:pseudo:atrule:underline')).toEqual(
+  expect(migrateVariantOrder(designSystem, {}, 'combinator:pseudo:atrule:underline')).toEqual(
     'atrule:combinator:pseudo:underline',
   )
 })
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/variant-order.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-variant-order.ts
similarity index 85%
rename from packages/@tailwindcss-upgrade/src/template/codemods/variant-order.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/migrate-variant-order.ts
index 07c7015ab..3fd84af7c 100644
--- a/packages/@tailwindcss-upgrade/src/template/codemods/variant-order.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-variant-order.ts
@@ -1,14 +1,24 @@
-import { walk, type AstNode } from '../../../../tailwindcss/src/ast'
+import { type AstNode } from '../../../../tailwindcss/src/ast'
 import { type Variant } from '../../../../tailwindcss/src/candidate'
 import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
 import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
-import { printCandidate } from '../candidates'
+import { walk } from '../../../../tailwindcss/src/walk'
+import * as version from '../../utils/version'
 
-export function variantOrder(
+export function migrateVariantOrder(
   designSystem: DesignSystem,
-  _userConfig: Config,
+  _userConfig: Config | null,
   rawCandidate: string,
 ): string {
+  // This migration is only needed for Tailwind CSS v3
+  //
+  // Changing the variant order when migrating from v3 to v4 is fine, but
+  // migrating v4 to v4 would make it unsafe because the variant order would
+  // flip-flop every time you run the migration.
+  if (!version.isMajor(3)) {
+    return rawCandidate
+  }
+
   for (let candidate of designSystem.parseCandidate(rawCandidate)) {
     if (candidate.variants.length <= 1) {
       continue
@@ -46,7 +56,7 @@ export function variantOrder(
       continue
     }
 
-    return printCandidate(designSystem, { ...candidate, variants: newOrder })
+    return designSystem.printCandidate({ ...candidate, variants: newOrder })
   }
   return rawCandidate
 }
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate.test.ts
new file mode 100644
index 000000000..24bb3d5ef
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate.test.ts
@@ -0,0 +1,129 @@
+import { __unstable__loadDesignSystem } from '@tailwindcss/node'
+import { describe, expect, test, vi } from 'vitest'
+import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map'
+import * as versions from '../../utils/version'
+import { migrateCandidate as migrate } from './migrate'
+vi.spyOn(versions, 'isMajor').mockReturnValue(false)
+
+const designSystems = new DefaultMap((base: string) => {
+  return new DefaultMap((input: string) => {
+    return __unstable__loadDesignSystem(input, { base })
+  })
+})
+
+const css = String.raw
+
+describe.each([['default'], ['with-variant'], ['important'], ['prefix']])('%s', (strategy) => {
+  let testName = '%s => %s (%#)'
+  if (strategy === 'with-variant') {
+    testName = testName.replaceAll('%s', 'focus:%s')
+  } else if (strategy === 'important') {
+    testName = testName.replaceAll('%s', '%s!')
+  } else if (strategy === 'prefix') {
+    testName = testName.replaceAll('%s', 'tw:%s')
+  }
+
+  // Basic input with minimal design system to keep the tests fast
+  let input = css`
+    @import 'tailwindcss' ${strategy === 'prefix' ? 'prefix(tw)' : ''};
+    @theme {
+      --*: initial;
+      --spacing: 0.25rem;
+      --color-red-500: red;
+
+      /* Equivalent of blue-500/50 */
+      --color-primary: color-mix(in oklab, oklch(62.3% 0.214 259.815) 50%, transparent);
+    }
+  `
+
+  test.each([
+    // Arbitrary property to named functional utility
+    ['[color:red]', 'text-red-500'],
+
+    // Promote data types to more specific utility if it exists
+    ['bg-(position:--my-value)', 'bg-position-(--my-value)'],
+
+    // Promote inferred data type to more specific utility if it exists
+    ['bg-[123px]', 'bg-position-[123px]'],
+
+    // Do not migrate bare values or arbitrary values to named values that are
+    // deprecated
+    ['order-[0]', 'order-0'],
+    ['order-0', 'order-0'],
+
+    // Migrate deprecated named values to bare values
+    ['order-none', 'order-0'],
+
+    // `-0` should not be migrated to `0`.
+    //
+    // This used to be a bug that translate `mt-[0px]` into `-mt-[0px]` because
+    // `-mt-[0px]` translates to `margin-top: calc(0px * -1);` and therefore we
+    // handle the `0px * -1` case which translates to `0px` not `-0px`.
+    //
+    // This translation is actually fine, because now, we will prefer the
+    // non-negative version first so we can replace `-mt-[0px]` with `mt-0`.
+    ['mt-[0px]', 'mt-0'],
+    ['-mt-[0px]', 'mt-0'],
+
+    // Shorthand CSS Variables should be converted to the new syntax, even if
+    // the fallback contains functions. The fallback should also be migrated to
+    // the newest syntax.
+    ['bg-[--my-color,theme(colors.red.500)]', 'bg-(--my-color,var(--color-red-500))'],
+
+    // Both the positive and negative versions of arbitrary utilities should be
+    // converted to the bare value version.
+    ['mb-[32rem]', 'mb-128'],
+    ['mb-[-32rem]', '-mb-128'],
+  ])(testName, async (candidate, result) => {
+    if (strategy === 'with-variant') {
+      candidate = `focus:${candidate}`
+      result = `focus:${result}`
+    } else if (strategy === 'important') {
+      candidate = `${candidate}!`
+      result = `${result}!`
+    } else if (strategy === 'prefix') {
+      // Not only do we need to prefix the candidate, we also have to make
+      // sure that we prefix all CSS variables.
+      candidate = `tw:${candidate.replaceAll('var(--', 'var(--tw-')}`
+      result = `tw:${result.replaceAll('var(--', 'var(--tw-')}`
+    }
+
+    let designSystem = await designSystems.get(__dirname).get(input)
+    let migrated = await migrate(designSystem, {}, candidate)
+    expect(migrated).toEqual(result)
+  })
+
+  test.each([
+    ['order-[0]', 'order-0'],
+    ['order-0', 'order-0'],
+
+    // Do not migrate `order-none` if defined as a custom utility as it is then
+    // not safe to migrate to `order-0`
+    ['order-none', 'order-none'],
+  ])(`${testName} with custom implementations`, async (candidate, result) => {
+    if (strategy === 'with-variant') {
+      candidate = `focus:${candidate}`
+      result = `focus:${result}`
+    } else if (strategy === 'important') {
+      candidate = `${candidate}!`
+      result = `${result}!`
+    } else if (strategy === 'prefix') {
+      // Not only do we need to prefix the candidate, we also have to make
+      // sure that we prefix all CSS variables.
+      candidate = `tw:${candidate.replaceAll('var(--', 'var(--tw-')}`
+      result = `tw:${result.replaceAll('var(--', 'var(--tw-')}`
+    }
+
+    let localInput = css`
+      ${input}
+
+      @utility order-none {
+        order: none; /* imagine this exists */
+      }
+    `
+
+    let designSystem = await designSystems.get(__dirname).get(localInput)
+    let migrated = await migrate(designSystem, {}, candidate)
+    expect(migrated).toEqual(result)
+  })
+})
diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate.ts
new file mode 100644
index 000000000..976c63a83
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate.ts
@@ -0,0 +1,137 @@
+import fs from 'node:fs/promises'
+import path, { extname } from 'node:path'
+import {
+  createSignatureOptions,
+  prepareDesignSystemStorage,
+  UTILITY_SIGNATURE_KEY,
+} from '../../../../tailwindcss/src/canonicalize-candidates'
+import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map'
+import { spliceChangesIntoString, type StringChange } from '../../utils/splice-changes-into-string'
+import { writeFileSafely } from '../../utils/write-file-safely'
+import { extractRawCandidates } from './candidates'
+import { isSafeMigration } from './is-safe-migration'
+import { migrateAutomaticVarInjection } from './migrate-automatic-var-injection'
+import { migrateCamelcaseInNamedValue } from './migrate-camelcase-in-named-value'
+import { migrateCanonicalizeCandidate } from './migrate-canonicalize-candidate'
+import { migrateEmptyArbitraryValues } from './migrate-handle-empty-arbitrary-values'
+import { migrateLegacyArbitraryValues } from './migrate-legacy-arbitrary-values'
+import { migrateLegacyClasses } from './migrate-legacy-classes'
+import { migrateMaxWidthScreen } from './migrate-max-width-screen'
+import { migrateModernizeArbitraryValues } from './migrate-modernize-arbitrary-values'
+import { migratePrefix } from './migrate-prefix'
+import { migrateSimpleLegacyClasses } from './migrate-simple-legacy-classes'
+import { migrateVariantOrder } from './migrate-variant-order'
+
+export type Migration = (
+  designSystem: DesignSystem,
+  userConfig: Config | null,
+  rawCandidate: string,
+) => string | Promise<string>
+
+export const DEFAULT_MIGRATIONS: Migration[] = [
+  migrateEmptyArbitraryValues,
+  migratePrefix,
+  migrateCanonicalizeCandidate,
+  migrateSimpleLegacyClasses,
+  migrateCamelcaseInNamedValue,
+  migrateLegacyClasses,
+  migrateMaxWidthScreen,
+  migrateVariantOrder, // Has to happen before migrations that modify variants
+  migrateAutomaticVarInjection,
+  migrateLegacyArbitraryValues,
+  migrateModernizeArbitraryValues,
+]
+
+let migrateCached = new DefaultMap((baseDesignSystem: DesignSystem) => {
+  let designSystem = prepareDesignSystemStorage(baseDesignSystem)
+  let options = createSignatureOptions(designSystem)
+
+  return new DefaultMap((userConfig: Config | null) => {
+    return new DefaultMap(async (rawCandidate) => {
+      let original = rawCandidate
+
+      for (let migration of DEFAULT_MIGRATIONS) {
+        rawCandidate = await migration(designSystem, userConfig, rawCandidate)
+      }
+
+      // Canonicalize the final migrated candidate to its final form
+      rawCandidate = designSystem.canonicalizeCandidates([rawCandidate]).pop()!
+
+      // Verify that the candidate actually makes sense at all. E.g.: `duration`
+      // is not a valid candidate, but it will parse because `duration-<number>`
+      // exists.
+      let signature = designSystem.storage[UTILITY_SIGNATURE_KEY].get(options).get(rawCandidate)
+      if (typeof signature !== 'string') return original
+
+      return rawCandidate
+    })
+  })
+})
+
+export async function migrateCandidate(
+  designSystem: DesignSystem,
+  userConfig: Config | null,
+  rawCandidate: string,
+  // Location is only set when migrating a candidate from a source file
+  location?: {
+    contents: string
+    start: number
+    end: number
+  },
+): Promise<string> {
+  // Skip this migration if we think that the migration is unsafe
+  if (location && !isSafeMigration(rawCandidate, location, designSystem)) {
+    return rawCandidate
+  }
+
+  return migrateCached.get(designSystem).get(userConfig).get(rawCandidate)
+}
+
+export default async function migrateContents(
+  designSystem: DesignSystem,
+  userConfig: Config | null,
+  contents: string,
+  extension: string,
+): Promise<string> {
+  let candidates = await extractRawCandidates(contents, extension)
+
+  let changes: StringChange[] = []
+
+  for (let { rawCandidate, start, end } of candidates) {
+    let migratedCandidate = await migrateCandidate(designSystem, userConfig, rawCandidate, {
+      contents,
+      start,
+      end,
+    })
+
+    if (migratedCandidate === rawCandidate) {
+      continue
+    }
+
+    changes.push({
+      start,
+      end,
+      replacement: migratedCandidate,
+    })
+  }
+
+  return spliceChangesIntoString(contents, changes)
+}
+
+export async function migrate(
+  designSystem: DesignSystem,
+  userConfig: Config | null,
+  file: string,
+): Promise<boolean> {
+  let fullPath = path.isAbsolute(file) ? file : path.resolve(process.cwd(), file)
+  let contents = await fs.readFile(fullPath, 'utf-8')
+
+  let migrated = await migrateContents(designSystem, userConfig, contents, extname(file))
+  if (migrated === contents) return false // Nothing changed
+  if (migrated.trim() === '') return false // Emptied out, something went horribly wrong
+
+  await writeFileSafely(fullPath, migrated)
+  return true
+}
diff --git a/packages/@tailwindcss-upgrade/src/template/prepare-config.ts b/packages/@tailwindcss-upgrade/src/codemods/template/prepare-config.ts
similarity index 83%
rename from packages/@tailwindcss-upgrade/src/template/prepare-config.ts
rename to packages/@tailwindcss-upgrade/src/codemods/template/prepare-config.ts
index f5a817d40..d9fae442b 100644
--- a/packages/@tailwindcss-upgrade/src/template/prepare-config.ts
+++ b/packages/@tailwindcss-upgrade/src/codemods/template/prepare-config.ts
@@ -2,12 +2,12 @@ import { __unstable__loadDesignSystem, compile } from '@tailwindcss/node'
 import fs from 'node:fs/promises'
 import path, { dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { loadModule } from '../../../@tailwindcss-node/src/compile'
-import { resolveConfig } from '../../../tailwindcss/src/compat/config/resolve-config'
-import type { Config } from '../../../tailwindcss/src/compat/plugin-api'
-import type { DesignSystem } from '../../../tailwindcss/src/design-system'
-import { error, highlight, relative } from '../utils/renderer'
-import { migratePrefix } from './codemods/prefix'
+import { loadModule } from '../../../../@tailwindcss-node/src/compile'
+import { resolveConfig } from '../../../../tailwindcss/src/compat/config/resolve-config'
+import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
+import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
+import { error, highlight, relative } from '../../utils/renderer'
+import { migratePrefixValue } from './migrate-prefix'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = dirname(__filename)
@@ -19,7 +19,7 @@ export async function prepareConfig(
   options: { base: string },
 ): Promise<{
   designSystem: DesignSystem
-  globs: { base: string; pattern: string }[]
+  sources: { base: string; pattern: string }[]
   userConfig: Config
   configFilePath: string
 
@@ -40,16 +40,16 @@ export async function prepareConfig(
     // If the path points to a file in the same directory, `path.relative` will
     // remove the leading `./` and we need to add it back in order to still
     // consider the path relative
-    if (!relative.startsWith('.')) {
+    if (!relative.startsWith('.') && !path.isAbsolute(relative)) {
       relative = './' + relative
     }
 
     let userConfig = await createResolvedUserConfig(configFilePath)
 
-    let newPrefix = userConfig.prefix ? migratePrefix(userConfig.prefix) : null
+    let newPrefix = userConfig.prefix ? migratePrefixValue(userConfig.prefix) : null
     let input = css`
       @import 'tailwindcss' ${newPrefix ? `prefix(${newPrefix})` : ''};
-      @config './${relative}';
+      @config '${relative}';
     `
 
     let [compiler, designSystem] = await Promise.all([
@@ -59,7 +59,7 @@ export async function prepareConfig(
 
     return {
       designSystem,
-      globs: compiler.globs,
+      sources: compiler.sources,
       userConfig,
       newPrefix,
       configFilePath,
@@ -82,7 +82,7 @@ async function createResolvedUserConfig(fullConfigPath: string): Promise<Config>
   ])
 
   return resolveConfig(noopDesignSystem, [
-    { base: dirname(fullConfigPath), config: unresolvedUserConfig },
+    { base: dirname(fullConfigPath), config: unresolvedUserConfig, reference: false },
   ]).resolvedConfig as any
 }
 
diff --git a/packages/@tailwindcss-upgrade/src/index.test.ts b/packages/@tailwindcss-upgrade/src/index.test.ts
index 65d74937b..2eae32f30 100644
--- a/packages/@tailwindcss-upgrade/src/index.test.ts
+++ b/packages/@tailwindcss-upgrade/src/index.test.ts
@@ -2,10 +2,12 @@ import { __unstable__loadDesignSystem } from '@tailwindcss/node'
 import dedent from 'dedent'
 import path from 'node:path'
 import postcss from 'postcss'
-import { expect, it } from 'vitest'
-import { formatNodes } from './codemods/format-nodes'
-import { sortBuckets } from './codemods/sort-buckets'
-import { migrateContents } from './migrate'
+import { expect, it, vi } from 'vitest'
+import { formatNodes } from './codemods/css/format-nodes'
+import { migrateContents } from './codemods/css/migrate'
+import { sortBuckets } from './codemods/css/sort-buckets'
+import * as versions from './utils/version'
+vi.spyOn(versions, 'isMajor').mockReturnValue(true)
 
 const css = dedent
 
@@ -97,7 +99,7 @@ it('should migrate a stylesheet', async () => {
     "@import 'tailwindcss';
 
     /*
-      The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+      The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
       so we've added these compatibility styles to make sure everything still
       looks the same as it did with Tailwind CSS v3.
 
@@ -110,7 +112,7 @@ it('should migrate a stylesheet', async () => {
       ::before,
       ::backdrop,
       ::file-selector-button {
-        border-color: var(--color-gray-200, currentColor);
+        border-color: var(--color-gray-200, currentcolor);
       }
     }
 
@@ -168,7 +170,7 @@ it('should migrate a stylesheet (with imports)', async () => {
     @import './my-utilities.css' layer(utilities);
 
     /*
-      The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+      The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
       so we've added these compatibility styles to make sure everything still
       looks the same as it did with Tailwind CSS v3.
 
@@ -181,7 +183,7 @@ it('should migrate a stylesheet (with imports)', async () => {
       ::before,
       ::backdrop,
       ::file-selector-button {
-        border-color: var(--color-gray-200, currentColor);
+        border-color: var(--color-gray-200, currentcolor);
       }
     }"
   `)
@@ -210,7 +212,7 @@ it('should migrate a stylesheet (with preceding rules that should be wrapped in
     @import 'tailwindcss';
 
     /*
-      The default border color has changed to \`currentColor\` in Tailwind CSS v4,
+      The default border color has changed to \`currentcolor\` in Tailwind CSS v4,
       so we've added these compatibility styles to make sure everything still
       looks the same as it did with Tailwind CSS v3.
 
@@ -223,7 +225,7 @@ it('should migrate a stylesheet (with preceding rules that should be wrapped in
       ::before,
       ::backdrop,
       ::file-selector-button {
-        border-color: var(--color-gray-200, currentColor);
+        border-color: var(--color-gray-200, currentcolor);
       }
     }
 
diff --git a/packages/@tailwindcss-upgrade/src/index.ts b/packages/@tailwindcss-upgrade/src/index.ts
index 945b48ab4..d304bbe1f 100644
--- a/packages/@tailwindcss-upgrade/src/index.ts
+++ b/packages/@tailwindcss-upgrade/src/index.ts
@@ -1,30 +1,29 @@
 #!/usr/bin/env node
 
-import { globby } from 'globby'
+import { Scanner } from '@tailwindcss/oxide'
+import { globby, isGitIgnored } from 'globby'
 import fs from 'node:fs/promises'
 import path from 'node:path'
+import pc from 'picocolors'
 import postcss from 'postcss'
-import { formatNodes } from './codemods/format-nodes'
-import { sortBuckets } from './codemods/sort-buckets'
+import { migrateJsConfig } from './codemods/config/migrate-js-config'
+import { migratePostCSSConfig } from './codemods/config/migrate-postcss'
+import { analyze as analyzeStylesheets } from './codemods/css/analyze'
+import { formatNodes } from './codemods/css/format-nodes'
+import { linkConfigs as linkConfigsToStylesheets } from './codemods/css/link'
+import { migrate as migrateStylesheet } from './codemods/css/migrate'
+import { sortBuckets } from './codemods/css/sort-buckets'
+import { split as splitStylesheets } from './codemods/css/split'
+import { migrate as migrateTemplate } from './codemods/template/migrate'
+import { prepareConfig } from './codemods/template/prepare-config'
 import { help } from './commands/help'
-import {
-  analyze as analyzeStylesheets,
-  linkConfigs as linkConfigsToStylesheets,
-  migrate as migrateStylesheet,
-  split as splitStylesheets,
-} from './migrate'
-import { migrateJsConfig } from './migrate-js-config'
-import { migratePostCSSConfig } from './migrate-postcss'
-import { migratePrettierPlugin } from './migrate-prettier'
 import { Stylesheet } from './stylesheet'
-import { migrate as migrateTemplate } from './template/migrate'
-import { prepareConfig } from './template/prepare-config'
 import { args, type Arg } from './utils/args'
-import { isRepoDirty } from './utils/git'
-import { hoistStaticGlobParts } from './utils/hoist-static-glob-parts'
-import { getPackageVersion } from './utils/package-version'
+import { gitRoot, isRepoDirty } from './utils/git'
 import { pkg } from './utils/packages'
 import { eprintln, error, header, highlight, info, relative, success } from './utils/renderer'
+import * as version from './utils/version'
+import { writeFileSafely } from './utils/write-file-safely'
 
 const options = {
   '--config': { type: 'string', description: 'Path to the configuration file', alias: '-c' },
@@ -44,6 +43,9 @@ if (flags['--help']) {
 
 async function run() {
   let base = process.cwd()
+  // Use the project's git root, instead of the `base` to ensure all
+  // `.gitignore` rules are being used.
+  let isIgnored = await isGitIgnored({ cwd: gitRoot(base) ?? base })
 
   eprintln(header())
   eprintln()
@@ -61,11 +63,27 @@ async function run() {
     }
   }
 
-  // Require an installed `tailwindcss` version < 4
-  let tailwindVersion = await getPackageVersion('tailwindcss', base)
-  if (tailwindVersion && Number(tailwindVersion.split('.')[0]) !== 3) {
+  info(`Upgrading from Tailwind CSS ${highlight(`v${version.installedTailwindVersion(base)}`)}`, {
+    prefix: '↳ ',
+  })
+
+  if (version.installedTailwindVersion(base) !== version.expectedTailwindVersion(base)) {
+    let pkgManager = await pkg(base).manager()
+
     error(
-      `Tailwind CSS v${tailwindVersion} found. The migration tool can only be run on v3 projects.`,
+      [
+        'Version mismatch',
+        '',
+        pc.dim('```diff'),
+        `${pc.red('-')} ${`${pc.dim('"tailwindcss":')} ${`${pc.dim('"')}${pc.blue(version.expectedTailwindVersion(base))}${pc.dim('"')}`}`} (expected version in ${highlight('package.json')})`,
+        `${pc.green('+')} ${`${pc.dim('"tailwindcss":')} ${`${pc.dim('"')}${pc.blue(version.installedTailwindVersion(base))}${pc.dim('"')}`}`} (installed version in ${highlight('node_modules')})`,
+        pc.dim('```'),
+        '',
+        `Make sure to run ${highlight(`${pkgManager} install`)} and try again.`,
+      ].join('\n'),
+      {
+        prefix: '↳ ',
+      },
     )
     process.exit(1)
   }
@@ -81,8 +99,11 @@ async function run() {
       info('Searching for CSS files in the current directory and its subdirectories…')
 
       files = await globby(['**/*.css'], {
+        cwd: base,
         absolute: true,
         gitignore: true,
+        // gitignore: true will first search for all .gitignore including node_modules folders, this makes the initial search much faster
+        ignore: ['**/node_modules/**'],
       })
     }
 
@@ -102,26 +123,30 @@ async function run() {
     let stylesheets = loadResults
       .filter((result) => result.status === 'fulfilled')
       .map((result) => result.value)
+    let originals = new Map(stylesheets.map((sheet) => [sheet, sheet.root.toString()]))
 
     // Analyze the stylesheets
     try {
-      await analyzeStylesheets(stylesheets)
+      await analyzeStylesheets(stylesheets, { base })
     } catch (e: any) {
       error(`${e?.message ?? e}`, { prefix: '↳ ' })
     }
 
-    // Ensure stylesheets are linked to configs
-    try {
-      await linkConfigsToStylesheets(stylesheets, {
-        configPath: flags['--config'],
-        base,
-      })
-    } catch (e: any) {
-      error(`${e?.message ?? e}`, { prefix: '↳ ' })
+    // Ensure stylesheets are linked to configs. But this is only necessary when
+    // migrating from v3 to v4.
+    if (version.isMajor(3)) {
+      try {
+        await linkConfigsToStylesheets(stylesheets, {
+          configPath: flags['--config'],
+          base,
+        })
+      } catch (e: any) {
+        error(`${e?.message ?? e}`, { prefix: '↳ ' })
+      }
     }
 
     // Migrate js config files, linked to stylesheets
-    if (stylesheets.some((sheet) => sheet.isTailwindRoot)) {
+    if (stylesheets.some((sheet) => sheet.isTailwindRoot && sheet.linkedConfigPath)) {
       info('Migrating JavaScript configuration files…')
     }
     let configBySheet = new Map<Stylesheet, Awaited<ReturnType<typeof prepareConfig>>>()
@@ -131,6 +156,7 @@ async function run() {
     >()
     for (let sheet of stylesheets) {
       if (!sheet.isTailwindRoot) continue
+      if (!version.isMajor(3) && !sheet.linkedConfigPath) continue
 
       let config = await prepareConfig(sheet.linkedConfigPath, { base })
       configBySheet.set(sheet, config)
@@ -155,41 +181,6 @@ async function run() {
       }
     }
 
-    // Migrate source files, linked to config files
-    if (configBySheet.size > 0) {
-      info('Migrating templates…')
-    }
-    {
-      // Template migrations
-      for (let config of configBySheet.values()) {
-        let set = new Set<string>()
-        for (let globEntry of config.globs.flatMap((entry) => hoistStaticGlobParts(entry))) {
-          let files = await globby([globEntry.pattern], {
-            absolute: true,
-            gitignore: true,
-            cwd: globEntry.base,
-          })
-
-          for (let file of files) {
-            set.add(file)
-          }
-        }
-
-        let files = Array.from(set)
-        files.sort()
-
-        // Migrate each file
-        await Promise.allSettled(
-          files.map((file) => migrateTemplate(config.designSystem, config.userConfig, file)),
-        )
-
-        success(
-          `Migrated templates for configuration file: ${highlight(relative(config.configFilePath, base))}`,
-          { prefix: '↳ ' },
-        )
-      }
-    }
-
     // Migrate each CSS file
     if (stylesheets.length > 0) {
       info('Migrating stylesheets…')
@@ -197,20 +188,33 @@ async function run() {
     await Promise.all(
       stylesheets.map(async (sheet) => {
         try {
-          let config = configBySheet.get(sheet)!
-          let jsConfigMigration = jsConfigMigrationBySheet.get(sheet)!
+          let config = configBySheet.get(sheet)
+          let jsConfigMigration = jsConfigMigrationBySheet.get(sheet) ?? null
 
           if (!config) {
             for (let parent of sheet.ancestors()) {
               if (parent.isTailwindRoot) {
                 config ??= configBySheet.get(parent)!
-                jsConfigMigration ??= jsConfigMigrationBySheet.get(parent)!
+                jsConfigMigration ??= jsConfigMigrationBySheet.get(parent) ?? null
                 break
               }
             }
           }
 
-          await migrateStylesheet(sheet, { ...config, jsConfigMigration })
+          // Prime the compiler/designSystem cache against the pre-migration AST
+          // so the later template-migration phase sees the same v4 state. After
+          // this point, `sheet.root` may be mutated by `migrateStylesheet`.
+          if (!version.isMajor(3) && sheet.isTailwindRoot) {
+            await Promise.all([sheet.compiler(), sheet.designSystem()])
+          }
+
+          await migrateStylesheet(sheet, {
+            newPrefix: config?.newPrefix ?? null,
+            designSystem: config?.designSystem ?? (await sheet.designSystem()),
+            userConfig: config?.userConfig ?? null,
+            configFilePath: config?.configFilePath ?? null,
+            jsConfigMigration,
+          })
         } catch (e: any) {
           error(`${e?.message ?? e} in ${highlight(relative(sheet.file!, base))}`, { prefix: '↳ ' })
         }
@@ -218,36 +222,39 @@ async function run() {
     )
 
     // Split up stylesheets (as needed)
-    try {
-      await splitStylesheets(stylesheets)
-    } catch (e: any) {
-      error(`${e?.message ?? e}`, { prefix: '↳ ' })
-    }
+    if (version.isMajor(3)) {
+      try {
+        await splitStylesheets(stylesheets)
+      } catch (e: any) {
+        error(`${e?.message ?? e}`, { prefix: '↳ ' })
+      }
 
-    // Cleanup `@import "…" layer(utilities)`
-    for (let sheet of stylesheets) {
-      for (let importRule of sheet.importRules) {
-        if (!importRule.raws.tailwind_injected_layer) continue
-        let importedSheet = stylesheets.find(
-          (sheet) => sheet.id === importRule.raws.tailwind_destination_sheet_id,
-        )
-        if (!importedSheet) continue
+      // Cleanup `@import "…" layer(utilities)`
+      for (let sheet of stylesheets) {
+        for (let importRule of sheet.importRules) {
+          if (!importRule.raws.tailwind_injected_layer) continue
+          let importedSheet = stylesheets.find(
+            (sheet) => sheet.id === importRule.raws.tailwind_destination_sheet_id,
+          )
+          if (!importedSheet) continue
 
-        // Only remove the `layer(…)` next to the import if any of the children
-        // contain `@utility`. Otherwise `@utility` will not be top-level.
-        if (
-          !importedSheet.containsRule((node) => node.type === 'atrule' && node.name === 'utility')
-        ) {
-          continue
+          // Only remove the `layer(…)` next to the import if any of the children
+          // contain `@utility`. Otherwise `@utility` will not be top-level.
+          if (
+            !importedSheet.containsRule((node) => node.type === 'atrule' && node.name === 'utility')
+          ) {
+            continue
+          }
+
+          // Make sure to remove the `layer(…)` from the `@import` at-rule
+          importRule.params = importRule.params.replace(/ layer\([^)]+\)/, '').trim()
         }
-
-        // Make sure to remove the `layer(…)` from the `@import` at-rule
-        importRule.params = importRule.params.replace(/ layer\([^)]+\)/, '').trim()
       }
     }
 
     // Format nodes
     for (let sheet of stylesheets) {
+      if (originals.get(sheet) === sheet.root.toString()) continue
       await postcss([sortBuckets(), formatNodes()]).process(sheet.root!, { from: sheet.file! })
     }
 
@@ -255,31 +262,186 @@ async function run() {
     for (let sheet of stylesheets) {
       if (!sheet.file) continue
 
-      await fs.writeFile(sheet.file, sheet.root.toString())
+      await writeFileSafely(sheet.file, sheet.root.toString())
 
       if (sheet.isTailwindRoot) {
         success(`Migrated stylesheet: ${highlight(relative(sheet.file, base))}`, { prefix: '↳ ' })
       }
     }
+
+    info('Updating dependencies…')
+    {
+      let pkgManager = pkg(base)
+      let dependencies = [
+        'tailwindcss',
+        '@tailwindcss/cli',
+        '@tailwindcss/postcss',
+        '@tailwindcss/vite',
+        '@tailwindcss/node',
+        '@tailwindcss/oxide',
+        'prettier-plugin-tailwindcss',
+      ].filter((dependency) => dependency === 'tailwindcss' || pkgManager.has(dependency))
+      try {
+        await pkgManager.add(dependencies.map((dependency) => `${dependency}@latest`))
+        for (let dependency of dependencies) {
+          success(`Updated package: ${highlight(dependency)}`, { prefix: '↳ ' })
+        }
+      } catch {}
+    }
+
+    let tailwindRootStylesheets = stylesheets.filter((sheet) => sheet.isTailwindRoot && sheet.file)
+
+    // Migrate source files
+    if (tailwindRootStylesheets.length > 0) {
+      info('Migrating templates…')
+    }
+    {
+      let seenFiles = new Set()
+
+      // Template migrations
+      for (let sheet of tailwindRootStylesheets) {
+        let compiler = await sheet.compiler()
+        if (!compiler) continue
+        let designSystem = await sheet.designSystem()
+        if (!designSystem) continue
+
+        let config = configBySheet.get(sheet)
+
+        // Figure out the source files to migrate
+        let sources = (() => {
+          // Disable auto source detection
+          if (compiler.root === 'none') {
+            return []
+          }
+
+          // No root specified
+          if (compiler.root === null) {
+            // When coming from Tailwind CSS v3, we have to use the
+            // `config.sources` (which came from `config.content` originally)
+            if (version.isMajor(3)) {
+              if (config?.sources) {
+                return config.sources.map((source) => ({ ...source, negated: false }))
+              }
+
+              // When we don't have any sources, then we have to fallback to no
+              // sources at all. We cannot fallback to the `**/*` pattern.
+              return []
+            }
+
+            // When we are upgrading a Tailwind CSS v4 and up version, we use
+            // the default `**/*` pattern. All custom `@source` directives will
+            // be attached later as sources.
+            return [{ base, pattern: '**/*', negated: false }]
+          }
+
+          // Use the specified root
+          return [{ ...compiler.root, negated: false }]
+        })().concat(compiler.sources)
+        let scanner = new Scanner({ sources })
+        let filesToMigrate = []
+
+        let ignoredPaths = new Set<string>()
+
+        for (let file of scanner.files) {
+          file = await fs.realpath(file).catch(() => file) // Ensure we are dealing with the real path, not symlinks
+          if (file.endsWith('.css')) continue
+
+          // When a file is git ignored, then we don't want to migrate it even
+          // if it was listed in the `config.content` array or part of any
+          // `@source` directives.
+          //
+          // We can make this an option later to explicitly allow this, but
+          // this should be the default. This guarantees that:
+          //
+          // 1. Files coming from node_modules aren't touched
+          // 2. Generated files aren't changed (the source should update, not the target)
+          // 3. You can see all the changes that happened
+          try {
+            if (isIgnored(file)) {
+              let culprit = file
+
+              // To prevent print all ignored files, we can also walk up the
+              // parent tree and log those instead _if_ they are:
+              //
+              // 1. Also git ignored
+              // 2. Are not going outside of the current repo
+              let parent = path.dirname(file)
+              do {
+                try {
+                  if (isIgnored(parent)) {
+                    culprit = parent
+                  }
+                } catch {
+                  // Escaping the current repo
+                  break
+                }
+
+                let nextParent = path.dirname(parent)
+                if (nextParent === parent) break
+                parent = nextParent
+              } while (parent)
+
+              if (ignoredPaths.has(culprit)) continue // Already logged, skip
+              ignoredPaths.add(culprit)
+
+              if (culprit === file) {
+                info(`Git ignored, skipping: ${highlight(relative(culprit, base))}`, {
+                  prefix: '↳ ',
+                })
+              } else {
+                info(`Git ignored folder, skipping: ${highlight(relative(culprit, base))}`, {
+                  prefix: '↳ ',
+                })
+              }
+
+              continue
+            }
+          } catch (err) {
+            info(`Outside repository, skipping: ${highlight(relative(file, base))}`, {
+              prefix: '↳ ',
+            })
+            // Skip this file when we run into errors. E.g.: when the current
+            // file is not part of the current git repo it will throw an error.
+            continue
+          }
+
+          if (seenFiles.has(file)) continue
+          seenFiles.add(file)
+          filesToMigrate.push(file)
+        }
+
+        // Migrate each file
+        let changes = 0
+        await Promise.allSettled(
+          filesToMigrate.map(async (file) => {
+            let changed = await migrateTemplate(designSystem, config?.userConfig ?? null, file)
+            if (changed) {
+              changes++
+              info(`Migrated ${highlight(relative(file, base))}`, { prefix: '↳ ' })
+            }
+          }),
+        )
+
+        if (config?.configFilePath) {
+          success(
+            `Migrated templates for configuration file: ${highlight(relative(config.configFilePath, base))} (${changes} file${changes === 1 ? '' : 's'} changed)`,
+            { prefix: '↳ ' },
+          )
+        } else {
+          success(
+            `Migrated templates for: ${highlight(relative(sheet.file ?? '<unknown>', base))} (${changes} file${changes === 1 ? '' : 's'} changed)`,
+            { prefix: '↳ ' },
+          )
+        }
+      }
+    }
   }
 
-  {
+  if (version.isMajor(3)) {
     // PostCSS config migration
     await migratePostCSSConfig(base)
   }
 
-  info('Updating dependencies…')
-  {
-    // Migrate the prettier plugin to the latest version
-    await migratePrettierPlugin(base)
-  }
-
-  try {
-    // Upgrade Tailwind CSS
-    await pkg(base).add(['tailwindcss@next'])
-    success(`Updated package: ${highlight('tailwindcss')}`, { prefix: '↳ ' })
-  } catch {}
-
   // Run all cleanup functions because we completed the migration
   await Promise.allSettled(cleanup.map((fn) => fn()))
 
diff --git a/packages/@tailwindcss-upgrade/src/migrate-prettier.ts b/packages/@tailwindcss-upgrade/src/migrate-prettier.ts
deleted file mode 100644
index cd56cc688..000000000
--- a/packages/@tailwindcss-upgrade/src/migrate-prettier.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import fs from 'node:fs/promises'
-import path from 'node:path'
-import { pkg } from './utils/packages'
-import { highlight, success } from './utils/renderer'
-
-export async function migratePrettierPlugin(base: string) {
-  let packageJsonPath = path.resolve(base, 'package.json')
-  try {
-    let packageJson = await fs.readFile(packageJsonPath, 'utf-8')
-    if (packageJson.includes('prettier-plugin-tailwindcss')) {
-      await pkg(base).add(['prettier-plugin-tailwindcss@latest'])
-      success(`Updated package: ${highlight('prettier-plugin-tailwindcss')}`, { prefix: '↳ ' })
-    }
-  } catch {}
-}
diff --git a/packages/@tailwindcss-upgrade/src/migrate.ts b/packages/@tailwindcss-upgrade/src/migrate.ts
deleted file mode 100644
index 53b228256..000000000
--- a/packages/@tailwindcss-upgrade/src/migrate.ts
+++ /dev/null
@@ -1,719 +0,0 @@
-import { normalizePath } from '@tailwindcss/node'
-import { isGitIgnored } from 'globby'
-import path from 'node:path'
-import postcss, { type Result } from 'postcss'
-import type { Config } from '../../tailwindcss/src/compat/plugin-api'
-import type { DesignSystem } from '../../tailwindcss/src/design-system'
-import { DefaultMap } from '../../tailwindcss/src/utils/default-map'
-import { segment } from '../../tailwindcss/src/utils/segment'
-import { migrateAtApply } from './codemods/migrate-at-apply'
-import { migrateAtLayerUtilities } from './codemods/migrate-at-layer-utilities'
-import { migrateConfig } from './codemods/migrate-config'
-import { migrateImport } from './codemods/migrate-import'
-import { migrateMediaScreen } from './codemods/migrate-media-screen'
-import { migrateMissingLayers } from './codemods/migrate-missing-layers'
-import { migratePreflight } from './codemods/migrate-preflight'
-import { migrateTailwindDirectives } from './codemods/migrate-tailwind-directives'
-import { migrateThemeToVar } from './codemods/migrate-theme-to-var'
-import { migrateVariantsDirective } from './codemods/migrate-variants-directive'
-import type { JSConfigMigration } from './migrate-js-config'
-import { Stylesheet, type StylesheetConnection, type StylesheetId } from './stylesheet'
-import { detectConfigPath } from './template/prepare-config'
-import { error, highlight, relative, success } from './utils/renderer'
-import { resolveCssId } from './utils/resolve'
-import { walk, WalkAction } from './utils/walk'
-
-export interface MigrateOptions {
-  newPrefix: string | null
-  designSystem: DesignSystem
-  userConfig: Config
-  configFilePath: string
-  jsConfigMigration: JSConfigMigration
-}
-
-export async function migrateContents(
-  stylesheet: Stylesheet | string,
-  options: MigrateOptions,
-  file?: string,
-) {
-  if (typeof stylesheet === 'string') {
-    stylesheet = await Stylesheet.fromString(stylesheet)
-    stylesheet.file = file ?? null
-  }
-
-  return postcss()
-    .use(migrateImport())
-    .use(migrateAtApply(options))
-    .use(migrateMediaScreen(options))
-    .use(migrateVariantsDirective())
-    .use(migrateAtLayerUtilities(stylesheet))
-    .use(migrateMissingLayers())
-    .use(migrateTailwindDirectives(options))
-    .use(migrateConfig(stylesheet, options))
-    .use(migratePreflight(options))
-    .use(migrateThemeToVar(options))
-    .process(stylesheet.root, { from: stylesheet.file ?? undefined })
-}
-
-export async function migrate(stylesheet: Stylesheet, options: MigrateOptions) {
-  if (!stylesheet.file) {
-    throw new Error('Cannot migrate a stylesheet without a file path')
-  }
-
-  if (!stylesheet.canMigrate) return
-
-  await migrateContents(stylesheet, options)
-}
-
-export async function analyze(stylesheets: Stylesheet[]) {
-  let isIgnored = await isGitIgnored()
-  let processingQueue: (() => Promise<Result>)[] = []
-  let stylesheetsByFile = new DefaultMap<string, Stylesheet | null>((file) => {
-    // We don't want to process ignored files (like node_modules)
-    if (isIgnored(file)) {
-      return null
-    }
-
-    try {
-      let sheet = Stylesheet.loadSync(file)
-
-      // Mutate incoming stylesheets to include the newly discovered sheet
-      stylesheets.push(sheet)
-
-      // Queue up the processing of this stylesheet
-      processingQueue.push(() => processor.process(sheet.root, { from: sheet.file! }))
-
-      return sheet
-    } catch {
-      return null
-    }
-  })
-
-  // Step 1: Record which `@import` rules point to which stylesheets
-  // and which stylesheets are parents/children of each other
-  let processor = postcss([
-    {
-      postcssPlugin: 'mark-import-nodes',
-      AtRule: {
-        import(node) {
-          // Find what the import points to
-          let id = node.params.match(/['"](.*)['"]/)?.[1]
-          if (!id) return
-
-          let basePath = node.source?.input.file
-            ? path.dirname(node.source.input.file)
-            : process.cwd()
-
-          // Resolve the import to a file path
-          let resolvedPath: string | false = false
-          try {
-            // We first try to resolve the file as relative to the current file
-            // to mimic the behavior of `postcss-import` since that's what was
-            // used to resolve imports in Tailwind CSS v3.
-            if (id[0] !== '.') {
-              try {
-                resolvedPath = resolveCssId(`./${id}`, basePath)
-              } catch {}
-            }
-
-            if (!resolvedPath) {
-              resolvedPath = resolveCssId(id, basePath)
-            }
-          } catch (err) {
-            // Import is a URL, we don't want to process these, but also don't
-            // want to show an error message for them.
-            if (id.startsWith('http://') || id.startsWith('https://') || id.startsWith('//')) {
-              return
-            }
-
-            // Something went wrong, we can't resolve the import.
-            error(
-              `Failed to resolve import: ${highlight(id)} in ${highlight(relative(node.source?.input.file!, basePath))}. Skipping.`,
-              { prefix: '↳ ' },
-            )
-            return
-          }
-
-          if (!resolvedPath) return
-
-          // Find the stylesheet pointing to the resolved path
-          let stylesheet = stylesheetsByFile.get(resolvedPath)
-
-          // If it _does not_ exist in stylesheets we don't care and skip it
-          // this is likely because its in node_modules or a workspace package
-          // that we don't want to modify
-          if (!stylesheet) return
-
-          // Mark the import node with the ID of the stylesheet it points to
-          // We will use these later to build lookup tables and modify the AST
-          node.raws.tailwind_destination_sheet_id = stylesheet.id
-
-          let parent = node.source?.input.file
-            ? stylesheetsByFile.get(node.source.input.file)
-            : undefined
-
-          let layers: string[] = []
-
-          for (let part of segment(node.params, ' ')) {
-            if (!part.startsWith('layer(')) continue
-            if (!part.endsWith(')')) continue
-
-            layers.push(part.slice(6, -1).trim())
-          }
-
-          // Connect sheets together in a dependency graph
-          if (parent) {
-            let meta = { layers }
-            stylesheet.parents.add({ item: parent, meta })
-            parent.children.add({ item: stylesheet, meta })
-          }
-        },
-      },
-    },
-  ])
-
-  // Seed the map with all the known stylesheets, and queue up the processing of
-  // each incoming stylesheet.
-  for (let sheet of stylesheets) {
-    if (sheet.file) {
-      stylesheetsByFile.set(sheet.file, sheet)
-      processingQueue.push(() => processor.process(sheet.root, { from: sheet.file ?? undefined }))
-    }
-  }
-
-  // Process all the stylesheets from step 1
-  while (processingQueue.length > 0) {
-    let task = processingQueue.shift()!
-    await task()
-  }
-
-  // ---
-
-  let commonPath = process.cwd()
-
-  function pathToString(path: StylesheetConnection[]) {
-    let parts: string[] = []
-
-    for (let connection of path) {
-      if (!connection.item.file) continue
-
-      let filePath = connection.item.file.replace(commonPath, '')
-      let layers = connection.meta.layers.join(', ')
-
-      if (layers.length > 0) {
-        parts.push(`${filePath} (layers: ${layers})`)
-      } else {
-        parts.push(filePath)
-      }
-    }
-
-    return parts.join(' <- ')
-  }
-
-  let lines: string[] = []
-
-  for (let sheet of stylesheets) {
-    if (!sheet.file) continue
-
-    let { convertiblePaths, nonConvertiblePaths } = sheet.analyzeImportPaths()
-    let isAmbiguous = convertiblePaths.length > 0 && nonConvertiblePaths.length > 0
-
-    if (!isAmbiguous) continue
-
-    sheet.canMigrate = false
-
-    let filePath = sheet.file.replace(commonPath, '')
-
-    for (let path of convertiblePaths) {
-      lines.push(`- ${filePath} <- ${pathToString(path)}`)
-    }
-
-    for (let path of nonConvertiblePaths) {
-      lines.push(`- ${filePath} <- ${pathToString(path)}`)
-    }
-  }
-
-  if (lines.length === 0) {
-    let tailwindRootLeafs = new Set<Stylesheet>()
-
-    for (let sheet of stylesheets) {
-      // If the current file already contains `@config`, then we can assume it's
-      // a Tailwind CSS root file.
-      sheet.root.walkAtRules('config', () => {
-        sheet.isTailwindRoot = true
-        return false
-      })
-      if (sheet.isTailwindRoot) continue
-
-      // If an `@tailwind` at-rule, or `@import "tailwindcss"` is present,
-      // then we can assume it's a file where Tailwind CSS might be configured.
-      //
-      // However, if 2 or more stylesheets exist with these rules that share a
-      // common parent, then we want to mark the common parent as the root
-      // stylesheet instead.
-      sheet.root.walkAtRules((node) => {
-        if (
-          node.name === 'tailwind' ||
-          (node.name === 'import' && node.params.match(/^["']tailwindcss["']/)) ||
-          (node.name === 'import' && node.params.match(/^["']tailwindcss\/.*?["']$/))
-        ) {
-          sheet.isTailwindRoot = true
-          tailwindRootLeafs.add(sheet)
-        }
-      })
-    }
-
-    // Only a single Tailwind CSS root file exists, no need to do anything else.
-    if (tailwindRootLeafs.size <= 1) {
-      return
-    }
-
-    // Mark the common parent as the root file
-    {
-      // Group each sheet from tailwindRootLeafs by their common parent
-      let commonParents = new DefaultMap<Stylesheet, Set<Stylesheet>>(() => new Set<Stylesheet>())
-
-      // Seed common parents with leafs
-      for (let sheet of tailwindRootLeafs) {
-        commonParents.get(sheet).add(sheet)
-      }
-
-      // If any 2 common parents come from the same tree, then all children of
-      // parent A and parent B will be moved to the parent of parent A and
-      // parent B. Parent A and parent B will be removed.
-      let repeat = true
-      repeat: while (repeat) {
-        repeat = false
-
-        for (let [sheetA, childrenA] of commonParents) {
-          for (let [sheetB, childrenB] of commonParents) {
-            if (sheetA === sheetB) continue
-
-            // Ancestors from self to root. Reversed order so we find the
-            // nearest common parent first
-            //
-            // Including self because if you compare a sheet with its parent,
-            // then the parent is still the common sheet between the two. In
-            // this case, the parent is the root file.
-            let ancestorsA = [sheetA].concat(Array.from(sheetA.ancestors()).reverse())
-            let ancestorsB = [sheetB].concat(Array.from(sheetB.ancestors()).reverse())
-
-            for (let parentA of ancestorsA) {
-              for (let parentB of ancestorsB) {
-                if (parentA !== parentB) continue
-
-                // Found the parent
-                let parent = parentA
-
-                commonParents.delete(sheetA)
-                commonParents.delete(sheetB)
-
-                for (let child of childrenA) {
-                  commonParents.get(parent).add(child)
-                }
-
-                for (let child of childrenB) {
-                  commonParents.get(parent).add(child)
-                }
-
-                // Found a common parent between sheet A and sheet B. We can
-                // stop looking for more common parents between A and B, and
-                // continue with the next sheet.
-                repeat = true
-                continue repeat
-              }
-            }
-          }
-        }
-      }
-
-      // Mark the common parent as the Tailwind CSS root file, and remove the
-      // flag from each leaf.
-      for (let [parent, children] of commonParents) {
-        parent.isTailwindRoot = true
-
-        for (let child of children) {
-          if (parent === child) continue
-
-          child.isTailwindRoot = false
-        }
-      }
-      return
-    }
-  }
-
-  {
-    let error = `You have one or more stylesheets that are imported into a utility layer and non-utility layer.\n`
-    error += `We cannot convert stylesheets under these conditions. Please look at the following stylesheets:\n`
-
-    throw new Error(error + lines.join('\n'))
-  }
-}
-
-export async function linkConfigs(
-  stylesheets: Stylesheet[],
-  { configPath, base }: { configPath: string | null; base: string },
-) {
-  let rootStylesheets = stylesheets.filter((sheet) => sheet.isTailwindRoot)
-  if (rootStylesheets.length === 0) {
-    throw new Error(
-      `Cannot find any CSS files that reference Tailwind CSS.\nBefore your project can be upgraded you need to create a CSS file that imports Tailwind CSS or uses ${highlight('@tailwind')}.`,
-    )
-  }
-  let withoutAtConfig = rootStylesheets.filter((sheet) => {
-    let hasConfig = false
-    sheet.root.walkAtRules('config', (node) => {
-      let configPath = path.resolve(path.dirname(sheet.file!), node.params.slice(1, -1))
-      sheet.linkedConfigPath = configPath
-      hasConfig = true
-      return false
-    })
-    return !hasConfig
-  })
-
-  // All stylesheets have a `@config` directives
-  if (withoutAtConfig.length === 0) return
-
-  // Find the config file path for each stylesheet
-  let configPathBySheet = new Map<Stylesheet, string>()
-  let sheetByConfigPath = new DefaultMap<string, Set<Stylesheet>>(() => new Set())
-  for (let sheet of withoutAtConfig) {
-    if (!sheet.file) continue
-
-    let localConfigPath = configPath as string
-    if (configPath === null) {
-      localConfigPath = await detectConfigPath(path.dirname(sheet.file), base)
-    } else if (!path.isAbsolute(localConfigPath)) {
-      localConfigPath = path.resolve(base, localConfigPath)
-    }
-
-    configPathBySheet.set(sheet, localConfigPath)
-    sheetByConfigPath.get(localConfigPath).add(sheet)
-  }
-
-  let problematicStylesheets = new Set<Stylesheet>()
-  for (let sheets of sheetByConfigPath.values()) {
-    if (sheets.size > 1) {
-      for (let sheet of sheets) {
-        problematicStylesheets.add(sheet)
-      }
-    }
-  }
-
-  // There are multiple "root" files without `@config` directives. Manual
-  // intervention is needed to link to the correct Tailwind config files.
-  if (problematicStylesheets.size > 1) {
-    for (let sheet of problematicStylesheets) {
-      error(
-        `Could not determine configuration file for: ${highlight(relative(sheet.file!, base))}\nUpdate your stylesheet to use ${highlight('@config')} to specify the correct configuration file explicitly and then run the upgrade tool again.`,
-        { prefix: '↳ ' },
-      )
-    }
-
-    process.exit(1)
-  }
-
-  let relativePath = relative
-  for (let [sheet, configPath] of configPathBySheet) {
-    try {
-      if (!sheet || !sheet.file) return
-      success(
-        `Linked ${highlight(relativePath(configPath, base))} to ${highlight(relativePath(sheet.file, base))}`,
-        { prefix: '↳ ' },
-      )
-
-      // Link the `@config` directive to the root stylesheets
-
-      // Track the config file path on the stylesheet itself for easy access
-      // without traversing the CSS ast and finding the corresponding
-      // `@config` later.
-      sheet.linkedConfigPath = configPath
-
-      // Create a relative path from the current file to the config file.
-      let relative = path.relative(path.dirname(sheet.file), configPath)
-
-      // If the path points to a file in the same directory, `path.relative` will
-      // remove the leading `./` and we need to add it back in order to still
-      // consider the path relative
-      if (!relative.startsWith('.')) {
-        relative = './' + relative
-      }
-
-      relative = normalizePath(relative)
-
-      // Add the `@config` directive to the root stylesheet.
-      {
-        let target = sheet.root as postcss.Root | postcss.AtRule
-        let atConfig = postcss.atRule({ name: 'config', params: `'${relative}'` })
-
-        sheet.root.walkAtRules((node) => {
-          if (node.name === 'tailwind' || node.name === 'import') {
-            target = node
-          }
-        })
-
-        if (target.type === 'root') {
-          sheet.root.prepend(atConfig)
-        } else if (target.type === 'atrule') {
-          target.after(atConfig)
-        }
-      }
-    } catch (e: any) {
-      error('Could not load the configuration file: ' + e.message, { prefix: '↳ ' })
-      process.exit(1)
-    }
-  }
-}
-
-export async function split(stylesheets: Stylesheet[]) {
-  let stylesheetsById = new Map<StylesheetId, Stylesheet>()
-  let stylesheetsByFile = new Map<string, Stylesheet>()
-
-  for (let sheet of stylesheets) {
-    stylesheetsById.set(sheet.id, sheet)
-
-    if (sheet.file) {
-      stylesheetsByFile.set(sheet.file, sheet)
-    }
-  }
-
-  // Keep track of sheets that contain `@utility` rules
-  let requiresSplit = new Set<Stylesheet>()
-
-  for (let sheet of stylesheets) {
-    // Root files don't need to be split
-    if (sheet.isTailwindRoot) continue
-
-    let containsUtility = false
-    let containsUnsafe = sheet.layers().size > 0
-
-    walk(sheet.root, (node) => {
-      if (node.type === 'atrule' && node.name === 'utility') {
-        containsUtility = true
-      }
-
-      // Safe to keep without splitting
-      else if (
-        // An `@import "…" layer(…)` is safe
-        (node.type === 'atrule' && node.name === 'import' && node.params.includes('layer(')) ||
-        // @layer blocks are safe
-        (node.type === 'atrule' && node.name === 'layer') ||
-        // Comments are safe
-        node.type === 'comment'
-      ) {
-        return WalkAction.Skip
-      }
-
-      // Everything else is not safe, and requires a split
-      else {
-        containsUnsafe = true
-      }
-
-      // We already know we need to split this sheet
-      if (containsUtility && containsUnsafe) {
-        return WalkAction.Stop
-      }
-
-      return WalkAction.Skip
-    })
-
-    if (containsUtility && containsUnsafe) {
-      requiresSplit.add(sheet)
-    }
-  }
-
-  // Split every imported stylesheet into two parts
-  let utilitySheets = new Map<Stylesheet, Stylesheet>()
-
-  for (let sheet of stylesheets) {
-    // Ignore stylesheets that were not imported
-    if (!sheet.file) continue
-    if (sheet.parents.size === 0) continue
-
-    // Skip stylesheets that don't have utilities
-    // and don't have any children that have utilities
-    if (!requiresSplit.has(sheet)) {
-      if (!Array.from(sheet.descendants()).some((child) => requiresSplit.has(child))) {
-        continue
-      }
-    }
-
-    let utilities = postcss.root()
-
-    walk(sheet.root, (node) => {
-      if (node.type !== 'atrule') return
-      if (node.name !== 'utility') return
-
-      // `append` will move this node from the original sheet
-      // to the new utilities sheet
-      utilities.append(node)
-
-      return WalkAction.Skip
-    })
-
-    let newFileName = sheet.file.replace(/\.css$/, '.utilities.css')
-
-    let counter = 0
-
-    // If we already have a utility sheet with this name, we need to rename it
-    while (stylesheetsByFile.has(newFileName)) {
-      counter += 1
-      newFileName = sheet.file.replace(/\.css$/, `.utilities.${counter}.css`)
-    }
-
-    let utilitySheet = await Stylesheet.fromRoot(utilities, newFileName)
-
-    utilitySheet.extension = counter > 0 ? `.utilities.${counter}.css` : `.utilities.css`
-
-    utilitySheets.set(sheet, utilitySheet)
-    stylesheetsById.set(utilitySheet.id, utilitySheet)
-  }
-
-  // Make sure the utility sheets are linked to one another
-  for (let [normalSheet, utilitySheet] of utilitySheets) {
-    for (let parent of normalSheet.parents) {
-      let utilityParent = utilitySheets.get(parent.item)
-      if (!utilityParent) continue
-      utilitySheet.parents.add({
-        item: utilityParent,
-        meta: parent.meta,
-      })
-    }
-
-    for (let child of normalSheet.children) {
-      let utilityChild = utilitySheets.get(child.item)
-      if (!utilityChild) continue
-      utilitySheet.children.add({
-        item: utilityChild,
-        meta: child.meta,
-      })
-    }
-  }
-
-  for (let sheet of stylesheets) {
-    let utilitySheet = utilitySheets.get(sheet)
-    let utilityImports: Set<postcss.AtRule> = new Set()
-
-    for (let node of sheet.importRules) {
-      let sheetId = node.raws.tailwind_destination_sheet_id as StylesheetId | undefined
-
-      // This import rule does not point to a stylesheet
-      // which likely means it points to `node_modules`
-      if (!sheetId) continue
-
-      let originalDestination = stylesheetsById.get(sheetId)
-
-      // This import points to a stylesheet that no longer exists which likely
-      // means it was removed by the optimizer this will be cleaned up later
-      if (!originalDestination) continue
-
-      let utilityDestination = utilitySheets.get(originalDestination)
-
-      // A utility sheet doesn't exist for this import so it doesn't need
-      // to be processed
-      if (!utilityDestination) continue
-
-      let match = node.params.match(/(['"])(.*)\1/)
-      if (!match) return
-
-      let quote = match[1]
-      let id = match[2]
-
-      let newFile = id.replace(/\.css$/, utilityDestination.extension!)
-
-      // The import will just point to the new file without any media queries,
-      // layers, or other conditions because `@utility` MUST be top-level.
-      let newImport = node.clone({
-        params: `${quote}${newFile}${quote}`,
-        raws: {
-          tailwind_injected_layer: node.raws.tailwind_injected_layer,
-          tailwind_original_params: `${quote}${id}${quote}`,
-          tailwind_destination_sheet_id: utilityDestination.id,
-        },
-      })
-
-      if (utilitySheet) {
-        // If this import is intended to go into the utility sheet
-        // we'll collect it into a list to add later. If we don't'
-        // we'll end up adding them in reverse order.
-        utilityImports.add(newImport)
-      } else {
-        // This import will go immediately after the original import
-        node.after(newImport)
-      }
-    }
-
-    // Add imports to the top of the utility sheet if necessary
-    if (utilitySheet && utilityImports.size > 0) {
-      utilitySheet.root.prepend(Array.from(utilityImports))
-    }
-  }
-
-  // Tracks the at rules that import a given stylesheet
-  let importNodes = new DefaultMap<Stylesheet, Set<postcss.AtRule>>(() => new Set())
-
-  for (let sheet of stylesheetsById.values()) {
-    for (let node of sheet.importRules) {
-      let sheetId = node.raws.tailwind_destination_sheet_id as StylesheetId | undefined
-
-      // This import rule does not point to a stylesheet
-      if (!sheetId) continue
-
-      let destination = stylesheetsById.get(sheetId)
-
-      // This import rule does not point to a stylesheet that exists
-      // We'll remove it later
-      if (!destination) continue
-
-      importNodes.get(destination).add(node)
-    }
-  }
-
-  // At this point we've created many `{name}.utilities.css` files.
-  // If the original file _becomes_ empty after splitting that means that
-  // dedicated utility file is not required and we can move the utilities
-  // back to the original file.
-  //
-  // This could be done in one step but separating them makes it easier to
-  // reason about since the stylesheets are in a consistent state before we
-  // perform any cleanup tasks.
-  let list: Stylesheet[] = []
-
-  for (let sheet of stylesheets.slice()) {
-    for (let child of sheet.descendants()) {
-      list.push(child)
-    }
-
-    list.push(sheet)
-  }
-
-  for (let sheet of list) {
-    let utilitySheet = utilitySheets.get(sheet)
-
-    // This sheet was not split so there's nothing to do
-    if (!utilitySheet) continue
-
-    // This sheet did not become empty
-    if (!sheet.isEmpty) continue
-
-    // We have a sheet that became empty after splitting
-    // 1. Replace the sheet with it's utility sheet content
-    sheet.root = utilitySheet.root
-
-    // 2. Rewrite imports in parent sheets to point to the original sheet
-    // Ideally this wouldn't need to be _undone_ but instead only done once at the end
-    for (let node of importNodes.get(utilitySheet)) {
-      node.params = node.raws.tailwind_original_params as any
-    }
-
-    // 3. Remove the original import from the non-utility sheet
-    for (let node of importNodes.get(sheet)) {
-      node.remove()
-    }
-
-    // 3. Mark the utility sheet for removal
-    utilitySheets.delete(sheet)
-  }
-
-  stylesheets.push(...utilitySheets.values())
-}
diff --git a/packages/@tailwindcss-upgrade/src/stylesheet.ts b/packages/@tailwindcss-upgrade/src/stylesheet.ts
index 092d9414b..573413262 100644
--- a/packages/@tailwindcss-upgrade/src/stylesheet.ts
+++ b/packages/@tailwindcss-upgrade/src/stylesheet.ts
@@ -1,8 +1,10 @@
+import { __unstable__loadDesignSystem, compileAst } from '@tailwindcss/node'
 import * as fsSync from 'node:fs'
 import * as fs from 'node:fs/promises'
 import * as path from 'node:path'
 import * as util from 'node:util'
 import * as postcss from 'postcss'
+import { postCssAstToCssAst } from '../../@tailwindcss-postcss/src/ast'
 
 export type StylesheetId = string
 
@@ -263,6 +265,28 @@ export class Stylesheet {
     return false
   }
 
+  #compiler?: Promise<Awaited<ReturnType<typeof compileAst>> | null>
+  #designSystem?: Promise<Awaited<ReturnType<typeof __unstable__loadDesignSystem>> | null>
+
+  async compiler(): Promise<Awaited<ReturnType<typeof compileAst>> | null> {
+    if (!this.isTailwindRoot) return null
+    if (!this.file) return null
+
+    return (this.#compiler ??= compileAst(postCssAstToCssAst(this.root), {
+      base: path.dirname(this.file),
+      onDependency() {},
+    }))
+  }
+
+  async designSystem(): Promise<Awaited<ReturnType<typeof __unstable__loadDesignSystem>> | null> {
+    if (!this.isTailwindRoot) return null
+    if (!this.file) return null
+
+    return (this.#designSystem ??= __unstable__loadDesignSystem(this.root.toString(), {
+      base: path.dirname(this.file),
+    }))
+  }
+
   [util.inspect.custom]() {
     return {
       ...this,
diff --git a/packages/@tailwindcss-upgrade/src/template/candidates.test.ts b/packages/@tailwindcss-upgrade/src/template/candidates.test.ts
deleted file mode 100644
index 74f5974fc..000000000
--- a/packages/@tailwindcss-upgrade/src/template/candidates.test.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-import { __unstable__loadDesignSystem } from '@tailwindcss/node'
-import { describe, expect, test } from 'vitest'
-import { extractRawCandidates, printCandidate } from './candidates'
-import { spliceChangesIntoString } from './splice-changes-into-string'
-
-let html = String.raw
-
-test('extracts candidates with positions from a template', async () => {
-  let content = html`
-    <div class="bg-blue-500 hover:focus:text-white [color:red]">
-      <button class="bg-blue-500 text-white">My button</button>
-    </div>
-  `
-  let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', {
-    base: __dirname,
-  })
-
-  let candidates = await extractRawCandidates(content, 'html')
-  let validCandidates = candidates.filter(
-    ({ rawCandidate }) => designSystem.parseCandidate(rawCandidate).length > 0,
-  )
-
-  expect(validCandidates).toMatchInlineSnapshot(`
-    [
-      {
-        "end": 28,
-        "rawCandidate": "bg-blue-500",
-        "start": 17,
-      },
-      {
-        "end": 51,
-        "rawCandidate": "hover:focus:text-white",
-        "start": 29,
-      },
-      {
-        "end": 63,
-        "rawCandidate": "[color:red]",
-        "start": 52,
-      },
-      {
-        "end": 98,
-        "rawCandidate": "bg-blue-500",
-        "start": 87,
-      },
-      {
-        "end": 109,
-        "rawCandidate": "text-white",
-        "start": 99,
-      },
-    ]
-  `)
-})
-
-test('replaces the right positions for a candidate', async () => {
-  let content = html`
-    <h1>🤠👋</h1>
-    <div class="bg-blue-500" />
-  `
-
-  let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', {
-    base: __dirname,
-  })
-
-  let candidates = await extractRawCandidates(content, 'html')
-
-  let candidate = candidates.find(
-    ({ rawCandidate }) => designSystem.parseCandidate(rawCandidate).length > 0,
-  )!
-
-  let migrated = spliceChangesIntoString(content, [
-    {
-      start: candidate.start,
-      end: candidate.end,
-      replacement: 'flex',
-    },
-  ])
-
-  expect(migrated).toMatchInlineSnapshot(`
-    "
-        <h1>🤠👋</h1>
-        <div class="flex" />
-      "
-  `)
-})
-
-const candidates = [
-  // Arbitrary candidates
-  ['[color:red]', '[color:red]'],
-  ['[color:red]/50', '[color:red]/50'],
-  ['[color:red]/[0.5]', '[color:red]/[0.5]'],
-  ['[color:red]/50!', '[color:red]/50!'],
-  ['![color:red]/50', '[color:red]/50!'],
-  ['[color:red]/[0.5]!', '[color:red]/[0.5]!'],
-
-  // Static candidates
-  ['box-border', 'box-border'],
-  ['underline!', 'underline!'],
-  ['!underline', 'underline!'],
-  ['-inset-full', '-inset-full'],
-
-  // Functional candidates
-  ['bg-red-500', 'bg-red-500'],
-  ['bg-red-500/50', 'bg-red-500/50'],
-  ['bg-red-500/[0.5]', 'bg-red-500/[0.5]'],
-  ['bg-red-500!', 'bg-red-500!'],
-  ['!bg-red-500', 'bg-red-500!'],
-  ['bg-[#0088cc]/50', 'bg-[#0088cc]/50'],
-  ['bg-[#0088cc]/[0.5]', 'bg-[#0088cc]/[0.5]'],
-  ['bg-[#0088cc]!', 'bg-[#0088cc]!'],
-  ['!bg-[#0088cc]', 'bg-[#0088cc]!'],
-  ['bg-[var(--spacing)-1px]', 'bg-[var(--spacing)-1px]'],
-  ['bg-[var(--spacing)_-_1px]', 'bg-[var(--spacing)-1px]'],
-  ['bg-[-1px_-1px]', 'bg-[-1px_-1px]'],
-  ['p-[round(to-zero,1px)]', 'p-[round(to-zero,1px)]'],
-  ['w-1/2', 'w-1/2'],
-  ['p-[calc((100vw-theme(maxWidth.2xl))_/_2)]', 'p-[calc((100vw-theme(maxWidth.2xl))/2)]'],
-
-  // Keep spaces in strings
-  ['content-["hello_world"]', 'content-["hello_world"]'],
-  ['content-[____"hello_world"___]', 'content-["hello_world"]'],
-
-  // Do not escape underscores for url() and CSS variable in var()
-  ['bg-[no-repeat_url(/image_13.png)]', 'bg-[no-repeat_url(/image_13.png)]'],
-  [
-    'bg-[var(--spacing-0_5,_var(--spacing-1_5,_3rem))]',
-    'bg-(--spacing-0_5,var(--spacing-1_5,3rem))',
-  ],
-]
-
-const variants = [
-  ['', ''], // no variant
-  ['*:', '*:'],
-  ['focus:', 'focus:'],
-  ['group-focus:', 'group-focus:'],
-
-  ['hover:focus:', 'hover:focus:'],
-  ['hover:group-focus:', 'hover:group-focus:'],
-  ['group-hover:focus:', 'group-hover:focus:'],
-  ['group-hover:group-focus:', 'group-hover:group-focus:'],
-
-  ['min-[10px]:', 'min-[10px]:'],
-
-  // Normalize spaces
-  ['min-[calc(1000px_+_12em)]:', 'min-[calc(1000px+12em)]:'],
-  ['min-[calc(1000px_+12em)]:', 'min-[calc(1000px+12em)]:'],
-  ['min-[calc(1000px+_12em)]:', 'min-[calc(1000px+12em)]:'],
-  ['min-[calc(1000px___+___12em)]:', 'min-[calc(1000px+12em)]:'],
-
-  ['peer-[&_p]:', 'peer-[&_p]:'],
-  ['peer-[&_p]:hover:', 'peer-[&_p]:hover:'],
-  ['hover:peer-[&_p]:', 'hover:peer-[&_p]:'],
-  ['hover:peer-[&_p]:focus:', 'hover:peer-[&_p]:focus:'],
-  ['peer-[&:hover]:peer-[&_p]:', 'peer-[&:hover]:peer-[&_p]:'],
-
-  ['[p]:', '[p]:'],
-  ['[_p_]:', '[p]:'],
-  ['has-[p]:', 'has-[p]:'],
-  ['has-[_p_]:', 'has-[p]:'],
-
-  // Simplify `&:is(p)` to `p`
-  ['[&:is(p)]:', '[p]:'],
-  ['[&:is(_p_)]:', '[p]:'],
-  ['has-[&:is(p)]:', 'has-[p]:'],
-  ['has-[&:is(_p_)]:', 'has-[p]:'],
-]
-
-let combinations: [string, string][] = []
-
-for (let [inputVariant, outputVariant] of variants) {
-  for (let [inputCandidate, outputCandidate] of candidates) {
-    combinations.push([`${inputVariant}${inputCandidate}`, `${outputVariant}${outputCandidate}`])
-  }
-}
-
-describe('printCandidate()', () => {
-  test.each(combinations)('%s -> %s', async (candidate: string, result: string) => {
-    let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', {
-      base: __dirname,
-    })
-
-    let candidates = designSystem.parseCandidate(candidate)
-
-    // Sometimes we will have a functional and a static candidate for the same
-    // raw input string (e.g. `-inset-full`). Dedupe in this case.
-    let cleaned = new Set([...candidates].map((c) => printCandidate(designSystem, c)))
-
-    expect([...cleaned]).toEqual([result])
-  })
-})
diff --git a/packages/@tailwindcss-upgrade/src/template/candidates.ts b/packages/@tailwindcss-upgrade/src/template/candidates.ts
deleted file mode 100644
index 6a0ab65bd..000000000
--- a/packages/@tailwindcss-upgrade/src/template/candidates.ts
+++ /dev/null
@@ -1,290 +0,0 @@
-import { Scanner } from '@tailwindcss/oxide'
-import type { Candidate, Variant } from '../../../tailwindcss/src/candidate'
-import type { DesignSystem } from '../../../tailwindcss/src/design-system'
-import * as ValueParser from '../../../tailwindcss/src/value-parser'
-
-export async function extractRawCandidates(
-  content: string,
-  extension: string = 'html',
-): Promise<{ rawCandidate: string; start: number; end: number }[]> {
-  let scanner = new Scanner({})
-  let result = scanner.getCandidatesWithPositions({ content, extension })
-
-  let candidates: { rawCandidate: string; start: number; end: number }[] = []
-  for (let { candidate: rawCandidate, position: start } of result) {
-    candidates.push({ rawCandidate, start, end: start + rawCandidate.length })
-  }
-  return candidates
-}
-
-export function printCandidate(designSystem: DesignSystem, candidate: Candidate) {
-  let parts: string[] = []
-
-  for (let variant of candidate.variants) {
-    parts.unshift(printVariant(variant))
-  }
-
-  // Handle prefix
-  if (designSystem.theme.prefix) {
-    parts.unshift(designSystem.theme.prefix)
-  }
-
-  let base: string = ''
-
-  // Handle static
-  if (candidate.kind === 'static') {
-    base += candidate.root
-  }
-
-  // Handle functional
-  if (candidate.kind === 'functional') {
-    base += candidate.root
-
-    if (candidate.value) {
-      if (candidate.value.kind === 'arbitrary') {
-        if (candidate.value !== null) {
-          let isVarValue = isVar(candidate.value.value)
-          let value = isVarValue ? candidate.value.value.slice(4, -1) : candidate.value.value
-          let [open, close] = isVarValue ? ['(', ')'] : ['[', ']']
-
-          if (candidate.value.dataType) {
-            base += `-${open}${candidate.value.dataType}:${printArbitraryValue(value)}${close}`
-          } else {
-            base += `-${open}${printArbitraryValue(value)}${close}`
-          }
-        }
-      } else if (candidate.value.kind === 'named') {
-        base += `-${candidate.value.value}`
-      }
-    }
-  }
-
-  // Handle arbitrary
-  if (candidate.kind === 'arbitrary') {
-    base += `[${candidate.property}:${printArbitraryValue(candidate.value)}]`
-  }
-
-  // Handle modifier
-  if (candidate.kind === 'arbitrary' || candidate.kind === 'functional') {
-    if (candidate.modifier) {
-      let isVarValue = isVar(candidate.modifier.value)
-      let value = isVarValue ? candidate.modifier.value.slice(4, -1) : candidate.modifier.value
-      let [open, close] = isVarValue ? ['(', ')'] : ['[', ']']
-
-      if (candidate.modifier.kind === 'arbitrary') {
-        base += `/${open}${printArbitraryValue(value)}${close}`
-      } else if (candidate.modifier.kind === 'named') {
-        base += `/${candidate.modifier.value}`
-      }
-    }
-  }
-
-  // Handle important
-  if (candidate.important) {
-    base += '!'
-  }
-
-  parts.push(base)
-
-  return parts.join(':')
-}
-
-function printVariant(variant: Variant) {
-  // Handle static variants
-  if (variant.kind === 'static') {
-    return variant.root
-  }
-
-  // Handle arbitrary variants
-  if (variant.kind === 'arbitrary') {
-    return `[${printArbitraryValue(simplifyArbitraryVariant(variant.selector))}]`
-  }
-
-  let base: string = ''
-
-  // Handle functional variants
-  if (variant.kind === 'functional') {
-    base += variant.root
-    if (variant.value) {
-      if (variant.value.kind === 'arbitrary') {
-        let isVarValue = isVar(variant.value.value)
-        let value = isVarValue ? variant.value.value.slice(4, -1) : variant.value.value
-        let [open, close] = isVarValue ? ['(', ')'] : ['[', ']']
-
-        base += `-${open}${printArbitraryValue(value)}${close}`
-      } else if (variant.value.kind === 'named') {
-        base += `-${variant.value.value}`
-      }
-    }
-  }
-
-  // Handle compound variants
-  if (variant.kind === 'compound') {
-    base += variant.root
-    base += '-'
-    base += printVariant(variant.variant)
-  }
-
-  // Handle modifiers
-  if (variant.kind === 'functional' || variant.kind === 'compound') {
-    if (variant.modifier) {
-      if (variant.modifier.kind === 'arbitrary') {
-        base += `/[${printArbitraryValue(variant.modifier.value)}]`
-      } else if (variant.modifier.kind === 'named') {
-        base += `/${variant.modifier.value}`
-      }
-    }
-  }
-
-  return base
-}
-
-function printArbitraryValue(input: string) {
-  let ast = ValueParser.parse(input)
-
-  let drop = new Set<ValueParser.ValueAstNode>()
-
-  ValueParser.walk(ast, (node, { parent }) => {
-    let parentArray = parent === null ? ast : (parent.nodes ?? [])
-
-    // Handle operators (e.g.: inside of `calc(…)`)
-    if (
-      node.kind === 'word' &&
-      // Operators
-      (node.value === '+' || node.value === '-' || node.value === '*' || node.value === '/')
-    ) {
-      let idx = parentArray.indexOf(node) ?? -1
-
-      // This should not be possible
-      if (idx === -1) return
-
-      let previous = parentArray[idx - 1]
-      if (previous?.kind !== 'separator' || previous.value !== ' ') return
-
-      let next = parentArray[idx + 1]
-      if (next?.kind !== 'separator' || next.value !== ' ') return
-
-      drop.add(previous)
-      drop.add(next)
-    }
-
-    // The value parser handles `/` as a separator in some scenarios. E.g.:
-    // `theme(colors.red/50%)`. Because of this, we have to handle this case
-    // separately.
-    else if (node.kind === 'separator' && node.value.trim() === '/') {
-      node.value = '/'
-    }
-
-    // Leading and trailing whitespace
-    else if (node.kind === 'separator' && node.value.length > 0 && node.value.trim() === '') {
-      if (parentArray[0] === node || parentArray[parentArray.length - 1] === node) {
-        drop.add(node)
-      }
-    }
-
-    // Whitespace around `,` separators can be removed.
-    // E.g.: `min(1px , 2px)` -> `min(1px,2px)`
-    else if (node.kind === 'separator' && node.value.trim() === ',') {
-      node.value = ','
-    }
-  })
-
-  if (drop.size > 0) {
-    ValueParser.walk(ast, (node, { replaceWith }) => {
-      if (drop.has(node)) {
-        drop.delete(node)
-        replaceWith([])
-      }
-    })
-  }
-
-  recursivelyEscapeUnderscores(ast)
-
-  return ValueParser.toCss(ast)
-}
-
-function simplifyArbitraryVariant(input: string) {
-  let ast = ValueParser.parse(input)
-
-  // &:is(…)
-  if (
-    ast.length === 3 &&
-    // &
-    ast[0].kind === 'word' &&
-    ast[0].value === '&' &&
-    // :
-    ast[1].kind === 'separator' &&
-    ast[1].value === ':' &&
-    // is(…)
-    ast[2].kind === 'function' &&
-    ast[2].value === 'is'
-  ) {
-    return ValueParser.toCss(ast[2].nodes)
-  }
-
-  return input
-}
-
-function recursivelyEscapeUnderscores(ast: ValueParser.ValueAstNode[]) {
-  for (let node of ast) {
-    switch (node.kind) {
-      case 'function': {
-        if (node.value === 'url' || node.value.endsWith('_url')) {
-          // Don't decode underscores in url() but do decode the function name
-          node.value = escapeUnderscore(node.value)
-          break
-        }
-
-        if (
-          node.value === 'var' ||
-          node.value.endsWith('_var') ||
-          node.value === 'theme' ||
-          node.value.endsWith('_theme')
-        ) {
-          // Don't decode underscores in the first argument of var() and theme()
-          // but do decode the function name
-          node.value = escapeUnderscore(node.value)
-          for (let i = 0; i < node.nodes.length; i++) {
-            if (i == 0 && node.nodes[i].kind === 'word') {
-              continue
-            }
-            recursivelyEscapeUnderscores([node.nodes[i]])
-          }
-          break
-        }
-
-        node.value = escapeUnderscore(node.value)
-        recursivelyEscapeUnderscores(node.nodes)
-        break
-      }
-      case 'separator':
-        node.value = escapeUnderscore(node.value)
-        break
-      case 'word': {
-        // Dashed idents and variables `var(--my-var)` and `--my-var` should not
-        // have underscores escaped
-        if (node.value[0] !== '-' && node.value[1] !== '-') {
-          node.value = escapeUnderscore(node.value)
-        }
-        break
-      }
-      default:
-        never(node)
-    }
-  }
-}
-
-function isVar(value: string) {
-  let ast = ValueParser.parse(value)
-  return ast.length === 1 && ast[0].kind === 'function' && ast[0].value === 'var'
-}
-
-function never(value: never): never {
-  throw new Error(`Unexpected value: ${value}`)
-}
-
-function escapeUnderscore(value: string): string {
-  return value
-    .replaceAll('_', String.raw`\_`) // Escape underscores to keep them as-is
-    .replaceAll(' ', '_') // Replace spaces with underscores
-}
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/arbitrary-value-to-bare-value.test.ts b/packages/@tailwindcss-upgrade/src/template/codemods/arbitrary-value-to-bare-value.test.ts
deleted file mode 100644
index 62355dc6f..000000000
--- a/packages/@tailwindcss-upgrade/src/template/codemods/arbitrary-value-to-bare-value.test.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { __unstable__loadDesignSystem } from '@tailwindcss/node'
-import { expect, test } from 'vitest'
-import { arbitraryValueToBareValue } from './arbitrary-value-to-bare-value'
-
-test.each([
-  ['aspect-[12/34]', 'aspect-12/34'],
-  ['aspect-[1.2/34]', 'aspect-[1.2/34]'],
-  ['col-start-[7]', 'col-start-7'],
-  ['flex-[2]', 'flex-2'], // `flex` is implemented as static and functional utilities
-
-  ['grid-cols-[subgrid]', 'grid-cols-subgrid'],
-  ['grid-rows-[subgrid]', 'grid-rows-subgrid'],
-
-  // Only 50-200% (inclusive) are valid:
-  // https://developer.mozilla.org/en-US/docs/Web/CSS/font-stretch#percentage
-  ['font-stretch-[50%]', 'font-stretch-50%'],
-  ['font-stretch-[50.5%]', 'font-stretch-[50.5%]'],
-  ['font-stretch-[201%]', 'font-stretch-[201%]'],
-  ['font-stretch-[49%]', 'font-stretch-[49%]'],
-  // Should stay as-is
-  ['font-stretch-[1/2]', 'font-stretch-[1/2]'],
-
-  // Bare value with % is valid for these utilities
-  ['from-[28%]', 'from-28%'],
-  ['via-[28%]', 'via-28%'],
-  ['to-[28%]', 'to-28%'],
-  ['from-[28.5%]', 'from-[28.5%]'],
-  ['via-[28.5%]', 'via-[28.5%]'],
-  ['to-[28.5%]', 'to-[28.5%]'],
-
-  // This test in itself is a bit flawed because `text-[1/2]` currently
-  // generates something. Converting it to `text-1/2` doesn't produce anything.
-  ['text-[1/2]', 'text-[1/2]'],
-
-  ['data-[selected]:flex', 'data-selected:flex'],
-  ['data-[foo=bar]:flex', 'data-[foo=bar]:flex'],
-
-  ['supports-[gap]:flex', 'supports-gap:flex'],
-  ['supports-[display:grid]:flex', 'supports-[display:grid]:flex'],
-
-  ['group-data-[selected]:flex', 'group-data-selected:flex'],
-  ['group-data-[foo=bar]:flex', 'group-data-[foo=bar]:flex'],
-  ['group-has-data-[selected]:flex', 'group-has-data-selected:flex'],
-
-  ['aria-[selected]:flex', 'aria-[selected]:flex'],
-  ['aria-[selected="true"]:flex', 'aria-selected:flex'],
-  ['aria-[selected*="true"]:flex', 'aria-[selected*="true"]:flex'],
-
-  ['group-aria-[selected]:flex', 'group-aria-[selected]:flex'],
-  ['group-aria-[selected="true"]:flex', 'group-aria-selected:flex'],
-  ['group-has-aria-[selected]:flex', 'group-has-aria-[selected]:flex'],
-
-  ['max-lg:hover:data-[selected]:flex!', 'max-lg:hover:data-selected:flex!'],
-  [
-    'data-[selected]:aria-[selected="true"]:aspect-[12/34]',
-    'data-selected:aria-selected:aspect-12/34',
-  ],
-])('%s => %s', async (candidate, result) => {
-  let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', {
-    base: __dirname,
-  })
-
-  expect(arbitraryValueToBareValue(designSystem, {}, candidate)).toEqual(result)
-})
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/arbitrary-value-to-bare-value.ts b/packages/@tailwindcss-upgrade/src/template/codemods/arbitrary-value-to-bare-value.ts
deleted file mode 100644
index 77a303dc3..000000000
--- a/packages/@tailwindcss-upgrade/src/template/codemods/arbitrary-value-to-bare-value.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import { parseCandidate, type Candidate, type Variant } from '../../../../tailwindcss/src/candidate'
-import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
-import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
-import { isPositiveInteger } from '../../../../tailwindcss/src/utils/infer-data-type'
-import { segment } from '../../../../tailwindcss/src/utils/segment'
-import { printCandidate } from '../candidates'
-
-export function arbitraryValueToBareValue(
-  designSystem: DesignSystem,
-  _userConfig: Config,
-  rawCandidate: string,
-): string {
-  for (let candidate of parseCandidate(rawCandidate, designSystem)) {
-    let clone = structuredClone(candidate)
-    let changed = false
-
-    // Convert [subgrid] to subgrid
-    if (
-      clone.kind === 'functional' &&
-      clone.value?.kind === 'arbitrary' &&
-      clone.value.value === 'subgrid' &&
-      (clone.root === 'grid-cols' || clone.root == 'grid-rows')
-    ) {
-      changed = true
-      clone.value = {
-        kind: 'named',
-        value: 'subgrid',
-        fraction: null,
-      }
-    }
-
-    // Convert utilities that accept bare values ending in %
-    if (
-      clone.kind === 'functional' &&
-      clone.value?.kind === 'arbitrary' &&
-      clone.value.dataType === null &&
-      (clone.root === 'from' ||
-        clone.root === 'via' ||
-        clone.root === 'to' ||
-        clone.root === 'font-stretch')
-    ) {
-      if (clone.value.value.endsWith('%') && isPositiveInteger(clone.value.value.slice(0, -1))) {
-        let percentage = parseInt(clone.value.value)
-        if (
-          clone.root === 'from' ||
-          clone.root === 'via' ||
-          clone.root === 'to' ||
-          (clone.root === 'font-stretch' && percentage >= 50 && percentage <= 200)
-        ) {
-          changed = true
-          clone.value = {
-            kind: 'named',
-            value: clone.value.value,
-            fraction: null,
-          }
-        }
-      }
-    }
-
-    // Convert arbitrary values with positive integers to bare values
-    // Convert arbitrary values with fractions to bare values
-    else if (
-      clone.kind === 'functional' &&
-      clone.value?.kind === 'arbitrary' &&
-      clone.value.dataType === null
-    ) {
-      let parts = segment(clone.value.value, '/')
-      if (parts.every((part) => isPositiveInteger(part))) {
-        changed = true
-
-        let currentValue = clone.value
-        let currentModifier = clone.modifier
-
-        // E.g.: `col-start-[12]`
-        //                   ^^
-        if (parts.length === 1) {
-          clone.value = {
-            kind: 'named',
-            value: clone.value.value,
-            fraction: null,
-          }
-        }
-
-        // E.g.: `aspect-[12/34]`
-        //                ^^ ^^
-        else {
-          clone.value = {
-            kind: 'named',
-            value: parts[0],
-            fraction: clone.value.value,
-          }
-          clone.modifier = {
-            kind: 'named',
-            value: parts[1],
-          }
-        }
-
-        // Double check that the new value compiles correctly
-        if (designSystem.compileAstNodes(clone).length === 0) {
-          clone.value = currentValue
-          clone.modifier = currentModifier
-          changed = false
-        }
-      }
-    }
-
-    for (let variant of variants(clone)) {
-      // Convert `data-[selected]` to `data-selected`
-      if (
-        variant.kind === 'functional' &&
-        variant.root === 'data' &&
-        variant.value?.kind === 'arbitrary' &&
-        !variant.value.value.includes('=')
-      ) {
-        changed = true
-        variant.value = {
-          kind: 'named',
-          value: variant.value.value,
-        }
-      }
-
-      // Convert `aria-[selected="true"]` to `aria-selected`
-      else if (
-        variant.kind === 'functional' &&
-        variant.root === 'aria' &&
-        variant.value?.kind === 'arbitrary' &&
-        (variant.value.value.endsWith('=true') ||
-          variant.value.value.endsWith('="true"') ||
-          variant.value.value.endsWith("='true'"))
-      ) {
-        let [key, _value] = segment(variant.value.value, '=')
-        if (
-          // aria-[foo~="true"]
-          key[key.length - 1] === '~' ||
-          // aria-[foo|="true"]
-          key[key.length - 1] === '|' ||
-          // aria-[foo^="true"]
-          key[key.length - 1] === '^' ||
-          // aria-[foo$="true"]
-          key[key.length - 1] === '$' ||
-          // aria-[foo*="true"]
-          key[key.length - 1] === '*'
-        ) {
-          continue
-        }
-
-        changed = true
-        variant.value = {
-          kind: 'named',
-          value: variant.value.value.slice(0, variant.value.value.indexOf('=')),
-        }
-      }
-
-      // Convert `supports-[gap]` to `supports-gap`
-      else if (
-        variant.kind === 'functional' &&
-        variant.root === 'supports' &&
-        variant.value?.kind === 'arbitrary' &&
-        /^[a-z-][a-z0-9-]*$/i.test(variant.value.value)
-      ) {
-        changed = true
-        variant.value = {
-          kind: 'named',
-          value: variant.value.value,
-        }
-      }
-    }
-
-    return changed ? printCandidate(designSystem, clone) : rawCandidate
-  }
-
-  return rawCandidate
-}
-
-function* variants(candidate: Candidate) {
-  function* inner(variant: Variant): Iterable<Variant> {
-    yield variant
-    if (variant.kind === 'compound') {
-      yield* inner(variant.variant)
-    }
-  }
-
-  for (let variant of candidate.variants) {
-    yield* inner(variant)
-  }
-}
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/bg-gradient.test.ts b/packages/@tailwindcss-upgrade/src/template/codemods/bg-gradient.test.ts
deleted file mode 100644
index 3c42903c3..000000000
--- a/packages/@tailwindcss-upgrade/src/template/codemods/bg-gradient.test.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { __unstable__loadDesignSystem } from '@tailwindcss/node'
-import { expect, test } from 'vitest'
-import { bgGradient } from './bg-gradient'
-
-test.each([
-  ['bg-gradient-to-t', 'bg-linear-to-t'],
-  ['bg-gradient-to-tr', 'bg-linear-to-tr'],
-  ['bg-gradient-to-r', 'bg-linear-to-r'],
-  ['bg-gradient-to-br', 'bg-linear-to-br'],
-  ['bg-gradient-to-b', 'bg-linear-to-b'],
-  ['bg-gradient-to-bl', 'bg-linear-to-bl'],
-  ['bg-gradient-to-l', 'bg-linear-to-l'],
-  ['bg-gradient-to-tl', 'bg-linear-to-tl'],
-
-  ['max-lg:hover:bg-gradient-to-t', 'max-lg:hover:bg-linear-to-t'],
-])('%s => %s', async (candidate, result) => {
-  let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', {
-    base: __dirname,
-  })
-
-  expect(bgGradient(designSystem, {}, candidate)).toEqual(result)
-})
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/bg-gradient.ts b/packages/@tailwindcss-upgrade/src/template/codemods/bg-gradient.ts
deleted file mode 100644
index 02ad5590b..000000000
--- a/packages/@tailwindcss-upgrade/src/template/codemods/bg-gradient.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
-import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
-import { printCandidate } from '../candidates'
-
-const DIRECTIONS = ['t', 'tr', 'r', 'br', 'b', 'bl', 'l', 'tl']
-
-export function bgGradient(
-  designSystem: DesignSystem,
-  _userConfig: Config,
-  rawCandidate: string,
-): string {
-  for (let candidate of designSystem.parseCandidate(rawCandidate)) {
-    if (candidate.kind === 'static' && candidate.root.startsWith('bg-gradient-to-')) {
-      let direction = candidate.root.slice(15)
-
-      if (!DIRECTIONS.includes(direction)) {
-        continue
-      }
-
-      return printCandidate(designSystem, {
-        ...candidate,
-        root: `bg-linear-to-${direction}`,
-      })
-    }
-  }
-  return rawCandidate
-}
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/important.test.ts b/packages/@tailwindcss-upgrade/src/template/codemods/important.test.ts
deleted file mode 100644
index 60d78aa53..000000000
--- a/packages/@tailwindcss-upgrade/src/template/codemods/important.test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { __unstable__loadDesignSystem } from '@tailwindcss/node'
-import { expect, test } from 'vitest'
-import { important } from './important'
-
-test.each([
-  ['!flex', 'flex!'],
-  ['min-[calc(1000px+12em)]:!flex', 'min-[calc(1000px+12em)]:flex!'],
-  ['md:!block', 'md:block!'],
-
-  // Does not change non-important candidates
-  ['bg-blue-500', 'bg-blue-500'],
-  ['min-[calc(1000px+12em)]:flex', 'min-[calc(1000px+12em)]:flex'],
-])('%s => %s', async (candidate, result) => {
-  let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', {
-    base: __dirname,
-  })
-
-  expect(
-    important(designSystem, {}, candidate, {
-      contents: `"${candidate}"`,
-      start: 1,
-      end: candidate.length + 1,
-    }),
-  ).toEqual(result)
-})
-
-test('does not match false positives', async () => {
-  let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', {
-    base: __dirname,
-  })
-
-  expect(
-    important(designSystem, {}, '!border', {
-      contents: `let notBorder = !border\n`,
-      start: 16,
-      end: 16 + '!border'.length,
-    }),
-  ).toEqual('!border')
-})
-
-test('does not match false positives', async () => {
-  let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', {
-    base: __dirname,
-  })
-
-  function shouldNotDetect(example: string, candidate = '!border') {
-    expect(
-      important(designSystem, {}, candidate, {
-        contents: example,
-        start: example.indexOf(candidate),
-        end: example.indexOf(candidate) + candidate.length,
-      }),
-    ).toEqual('!border')
-  }
-
-  shouldNotDetect(`let notBorder = !border    \n`)
-  shouldNotDetect(`{ "foo": !border.something + ""}\n`)
-  shouldNotDetect(`<div v-if="something && !border"></div>\n`)
-  shouldNotDetect(`<div v-else-if="something && !border"></div>\n`)
-  shouldNotDetect(`<div v-show="something && !border"></div>\n`)
-  shouldNotDetect(`<div v-if="!border || !border"></div>\n`)
-  shouldNotDetect(`<div v-else-if="!border || !border"></div>\n`)
-  shouldNotDetect(`<div v-show="!border || !border"></div>\n`)
-  shouldNotDetect(`<div v-if="!border"></div>\n`)
-  shouldNotDetect(`<div v-else-if="!border"></div>\n`)
-  shouldNotDetect(`<div v-show="!border"></div>\n`)
-  shouldNotDetect(`<div x-if="!border"></div>\n`)
-})
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/important.ts b/packages/@tailwindcss-upgrade/src/template/codemods/important.ts
deleted file mode 100644
index 4f2c6871f..000000000
--- a/packages/@tailwindcss-upgrade/src/template/codemods/important.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { parseCandidate } from '../../../../tailwindcss/src/candidate'
-import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
-import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
-import { printCandidate } from '../candidates'
-import { isSafeMigration } from '../is-safe-migration'
-
-// In v3 the important modifier `!` sits in front of the utility itself, not
-// before any of the variants. In v4, we want it to be at the end of the utility
-// so that it's always in the same location regardless of whether you used
-// variants or not.
-//
-// So this:
-//
-//   !flex md:!block
-//
-// Should turn into:
-//
-//   flex! md:block!
-export function important(
-  designSystem: DesignSystem,
-  _userConfig: Config,
-  rawCandidate: string,
-  location?: {
-    contents: string
-    start: number
-    end: number
-  },
-): string {
-  nextCandidate: for (let candidate of parseCandidate(rawCandidate, designSystem)) {
-    if (candidate.important && candidate.raw[candidate.raw.length - 1] !== '!') {
-      // The important migration is one of the most broad migrations with a high
-      // potential of matching false positives since `!` is a valid character in
-      // most programming languages. Since v4 is technically backward compatible
-      // with v3 in that it can read `!` in the front of the utility too, we err
-      // on the side of caution and only migrate candidates that we are certain
-      // are inside of a string.
-      if (location && !isSafeMigration(location)) {
-        continue nextCandidate
-      }
-
-      // The printCandidate function will already put the exclamation mark in
-      // the right place, so we just need to mark this candidate as requiring a
-      // migration.
-      return printCandidate(designSystem, candidate)
-    }
-  }
-
-  return rawCandidate
-}
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/modernize-arbitrary-values.test.ts b/packages/@tailwindcss-upgrade/src/template/codemods/modernize-arbitrary-values.test.ts
deleted file mode 100644
index ec38d0864..000000000
--- a/packages/@tailwindcss-upgrade/src/template/codemods/modernize-arbitrary-values.test.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import { __unstable__loadDesignSystem } from '@tailwindcss/node'
-import { expect, test } from 'vitest'
-import { handleEmptyArbitraryValues } from './handle-empty-arbitrary-values'
-import { modernizeArbitraryValues } from './modernize-arbitrary-values'
-import { prefix } from './prefix'
-
-test.each([
-  // Arbitrary variants
-  ['[[data-visible]]:flex', 'data-visible:flex'],
-  ['[&[data-visible]]:flex', 'data-visible:flex'],
-  ['[[data-visible]&]:flex', 'data-visible:flex'],
-  ['[&>[data-visible]]:flex', '*:data-visible:flex'],
-  ['[&_>_[data-visible]]:flex', '*:data-visible:flex'],
-  ['[&>*]:flex', '*:flex'],
-  ['[&_>_*]:flex', '*:flex'],
-
-  ['[&_[data-visible]]:flex', '**:data-visible:flex'],
-  ['[&_*]:flex', '**:flex'],
-
-  ['[&:first-child]:flex', 'first:flex'],
-  ['[&:not(:first-child)]:flex', 'not-first:flex'],
-
-  // in-* variants
-  ['[p_&]:flex', 'in-[p]:flex'],
-  ['[.foo_&]:flex', 'in-[.foo]:flex'],
-  ['[[data-visible]_&]:flex', 'in-data-visible:flex'],
-  // Multiple selectors, should stay as-is
-  ['[[data-foo][data-bar]_&]:flex', '[[data-foo][data-bar]_&]:flex'],
-  // Using `>` instead of ` ` should not be transformed:
-  ['[figure>&]:my-0', '[figure>&]:my-0'],
-  // Some extreme examples of what happens in the wild:
-  ['group-[]:flex', 'in-[.group]:flex'],
-  ['group-[]/name:flex', 'in-[.group\\/name]:flex'],
-
-  // Migrate `peer-[]` to a parsable `peer-[&]` instead:
-  ['peer-[]:flex', 'peer-[&]:flex'],
-  ['peer-[]/name:flex', 'peer-[&]/name:flex'],
-
-  // These shouldn't happen in the real world (because compound variants are
-  // new). But this could happen once we allow codemods to run in v4+ projects.
-  ['has-group-[]:flex', 'has-in-[.group]:flex'],
-  ['has-group-[]/name:flex', 'has-in-[.group\\/name]:flex'],
-  ['not-group-[]:flex', 'not-in-[.group]:flex'],
-  ['not-group-[]/name:flex', 'not-in-[.group\\/name]:flex'],
-
-  // nth-child
-  ['[&:nth-child(2)]:flex', 'nth-2:flex'],
-  ['[&:not(:nth-child(2))]:flex', 'not-nth-2:flex'],
-
-  ['[&:nth-child(-n+3)]:flex', 'nth-[-n+3]:flex'],
-  ['[&:not(:nth-child(-n+3))]:flex', 'not-nth-[-n+3]:flex'],
-  ['[&:nth-child(-n_+_3)]:flex', 'nth-[-n+3]:flex'],
-  ['[&:not(:nth-child(-n_+_3))]:flex', 'not-nth-[-n+3]:flex'],
-
-  // nth-last-child
-  ['[&:nth-last-child(2)]:flex', 'nth-last-2:flex'],
-  ['[&:not(:nth-last-child(2))]:flex', 'not-nth-last-2:flex'],
-
-  ['[&:nth-last-child(-n+3)]:flex', 'nth-last-[-n+3]:flex'],
-  ['[&:not(:nth-last-child(-n+3))]:flex', 'not-nth-last-[-n+3]:flex'],
-  ['[&:nth-last-child(-n_+_3)]:flex', 'nth-last-[-n+3]:flex'],
-  ['[&:not(:nth-last-child(-n_+_3))]:flex', 'not-nth-last-[-n+3]:flex'],
-
-  // nth-child odd/even
-  ['[&:nth-child(odd)]:flex', 'odd:flex'],
-  ['[&:not(:nth-child(odd))]:flex', 'even:flex'],
-  ['[&:nth-child(even)]:flex', 'even:flex'],
-  ['[&:not(:nth-child(even))]:flex', 'odd:flex'],
-
-  // Keep multiple attribute selectors as-is
-  ['[[data-visible][data-dark]]:flex', '[[data-visible][data-dark]]:flex'],
-
-  // Complex attribute selectors with operators, quotes and insensitivity flags
-  ['[[data-url*="example"]]:flex', 'data-[url*="example"]:flex'],
-  ['[[data-url$=".com"_i]]:flex', 'data-[url$=".com"_i]:flex'],
-  ['[[data-url$=.com_i]]:flex', 'data-[url$=.com_i]:flex'],
-
-  // Attribute selector wrapped in `&:is(…)`
-  ['[&:is([data-visible])]:flex', 'data-visible:flex'],
-
-  // Compound arbitrary variants
-  ['has-[[data-visible]]:flex', 'has-data-visible:flex'],
-  ['has-[&:is([data-visible])]:flex', 'has-data-visible:flex'],
-  ['has-[&>[data-visible]]:flex', 'has-[&>[data-visible]]:flex'],
-
-  ['has-[[data-slot=description]]:flex', 'has-data-[slot=description]:flex'],
-  ['has-[&:is([data-slot=description])]:flex', 'has-data-[slot=description]:flex'],
-
-  ['has-[[aria-visible="true"]]:flex', 'has-aria-visible:flex'],
-  ['has-[[aria-visible]]:flex', 'has-aria-[visible]:flex'],
-
-  ['has-[&:not(:nth-child(even))]:flex', 'has-odd:flex'],
-])('%s => %s (%#)', async (candidate, result) => {
-  let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', {
-    base: __dirname,
-  })
-
-  expect(
-    [handleEmptyArbitraryValues, modernizeArbitraryValues].reduce(
-      (acc, step) => step(designSystem, {}, acc),
-      candidate,
-    ),
-  ).toEqual(result)
-})
-
-test.each([
-  // Should not prefix classes in arbitrary values
-  ['[.foo_&]:tw-flex', 'tw:in-[.foo]:flex'],
-
-  // Should migrate `.group` classes
-  ['group-[]:tw-flex', 'tw:in-[.tw\\:group]:flex'],
-  ['group-[]/name:tw-flex', 'tw:in-[.tw\\:group\\/name]:flex'],
-
-  // Migrate `peer-[]` to a parsable `peer-[&]` instead:
-  ['peer-[]:tw-flex', 'tw:peer-[&]:flex'],
-  ['peer-[]/name:tw-flex', 'tw:peer-[&]/name:flex'],
-
-  // However, `.group` inside of an arbitrary variant should not be prefixed:
-  ['[.group_&]:tw-flex', 'tw:in-[.group]:flex'],
-
-  // These shouldn't happen in the real world (because compound variants are
-  // new). But this could happen once we allow codemods to run in v4+ projects.
-  ['has-group-[]:tw-flex', 'tw:has-in-[.tw\\:group]:flex'],
-  ['has-group-[]/name:tw-flex', 'tw:has-in-[.tw\\:group\\/name]:flex'],
-  ['not-group-[]:tw-flex', 'tw:not-in-[.tw\\:group]:flex'],
-  ['not-group-[]/name:tw-flex', 'tw:not-in-[.tw\\:group\\/name]:flex'],
-])('%s => %s (%#)', async (candidate, result) => {
-  let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss" prefix(tw);', {
-    base: __dirname,
-  })
-
-  expect(
-    [handleEmptyArbitraryValues, prefix, modernizeArbitraryValues].reduce(
-      (acc, step) => step(designSystem, { prefix: 'tw-' }, acc),
-      candidate,
-    ),
-  ).toEqual(result)
-})
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/modernize-arbitrary-values.ts b/packages/@tailwindcss-upgrade/src/template/codemods/modernize-arbitrary-values.ts
deleted file mode 100644
index 3d90351b1..000000000
--- a/packages/@tailwindcss-upgrade/src/template/codemods/modernize-arbitrary-values.ts
+++ /dev/null
@@ -1,402 +0,0 @@
-import SelectorParser from 'postcss-selector-parser'
-import { parseCandidate, type Candidate, type Variant } from '../../../../tailwindcss/src/candidate'
-import type { Config } from '../../../../tailwindcss/src/compat/plugin-api'
-import type { DesignSystem } from '../../../../tailwindcss/src/design-system'
-import { isPositiveInteger } from '../../../../tailwindcss/src/utils/infer-data-type'
-import { printCandidate } from '../candidates'
-
-function memcpy<T extends object, U extends object | null>(target: T, source: U): U {
-  // Clear out the target object, otherwise inspecting the final object will
-  // look very confusing.
-  for (let key in target) delete target[key]
-
-  return Object.assign(target, source)
-}
-
-export function modernizeArbitraryValues(
-  designSystem: DesignSystem,
-  _userConfig: Config,
-  rawCandidate: string,
-): string {
-  for (let candidate of parseCandidate(rawCandidate, designSystem)) {
-    let clone = structuredClone(candidate)
-    let changed = false
-
-    for (let [variant, parent] of variants(clone)) {
-      // Forward modifier from the root to the compound variant
-      if (
-        variant.kind === 'compound' &&
-        (variant.root === 'has' || variant.root === 'not' || variant.root === 'in')
-      ) {
-        if (variant.modifier !== null) {
-          if ('modifier' in variant.variant) {
-            variant.variant.modifier = variant.modifier
-            variant.modifier = null
-          }
-        }
-      }
-
-      // Promote `group-[]:flex` to `in-[.group]:flex`
-      //                ^^ Yes, this is empty
-      // Promote `group-[]/name:flex` to `in-[.group\/name]:flex`
-      if (
-        variant.kind === 'compound' &&
-        variant.root === 'group' &&
-        variant.variant.kind === 'arbitrary' &&
-        variant.variant.selector === '&'
-      ) {
-        // `group-[]`
-        if (variant.modifier === null) {
-          changed = true
-          memcpy(
-            variant,
-            designSystem.parseVariant(
-              designSystem.theme.prefix
-                ? `in-[.${designSystem.theme.prefix}\\:group]`
-                : 'in-[.group]',
-            ),
-          )
-        }
-
-        // `group-[]/name`
-        else if (variant.modifier.kind === 'named') {
-          changed = true
-          memcpy(
-            variant,
-            designSystem.parseVariant(
-              designSystem.theme.prefix
-                ? `in-[.${designSystem.theme.prefix}\\:group\\/${variant.modifier.value}]`
-                : `in-[.group\\/${variant.modifier.value}]`,
-            ),
-          )
-        }
-        continue
-      }
-
-      // Expecting an arbitrary variant
-      if (variant.kind === 'arbitrary') {
-        // Expecting a non-relative arbitrary variant
-        if (variant.relative) continue
-
-        let ast = SelectorParser().astSync(variant.selector)
-
-        // Expecting a single selector node
-        if (ast.nodes.length !== 1) continue
-
-        // `[&>*]` can be replaced with `*`
-        if (
-          // Only top-level, so `has-[&>*]` is not supported
-          parent === null &&
-          // [&_>_*]:flex
-          //  ^ ^ ^
-          ast.nodes[0].length === 3 &&
-          ast.nodes[0].nodes[0].type === 'nesting' &&
-          ast.nodes[0].nodes[0].value === '&' &&
-          ast.nodes[0].nodes[1].type === 'combinator' &&
-          ast.nodes[0].nodes[1].value === '>' &&
-          ast.nodes[0].nodes[2].type === 'universal'
-        ) {
-          changed = true
-          memcpy(variant, designSystem.parseVariant('*'))
-          continue
-        }
-
-        // `[&_*]` can be replaced with `**`
-        if (
-          // Only top-level, so `has-[&_*]` is not supported
-          parent === null &&
-          // [&_*]:flex
-          //  ^ ^
-          ast.nodes[0].length === 3 &&
-          ast.nodes[0].nodes[0].type === 'nesting' &&
-          ast.nodes[0].nodes[0].value === '&' &&
-          ast.nodes[0].nodes[1].type === 'combinator' &&
-          ast.nodes[0].nodes[1].value === ' ' &&
-          ast.nodes[0].nodes[2].type === 'universal'
-        ) {
-          changed = true
-          memcpy(variant, designSystem.parseVariant('**'))
-          continue
-        }
-
-        // `in-*` variant. If the selector ends with ` &`, we can convert it to an
-        // `in-*` variant.
-        //
-        // E.g.: `[[data-visible]_&]` => `in-data-visible`
-        if (
-          // Only top-level, so `in-[&_[data-visible]]` is not supported
-          parent === null &&
-          // [[data-visible]___&]:flex
-          //  ^^^^^^^^^^^^^^ ^ ^
-          ast.nodes[0].nodes.length === 3 &&
-          ast.nodes[0].nodes[1].type === 'combinator' &&
-          ast.nodes[0].nodes[1].value === ' ' &&
-          ast.nodes[0].nodes[2].type === 'nesting'
-        ) {
-          ast.nodes[0].nodes.pop() // Remove the nesting node
-          ast.nodes[0].nodes.pop() // Remove the combinator
-
-          changed = true
-          // When handling a compound like `in-[[data-visible]]`, we will first
-          // handle `[[data-visible]]`, then the parent `in-*` part. This means
-          // that we can convert `[[data-visible]_&]` to `in-[[data-visible]]`.
-          //
-          // Later this gets converted to `in-data-visible`.
-          memcpy(variant, designSystem.parseVariant(`in-[${ast.toString()}]`))
-          continue
-        }
-
-        let prefixedVariant: Variant | null = null
-
-        // Handling a child combinator. E.g.: `[&>[data-visible]]` => `*:data-visible`
-        if (
-          // Only top-level, so `has-[&>[data-visible]]` is not supported
-          parent === null &&
-          // [&_>_[data-visible]]:flex
-          //  ^ ^ ^^^^^^^^^^^^^^
-          ast.nodes[0].length === 3 &&
-          ast.nodes[0].nodes[0].type === 'nesting' &&
-          ast.nodes[0].nodes[0].value === '&' &&
-          ast.nodes[0].nodes[1].type === 'combinator' &&
-          ast.nodes[0].nodes[1].value === '>' &&
-          ast.nodes[0].nodes[2].type === 'attribute'
-        ) {
-          ast.nodes[0].nodes = [ast.nodes[0].nodes[2]]
-          prefixedVariant = designSystem.parseVariant('*')
-        }
-
-        // Handling a grand child combinator. E.g.: `[&_[data-visible]]` => `**:data-visible`
-        if (
-          // Only top-level, so `has-[&_[data-visible]]` is not supported
-          parent === null &&
-          // [&_[data-visible]]:flex
-          //  ^ ^^^^^^^^^^^^^^
-          ast.nodes[0].length === 3 &&
-          ast.nodes[0].nodes[0].type === 'nesting' &&
-          ast.nodes[0].nodes[0].value === '&' &&
-          ast.nodes[0].nodes[1].type === 'combinator' &&
-          ast.nodes[0].nodes[1].value === ' ' &&
-          ast.nodes[0].nodes[2].type === 'attribute'
-        ) {
-          ast.nodes[0].nodes = [ast.nodes[0].nodes[2]]
-          prefixedVariant = designSystem.parseVariant('**')
-        }
-
-        // Filter out `&`. E.g.: `&[data-foo]` => `[data-foo]`
-        let selectorNodes = ast.nodes[0].filter((node) => node.type !== 'nesting')
-
-        // Expecting a single selector (normal selector or attribute selector)
-        if (selectorNodes.length !== 1) continue
-
-        let target = selectorNodes[0]
-        if (target.type === 'pseudo' && target.value === ':is') {
-          // Expecting a single selector node
-          if (target.nodes.length !== 1) continue
-
-          // Expecting a single attribute selector
-          if (target.nodes[0].nodes.length !== 1) continue
-
-          // Unwrap the selector from inside `&:is(…)`
-          target = target.nodes[0].nodes[0]
-        }
-
-        // Expecting a pseudo selector
-        if (target.type === 'pseudo') {
-          let targetNode = target
-          let compoundNot = false
-          if (target.value === ':not') {
-            compoundNot = true
-            if (target.nodes.length !== 1) continue
-            if (target.nodes[0].type !== 'selector') continue
-            if (target.nodes[0].nodes.length !== 1) continue
-            if (target.nodes[0].nodes[0].type !== 'pseudo') continue
-
-            targetNode = target.nodes[0].nodes[0]
-          }
-
-          let newVariant = ((value) => {
-            //
-            if (value === ':first-letter') return 'first-letter'
-            else if (value === ':first-line') return 'first-line'
-            //
-            else if (value === ':file-selector-button') return 'file'
-            else if (value === ':placeholder') return 'placeholder'
-            else if (value === ':backdrop') return 'backdrop'
-            // Positional
-            else if (value === ':first-child') return 'first'
-            else if (value === ':last-child') return 'last'
-            else if (value === ':only-child') return 'only'
-            else if (value === ':first-of-type') return 'first-of-type'
-            else if (value === ':last-of-type') return 'last-of-type'
-            else if (value === ':only-of-type') return 'only-of-type'
-            // State
-            else if (value === ':visited') return 'visited'
-            else if (value === ':target') return 'target'
-            // Forms
-            else if (value === ':default') return 'default'
-            else if (value === ':checked') return 'checked'
-            else if (value === ':indeterminate') return 'indeterminate'
-            else if (value === ':placeholder-shown') return 'placeholder-shown'
-            else if (value === ':autofill') return 'autofill'
-            else if (value === ':optional') return 'optional'
-            else if (value === ':required') return 'required'
-            else if (value === ':valid') return 'valid'
-            else if (value === ':invalid') return 'invalid'
-            else if (value === ':in-range') return 'in-range'
-            else if (value === ':out-of-range') return 'out-of-range'
-            else if (value === ':read-only') return 'read-only'
-            // Content
-            else if (value === ':empty') return 'empty'
-            // Interactive
-            else if (value === ':focus-within') return 'focus-within'
-            else if (value === ':focus') return 'focus'
-            else if (value === ':focus-visible') return 'focus-visible'
-            else if (value === ':active') return 'active'
-            else if (value === ':enabled') return 'enabled'
-            else if (value === ':disabled') return 'disabled'
-            //
-            if (
-              value === ':nth-child' &&
-              targetNode.nodes.length === 1 &&
-              targetNode.nodes[0].nodes.length === 1 &&
-              targetNode.nodes[0].nodes[0].type === 'tag' &&
-              targetNode.nodes[0].nodes[0].value === 'odd'
-            ) {
-              if (compoundNot) {
-                compoundNot = false
-                return 'even'
-              }
-              return 'odd'
-            }
-            if (
-              value === ':nth-child' &&
-              targetNode.nodes.length === 1 &&
-              targetNode.nodes[0].nodes.length === 1 &&
-              targetNode.nodes[0].nodes[0].type === 'tag' &&
-              targetNode.nodes[0].nodes[0].value === 'even'
-            ) {
-              if (compoundNot) {
-                compoundNot = false
-                return 'odd'
-              }
-              return 'even'
-            }
-
-            for (let [selector, variantName] of [
-              [':nth-child', 'nth'],
-              [':nth-last-child', 'nth-last'],
-              [':nth-of-type', 'nth-of-type'],
-              [':nth-last-of-type', 'nth-of-last-type'],
-            ]) {
-              if (value === selector && targetNode.nodes.length === 1) {
-                if (
-                  targetNode.nodes[0].nodes.length === 1 &&
-                  targetNode.nodes[0].nodes[0].type === 'tag' &&
-                  isPositiveInteger(targetNode.nodes[0].nodes[0].value)
-                ) {
-                  return `${variantName}-${targetNode.nodes[0].nodes[0].value}`
-                }
-
-                return `${variantName}-[${targetNode.nodes[0].toString()}]`
-              }
-            }
-
-            return null
-          })(targetNode.value)
-
-          if (newVariant === null) continue
-
-          // Add `not-` prefix
-          if (compoundNot) newVariant = `not-${newVariant}`
-
-          let parsed = designSystem.parseVariant(newVariant)
-          if (parsed === null) continue
-
-          // Update original variant
-          changed = true
-          memcpy(variant, parsed)
-        }
-
-        // Expecting an attribute selector
-        else if (target.type === 'attribute') {
-          // Attribute selectors
-          let attributeKey = target.attribute
-          let attributeValue = target.value
-            ? target.quoted
-              ? `${target.quoteMark}${target.value}${target.quoteMark}`
-              : target.value
-            : null
-
-          // Insensitive attribute selectors. E.g.: `[data-foo="value" i]`
-          //                                                           ^
-          if (target.insensitive && attributeValue) {
-            attributeValue += ' i'
-          }
-
-          let operator = target.operator ?? '='
-
-          // Migrate `data-*`
-          if (attributeKey.startsWith('data-')) {
-            changed = true
-            attributeKey = attributeKey.slice(5) // Remove `data-`
-            memcpy(variant, {
-              kind: 'functional',
-              root: 'data',
-              modifier: null,
-              value:
-                attributeValue === null
-                  ? { kind: 'named', value: attributeKey }
-                  : { kind: 'arbitrary', value: `${attributeKey}${operator}${attributeValue}` },
-            } satisfies Variant)
-          }
-
-          // Migrate `aria-*`
-          else if (attributeKey.startsWith('aria-')) {
-            changed = true
-            attributeKey = attributeKey.slice(5) // Remove `aria-`
-            memcpy(variant, {
-              kind: 'functional',
-              root: 'aria',
-              modifier: null,
-              value:
-                attributeValue === null
-                  ? { kind: 'arbitrary', value: attributeKey } // aria-[foo]
-                  : operator === '=' && target.value === 'true' && !target.insensitive
-                    ? { kind: 'named', value: attributeKey } // aria-[foo="true"] or aria-[foo='true'] or aria-[foo=true]
-                    : { kind: 'arbitrary', value: `${attributeKey}${operator}${attributeValue}` }, // aria-[foo~="true"], aria-[foo|="true"], …
-            } satisfies Variant)
-          }
-        }
-
-        if (prefixedVariant) {
-          let idx = clone.variants.indexOf(variant)
-          if (idx === -1) continue
-
-          // Ensure we inject the prefixed variant
-          clone.variants.splice(idx, 1, variant, prefixedVariant)
-        }
-      }
-    }
-
-    return changed ? printCandidate(designSystem, clone) : rawCandidate
-  }
-
-  return rawCandidate
-}
-
-function* variants(candidate: Candidate) {
-  function* inner(
-    variant: Variant,
-    parent: Extract<Variant, { kind: 'compound' }> | null = null,
-  ): Iterable<[Variant, Extract<Variant, { kind: 'compound' }> | null]> {
-    yield [variant, parent]
-
-    if (variant.kind === 'compound') {
-      yield* inner(variant.variant, variant)
-    }
-  }
-
-  for (let variant of candidate.variants) {
-    yield* inner(variant, null)
-  }
-}
diff --git a/packages/@tailwindcss-upgrade/src/template/codemods/theme-to-var.test.ts b/packages/@tailwindcss-upgrade/src/template/codemods/theme-to-var.test.ts
deleted file mode 100644
index f5f2a41db..000000000
--- a/packages/@tailwindcss-upgrade/src/template/codemods/theme-to-var.test.ts
+++ /dev/null
@@ -1,191 +0,0 @@
-import { __unstable__loadDesignSystem } from '@tailwindcss/node'
-import { expect, test } from 'vitest'
-import { themeToVar } from './theme-to-var'
-
-let css = String.raw
-
-test.each([
-  // Keep candidates that don't contain `theme(…)` or `theme(…, …)`
-  ['[color:red]', '[color:red]'],
-
-  // Handle special cases around `.1` in the `theme(…)`
-  ['[--value:theme(spacing.1)]', '[--value:calc(var(--spacing)*1)]'],
-  ['[--value:theme(fontSize.xs.1.lineHeight)]', '[--value:var(--text-xs--line-height)]'],
-  ['[--value:theme(spacing[1.25])]', '[--value:calc(var(--spacing)*1.25)]'],
-
-  // Should not convert invalid spacing values to calc
-  ['[--value:theme(spacing[1.1])]', '[--value:theme(spacing[1.1])]'],
-
-  // Convert to `var(…)` if we can resolve the path
-  ['[color:theme(colors.red.500)]', '[color:var(--color-red-500)]'], // Arbitrary property
-  ['[color:theme(colors.red.500)]/50', '[color:var(--color-red-500)]/50'], // Arbitrary property + modifier
-  ['bg-[theme(colors.red.500)]', 'bg-(--color-red-500)'], // Arbitrary value
-  ['bg-[size:theme(spacing.4)]', 'bg-[size:calc(var(--spacing)*4)]'], // Arbitrary value + data type hint
-
-  // Convert to `var(…)` if we can resolve the path, but keep fallback values
-  ['bg-[theme(colors.red.500,red)]', 'bg-(--color-red-500,red)'],
-
-  // Keep `theme(…)` if we can't resolve the path
-  ['bg-[theme(colors.foo.1000)]', 'bg-[theme(colors.foo.1000)]'],
-
-  // Keep `theme(…)` if we can't resolve the path, but still try to convert the
-  // fallback value.
-  [
-    'bg-[theme(colors.foo.1000,theme(colors.red.500))]',
-    'bg-[theme(colors.foo.1000,var(--color-red-500))]',
-  ],
-
-  // Use `theme(…)` (deeply nested) inside of a `calc(…)` function
-  ['text-[calc(theme(fontSize.xs)*2)]', 'text-[calc(var(--text-xs)*2)]'],
-
-  // Multiple `theme(… / …)` calls should result in modern syntax of `theme(…)`
-  // - Can't convert to `var(…)` because that would lose the modifier.
-  // - Can't convert to a candidate modifier because there are multiple
-  //   `theme(…)` calls.
-  //
-  //   If we really want to, we can make a fancy migration that tries to move it
-  //   to a candidate modifier _if_ all `theme(…)` calls use the same modifier.
-  [
-    '[color:theme(colors.red.500/50,theme(colors.blue.500/50))]',
-    '[color:theme(--color-red-500/50,theme(--color-blue-500/50))]',
-  ],
-  [
-    '[color:theme(colors.red.500/50,theme(colors.blue.500/50))]/50',
-    '[color:theme(--color-red-500/50,theme(--color-blue-500/50))]/50',
-  ],
-
-  // Convert the `theme(…)`, but try to move the inline modifier (e.g. `50%`),
-  // to a candidate modifier.
-  // Arbitrary property, with simple percentage modifier
-  ['[color:theme(colors.red.500/75%)]', '[color:var(--color-red-500)]/75'],
-
-  // Arbitrary property, with numbers (0-1) without a unit
-  ['[color:theme(colors.red.500/.12)]', '[color:var(--color-red-500)]/12'],
-  ['[color:theme(colors.red.500/0.12)]', '[color:var(--color-red-500)]/12'],
-
-  // Arbitrary property, with more complex modifier (we only allow whole numbers
-  // as bare modifiers). Convert the complex numbers to arbitrary values instead.
-  ['[color:theme(colors.red.500/12.34%)]', '[color:var(--color-red-500)]/[12.34%]'],
-  ['[color:theme(colors.red.500/var(--opacity))]', '[color:var(--color-red-500)]/(--opacity)'],
-  ['[color:theme(colors.red.500/.12345)]', '[color:var(--color-red-500)]/[12.345]'],
-  ['[color:theme(colors.red.500/50.25%)]', '[color:var(--color-red-500)]/[50.25%]'],
-
-  // Arbitrary value
-  ['bg-[theme(colors.red.500/75%)]', 'bg-(--color-red-500)/75'],
-  ['bg-[theme(colors.red.500/12.34%)]', 'bg-(--color-red-500)/[12.34%]'],
-
-  // Arbitrary property that already contains a modifier
-  ['[color:theme(colors.red.500/50%)]/50', '[color:theme(--color-red-500/50%)]/50'],
-
-  // Values that don't contain only `theme(…)` calls should not be converted to
-  // use a modifier since the color is not the whole value.
-  [
-    'shadow-[shadow:inset_0px_1px_theme(colors.white/15%)]',
-    'shadow-[shadow:inset_0px_1px_theme(--color-white/15%)]',
-  ],
-
-  // Arbitrary value, where the candidate already contains a modifier
-  // This should still migrate the `theme(…)` syntax to the modern syntax.
-  ['bg-[theme(colors.red.500/50%)]/50', 'bg-[theme(--color-red-500/50%)]/50'],
-
-  // Variants, we can't use `var(…)` especially inside of `@media(…)`. We can
-  // still upgrade the `theme(…)` to the modern syntax.
-  ['max-[theme(screens.lg)]:flex', 'max-[theme(--breakpoint-lg)]:flex'],
-  // There are no variables for `--spacing` multiples, so we can't convert this
-  ['max-[theme(spacing.4)]:flex', 'max-[theme(spacing.4)]:flex'],
-
-  // This test in itself doesn't make much sense. But we need to make sure
-  // that this doesn't end up as the modifier in the candidate itself.
-  ['max-[theme(spacing.4/50)]:flex', 'max-[theme(spacing.4/50)]:flex'],
-
-  // `theme(…)` calls in another CSS function is replaced correctly.
-  // Additionally we remove unnecessary whitespace.
-  [
-    'grid-cols-[min(50%_,_theme(spacing.80))_auto]',
-    'grid-cols-[min(50%,calc(var(--spacing)*80))_auto]',
-  ],
-
-  // `theme(…)` calls valid in v3, but not in v4 should still be converted.
-  ['[--foo:theme(transitionDuration.500)]', '[--foo:theme(transitionDuration.500)]'],
-
-  // Renamed theme keys
-  ['max-w-[theme(screens.md)]', 'max-w-(--breakpoint-md)'],
-  ['w-[theme(maxWidth.md)]', 'w-(--container-md)'],
-
-  // Invalid cases
-  ['[--foo:theme(colors.red.500/50/50)]', '[--foo:theme(colors.red.500/50/50)]'],
-  ['[--foo:theme(colors.red.500/50/50)]/50', '[--foo:theme(colors.red.500/50/50)]/50'],
-
-  // Partially invalid cases
-  [
-    '[--foo:theme(colors.red.500/50/50)_theme(colors.blue.200)]',
-    '[--foo:theme(colors.red.500/50/50)_var(--color-blue-200)]',
-  ],
-  [
-    '[--foo:theme(colors.red.500/50/50)_theme(colors.blue.200)]/50',
-    '[--foo:theme(colors.red.500/50/50)_var(--color-blue-200)]/50',
-  ],
-])('%s => %s', async (candidate, result) => {
-  let designSystem = await __unstable__loadDesignSystem(
-    css`
-      @import 'tailwindcss';
-    `,
-    {
-      base: __dirname,
-    },
-  )
-
-  expect(themeToVar(designSystem, {}, candidate)).toEqual(result)
-})
-
-test('extended space scale converts to var or calc', async () => {
-  let designSystem = await __unstable__loadDesignSystem(
-    css`
-      @import 'tailwindcss';
-      @theme {
-        --spacing-2: 2px;
-        --spacing-miami: 0.875rem;
-      }
-    `,
-    {
-      base: __dirname,
-    },
-  )
-  expect(themeToVar(designSystem, {}, '[--value:theme(spacing.1)]')).toEqual(
-    '[--value:calc(var(--spacing)*1)]',
-  )
-  expect(themeToVar(designSystem, {}, '[--value:theme(spacing.2)]')).toEqual(
-    '[--value:var(--spacing-2)]',
-  )
-  expect(themeToVar(designSystem, {}, '[--value:theme(spacing.miami)]')).toEqual(
-    '[--value:var(--spacing-miami)]',
-  )
-  expect(themeToVar(designSystem, {}, '[--value:theme(spacing.nyc)]')).toEqual(
-    '[--value:theme(spacing.nyc)]',
-  )
-})
-
-test('custom space scale converts to var', async () => {
-  let designSystem = await __unstable__loadDesignSystem(
-    css`
-      @import 'tailwindcss';
-      @theme {
-        --spacing-*: initial;
-        --spacing-1: 0.25rem;
-        --spacing-2: 0.5rem;
-      }
-    `,
-    {
-      base: __dirname,
-    },
-  )
-  expect(themeToVar(designSystem, {}, '[--value:theme(spacing.1)]')).toEqual(
-    '[--value:var(--spacing-1)]',
-  )
-  expect(themeToVar(designSystem, {}, '[--value:theme(spacing.2)]')).toEqual(
-    '[--value:var(--spacing-2)]',
-  )
-  expect(themeToVar(designSystem, {}, '[--value:theme(spacing.3)]')).toEqual(
-    '[--value:theme(spacing.3)]',
-  )
-})
diff --git a/packages/@tailwindcss-upgrade/src/template/is-safe-migration.ts b/packages/@tailwindcss-upgrade/src/template/is-safe-migration.ts
deleted file mode 100644
index 046ee10e6..000000000
--- a/packages/@tailwindcss-upgrade/src/template/is-safe-migration.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-const QUOTES = ['"', "'", '`']
-const LOGICAL_OPERATORS = ['&&', '||', '?', '===', '==', '!=', '!==', '>', '>=', '<', '<=']
-const CONDITIONAL_TEMPLATE_SYNTAX = [
-  // Vue
-  /v-else-if=['"]$/,
-  /v-if=['"]$/,
-  /v-show=['"]$/,
-
-  // Alpine
-  /x-if=['"]$/,
-  /x-show=['"]$/,
-]
-
-export function isSafeMigration(location: { contents: string; start: number; end: number }) {
-  let currentLineBeforeCandidate = ''
-  for (let i = location.start - 1; i >= 0; i--) {
-    let char = location.contents.at(i)!
-    if (char === '\n') {
-      break
-    }
-    currentLineBeforeCandidate = char + currentLineBeforeCandidate
-  }
-  let currentLineAfterCandidate = ''
-  for (let i = location.end; i < location.contents.length; i++) {
-    let char = location.contents.at(i)!
-    if (char === '\n') {
-      break
-    }
-    currentLineAfterCandidate += char
-  }
-
-  // Heuristic 1: Require the candidate to be inside quotes
-  let isQuoteBeforeCandidate = QUOTES.some((quote) => currentLineBeforeCandidate.includes(quote))
-  let isQuoteAfterCandidate = QUOTES.some((quote) => currentLineAfterCandidate.includes(quote))
-  if (!isQuoteBeforeCandidate || !isQuoteAfterCandidate) {
-    return false
-  }
-
-  // Heuristic 2: Disallow object access immediately following the candidate
-  if (currentLineAfterCandidate[0] === '.') {
-    return false
-  }
-
-  // Heuristic 3: Disallow logical operators preceding or following the candidate
-  for (let operator of LOGICAL_OPERATORS) {
-    if (
-      currentLineAfterCandidate.trim().startsWith(operator) ||
-      currentLineBeforeCandidate.trim().endsWith(operator)
-    ) {
-      return false
-    }
-  }
-
-  // Heuristic 4: Disallow conditional template syntax
-  for (let rule of CONDITIONAL_TEMPLATE_SYNTAX) {
-    if (rule.test(currentLineBeforeCandidate)) {
-      return false
-    }
-  }
-
-  return true
-}
diff --git a/packages/@tailwindcss-upgrade/src/template/migrate.ts b/packages/@tailwindcss-upgrade/src/template/migrate.ts
deleted file mode 100644
index 7fdc164f2..000000000
--- a/packages/@tailwindcss-upgrade/src/template/migrate.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import fs from 'node:fs/promises'
-import path, { extname } from 'node:path'
-import type { Config } from '../../../tailwindcss/src/compat/plugin-api'
-import type { DesignSystem } from '../../../tailwindcss/src/design-system'
-import { extractRawCandidates } from './candidates'
-import { arbitraryValueToBareValue } from './codemods/arbitrary-value-to-bare-value'
-import { automaticVarInjection } from './codemods/automatic-var-injection'
-import { bgGradient } from './codemods/bg-gradient'
-import { handleEmptyArbitraryValues } from './codemods/handle-empty-arbitrary-values'
-import { important } from './codemods/important'
-import { legacyArbitraryValues } from './codemods/legacy-arbitrary-values'
-import { legacyClasses } from './codemods/legacy-classes'
-import { maxWidthScreen } from './codemods/max-width-screen'
-import { modernizeArbitraryValues } from './codemods/modernize-arbitrary-values'
-import { prefix } from './codemods/prefix'
-import { simpleLegacyClasses } from './codemods/simple-legacy-classes'
-import { themeToVar } from './codemods/theme-to-var'
-import { variantOrder } from './codemods/variant-order'
-import { spliceChangesIntoString, type StringChange } from './splice-changes-into-string'
-
-export type Migration = (
-  designSystem: DesignSystem,
-  userConfig: Config,
-  rawCandidate: string,
-  location?: {
-    contents: string
-    start: number
-    end: number
-  },
-) => string | Promise<string>
-
-export const DEFAULT_MIGRATIONS: Migration[] = [
-  handleEmptyArbitraryValues,
-  prefix,
-  important,
-  bgGradient,
-  simpleLegacyClasses,
-  legacyClasses,
-  maxWidthScreen,
-  themeToVar,
-  variantOrder, // Has to happen before migrations that modify variants
-  automaticVarInjection,
-  legacyArbitraryValues,
-  arbitraryValueToBareValue,
-  modernizeArbitraryValues,
-]
-
-export async function migrateCandidate(
-  designSystem: DesignSystem,
-  userConfig: Config,
-  rawCandidate: string,
-  // Location is only set when migrating a candidate from a source file
-  location?: {
-    contents: string
-    start: number
-    end: number
-  },
-): Promise<string> {
-  for (let migration of DEFAULT_MIGRATIONS) {
-    rawCandidate = await migration(designSystem, userConfig, rawCandidate, location)
-  }
-  return rawCandidate
-}
-
-export default async function migrateContents(
-  designSystem: DesignSystem,
-  userConfig: Config,
-  contents: string,
-  extension: string,
-): Promise<string> {
-  let candidates = await extractRawCandidates(contents, extension)
-
-  let changes: StringChange[] = []
-
-  for (let { rawCandidate, start, end } of candidates) {
-    let migratedCandidate = await migrateCandidate(designSystem, userConfig, rawCandidate, {
-      contents,
-      start,
-      end,
-    })
-
-    if (migratedCandidate === rawCandidate) {
-      continue
-    }
-
-    changes.push({
-      start,
-      end,
-      replacement: migratedCandidate,
-    })
-  }
-
-  return spliceChangesIntoString(contents, changes)
-}
-
-export async function migrate(designSystem: DesignSystem, userConfig: Config, file: string) {
-  let fullPath = path.isAbsolute(file) ? file : path.resolve(process.cwd(), file)
-  let contents = await fs.readFile(fullPath, 'utf-8')
-
-  await fs.writeFile(
-    fullPath,
-    await migrateContents(designSystem, userConfig, contents, extname(file)),
-  )
-}
diff --git a/packages/@tailwindcss-upgrade/src/utils/git.ts b/packages/@tailwindcss-upgrade/src/utils/git.ts
index d716fbb8a..38edf21cb 100644
--- a/packages/@tailwindcss-upgrade/src/utils/git.ts
+++ b/packages/@tailwindcss-upgrade/src/utils/git.ts
@@ -1,8 +1,20 @@
 import { execSync } from 'node:child_process'
 
-export function isRepoDirty() {
+export function gitRoot(cwd?: string): string | null {
   try {
-    let stdout = execSync('git status --porcelain', { encoding: 'utf-8' })
+    return execSync('git rev-parse --show-toplevel', {
+      encoding: 'utf-8',
+      cwd,
+      stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim()
+  } catch {
+    return null
+  }
+}
+
+export function isRepoDirty(cwd?: string) {
+  try {
+    let stdout = execSync('git status --porcelain', { encoding: 'utf-8', cwd })
     return stdout.trim() !== ''
   } catch (error) {
     // If it's not a git repository we don't know if it's dirty or not. But we
diff --git a/packages/@tailwindcss-upgrade/src/utils/hoist-static-glob-parts.test.ts b/packages/@tailwindcss-upgrade/src/utils/hoist-static-glob-parts.test.ts
deleted file mode 100644
index 1e6d8b1e8..000000000
--- a/packages/@tailwindcss-upgrade/src/utils/hoist-static-glob-parts.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { expect, it } from 'vitest'
-import { hoistStaticGlobParts } from './hoist-static-glob-parts'
-
-it.each([
-  // A basic glob
-  [
-    { base: '/projects/project-a', pattern: './src/**/*.html' },
-    [{ base: '/projects/project-a/src', pattern: '**/*.html' }],
-  ],
-
-  // A glob pointing to a folder should result in `**/*`
-  [
-    { base: '/projects/project-a', pattern: './src' },
-    [{ base: '/projects/project-a/src', pattern: '**/*' }],
-  ],
-
-  // A glob pointing to a file, should result in the file as the pattern
-  [
-    { base: '/projects/project-a', pattern: './src/index.html' },
-    [{ base: '/projects/project-a/src', pattern: 'index.html' }],
-  ],
-
-  // A glob going up a directory, should result in the new directory as the base
-  [
-    { base: '/projects/project-a', pattern: '../project-b/src/**/*.html' },
-    [{ base: '/projects/project-b/src', pattern: '**/*.html' }],
-  ],
-
-  // A glob with curlies, should be expanded to multiple globs
-  [
-    { base: '/projects/project-a', pattern: '../project-{b,c}/src/**/*.html' },
-    [
-      { base: '/projects/project-b/src', pattern: '**/*.html' },
-      { base: '/projects/project-c/src', pattern: '**/*.html' },
-    ],
-  ],
-  [
-    { base: '/projects/project-a', pattern: '../project-{b,c}/src/**/*.{js,html}' },
-    [
-      { base: '/projects/project-b/src', pattern: '**/*.js' },
-      { base: '/projects/project-b/src', pattern: '**/*.html' },
-      { base: '/projects/project-c/src', pattern: '**/*.js' },
-      { base: '/projects/project-c/src', pattern: '**/*.html' },
-    ],
-  ],
-])('should hoist the static parts of the glob: %s', (input, output) => {
-  expect(hoistStaticGlobParts(input)).toEqual(output)
-})
diff --git a/packages/@tailwindcss-upgrade/src/utils/hoist-static-glob-parts.ts b/packages/@tailwindcss-upgrade/src/utils/hoist-static-glob-parts.ts
deleted file mode 100644
index 18d587998..000000000
--- a/packages/@tailwindcss-upgrade/src/utils/hoist-static-glob-parts.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { normalizePath } from '@tailwindcss/node'
-import braces from 'braces'
-import path from 'node:path'
-
-interface GlobEntry {
-  base: string
-  pattern: string
-}
-
-export function hoistStaticGlobParts(entry: GlobEntry): GlobEntry[] {
-  return braces(entry.pattern, { expand: true }).map((pattern) => {
-    let clone = { ...entry }
-    let [staticPart, dynamicPart] = splitPattern(pattern)
-
-    // Move static part into the `base`.
-    let absolutePosixPath = normalizePath(entry.base)
-
-    if (staticPart !== null) {
-      clone.base = path.posix.join(absolutePosixPath, staticPart)
-    } else {
-      clone.base = absolutePosixPath
-    }
-
-    // Move dynamic part into the `pattern`.
-    if (dynamicPart === null) {
-      clone.pattern = '**/*'
-    } else {
-      clone.pattern = dynamicPart
-    }
-
-    // If the pattern looks like a file, move the file name from the `base` to
-    // the `pattern`.
-    let file = path.basename(clone.base)
-    if (file.includes('.')) {
-      clone.pattern = file
-      clone.base = path.dirname(clone.base)
-    }
-
-    return clone
-  })
-}
-
-// Split a glob pattern into a `static` and `dynamic` part.
-//
-// Assumption: we assume that all globs are expanded, which means that the only
-// dynamic parts are using `*`.
-//
-// E.g.:
-//  Original input: `../project-b/**/*.{html,js}`
-//  Expanded input: `../project-b/**/*.html` & `../project-b/**/*.js`
-//  Split on first input: ("../project-b", "**/*.html")
-//  Split on second input: ("../project-b", "**/*.js")
-function splitPattern(pattern: string): [staticPart: string | null, dynamicPart: string | null] {
-  // No dynamic parts, so we can just return the input as-is.
-  if (!pattern.includes('*')) {
-    return [pattern, null]
-  }
-
-  let lastSlashPosition: number | null = null
-
-  for (let i = 0; i < pattern.length; i++) {
-    let c = pattern[i]
-    if (c === '/') {
-      lastSlashPosition = i
-    }
-
-    if (c === '*' || c === '!') {
-      break
-    }
-  }
-
-  // Very first character is a `*`, therefore there is no static part, only a
-  // dynamic part.
-  if (lastSlashPosition === null) {
-    return [null, pattern]
-  }
-
-  let staticPart = pattern.slice(0, lastSlashPosition).trim()
-  let dynamicPart = pattern.slice(lastSlashPosition + 1).trim()
-
-  return [staticPart || null, dynamicPart || null]
-}
diff --git a/packages/@tailwindcss-upgrade/src/utils/package-version.ts b/packages/@tailwindcss-upgrade/src/utils/package-version.ts
index 833ccadf2..64a1e7ed1 100644
--- a/packages/@tailwindcss-upgrade/src/utils/package-version.ts
+++ b/packages/@tailwindcss-upgrade/src/utils/package-version.ts
@@ -1,3 +1,4 @@
+import { readFileSync } from 'node:fs'
 import fs from 'node:fs/promises'
 import { resolveJsId } from './resolve'
 
@@ -15,3 +16,14 @@ export async function getPackageVersion(pkg: string, base: string): Promise<stri
     return null
   }
 }
+
+export function getPackageVersionSync(pkg: string, base: string): string | null {
+  try {
+    let packageJson = resolveJsId(`${pkg}/package.json`, base)
+    if (!packageJson) return null
+    let { version } = JSON.parse(readFileSync(packageJson, 'utf8'))
+    return version
+  } catch {
+    return null
+  }
+}
diff --git a/packages/@tailwindcss-upgrade/src/utils/packages.ts b/packages/@tailwindcss-upgrade/src/utils/packages.ts
index 0c6de1063..461a6983a 100644
--- a/packages/@tailwindcss-upgrade/src/utils/packages.ts
+++ b/packages/@tailwindcss-upgrade/src/utils/packages.ts
@@ -1,9 +1,10 @@
 import { exec as execCb } from 'node:child_process'
+import { readFileSync } from 'node:fs'
 import fs from 'node:fs/promises'
 import { dirname, resolve } from 'node:path'
 import { promisify } from 'node:util'
 import { DefaultMap } from '../../../tailwindcss/src/utils/default-map'
-import { warn } from './renderer'
+import { error, warn } from './renderer'
 
 const exec = promisify(execCb)
 
@@ -12,19 +13,62 @@ const SAVE_DEV: Record<string, string> = {
   bun: '-d',
 }
 
+const manifests = new DefaultMap((base) => {
+  try {
+    let packageJsonPath = resolve(base, 'package.json')
+    return readFileSync(packageJsonPath, 'utf-8')
+  } catch {
+    return ''
+  }
+})
+
 export function pkg(base: string) {
   return {
+    async manager() {
+      return await packageManagerForBase.get(base)
+    },
     async add(packages: string[], location: 'dependencies' | 'devDependencies' = 'dependencies') {
       let packageManager = await packageManagerForBase.get(base)
       let args = packages.slice()
       if (location === 'devDependencies') {
         args.push(SAVE_DEV[packageManager] || SAVE_DEV.default)
       }
-      return exec(`${packageManager} add ${args.join(' ')}`, { cwd: base })
+
+      // Allow running the `pnpm` command in the workspace root without
+      // erroring. Can't just use `--workspace-root` because that will force
+      // install dependencies in the workspace root.
+      if (packageManager === 'pnpm') {
+        args.push('--ignore-workspace-root-check')
+      }
+
+      let command = `${packageManager} add ${args.join(' ')}`
+      try {
+        return await exec(command, { cwd: base })
+      } catch (e: any) {
+        error(`An error occurred while running \`${command}\`\n\n${e.stdout}\n${e.stderr}`, {
+          prefix: '↳ ',
+        })
+        throw e
+      } finally {
+        manifests.delete(base)
+      }
+    },
+    has(name: string) {
+      return manifests.get(base).includes(`"${name}":`)
     },
     async remove(packages: string[]) {
       let packageManager = await packageManagerForBase.get(base)
-      return exec(`${packageManager} remove ${packages.join(' ')}`, { cwd: base })
+      let command = `${packageManager} remove ${packages.join(' ')}`
+      try {
+        return await exec(command, { cwd: base })
+      } catch (e: any) {
+        error(`An error occurred while running \`${command}\`\n\n${e.stdout}\n${e.stderr}`, {
+          prefix: '↳ ',
+        })
+        throw e
+      } finally {
+        manifests.delete(base)
+      }
     },
   }
 }
diff --git a/packages/@tailwindcss-upgrade/src/utils/renderer.ts b/packages/@tailwindcss-upgrade/src/utils/renderer.ts
index 38bd9826a..c9a967801 100644
--- a/packages/@tailwindcss-upgrade/src/utils/renderer.ts
+++ b/packages/@tailwindcss-upgrade/src/utils/renderer.ts
@@ -44,7 +44,7 @@ export function wordWrap(text: string, width: number): string[] {
   // Handle text with newlines by maintaining the newlines, then splitting
   // each line separately.
   if (text.includes('\n')) {
-    return text.split('\n').flatMap((line) => wordWrap(line, width))
+    return text.split('\n').flatMap((line) => (line ? wordWrap(line, width) : ['']))
   }
 
   let words = text.split(' ')
diff --git a/packages/@tailwindcss-upgrade/src/template/splice-changes-into-string.ts b/packages/@tailwindcss-upgrade/src/utils/splice-changes-into-string.ts
similarity index 100%
rename from packages/@tailwindcss-upgrade/src/template/splice-changes-into-string.ts
rename to packages/@tailwindcss-upgrade/src/utils/splice-changes-into-string.ts
diff --git a/packages/@tailwindcss-upgrade/src/utils/version.ts b/packages/@tailwindcss-upgrade/src/utils/version.ts
new file mode 100644
index 000000000..27bc44f2b
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/utils/version.ts
@@ -0,0 +1,63 @@
+import { execSync } from 'node:child_process'
+import semver from 'semver'
+import { DefaultMap } from '../../../tailwindcss/src/utils/default-map'
+import { getPackageVersionSync } from './package-version'
+
+/**
+ * Must be of major version.
+ *
+ * E.g.: `isMajor(3)`
+ */
+export function isMajor(version: number) {
+  return semver.satisfies(installedTailwindVersion(), `>=${version}.0.0 <${version + 1}.0.0`)
+}
+
+/**
+ * Must be of greater than the current major version including minor and patch.
+ *
+ * E.g.: `isGreaterThan(3)`
+ */
+export function isGreaterThan(version: number) {
+  return semver.gte(installedTailwindVersion(), `${version + 1}.0.0`)
+}
+
+let cache = new DefaultMap((base) => {
+  let tailwindVersion = getPackageVersionSync('tailwindcss', base)
+  if (!tailwindVersion) throw new Error('Tailwind CSS is not installed')
+  return tailwindVersion
+})
+
+export function installedTailwindVersion(base = process.cwd()): string {
+  return cache.get(base)
+}
+
+let expectedCache = new DefaultMap((base) => {
+  try {
+    // This will report a problem if the package.json/package-lock.json
+    // mismatches with the installed version in node_modules.
+    //
+    // Also tested this with Bun and PNPM, both seem to work fine.
+    execSync('npm ls tailwindcss --json', { cwd: base, stdio: 'pipe' })
+    return installedTailwindVersion(base)
+  } catch (_e) {
+    try {
+      let e = _e as { stdout: Buffer }
+      let data = JSON.parse(e.stdout.toString())
+
+      return (
+        // Could be a sub-dependency issue, but we are only interested in
+        // the top-level version mismatch.
+        /"(.*?)" from the root project/.exec(data.dependencies.tailwindcss.invalid)?.[1] ??
+        // Fallback to the installed version
+        installedTailwindVersion(base)
+      )
+    } catch {
+      // We don't know how to verify, so let's just return the installed
+      // version to not block the user.
+      return installedTailwindVersion(base)
+    }
+  }
+})
+export function expectedTailwindVersion(base = process.cwd()): string {
+  return expectedCache.get(base)
+}
diff --git a/packages/@tailwindcss-upgrade/src/utils/walk-variants.ts b/packages/@tailwindcss-upgrade/src/utils/walk-variants.ts
new file mode 100644
index 000000000..e0dd16899
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/utils/walk-variants.ts
@@ -0,0 +1,18 @@
+import type { Candidate, Variant } from '../../../tailwindcss/src/candidate'
+
+export function* walkVariants(candidate: Candidate) {
+  function* inner(
+    variant: Variant,
+    parent: Extract<Variant, { kind: 'compound' }> | null = null,
+  ): Iterable<[Variant, Extract<Variant, { kind: 'compound' }> | null]> {
+    yield [variant, parent]
+
+    if (variant.kind === 'compound') {
+      yield* inner(variant.variant, variant)
+    }
+  }
+
+  for (let variant of candidate.variants) {
+    yield* inner(variant, null)
+  }
+}
diff --git a/packages/@tailwindcss-upgrade/src/utils/write-file-safely.ts b/packages/@tailwindcss-upgrade/src/utils/write-file-safely.ts
new file mode 100644
index 000000000..2ff99f9e7
--- /dev/null
+++ b/packages/@tailwindcss-upgrade/src/utils/write-file-safely.ts
@@ -0,0 +1,49 @@
+import { randomUUID } from 'node:crypto'
+import fs from 'node:fs/promises'
+import path from 'node:path'
+
+export async function writeFileSafely(file: string, contents: string) {
+  // Resolve symlinks so the rename replaces the actual target file rather than
+  // replacing the symlink itself with a regular file.
+  let realFile = await fs.realpath(file).catch(() => file)
+
+  // Start by creating a new file in the current directory that is guaranteed to
+  // be unique (via `uuid`). We can embed the `process.id` in case we need to
+  // debug things later.
+  //
+  // While we can write this to a more global `/tmp` folder, I want to be 100%
+  // sure that we are on the same file system (same drive) so the rename
+  // operation is atomic. Once the file is written, we will rename the file. If
+  // this fails, the old file is still intact, if it works we have an updated
+  // file.
+  //
+  // If this still causes problems (but it will slow things down):
+  // 1. We could make sure that we inherit the file permissions
+  // 2. Use an explicit fsync to force a flush to disk
+  let temporaryFile = path.join(
+    path.dirname(realFile),
+    `.${path.basename(realFile)}.tailwind-upgrade.${process.pid}.${randomUUID()}.tmp`,
+  )
+
+  // Write file uses the `w` flag by default, which is defined as:
+  // > Open file for writing. The file is created (if it does not exist) or truncated (if it exists).
+  // > https://nodejs.org/api/fs.html#file-system-flags
+  //
+  // Which means that if this function is actively running, and you cancel the
+  // process at the wrong time, then the truncated files are present. Since all
+  // these migrations happen in parallel, multiple files are open and available
+  // to be written to, it could mean in multiple truncated files.
+  //
+  // Writing to a temp file first means that if the process is cancelled at this
+  // point, that the old original file is still correct.
+  //
+  // The rename part should be atomic (especially because we guarantee it to be
+  // on the same file system) so this either succeeds or doesn't happen.
+  try {
+    await fs.writeFile(temporaryFile, contents, 'utf8')
+    await fs.rename(temporaryFile, realFile)
+  } catch (error) {
+    await fs.unlink(temporaryFile).catch(() => {})
+    throw error
+  }
+}
diff --git a/packages/@tailwindcss-vite/README.md b/packages/@tailwindcss-vite/README.md
index 95ec9d87d..1a5d25c73 100644
--- a/packages/@tailwindcss-vite/README.md
+++ b/packages/@tailwindcss-vite/README.md
@@ -13,10 +13,10 @@
 </p>
 
 <p align="center">
-    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=next" alt="Build Status"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=main" alt="Build Status"></a>
     <a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
 </p>
 
 ---
@@ -27,14 +27,50 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com).
 
 ## Community
 
-For help, discussion about best practices, or any other conversation that would benefit from being searchable:
+For help, discussion about best practices, or feature ideas:
 
-[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions)
-
-For chatting with others using the framework:
-
-[Join the Tailwind CSS Discord Server](https://discord.gg/7NF8GNe)
+[Discuss Tailwind CSS on GitHub](https://github.com/tailwindlabs/tailwindcss/discussions)
 
 ## Contributing
 
-If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindcss/tailwindcss/blob/next/.github/CONTRIBUTING.md) **before submitting a pull request**.
+If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindlabs/tailwindcss/blob/main/.github/CONTRIBUTING.md) **before submitting a pull request**.
+
+---
+
+## `@tailwindcss/vite` plugin API
+
+### Enabling or disabling Lightning CSS
+
+By default, this plugin detects whether or not the CSS is being built for production by checking the `NODE_ENV` environment variable. When building for production Lightning CSS will be enabled otherwise it is disabled.
+
+If you want to always enable or disable Lightning CSS the `optimize` option may be used:
+
+```js
+import tailwindcss from '@tailwindcss/vite'
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+  plugins: [
+    tailwindcss({
+      // Disable Lightning CSS optimization
+      optimize: false,
+    }),
+  ],
+})
+```
+
+It's also possible to keep Lightning CSS enabled but disable minification:
+
+```js
+import tailwindcss from '@tailwindcss/vite'
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+  plugins: [
+    tailwindcss({
+      // Enable Lightning CSS but disable minification
+      optimize: { minify: false },
+    }),
+  ],
+})
+```
diff --git a/packages/@tailwindcss-vite/package.json b/packages/@tailwindcss-vite/package.json
index 5c50f8328..821704a1d 100644
--- a/packages/@tailwindcss-vite/package.json
+++ b/packages/@tailwindcss-vite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tailwindcss/vite",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "repository": {
@@ -24,13 +24,12 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.mts",
-      "import": "./dist/index.mjs"
+      "default": "./dist/index.mjs"
     }
   },
   "dependencies": {
-    "@tailwindcss/node": "workspace:^",
-    "@tailwindcss/oxide": "workspace:^",
-    "lightningcss": "catalog:",
+    "@tailwindcss/node": "workspace:*",
+    "@tailwindcss/oxide": "workspace:*",
     "tailwindcss": "workspace:*"
   },
   "devDependencies": {
@@ -38,6 +37,6 @@
     "vite": "catalog:"
   },
   "peerDependencies": {
-    "vite": "^5.2.0 || ^6"
+    "vite": "^5.2.0 || ^6 || ^7 || ^8"
   }
 }
diff --git a/packages/@tailwindcss-vite/src/index.ts b/packages/@tailwindcss-vite/src/index.ts
index b3c9ace1e..8fc660eaa 100644
--- a/packages/@tailwindcss-vite/src/index.ts
+++ b/packages/@tailwindcss-vite/src/index.ts
@@ -1,213 +1,203 @@
-import { compile, env, Features, Instrumentation, normalizePath } from '@tailwindcss/node'
+import {
+  compile,
+  env,
+  Features,
+  Instrumentation,
+  normalizePath,
+  optimize,
+  toSourceMap,
+} from '@tailwindcss/node'
 import { clearRequireCache } from '@tailwindcss/node/require-cache'
 import { Scanner } from '@tailwindcss/oxide'
-import { Features as LightningCssFeatures, transform } from 'lightningcss'
 import fs from 'node:fs/promises'
 import path from 'node:path'
-import type { Plugin, ResolvedConfig, Rollup, Update, ViteDevServer } from 'vite'
+import type { Environment, InternalResolveOptions, Plugin, ResolvedConfig } from 'vite'
+import * as vite from 'vite'
 
 const DEBUG = env.DEBUG
-const SPECIAL_QUERY_RE = /[?&](raw|url)\b/
+const SPECIAL_QUERY_RE = /[?&](?:worker|sharedworker|raw|url)\b/
+const COMMON_JS_PROXY_RE = /\?commonjs-proxy/
+const INLINE_STYLE_ID_RE = /[?&]index=\d+\.css$/
 
-export default function tailwindcss(): Plugin[] {
-  let servers: ViteDevServer[] = []
+export type PluginOptions = {
+  /**
+   * Optimize and minify the output CSS.
+   */
+  optimize?: boolean | { minify?: boolean }
+}
+
+function createCustomResolver(
+  resolvers: ((id: string, importer: string) => Promise<string | undefined>)[],
+  filter = (_path: string) => true,
+) {
+  return async (id: string, base: string) => {
+    // The resolver expects an `importer` file. We don't really know where the
+    // current `id` was imported from, but Vite will essentially do a
+    // `path.dirname(importer)` so it doesn't really matter.
+    //
+    // It does matter that this is a file, otherwise we would go up a directory,
+    // which means that we would be resolving files from a parent folder first,
+    // instead of the current folder we are in.
+    let importer = path.resolve(base, '__placeholder__.ts')
+
+    for (let resolver of resolvers) {
+      let resolved = await resolver(id, importer)
+
+      // If we didn't resolve, we don't have to bail immediately, but we can try
+      // the next resolver
+      if (!resolved) continue
+
+      if (resolved === id) continue
+
+      // Looks like a relative file, let's resolve it to an absolute path
+      if (resolved[0] === '.') resolved = path.resolve(base, resolved)
+
+      // Must adhere to additional filters (e.g.: must be a .css file)
+      if (!filter(resolved)) continue
+
+      // If it's not an absolute path, then we don't really know how to read
+      // the file from disk.
+      if (!path.isAbsolute(resolved)) continue
+
+      return resolved
+    }
+  }
+}
+
+export default function tailwindcss(opts: PluginOptions = {}): Plugin[] {
   let config: ResolvedConfig | null = null
+  let rootsByEnv = new DefaultMap<string, Map<string, Root>>((env: string) => new Map())
 
   let isSSR = false
-  let minify = false
+  let shouldOptimize = true
+  let minify = true
 
-  // The Vite extension has two types of sources for candidates:
-  //
-  // 1. The module graph: These are all modules that vite transforms and we want
-  //    them to be automatically scanned for candidates.
-  // 2. Root defined `@source`s
-  //
-  // Module graph candidates are global to the Vite extension since we do not
-  // know which CSS roots will be used for the modules. We are using a custom
-  // scanner instance with auto source discovery disabled to parse these.
-  //
-  // For candidates coming from custom `@source` directives of the CSS roots, we
-  // create an individual scanner for each root.
-  //
-  // Note: To improve performance, we do not remove candidates from this set.
-  // This means a longer-ongoing dev mode session might contain candidates that
-  // are no longer referenced in code.
-  let moduleGraphCandidates = new DefaultMap<string, Set<string>>(() => new Set<string>())
-  let moduleGraphScanner = new Scanner({})
+  function createRoot(env: Environment | null, id: string) {
+    type ResolveFn = (id: string, base: string) => Promise<string | false | undefined>
 
-  let roots: DefaultMap<string, Root> = new DefaultMap((id) => {
-    let cssResolver = config!.createResolver({
-      ...config!.resolve,
-      extensions: ['.css'],
-      mainFields: ['style'],
-      conditions: ['style', 'development|production'],
-      tryIndex: false,
-      preferRelative: true,
-    })
-    function customCssResolver(id: string, base: string) {
-      return cssResolver(id, base, true, isSSR)
+    let customCssResolver: ResolveFn
+    let customJsResolver: ResolveFn
+
+    if (!env) {
+      // Older, pre-environment Vite API
+      // TODO: Can we drop this??
+      let cssResolver = config!.createResolver({
+        ...config!.resolve,
+        extensions: ['.css'],
+        mainFields: ['style'],
+        conditions: ['style', 'development|production'],
+        tryIndex: false,
+        preferRelative: true,
+      })
+
+      let jsResolver = config!.createResolver(config!.resolve)
+
+      customCssResolver = createCustomResolver(
+        [
+          (id, importer) => cssResolver(id, importer, true, isSSR),
+          (id, importer) => cssResolver(id, importer, false, isSSR),
+        ],
+        (path) => path.endsWith('.css'),
+      )
+      customJsResolver = createCustomResolver(
+        [
+          (id, importer) => jsResolver(id, importer, true, isSSR),
+          (id, importer) => jsResolver(id, importer, false, isSSR),
+        ],
+        (path) => !path.endsWith('.css'),
+      )
+    } else {
+      type ResolveIdFn = (
+        environment: Environment,
+        id: string,
+        importer?: string,
+        aliasOnly?: boolean,
+      ) => Promise<string | undefined>
+
+      // There are cases where Environment API is available,
+      // but `createResolver` is still overridden (for example astro v5)
+      //
+      // Copied as-is from vite, because this function is not a part of public API
+      //
+      // TODO: Remove this function and pre-environment code when Vite < 7 is no longer supported
+      function createBackCompatIdResolver(
+        config: ResolvedConfig,
+        options?: Partial<InternalResolveOptions>,
+      ): ResolveIdFn {
+        const compatResolve = config.createResolver(options)
+        let resolve: ResolveIdFn
+        return async (environment, id, importer, aliasOnly) => {
+          if (environment.name === 'client' || environment.name === 'ssr') {
+            return compatResolve(id, importer, aliasOnly, environment.name === 'ssr')
+          }
+          resolve ??= vite.createIdResolver(config, options)
+          return resolve(environment, id, importer, aliasOnly)
+        }
+      }
+
+      // Newer Vite versions
+      let cssResolver = createBackCompatIdResolver(env.config, {
+        ...env.config.resolve,
+        extensions: ['.css'],
+        mainFields: ['style'],
+        conditions: ['style', 'development|production'],
+        tryIndex: false,
+        preferRelative: true,
+      })
+
+      let jsResolver = createBackCompatIdResolver(env.config, env.config.resolve)
+
+      customCssResolver = createCustomResolver(
+        [
+          (id, importer) => cssResolver(env, id, importer, true),
+          (id, importer) => cssResolver(env, id, importer, false),
+        ],
+        (path) => path.endsWith('.css'),
+      )
+      customJsResolver = createCustomResolver(
+        [
+          (id, importer) => jsResolver(env, id, importer, true),
+          (id, importer) => jsResolver(env, id, importer, false),
+        ],
+        (path) => !path.endsWith('.css'),
+      )
     }
 
-    let jsResolver = config!.createResolver(config!.resolve)
-    function customJsResolver(id: string, base: string) {
-      return jsResolver(id, base, true, isSSR)
-    }
     return new Root(
       id,
-      () => moduleGraphCandidates,
-      config!.base,
+      config!.root,
+      // Currently, Vite only supports CSS source maps in development and they
+      // are off by default. Check to see if we need them or not.
+      config?.css.devSourcemap ?? false,
       customCssResolver,
       customJsResolver,
     )
-  })
-
-  function scanFile(id: string, content: string, extension: string, isSSR: boolean) {
-    let updated = false
-    for (let candidate of moduleGraphScanner.scanFiles([{ content, extension }])) {
-      updated = true
-      moduleGraphCandidates.get(id).add(candidate)
-    }
-
-    if (updated) {
-      invalidateAllRoots(isSSR)
-    }
-  }
-
-  function invalidateAllRoots(isSSR: boolean) {
-    for (let server of servers) {
-      let updates: Update[] = []
-      for (let [id, root] of roots.entries()) {
-        let module = server.moduleGraph.getModuleById(id)
-        if (!module) {
-          // The module for this root might not exist yet
-          if (root.builtBeforeTransform) {
-            continue
-          }
-
-          // Note: Removing this during SSR is not safe and will produce
-          // inconsistent results based on the timing of the removal and
-          // the order / timing of transforms.
-          if (!isSSR) {
-            // It is safe to remove the item here since we're iterating on a copy
-            // of the keys.
-            roots.delete(id)
-          }
-          continue
-        }
-
-        roots.get(id).requiresRebuild = false
-        server.moduleGraph.invalidateModule(module)
-        updates.push({
-          type: `${module.type}-update`,
-          path: module.url,
-          acceptedPath: module.url,
-          timestamp: Date.now(),
-        })
-      }
-
-      if (updates.length > 0) {
-        server.hot.send({ type: 'update', updates })
-      }
-    }
-  }
-
-  async function regenerateOptimizedCss(
-    root: Root,
-    addWatchFile: (file: string) => void,
-    I: Instrumentation,
-  ) {
-    let content = root.lastContent
-    let generated = await root.generate(content, addWatchFile, I)
-    if (generated === false) {
-      return
-    }
-    DEBUG && I.start('Optimize CSS')
-    let result = optimizeCss(generated, { minify })
-    DEBUG && I.end('Optimize CSS')
-    return result
-  }
-
-  // Manually run the transform functions of non-Tailwind plugins on the given CSS
-  async function transformWithPlugins(context: Rollup.PluginContext, id: string, css: string) {
-    let transformPluginContext = {
-      ...context,
-      getCombinedSourcemap: () => {
-        throw new Error('getCombinedSourcemap not implemented')
-      },
-    }
-
-    for (let plugin of config!.plugins) {
-      if (!plugin.transform) continue
-
-      if (plugin.name.startsWith('@tailwindcss/')) {
-        // We do not run any Tailwind transforms anymore
-        continue
-      } else if (
-        plugin.name.startsWith('vite:') &&
-        // Apply the vite:css plugin to generated CSS for transformations like
-        // URL path rewriting and image inlining.
-        plugin.name !== 'vite:css' &&
-        // In build mode, since `renderStart` runs after all transformations, we
-        // need to also apply vite:css-post.
-        plugin.name !== 'vite:css-post' &&
-        // The vite:vue plugin handles CSS specific post-processing for Vue
-        plugin.name !== 'vite:vue'
-      ) {
-        continue
-      } else if (plugin.name === 'ssr-styles') {
-        // The Nuxt ssr-styles plugin emits styles from server-side rendered
-        // components, we can't run it in the `renderStart` phase so we're
-        // skipping it.
-        continue
-      }
-
-      let transformHandler =
-        'handler' in plugin.transform! ? plugin.transform.handler : plugin.transform!
-
-      try {
-        // Directly call the plugin's transform function to process the
-        // generated CSS. In build mode, this updates the chunks later used to
-        // generate the bundle. In serve mode, the transformed source should be
-        // applied in transform.
-        let result = await transformHandler.call(transformPluginContext, css, id)
-        if (!result) continue
-        if (typeof result === 'string') {
-          css = result
-        } else if (result.code) {
-          css = result.code
-        }
-      } catch (e) {
-        console.error(`Error running ${plugin.name} on Tailwind CSS output. Skipping.`)
-      }
-    }
-    return css
   }
 
   return [
-    svelteProcessor(roots),
     {
       // Step 1: Scan source files for candidates
       name: '@tailwindcss/vite:scan',
       enforce: 'pre',
 
-      configureServer(server) {
-        servers.push(server)
-      },
-
       async configResolved(_config) {
         config = _config
-        minify = config.build.cssMinify !== false
         isSSR = config.build.ssr !== false && config.build.ssr !== undefined
-      },
 
-      // Scan all non-CSS files for candidates
-      transformIndexHtml(html, { path }) {
-        scanFile(path, html, 'html', isSSR)
-      },
-      transform(src, id, options) {
-        let extension = getExtension(id)
-        if (isPotentialCssRootFile(id)) return
-        scanFile(id, src, extension, options?.ssr ?? false)
+        // By default we optimize CSS during the build phase but if the user
+        // provides explicit options we'll use those instead
+        if (opts.optimize !== undefined) {
+          shouldOptimize = opts.optimize !== false
+        }
+
+        // Minification is also performed when optimizing as long as it's also
+        // enabled in Vite
+        minify = shouldOptimize && config.build.cssMinify !== false
+
+        // But again, the user can override that choice explicitly
+        if (typeof opts.optimize === 'object') {
+          minify = opts.optimize.minify !== false
+        }
       },
     },
 
@@ -216,45 +206,35 @@ export default function tailwindcss(): Plugin[] {
       name: '@tailwindcss/vite:generate:serve',
       apply: 'serve',
       enforce: 'pre',
+      transform: {
+        filter: {
+          id: {
+            exclude: [/\/\.vite\//, SPECIAL_QUERY_RE, COMMON_JS_PROXY_RE],
+            include: [/\.css(?:\?.*)?$/, /&lang\.css/, INLINE_STYLE_ID_RE],
+          },
+        },
+        async handler(src, id) {
+          if (!isPotentialCssRootFile(id)) return
 
-      async transform(src, id, options) {
-        if (!isPotentialCssRootFile(id)) return
+          using I = new Instrumentation()
+          DEBUG && I.start('[@tailwindcss/vite] Generate CSS (serve)')
 
-        using I = new Instrumentation()
-        I.start('[@tailwindcss/vite] Generate CSS (serve)')
+          let roots = rootsByEnv.get(this.environment?.name ?? 'default')
+          let root = roots.get(id)
+          if (!root) {
+            root ??= createRoot(this.environment ?? null, id)
+            roots.set(id, root)
+          }
 
-        let root = roots.get(id)
+          let result = await root.generate(src, (file) => this.addWatchFile(file), I)
+          if (!result) {
+            roots.delete(id)
+            return
+          }
 
-        // If the root was built outside of the transform hook (e.g. in the
-        // Svelte preprocessor), we still want to mark all dependencies of the
-        // root as watched files.
-        if (root.builtBeforeTransform) {
-          root.builtBeforeTransform.forEach((file) => this.addWatchFile(file))
-          root.builtBeforeTransform = undefined
-        }
-
-        // We only process Svelte `<style>` tags in the `sveltePreprocessor`
-        if (isSvelteStyle(id)) {
-          return src
-        }
-
-        if (!options?.ssr) {
-          // Wait until all other files have been processed, so we can extract
-          // all candidates before generating CSS. This must not be called
-          // during SSR or it will block the server.
-          //
-          // The reason why we can not rely on the invalidation here is that the
-          // users would otherwise see a flicker in the styles as the CSS might
-          // be loaded with an invalid set of candidates first.
-          await Promise.all(servers.map((server) => server.waitForRequestsIdle(id)))
-        }
-
-        let generated = await root.generate(src, (file) => this.addWatchFile(file), I)
-        if (!generated) {
-          roots.delete(id)
-          return src
-        }
-        return { code: generated }
+          DEBUG && I.end('[@tailwindcss/vite] Generate CSS (serve)')
+          return result
+        },
       },
     },
 
@@ -263,70 +243,44 @@ export default function tailwindcss(): Plugin[] {
       name: '@tailwindcss/vite:generate:build',
       apply: 'build',
       enforce: 'pre',
+      transform: {
+        filter: {
+          id: {
+            exclude: [/\/\.vite\//, SPECIAL_QUERY_RE, COMMON_JS_PROXY_RE],
+            include: [/\.css(?:\?.*)?$/, /&lang\.css/, INLINE_STYLE_ID_RE],
+          },
+        },
+        async handler(src, id) {
+          if (!isPotentialCssRootFile(id)) return
 
-      async transform(src, id) {
-        if (!isPotentialCssRootFile(id)) return
+          using I = new Instrumentation()
+          DEBUG && I.start('[@tailwindcss/vite] Generate CSS (build)')
 
-        using I = new Instrumentation()
-        I.start('[@tailwindcss/vite] Generate CSS (build)')
-
-        let root = roots.get(id)
-
-        // If the root was built outside of the transform hook (e.g. in the
-        // Svelte preprocessor), we still want to mark all dependencies of the
-        // root as watched files.
-        if (root.builtBeforeTransform) {
-          root.builtBeforeTransform.forEach((file) => this.addWatchFile(file))
-          root.builtBeforeTransform = undefined
-        }
-
-        // We only process Svelte `<style>` tags in the `sveltePreprocessor`
-        if (isSvelteStyle(id)) {
-          return src
-        }
-
-        // We do a first pass to generate valid CSS for the downstream plugins.
-        // However, since not all candidates are guaranteed to be extracted by
-        // this time, we have to re-run a transform for the root later.
-        let generated = await root.generate(src, (file) => this.addWatchFile(file), I)
-        if (!generated) {
-          roots.delete(id)
-          return src
-        }
-        return { code: generated }
-      },
-
-      // `renderStart` runs in the bundle generation stage after all transforms.
-      // We must run before `enforce: post` so the updated chunks are picked up
-      // by vite:css-post.
-      async renderStart() {
-        using I = new Instrumentation()
-        I.start('[@tailwindcss/vite] (render start)')
-
-        for (let [id, root] of roots.entries()) {
-          // Do not do a second render pass on Svelte `<style>` tags.
-          if (isSvelteStyle(id)) continue
-
-          let generated = await regenerateOptimizedCss(
-            root,
-            // During the renderStart phase, we can not add watch files since
-            // those would not be causing a refresh of the right CSS file. This
-            // should not be an issue since we did already process the CSS file
-            // before and the dependencies should not be changed (only the
-            // candidate list might have)
-            () => {},
-            I,
-          )
-          if (!generated) {
-            roots.delete(id)
-            continue
+          let roots = rootsByEnv.get(this.environment?.name ?? 'default')
+          let root = roots.get(id)
+          if (!root) {
+            root ??= createRoot(this.environment ?? null, id)
+            roots.set(id, root)
           }
 
-          // These plugins have side effects which, during build, results in CSS
-          // being written to the output dir. We need to run them here to ensure
-          // the CSS is written before the bundle is generated.
-          await transformWithPlugins(this, id, generated)
-        }
+          let result = await root.generate(src, (file) => this.addWatchFile(file), I)
+          if (!result) {
+            roots.delete(id)
+            return
+          }
+          DEBUG && I.end('[@tailwindcss/vite] Generate CSS (build)')
+
+          if (shouldOptimize) {
+            DEBUG && I.start('[@tailwindcss/vite] Optimize CSS')
+            result = optimize(result.code, {
+              minify,
+              map: result.map,
+            })
+            DEBUG && I.end('[@tailwindcss/vite] Optimize CSS')
+          }
+
+          return result
+        },
       },
     },
   ] satisfies Plugin[]
@@ -338,59 +292,18 @@ function getExtension(id: string) {
 }
 
 function isPotentialCssRootFile(id: string) {
-  if (id.includes('/.vite/')) return
+  if (id.includes('/.vite/')) return false
+
+  // Don't intercept special static asset resources
+  if (SPECIAL_QUERY_RE.test(id)) return false
+  if (COMMON_JS_PROXY_RE.test(id)) return false
+
   let extension = getExtension(id)
-  let isCssFile =
-    (extension === 'css' ||
-      (extension === 'vue' && id.includes('&lang.css')) ||
-      (extension === 'astro' && id.includes('&lang.css')) ||
-      // We want to process Svelte `<style>` tags to properly add dependency
-      // tracking for imported files.
-      isSvelteStyle(id)) &&
-    // Don't intercept special static asset resources
-    !SPECIAL_QUERY_RE.test(id)
+  let isCssFile = extension === 'css' || id.includes('&lang.css') || id.match(INLINE_STYLE_ID_RE)
 
   return isCssFile
 }
 
-function isSvelteStyle(id: string) {
-  let extension = getExtension(id)
-  return extension === 'svelte' && id.includes('&lang.css')
-}
-
-function optimizeCss(
-  input: string,
-  { file = 'input.css', minify = false }: { file?: string; minify?: boolean } = {},
-) {
-  function optimize(code: Buffer | Uint8Array) {
-    return transform({
-      filename: file,
-      code,
-      minify,
-      sourceMap: false,
-      drafts: {
-        customMedia: true,
-      },
-      nonStandard: {
-        deepSelectorCombinator: true,
-      },
-      include: LightningCssFeatures.Nesting,
-      exclude: LightningCssFeatures.LogicalProperties | LightningCssFeatures.DirSelector,
-      targets: {
-        safari: (16 << 16) | (4 << 8),
-        ios_saf: (16 << 16) | (4 << 8),
-        firefox: 128 << 16,
-        chrome: 111 << 16,
-      },
-      errorRecovery: true,
-    }).code
-  }
-
-  // Running Lightning CSS twice to ensure that adjacent rules are merged after
-  // nesting is applied. This creates a more optimized output.
-  return optimize(optimize(Buffer.from(input))).toString()
-}
-
 function idToPath(id: string) {
   return path.resolve(id.replace(/\?.*$/, ''))
 }
@@ -417,49 +330,28 @@ class DefaultMap<K, V> extends Map<K, V> {
 }
 
 class Root {
-  // Content is only used in serve mode where we need to capture the initial
-  // contents of the root file so that we can restore it during the
-  // `renderStart` hook.
-  public lastContent: string = ''
-
-  // When set, indicates that the root was built before the Vite transform hook
-  // was being called. This can happen in scenarios like when preprocessing
-  // `<style>` tags for Svelte components.
-  //
-  // It can be set to a list of dependencies that will be added whenever the
-  // next `transform` hook is being called.
-  public builtBeforeTransform: string[] | undefined
-
   // The lazily-initialized Tailwind compiler components. These are persisted
   // throughout rebuilds but will be re-initialized if the rebuild strategy is
   // set to `full`.
   private compiler?: Awaited<ReturnType<typeof compile>>
 
-  public requiresRebuild: boolean = true
-
-  // This is the compiler-specific scanner instance that is used only to scan
-  // files for custom @source paths. All other modules we scan for candidates
-  // will use the shared moduleGraphScanner instance.
+  // The lazily-initialized Tailwind scanner.
   private scanner?: Scanner
 
   // List of all candidates that were being returned by the root scanner during
   // the lifetime of the root.
   private candidates: Set<string> = new Set<string>()
 
-  // List of all dependencies captured while generating the root. These are
-  // retained so we can clear the require cache when we rebuild the root.
-  private dependencies = new Set<string>()
-
-  // The resolved path given to `source(…)`. When not given this is `null`.
-  private basePath: string | null = null
-
-  public overwriteCandidates: string[] | null = null
+  // List of all build dependencies (e.g. imported  stylesheets or plugins) and
+  // their last modification timestamp. If no mtime can be found, we need to
+  // assume the file has always changed.
+  private buildDependencies = new Map<string, number | null>()
 
   constructor(
     private id: string,
-    private getSharedCandidates: () => Map<string, Set<string>>,
     private base: string,
 
+    private enableSourceMaps: boolean,
     private customCssResolver: (id: string, base: string) => Promise<string | false | undefined>,
     private customJsResolver: (id: string, base: string) => Promise<string | false | undefined>,
   ) {}
@@ -468,60 +360,99 @@ class Root {
   // not considered a Tailwind root. When this happened, the root can be GCed.
   public async generate(
     content: string,
-    addWatchFile: (file: string) => void,
+    _addWatchFile: (file: string) => void,
     I: Instrumentation,
-  ): Promise<string | false> {
-    this.lastContent = content
-
+  ): Promise<
+    | {
+        code: string
+        map: string | undefined
+      }
+    | false
+  > {
     let inputPath = idToPath(this.id)
+
+    function addWatchFile(file: string) {
+      // Don't watch the input file since it's already a dependency and causes
+      // issues with some setups (e.g. Qwik).
+      if (file === inputPath) {
+        return
+      }
+
+      // Scanning `.svg` file containing a `#` or `?` in the path will
+      // crash Vite. We work around this for now by ignoring updates to them.
+      //
+      // https://github.com/tailwindlabs/tailwindcss/issues/16877
+      if (/[#?].*\.svg$/.test(file)) {
+        return
+      }
+      _addWatchFile(file)
+    }
+
+    let requiresBuildPromise = this.requiresBuild()
     let inputBase = path.dirname(path.resolve(inputPath))
 
-    if (!this.compiler || !this.scanner || this.requiresRebuild) {
-      clearRequireCache(Array.from(this.dependencies))
-      this.dependencies = new Set([idToPath(inputPath)])
+    if (!this.compiler || !this.scanner || (await requiresBuildPromise)) {
+      clearRequireCache(Array.from(this.buildDependencies.keys()))
+      this.buildDependencies.clear()
+
+      this.addBuildDependency(idToPath(inputPath))
 
       DEBUG && I.start('Setup compiler')
+      let addBuildDependenciesPromises: Promise<void>[] = []
       this.compiler = await compile(content, {
+        from: this.enableSourceMaps ? this.id : undefined,
         base: inputBase,
         shouldRewriteUrls: true,
         onDependency: (path) => {
           addWatchFile(path)
-          this.dependencies.add(path)
+          addBuildDependenciesPromises.push(this.addBuildDependency(path))
         },
 
         customCssResolver: this.customCssResolver,
         customJsResolver: this.customJsResolver,
       })
+      await Promise.all(addBuildDependenciesPromises)
       DEBUG && I.end('Setup compiler')
 
+      DEBUG && I.start('Setup scanner')
+
       let sources = (() => {
         // Disable auto source detection
         if (this.compiler.root === 'none') {
           return []
         }
 
-        // No root specified, use the module graph
+        // No root specified, auto-detect based on the `**/*` pattern
         if (this.compiler.root === null) {
-          return []
+          return [{ base: this.base, pattern: '**/*', negated: false }]
         }
 
         // Use the specified root
-        return [this.compiler.root]
-      })().concat(this.compiler.globs)
+        return [{ ...this.compiler.root, negated: false }]
+      })().concat(this.compiler.sources)
 
       this.scanner = new Scanner({ sources })
+      DEBUG && I.end('Setup scanner')
+    } else {
+      for (let buildDependency of this.buildDependencies.keys()) {
+        addWatchFile(buildDependency)
+      }
     }
 
     if (
       !(
         this.compiler.features &
-        (Features.AtApply | Features.JsPluginCompat | Features.ThemeFunction | Features.Utilities)
+        (Features.AtApply |
+          Features.JsPluginCompat |
+          Features.ThemeFunction |
+          Features.Utilities |
+          Features.Variants)
       )
     ) {
       return false
     }
 
-    if (!this.overwriteCandidates || this.compiler.features & Features.Utilities) {
+    if (this.compiler.features & Features.Utilities) {
       // This should not be here, but right now the Vite plugin is setup where we
       // setup a new scanner and compiler every time we request the CSS file
       // (regardless whether it actually changed or not).
@@ -533,6 +464,7 @@ class Root {
     }
 
     if (this.compiler.features & Features.Utilities) {
+      DEBUG && I.start('Register dependency messages')
       // Watch individual files found via custom `@source` paths
       for (let file of this.scanner.files) {
         addWatchFile(file)
@@ -567,131 +499,45 @@ class Root {
               `The path given to \`source(…)\` must be a directory but got \`source(${basePath})\` instead.`,
             )
           }
-
-          this.basePath = basePath
-        } else if (root === null) {
-          this.basePath = null
         }
       }
+      DEBUG && I.end('Register dependency messages')
     }
 
-    this.requiresRebuild = true
-
     DEBUG && I.start('Build CSS')
-    let result = this.compiler.build(
-      this.overwriteCandidates
-        ? this.overwriteCandidates
-        : [...this.sharedCandidates(), ...this.candidates],
-    )
+    let code = this.compiler.build([...this.candidates])
     DEBUG && I.end('Build CSS')
 
-    return result
+    DEBUG && I.start('Build Source Map')
+    let map = this.enableSourceMaps ? toSourceMap(this.compiler.buildSourceMap()).raw : undefined
+    DEBUG && I.end('Build Source Map')
+
+    return {
+      code,
+      map,
+    }
   }
 
-  private sharedCandidates(): Set<string> {
-    if (!this.compiler) return new Set()
-    if (this.compiler.root === 'none') return new Set()
+  private async addBuildDependency(path: string) {
+    let mtime: number | null = null
+    try {
+      mtime = (await fs.stat(path)).mtimeMs
+    } catch {}
+    this.buildDependencies.set(path, mtime)
+  }
 
-    const HAS_DRIVE_LETTER = /^[A-Z]:/
-
-    let shouldIncludeCandidatesFrom = (id: string) => {
-      if (this.basePath === null) return true
-
-      if (id.startsWith(this.basePath)) return true
-
-      // This is a windows absolute path that doesn't match so return false
-      if (HAS_DRIVE_LETTER.test(id)) return false
-
-      // We've got a path that's not absolute and not on Windows
-      // TODO: this is probably a virtual module -- not sure if we need to scan it
-      if (!id.startsWith('/')) return true
-
-      // This is an absolute path on POSIX and it does not match
-      return false
-    }
-
-    let shared = new Set<string>()
-
-    for (let [id, candidates] of this.getSharedCandidates()) {
-      if (!shouldIncludeCandidatesFrom(id)) continue
-
-      for (let candidate of candidates) {
-        shared.add(candidate)
+  private async requiresBuild(): Promise<boolean> {
+    for (let [path, mtime] of this.buildDependencies) {
+      if (mtime === null) return true
+      try {
+        let stat = await fs.stat(path)
+        if (stat.mtimeMs > mtime) {
+          return true
+        }
+      } catch {
+        return true
       }
     }
-
-    return shared
-  }
-}
-
-// Register a plugin that can hook into the Svelte preprocessor if Svelte is
-// configured. This allows us to transform CSS in `<style>` tags and create a
-// stricter version of CSS that passes the Svelte compiler.
-//
-// Note that these files will not undergo a second pass through the vite
-// transpiler later. This means that `@tailwind utilities;` will not be up to
-// date.
-//
-// In practice, it is discouraged to use `@tailwind utilities;` inside Svelte
-// components, as the styles it create would be scoped anyways. Use an external
-// `.css` file instead.
-function svelteProcessor(roots: DefaultMap<string, Root>): Plugin {
-  return {
-    name: '@tailwindcss/svelte',
-    api: {
-      sveltePreprocess: {
-        async style({
-          content,
-          filename,
-          markup,
-        }: {
-          content: string
-          filename?: string
-          markup: string
-        }) {
-          if (!filename) return
-          using I = new Instrumentation()
-          DEBUG && I.start('[@tailwindcss/vite] Preprocess svelte')
-
-          // Create the ID used by Vite to identify the `<style>` contents. This
-          // way, the Vite `transform` hook can find the right root and thus
-          // track the right dependencies.
-          let id = filename + '?svelte&type=style&lang.css'
-
-          let root = roots.get(id)
-
-          // Since a Svelte pre-processor call means that the CSS has changed,
-          // we need to trigger a rebuild.
-          root.requiresRebuild = true
-
-          // Mark this root as being built before the Vite transform hook is
-          // called. We capture all eventually added dependencies so that we can
-          // connect them to the vite module graph later, when the transform
-          // hook is called.
-          root.builtBeforeTransform = []
-
-          // We only want to consider candidates from the current template file,
-          // this ensures that no one can depend on this having the full candidate
-          // list in some builds (as this is undefined behavior).
-          let scanner = new Scanner({})
-          root.overwriteCandidates = scanner.scanFiles([
-            { content: markup, file: filename, extension: 'svelte' },
-          ])
-
-          let generated = await root.generate(
-            content,
-            (file) => root.builtBeforeTransform?.push(file),
-            I,
-          )
-
-          if (!generated) {
-            roots.delete(id)
-            return
-          }
-
-          return { code: generated }
-        },
-      },
-    },
+    return false
   }
 }
diff --git a/packages/@tailwindcss-webpack/README.md b/packages/@tailwindcss-webpack/README.md
new file mode 100644
index 000000000..56484ed7f
--- /dev/null
+++ b/packages/@tailwindcss-webpack/README.md
@@ -0,0 +1,102 @@
+<p align="center">
+  <a href="https://tailwindcss.com" target="_blank">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-dark.svg">
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-light.svg">
+      <img alt="Tailwind CSS" src="https://raw.githubusercontent.com/tailwindlabs/tailwindcss/HEAD/.github/logo-light.svg" width="350" height="70" style="max-width: 100%;">
+    </picture>
+  </a>
+</p>
+
+<p align="center">
+  A utility-first CSS framework for rapidly building custom user interfaces.
+</p>
+
+<p align="center">
+    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=main" alt="Build Status"></a>
+    <a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
+</p>
+
+---
+
+## Documentation
+
+For full documentation, visit [tailwindcss.com](https://tailwindcss.com).
+
+## Community
+
+For help, discussion about best practices, or feature ideas:
+
+[Discuss Tailwind CSS on GitHub](https://github.com/tailwindlabs/tailwindcss/discussions)
+
+## Contributing
+
+If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindlabs/tailwindcss/blob/main/.github/CONTRIBUTING.md) **before submitting a pull request**.
+
+---
+
+## @tailwindcss/webpack
+
+A webpack loader for Tailwind CSS v4.
+
+## Installation
+
+```sh
+npm install @tailwindcss/webpack
+```
+
+### Usage
+
+```javascript
+// webpack.config.js
+const MiniCssExtractPlugin = require('mini-css-extract-plugin')
+
+module.exports = {
+  plugins: [new MiniCssExtractPlugin()],
+  module: {
+    rules: [
+      {
+        test: /\.css$/i,
+        use: [MiniCssExtractPlugin.loader, 'css-loader', '@tailwindcss/webpack'],
+      },
+    ],
+  },
+}
+```
+
+Then create a CSS file that imports Tailwind:
+
+```css
+/* src/index.css */
+@import 'tailwindcss';
+```
+
+### Options
+
+#### `base`
+
+The base directory to scan for class candidates. Defaults to the current working directory.
+
+```javascript
+{
+  loader: '@tailwindcss/webpack',
+  options: {
+    base: process.cwd(),
+  },
+}
+```
+
+#### `optimize`
+
+Whether to optimize and minify the output CSS. Defaults to `true` in production mode.
+
+```javascript
+{
+  loader: '@tailwindcss/webpack',
+  options: {
+    optimize: true, // or { minify: true }
+  },
+}
+```
diff --git a/packages/@tailwindcss-webpack/package.json b/packages/@tailwindcss-webpack/package.json
new file mode 100644
index 000000000..dce09429d
--- /dev/null
+++ b/packages/@tailwindcss-webpack/package.json
@@ -0,0 +1,55 @@
+{
+  "name": "@tailwindcss/webpack",
+  "version": "4.3.3",
+  "description": "A webpack loader for Tailwind CSS v4.",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tailwindlabs/tailwindcss.git",
+    "directory": "packages/@tailwindcss-webpack"
+  },
+  "bugs": "https://github.com/tailwindlabs/tailwindcss/issues",
+  "homepage": "https://tailwindcss.com",
+  "scripts": {
+    "build": "tsup-node",
+    "dev": "pnpm run build -- --watch"
+  },
+  "files": [
+    "dist/"
+  ],
+  "publishConfig": {
+    "provenance": true,
+    "access": "public"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js"
+    }
+  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "dependencies": {
+    "@alloc/quick-lru": "^5.2.0",
+    "@tailwindcss/node": "workspace:*",
+    "@tailwindcss/oxide": "workspace:*",
+    "tailwindcss": "workspace:*"
+  },
+  "devDependencies": {
+    "@types/node": "catalog:",
+    "webpack": "catalog:"
+  },
+  "peerDependencies": {
+    "@rspack/core": "^1.0.0 || ^2.0.0",
+    "webpack": "^5.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@rspack/core": {
+      "optional": true
+    },
+    "webpack": {
+      "optional": true
+    }
+  }
+}
diff --git a/packages/@tailwindcss-webpack/src/index.cts b/packages/@tailwindcss-webpack/src/index.cts
new file mode 100644
index 000000000..dbdded748
--- /dev/null
+++ b/packages/@tailwindcss-webpack/src/index.cts
@@ -0,0 +1,5 @@
+import tailwindLoader from './index.ts'
+
+// CommonJS export for webpack loaders - must be the function directly
+// @ts-ignore
+export = tailwindLoader
diff --git a/packages/@tailwindcss-webpack/src/index.ts b/packages/@tailwindcss-webpack/src/index.ts
new file mode 100644
index 000000000..6d02f1f0b
--- /dev/null
+++ b/packages/@tailwindcss-webpack/src/index.ts
@@ -0,0 +1,287 @@
+import QuickLRU from '@alloc/quick-lru'
+import {
+  compile,
+  env,
+  Features,
+  Instrumentation,
+  normalizePath,
+  optimize,
+  Polyfills,
+} from '@tailwindcss/node'
+import { clearRequireCache } from '@tailwindcss/node/require-cache'
+import { Scanner } from '@tailwindcss/oxide'
+import fs from 'node:fs'
+import path from 'node:path'
+import type { LoaderContext } from 'webpack'
+
+const DEBUG = env.DEBUG
+
+export interface LoaderOptions {
+  /**
+   * The base directory to scan for class candidates.
+   *
+   * Defaults to the current working directory.
+   */
+  base?: string
+
+  /**
+   * Optimize and minify the output CSS.
+   */
+  optimize?: boolean | { minify?: boolean }
+}
+
+interface CacheEntry {
+  mtimes: Map<string, number>
+  compiler: null | Awaited<ReturnType<typeof compile>>
+  scanner: null | Scanner
+  candidates: Set<string>
+  fullRebuildPaths: string[]
+}
+
+const cache = new QuickLRU<string, CacheEntry>({ maxSize: 50 })
+
+function getCacheKey(resourceId: string, opts: LoaderOptions): string {
+  return `${resourceId}:${opts.base ?? ''}:${JSON.stringify(opts.optimize)}`
+}
+
+function getContextFromCache(resourceId: string, opts: LoaderOptions): CacheEntry {
+  let key = getCacheKey(resourceId, opts)
+  if (cache.has(key)) return cache.get(key)!
+  let entry: CacheEntry = {
+    mtimes: new Map<string, number>(),
+    compiler: null,
+    scanner: null,
+    candidates: new Set<string>(),
+    fullRebuildPaths: [],
+  }
+  cache.set(key, entry)
+  return entry
+}
+
+export default async function tailwindLoader(
+  this: LoaderContext<LoaderOptions>,
+  source: string,
+): Promise<void> {
+  let callback = this.async()
+  let options = this.getOptions() ?? {}
+  let inputFile = this.resourcePath
+  let resourceId = this.resource
+  let base = options.base ?? process.cwd()
+  let shouldOptimize = options.optimize ?? process.env.NODE_ENV === 'production'
+  let isCSSModuleFile = inputFile.endsWith('.module.css')
+
+  using I = new Instrumentation()
+
+  DEBUG && I.start(`[@tailwindcss/webpack] ${path.relative(base, inputFile)}`)
+
+  // Bail out early if this is guaranteed to be a non-Tailwind CSS file.
+  {
+    DEBUG && I.start('Quick bail check')
+    let canBail = !/@(import|reference|theme|variant|config|plugin|apply|tailwind)\b/.test(source)
+    if (canBail) {
+      DEBUG && I.end('Quick bail check')
+      DEBUG && I.end(`[@tailwindcss/webpack] ${path.relative(base, inputFile)}`)
+      callback(null, source)
+      return
+    }
+    DEBUG && I.end('Quick bail check')
+  }
+
+  try {
+    let context = getContextFromCache(resourceId, options)
+    let inputBasePath = path.dirname(path.resolve(inputFile))
+
+    // Whether this is the first build or not
+    let isInitialBuild = context.compiler === null
+
+    async function createCompiler() {
+      DEBUG && I.start('Setup compiler')
+      if (context.fullRebuildPaths.length > 0 && !isInitialBuild) {
+        clearRequireCache(context.fullRebuildPaths)
+      }
+
+      context.fullRebuildPaths = []
+
+      DEBUG && I.start('Create compiler')
+      let compiler = await compile(source, {
+        from: inputFile,
+        base: inputBasePath,
+        shouldRewriteUrls: true,
+        onDependency: (depPath) => context.fullRebuildPaths.push(depPath),
+        // In CSS Module files, we have to disable the `@property` polyfill since these will
+        // emit global `*` rules which are considered to be non-pure and will cause builds
+        // to fail.
+        polyfills: isCSSModuleFile ? Polyfills.All ^ Polyfills.AtProperty : Polyfills.All,
+      })
+      DEBUG && I.end('Create compiler')
+
+      DEBUG && I.end('Setup compiler')
+      return compiler
+    }
+
+    // Setup the compiler if it doesn't exist yet
+    context.compiler ??= await createCompiler()
+
+    // Early exit if no Tailwind features are used
+    if (context.compiler.features === Features.None) {
+      DEBUG && I.end(`[@tailwindcss/webpack] ${path.relative(base, inputFile)}`)
+      callback(null, source)
+      return
+    }
+
+    let rebuildStrategy: 'full' | 'incremental' = 'incremental'
+
+    // Track file modification times to CSS files
+    DEBUG && I.start('Register full rebuild paths')
+    {
+      // Report dependencies for config files, plugins, etc.
+      for (let file of context.fullRebuildPaths) {
+        this.addDependency(path.resolve(file))
+      }
+
+      let files = [...context.fullRebuildPaths, inputFile]
+
+      for (let file of files) {
+        let changedTime: number | null = null
+        try {
+          changedTime = fs.statSync(file)?.mtimeMs ?? null
+        } catch {
+          // File might not exist
+        }
+
+        if (changedTime === null) {
+          if (file === inputFile) {
+            rebuildStrategy = 'full'
+          }
+          continue
+        }
+
+        let prevTime = context.mtimes.get(file)
+        if (prevTime === changedTime) continue
+
+        rebuildStrategy = 'full'
+        context.mtimes.set(file, changedTime)
+      }
+    }
+    DEBUG && I.end('Register full rebuild paths')
+
+    if (rebuildStrategy === 'full' && !isInitialBuild) {
+      context.compiler = await createCompiler()
+    }
+
+    let compiler = context.compiler
+
+    // Check if we need to process this file at all
+    if (
+      !(
+        compiler.features &
+        (Features.AtApply | Features.JsPluginCompat | Features.ThemeFunction | Features.Utilities)
+      )
+    ) {
+      DEBUG && I.end(`[@tailwindcss/webpack] ${path.relative(base, inputFile)}`)
+      callback(null, source)
+      return
+    }
+
+    // Setup or update scanner if needed
+    if (context.scanner === null || rebuildStrategy === 'full') {
+      DEBUG && I.start('Setup scanner')
+      let sources = (() => {
+        // Disable auto source detection
+        if (compiler.root === 'none') {
+          return []
+        }
+
+        // No root specified, use the base directory
+        if (compiler.root === null) {
+          return [{ base, pattern: '**/*', negated: false }]
+        }
+
+        // Use the specified root
+        return [{ ...compiler.root, negated: false }]
+      })().concat(compiler.sources)
+
+      context.scanner = new Scanner({ sources })
+      DEBUG && I.end('Setup scanner')
+    }
+
+    // Scan for candidates if utilities are used
+    if (compiler.features & Features.Utilities) {
+      DEBUG && I.start('Scan for candidates')
+      for (let candidate of context.scanner.scan()) {
+        context.candidates.add(candidate)
+      }
+      DEBUG && I.end('Scan for candidates')
+
+      DEBUG && I.start('Register dependency messages')
+      // Add all found files as direct dependencies
+      let resolvedInputFile = path.resolve(base, inputFile)
+      for (let file of context.scanner.files) {
+        let absolutePath = path.resolve(file)
+        // The CSS file cannot be a dependency of itself
+        if (absolutePath === resolvedInputFile) {
+          continue
+        }
+        this.addDependency(absolutePath)
+      }
+
+      // Register context dependencies for glob patterns
+      for (let glob of context.scanner.globs) {
+        // Skip negated patterns
+        if (glob.pattern[0] === '!') continue
+
+        // Avoid adding a dependency on the base directory itself
+        if (glob.pattern === '*' && base === glob.base) {
+          continue
+        }
+
+        this.addContextDependency(path.resolve(glob.base))
+      }
+
+      // Validate that source(...) paths are directories
+      let root = compiler.root
+      if (root !== 'none' && root !== null) {
+        let basePath = normalizePath(path.resolve(root.base, root.pattern))
+        try {
+          let stats = fs.statSync(basePath)
+          if (!stats.isDirectory()) {
+            throw new Error(
+              `The path given to \`source(…)\` must be a directory but got \`source(${basePath})\` instead.`,
+            )
+          }
+        } catch (err) {
+          if ((err as NodeJS.ErrnoException).code !== 'ENOENT') {
+            throw err
+          }
+          // Directory doesn't exist yet, which is fine
+        }
+      }
+      DEBUG && I.end('Register dependency messages')
+    }
+
+    DEBUG && I.start('Build utilities')
+    let css = compiler.build([...context.candidates])
+    DEBUG && I.end('Build utilities')
+
+    // Optionally optimize the output
+    let result = css
+    if (shouldOptimize) {
+      DEBUG && I.start('Optimization')
+      let optimized = optimize(css, {
+        minify: typeof shouldOptimize === 'object' ? shouldOptimize.minify : true,
+      })
+      result = optimized.code
+      DEBUG && I.end('Optimization')
+    }
+
+    DEBUG && I.end(`[@tailwindcss/webpack] ${path.relative(base, inputFile)}`)
+    callback(null, result)
+  } catch (error) {
+    // Clear the cache entry on error to force a full rebuild next time
+    let key = getCacheKey(resourceId, options)
+    cache.delete(key)
+
+    DEBUG && I.end(`[@tailwindcss/webpack] ${path.relative(base, inputFile)}`)
+    callback(error as Error)
+  }
+}
diff --git a/packages/@tailwindcss-webpack/tsconfig.json b/packages/@tailwindcss-webpack/tsconfig.json
new file mode 100644
index 000000000..d2131cbeb
--- /dev/null
+++ b/packages/@tailwindcss-webpack/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "verbatimModuleSyntax": false,
+  },
+}
diff --git a/packages/@tailwindcss-webpack/tsup.config.ts b/packages/@tailwindcss-webpack/tsup.config.ts
new file mode 100644
index 000000000..998eebe4f
--- /dev/null
+++ b/packages/@tailwindcss-webpack/tsup.config.ts
@@ -0,0 +1,19 @@
+import { defineConfig } from 'tsup'
+
+export default defineConfig([
+  {
+    format: ['esm'],
+    clean: true,
+    minify: true,
+    cjsInterop: true,
+    dts: true,
+    entry: ['src/index.ts'],
+  },
+  {
+    format: ['cjs'],
+    minify: true,
+    cjsInterop: true,
+    dts: true,
+    entry: ['src/index.cts'],
+  },
+])
diff --git a/packages/tailwindcss/README.md b/packages/tailwindcss/README.md
index 95ec9d87d..5f532607d 100644
--- a/packages/tailwindcss/README.md
+++ b/packages/tailwindcss/README.md
@@ -13,10 +13,10 @@
 </p>
 
 <p align="center">
-    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=next" alt="Build Status"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/actions"><img src="https://img.shields.io/github/actions/workflow/status/tailwindlabs/tailwindcss/ci.yml?branch=main" alt="Build Status"></a>
     <a href="https://www.npmjs.com/package/tailwindcss"><img src="https://img.shields.io/npm/dt/tailwindcss.svg" alt="Total Downloads"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
-    <a href="https://github.com/tailwindcss/tailwindcss/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/releases"><img src="https://img.shields.io/npm/v/tailwindcss.svg" alt="Latest Release"></a>
+    <a href="https://github.com/tailwindlabs/tailwindcss/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/tailwindcss.svg" alt="License"></a>
 </p>
 
 ---
@@ -27,14 +27,10 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com).
 
 ## Community
 
-For help, discussion about best practices, or any other conversation that would benefit from being searchable:
+For help, discussion about best practices, or feature ideas:
 
-[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions)
-
-For chatting with others using the framework:
-
-[Join the Tailwind CSS Discord Server](https://discord.gg/7NF8GNe)
+[Discuss Tailwind CSS on GitHub](https://github.com/tailwindlabs/tailwindcss/discussions)
 
 ## Contributing
 
-If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindcss/tailwindcss/blob/next/.github/CONTRIBUTING.md) **before submitting a pull request**.
+If you're interested in contributing to Tailwind CSS, please read our [contributing docs](https://github.com/tailwindlabs/tailwindcss/blob/main/.github/CONTRIBUTING.md) **before submitting a pull request**.
diff --git a/packages/tailwindcss/package.json b/packages/tailwindcss/package.json
index 6ce3646bc..d1288d6fa 100644
--- a/packages/tailwindcss/package.json
+++ b/packages/tailwindcss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss",
-  "version": "4.0.0-beta.7",
+  "version": "4.3.3",
   "description": "A utility-first CSS framework for rapidly building custom user interfaces.",
   "license": "MIT",
   "repository": {
@@ -35,6 +35,10 @@
       "require": "./src/compat/flatten-color-palette.cts",
       "import": "./src/compat/flatten-color-palette.ts"
     },
+    "./lib/util/flattenColorPalette.js": {
+      "require": "./src/compat/flatten-color-palette.cts",
+      "import": "./src/compat/flatten-color-palette.ts"
+    },
     "./defaultTheme": {
       "require": "./src/compat/default-theme.cts",
       "import": "./src/compat/default-theme.ts"
@@ -99,6 +103,10 @@
         "require": "./dist/flatten-color-palette.js",
         "import": "./dist/flatten-color-palette.mjs"
       },
+      "./lib/util/flattenColorPalette.js": {
+        "require": "./dist/flatten-color-palette.js",
+        "import": "./dist/flatten-color-palette.mjs"
+      },
       "./package.json": "./package.json",
       "./index.css": "./index.css",
       "./index": "./index.css",
@@ -119,9 +127,12 @@
     "utilities.css"
   ],
   "devDependencies": {
+    "@jridgewell/remapping": "^2.3.5",
     "@tailwindcss/oxide": "workspace:^",
     "@types/node": "catalog:",
+    "dedent": "catalog:",
     "lightningcss": "catalog:",
-    "dedent": "1.5.3"
+    "magic-string": "^1.1.0",
+    "source-map-js": "^1.2.1"
   }
 }
diff --git a/packages/tailwindcss/playwright.config.ts b/packages/tailwindcss/playwright.config.ts
index c0a123abf..ba8f95d70 100644
--- a/packages/tailwindcss/playwright.config.ts
+++ b/packages/tailwindcss/playwright.config.ts
@@ -20,7 +20,7 @@ export default defineConfig({
   /* Opt out of parallel tests on CI. */
   workers: process.env.CI ? 1 : undefined,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
+  reporter: [['html', { open: 'never' }]],
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
   use: {
     /* Base URL to use in actions like `await page.goto('/')`. */
@@ -36,10 +36,11 @@ export default defineConfig({
       name: 'chromium',
       use: { ...devices['Desktop Chrome'] },
     },
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
+    // Playwright 1.60's Windows WebKit worker hangs on shutdown after all tests
+    // pass, causing CI to fail with a worker force-kill error.
+    ...(process.platform === 'win32'
+      ? []
+      : [{ name: 'webkit', use: { ...devices['Desktop Safari'] } }]),
     {
       name: 'firefox',
       use: {
diff --git a/packages/tailwindcss/preflight.css b/packages/tailwindcss/preflight.css
index a307c6d60..04e87905c 100644
--- a/packages/tailwindcss/preflight.css
+++ b/packages/tailwindcss/preflight.css
@@ -30,29 +30,26 @@ html,
   line-height: 1.5; /* 1 */
   -webkit-text-size-adjust: 100%; /* 2 */
   tab-size: 4; /* 3 */
-  font-family: var(
+  font-family: --theme(
     --default-font-family,
-    ui-sans-serif,
-    system-ui,
+    -apple-system,
+    BlinkMacSystemFont,
+    'Segoe UI',
+    Roboto,
+    'Helvetica Neue',
+    'Noto Sans',
+    Arial,
     sans-serif,
     'Apple Color Emoji',
     'Segoe UI Emoji',
     'Segoe UI Symbol',
     'Noto Color Emoji'
   ); /* 4 */
-  font-feature-settings: var(--default-font-feature-settings, normal); /* 5 */
-  font-variation-settings: var(--default-font-variation-settings, normal); /* 6 */
+  font-feature-settings: --theme(--default-font-feature-settings, normal); /* 5 */
+  font-variation-settings: --theme(--default-font-variation-settings, normal); /* 6 */
   -webkit-tap-highlight-color: transparent; /* 7 */
 }
 
-/*
-  Inherit line-height from `html` so users can set them as a class directly on the `html` element.
-*/
-
-body {
-  line-height: inherit;
-}
-
 /*
   1. Add the correct height in Firefox.
   2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)
@@ -118,7 +115,7 @@ code,
 kbd,
 samp,
 pre {
-  font-family: var(
+  font-family: --theme(
     --default-mono-font-family,
     ui-monospace,
     SFMono-Regular,
@@ -128,9 +125,9 @@ pre {
     'Liberation Mono',
     'Courier New',
     monospace
-  ); /* 4 */
-  font-feature-settings: var(--default-mono-font-feature-settings, normal); /* 5 */
-  font-variation-settings: var(--default-mono-font-variation-settings, normal); /* 6 */
+  ); /* 1 */
+  font-feature-settings: --theme(--default-mono-font-feature-settings, normal); /* 2 */
+  font-variation-settings: --theme(--default-mono-font-variation-settings, normal); /* 3 */
   font-size: 1em; /* 4 */
 }
 
@@ -178,7 +175,7 @@ table {
   Use the modern Firefox focus style for all focusable elements.
 */
 
-:-moz-focusring {
+:-moz-focusring:where(:not(iframe)) {
   outline: auto;
 }
 
@@ -284,13 +281,23 @@ textarea,
 }
 
 /*
-  1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300)
-  2. Set the default placeholder color to a semi-transparent version of the current text color.
+  Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300)
 */
 
 ::placeholder {
-  opacity: 1; /* 1 */
-  color: color-mix(in oklab, currentColor 50%, transparent); /* 2 */
+  opacity: 1;
+}
+
+/*
+  Set the default placeholder color to a semi-transparent version of the current text color in browsers that do not
+  crash when using `color-mix(…)` with `currentcolor`. (https://github.com/tailwindlabs/tailwindcss/issues/17194)
+*/
+
+@supports (not (-webkit-appearance: -apple-pay-button)) /* Not Safari */ or
+  (contain-intrinsic-size: 1px) /* Safari 17+ */ {
+  ::placeholder {
+    color: color-mix(in oklab, currentcolor 50%, transparent);
+  }
 }
 
 /*
@@ -347,6 +354,14 @@ textarea {
   padding-block: 0;
 }
 
+/*
+  Center dropdown marker shown on inputs with paired `<datalist>`s in Chrome. (https://github.com/tailwindlabs/tailwindcss/issues/18499)
+*/
+
+::-webkit-calendar-picker-indicator {
+  line-height: 1;
+}
+
 /*
   Remove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737)
 */
diff --git a/packages/tailwindcss/src/__snapshots__/index.test.ts.snap b/packages/tailwindcss/src/__snapshots__/index.test.ts.snap
index 4c8a9f5a9..9921709d7 100644
--- a/packages/tailwindcss/src/__snapshots__/index.test.ts.snap
+++ b/packages/tailwindcss/src/__snapshots__/index.test.ts.snap
@@ -1,372 +1,31 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`compiling CSS > \`@tailwind utilities\` is replaced by utilities using the default theme 1`] = `
-":root {
-  --font-sans: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-  --font-serif: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif;
-  --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-  --color-red-50: oklch(.971 .013 17.38);
-  --color-red-100: oklch(.936 .032 17.717);
-  --color-red-200: oklch(.885 .062 18.334);
-  --color-red-300: oklch(.808 .114 19.571);
-  --color-red-400: oklch(.704 .191 22.216);
-  --color-red-500: oklch(.637 .237 25.331);
-  --color-red-600: oklch(.577 .245 27.325);
-  --color-red-700: oklch(.505 .213 27.518);
-  --color-red-800: oklch(.444 .177 26.899);
-  --color-red-900: oklch(.396 .141 25.723);
-  --color-red-950: oklch(.258 .092 26.042);
-  --color-orange-50: oklch(.98 .016 73.684);
-  --color-orange-100: oklch(.954 .038 75.164);
-  --color-orange-200: oklch(.901 .076 70.697);
-  --color-orange-300: oklch(.837 .128 66.29);
-  --color-orange-400: oklch(.75 .183 55.934);
-  --color-orange-500: oklch(.705 .213 47.604);
-  --color-orange-600: oklch(.646 .222 41.116);
-  --color-orange-700: oklch(.553 .195 38.402);
-  --color-orange-800: oklch(.47 .157 37.304);
-  --color-orange-900: oklch(.408 .123 38.172);
-  --color-orange-950: oklch(.266 .079 36.259);
-  --color-amber-50: oklch(.987 .022 95.277);
-  --color-amber-100: oklch(.962 .059 95.617);
-  --color-amber-200: oklch(.924 .12 95.746);
-  --color-amber-300: oklch(.879 .169 91.605);
-  --color-amber-400: oklch(.828 .189 84.429);
-  --color-amber-500: oklch(.769 .188 70.08);
-  --color-amber-600: oklch(.666 .179 58.318);
-  --color-amber-700: oklch(.555 .163 48.998);
-  --color-amber-800: oklch(.473 .137 46.201);
-  --color-amber-900: oklch(.414 .112 45.904);
-  --color-amber-950: oklch(.279 .077 45.635);
-  --color-yellow-50: oklch(.987 .026 102.212);
-  --color-yellow-100: oklch(.973 .071 103.193);
-  --color-yellow-200: oklch(.945 .129 101.54);
-  --color-yellow-300: oklch(.905 .182 98.111);
-  --color-yellow-400: oklch(.852 .199 91.936);
-  --color-yellow-500: oklch(.795 .184 86.047);
-  --color-yellow-600: oklch(.681 .162 75.834);
-  --color-yellow-700: oklch(.554 .135 66.442);
-  --color-yellow-800: oklch(.476 .114 61.907);
-  --color-yellow-900: oklch(.421 .095 57.708);
-  --color-yellow-950: oklch(.286 .066 53.813);
-  --color-lime-50: oklch(.986 .031 120.757);
-  --color-lime-100: oklch(.967 .067 122.328);
-  --color-lime-200: oklch(.938 .127 124.321);
-  --color-lime-300: oklch(.897 .196 126.665);
-  --color-lime-400: oklch(.841 .238 128.85);
-  --color-lime-500: oklch(.768 .233 130.85);
-  --color-lime-600: oklch(.648 .2 131.684);
-  --color-lime-700: oklch(.532 .157 131.589);
-  --color-lime-800: oklch(.453 .124 130.933);
-  --color-lime-900: oklch(.405 .101 131.063);
-  --color-lime-950: oklch(.274 .072 132.109);
-  --color-green-50: oklch(.982 .018 155.826);
-  --color-green-100: oklch(.962 .044 156.743);
-  --color-green-200: oklch(.925 .084 155.995);
-  --color-green-300: oklch(.871 .15 154.449);
-  --color-green-400: oklch(.792 .209 151.711);
-  --color-green-500: oklch(.723 .219 149.579);
-  --color-green-600: oklch(.627 .194 149.214);
-  --color-green-700: oklch(.527 .154 150.069);
-  --color-green-800: oklch(.448 .119 151.328);
-  --color-green-900: oklch(.393 .095 152.535);
-  --color-green-950: oklch(.266 .065 152.934);
-  --color-emerald-50: oklch(.979 .021 166.113);
-  --color-emerald-100: oklch(.95 .052 163.051);
-  --color-emerald-200: oklch(.905 .093 164.15);
-  --color-emerald-300: oklch(.845 .143 164.978);
-  --color-emerald-400: oklch(.765 .177 163.223);
-  --color-emerald-500: oklch(.696 .17 162.48);
-  --color-emerald-600: oklch(.596 .145 163.225);
-  --color-emerald-700: oklch(.508 .118 165.612);
-  --color-emerald-800: oklch(.432 .095 166.913);
-  --color-emerald-900: oklch(.378 .077 168.94);
-  --color-emerald-950: oklch(.262 .051 172.552);
-  --color-teal-50: oklch(.984 .014 180.72);
-  --color-teal-100: oklch(.953 .051 180.801);
-  --color-teal-200: oklch(.91 .096 180.426);
-  --color-teal-300: oklch(.855 .138 181.071);
-  --color-teal-400: oklch(.777 .152 181.912);
-  --color-teal-500: oklch(.704 .14 182.503);
-  --color-teal-600: oklch(.6 .118 184.704);
-  --color-teal-700: oklch(.511 .096 186.391);
-  --color-teal-800: oklch(.437 .078 188.216);
-  --color-teal-900: oklch(.386 .063 188.416);
-  --color-teal-950: oklch(.277 .046 192.524);
-  --color-cyan-50: oklch(.984 .019 200.873);
-  --color-cyan-100: oklch(.956 .045 203.388);
-  --color-cyan-200: oklch(.917 .08 205.041);
-  --color-cyan-300: oklch(.865 .127 207.078);
-  --color-cyan-400: oklch(.789 .154 211.53);
-  --color-cyan-500: oklch(.715 .143 215.221);
-  --color-cyan-600: oklch(.609 .126 221.723);
-  --color-cyan-700: oklch(.52 .105 223.128);
-  --color-cyan-800: oklch(.45 .085 224.283);
-  --color-cyan-900: oklch(.398 .07 227.392);
-  --color-cyan-950: oklch(.302 .056 229.695);
-  --color-sky-50: oklch(.977 .013 236.62);
-  --color-sky-100: oklch(.951 .026 236.824);
-  --color-sky-200: oklch(.901 .058 230.902);
-  --color-sky-300: oklch(.828 .111 230.318);
-  --color-sky-400: oklch(.746 .16 232.661);
-  --color-sky-500: oklch(.685 .169 237.323);
-  --color-sky-600: oklch(.588 .158 241.966);
-  --color-sky-700: oklch(.5 .134 242.749);
-  --color-sky-800: oklch(.443 .11 240.79);
-  --color-sky-900: oklch(.391 .09 240.876);
-  --color-sky-950: oklch(.293 .066 243.157);
-  --color-blue-50: oklch(.97 .014 254.604);
-  --color-blue-100: oklch(.932 .032 255.585);
-  --color-blue-200: oklch(.882 .059 254.128);
-  --color-blue-300: oklch(.809 .105 251.813);
-  --color-blue-400: oklch(.707 .165 254.624);
-  --color-blue-500: oklch(.623 .214 259.815);
-  --color-blue-600: oklch(.546 .245 262.881);
-  --color-blue-700: oklch(.488 .243 264.376);
-  --color-blue-800: oklch(.424 .199 265.638);
-  --color-blue-900: oklch(.379 .146 265.522);
-  --color-blue-950: oklch(.282 .091 267.935);
-  --color-indigo-50: oklch(.962 .018 272.314);
-  --color-indigo-100: oklch(.93 .034 272.788);
-  --color-indigo-200: oklch(.87 .065 274.039);
-  --color-indigo-300: oklch(.785 .115 274.713);
-  --color-indigo-400: oklch(.673 .182 276.935);
-  --color-indigo-500: oklch(.585 .233 277.117);
-  --color-indigo-600: oklch(.511 .262 276.966);
-  --color-indigo-700: oklch(.457 .24 277.023);
-  --color-indigo-800: oklch(.398 .195 277.366);
-  --color-indigo-900: oklch(.359 .144 278.697);
-  --color-indigo-950: oklch(.257 .09 281.288);
-  --color-violet-50: oklch(.969 .016 293.756);
-  --color-violet-100: oklch(.943 .029 294.588);
-  --color-violet-200: oklch(.894 .057 293.283);
-  --color-violet-300: oklch(.811 .111 293.571);
-  --color-violet-400: oklch(.702 .183 293.541);
-  --color-violet-500: oklch(.606 .25 292.717);
-  --color-violet-600: oklch(.541 .281 293.009);
-  --color-violet-700: oklch(.491 .27 292.581);
-  --color-violet-800: oklch(.432 .232 292.759);
-  --color-violet-900: oklch(.38 .189 293.745);
-  --color-violet-950: oklch(.283 .141 291.089);
-  --color-purple-50: oklch(.977 .014 308.299);
-  --color-purple-100: oklch(.946 .033 307.174);
-  --color-purple-200: oklch(.902 .063 306.703);
-  --color-purple-300: oklch(.827 .119 306.383);
-  --color-purple-400: oklch(.714 .203 305.504);
-  --color-purple-500: oklch(.627 .265 303.9);
-  --color-purple-600: oklch(.558 .288 302.321);
-  --color-purple-700: oklch(.496 .265 301.924);
-  --color-purple-800: oklch(.438 .218 303.724);
-  --color-purple-900: oklch(.381 .176 304.987);
-  --color-purple-950: oklch(.291 .149 302.717);
-  --color-fuchsia-50: oklch(.977 .017 320.058);
-  --color-fuchsia-100: oklch(.952 .037 318.852);
-  --color-fuchsia-200: oklch(.903 .076 319.62);
-  --color-fuchsia-300: oklch(.833 .145 321.434);
-  --color-fuchsia-400: oklch(.74 .238 322.16);
-  --color-fuchsia-500: oklch(.667 .295 322.15);
-  --color-fuchsia-600: oklch(.591 .293 322.896);
-  --color-fuchsia-700: oklch(.518 .253 323.949);
-  --color-fuchsia-800: oklch(.452 .211 324.591);
-  --color-fuchsia-900: oklch(.401 .17 325.612);
-  --color-fuchsia-950: oklch(.293 .136 325.661);
-  --color-pink-50: oklch(.971 .014 343.198);
-  --color-pink-100: oklch(.948 .028 342.258);
-  --color-pink-200: oklch(.899 .061 343.231);
-  --color-pink-300: oklch(.823 .12 346.018);
-  --color-pink-400: oklch(.718 .202 349.761);
-  --color-pink-500: oklch(.656 .241 354.308);
-  --color-pink-600: oklch(.592 .249 .584);
-  --color-pink-700: oklch(.525 .223 3.958);
-  --color-pink-800: oklch(.459 .187 3.815);
-  --color-pink-900: oklch(.408 .153 2.432);
-  --color-pink-950: oklch(.284 .109 3.907);
-  --color-rose-50: oklch(.969 .015 12.422);
-  --color-rose-100: oklch(.941 .03 12.58);
-  --color-rose-200: oklch(.892 .058 10.001);
-  --color-rose-300: oklch(.81 .117 11.638);
-  --color-rose-400: oklch(.712 .194 13.428);
-  --color-rose-500: oklch(.645 .246 16.439);
-  --color-rose-600: oklch(.586 .253 17.585);
-  --color-rose-700: oklch(.514 .222 16.935);
-  --color-rose-800: oklch(.455 .188 13.697);
-  --color-rose-900: oklch(.41 .159 10.272);
-  --color-rose-950: oklch(.271 .105 12.094);
-  --color-slate-50: oklch(.984 .003 247.858);
-  --color-slate-100: oklch(.968 .007 247.896);
-  --color-slate-200: oklch(.929 .013 255.508);
-  --color-slate-300: oklch(.869 .022 252.894);
-  --color-slate-400: oklch(.704 .04 256.788);
-  --color-slate-500: oklch(.554 .046 257.417);
-  --color-slate-600: oklch(.446 .043 257.281);
-  --color-slate-700: oklch(.372 .044 257.287);
-  --color-slate-800: oklch(.279 .041 260.031);
-  --color-slate-900: oklch(.208 .042 265.755);
-  --color-slate-950: oklch(.129 .042 264.695);
-  --color-gray-50: oklch(.985 .002 247.839);
-  --color-gray-100: oklch(.967 .003 264.542);
-  --color-gray-200: oklch(.928 .006 264.531);
-  --color-gray-300: oklch(.872 .01 258.338);
-  --color-gray-400: oklch(.707 .022 261.325);
-  --color-gray-500: oklch(.551 .027 264.364);
-  --color-gray-600: oklch(.446 .03 256.802);
-  --color-gray-700: oklch(.373 .034 259.733);
-  --color-gray-800: oklch(.278 .033 256.848);
-  --color-gray-900: oklch(.21 .034 264.665);
-  --color-gray-950: oklch(.13 .028 261.692);
-  --color-zinc-50: oklch(.985 0 0);
-  --color-zinc-100: oklch(.967 .001 286.375);
-  --color-zinc-200: oklch(.92 .004 286.32);
-  --color-zinc-300: oklch(.871 .006 286.286);
-  --color-zinc-400: oklch(.705 .015 286.067);
-  --color-zinc-500: oklch(.552 .016 285.938);
-  --color-zinc-600: oklch(.442 .017 285.786);
-  --color-zinc-700: oklch(.37 .013 285.805);
-  --color-zinc-800: oklch(.274 .006 286.033);
-  --color-zinc-900: oklch(.21 .006 285.885);
-  --color-zinc-950: oklch(.141 .005 285.823);
-  --color-neutral-50: oklch(.985 0 0);
-  --color-neutral-100: oklch(.97 0 0);
-  --color-neutral-200: oklch(.922 0 0);
-  --color-neutral-300: oklch(.87 0 0);
-  --color-neutral-400: oklch(.708 0 0);
-  --color-neutral-500: oklch(.556 0 0);
-  --color-neutral-600: oklch(.439 0 0);
-  --color-neutral-700: oklch(.371 0 0);
-  --color-neutral-800: oklch(.269 0 0);
-  --color-neutral-900: oklch(.205 0 0);
-  --color-neutral-950: oklch(.145 0 0);
-  --color-stone-50: oklch(.985 .001 106.423);
-  --color-stone-100: oklch(.97 .001 106.424);
-  --color-stone-200: oklch(.923 .003 48.717);
-  --color-stone-300: oklch(.869 .005 56.366);
-  --color-stone-400: oklch(.709 .01 56.259);
-  --color-stone-500: oklch(.553 .013 58.071);
-  --color-stone-600: oklch(.444 .011 73.639);
-  --color-stone-700: oklch(.374 .01 67.558);
-  --color-stone-800: oklch(.268 .007 34.298);
-  --color-stone-900: oklch(.216 .006 56.043);
-  --color-stone-950: oklch(.147 .004 49.25);
-  --color-black: #000;
-  --color-white: #fff;
+"
+@layer properties {
+  @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+    *, :before, :after, ::backdrop {
+      --tw-shadow: 0 0 #0000;
+      --tw-shadow-color: initial;
+      --tw-shadow-alpha: 100%;
+      --tw-inset-shadow: 0 0 #0000;
+      --tw-inset-shadow-color: initial;
+      --tw-inset-shadow-alpha: 100%;
+      --tw-ring-color: initial;
+      --tw-ring-shadow: 0 0 #0000;
+      --tw-inset-ring-color: initial;
+      --tw-inset-ring-shadow: 0 0 #0000;
+      --tw-ring-inset: initial;
+      --tw-ring-offset-width: 0px;
+      --tw-ring-offset-color: #fff;
+      --tw-ring-offset-shadow: 0 0 #0000;
+    }
+  }
+}
+
+:root, :host {
+  --color-red-500: oklch(63.7% .237 25.331);
   --spacing: .25rem;
-  --breakpoint-sm: 40rem;
-  --breakpoint-md: 48rem;
-  --breakpoint-lg: 64rem;
-  --breakpoint-xl: 80rem;
-  --breakpoint-2xl: 96rem;
-  --container-3xs: 16rem;
-  --container-2xs: 18rem;
-  --container-xs: 20rem;
-  --container-sm: 24rem;
-  --container-md: 28rem;
-  --container-lg: 32rem;
-  --container-xl: 36rem;
-  --container-2xl: 42rem;
-  --container-3xl: 48rem;
-  --container-4xl: 56rem;
-  --container-5xl: 64rem;
-  --container-6xl: 72rem;
-  --container-7xl: 80rem;
-  --container-prose: 65ch;
-  --text-xs: .75rem;
-  --text-xs--line-height: calc(1 / .75);
-  --text-sm: .875rem;
-  --text-sm--line-height: calc(1.25 / .875);
-  --text-base: 1rem;
-  --text-base--line-height: calc(1.5 / 1);
-  --text-lg: 1.125rem;
-  --text-lg--line-height: calc(1.75 / 1.125);
-  --text-xl: 1.25rem;
-  --text-xl--line-height: calc(1.75 / 1.25);
-  --text-2xl: 1.5rem;
-  --text-2xl--line-height: calc(2 / 1.5);
-  --text-3xl: 1.875rem;
-  --text-3xl--line-height: calc(2.25 / 1.875);
-  --text-4xl: 2.25rem;
-  --text-4xl--line-height: calc(2.5 / 2.25);
-  --text-5xl: 3rem;
-  --text-5xl--line-height: 1;
-  --text-6xl: 3.75rem;
-  --text-6xl--line-height: 1;
-  --text-7xl: 4.5rem;
-  --text-7xl--line-height: 1;
-  --text-8xl: 6rem;
-  --text-8xl--line-height: 1;
-  --text-9xl: 8rem;
-  --text-9xl--line-height: 1;
-  --font-weight-thin: 100;
-  --font-weight-extralight: 200;
-  --font-weight-light: 300;
-  --font-weight-normal: 400;
-  --font-weight-medium: 500;
-  --font-weight-semibold: 600;
-  --font-weight-bold: 700;
-  --font-weight-extrabold: 800;
-  --font-weight-black: 900;
-  --tracking-tighter: -.05em;
-  --tracking-tight: -.025em;
-  --tracking-normal: 0em;
-  --tracking-wide: .025em;
-  --tracking-wider: .05em;
-  --tracking-widest: .1em;
-  --leading-tight: 1.25;
-  --leading-snug: 1.375;
-  --leading-normal: 1.5;
-  --leading-relaxed: 1.625;
-  --leading-loose: 2;
-  --radius-xs: .125rem;
-  --radius-sm: .25rem;
-  --radius-md: .375rem;
-  --radius-lg: .5rem;
-  --radius-xl: .75rem;
-  --radius-2xl: 1rem;
-  --radius-3xl: 1.5rem;
-  --radius-4xl: 2rem;
-  --shadow-2xs: 0 1px #0000000d;
-  --shadow-xs: 0 1px 2px 0 #0000000d;
-  --shadow-sm: 0 1px 3px 0 #0000001a, 0 1px 2px -1px #0000001a;
-  --shadow-md: 0 4px 6px -1px #0000001a, 0 2px 4px -2px #0000001a;
-  --shadow-lg: 0 10px 15px -3px #0000001a, 0 4px 6px -4px #0000001a;
-  --shadow-xl: 0 20px 25px -5px #0000001a, 0 8px 10px -6px #0000001a;
-  --shadow-2xl: 0 25px 50px -12px #00000040;
-  --inset-shadow-2xs: inset 0 1px #0000000d;
-  --inset-shadow-xs: inset 0 1px 1px #0000000d;
-  --inset-shadow-sm: inset 0 2px 4px #0000000d;
-  --drop-shadow-xs: 0 1px 1px #0000000d;
-  --drop-shadow-sm: 0 1px 2px #00000026;
-  --drop-shadow-md: 0 3px 3px #0000001f;
-  --drop-shadow-lg: 0 4px 4px #00000026;
-  --drop-shadow-xl: 0 9px 7px #0000001a;
-  --drop-shadow-2xl: 0 25px 25px #00000026;
-  --ease-in: cubic-bezier(.4, 0, 1, 1);
-  --ease-out: cubic-bezier(0, 0, .2, 1);
-  --ease-in-out: cubic-bezier(.4, 0, .2, 1);
-  --animate-spin: spin 1s linear infinite;
-  --animate-ping: ping 1s cubic-bezier(0, 0, .2, 1) infinite;
-  --animate-pulse: pulse 2s cubic-bezier(.4, 0, .6, 1) infinite;
-  --animate-bounce: bounce 1s infinite;
-  --blur-xs: 4px;
-  --blur-sm: 8px;
-  --blur-md: 12px;
-  --blur-lg: 16px;
-  --blur-xl: 24px;
-  --blur-2xl: 40px;
-  --blur-3xl: 64px;
-  --perspective-dramatic: 100px;
-  --perspective-near: 300px;
-  --perspective-normal: 500px;
-  --perspective-midrange: 800px;
-  --perspective-distant: 1200px;
-  --aspect-video: 16 / 9;
-  --default-transition-duration: .15s;
-  --default-transition-timing-function: cubic-bezier(.4, 0, .2, 1);
-  --default-font-family: var(--font-sans);
-  --default-font-feature-settings: var(--font-sans--font-feature-settings);
-  --default-font-variation-settings: var(--font-sans--font-variation-settings);
-  --default-mono-font-family: var(--font-mono);
-  --default-mono-font-feature-settings: var(--font-mono--font-feature-settings);
-  --default-mono-font-variation-settings: var(--font-mono--font-variation-settings);
 }
 
 .w-4 {
@@ -382,62 +41,12 @@ exports[`compiling CSS > \`@tailwind utilities\` is replaced by utilities using
   box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
 }
 
-@media (width >= 40rem) {
+@media (min-width: 40rem) {
   .sm\\:flex {
     display: flex;
   }
 }
 
-@supports (-moz-orient: inline) {
-  @layer base {
-    *, :before, :after, ::backdrop {
-      --tw-shadow: 0 0 #0000;
-      --tw-shadow-color: initial;
-      --tw-inset-shadow: 0 0 #0000;
-      --tw-inset-shadow-color: initial;
-      --tw-ring-color: initial;
-      --tw-ring-shadow: 0 0 #0000;
-      --tw-inset-ring-color: initial;
-      --tw-inset-ring-shadow: 0 0 #0000;
-      --tw-ring-inset: initial;
-      --tw-ring-offset-width: 0px;
-      --tw-ring-offset-color: #fff;
-      --tw-ring-offset-shadow: 0 0 #0000;
-    }
-  }
-}
-
-@keyframes spin {
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-@keyframes ping {
-  75%, 100% {
-    opacity: 0;
-    transform: scale(2);
-  }
-}
-
-@keyframes pulse {
-  50% {
-    opacity: .5;
-  }
-}
-
-@keyframes bounce {
-  0%, 100% {
-    animation-timing-function: cubic-bezier(.8, 0, 1, 1);
-    transform: translateY(-25%);
-  }
-
-  50% {
-    animation-timing-function: cubic-bezier(0, 0, .2, 1);
-    transform: none;
-  }
-}
-
 @property --tw-shadow {
   syntax: "*";
   inherits: false;
@@ -449,6 +58,12 @@ exports[`compiling CSS > \`@tailwind utilities\` is replaced by utilities using
   inherits: false
 }
 
+@property --tw-shadow-alpha {
+  syntax: "<percentage>";
+  inherits: false;
+  initial-value: 100%;
+}
+
 @property --tw-inset-shadow {
   syntax: "*";
   inherits: false;
@@ -460,6 +75,12 @@ exports[`compiling CSS > \`@tailwind utilities\` is replaced by utilities using
   inherits: false
 }
 
+@property --tw-inset-shadow-alpha {
+  syntax: "<percentage>";
+  inherits: false;
+  initial-value: 100%;
+}
+
 @property --tw-ring-color {
   syntax: "*";
   inherits: false
@@ -503,5 +124,270 @@ exports[`compiling CSS > \`@tailwind utilities\` is replaced by utilities using
   syntax: "*";
   inherits: false;
   initial-value: 0 0 #0000;
-}"
+}
+"
+`;
+
+exports[`compiling CSS > prefix all CSS variables inside preflight 1`] = `
+"
+@layer theme {
+  :root, :host {
+    --tw-font-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", Arial,
+    sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+    --tw-font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
+    monospace;
+    --tw-default-font-family: var(--tw-font-sans);
+    --tw-default-mono-font-family: var(--tw-font-mono);
+  }
+}
+
+@layer base {
+  *, :after, :before, ::backdrop {
+    box-sizing: border-box;
+    border: 0 solid;
+    margin: 0;
+    padding: 0;
+  }
+
+  ::file-selector-button {
+    box-sizing: border-box;
+    border: 0 solid;
+    margin: 0;
+    padding: 0;
+  }
+
+  html, :host {
+    -webkit-text-size-adjust: 100%;
+    tab-size: 4;
+    line-height: 1.5;
+    font-family: var(--tw-default-font-family, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji");
+    font-feature-settings: var(--tw-default-font-feature-settings, normal);
+    font-variation-settings: var(--tw-default-font-variation-settings, normal);
+    -webkit-tap-highlight-color: transparent;
+  }
+
+  hr {
+    height: 0;
+    color: inherit;
+    border-top-width: 1px;
+  }
+
+  abbr:where([title]) {
+    -webkit-text-decoration: underline dotted;
+    text-decoration: underline dotted;
+  }
+
+  h1, h2, h3, h4, h5, h6 {
+    font-size: inherit;
+    font-weight: inherit;
+  }
+
+  a {
+    color: inherit;
+    -webkit-text-decoration: inherit;
+    -webkit-text-decoration: inherit;
+    -webkit-text-decoration: inherit;
+    text-decoration: inherit;
+  }
+
+  b, strong {
+    font-weight: bolder;
+  }
+
+  code, kbd, samp, pre {
+    font-family: var(--tw-default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace);
+    font-feature-settings: var(--tw-default-mono-font-feature-settings, normal);
+    font-variation-settings: var(--tw-default-mono-font-variation-settings, normal);
+    font-size: 1em;
+  }
+
+  small {
+    font-size: 80%;
+  }
+
+  sub, sup {
+    vertical-align: baseline;
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+  }
+
+  sub {
+    bottom: -.25em;
+  }
+
+  sup {
+    top: -.5em;
+  }
+
+  table {
+    text-indent: 0;
+    border-color: inherit;
+    border-collapse: collapse;
+  }
+
+  :-moz-focusring:where(:not(iframe)) {
+    outline: auto;
+  }
+
+  progress {
+    vertical-align: baseline;
+  }
+
+  summary {
+    display: list-item;
+  }
+
+  ol, ul, menu {
+    list-style: none;
+  }
+
+  img, svg, video, canvas, audio, iframe, embed, object {
+    vertical-align: middle;
+    display: block;
+  }
+
+  img, video {
+    max-width: 100%;
+    height: auto;
+  }
+
+  button, input, select, optgroup, textarea {
+    font: inherit;
+    font-feature-settings: inherit;
+    font-variation-settings: inherit;
+    letter-spacing: inherit;
+    color: inherit;
+    opacity: 1;
+    background-color: #0000;
+    border-radius: 0;
+  }
+
+  ::file-selector-button {
+    font: inherit;
+    font-feature-settings: inherit;
+    font-variation-settings: inherit;
+    letter-spacing: inherit;
+    color: inherit;
+    opacity: 1;
+    background-color: #0000;
+    border-radius: 0;
+  }
+
+  :where(select:is([multiple], [size])) optgroup {
+    font-weight: bolder;
+  }
+
+  :where(select:is([multiple], [size])) optgroup option {
+    padding-inline-start: 20px;
+  }
+
+  ::file-selector-button {
+    margin-inline-end: 4px;
+  }
+
+  ::placeholder {
+    opacity: 1;
+  }
+
+  @supports (not ((-webkit-appearance: -apple-pay-button))) or (contain-intrinsic-size: 1px) {
+    ::placeholder {
+      color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      ::placeholder {
+        color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+  }
+
+  textarea {
+    resize: vertical;
+  }
+
+  ::-webkit-search-decoration {
+    -webkit-appearance: none;
+  }
+
+  ::-webkit-date-and-time-value {
+    min-height: 1lh;
+    text-align: inherit;
+  }
+
+  ::-webkit-datetime-edit {
+    display: inline-flex;
+  }
+
+  ::-webkit-datetime-edit-fields-wrapper {
+    padding: 0;
+  }
+
+  ::-webkit-datetime-edit {
+    padding-block: 0;
+  }
+
+  ::-webkit-datetime-edit-year-field {
+    padding-block: 0;
+  }
+
+  ::-webkit-datetime-edit-month-field {
+    padding-block: 0;
+  }
+
+  ::-webkit-datetime-edit-day-field {
+    padding-block: 0;
+  }
+
+  ::-webkit-datetime-edit-hour-field {
+    padding-block: 0;
+  }
+
+  ::-webkit-datetime-edit-minute-field {
+    padding-block: 0;
+  }
+
+  ::-webkit-datetime-edit-second-field {
+    padding-block: 0;
+  }
+
+  ::-webkit-datetime-edit-millisecond-field {
+    padding-block: 0;
+  }
+
+  ::-webkit-datetime-edit-meridiem-field {
+    padding-block: 0;
+  }
+
+  ::-webkit-calendar-picker-indicator {
+    line-height: 1;
+  }
+
+  :-moz-ui-invalid {
+    box-shadow: none;
+  }
+
+  button, input:where([type="button"], [type="reset"], [type="submit"]) {
+    appearance: button;
+  }
+
+  ::file-selector-button {
+    appearance: button;
+  }
+
+  ::-webkit-inner-spin-button {
+    height: auto;
+  }
+
+  ::-webkit-outer-spin-button {
+    height: auto;
+  }
+
+  [hidden]:where(:not([hidden="until-found"])) {
+    display: none !important;
+  }
+}
+
+@layer components, utilities;
+"
 `;
diff --git a/packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap b/packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap
index 3c20b11d0..d595e8c01 100644
--- a/packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap
+++ b/packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap
@@ -11,6 +11,33 @@ exports[`getClassList 1`] = `
   "-bg-conic-0/shorter",
   "-bg-conic-0/increasing",
   "-bg-conic-0/decreasing",
+  "-bg-conic-30",
+  "-bg-conic-30/oklab",
+  "-bg-conic-30/oklch",
+  "-bg-conic-30/srgb",
+  "-bg-conic-30/hsl",
+  "-bg-conic-30/longer",
+  "-bg-conic-30/shorter",
+  "-bg-conic-30/increasing",
+  "-bg-conic-30/decreasing",
+  "-bg-conic-60",
+  "-bg-conic-60/oklab",
+  "-bg-conic-60/oklch",
+  "-bg-conic-60/srgb",
+  "-bg-conic-60/hsl",
+  "-bg-conic-60/longer",
+  "-bg-conic-60/shorter",
+  "-bg-conic-60/increasing",
+  "-bg-conic-60/decreasing",
+  "-bg-conic-90",
+  "-bg-conic-90/oklab",
+  "-bg-conic-90/oklch",
+  "-bg-conic-90/srgb",
+  "-bg-conic-90/hsl",
+  "-bg-conic-90/longer",
+  "-bg-conic-90/shorter",
+  "-bg-conic-90/increasing",
+  "-bg-conic-90/decreasing",
   "-bg-conic-120",
   "-bg-conic-120/oklab",
   "-bg-conic-120/oklch",
@@ -65,15 +92,6 @@ exports[`getClassList 1`] = `
   "-bg-conic-270/shorter",
   "-bg-conic-270/increasing",
   "-bg-conic-270/decreasing",
-  "-bg-conic-30",
-  "-bg-conic-30/oklab",
-  "-bg-conic-30/oklch",
-  "-bg-conic-30/srgb",
-  "-bg-conic-30/hsl",
-  "-bg-conic-30/longer",
-  "-bg-conic-30/shorter",
-  "-bg-conic-30/increasing",
-  "-bg-conic-30/decreasing",
   "-bg-conic-300",
   "-bg-conic-300/oklab",
   "-bg-conic-300/oklch",
@@ -92,24 +110,6 @@ exports[`getClassList 1`] = `
   "-bg-conic-330/shorter",
   "-bg-conic-330/increasing",
   "-bg-conic-330/decreasing",
-  "-bg-conic-60",
-  "-bg-conic-60/oklab",
-  "-bg-conic-60/oklch",
-  "-bg-conic-60/srgb",
-  "-bg-conic-60/hsl",
-  "-bg-conic-60/longer",
-  "-bg-conic-60/shorter",
-  "-bg-conic-60/increasing",
-  "-bg-conic-60/decreasing",
-  "-bg-conic-90",
-  "-bg-conic-90/oklab",
-  "-bg-conic-90/oklch",
-  "-bg-conic-90/srgb",
-  "-bg-conic-90/hsl",
-  "-bg-conic-90/longer",
-  "-bg-conic-90/shorter",
-  "-bg-conic-90/increasing",
-  "-bg-conic-90/decreasing",
   "-bg-linear-0",
   "-bg-linear-0/oklab",
   "-bg-linear-0/oklch",
@@ -119,6 +119,33 @@ exports[`getClassList 1`] = `
   "-bg-linear-0/shorter",
   "-bg-linear-0/increasing",
   "-bg-linear-0/decreasing",
+  "-bg-linear-30",
+  "-bg-linear-30/oklab",
+  "-bg-linear-30/oklch",
+  "-bg-linear-30/srgb",
+  "-bg-linear-30/hsl",
+  "-bg-linear-30/longer",
+  "-bg-linear-30/shorter",
+  "-bg-linear-30/increasing",
+  "-bg-linear-30/decreasing",
+  "-bg-linear-60",
+  "-bg-linear-60/oklab",
+  "-bg-linear-60/oklch",
+  "-bg-linear-60/srgb",
+  "-bg-linear-60/hsl",
+  "-bg-linear-60/longer",
+  "-bg-linear-60/shorter",
+  "-bg-linear-60/increasing",
+  "-bg-linear-60/decreasing",
+  "-bg-linear-90",
+  "-bg-linear-90/oklab",
+  "-bg-linear-90/oklch",
+  "-bg-linear-90/srgb",
+  "-bg-linear-90/hsl",
+  "-bg-linear-90/longer",
+  "-bg-linear-90/shorter",
+  "-bg-linear-90/increasing",
+  "-bg-linear-90/decreasing",
   "-bg-linear-120",
   "-bg-linear-120/oklab",
   "-bg-linear-120/oklch",
@@ -173,15 +200,6 @@ exports[`getClassList 1`] = `
   "-bg-linear-270/shorter",
   "-bg-linear-270/increasing",
   "-bg-linear-270/decreasing",
-  "-bg-linear-30",
-  "-bg-linear-30/oklab",
-  "-bg-linear-30/oklch",
-  "-bg-linear-30/srgb",
-  "-bg-linear-30/hsl",
-  "-bg-linear-30/longer",
-  "-bg-linear-30/shorter",
-  "-bg-linear-30/increasing",
-  "-bg-linear-30/decreasing",
   "-bg-linear-300",
   "-bg-linear-300/oklab",
   "-bg-linear-300/oklch",
@@ -200,65 +218,69 @@ exports[`getClassList 1`] = `
   "-bg-linear-330/shorter",
   "-bg-linear-330/increasing",
   "-bg-linear-330/decreasing",
-  "-bg-linear-60",
-  "-bg-linear-60/oklab",
-  "-bg-linear-60/oklch",
-  "-bg-linear-60/srgb",
-  "-bg-linear-60/hsl",
-  "-bg-linear-60/longer",
-  "-bg-linear-60/shorter",
-  "-bg-linear-60/increasing",
-  "-bg-linear-60/decreasing",
-  "-bg-linear-90",
-  "-bg-linear-90/oklab",
-  "-bg-linear-90/oklch",
-  "-bg-linear-90/srgb",
-  "-bg-linear-90/hsl",
-  "-bg-linear-90/longer",
-  "-bg-linear-90/shorter",
-  "-bg-linear-90/increasing",
-  "-bg-linear-90/decreasing",
   "-bottom-0",
   "-bottom-0.5",
   "-bottom-1",
   "-bottom-1.5",
+  "-bottom-2",
+  "-bottom-2.5",
+  "-bottom-3",
+  "-bottom-3.5",
+  "-bottom-4",
+  "-bottom-5",
+  "-bottom-6",
+  "-bottom-7",
+  "-bottom-8",
+  "-bottom-9",
   "-bottom-10",
   "-bottom-11",
   "-bottom-12",
   "-bottom-14",
   "-bottom-16",
-  "-bottom-2",
-  "-bottom-2.5",
   "-bottom-20",
   "-bottom-24",
   "-bottom-28",
-  "-bottom-3",
-  "-bottom-3.5",
   "-bottom-32",
   "-bottom-36",
-  "-bottom-4",
   "-bottom-40",
   "-bottom-44",
   "-bottom-48",
-  "-bottom-5",
   "-bottom-52",
   "-bottom-56",
-  "-bottom-6",
   "-bottom-60",
   "-bottom-64",
-  "-bottom-7",
   "-bottom-72",
-  "-bottom-8",
   "-bottom-80",
-  "-bottom-9",
   "-bottom-96",
+  "-bottom-1/2",
+  "-bottom-1/3",
+  "-bottom-1/4",
+  "-bottom-1/5",
+  "-bottom-1/6",
+  "-bottom-1/12",
+  "-bottom-2/3",
+  "-bottom-2/4",
+  "-bottom-2/5",
+  "-bottom-2/6",
+  "-bottom-2/12",
+  "-bottom-3/4",
+  "-bottom-3/5",
+  "-bottom-3/6",
+  "-bottom-3/12",
+  "-bottom-4/5",
+  "-bottom-4/6",
+  "-bottom-4/12",
+  "-bottom-5/6",
+  "-bottom-5/12",
+  "-bottom-6/12",
+  "-bottom-7/12",
+  "-bottom-8/12",
+  "-bottom-9/12",
+  "-bottom-10/12",
+  "-bottom-11/12",
   "-bottom-full",
   "-bottom-px",
   "-col-end-1",
-  "-col-end-10",
-  "-col-end-11",
-  "-col-end-12",
-  "-col-end-13",
   "-col-end-2",
   "-col-end-3",
   "-col-end-4",
@@ -267,11 +289,11 @@ exports[`getClassList 1`] = `
   "-col-end-7",
   "-col-end-8",
   "-col-end-9",
+  "-col-end-10",
+  "-col-end-11",
+  "-col-end-12",
+  "-col-end-13",
   "-col-start-1",
-  "-col-start-10",
-  "-col-start-11",
-  "-col-start-12",
-  "-col-start-13",
   "-col-start-2",
   "-col-start-3",
   "-col-start-4",
@@ -280,540 +302,947 @@ exports[`getClassList 1`] = `
   "-col-start-7",
   "-col-start-8",
   "-col-start-9",
-  "-end-0",
-  "-end-0.5",
-  "-end-1",
-  "-end-1.5",
-  "-end-10",
-  "-end-11",
-  "-end-12",
-  "-end-14",
-  "-end-16",
-  "-end-2",
-  "-end-2.5",
-  "-end-20",
-  "-end-24",
-  "-end-28",
-  "-end-3",
-  "-end-3.5",
-  "-end-32",
-  "-end-36",
-  "-end-4",
-  "-end-40",
-  "-end-44",
-  "-end-48",
-  "-end-5",
-  "-end-52",
-  "-end-56",
-  "-end-6",
-  "-end-60",
-  "-end-64",
-  "-end-7",
-  "-end-72",
-  "-end-8",
-  "-end-80",
-  "-end-9",
-  "-end-96",
+  "-col-start-10",
+  "-col-start-11",
+  "-col-start-12",
+  "-col-start-13",
   "-end-full",
   "-end-px",
   "-indent-0",
   "-indent-0.5",
   "-indent-1",
   "-indent-1.5",
+  "-indent-2",
+  "-indent-2.5",
+  "-indent-3",
+  "-indent-3.5",
+  "-indent-4",
+  "-indent-5",
+  "-indent-6",
+  "-indent-7",
+  "-indent-8",
+  "-indent-9",
   "-indent-10",
   "-indent-11",
   "-indent-12",
   "-indent-14",
   "-indent-16",
-  "-indent-2",
-  "-indent-2.5",
   "-indent-20",
   "-indent-24",
   "-indent-28",
-  "-indent-3",
-  "-indent-3.5",
   "-indent-32",
   "-indent-36",
-  "-indent-4",
   "-indent-40",
   "-indent-44",
   "-indent-48",
-  "-indent-5",
   "-indent-52",
   "-indent-56",
-  "-indent-6",
   "-indent-60",
   "-indent-64",
-  "-indent-7",
   "-indent-72",
-  "-indent-8",
   "-indent-80",
-  "-indent-9",
   "-indent-96",
   "-indent-px",
   "-inset-0",
   "-inset-0.5",
   "-inset-1",
   "-inset-1.5",
+  "-inset-2",
+  "-inset-2.5",
+  "-inset-3",
+  "-inset-3.5",
+  "-inset-4",
+  "-inset-5",
+  "-inset-6",
+  "-inset-7",
+  "-inset-8",
+  "-inset-9",
   "-inset-10",
   "-inset-11",
   "-inset-12",
   "-inset-14",
   "-inset-16",
-  "-inset-2",
-  "-inset-2.5",
   "-inset-20",
   "-inset-24",
   "-inset-28",
-  "-inset-3",
-  "-inset-3.5",
   "-inset-32",
   "-inset-36",
-  "-inset-4",
   "-inset-40",
   "-inset-44",
   "-inset-48",
-  "-inset-5",
   "-inset-52",
   "-inset-56",
-  "-inset-6",
   "-inset-60",
   "-inset-64",
-  "-inset-7",
   "-inset-72",
-  "-inset-8",
   "-inset-80",
-  "-inset-9",
   "-inset-96",
+  "-inset-1/2",
+  "-inset-1/3",
+  "-inset-1/4",
+  "-inset-1/5",
+  "-inset-1/6",
+  "-inset-1/12",
+  "-inset-2/3",
+  "-inset-2/4",
+  "-inset-2/5",
+  "-inset-2/6",
+  "-inset-2/12",
+  "-inset-3/4",
+  "-inset-3/5",
+  "-inset-3/6",
+  "-inset-3/12",
+  "-inset-4/5",
+  "-inset-4/6",
+  "-inset-4/12",
+  "-inset-5/6",
+  "-inset-5/12",
+  "-inset-6/12",
+  "-inset-7/12",
+  "-inset-8/12",
+  "-inset-9/12",
+  "-inset-10/12",
+  "-inset-11/12",
+  "-inset-be-0",
+  "-inset-be-0.5",
+  "-inset-be-1",
+  "-inset-be-1.5",
+  "-inset-be-2",
+  "-inset-be-2.5",
+  "-inset-be-3",
+  "-inset-be-3.5",
+  "-inset-be-4",
+  "-inset-be-5",
+  "-inset-be-6",
+  "-inset-be-7",
+  "-inset-be-8",
+  "-inset-be-9",
+  "-inset-be-10",
+  "-inset-be-11",
+  "-inset-be-12",
+  "-inset-be-14",
+  "-inset-be-16",
+  "-inset-be-20",
+  "-inset-be-24",
+  "-inset-be-28",
+  "-inset-be-32",
+  "-inset-be-36",
+  "-inset-be-40",
+  "-inset-be-44",
+  "-inset-be-48",
+  "-inset-be-52",
+  "-inset-be-56",
+  "-inset-be-60",
+  "-inset-be-64",
+  "-inset-be-72",
+  "-inset-be-80",
+  "-inset-be-96",
+  "-inset-be-1/2",
+  "-inset-be-1/3",
+  "-inset-be-1/4",
+  "-inset-be-1/5",
+  "-inset-be-1/6",
+  "-inset-be-1/12",
+  "-inset-be-2/3",
+  "-inset-be-2/4",
+  "-inset-be-2/5",
+  "-inset-be-2/6",
+  "-inset-be-2/12",
+  "-inset-be-3/4",
+  "-inset-be-3/5",
+  "-inset-be-3/6",
+  "-inset-be-3/12",
+  "-inset-be-4/5",
+  "-inset-be-4/6",
+  "-inset-be-4/12",
+  "-inset-be-5/6",
+  "-inset-be-5/12",
+  "-inset-be-6/12",
+  "-inset-be-7/12",
+  "-inset-be-8/12",
+  "-inset-be-9/12",
+  "-inset-be-10/12",
+  "-inset-be-11/12",
+  "-inset-be-full",
+  "-inset-be-px",
+  "-inset-bs-0",
+  "-inset-bs-0.5",
+  "-inset-bs-1",
+  "-inset-bs-1.5",
+  "-inset-bs-2",
+  "-inset-bs-2.5",
+  "-inset-bs-3",
+  "-inset-bs-3.5",
+  "-inset-bs-4",
+  "-inset-bs-5",
+  "-inset-bs-6",
+  "-inset-bs-7",
+  "-inset-bs-8",
+  "-inset-bs-9",
+  "-inset-bs-10",
+  "-inset-bs-11",
+  "-inset-bs-12",
+  "-inset-bs-14",
+  "-inset-bs-16",
+  "-inset-bs-20",
+  "-inset-bs-24",
+  "-inset-bs-28",
+  "-inset-bs-32",
+  "-inset-bs-36",
+  "-inset-bs-40",
+  "-inset-bs-44",
+  "-inset-bs-48",
+  "-inset-bs-52",
+  "-inset-bs-56",
+  "-inset-bs-60",
+  "-inset-bs-64",
+  "-inset-bs-72",
+  "-inset-bs-80",
+  "-inset-bs-96",
+  "-inset-bs-1/2",
+  "-inset-bs-1/3",
+  "-inset-bs-1/4",
+  "-inset-bs-1/5",
+  "-inset-bs-1/6",
+  "-inset-bs-1/12",
+  "-inset-bs-2/3",
+  "-inset-bs-2/4",
+  "-inset-bs-2/5",
+  "-inset-bs-2/6",
+  "-inset-bs-2/12",
+  "-inset-bs-3/4",
+  "-inset-bs-3/5",
+  "-inset-bs-3/6",
+  "-inset-bs-3/12",
+  "-inset-bs-4/5",
+  "-inset-bs-4/6",
+  "-inset-bs-4/12",
+  "-inset-bs-5/6",
+  "-inset-bs-5/12",
+  "-inset-bs-6/12",
+  "-inset-bs-7/12",
+  "-inset-bs-8/12",
+  "-inset-bs-9/12",
+  "-inset-bs-10/12",
+  "-inset-bs-11/12",
+  "-inset-bs-full",
+  "-inset-bs-px",
+  "-inset-e-0",
+  "-inset-e-0.5",
+  "-inset-e-1",
+  "-inset-e-1.5",
+  "-inset-e-2",
+  "-inset-e-2.5",
+  "-inset-e-3",
+  "-inset-e-3.5",
+  "-inset-e-4",
+  "-inset-e-5",
+  "-inset-e-6",
+  "-inset-e-7",
+  "-inset-e-8",
+  "-inset-e-9",
+  "-inset-e-10",
+  "-inset-e-11",
+  "-inset-e-12",
+  "-inset-e-14",
+  "-inset-e-16",
+  "-inset-e-20",
+  "-inset-e-24",
+  "-inset-e-28",
+  "-inset-e-32",
+  "-inset-e-36",
+  "-inset-e-40",
+  "-inset-e-44",
+  "-inset-e-48",
+  "-inset-e-52",
+  "-inset-e-56",
+  "-inset-e-60",
+  "-inset-e-64",
+  "-inset-e-72",
+  "-inset-e-80",
+  "-inset-e-96",
+  "-inset-e-1/2",
+  "-inset-e-1/3",
+  "-inset-e-1/4",
+  "-inset-e-1/5",
+  "-inset-e-1/6",
+  "-inset-e-1/12",
+  "-inset-e-2/3",
+  "-inset-e-2/4",
+  "-inset-e-2/5",
+  "-inset-e-2/6",
+  "-inset-e-2/12",
+  "-inset-e-3/4",
+  "-inset-e-3/5",
+  "-inset-e-3/6",
+  "-inset-e-3/12",
+  "-inset-e-4/5",
+  "-inset-e-4/6",
+  "-inset-e-4/12",
+  "-inset-e-5/6",
+  "-inset-e-5/12",
+  "-inset-e-6/12",
+  "-inset-e-7/12",
+  "-inset-e-8/12",
+  "-inset-e-9/12",
+  "-inset-e-10/12",
+  "-inset-e-11/12",
+  "-inset-e-full",
+  "-inset-e-px",
   "-inset-full",
   "-inset-px",
+  "-inset-s-0",
+  "-inset-s-0.5",
+  "-inset-s-1",
+  "-inset-s-1.5",
+  "-inset-s-2",
+  "-inset-s-2.5",
+  "-inset-s-3",
+  "-inset-s-3.5",
+  "-inset-s-4",
+  "-inset-s-5",
+  "-inset-s-6",
+  "-inset-s-7",
+  "-inset-s-8",
+  "-inset-s-9",
+  "-inset-s-10",
+  "-inset-s-11",
+  "-inset-s-12",
+  "-inset-s-14",
+  "-inset-s-16",
+  "-inset-s-20",
+  "-inset-s-24",
+  "-inset-s-28",
+  "-inset-s-32",
+  "-inset-s-36",
+  "-inset-s-40",
+  "-inset-s-44",
+  "-inset-s-48",
+  "-inset-s-52",
+  "-inset-s-56",
+  "-inset-s-60",
+  "-inset-s-64",
+  "-inset-s-72",
+  "-inset-s-80",
+  "-inset-s-96",
+  "-inset-s-1/2",
+  "-inset-s-1/3",
+  "-inset-s-1/4",
+  "-inset-s-1/5",
+  "-inset-s-1/6",
+  "-inset-s-1/12",
+  "-inset-s-2/3",
+  "-inset-s-2/4",
+  "-inset-s-2/5",
+  "-inset-s-2/6",
+  "-inset-s-2/12",
+  "-inset-s-3/4",
+  "-inset-s-3/5",
+  "-inset-s-3/6",
+  "-inset-s-3/12",
+  "-inset-s-4/5",
+  "-inset-s-4/6",
+  "-inset-s-4/12",
+  "-inset-s-5/6",
+  "-inset-s-5/12",
+  "-inset-s-6/12",
+  "-inset-s-7/12",
+  "-inset-s-8/12",
+  "-inset-s-9/12",
+  "-inset-s-10/12",
+  "-inset-s-11/12",
+  "-inset-s-full",
+  "-inset-s-px",
   "-inset-x-0",
   "-inset-x-0.5",
   "-inset-x-1",
   "-inset-x-1.5",
+  "-inset-x-2",
+  "-inset-x-2.5",
+  "-inset-x-3",
+  "-inset-x-3.5",
+  "-inset-x-4",
+  "-inset-x-5",
+  "-inset-x-6",
+  "-inset-x-7",
+  "-inset-x-8",
+  "-inset-x-9",
   "-inset-x-10",
   "-inset-x-11",
   "-inset-x-12",
   "-inset-x-14",
   "-inset-x-16",
-  "-inset-x-2",
-  "-inset-x-2.5",
   "-inset-x-20",
   "-inset-x-24",
   "-inset-x-28",
-  "-inset-x-3",
-  "-inset-x-3.5",
   "-inset-x-32",
   "-inset-x-36",
-  "-inset-x-4",
   "-inset-x-40",
   "-inset-x-44",
   "-inset-x-48",
-  "-inset-x-5",
   "-inset-x-52",
   "-inset-x-56",
-  "-inset-x-6",
   "-inset-x-60",
   "-inset-x-64",
-  "-inset-x-7",
   "-inset-x-72",
-  "-inset-x-8",
   "-inset-x-80",
-  "-inset-x-9",
   "-inset-x-96",
+  "-inset-x-1/2",
+  "-inset-x-1/3",
+  "-inset-x-1/4",
+  "-inset-x-1/5",
+  "-inset-x-1/6",
+  "-inset-x-1/12",
+  "-inset-x-2/3",
+  "-inset-x-2/4",
+  "-inset-x-2/5",
+  "-inset-x-2/6",
+  "-inset-x-2/12",
+  "-inset-x-3/4",
+  "-inset-x-3/5",
+  "-inset-x-3/6",
+  "-inset-x-3/12",
+  "-inset-x-4/5",
+  "-inset-x-4/6",
+  "-inset-x-4/12",
+  "-inset-x-5/6",
+  "-inset-x-5/12",
+  "-inset-x-6/12",
+  "-inset-x-7/12",
+  "-inset-x-8/12",
+  "-inset-x-9/12",
+  "-inset-x-10/12",
+  "-inset-x-11/12",
   "-inset-x-full",
   "-inset-x-px",
   "-inset-y-0",
   "-inset-y-0.5",
   "-inset-y-1",
   "-inset-y-1.5",
+  "-inset-y-2",
+  "-inset-y-2.5",
+  "-inset-y-3",
+  "-inset-y-3.5",
+  "-inset-y-4",
+  "-inset-y-5",
+  "-inset-y-6",
+  "-inset-y-7",
+  "-inset-y-8",
+  "-inset-y-9",
   "-inset-y-10",
   "-inset-y-11",
   "-inset-y-12",
   "-inset-y-14",
   "-inset-y-16",
-  "-inset-y-2",
-  "-inset-y-2.5",
   "-inset-y-20",
   "-inset-y-24",
   "-inset-y-28",
-  "-inset-y-3",
-  "-inset-y-3.5",
   "-inset-y-32",
   "-inset-y-36",
-  "-inset-y-4",
   "-inset-y-40",
   "-inset-y-44",
   "-inset-y-48",
-  "-inset-y-5",
   "-inset-y-52",
   "-inset-y-56",
-  "-inset-y-6",
   "-inset-y-60",
   "-inset-y-64",
-  "-inset-y-7",
   "-inset-y-72",
-  "-inset-y-8",
   "-inset-y-80",
-  "-inset-y-9",
   "-inset-y-96",
+  "-inset-y-1/2",
+  "-inset-y-1/3",
+  "-inset-y-1/4",
+  "-inset-y-1/5",
+  "-inset-y-1/6",
+  "-inset-y-1/12",
+  "-inset-y-2/3",
+  "-inset-y-2/4",
+  "-inset-y-2/5",
+  "-inset-y-2/6",
+  "-inset-y-2/12",
+  "-inset-y-3/4",
+  "-inset-y-3/5",
+  "-inset-y-3/6",
+  "-inset-y-3/12",
+  "-inset-y-4/5",
+  "-inset-y-4/6",
+  "-inset-y-4/12",
+  "-inset-y-5/6",
+  "-inset-y-5/12",
+  "-inset-y-6/12",
+  "-inset-y-7/12",
+  "-inset-y-8/12",
+  "-inset-y-9/12",
+  "-inset-y-10/12",
+  "-inset-y-11/12",
   "-inset-y-full",
   "-inset-y-px",
   "-left-0",
   "-left-0.5",
   "-left-1",
   "-left-1.5",
+  "-left-2",
+  "-left-2.5",
+  "-left-3",
+  "-left-3.5",
+  "-left-4",
+  "-left-5",
+  "-left-6",
+  "-left-7",
+  "-left-8",
+  "-left-9",
   "-left-10",
   "-left-11",
   "-left-12",
   "-left-14",
   "-left-16",
-  "-left-2",
-  "-left-2.5",
   "-left-20",
   "-left-24",
   "-left-28",
-  "-left-3",
-  "-left-3.5",
   "-left-32",
   "-left-36",
-  "-left-4",
   "-left-40",
   "-left-44",
   "-left-48",
-  "-left-5",
   "-left-52",
   "-left-56",
-  "-left-6",
   "-left-60",
   "-left-64",
-  "-left-7",
   "-left-72",
-  "-left-8",
   "-left-80",
-  "-left-9",
   "-left-96",
+  "-left-1/2",
+  "-left-1/3",
+  "-left-1/4",
+  "-left-1/5",
+  "-left-1/6",
+  "-left-1/12",
+  "-left-2/3",
+  "-left-2/4",
+  "-left-2/5",
+  "-left-2/6",
+  "-left-2/12",
+  "-left-3/4",
+  "-left-3/5",
+  "-left-3/6",
+  "-left-3/12",
+  "-left-4/5",
+  "-left-4/6",
+  "-left-4/12",
+  "-left-5/6",
+  "-left-5/12",
+  "-left-6/12",
+  "-left-7/12",
+  "-left-8/12",
+  "-left-9/12",
+  "-left-10/12",
+  "-left-11/12",
   "-left-full",
   "-left-px",
   "-m-0",
   "-m-0.5",
   "-m-1",
   "-m-1.5",
+  "-m-2",
+  "-m-2.5",
+  "-m-3",
+  "-m-3.5",
+  "-m-4",
+  "-m-5",
+  "-m-6",
+  "-m-7",
+  "-m-8",
+  "-m-9",
   "-m-10",
   "-m-11",
   "-m-12",
   "-m-14",
   "-m-16",
-  "-m-2",
-  "-m-2.5",
   "-m-20",
   "-m-24",
   "-m-28",
-  "-m-3",
-  "-m-3.5",
   "-m-32",
   "-m-36",
-  "-m-4",
   "-m-40",
   "-m-44",
   "-m-48",
-  "-m-5",
   "-m-52",
   "-m-56",
-  "-m-6",
   "-m-60",
   "-m-64",
-  "-m-7",
   "-m-72",
-  "-m-8",
   "-m-80",
-  "-m-9",
   "-m-96",
   "-m-px",
+  "-mask-conic-0",
+  "-mask-conic-1",
+  "-mask-conic-2",
+  "-mask-conic-3",
+  "-mask-conic-6",
+  "-mask-conic-12",
+  "-mask-conic-45",
+  "-mask-conic-90",
+  "-mask-conic-180",
+  "-mask-linear-0",
+  "-mask-linear-1",
+  "-mask-linear-2",
+  "-mask-linear-3",
+  "-mask-linear-6",
+  "-mask-linear-12",
+  "-mask-linear-45",
+  "-mask-linear-90",
+  "-mask-linear-180",
   "-mb-0",
   "-mb-0.5",
   "-mb-1",
   "-mb-1.5",
+  "-mb-2",
+  "-mb-2.5",
+  "-mb-3",
+  "-mb-3.5",
+  "-mb-4",
+  "-mb-5",
+  "-mb-6",
+  "-mb-7",
+  "-mb-8",
+  "-mb-9",
   "-mb-10",
   "-mb-11",
   "-mb-12",
   "-mb-14",
   "-mb-16",
-  "-mb-2",
-  "-mb-2.5",
   "-mb-20",
   "-mb-24",
   "-mb-28",
-  "-mb-3",
-  "-mb-3.5",
   "-mb-32",
   "-mb-36",
-  "-mb-4",
   "-mb-40",
   "-mb-44",
   "-mb-48",
-  "-mb-5",
   "-mb-52",
   "-mb-56",
-  "-mb-6",
   "-mb-60",
   "-mb-64",
-  "-mb-7",
   "-mb-72",
-  "-mb-8",
   "-mb-80",
-  "-mb-9",
   "-mb-96",
   "-mb-px",
+  "-mbe-0",
+  "-mbe-0.5",
+  "-mbe-1",
+  "-mbe-1.5",
+  "-mbe-2",
+  "-mbe-2.5",
+  "-mbe-3",
+  "-mbe-3.5",
+  "-mbe-4",
+  "-mbe-5",
+  "-mbe-6",
+  "-mbe-7",
+  "-mbe-8",
+  "-mbe-9",
+  "-mbe-10",
+  "-mbe-11",
+  "-mbe-12",
+  "-mbe-14",
+  "-mbe-16",
+  "-mbe-20",
+  "-mbe-24",
+  "-mbe-28",
+  "-mbe-32",
+  "-mbe-36",
+  "-mbe-40",
+  "-mbe-44",
+  "-mbe-48",
+  "-mbe-52",
+  "-mbe-56",
+  "-mbe-60",
+  "-mbe-64",
+  "-mbe-72",
+  "-mbe-80",
+  "-mbe-96",
+  "-mbe-px",
+  "-mbs-0",
+  "-mbs-0.5",
+  "-mbs-1",
+  "-mbs-1.5",
+  "-mbs-2",
+  "-mbs-2.5",
+  "-mbs-3",
+  "-mbs-3.5",
+  "-mbs-4",
+  "-mbs-5",
+  "-mbs-6",
+  "-mbs-7",
+  "-mbs-8",
+  "-mbs-9",
+  "-mbs-10",
+  "-mbs-11",
+  "-mbs-12",
+  "-mbs-14",
+  "-mbs-16",
+  "-mbs-20",
+  "-mbs-24",
+  "-mbs-28",
+  "-mbs-32",
+  "-mbs-36",
+  "-mbs-40",
+  "-mbs-44",
+  "-mbs-48",
+  "-mbs-52",
+  "-mbs-56",
+  "-mbs-60",
+  "-mbs-64",
+  "-mbs-72",
+  "-mbs-80",
+  "-mbs-96",
+  "-mbs-px",
   "-me-0",
   "-me-0.5",
   "-me-1",
   "-me-1.5",
+  "-me-2",
+  "-me-2.5",
+  "-me-3",
+  "-me-3.5",
+  "-me-4",
+  "-me-5",
+  "-me-6",
+  "-me-7",
+  "-me-8",
+  "-me-9",
   "-me-10",
   "-me-11",
   "-me-12",
   "-me-14",
   "-me-16",
-  "-me-2",
-  "-me-2.5",
   "-me-20",
   "-me-24",
   "-me-28",
-  "-me-3",
-  "-me-3.5",
   "-me-32",
   "-me-36",
-  "-me-4",
   "-me-40",
   "-me-44",
   "-me-48",
-  "-me-5",
   "-me-52",
   "-me-56",
-  "-me-6",
   "-me-60",
   "-me-64",
-  "-me-7",
   "-me-72",
-  "-me-8",
   "-me-80",
-  "-me-9",
   "-me-96",
   "-me-px",
   "-ml-0",
   "-ml-0.5",
   "-ml-1",
   "-ml-1.5",
+  "-ml-2",
+  "-ml-2.5",
+  "-ml-3",
+  "-ml-3.5",
+  "-ml-4",
+  "-ml-5",
+  "-ml-6",
+  "-ml-7",
+  "-ml-8",
+  "-ml-9",
   "-ml-10",
   "-ml-11",
   "-ml-12",
   "-ml-14",
   "-ml-16",
-  "-ml-2",
-  "-ml-2.5",
   "-ml-20",
   "-ml-24",
   "-ml-28",
-  "-ml-3",
-  "-ml-3.5",
   "-ml-32",
   "-ml-36",
-  "-ml-4",
   "-ml-40",
   "-ml-44",
   "-ml-48",
-  "-ml-5",
   "-ml-52",
   "-ml-56",
-  "-ml-6",
   "-ml-60",
   "-ml-64",
-  "-ml-7",
   "-ml-72",
-  "-ml-8",
   "-ml-80",
-  "-ml-9",
   "-ml-96",
   "-ml-px",
   "-mr-0",
   "-mr-0.5",
   "-mr-1",
   "-mr-1.5",
+  "-mr-2",
+  "-mr-2.5",
+  "-mr-3",
+  "-mr-3.5",
+  "-mr-4",
+  "-mr-5",
+  "-mr-6",
+  "-mr-7",
+  "-mr-8",
+  "-mr-9",
   "-mr-10",
   "-mr-11",
   "-mr-12",
   "-mr-14",
   "-mr-16",
-  "-mr-2",
-  "-mr-2.5",
   "-mr-20",
   "-mr-24",
   "-mr-28",
-  "-mr-3",
-  "-mr-3.5",
   "-mr-32",
   "-mr-36",
-  "-mr-4",
   "-mr-40",
   "-mr-44",
   "-mr-48",
-  "-mr-5",
   "-mr-52",
   "-mr-56",
-  "-mr-6",
   "-mr-60",
   "-mr-64",
-  "-mr-7",
   "-mr-72",
-  "-mr-8",
   "-mr-80",
-  "-mr-9",
   "-mr-96",
   "-mr-px",
   "-ms-0",
   "-ms-0.5",
   "-ms-1",
   "-ms-1.5",
+  "-ms-2",
+  "-ms-2.5",
+  "-ms-3",
+  "-ms-3.5",
+  "-ms-4",
+  "-ms-5",
+  "-ms-6",
+  "-ms-7",
+  "-ms-8",
+  "-ms-9",
   "-ms-10",
   "-ms-11",
   "-ms-12",
   "-ms-14",
   "-ms-16",
-  "-ms-2",
-  "-ms-2.5",
   "-ms-20",
   "-ms-24",
   "-ms-28",
-  "-ms-3",
-  "-ms-3.5",
   "-ms-32",
   "-ms-36",
-  "-ms-4",
   "-ms-40",
   "-ms-44",
   "-ms-48",
-  "-ms-5",
   "-ms-52",
   "-ms-56",
-  "-ms-6",
   "-ms-60",
   "-ms-64",
-  "-ms-7",
   "-ms-72",
-  "-ms-8",
   "-ms-80",
-  "-ms-9",
   "-ms-96",
   "-ms-px",
   "-mt-0",
   "-mt-0.5",
   "-mt-1",
   "-mt-1.5",
+  "-mt-2",
+  "-mt-2.5",
+  "-mt-3",
+  "-mt-3.5",
+  "-mt-4",
+  "-mt-5",
+  "-mt-6",
+  "-mt-7",
+  "-mt-8",
+  "-mt-9",
   "-mt-10",
   "-mt-11",
   "-mt-12",
   "-mt-14",
   "-mt-16",
-  "-mt-2",
-  "-mt-2.5",
   "-mt-20",
   "-mt-24",
   "-mt-28",
-  "-mt-3",
-  "-mt-3.5",
   "-mt-32",
   "-mt-36",
-  "-mt-4",
   "-mt-40",
   "-mt-44",
   "-mt-48",
-  "-mt-5",
   "-mt-52",
   "-mt-56",
-  "-mt-6",
   "-mt-60",
   "-mt-64",
-  "-mt-7",
   "-mt-72",
-  "-mt-8",
   "-mt-80",
-  "-mt-9",
   "-mt-96",
   "-mt-px",
   "-mx-0",
   "-mx-0.5",
   "-mx-1",
   "-mx-1.5",
+  "-mx-2",
+  "-mx-2.5",
+  "-mx-3",
+  "-mx-3.5",
+  "-mx-4",
+  "-mx-5",
+  "-mx-6",
+  "-mx-7",
+  "-mx-8",
+  "-mx-9",
   "-mx-10",
   "-mx-11",
   "-mx-12",
   "-mx-14",
   "-mx-16",
-  "-mx-2",
-  "-mx-2.5",
   "-mx-20",
   "-mx-24",
   "-mx-28",
-  "-mx-3",
-  "-mx-3.5",
   "-mx-32",
   "-mx-36",
-  "-mx-4",
   "-mx-40",
   "-mx-44",
   "-mx-48",
-  "-mx-5",
   "-mx-52",
   "-mx-56",
-  "-mx-6",
   "-mx-60",
   "-mx-64",
-  "-mx-7",
   "-mx-72",
-  "-mx-8",
   "-mx-80",
-  "-mx-9",
   "-mx-96",
   "-mx-px",
   "-my-0",
   "-my-0.5",
   "-my-1",
   "-my-1.5",
+  "-my-2",
+  "-my-2.5",
+  "-my-3",
+  "-my-3.5",
+  "-my-4",
+  "-my-5",
+  "-my-6",
+  "-my-7",
+  "-my-8",
+  "-my-9",
   "-my-10",
   "-my-11",
   "-my-12",
   "-my-14",
   "-my-16",
-  "-my-2",
-  "-my-2.5",
   "-my-20",
   "-my-24",
   "-my-28",
-  "-my-3",
-  "-my-3.5",
   "-my-32",
   "-my-36",
-  "-my-4",
   "-my-40",
   "-my-44",
   "-my-48",
-  "-my-5",
   "-my-52",
   "-my-56",
-  "-my-6",
   "-my-60",
   "-my-64",
-  "-my-7",
   "-my-72",
-  "-my-8",
   "-my-80",
-  "-my-9",
   "-my-96",
   "-my-px",
   "-order-1",
-  "-order-10",
-  "-order-11",
-  "-order-12",
   "-order-2",
   "-order-3",
   "-order-4",
@@ -822,83 +1251,113 @@ exports[`getClassList 1`] = `
   "-order-7",
   "-order-8",
   "-order-9",
+  "-order-10",
+  "-order-11",
+  "-order-12",
+  "-outline-offset-0",
+  "-outline-offset-1",
+  "-outline-offset-2",
+  "-outline-offset-4",
+  "-outline-offset-8",
   "-right-0",
   "-right-0.5",
   "-right-1",
   "-right-1.5",
+  "-right-2",
+  "-right-2.5",
+  "-right-3",
+  "-right-3.5",
+  "-right-4",
+  "-right-5",
+  "-right-6",
+  "-right-7",
+  "-right-8",
+  "-right-9",
   "-right-10",
   "-right-11",
   "-right-12",
   "-right-14",
   "-right-16",
-  "-right-2",
-  "-right-2.5",
   "-right-20",
   "-right-24",
   "-right-28",
-  "-right-3",
-  "-right-3.5",
   "-right-32",
   "-right-36",
-  "-right-4",
   "-right-40",
   "-right-44",
   "-right-48",
-  "-right-5",
   "-right-52",
   "-right-56",
-  "-right-6",
   "-right-60",
   "-right-64",
-  "-right-7",
   "-right-72",
-  "-right-8",
   "-right-80",
-  "-right-9",
   "-right-96",
+  "-right-1/2",
+  "-right-1/3",
+  "-right-1/4",
+  "-right-1/5",
+  "-right-1/6",
+  "-right-1/12",
+  "-right-2/3",
+  "-right-2/4",
+  "-right-2/5",
+  "-right-2/6",
+  "-right-2/12",
+  "-right-3/4",
+  "-right-3/5",
+  "-right-3/6",
+  "-right-3/12",
+  "-right-4/5",
+  "-right-4/6",
+  "-right-4/12",
+  "-right-5/6",
+  "-right-5/12",
+  "-right-6/12",
+  "-right-7/12",
+  "-right-8/12",
+  "-right-9/12",
+  "-right-10/12",
+  "-right-11/12",
   "-right-full",
   "-right-px",
   "-rotate-0",
   "-rotate-1",
-  "-rotate-12",
-  "-rotate-180",
   "-rotate-2",
   "-rotate-3",
-  "-rotate-45",
   "-rotate-6",
+  "-rotate-12",
+  "-rotate-45",
   "-rotate-90",
+  "-rotate-180",
   "-rotate-x-0",
   "-rotate-x-1",
-  "-rotate-x-12",
-  "-rotate-x-180",
   "-rotate-x-2",
   "-rotate-x-3",
-  "-rotate-x-45",
   "-rotate-x-6",
+  "-rotate-x-12",
+  "-rotate-x-45",
   "-rotate-x-90",
+  "-rotate-x-180",
   "-rotate-y-0",
   "-rotate-y-1",
-  "-rotate-y-12",
-  "-rotate-y-180",
   "-rotate-y-2",
   "-rotate-y-3",
-  "-rotate-y-45",
   "-rotate-y-6",
+  "-rotate-y-12",
+  "-rotate-y-45",
   "-rotate-y-90",
+  "-rotate-y-180",
   "-rotate-z-0",
   "-rotate-z-1",
-  "-rotate-z-12",
-  "-rotate-z-180",
   "-rotate-z-2",
   "-rotate-z-3",
-  "-rotate-z-45",
   "-rotate-z-6",
+  "-rotate-z-12",
+  "-rotate-z-45",
   "-rotate-z-90",
+  "-rotate-z-180",
   "-row-end-1",
-  "-row-end-10",
-  "-row-end-11",
-  "-row-end-12",
-  "-row-end-13",
   "-row-end-2",
   "-row-end-3",
   "-row-end-4",
@@ -907,11 +1366,11 @@ exports[`getClassList 1`] = `
   "-row-end-7",
   "-row-end-8",
   "-row-end-9",
+  "-row-end-10",
+  "-row-end-11",
+  "-row-end-12",
+  "-row-end-13",
   "-row-start-1",
-  "-row-start-10",
-  "-row-start-11",
-  "-row-start-12",
-  "-row-start-13",
   "-row-start-2",
   "-row-start-3",
   "-row-start-4",
@@ -920,666 +1379,810 @@ exports[`getClassList 1`] = `
   "-row-start-7",
   "-row-start-8",
   "-row-start-9",
+  "-row-start-10",
+  "-row-start-11",
+  "-row-start-12",
+  "-row-start-13",
   "-scale-0",
+  "-scale-50",
+  "-scale-75",
+  "-scale-90",
+  "-scale-95",
   "-scale-100",
   "-scale-105",
   "-scale-110",
   "-scale-125",
   "-scale-150",
   "-scale-200",
-  "-scale-50",
-  "-scale-75",
-  "-scale-90",
-  "-scale-95",
   "-scale-x-0",
+  "-scale-x-50",
+  "-scale-x-75",
+  "-scale-x-90",
+  "-scale-x-95",
   "-scale-x-100",
   "-scale-x-105",
   "-scale-x-110",
   "-scale-x-125",
   "-scale-x-150",
   "-scale-x-200",
-  "-scale-x-50",
-  "-scale-x-75",
-  "-scale-x-90",
-  "-scale-x-95",
   "-scale-y-0",
+  "-scale-y-50",
+  "-scale-y-75",
+  "-scale-y-90",
+  "-scale-y-95",
   "-scale-y-100",
   "-scale-y-105",
   "-scale-y-110",
   "-scale-y-125",
   "-scale-y-150",
   "-scale-y-200",
-  "-scale-y-50",
-  "-scale-y-75",
-  "-scale-y-90",
-  "-scale-y-95",
   "-scale-z-0",
+  "-scale-z-50",
+  "-scale-z-75",
+  "-scale-z-90",
+  "-scale-z-95",
   "-scale-z-100",
   "-scale-z-105",
   "-scale-z-110",
   "-scale-z-125",
   "-scale-z-150",
   "-scale-z-200",
-  "-scale-z-50",
-  "-scale-z-75",
-  "-scale-z-90",
-  "-scale-z-95",
   "-scroll-m-0",
   "-scroll-m-0.5",
   "-scroll-m-1",
   "-scroll-m-1.5",
+  "-scroll-m-2",
+  "-scroll-m-2.5",
+  "-scroll-m-3",
+  "-scroll-m-3.5",
+  "-scroll-m-4",
+  "-scroll-m-5",
+  "-scroll-m-6",
+  "-scroll-m-7",
+  "-scroll-m-8",
+  "-scroll-m-9",
   "-scroll-m-10",
   "-scroll-m-11",
   "-scroll-m-12",
   "-scroll-m-14",
   "-scroll-m-16",
-  "-scroll-m-2",
-  "-scroll-m-2.5",
   "-scroll-m-20",
   "-scroll-m-24",
   "-scroll-m-28",
-  "-scroll-m-3",
-  "-scroll-m-3.5",
   "-scroll-m-32",
   "-scroll-m-36",
-  "-scroll-m-4",
   "-scroll-m-40",
   "-scroll-m-44",
   "-scroll-m-48",
-  "-scroll-m-5",
   "-scroll-m-52",
   "-scroll-m-56",
-  "-scroll-m-6",
   "-scroll-m-60",
   "-scroll-m-64",
-  "-scroll-m-7",
   "-scroll-m-72",
-  "-scroll-m-8",
   "-scroll-m-80",
-  "-scroll-m-9",
   "-scroll-m-96",
   "-scroll-m-px",
   "-scroll-mb-0",
   "-scroll-mb-0.5",
   "-scroll-mb-1",
   "-scroll-mb-1.5",
+  "-scroll-mb-2",
+  "-scroll-mb-2.5",
+  "-scroll-mb-3",
+  "-scroll-mb-3.5",
+  "-scroll-mb-4",
+  "-scroll-mb-5",
+  "-scroll-mb-6",
+  "-scroll-mb-7",
+  "-scroll-mb-8",
+  "-scroll-mb-9",
   "-scroll-mb-10",
   "-scroll-mb-11",
   "-scroll-mb-12",
   "-scroll-mb-14",
   "-scroll-mb-16",
-  "-scroll-mb-2",
-  "-scroll-mb-2.5",
   "-scroll-mb-20",
   "-scroll-mb-24",
   "-scroll-mb-28",
-  "-scroll-mb-3",
-  "-scroll-mb-3.5",
   "-scroll-mb-32",
   "-scroll-mb-36",
-  "-scroll-mb-4",
   "-scroll-mb-40",
   "-scroll-mb-44",
   "-scroll-mb-48",
-  "-scroll-mb-5",
   "-scroll-mb-52",
   "-scroll-mb-56",
-  "-scroll-mb-6",
   "-scroll-mb-60",
   "-scroll-mb-64",
-  "-scroll-mb-7",
   "-scroll-mb-72",
-  "-scroll-mb-8",
   "-scroll-mb-80",
-  "-scroll-mb-9",
   "-scroll-mb-96",
   "-scroll-mb-px",
+  "-scroll-mbe-0",
+  "-scroll-mbe-0.5",
+  "-scroll-mbe-1",
+  "-scroll-mbe-1.5",
+  "-scroll-mbe-2",
+  "-scroll-mbe-2.5",
+  "-scroll-mbe-3",
+  "-scroll-mbe-3.5",
+  "-scroll-mbe-4",
+  "-scroll-mbe-5",
+  "-scroll-mbe-6",
+  "-scroll-mbe-7",
+  "-scroll-mbe-8",
+  "-scroll-mbe-9",
+  "-scroll-mbe-10",
+  "-scroll-mbe-11",
+  "-scroll-mbe-12",
+  "-scroll-mbe-14",
+  "-scroll-mbe-16",
+  "-scroll-mbe-20",
+  "-scroll-mbe-24",
+  "-scroll-mbe-28",
+  "-scroll-mbe-32",
+  "-scroll-mbe-36",
+  "-scroll-mbe-40",
+  "-scroll-mbe-44",
+  "-scroll-mbe-48",
+  "-scroll-mbe-52",
+  "-scroll-mbe-56",
+  "-scroll-mbe-60",
+  "-scroll-mbe-64",
+  "-scroll-mbe-72",
+  "-scroll-mbe-80",
+  "-scroll-mbe-96",
+  "-scroll-mbe-px",
+  "-scroll-mbs-0",
+  "-scroll-mbs-0.5",
+  "-scroll-mbs-1",
+  "-scroll-mbs-1.5",
+  "-scroll-mbs-2",
+  "-scroll-mbs-2.5",
+  "-scroll-mbs-3",
+  "-scroll-mbs-3.5",
+  "-scroll-mbs-4",
+  "-scroll-mbs-5",
+  "-scroll-mbs-6",
+  "-scroll-mbs-7",
+  "-scroll-mbs-8",
+  "-scroll-mbs-9",
+  "-scroll-mbs-10",
+  "-scroll-mbs-11",
+  "-scroll-mbs-12",
+  "-scroll-mbs-14",
+  "-scroll-mbs-16",
+  "-scroll-mbs-20",
+  "-scroll-mbs-24",
+  "-scroll-mbs-28",
+  "-scroll-mbs-32",
+  "-scroll-mbs-36",
+  "-scroll-mbs-40",
+  "-scroll-mbs-44",
+  "-scroll-mbs-48",
+  "-scroll-mbs-52",
+  "-scroll-mbs-56",
+  "-scroll-mbs-60",
+  "-scroll-mbs-64",
+  "-scroll-mbs-72",
+  "-scroll-mbs-80",
+  "-scroll-mbs-96",
+  "-scroll-mbs-px",
   "-scroll-me-0",
   "-scroll-me-0.5",
   "-scroll-me-1",
   "-scroll-me-1.5",
+  "-scroll-me-2",
+  "-scroll-me-2.5",
+  "-scroll-me-3",
+  "-scroll-me-3.5",
+  "-scroll-me-4",
+  "-scroll-me-5",
+  "-scroll-me-6",
+  "-scroll-me-7",
+  "-scroll-me-8",
+  "-scroll-me-9",
   "-scroll-me-10",
   "-scroll-me-11",
   "-scroll-me-12",
   "-scroll-me-14",
   "-scroll-me-16",
-  "-scroll-me-2",
-  "-scroll-me-2.5",
   "-scroll-me-20",
   "-scroll-me-24",
   "-scroll-me-28",
-  "-scroll-me-3",
-  "-scroll-me-3.5",
   "-scroll-me-32",
   "-scroll-me-36",
-  "-scroll-me-4",
   "-scroll-me-40",
   "-scroll-me-44",
   "-scroll-me-48",
-  "-scroll-me-5",
   "-scroll-me-52",
   "-scroll-me-56",
-  "-scroll-me-6",
   "-scroll-me-60",
   "-scroll-me-64",
-  "-scroll-me-7",
   "-scroll-me-72",
-  "-scroll-me-8",
   "-scroll-me-80",
-  "-scroll-me-9",
   "-scroll-me-96",
   "-scroll-me-px",
   "-scroll-ml-0",
   "-scroll-ml-0.5",
   "-scroll-ml-1",
   "-scroll-ml-1.5",
+  "-scroll-ml-2",
+  "-scroll-ml-2.5",
+  "-scroll-ml-3",
+  "-scroll-ml-3.5",
+  "-scroll-ml-4",
+  "-scroll-ml-5",
+  "-scroll-ml-6",
+  "-scroll-ml-7",
+  "-scroll-ml-8",
+  "-scroll-ml-9",
   "-scroll-ml-10",
   "-scroll-ml-11",
   "-scroll-ml-12",
   "-scroll-ml-14",
   "-scroll-ml-16",
-  "-scroll-ml-2",
-  "-scroll-ml-2.5",
   "-scroll-ml-20",
   "-scroll-ml-24",
   "-scroll-ml-28",
-  "-scroll-ml-3",
-  "-scroll-ml-3.5",
   "-scroll-ml-32",
   "-scroll-ml-36",
-  "-scroll-ml-4",
   "-scroll-ml-40",
   "-scroll-ml-44",
   "-scroll-ml-48",
-  "-scroll-ml-5",
   "-scroll-ml-52",
   "-scroll-ml-56",
-  "-scroll-ml-6",
   "-scroll-ml-60",
   "-scroll-ml-64",
-  "-scroll-ml-7",
   "-scroll-ml-72",
-  "-scroll-ml-8",
   "-scroll-ml-80",
-  "-scroll-ml-9",
   "-scroll-ml-96",
   "-scroll-ml-px",
   "-scroll-mr-0",
   "-scroll-mr-0.5",
   "-scroll-mr-1",
   "-scroll-mr-1.5",
+  "-scroll-mr-2",
+  "-scroll-mr-2.5",
+  "-scroll-mr-3",
+  "-scroll-mr-3.5",
+  "-scroll-mr-4",
+  "-scroll-mr-5",
+  "-scroll-mr-6",
+  "-scroll-mr-7",
+  "-scroll-mr-8",
+  "-scroll-mr-9",
   "-scroll-mr-10",
   "-scroll-mr-11",
   "-scroll-mr-12",
   "-scroll-mr-14",
   "-scroll-mr-16",
-  "-scroll-mr-2",
-  "-scroll-mr-2.5",
   "-scroll-mr-20",
   "-scroll-mr-24",
   "-scroll-mr-28",
-  "-scroll-mr-3",
-  "-scroll-mr-3.5",
   "-scroll-mr-32",
   "-scroll-mr-36",
-  "-scroll-mr-4",
   "-scroll-mr-40",
   "-scroll-mr-44",
   "-scroll-mr-48",
-  "-scroll-mr-5",
   "-scroll-mr-52",
   "-scroll-mr-56",
-  "-scroll-mr-6",
   "-scroll-mr-60",
   "-scroll-mr-64",
-  "-scroll-mr-7",
   "-scroll-mr-72",
-  "-scroll-mr-8",
   "-scroll-mr-80",
-  "-scroll-mr-9",
   "-scroll-mr-96",
   "-scroll-mr-px",
   "-scroll-ms-0",
   "-scroll-ms-0.5",
   "-scroll-ms-1",
   "-scroll-ms-1.5",
+  "-scroll-ms-2",
+  "-scroll-ms-2.5",
+  "-scroll-ms-3",
+  "-scroll-ms-3.5",
+  "-scroll-ms-4",
+  "-scroll-ms-5",
+  "-scroll-ms-6",
+  "-scroll-ms-7",
+  "-scroll-ms-8",
+  "-scroll-ms-9",
   "-scroll-ms-10",
   "-scroll-ms-11",
   "-scroll-ms-12",
   "-scroll-ms-14",
   "-scroll-ms-16",
-  "-scroll-ms-2",
-  "-scroll-ms-2.5",
   "-scroll-ms-20",
   "-scroll-ms-24",
   "-scroll-ms-28",
-  "-scroll-ms-3",
-  "-scroll-ms-3.5",
   "-scroll-ms-32",
   "-scroll-ms-36",
-  "-scroll-ms-4",
   "-scroll-ms-40",
   "-scroll-ms-44",
   "-scroll-ms-48",
-  "-scroll-ms-5",
   "-scroll-ms-52",
   "-scroll-ms-56",
-  "-scroll-ms-6",
   "-scroll-ms-60",
   "-scroll-ms-64",
-  "-scroll-ms-7",
   "-scroll-ms-72",
-  "-scroll-ms-8",
   "-scroll-ms-80",
-  "-scroll-ms-9",
   "-scroll-ms-96",
   "-scroll-ms-px",
   "-scroll-mt-0",
   "-scroll-mt-0.5",
   "-scroll-mt-1",
   "-scroll-mt-1.5",
+  "-scroll-mt-2",
+  "-scroll-mt-2.5",
+  "-scroll-mt-3",
+  "-scroll-mt-3.5",
+  "-scroll-mt-4",
+  "-scroll-mt-5",
+  "-scroll-mt-6",
+  "-scroll-mt-7",
+  "-scroll-mt-8",
+  "-scroll-mt-9",
   "-scroll-mt-10",
   "-scroll-mt-11",
   "-scroll-mt-12",
   "-scroll-mt-14",
   "-scroll-mt-16",
-  "-scroll-mt-2",
-  "-scroll-mt-2.5",
   "-scroll-mt-20",
   "-scroll-mt-24",
   "-scroll-mt-28",
-  "-scroll-mt-3",
-  "-scroll-mt-3.5",
   "-scroll-mt-32",
   "-scroll-mt-36",
-  "-scroll-mt-4",
   "-scroll-mt-40",
   "-scroll-mt-44",
   "-scroll-mt-48",
-  "-scroll-mt-5",
   "-scroll-mt-52",
   "-scroll-mt-56",
-  "-scroll-mt-6",
   "-scroll-mt-60",
   "-scroll-mt-64",
-  "-scroll-mt-7",
   "-scroll-mt-72",
-  "-scroll-mt-8",
   "-scroll-mt-80",
-  "-scroll-mt-9",
   "-scroll-mt-96",
   "-scroll-mt-px",
   "-scroll-mx-0",
   "-scroll-mx-0.5",
   "-scroll-mx-1",
   "-scroll-mx-1.5",
+  "-scroll-mx-2",
+  "-scroll-mx-2.5",
+  "-scroll-mx-3",
+  "-scroll-mx-3.5",
+  "-scroll-mx-4",
+  "-scroll-mx-5",
+  "-scroll-mx-6",
+  "-scroll-mx-7",
+  "-scroll-mx-8",
+  "-scroll-mx-9",
   "-scroll-mx-10",
   "-scroll-mx-11",
   "-scroll-mx-12",
   "-scroll-mx-14",
   "-scroll-mx-16",
-  "-scroll-mx-2",
-  "-scroll-mx-2.5",
   "-scroll-mx-20",
   "-scroll-mx-24",
   "-scroll-mx-28",
-  "-scroll-mx-3",
-  "-scroll-mx-3.5",
   "-scroll-mx-32",
   "-scroll-mx-36",
-  "-scroll-mx-4",
   "-scroll-mx-40",
   "-scroll-mx-44",
   "-scroll-mx-48",
-  "-scroll-mx-5",
   "-scroll-mx-52",
   "-scroll-mx-56",
-  "-scroll-mx-6",
   "-scroll-mx-60",
   "-scroll-mx-64",
-  "-scroll-mx-7",
   "-scroll-mx-72",
-  "-scroll-mx-8",
   "-scroll-mx-80",
-  "-scroll-mx-9",
   "-scroll-mx-96",
   "-scroll-mx-px",
   "-scroll-my-0",
   "-scroll-my-0.5",
   "-scroll-my-1",
   "-scroll-my-1.5",
+  "-scroll-my-2",
+  "-scroll-my-2.5",
+  "-scroll-my-3",
+  "-scroll-my-3.5",
+  "-scroll-my-4",
+  "-scroll-my-5",
+  "-scroll-my-6",
+  "-scroll-my-7",
+  "-scroll-my-8",
+  "-scroll-my-9",
   "-scroll-my-10",
   "-scroll-my-11",
   "-scroll-my-12",
   "-scroll-my-14",
   "-scroll-my-16",
-  "-scroll-my-2",
-  "-scroll-my-2.5",
   "-scroll-my-20",
   "-scroll-my-24",
   "-scroll-my-28",
-  "-scroll-my-3",
-  "-scroll-my-3.5",
   "-scroll-my-32",
   "-scroll-my-36",
-  "-scroll-my-4",
   "-scroll-my-40",
   "-scroll-my-44",
   "-scroll-my-48",
-  "-scroll-my-5",
   "-scroll-my-52",
   "-scroll-my-56",
-  "-scroll-my-6",
   "-scroll-my-60",
   "-scroll-my-64",
-  "-scroll-my-7",
   "-scroll-my-72",
-  "-scroll-my-8",
   "-scroll-my-80",
-  "-scroll-my-9",
   "-scroll-my-96",
   "-scroll-my-px",
   "-skew-0",
   "-skew-1",
-  "-skew-12",
   "-skew-2",
   "-skew-3",
   "-skew-6",
+  "-skew-12",
   "-skew-x-0",
   "-skew-x-1",
-  "-skew-x-12",
   "-skew-x-2",
   "-skew-x-3",
   "-skew-x-6",
+  "-skew-x-12",
   "-skew-y-0",
   "-skew-y-1",
-  "-skew-y-12",
   "-skew-y-2",
   "-skew-y-3",
   "-skew-y-6",
+  "-skew-y-12",
   "-space-x-0",
   "-space-x-0.5",
   "-space-x-1",
   "-space-x-1.5",
+  "-space-x-2",
+  "-space-x-2.5",
+  "-space-x-3",
+  "-space-x-3.5",
+  "-space-x-4",
+  "-space-x-5",
+  "-space-x-6",
+  "-space-x-7",
+  "-space-x-8",
+  "-space-x-9",
   "-space-x-10",
   "-space-x-11",
   "-space-x-12",
   "-space-x-14",
   "-space-x-16",
-  "-space-x-2",
-  "-space-x-2.5",
   "-space-x-20",
   "-space-x-24",
   "-space-x-28",
-  "-space-x-3",
-  "-space-x-3.5",
   "-space-x-32",
   "-space-x-36",
-  "-space-x-4",
   "-space-x-40",
   "-space-x-44",
   "-space-x-48",
-  "-space-x-5",
   "-space-x-52",
   "-space-x-56",
-  "-space-x-6",
   "-space-x-60",
   "-space-x-64",
-  "-space-x-7",
   "-space-x-72",
-  "-space-x-8",
   "-space-x-80",
-  "-space-x-9",
   "-space-x-96",
   "-space-x-px",
   "-space-y-0",
   "-space-y-0.5",
   "-space-y-1",
   "-space-y-1.5",
+  "-space-y-2",
+  "-space-y-2.5",
+  "-space-y-3",
+  "-space-y-3.5",
+  "-space-y-4",
+  "-space-y-5",
+  "-space-y-6",
+  "-space-y-7",
+  "-space-y-8",
+  "-space-y-9",
   "-space-y-10",
   "-space-y-11",
   "-space-y-12",
   "-space-y-14",
   "-space-y-16",
-  "-space-y-2",
-  "-space-y-2.5",
   "-space-y-20",
   "-space-y-24",
   "-space-y-28",
-  "-space-y-3",
-  "-space-y-3.5",
   "-space-y-32",
   "-space-y-36",
-  "-space-y-4",
   "-space-y-40",
   "-space-y-44",
   "-space-y-48",
-  "-space-y-5",
   "-space-y-52",
   "-space-y-56",
-  "-space-y-6",
   "-space-y-60",
   "-space-y-64",
-  "-space-y-7",
   "-space-y-72",
-  "-space-y-8",
   "-space-y-80",
-  "-space-y-9",
   "-space-y-96",
   "-space-y-px",
-  "-start-0",
-  "-start-0.5",
-  "-start-1",
-  "-start-1.5",
-  "-start-10",
-  "-start-11",
-  "-start-12",
-  "-start-14",
-  "-start-16",
-  "-start-2",
-  "-start-2.5",
-  "-start-20",
-  "-start-24",
-  "-start-28",
-  "-start-3",
-  "-start-3.5",
-  "-start-32",
-  "-start-36",
-  "-start-4",
-  "-start-40",
-  "-start-44",
-  "-start-48",
-  "-start-5",
-  "-start-52",
-  "-start-56",
-  "-start-6",
-  "-start-60",
-  "-start-64",
-  "-start-7",
-  "-start-72",
-  "-start-8",
-  "-start-80",
-  "-start-9",
-  "-start-96",
   "-start-full",
   "-start-px",
   "-top-0",
   "-top-0.5",
   "-top-1",
   "-top-1.5",
+  "-top-2",
+  "-top-2.5",
+  "-top-3",
+  "-top-3.5",
+  "-top-4",
+  "-top-5",
+  "-top-6",
+  "-top-7",
+  "-top-8",
+  "-top-9",
   "-top-10",
   "-top-11",
   "-top-12",
   "-top-14",
   "-top-16",
-  "-top-2",
-  "-top-2.5",
   "-top-20",
   "-top-24",
   "-top-28",
-  "-top-3",
-  "-top-3.5",
   "-top-32",
   "-top-36",
-  "-top-4",
   "-top-40",
   "-top-44",
   "-top-48",
-  "-top-5",
   "-top-52",
   "-top-56",
-  "-top-6",
   "-top-60",
   "-top-64",
-  "-top-7",
   "-top-72",
-  "-top-8",
   "-top-80",
-  "-top-9",
   "-top-96",
+  "-top-1/2",
+  "-top-1/3",
+  "-top-1/4",
+  "-top-1/5",
+  "-top-1/6",
+  "-top-1/12",
+  "-top-2/3",
+  "-top-2/4",
+  "-top-2/5",
+  "-top-2/6",
+  "-top-2/12",
+  "-top-3/4",
+  "-top-3/5",
+  "-top-3/6",
+  "-top-3/12",
+  "-top-4/5",
+  "-top-4/6",
+  "-top-4/12",
+  "-top-5/6",
+  "-top-5/12",
+  "-top-6/12",
+  "-top-7/12",
+  "-top-8/12",
+  "-top-9/12",
+  "-top-10/12",
+  "-top-11/12",
   "-top-full",
   "-top-px",
   "-translate-0",
   "-translate-0.5",
   "-translate-1",
   "-translate-1.5",
+  "-translate-2",
+  "-translate-2.5",
+  "-translate-3",
+  "-translate-3.5",
+  "-translate-4",
+  "-translate-5",
+  "-translate-6",
+  "-translate-7",
+  "-translate-8",
+  "-translate-9",
   "-translate-10",
   "-translate-11",
   "-translate-12",
   "-translate-14",
   "-translate-16",
-  "-translate-2",
-  "-translate-2.5",
   "-translate-20",
   "-translate-24",
   "-translate-28",
-  "-translate-3",
-  "-translate-3.5",
   "-translate-32",
   "-translate-36",
-  "-translate-4",
   "-translate-40",
   "-translate-44",
   "-translate-48",
-  "-translate-5",
   "-translate-52",
   "-translate-56",
-  "-translate-6",
   "-translate-60",
   "-translate-64",
-  "-translate-7",
   "-translate-72",
-  "-translate-8",
   "-translate-80",
-  "-translate-9",
   "-translate-96",
+  "-translate-1/2",
+  "-translate-1/3",
+  "-translate-1/4",
+  "-translate-1/5",
+  "-translate-1/6",
+  "-translate-1/12",
+  "-translate-2/3",
+  "-translate-2/4",
+  "-translate-2/5",
+  "-translate-2/6",
+  "-translate-2/12",
+  "-translate-3/4",
+  "-translate-3/5",
+  "-translate-3/6",
+  "-translate-3/12",
+  "-translate-4/5",
+  "-translate-4/6",
+  "-translate-4/12",
+  "-translate-5/6",
+  "-translate-5/12",
+  "-translate-6/12",
+  "-translate-7/12",
+  "-translate-8/12",
+  "-translate-9/12",
+  "-translate-10/12",
+  "-translate-11/12",
   "-translate-full",
   "-translate-px",
   "-translate-x-0",
   "-translate-x-0.5",
   "-translate-x-1",
   "-translate-x-1.5",
+  "-translate-x-2",
+  "-translate-x-2.5",
+  "-translate-x-3",
+  "-translate-x-3.5",
+  "-translate-x-4",
+  "-translate-x-5",
+  "-translate-x-6",
+  "-translate-x-7",
+  "-translate-x-8",
+  "-translate-x-9",
   "-translate-x-10",
   "-translate-x-11",
   "-translate-x-12",
   "-translate-x-14",
   "-translate-x-16",
-  "-translate-x-2",
-  "-translate-x-2.5",
   "-translate-x-20",
   "-translate-x-24",
   "-translate-x-28",
-  "-translate-x-3",
-  "-translate-x-3.5",
   "-translate-x-32",
   "-translate-x-36",
-  "-translate-x-4",
   "-translate-x-40",
   "-translate-x-44",
   "-translate-x-48",
-  "-translate-x-5",
   "-translate-x-52",
   "-translate-x-56",
-  "-translate-x-6",
   "-translate-x-60",
   "-translate-x-64",
-  "-translate-x-7",
   "-translate-x-72",
-  "-translate-x-8",
   "-translate-x-80",
-  "-translate-x-9",
   "-translate-x-96",
+  "-translate-x-1/2",
+  "-translate-x-1/3",
+  "-translate-x-1/4",
+  "-translate-x-1/5",
+  "-translate-x-1/6",
+  "-translate-x-1/12",
+  "-translate-x-2/3",
+  "-translate-x-2/4",
+  "-translate-x-2/5",
+  "-translate-x-2/6",
+  "-translate-x-2/12",
+  "-translate-x-3/4",
+  "-translate-x-3/5",
+  "-translate-x-3/6",
+  "-translate-x-3/12",
+  "-translate-x-4/5",
+  "-translate-x-4/6",
+  "-translate-x-4/12",
+  "-translate-x-5/6",
+  "-translate-x-5/12",
+  "-translate-x-6/12",
+  "-translate-x-7/12",
+  "-translate-x-8/12",
+  "-translate-x-9/12",
+  "-translate-x-10/12",
+  "-translate-x-11/12",
   "-translate-x-full",
   "-translate-x-px",
   "-translate-y-0",
   "-translate-y-0.5",
   "-translate-y-1",
   "-translate-y-1.5",
+  "-translate-y-2",
+  "-translate-y-2.5",
+  "-translate-y-3",
+  "-translate-y-3.5",
+  "-translate-y-4",
+  "-translate-y-5",
+  "-translate-y-6",
+  "-translate-y-7",
+  "-translate-y-8",
+  "-translate-y-9",
   "-translate-y-10",
   "-translate-y-11",
   "-translate-y-12",
   "-translate-y-14",
   "-translate-y-16",
-  "-translate-y-2",
-  "-translate-y-2.5",
   "-translate-y-20",
   "-translate-y-24",
   "-translate-y-28",
-  "-translate-y-3",
-  "-translate-y-3.5",
   "-translate-y-32",
   "-translate-y-36",
-  "-translate-y-4",
   "-translate-y-40",
   "-translate-y-44",
   "-translate-y-48",
-  "-translate-y-5",
   "-translate-y-52",
   "-translate-y-56",
-  "-translate-y-6",
   "-translate-y-60",
   "-translate-y-64",
-  "-translate-y-7",
   "-translate-y-72",
-  "-translate-y-8",
   "-translate-y-80",
-  "-translate-y-9",
   "-translate-y-96",
+  "-translate-y-1/2",
+  "-translate-y-1/3",
+  "-translate-y-1/4",
+  "-translate-y-1/5",
+  "-translate-y-1/6",
+  "-translate-y-1/12",
+  "-translate-y-2/3",
+  "-translate-y-2/4",
+  "-translate-y-2/5",
+  "-translate-y-2/6",
+  "-translate-y-2/12",
+  "-translate-y-3/4",
+  "-translate-y-3/5",
+  "-translate-y-3/6",
+  "-translate-y-3/12",
+  "-translate-y-4/5",
+  "-translate-y-4/6",
+  "-translate-y-4/12",
+  "-translate-y-5/6",
+  "-translate-y-5/12",
+  "-translate-y-6/12",
+  "-translate-y-7/12",
+  "-translate-y-8/12",
+  "-translate-y-9/12",
+  "-translate-y-10/12",
+  "-translate-y-11/12",
   "-translate-y-full",
   "-translate-y-px",
   "-translate-z-0",
   "-translate-z-0.5",
   "-translate-z-1",
   "-translate-z-1.5",
+  "-translate-z-2",
+  "-translate-z-2.5",
+  "-translate-z-3",
+  "-translate-z-3.5",
+  "-translate-z-4",
+  "-translate-z-5",
+  "-translate-z-6",
+  "-translate-z-7",
+  "-translate-z-8",
+  "-translate-z-9",
   "-translate-z-10",
   "-translate-z-11",
   "-translate-z-12",
   "-translate-z-14",
   "-translate-z-16",
-  "-translate-z-2",
-  "-translate-z-2.5",
   "-translate-z-20",
   "-translate-z-24",
   "-translate-z-28",
-  "-translate-z-3",
-  "-translate-z-3.5",
   "-translate-z-32",
   "-translate-z-36",
-  "-translate-z-4",
   "-translate-z-40",
   "-translate-z-44",
   "-translate-z-48",
-  "-translate-z-5",
   "-translate-z-52",
   "-translate-z-56",
-  "-translate-z-6",
   "-translate-z-60",
   "-translate-z-64",
-  "-translate-z-7",
   "-translate-z-72",
-  "-translate-z-8",
   "-translate-z-80",
-  "-translate-z-9",
   "-translate-z-96",
   "-translate-z-px",
   "-underline-offset-0",
@@ -1619,6 +2222,7 @@ exports[`getClassList 1`] = `
   "accent-current/90",
   "accent-current/95",
   "accent-current/100",
+  "accent-current/background",
   "accent-inherit",
   "accent-inherit/0",
   "accent-inherit/5",
@@ -1641,6 +2245,7 @@ exports[`getClassList 1`] = `
   "accent-inherit/90",
   "accent-inherit/95",
   "accent-inherit/100",
+  "accent-inherit/background",
   "accent-transparent",
   "accent-transparent/0",
   "accent-transparent/5",
@@ -1663,6 +2268,7 @@ exports[`getClassList 1`] = `
   "accent-transparent/90",
   "accent-transparent/95",
   "accent-transparent/100",
+  "accent-transparent/background",
   "align-baseline",
   "align-bottom",
   "align-middle",
@@ -1688,44 +2294,44 @@ exports[`getClassList 1`] = `
   "auto-rows-min",
   "backdrop-blur-none",
   "backdrop-brightness-0",
+  "backdrop-brightness-50",
+  "backdrop-brightness-75",
+  "backdrop-brightness-90",
+  "backdrop-brightness-95",
   "backdrop-brightness-100",
   "backdrop-brightness-105",
   "backdrop-brightness-110",
   "backdrop-brightness-125",
   "backdrop-brightness-150",
   "backdrop-brightness-200",
-  "backdrop-brightness-50",
-  "backdrop-brightness-75",
-  "backdrop-brightness-90",
-  "backdrop-brightness-95",
   "backdrop-contrast-0",
+  "backdrop-contrast-50",
+  "backdrop-contrast-75",
   "backdrop-contrast-100",
   "backdrop-contrast-125",
   "backdrop-contrast-150",
   "backdrop-contrast-200",
-  "backdrop-contrast-50",
-  "backdrop-contrast-75",
   "backdrop-grayscale",
   "backdrop-grayscale-0",
-  "backdrop-grayscale-100",
   "backdrop-grayscale-25",
   "backdrop-grayscale-50",
   "backdrop-grayscale-75",
+  "backdrop-grayscale-100",
   "backdrop-hue-rotate-0",
   "backdrop-hue-rotate-15",
-  "backdrop-hue-rotate-180",
   "backdrop-hue-rotate-30",
   "backdrop-hue-rotate-60",
   "backdrop-hue-rotate-90",
+  "backdrop-hue-rotate-180",
   "backdrop-invert",
   "backdrop-invert-0",
-  "backdrop-invert-100",
   "backdrop-invert-25",
   "backdrop-invert-50",
   "backdrop-invert-75",
+  "backdrop-invert-100",
   "backdrop-opacity-0",
+  "backdrop-opacity-5",
   "backdrop-opacity-10",
-  "backdrop-opacity-100",
   "backdrop-opacity-15",
   "backdrop-opacity-20",
   "backdrop-opacity-25",
@@ -1733,7 +2339,6 @@ exports[`getClassList 1`] = `
   "backdrop-opacity-35",
   "backdrop-opacity-40",
   "backdrop-opacity-45",
-  "backdrop-opacity-5",
   "backdrop-opacity-50",
   "backdrop-opacity-55",
   "backdrop-opacity-60",
@@ -1744,54 +2349,83 @@ exports[`getClassList 1`] = `
   "backdrop-opacity-85",
   "backdrop-opacity-90",
   "backdrop-opacity-95",
+  "backdrop-opacity-100",
   "backdrop-opacity-background",
   "backdrop-saturate-0",
+  "backdrop-saturate-50",
   "backdrop-saturate-100",
   "backdrop-saturate-150",
   "backdrop-saturate-200",
-  "backdrop-saturate-50",
   "backdrop-sepia",
   "backdrop-sepia-0",
-  "backdrop-sepia-100",
   "backdrop-sepia-50",
+  "backdrop-sepia-100",
   "backface-hidden",
   "backface-visible",
   "basis-0",
   "basis-0.5",
   "basis-1",
   "basis-1.5",
+  "basis-2",
+  "basis-2.5",
+  "basis-3",
+  "basis-3.5",
+  "basis-4",
+  "basis-5",
+  "basis-6",
+  "basis-7",
+  "basis-8",
+  "basis-9",
   "basis-10",
   "basis-11",
   "basis-12",
   "basis-14",
   "basis-16",
-  "basis-2",
-  "basis-2.5",
   "basis-20",
   "basis-24",
   "basis-28",
-  "basis-3",
-  "basis-3.5",
   "basis-32",
   "basis-36",
-  "basis-4",
   "basis-40",
   "basis-44",
   "basis-48",
-  "basis-5",
   "basis-52",
   "basis-56",
-  "basis-6",
   "basis-60",
   "basis-64",
-  "basis-7",
   "basis-72",
-  "basis-8",
   "basis-80",
-  "basis-9",
   "basis-96",
   "basis-auto",
   "basis-full",
+  "basis-lg",
+  "basis-md",
+  "basis-1/2",
+  "basis-1/3",
+  "basis-1/4",
+  "basis-1/5",
+  "basis-1/6",
+  "basis-1/12",
+  "basis-2/3",
+  "basis-2/4",
+  "basis-2/5",
+  "basis-2/6",
+  "basis-2/12",
+  "basis-3/4",
+  "basis-3/5",
+  "basis-3/6",
+  "basis-3/12",
+  "basis-4/5",
+  "basis-4/6",
+  "basis-4/12",
+  "basis-5/6",
+  "basis-5/12",
+  "basis-6/12",
+  "basis-7/12",
+  "basis-8/12",
+  "basis-9/12",
+  "basis-10/12",
+  "basis-11/12",
   "basis-px",
   "bg-auto",
   "bg-blend-color",
@@ -1811,6 +2445,8 @@ exports[`getClassList 1`] = `
   "bg-blend-screen",
   "bg-blend-soft-light",
   "bg-bottom",
+  "bg-bottom-left",
+  "bg-bottom-right",
   "bg-center",
   "bg-clip-border",
   "bg-clip-content",
@@ -1834,6 +2470,33 @@ exports[`getClassList 1`] = `
   "bg-conic-0/shorter",
   "bg-conic-0/increasing",
   "bg-conic-0/decreasing",
+  "bg-conic-30",
+  "bg-conic-30/oklab",
+  "bg-conic-30/oklch",
+  "bg-conic-30/srgb",
+  "bg-conic-30/hsl",
+  "bg-conic-30/longer",
+  "bg-conic-30/shorter",
+  "bg-conic-30/increasing",
+  "bg-conic-30/decreasing",
+  "bg-conic-60",
+  "bg-conic-60/oklab",
+  "bg-conic-60/oklch",
+  "bg-conic-60/srgb",
+  "bg-conic-60/hsl",
+  "bg-conic-60/longer",
+  "bg-conic-60/shorter",
+  "bg-conic-60/increasing",
+  "bg-conic-60/decreasing",
+  "bg-conic-90",
+  "bg-conic-90/oklab",
+  "bg-conic-90/oklch",
+  "bg-conic-90/srgb",
+  "bg-conic-90/hsl",
+  "bg-conic-90/longer",
+  "bg-conic-90/shorter",
+  "bg-conic-90/increasing",
+  "bg-conic-90/decreasing",
   "bg-conic-120",
   "bg-conic-120/oklab",
   "bg-conic-120/oklch",
@@ -1888,15 +2551,6 @@ exports[`getClassList 1`] = `
   "bg-conic-270/shorter",
   "bg-conic-270/increasing",
   "bg-conic-270/decreasing",
-  "bg-conic-30",
-  "bg-conic-30/oklab",
-  "bg-conic-30/oklch",
-  "bg-conic-30/srgb",
-  "bg-conic-30/hsl",
-  "bg-conic-30/longer",
-  "bg-conic-30/shorter",
-  "bg-conic-30/increasing",
-  "bg-conic-30/decreasing",
   "bg-conic-300",
   "bg-conic-300/oklab",
   "bg-conic-300/oklch",
@@ -1915,24 +2569,6 @@ exports[`getClassList 1`] = `
   "bg-conic-330/shorter",
   "bg-conic-330/increasing",
   "bg-conic-330/decreasing",
-  "bg-conic-60",
-  "bg-conic-60/oklab",
-  "bg-conic-60/oklch",
-  "bg-conic-60/srgb",
-  "bg-conic-60/hsl",
-  "bg-conic-60/longer",
-  "bg-conic-60/shorter",
-  "bg-conic-60/increasing",
-  "bg-conic-60/decreasing",
-  "bg-conic-90",
-  "bg-conic-90/oklab",
-  "bg-conic-90/oklch",
-  "bg-conic-90/srgb",
-  "bg-conic-90/hsl",
-  "bg-conic-90/longer",
-  "bg-conic-90/shorter",
-  "bg-conic-90/increasing",
-  "bg-conic-90/decreasing",
   "bg-contain",
   "bg-cover",
   "bg-current",
@@ -1957,6 +2593,7 @@ exports[`getClassList 1`] = `
   "bg-current/90",
   "bg-current/95",
   "bg-current/100",
+  "bg-current/background",
   "bg-fixed",
   "bg-inherit",
   "bg-inherit/0",
@@ -1980,9 +2617,8 @@ exports[`getClassList 1`] = `
   "bg-inherit/90",
   "bg-inherit/95",
   "bg-inherit/100",
+  "bg-inherit/background",
   "bg-left",
-  "bg-left-bottom",
-  "bg-left-top",
   "bg-linear-0",
   "bg-linear-0/oklab",
   "bg-linear-0/oklch",
@@ -1992,6 +2628,33 @@ exports[`getClassList 1`] = `
   "bg-linear-0/shorter",
   "bg-linear-0/increasing",
   "bg-linear-0/decreasing",
+  "bg-linear-30",
+  "bg-linear-30/oklab",
+  "bg-linear-30/oklch",
+  "bg-linear-30/srgb",
+  "bg-linear-30/hsl",
+  "bg-linear-30/longer",
+  "bg-linear-30/shorter",
+  "bg-linear-30/increasing",
+  "bg-linear-30/decreasing",
+  "bg-linear-60",
+  "bg-linear-60/oklab",
+  "bg-linear-60/oklch",
+  "bg-linear-60/srgb",
+  "bg-linear-60/hsl",
+  "bg-linear-60/longer",
+  "bg-linear-60/shorter",
+  "bg-linear-60/increasing",
+  "bg-linear-60/decreasing",
+  "bg-linear-90",
+  "bg-linear-90/oklab",
+  "bg-linear-90/oklch",
+  "bg-linear-90/srgb",
+  "bg-linear-90/hsl",
+  "bg-linear-90/longer",
+  "bg-linear-90/shorter",
+  "bg-linear-90/increasing",
+  "bg-linear-90/decreasing",
   "bg-linear-120",
   "bg-linear-120/oklab",
   "bg-linear-120/oklch",
@@ -2046,15 +2709,6 @@ exports[`getClassList 1`] = `
   "bg-linear-270/shorter",
   "bg-linear-270/increasing",
   "bg-linear-270/decreasing",
-  "bg-linear-30",
-  "bg-linear-30/oklab",
-  "bg-linear-30/oklch",
-  "bg-linear-30/srgb",
-  "bg-linear-30/hsl",
-  "bg-linear-30/longer",
-  "bg-linear-30/shorter",
-  "bg-linear-30/increasing",
-  "bg-linear-30/decreasing",
   "bg-linear-300",
   "bg-linear-300/oklab",
   "bg-linear-300/oklch",
@@ -2073,24 +2727,6 @@ exports[`getClassList 1`] = `
   "bg-linear-330/shorter",
   "bg-linear-330/increasing",
   "bg-linear-330/decreasing",
-  "bg-linear-60",
-  "bg-linear-60/oklab",
-  "bg-linear-60/oklch",
-  "bg-linear-60/srgb",
-  "bg-linear-60/hsl",
-  "bg-linear-60/longer",
-  "bg-linear-60/shorter",
-  "bg-linear-60/increasing",
-  "bg-linear-60/decreasing",
-  "bg-linear-90",
-  "bg-linear-90/oklab",
-  "bg-linear-90/oklch",
-  "bg-linear-90/srgb",
-  "bg-linear-90/hsl",
-  "bg-linear-90/longer",
-  "bg-linear-90/shorter",
-  "bg-linear-90/increasing",
-  "bg-linear-90/decreasing",
   "bg-linear-to-b",
   "bg-linear-to-b/oklab",
   "bg-linear-to-b/oklch",
@@ -2179,15 +2815,15 @@ exports[`getClassList 1`] = `
   "bg-radial/increasing",
   "bg-radial/decreasing",
   "bg-repeat",
+  "bg-repeat-round",
+  "bg-repeat-space",
   "bg-repeat-x",
   "bg-repeat-y",
   "bg-right",
-  "bg-right-bottom",
-  "bg-right-top",
-  "bg-round",
   "bg-scroll",
-  "bg-space",
   "bg-top",
+  "bg-top-left",
+  "bg-top-right",
   "bg-transparent",
   "bg-transparent/0",
   "bg-transparent/5",
@@ -2210,7 +2846,79 @@ exports[`getClassList 1`] = `
   "bg-transparent/90",
   "bg-transparent/95",
   "bg-transparent/100",
+  "bg-transparent/background",
   "block",
+  "block-0",
+  "block-0.5",
+  "block-1",
+  "block-1.5",
+  "block-2",
+  "block-2.5",
+  "block-3",
+  "block-3.5",
+  "block-4",
+  "block-5",
+  "block-6",
+  "block-7",
+  "block-8",
+  "block-9",
+  "block-10",
+  "block-11",
+  "block-12",
+  "block-14",
+  "block-16",
+  "block-20",
+  "block-24",
+  "block-28",
+  "block-32",
+  "block-36",
+  "block-40",
+  "block-44",
+  "block-48",
+  "block-52",
+  "block-56",
+  "block-60",
+  "block-64",
+  "block-72",
+  "block-80",
+  "block-96",
+  "block-1/2",
+  "block-1/3",
+  "block-1/4",
+  "block-1/5",
+  "block-1/6",
+  "block-1/12",
+  "block-2/3",
+  "block-2/4",
+  "block-2/5",
+  "block-2/6",
+  "block-2/12",
+  "block-3/4",
+  "block-3/5",
+  "block-3/6",
+  "block-3/12",
+  "block-4/5",
+  "block-4/6",
+  "block-4/12",
+  "block-5/6",
+  "block-5/12",
+  "block-6/12",
+  "block-7/12",
+  "block-8/12",
+  "block-9/12",
+  "block-10/12",
+  "block-11/12",
+  "block-auto",
+  "block-dvh",
+  "block-fit",
+  "block-full",
+  "block-lh",
+  "block-lvh",
+  "block-max",
+  "block-min",
+  "block-px",
+  "block-screen",
+  "block-svh",
   "blur-none",
   "border",
   "border/0",
@@ -2234,6 +2942,7 @@ exports[`getClassList 1`] = `
   "border/90",
   "border/95",
   "border/100",
+  "border/background",
   "border-0",
   "border-2",
   "border-4",
@@ -2260,6 +2969,7 @@ exports[`getClassList 1`] = `
   "border-b/90",
   "border-b/95",
   "border-b/100",
+  "border-b/background",
   "border-b-0",
   "border-b-2",
   "border-b-4",
@@ -2286,6 +2996,7 @@ exports[`getClassList 1`] = `
   "border-b-current/90",
   "border-b-current/95",
   "border-b-current/100",
+  "border-b-current/background",
   "border-b-inherit",
   "border-b-inherit/0",
   "border-b-inherit/5",
@@ -2308,6 +3019,7 @@ exports[`getClassList 1`] = `
   "border-b-inherit/90",
   "border-b-inherit/95",
   "border-b-inherit/100",
+  "border-b-inherit/background",
   "border-b-transparent",
   "border-b-transparent/0",
   "border-b-transparent/5",
@@ -2330,6 +3042,199 @@ exports[`getClassList 1`] = `
   "border-b-transparent/90",
   "border-b-transparent/95",
   "border-b-transparent/100",
+  "border-b-transparent/background",
+  "border-be",
+  "border-be/0",
+  "border-be/5",
+  "border-be/10",
+  "border-be/15",
+  "border-be/20",
+  "border-be/25",
+  "border-be/30",
+  "border-be/35",
+  "border-be/40",
+  "border-be/45",
+  "border-be/50",
+  "border-be/55",
+  "border-be/60",
+  "border-be/65",
+  "border-be/70",
+  "border-be/75",
+  "border-be/80",
+  "border-be/85",
+  "border-be/90",
+  "border-be/95",
+  "border-be/100",
+  "border-be/background",
+  "border-be-0",
+  "border-be-2",
+  "border-be-4",
+  "border-be-8",
+  "border-be-current",
+  "border-be-current/0",
+  "border-be-current/5",
+  "border-be-current/10",
+  "border-be-current/15",
+  "border-be-current/20",
+  "border-be-current/25",
+  "border-be-current/30",
+  "border-be-current/35",
+  "border-be-current/40",
+  "border-be-current/45",
+  "border-be-current/50",
+  "border-be-current/55",
+  "border-be-current/60",
+  "border-be-current/65",
+  "border-be-current/70",
+  "border-be-current/75",
+  "border-be-current/80",
+  "border-be-current/85",
+  "border-be-current/90",
+  "border-be-current/95",
+  "border-be-current/100",
+  "border-be-current/background",
+  "border-be-inherit",
+  "border-be-inherit/0",
+  "border-be-inherit/5",
+  "border-be-inherit/10",
+  "border-be-inherit/15",
+  "border-be-inherit/20",
+  "border-be-inherit/25",
+  "border-be-inherit/30",
+  "border-be-inherit/35",
+  "border-be-inherit/40",
+  "border-be-inherit/45",
+  "border-be-inherit/50",
+  "border-be-inherit/55",
+  "border-be-inherit/60",
+  "border-be-inherit/65",
+  "border-be-inherit/70",
+  "border-be-inherit/75",
+  "border-be-inherit/80",
+  "border-be-inherit/85",
+  "border-be-inherit/90",
+  "border-be-inherit/95",
+  "border-be-inherit/100",
+  "border-be-inherit/background",
+  "border-be-transparent",
+  "border-be-transparent/0",
+  "border-be-transparent/5",
+  "border-be-transparent/10",
+  "border-be-transparent/15",
+  "border-be-transparent/20",
+  "border-be-transparent/25",
+  "border-be-transparent/30",
+  "border-be-transparent/35",
+  "border-be-transparent/40",
+  "border-be-transparent/45",
+  "border-be-transparent/50",
+  "border-be-transparent/55",
+  "border-be-transparent/60",
+  "border-be-transparent/65",
+  "border-be-transparent/70",
+  "border-be-transparent/75",
+  "border-be-transparent/80",
+  "border-be-transparent/85",
+  "border-be-transparent/90",
+  "border-be-transparent/95",
+  "border-be-transparent/100",
+  "border-be-transparent/background",
+  "border-bs",
+  "border-bs/0",
+  "border-bs/5",
+  "border-bs/10",
+  "border-bs/15",
+  "border-bs/20",
+  "border-bs/25",
+  "border-bs/30",
+  "border-bs/35",
+  "border-bs/40",
+  "border-bs/45",
+  "border-bs/50",
+  "border-bs/55",
+  "border-bs/60",
+  "border-bs/65",
+  "border-bs/70",
+  "border-bs/75",
+  "border-bs/80",
+  "border-bs/85",
+  "border-bs/90",
+  "border-bs/95",
+  "border-bs/100",
+  "border-bs/background",
+  "border-bs-0",
+  "border-bs-2",
+  "border-bs-4",
+  "border-bs-8",
+  "border-bs-current",
+  "border-bs-current/0",
+  "border-bs-current/5",
+  "border-bs-current/10",
+  "border-bs-current/15",
+  "border-bs-current/20",
+  "border-bs-current/25",
+  "border-bs-current/30",
+  "border-bs-current/35",
+  "border-bs-current/40",
+  "border-bs-current/45",
+  "border-bs-current/50",
+  "border-bs-current/55",
+  "border-bs-current/60",
+  "border-bs-current/65",
+  "border-bs-current/70",
+  "border-bs-current/75",
+  "border-bs-current/80",
+  "border-bs-current/85",
+  "border-bs-current/90",
+  "border-bs-current/95",
+  "border-bs-current/100",
+  "border-bs-current/background",
+  "border-bs-inherit",
+  "border-bs-inherit/0",
+  "border-bs-inherit/5",
+  "border-bs-inherit/10",
+  "border-bs-inherit/15",
+  "border-bs-inherit/20",
+  "border-bs-inherit/25",
+  "border-bs-inherit/30",
+  "border-bs-inherit/35",
+  "border-bs-inherit/40",
+  "border-bs-inherit/45",
+  "border-bs-inherit/50",
+  "border-bs-inherit/55",
+  "border-bs-inherit/60",
+  "border-bs-inherit/65",
+  "border-bs-inherit/70",
+  "border-bs-inherit/75",
+  "border-bs-inherit/80",
+  "border-bs-inherit/85",
+  "border-bs-inherit/90",
+  "border-bs-inherit/95",
+  "border-bs-inherit/100",
+  "border-bs-inherit/background",
+  "border-bs-transparent",
+  "border-bs-transparent/0",
+  "border-bs-transparent/5",
+  "border-bs-transparent/10",
+  "border-bs-transparent/15",
+  "border-bs-transparent/20",
+  "border-bs-transparent/25",
+  "border-bs-transparent/30",
+  "border-bs-transparent/35",
+  "border-bs-transparent/40",
+  "border-bs-transparent/45",
+  "border-bs-transparent/50",
+  "border-bs-transparent/55",
+  "border-bs-transparent/60",
+  "border-bs-transparent/65",
+  "border-bs-transparent/70",
+  "border-bs-transparent/75",
+  "border-bs-transparent/80",
+  "border-bs-transparent/85",
+  "border-bs-transparent/90",
+  "border-bs-transparent/95",
+  "border-bs-transparent/100",
+  "border-bs-transparent/background",
   "border-collapse",
   "border-current",
   "border-current/0",
@@ -2353,6 +3258,7 @@ exports[`getClassList 1`] = `
   "border-current/90",
   "border-current/95",
   "border-current/100",
+  "border-current/background",
   "border-dashed",
   "border-dotted",
   "border-double",
@@ -2378,6 +3284,7 @@ exports[`getClassList 1`] = `
   "border-e/90",
   "border-e/95",
   "border-e/100",
+  "border-e/background",
   "border-e-0",
   "border-e-2",
   "border-e-4",
@@ -2404,6 +3311,7 @@ exports[`getClassList 1`] = `
   "border-e-current/90",
   "border-e-current/95",
   "border-e-current/100",
+  "border-e-current/background",
   "border-e-inherit",
   "border-e-inherit/0",
   "border-e-inherit/5",
@@ -2426,6 +3334,7 @@ exports[`getClassList 1`] = `
   "border-e-inherit/90",
   "border-e-inherit/95",
   "border-e-inherit/100",
+  "border-e-inherit/background",
   "border-e-transparent",
   "border-e-transparent/0",
   "border-e-transparent/5",
@@ -2448,6 +3357,7 @@ exports[`getClassList 1`] = `
   "border-e-transparent/90",
   "border-e-transparent/95",
   "border-e-transparent/100",
+  "border-e-transparent/background",
   "border-hidden",
   "border-inherit",
   "border-inherit/0",
@@ -2471,6 +3381,7 @@ exports[`getClassList 1`] = `
   "border-inherit/90",
   "border-inherit/95",
   "border-inherit/100",
+  "border-inherit/background",
   "border-l",
   "border-l/0",
   "border-l/5",
@@ -2493,6 +3404,7 @@ exports[`getClassList 1`] = `
   "border-l/90",
   "border-l/95",
   "border-l/100",
+  "border-l/background",
   "border-l-0",
   "border-l-2",
   "border-l-4",
@@ -2519,6 +3431,7 @@ exports[`getClassList 1`] = `
   "border-l-current/90",
   "border-l-current/95",
   "border-l-current/100",
+  "border-l-current/background",
   "border-l-inherit",
   "border-l-inherit/0",
   "border-l-inherit/5",
@@ -2541,6 +3454,7 @@ exports[`getClassList 1`] = `
   "border-l-inherit/90",
   "border-l-inherit/95",
   "border-l-inherit/100",
+  "border-l-inherit/background",
   "border-l-transparent",
   "border-l-transparent/0",
   "border-l-transparent/5",
@@ -2563,6 +3477,7 @@ exports[`getClassList 1`] = `
   "border-l-transparent/90",
   "border-l-transparent/95",
   "border-l-transparent/100",
+  "border-l-transparent/background",
   "border-none",
   "border-r",
   "border-r/0",
@@ -2586,6 +3501,7 @@ exports[`getClassList 1`] = `
   "border-r/90",
   "border-r/95",
   "border-r/100",
+  "border-r/background",
   "border-r-0",
   "border-r-2",
   "border-r-4",
@@ -2612,6 +3528,7 @@ exports[`getClassList 1`] = `
   "border-r-current/90",
   "border-r-current/95",
   "border-r-current/100",
+  "border-r-current/background",
   "border-r-inherit",
   "border-r-inherit/0",
   "border-r-inherit/5",
@@ -2634,6 +3551,7 @@ exports[`getClassList 1`] = `
   "border-r-inherit/90",
   "border-r-inherit/95",
   "border-r-inherit/100",
+  "border-r-inherit/background",
   "border-r-transparent",
   "border-r-transparent/0",
   "border-r-transparent/5",
@@ -2656,6 +3574,7 @@ exports[`getClassList 1`] = `
   "border-r-transparent/90",
   "border-r-transparent/95",
   "border-r-transparent/100",
+  "border-r-transparent/background",
   "border-s",
   "border-s/0",
   "border-s/5",
@@ -2678,6 +3597,7 @@ exports[`getClassList 1`] = `
   "border-s/90",
   "border-s/95",
   "border-s/100",
+  "border-s/background",
   "border-s-0",
   "border-s-2",
   "border-s-4",
@@ -2704,6 +3624,7 @@ exports[`getClassList 1`] = `
   "border-s-current/90",
   "border-s-current/95",
   "border-s-current/100",
+  "border-s-current/background",
   "border-s-inherit",
   "border-s-inherit/0",
   "border-s-inherit/5",
@@ -2726,6 +3647,7 @@ exports[`getClassList 1`] = `
   "border-s-inherit/90",
   "border-s-inherit/95",
   "border-s-inherit/100",
+  "border-s-inherit/background",
   "border-s-transparent",
   "border-s-transparent/0",
   "border-s-transparent/5",
@@ -2748,111 +3670,112 @@ exports[`getClassList 1`] = `
   "border-s-transparent/90",
   "border-s-transparent/95",
   "border-s-transparent/100",
+  "border-s-transparent/background",
   "border-separate",
   "border-solid",
   "border-spacing-0",
   "border-spacing-0.5",
   "border-spacing-1",
   "border-spacing-1.5",
+  "border-spacing-2",
+  "border-spacing-2.5",
+  "border-spacing-3",
+  "border-spacing-3.5",
+  "border-spacing-4",
+  "border-spacing-5",
+  "border-spacing-6",
+  "border-spacing-7",
+  "border-spacing-8",
+  "border-spacing-9",
   "border-spacing-10",
   "border-spacing-11",
   "border-spacing-12",
   "border-spacing-14",
   "border-spacing-16",
-  "border-spacing-2",
-  "border-spacing-2.5",
   "border-spacing-20",
   "border-spacing-24",
   "border-spacing-28",
-  "border-spacing-3",
-  "border-spacing-3.5",
   "border-spacing-32",
   "border-spacing-36",
-  "border-spacing-4",
   "border-spacing-40",
   "border-spacing-44",
   "border-spacing-48",
-  "border-spacing-5",
   "border-spacing-52",
   "border-spacing-56",
-  "border-spacing-6",
   "border-spacing-60",
   "border-spacing-64",
-  "border-spacing-7",
   "border-spacing-72",
-  "border-spacing-8",
   "border-spacing-80",
-  "border-spacing-9",
   "border-spacing-96",
   "border-spacing-px",
   "border-spacing-x-0",
   "border-spacing-x-0.5",
   "border-spacing-x-1",
   "border-spacing-x-1.5",
+  "border-spacing-x-2",
+  "border-spacing-x-2.5",
+  "border-spacing-x-3",
+  "border-spacing-x-3.5",
+  "border-spacing-x-4",
+  "border-spacing-x-5",
+  "border-spacing-x-6",
+  "border-spacing-x-7",
+  "border-spacing-x-8",
+  "border-spacing-x-9",
   "border-spacing-x-10",
   "border-spacing-x-11",
   "border-spacing-x-12",
   "border-spacing-x-14",
   "border-spacing-x-16",
-  "border-spacing-x-2",
-  "border-spacing-x-2.5",
   "border-spacing-x-20",
   "border-spacing-x-24",
   "border-spacing-x-28",
-  "border-spacing-x-3",
-  "border-spacing-x-3.5",
   "border-spacing-x-32",
   "border-spacing-x-36",
-  "border-spacing-x-4",
   "border-spacing-x-40",
   "border-spacing-x-44",
   "border-spacing-x-48",
-  "border-spacing-x-5",
   "border-spacing-x-52",
   "border-spacing-x-56",
-  "border-spacing-x-6",
   "border-spacing-x-60",
   "border-spacing-x-64",
-  "border-spacing-x-7",
   "border-spacing-x-72",
-  "border-spacing-x-8",
   "border-spacing-x-80",
-  "border-spacing-x-9",
   "border-spacing-x-96",
   "border-spacing-x-px",
   "border-spacing-y-0",
   "border-spacing-y-0.5",
   "border-spacing-y-1",
   "border-spacing-y-1.5",
+  "border-spacing-y-2",
+  "border-spacing-y-2.5",
+  "border-spacing-y-3",
+  "border-spacing-y-3.5",
+  "border-spacing-y-4",
+  "border-spacing-y-5",
+  "border-spacing-y-6",
+  "border-spacing-y-7",
+  "border-spacing-y-8",
+  "border-spacing-y-9",
   "border-spacing-y-10",
   "border-spacing-y-11",
   "border-spacing-y-12",
   "border-spacing-y-14",
   "border-spacing-y-16",
-  "border-spacing-y-2",
-  "border-spacing-y-2.5",
   "border-spacing-y-20",
   "border-spacing-y-24",
   "border-spacing-y-28",
-  "border-spacing-y-3",
-  "border-spacing-y-3.5",
   "border-spacing-y-32",
   "border-spacing-y-36",
-  "border-spacing-y-4",
   "border-spacing-y-40",
   "border-spacing-y-44",
   "border-spacing-y-48",
-  "border-spacing-y-5",
   "border-spacing-y-52",
   "border-spacing-y-56",
-  "border-spacing-y-6",
   "border-spacing-y-60",
   "border-spacing-y-64",
-  "border-spacing-y-7",
   "border-spacing-y-72",
-  "border-spacing-y-8",
   "border-spacing-y-80",
-  "border-spacing-y-9",
   "border-spacing-y-96",
   "border-spacing-y-px",
   "border-t",
@@ -2877,6 +3800,7 @@ exports[`getClassList 1`] = `
   "border-t/90",
   "border-t/95",
   "border-t/100",
+  "border-t/background",
   "border-t-0",
   "border-t-2",
   "border-t-4",
@@ -2903,6 +3827,7 @@ exports[`getClassList 1`] = `
   "border-t-current/90",
   "border-t-current/95",
   "border-t-current/100",
+  "border-t-current/background",
   "border-t-inherit",
   "border-t-inherit/0",
   "border-t-inherit/5",
@@ -2925,6 +3850,7 @@ exports[`getClassList 1`] = `
   "border-t-inherit/90",
   "border-t-inherit/95",
   "border-t-inherit/100",
+  "border-t-inherit/background",
   "border-t-transparent",
   "border-t-transparent/0",
   "border-t-transparent/5",
@@ -2947,6 +3873,7 @@ exports[`getClassList 1`] = `
   "border-t-transparent/90",
   "border-t-transparent/95",
   "border-t-transparent/100",
+  "border-t-transparent/background",
   "border-transparent",
   "border-transparent/0",
   "border-transparent/5",
@@ -2969,6 +3896,7 @@ exports[`getClassList 1`] = `
   "border-transparent/90",
   "border-transparent/95",
   "border-transparent/100",
+  "border-transparent/background",
   "border-x",
   "border-x/0",
   "border-x/5",
@@ -2991,6 +3919,7 @@ exports[`getClassList 1`] = `
   "border-x/90",
   "border-x/95",
   "border-x/100",
+  "border-x/background",
   "border-x-0",
   "border-x-2",
   "border-x-4",
@@ -3017,6 +3946,7 @@ exports[`getClassList 1`] = `
   "border-x-current/90",
   "border-x-current/95",
   "border-x-current/100",
+  "border-x-current/background",
   "border-x-inherit",
   "border-x-inherit/0",
   "border-x-inherit/5",
@@ -3039,6 +3969,7 @@ exports[`getClassList 1`] = `
   "border-x-inherit/90",
   "border-x-inherit/95",
   "border-x-inherit/100",
+  "border-x-inherit/background",
   "border-x-transparent",
   "border-x-transparent/0",
   "border-x-transparent/5",
@@ -3061,6 +3992,7 @@ exports[`getClassList 1`] = `
   "border-x-transparent/90",
   "border-x-transparent/95",
   "border-x-transparent/100",
+  "border-x-transparent/background",
   "border-y",
   "border-y/0",
   "border-y/5",
@@ -3083,6 +4015,7 @@ exports[`getClassList 1`] = `
   "border-y/90",
   "border-y/95",
   "border-y/100",
+  "border-y/background",
   "border-y-0",
   "border-y-2",
   "border-y-4",
@@ -3109,6 +4042,7 @@ exports[`getClassList 1`] = `
   "border-y-current/90",
   "border-y-current/95",
   "border-y-current/100",
+  "border-y-current/background",
   "border-y-inherit",
   "border-y-inherit/0",
   "border-y-inherit/5",
@@ -3131,6 +4065,7 @@ exports[`getClassList 1`] = `
   "border-y-inherit/90",
   "border-y-inherit/95",
   "border-y-inherit/100",
+  "border-y-inherit/background",
   "border-y-transparent",
   "border-y-transparent/0",
   "border-y-transparent/5",
@@ -3153,40 +4088,67 @@ exports[`getClassList 1`] = `
   "border-y-transparent/90",
   "border-y-transparent/95",
   "border-y-transparent/100",
+  "border-y-transparent/background",
   "bottom-0",
   "bottom-0.5",
   "bottom-1",
   "bottom-1.5",
+  "bottom-2",
+  "bottom-2.5",
+  "bottom-3",
+  "bottom-3.5",
+  "bottom-4",
+  "bottom-5",
+  "bottom-6",
+  "bottom-7",
+  "bottom-8",
+  "bottom-9",
   "bottom-10",
   "bottom-11",
   "bottom-12",
   "bottom-14",
   "bottom-16",
-  "bottom-2",
-  "bottom-2.5",
   "bottom-20",
   "bottom-24",
   "bottom-28",
-  "bottom-3",
-  "bottom-3.5",
   "bottom-32",
   "bottom-36",
-  "bottom-4",
   "bottom-40",
   "bottom-44",
   "bottom-48",
-  "bottom-5",
   "bottom-52",
   "bottom-56",
-  "bottom-6",
   "bottom-60",
   "bottom-64",
-  "bottom-7",
   "bottom-72",
-  "bottom-8",
   "bottom-80",
-  "bottom-9",
   "bottom-96",
+  "bottom-1/2",
+  "bottom-1/3",
+  "bottom-1/4",
+  "bottom-1/5",
+  "bottom-1/6",
+  "bottom-1/12",
+  "bottom-2/3",
+  "bottom-2/4",
+  "bottom-2/5",
+  "bottom-2/6",
+  "bottom-2/12",
+  "bottom-3/4",
+  "bottom-3/5",
+  "bottom-3/6",
+  "bottom-3/12",
+  "bottom-4/5",
+  "bottom-4/6",
+  "bottom-4/12",
+  "bottom-5/6",
+  "bottom-5/12",
+  "bottom-6/12",
+  "bottom-7/12",
+  "bottom-8/12",
+  "bottom-9/12",
+  "bottom-10/12",
+  "bottom-11/12",
   "bottom-auto",
   "bottom-full",
   "bottom-px",
@@ -3217,18 +4179,17 @@ exports[`getClassList 1`] = `
   "break-inside-avoid-page",
   "break-keep",
   "break-normal",
-  "break-words",
   "brightness-0",
+  "brightness-50",
+  "brightness-75",
+  "brightness-90",
+  "brightness-95",
   "brightness-100",
   "brightness-105",
   "brightness-110",
   "brightness-125",
   "brightness-150",
   "brightness-200",
-  "brightness-50",
-  "brightness-75",
-  "brightness-90",
-  "brightness-95",
   "capitalize",
   "caption-bottom",
   "caption-top",
@@ -3254,6 +4215,7 @@ exports[`getClassList 1`] = `
   "caret-current/90",
   "caret-current/95",
   "caret-current/100",
+  "caret-current/background",
   "caret-inherit",
   "caret-inherit/0",
   "caret-inherit/5",
@@ -3276,6 +4238,7 @@ exports[`getClassList 1`] = `
   "caret-inherit/90",
   "caret-inherit/95",
   "caret-inherit/100",
+  "caret-inherit/background",
   "caret-transparent",
   "caret-transparent/0",
   "caret-transparent/5",
@@ -3298,6 +4261,7 @@ exports[`getClassList 1`] = `
   "caret-transparent/90",
   "caret-transparent/95",
   "caret-transparent/100",
+  "caret-transparent/background",
   "clear-both",
   "clear-end",
   "clear-left",
@@ -3306,10 +4270,6 @@ exports[`getClassList 1`] = `
   "clear-start",
   "col-auto",
   "col-end-1",
-  "col-end-10",
-  "col-end-11",
-  "col-end-12",
-  "col-end-13",
   "col-end-2",
   "col-end-3",
   "col-end-4",
@@ -3318,11 +4278,12 @@ exports[`getClassList 1`] = `
   "col-end-7",
   "col-end-8",
   "col-end-9",
+  "col-end-10",
+  "col-end-11",
+  "col-end-12",
+  "col-end-13",
   "col-end-auto",
   "col-span-1",
-  "col-span-10",
-  "col-span-11",
-  "col-span-12",
   "col-span-2",
   "col-span-3",
   "col-span-4",
@@ -3331,12 +4292,11 @@ exports[`getClassList 1`] = `
   "col-span-7",
   "col-span-8",
   "col-span-9",
+  "col-span-10",
+  "col-span-11",
+  "col-span-12",
   "col-span-full",
   "col-start-1",
-  "col-start-10",
-  "col-start-11",
-  "col-start-12",
-  "col-start-13",
   "col-start-2",
   "col-start-3",
   "col-start-4",
@@ -3345,12 +4305,13 @@ exports[`getClassList 1`] = `
   "col-start-7",
   "col-start-8",
   "col-start-9",
+  "col-start-10",
+  "col-start-11",
+  "col-start-12",
+  "col-start-13",
   "col-start-auto",
   "collapse",
   "columns-1",
-  "columns-10",
-  "columns-11",
-  "columns-12",
   "columns-2",
   "columns-3",
   "columns-4",
@@ -3359,7 +4320,12 @@ exports[`getClassList 1`] = `
   "columns-7",
   "columns-8",
   "columns-9",
+  "columns-10",
+  "columns-11",
+  "columns-12",
   "columns-auto",
+  "columns-lg",
+  "columns-md",
   "contain-content",
   "contain-inline-size",
   "contain-layout",
@@ -3373,7 +4339,9 @@ exports[`getClassList 1`] = `
   "content-baseline",
   "content-between",
   "content-center",
+  "content-center-safe",
   "content-end",
+  "content-end-safe",
   "content-evenly",
   "content-none",
   "content-normal",
@@ -3381,12 +4349,12 @@ exports[`getClassList 1`] = `
   "content-stretch",
   "contents",
   "contrast-0",
+  "contrast-50",
+  "contrast-75",
   "contrast-100",
   "contrast-125",
   "contrast-150",
   "contrast-200",
-  "contrast-50",
-  "contrast-75",
   "cursor-alias",
   "cursor-all-scroll",
   "cursor-auto",
@@ -3449,6 +4417,7 @@ exports[`getClassList 1`] = `
   "decoration-current/90",
   "decoration-current/95",
   "decoration-current/100",
+  "decoration-current/background",
   "decoration-dashed",
   "decoration-dotted",
   "decoration-double",
@@ -3475,6 +4444,7 @@ exports[`getClassList 1`] = `
   "decoration-inherit/90",
   "decoration-inherit/95",
   "decoration-inherit/100",
+  "decoration-inherit/background",
   "decoration-solid",
   "decoration-transparent",
   "decoration-transparent/0",
@@ -3498,15 +4468,16 @@ exports[`getClassList 1`] = `
   "decoration-transparent/90",
   "decoration-transparent/95",
   "decoration-transparent/100",
+  "decoration-transparent/background",
   "decoration-wavy",
+  "delay-75",
   "delay-100",
-  "delay-1000",
   "delay-150",
   "delay-200",
   "delay-300",
   "delay-500",
   "delay-700",
-  "delay-75",
+  "delay-1000",
   "diagonal-fractions",
   "divide-current",
   "divide-current/0",
@@ -3530,6 +4501,7 @@ exports[`getClassList 1`] = `
   "divide-current/90",
   "divide-current/95",
   "divide-current/100",
+  "divide-current/background",
   "divide-dashed",
   "divide-dotted",
   "divide-double",
@@ -3555,6 +4527,7 @@ exports[`getClassList 1`] = `
   "divide-inherit/90",
   "divide-inherit/95",
   "divide-inherit/100",
+  "divide-inherit/background",
   "divide-none",
   "divide-solid",
   "divide-transparent",
@@ -3579,6 +4552,7 @@ exports[`getClassList 1`] = `
   "divide-transparent/90",
   "divide-transparent/95",
   "divide-transparent/100",
+  "divide-transparent/background",
   "divide-x",
   "divide-x-0",
   "divide-x-2",
@@ -3591,53 +4565,88 @@ exports[`getClassList 1`] = `
   "divide-y-4",
   "divide-y-8",
   "divide-y-reverse",
+  "drop-shadow-current",
+  "drop-shadow-current/0",
+  "drop-shadow-current/5",
+  "drop-shadow-current/10",
+  "drop-shadow-current/15",
+  "drop-shadow-current/20",
+  "drop-shadow-current/25",
+  "drop-shadow-current/30",
+  "drop-shadow-current/35",
+  "drop-shadow-current/40",
+  "drop-shadow-current/45",
+  "drop-shadow-current/50",
+  "drop-shadow-current/55",
+  "drop-shadow-current/60",
+  "drop-shadow-current/65",
+  "drop-shadow-current/70",
+  "drop-shadow-current/75",
+  "drop-shadow-current/80",
+  "drop-shadow-current/85",
+  "drop-shadow-current/90",
+  "drop-shadow-current/95",
+  "drop-shadow-current/100",
+  "drop-shadow-current/background",
+  "drop-shadow-inherit",
+  "drop-shadow-inherit/0",
+  "drop-shadow-inherit/5",
+  "drop-shadow-inherit/10",
+  "drop-shadow-inherit/15",
+  "drop-shadow-inherit/20",
+  "drop-shadow-inherit/25",
+  "drop-shadow-inherit/30",
+  "drop-shadow-inherit/35",
+  "drop-shadow-inherit/40",
+  "drop-shadow-inherit/45",
+  "drop-shadow-inherit/50",
+  "drop-shadow-inherit/55",
+  "drop-shadow-inherit/60",
+  "drop-shadow-inherit/65",
+  "drop-shadow-inherit/70",
+  "drop-shadow-inherit/75",
+  "drop-shadow-inherit/80",
+  "drop-shadow-inherit/85",
+  "drop-shadow-inherit/90",
+  "drop-shadow-inherit/95",
+  "drop-shadow-inherit/100",
+  "drop-shadow-inherit/background",
   "drop-shadow-none",
   "drop-shadow-sm",
+  "drop-shadow-transparent",
+  "drop-shadow-transparent/0",
+  "drop-shadow-transparent/5",
+  "drop-shadow-transparent/10",
+  "drop-shadow-transparent/15",
+  "drop-shadow-transparent/20",
+  "drop-shadow-transparent/25",
+  "drop-shadow-transparent/30",
+  "drop-shadow-transparent/35",
+  "drop-shadow-transparent/40",
+  "drop-shadow-transparent/45",
+  "drop-shadow-transparent/50",
+  "drop-shadow-transparent/55",
+  "drop-shadow-transparent/60",
+  "drop-shadow-transparent/65",
+  "drop-shadow-transparent/70",
+  "drop-shadow-transparent/75",
+  "drop-shadow-transparent/80",
+  "drop-shadow-transparent/85",
+  "drop-shadow-transparent/90",
+  "drop-shadow-transparent/95",
+  "drop-shadow-transparent/100",
+  "drop-shadow-transparent/background",
+  "duration-75",
   "duration-100",
-  "duration-1000",
   "duration-150",
   "duration-200",
   "duration-300",
   "duration-500",
   "duration-700",
-  "duration-75",
+  "duration-1000",
   "duration-initial",
   "ease-initial",
   "ease-linear",
-  "end-0",
-  "end-0.5",
-  "end-1",
-  "end-1.5",
-  "end-10",
-  "end-11",
-  "end-12",
-  "end-14",
-  "end-16",
-  "end-2",
-  "end-2.5",
-  "end-20",
-  "end-24",
-  "end-28",
-  "end-3",
-  "end-3.5",
-  "end-32",
-  "end-36",
-  "end-4",
-  "end-40",
-  "end-44",
-  "end-48",
-  "end-5",
-  "end-52",
-  "end-56",
-  "end-6",
-  "end-60",
-  "end-64",
-  "end-7",
-  "end-72",
-  "end-8",
-  "end-80",
-  "end-9",
-  "end-96",
   "end-auto",
   "end-full",
   "end-px",
@@ -3665,6 +4674,7 @@ exports[`getClassList 1`] = `
   "fill-current/90",
   "fill-current/95",
   "fill-current/100",
+  "fill-current/background",
   "fill-inherit",
   "fill-inherit/0",
   "fill-inherit/5",
@@ -3687,6 +4697,7 @@ exports[`getClassList 1`] = `
   "fill-inherit/90",
   "fill-inherit/95",
   "fill-inherit/100",
+  "fill-inherit/background",
   "fill-none",
   "fill-transparent",
   "fill-transparent/0",
@@ -3710,8 +4721,47 @@ exports[`getClassList 1`] = `
   "fill-transparent/90",
   "fill-transparent/95",
   "fill-transparent/100",
+  "fill-transparent/background",
   "fixed",
   "flex",
+  "flex-1",
+  "flex-2",
+  "flex-3",
+  "flex-4",
+  "flex-5",
+  "flex-6",
+  "flex-7",
+  "flex-8",
+  "flex-9",
+  "flex-10",
+  "flex-11",
+  "flex-12",
+  "flex-1/2",
+  "flex-1/3",
+  "flex-1/4",
+  "flex-1/5",
+  "flex-1/6",
+  "flex-1/12",
+  "flex-2/3",
+  "flex-2/4",
+  "flex-2/5",
+  "flex-2/6",
+  "flex-2/12",
+  "flex-3/4",
+  "flex-3/5",
+  "flex-3/6",
+  "flex-3/12",
+  "flex-4/5",
+  "flex-4/6",
+  "flex-4/12",
+  "flex-5/6",
+  "flex-5/12",
+  "flex-6/12",
+  "flex-7/12",
+  "flex-8/12",
+  "flex-9/12",
+  "flex-10/12",
+  "flex-11/12",
   "flex-auto",
   "flex-col",
   "flex-col-reverse",
@@ -3728,25 +4778,18 @@ exports[`getClassList 1`] = `
   "float-right",
   "float-start",
   "flow-root",
-  "font-black",
   "font-bold",
-  "font-extrabold",
-  "font-extralight",
-  "font-light",
-  "font-medium",
-  "font-normal",
   "font-sans",
-  "font-semibold",
+  "font-stretch-50%",
+  "font-stretch-75%",
+  "font-stretch-90%",
+  "font-stretch-95%",
   "font-stretch-100%",
   "font-stretch-105%",
   "font-stretch-110%",
   "font-stretch-125%",
   "font-stretch-150%",
   "font-stretch-200%",
-  "font-stretch-50%",
-  "font-stretch-75%",
-  "font-stretch-90%",
-  "font-stretch-95%",
   "font-stretch-condensed",
   "font-stretch-expanded",
   "font-stretch-extra-condensed",
@@ -3757,12 +4800,11 @@ exports[`getClassList 1`] = `
   "font-stretch-ultra-condensed",
   "font-stretch-ultra-expanded",
   "font-superbold",
-  "font-thin",
   "forced-color-adjust-auto",
   "forced-color-adjust-none",
   "from-0%",
+  "from-5%",
   "from-10%",
-  "from-100%",
   "from-15%",
   "from-20%",
   "from-25%",
@@ -3770,7 +4812,6 @@ exports[`getClassList 1`] = `
   "from-35%",
   "from-40%",
   "from-45%",
-  "from-5%",
   "from-50%",
   "from-55%",
   "from-60%",
@@ -3781,6 +4822,7 @@ exports[`getClassList 1`] = `
   "from-85%",
   "from-90%",
   "from-95%",
+  "from-100%",
   "from-current",
   "from-current/0",
   "from-current/5",
@@ -3803,6 +4845,7 @@ exports[`getClassList 1`] = `
   "from-current/90",
   "from-current/95",
   "from-current/100",
+  "from-current/background",
   "from-inherit",
   "from-inherit/0",
   "from-inherit/5",
@@ -3825,6 +4868,7 @@ exports[`getClassList 1`] = `
   "from-inherit/90",
   "from-inherit/95",
   "from-inherit/100",
+  "from-inherit/background",
   "from-transparent",
   "from-transparent/0",
   "from-transparent/5",
@@ -3847,122 +4891,120 @@ exports[`getClassList 1`] = `
   "from-transparent/90",
   "from-transparent/95",
   "from-transparent/100",
+  "from-transparent/background",
   "gap-0",
   "gap-0.5",
   "gap-1",
   "gap-1.5",
+  "gap-2",
+  "gap-2.5",
+  "gap-3",
+  "gap-3.5",
+  "gap-4",
+  "gap-5",
+  "gap-6",
+  "gap-7",
+  "gap-8",
+  "gap-9",
   "gap-10",
   "gap-11",
   "gap-12",
   "gap-14",
   "gap-16",
-  "gap-2",
-  "gap-2.5",
   "gap-20",
   "gap-24",
   "gap-28",
-  "gap-3",
-  "gap-3.5",
   "gap-32",
   "gap-36",
-  "gap-4",
   "gap-40",
   "gap-44",
   "gap-48",
-  "gap-5",
   "gap-52",
   "gap-56",
-  "gap-6",
   "gap-60",
   "gap-64",
-  "gap-7",
   "gap-72",
-  "gap-8",
   "gap-80",
-  "gap-9",
   "gap-96",
   "gap-px",
   "gap-x-0",
   "gap-x-0.5",
   "gap-x-1",
   "gap-x-1.5",
+  "gap-x-2",
+  "gap-x-2.5",
+  "gap-x-3",
+  "gap-x-3.5",
+  "gap-x-4",
+  "gap-x-5",
+  "gap-x-6",
+  "gap-x-7",
+  "gap-x-8",
+  "gap-x-9",
   "gap-x-10",
   "gap-x-11",
   "gap-x-12",
   "gap-x-14",
   "gap-x-16",
-  "gap-x-2",
-  "gap-x-2.5",
   "gap-x-20",
   "gap-x-24",
   "gap-x-28",
-  "gap-x-3",
-  "gap-x-3.5",
   "gap-x-32",
   "gap-x-36",
-  "gap-x-4",
   "gap-x-40",
   "gap-x-44",
   "gap-x-48",
-  "gap-x-5",
   "gap-x-52",
   "gap-x-56",
-  "gap-x-6",
   "gap-x-60",
   "gap-x-64",
-  "gap-x-7",
   "gap-x-72",
-  "gap-x-8",
   "gap-x-80",
-  "gap-x-9",
   "gap-x-96",
   "gap-x-px",
   "gap-y-0",
   "gap-y-0.5",
   "gap-y-1",
   "gap-y-1.5",
+  "gap-y-2",
+  "gap-y-2.5",
+  "gap-y-3",
+  "gap-y-3.5",
+  "gap-y-4",
+  "gap-y-5",
+  "gap-y-6",
+  "gap-y-7",
+  "gap-y-8",
+  "gap-y-9",
   "gap-y-10",
   "gap-y-11",
   "gap-y-12",
   "gap-y-14",
   "gap-y-16",
-  "gap-y-2",
-  "gap-y-2.5",
   "gap-y-20",
   "gap-y-24",
   "gap-y-28",
-  "gap-y-3",
-  "gap-y-3.5",
   "gap-y-32",
   "gap-y-36",
-  "gap-y-4",
   "gap-y-40",
   "gap-y-44",
   "gap-y-48",
-  "gap-y-5",
   "gap-y-52",
   "gap-y-56",
-  "gap-y-6",
   "gap-y-60",
   "gap-y-64",
-  "gap-y-7",
   "gap-y-72",
-  "gap-y-8",
   "gap-y-80",
-  "gap-y-9",
   "gap-y-96",
   "gap-y-px",
   "grayscale",
   "grayscale-0",
-  "grayscale-100",
   "grayscale-25",
   "grayscale-50",
   "grayscale-75",
+  "grayscale-100",
   "grid",
   "grid-cols-1",
-  "grid-cols-10",
-  "grid-cols-11",
-  "grid-cols-12",
   "grid-cols-2",
   "grid-cols-3",
   "grid-cols-4",
@@ -3971,6 +5013,9 @@ exports[`getClassList 1`] = `
   "grid-cols-7",
   "grid-cols-8",
   "grid-cols-9",
+  "grid-cols-10",
+  "grid-cols-11",
+  "grid-cols-12",
   "grid-cols-none",
   "grid-cols-subgrid",
   "grid-flow-col",
@@ -3979,9 +5024,6 @@ exports[`getClassList 1`] = `
   "grid-flow-row",
   "grid-flow-row-dense",
   "grid-rows-1",
-  "grid-rows-10",
-  "grid-rows-11",
-  "grid-rows-12",
   "grid-rows-2",
   "grid-rows-3",
   "grid-rows-4",
@@ -3990,6 +5032,9 @@ exports[`getClassList 1`] = `
   "grid-rows-7",
   "grid-rows-8",
   "grid-rows-9",
+  "grid-rows-10",
+  "grid-rows-11",
+  "grid-rows-12",
   "grid-rows-none",
   "grid-rows-subgrid",
   "grow",
@@ -3998,41 +5043,68 @@ exports[`getClassList 1`] = `
   "h-0.5",
   "h-1",
   "h-1.5",
+  "h-2",
+  "h-2.5",
+  "h-3",
+  "h-3.5",
+  "h-4",
+  "h-5",
+  "h-6",
+  "h-7",
+  "h-8",
+  "h-9",
   "h-10",
   "h-11",
   "h-12",
   "h-14",
   "h-16",
-  "h-2",
-  "h-2.5",
   "h-20",
   "h-24",
   "h-28",
-  "h-3",
-  "h-3.5",
   "h-32",
   "h-36",
-  "h-4",
   "h-40",
   "h-44",
   "h-48",
-  "h-5",
   "h-52",
   "h-56",
-  "h-6",
   "h-60",
   "h-64",
-  "h-7",
   "h-72",
-  "h-8",
   "h-80",
-  "h-9",
   "h-96",
+  "h-1/2",
+  "h-1/3",
+  "h-1/4",
+  "h-1/5",
+  "h-1/6",
+  "h-1/12",
+  "h-2/3",
+  "h-2/4",
+  "h-2/5",
+  "h-2/6",
+  "h-2/12",
+  "h-3/4",
+  "h-3/5",
+  "h-3/6",
+  "h-3/12",
+  "h-4/5",
+  "h-4/6",
+  "h-4/12",
+  "h-5/6",
+  "h-5/12",
+  "h-6/12",
+  "h-7/12",
+  "h-8/12",
+  "h-9/12",
+  "h-10/12",
+  "h-11/12",
   "h-auto",
   "h-dvh",
   "h-dvw",
   "h-fit",
   "h-full",
+  "h-lh",
   "h-lvh",
   "h-lvw",
   "h-max",
@@ -4044,10 +5116,10 @@ exports[`getClassList 1`] = `
   "hidden",
   "hue-rotate-0",
   "hue-rotate-15",
-  "hue-rotate-180",
   "hue-rotate-30",
   "hue-rotate-60",
   "hue-rotate-90",
+  "hue-rotate-180",
   "hyphens-auto",
   "hyphens-manual",
   "hyphens-none",
@@ -4055,77 +5127,364 @@ exports[`getClassList 1`] = `
   "indent-0.5",
   "indent-1",
   "indent-1.5",
+  "indent-2",
+  "indent-2.5",
+  "indent-3",
+  "indent-3.5",
+  "indent-4",
+  "indent-5",
+  "indent-6",
+  "indent-7",
+  "indent-8",
+  "indent-9",
   "indent-10",
   "indent-11",
   "indent-12",
   "indent-14",
   "indent-16",
-  "indent-2",
-  "indent-2.5",
   "indent-20",
   "indent-24",
   "indent-28",
-  "indent-3",
-  "indent-3.5",
   "indent-32",
   "indent-36",
-  "indent-4",
   "indent-40",
   "indent-44",
   "indent-48",
-  "indent-5",
   "indent-52",
   "indent-56",
-  "indent-6",
   "indent-60",
   "indent-64",
-  "indent-7",
   "indent-72",
-  "indent-8",
   "indent-80",
-  "indent-9",
   "indent-96",
   "indent-px",
   "inline",
+  "inline-0",
+  "inline-0.5",
+  "inline-1",
+  "inline-1.5",
+  "inline-2",
+  "inline-2.5",
+  "inline-3",
+  "inline-3.5",
+  "inline-4",
+  "inline-5",
+  "inline-6",
+  "inline-7",
+  "inline-8",
+  "inline-9",
+  "inline-10",
+  "inline-11",
+  "inline-12",
+  "inline-14",
+  "inline-16",
+  "inline-20",
+  "inline-24",
+  "inline-28",
+  "inline-32",
+  "inline-36",
+  "inline-40",
+  "inline-44",
+  "inline-48",
+  "inline-52",
+  "inline-56",
+  "inline-60",
+  "inline-64",
+  "inline-72",
+  "inline-80",
+  "inline-96",
+  "inline-auto",
   "inline-block",
+  "inline-dvw",
+  "inline-fit",
   "inline-flex",
+  "inline-full",
   "inline-grid",
+  "inline-lg",
+  "inline-lvw",
+  "inline-max",
+  "inline-md",
+  "inline-1/2",
+  "inline-1/3",
+  "inline-1/4",
+  "inline-1/5",
+  "inline-1/6",
+  "inline-1/12",
+  "inline-2/3",
+  "inline-2/4",
+  "inline-2/5",
+  "inline-2/6",
+  "inline-2/12",
+  "inline-3/4",
+  "inline-3/5",
+  "inline-3/6",
+  "inline-3/12",
+  "inline-4/5",
+  "inline-4/6",
+  "inline-4/12",
+  "inline-5/6",
+  "inline-5/12",
+  "inline-6/12",
+  "inline-7/12",
+  "inline-8/12",
+  "inline-9/12",
+  "inline-10/12",
+  "inline-11/12",
+  "inline-min",
+  "inline-px",
+  "inline-screen",
+  "inline-svw",
   "inline-table",
   "inset-0",
   "inset-0.5",
   "inset-1",
   "inset-1.5",
+  "inset-2",
+  "inset-2.5",
+  "inset-3",
+  "inset-3.5",
+  "inset-4",
+  "inset-5",
+  "inset-6",
+  "inset-7",
+  "inset-8",
+  "inset-9",
   "inset-10",
   "inset-11",
   "inset-12",
   "inset-14",
   "inset-16",
-  "inset-2",
-  "inset-2.5",
   "inset-20",
   "inset-24",
   "inset-28",
-  "inset-3",
-  "inset-3.5",
   "inset-32",
   "inset-36",
-  "inset-4",
   "inset-40",
   "inset-44",
   "inset-48",
-  "inset-5",
   "inset-52",
   "inset-56",
-  "inset-6",
   "inset-60",
   "inset-64",
-  "inset-7",
   "inset-72",
-  "inset-8",
   "inset-80",
-  "inset-9",
   "inset-96",
+  "inset-1/2",
+  "inset-1/3",
+  "inset-1/4",
+  "inset-1/5",
+  "inset-1/6",
+  "inset-1/12",
+  "inset-2/3",
+  "inset-2/4",
+  "inset-2/5",
+  "inset-2/6",
+  "inset-2/12",
+  "inset-3/4",
+  "inset-3/5",
+  "inset-3/6",
+  "inset-3/12",
+  "inset-4/5",
+  "inset-4/6",
+  "inset-4/12",
+  "inset-5/6",
+  "inset-5/12",
+  "inset-6/12",
+  "inset-7/12",
+  "inset-8/12",
+  "inset-9/12",
+  "inset-10/12",
+  "inset-11/12",
   "inset-auto",
+  "inset-be-0",
+  "inset-be-0.5",
+  "inset-be-1",
+  "inset-be-1.5",
+  "inset-be-2",
+  "inset-be-2.5",
+  "inset-be-3",
+  "inset-be-3.5",
+  "inset-be-4",
+  "inset-be-5",
+  "inset-be-6",
+  "inset-be-7",
+  "inset-be-8",
+  "inset-be-9",
+  "inset-be-10",
+  "inset-be-11",
+  "inset-be-12",
+  "inset-be-14",
+  "inset-be-16",
+  "inset-be-20",
+  "inset-be-24",
+  "inset-be-28",
+  "inset-be-32",
+  "inset-be-36",
+  "inset-be-40",
+  "inset-be-44",
+  "inset-be-48",
+  "inset-be-52",
+  "inset-be-56",
+  "inset-be-60",
+  "inset-be-64",
+  "inset-be-72",
+  "inset-be-80",
+  "inset-be-96",
+  "inset-be-1/2",
+  "inset-be-1/3",
+  "inset-be-1/4",
+  "inset-be-1/5",
+  "inset-be-1/6",
+  "inset-be-1/12",
+  "inset-be-2/3",
+  "inset-be-2/4",
+  "inset-be-2/5",
+  "inset-be-2/6",
+  "inset-be-2/12",
+  "inset-be-3/4",
+  "inset-be-3/5",
+  "inset-be-3/6",
+  "inset-be-3/12",
+  "inset-be-4/5",
+  "inset-be-4/6",
+  "inset-be-4/12",
+  "inset-be-5/6",
+  "inset-be-5/12",
+  "inset-be-6/12",
+  "inset-be-7/12",
+  "inset-be-8/12",
+  "inset-be-9/12",
+  "inset-be-10/12",
+  "inset-be-11/12",
+  "inset-be-auto",
+  "inset-be-full",
+  "inset-be-px",
+  "inset-bs-0",
+  "inset-bs-0.5",
+  "inset-bs-1",
+  "inset-bs-1.5",
+  "inset-bs-2",
+  "inset-bs-2.5",
+  "inset-bs-3",
+  "inset-bs-3.5",
+  "inset-bs-4",
+  "inset-bs-5",
+  "inset-bs-6",
+  "inset-bs-7",
+  "inset-bs-8",
+  "inset-bs-9",
+  "inset-bs-10",
+  "inset-bs-11",
+  "inset-bs-12",
+  "inset-bs-14",
+  "inset-bs-16",
+  "inset-bs-20",
+  "inset-bs-24",
+  "inset-bs-28",
+  "inset-bs-32",
+  "inset-bs-36",
+  "inset-bs-40",
+  "inset-bs-44",
+  "inset-bs-48",
+  "inset-bs-52",
+  "inset-bs-56",
+  "inset-bs-60",
+  "inset-bs-64",
+  "inset-bs-72",
+  "inset-bs-80",
+  "inset-bs-96",
+  "inset-bs-1/2",
+  "inset-bs-1/3",
+  "inset-bs-1/4",
+  "inset-bs-1/5",
+  "inset-bs-1/6",
+  "inset-bs-1/12",
+  "inset-bs-2/3",
+  "inset-bs-2/4",
+  "inset-bs-2/5",
+  "inset-bs-2/6",
+  "inset-bs-2/12",
+  "inset-bs-3/4",
+  "inset-bs-3/5",
+  "inset-bs-3/6",
+  "inset-bs-3/12",
+  "inset-bs-4/5",
+  "inset-bs-4/6",
+  "inset-bs-4/12",
+  "inset-bs-5/6",
+  "inset-bs-5/12",
+  "inset-bs-6/12",
+  "inset-bs-7/12",
+  "inset-bs-8/12",
+  "inset-bs-9/12",
+  "inset-bs-10/12",
+  "inset-bs-11/12",
+  "inset-bs-auto",
+  "inset-bs-full",
+  "inset-bs-px",
+  "inset-e-0",
+  "inset-e-0.5",
+  "inset-e-1",
+  "inset-e-1.5",
+  "inset-e-2",
+  "inset-e-2.5",
+  "inset-e-3",
+  "inset-e-3.5",
+  "inset-e-4",
+  "inset-e-5",
+  "inset-e-6",
+  "inset-e-7",
+  "inset-e-8",
+  "inset-e-9",
+  "inset-e-10",
+  "inset-e-11",
+  "inset-e-12",
+  "inset-e-14",
+  "inset-e-16",
+  "inset-e-20",
+  "inset-e-24",
+  "inset-e-28",
+  "inset-e-32",
+  "inset-e-36",
+  "inset-e-40",
+  "inset-e-44",
+  "inset-e-48",
+  "inset-e-52",
+  "inset-e-56",
+  "inset-e-60",
+  "inset-e-64",
+  "inset-e-72",
+  "inset-e-80",
+  "inset-e-96",
+  "inset-e-1/2",
+  "inset-e-1/3",
+  "inset-e-1/4",
+  "inset-e-1/5",
+  "inset-e-1/6",
+  "inset-e-1/12",
+  "inset-e-2/3",
+  "inset-e-2/4",
+  "inset-e-2/5",
+  "inset-e-2/6",
+  "inset-e-2/12",
+  "inset-e-3/4",
+  "inset-e-3/5",
+  "inset-e-3/6",
+  "inset-e-3/12",
+  "inset-e-4/5",
+  "inset-e-4/6",
+  "inset-e-4/12",
+  "inset-e-5/6",
+  "inset-e-5/12",
+  "inset-e-6/12",
+  "inset-e-7/12",
+  "inset-e-8/12",
+  "inset-e-9/12",
+  "inset-e-10/12",
+  "inset-e-11/12",
+  "inset-e-auto",
+  "inset-e-full",
+  "inset-e-px",
   "inset-full",
   "inset-px",
   "inset-ring",
@@ -4156,6 +5515,7 @@ exports[`getClassList 1`] = `
   "inset-ring-current/90",
   "inset-ring-current/95",
   "inset-ring-current/100",
+  "inset-ring-current/background",
   "inset-ring-inherit",
   "inset-ring-inherit/0",
   "inset-ring-inherit/5",
@@ -4178,6 +5538,7 @@ exports[`getClassList 1`] = `
   "inset-ring-inherit/90",
   "inset-ring-inherit/95",
   "inset-ring-inherit/100",
+  "inset-ring-inherit/background",
   "inset-ring-transparent",
   "inset-ring-transparent/0",
   "inset-ring-transparent/5",
@@ -4200,7 +5561,70 @@ exports[`getClassList 1`] = `
   "inset-ring-transparent/90",
   "inset-ring-transparent/95",
   "inset-ring-transparent/100",
-  "inset-shadow",
+  "inset-ring-transparent/background",
+  "inset-s-0",
+  "inset-s-0.5",
+  "inset-s-1",
+  "inset-s-1.5",
+  "inset-s-2",
+  "inset-s-2.5",
+  "inset-s-3",
+  "inset-s-3.5",
+  "inset-s-4",
+  "inset-s-5",
+  "inset-s-6",
+  "inset-s-7",
+  "inset-s-8",
+  "inset-s-9",
+  "inset-s-10",
+  "inset-s-11",
+  "inset-s-12",
+  "inset-s-14",
+  "inset-s-16",
+  "inset-s-20",
+  "inset-s-24",
+  "inset-s-28",
+  "inset-s-32",
+  "inset-s-36",
+  "inset-s-40",
+  "inset-s-44",
+  "inset-s-48",
+  "inset-s-52",
+  "inset-s-56",
+  "inset-s-60",
+  "inset-s-64",
+  "inset-s-72",
+  "inset-s-80",
+  "inset-s-96",
+  "inset-s-1/2",
+  "inset-s-1/3",
+  "inset-s-1/4",
+  "inset-s-1/5",
+  "inset-s-1/6",
+  "inset-s-1/12",
+  "inset-s-2/3",
+  "inset-s-2/4",
+  "inset-s-2/5",
+  "inset-s-2/6",
+  "inset-s-2/12",
+  "inset-s-3/4",
+  "inset-s-3/5",
+  "inset-s-3/6",
+  "inset-s-3/12",
+  "inset-s-4/5",
+  "inset-s-4/6",
+  "inset-s-4/12",
+  "inset-s-5/6",
+  "inset-s-5/12",
+  "inset-s-6/12",
+  "inset-s-7/12",
+  "inset-s-8/12",
+  "inset-s-9/12",
+  "inset-s-10/12",
+  "inset-s-11/12",
+  "inset-s-auto",
+  "inset-s-full",
+  "inset-s-px",
   "inset-shadow-current",
   "inset-shadow-current/0",
   "inset-shadow-current/5",
@@ -4223,6 +5647,7 @@ exports[`getClassList 1`] = `
   "inset-shadow-current/90",
   "inset-shadow-current/95",
   "inset-shadow-current/100",
+  "inset-shadow-current/background",
   "inset-shadow-inherit",
   "inset-shadow-inherit/0",
   "inset-shadow-inherit/5",
@@ -4245,7 +5670,31 @@ exports[`getClassList 1`] = `
   "inset-shadow-inherit/90",
   "inset-shadow-inherit/95",
   "inset-shadow-inherit/100",
+  "inset-shadow-inherit/background",
   "inset-shadow-initial",
+  "inset-shadow-none",
+  "inset-shadow-sm",
+  "inset-shadow-sm/0",
+  "inset-shadow-sm/5",
+  "inset-shadow-sm/10",
+  "inset-shadow-sm/15",
+  "inset-shadow-sm/20",
+  "inset-shadow-sm/25",
+  "inset-shadow-sm/30",
+  "inset-shadow-sm/35",
+  "inset-shadow-sm/40",
+  "inset-shadow-sm/45",
+  "inset-shadow-sm/50",
+  "inset-shadow-sm/55",
+  "inset-shadow-sm/60",
+  "inset-shadow-sm/65",
+  "inset-shadow-sm/70",
+  "inset-shadow-sm/75",
+  "inset-shadow-sm/80",
+  "inset-shadow-sm/85",
+  "inset-shadow-sm/90",
+  "inset-shadow-sm/95",
+  "inset-shadow-sm/100",
   "inset-shadow-transparent",
   "inset-shadow-transparent/0",
   "inset-shadow-transparent/5",
@@ -4268,40 +5717,67 @@ exports[`getClassList 1`] = `
   "inset-shadow-transparent/90",
   "inset-shadow-transparent/95",
   "inset-shadow-transparent/100",
+  "inset-shadow-transparent/background",
   "inset-x-0",
   "inset-x-0.5",
   "inset-x-1",
   "inset-x-1.5",
+  "inset-x-2",
+  "inset-x-2.5",
+  "inset-x-3",
+  "inset-x-3.5",
+  "inset-x-4",
+  "inset-x-5",
+  "inset-x-6",
+  "inset-x-7",
+  "inset-x-8",
+  "inset-x-9",
   "inset-x-10",
   "inset-x-11",
   "inset-x-12",
   "inset-x-14",
   "inset-x-16",
-  "inset-x-2",
-  "inset-x-2.5",
   "inset-x-20",
   "inset-x-24",
   "inset-x-28",
-  "inset-x-3",
-  "inset-x-3.5",
   "inset-x-32",
   "inset-x-36",
-  "inset-x-4",
   "inset-x-40",
   "inset-x-44",
   "inset-x-48",
-  "inset-x-5",
   "inset-x-52",
   "inset-x-56",
-  "inset-x-6",
   "inset-x-60",
   "inset-x-64",
-  "inset-x-7",
   "inset-x-72",
-  "inset-x-8",
   "inset-x-80",
-  "inset-x-9",
   "inset-x-96",
+  "inset-x-1/2",
+  "inset-x-1/3",
+  "inset-x-1/4",
+  "inset-x-1/5",
+  "inset-x-1/6",
+  "inset-x-1/12",
+  "inset-x-2/3",
+  "inset-x-2/4",
+  "inset-x-2/5",
+  "inset-x-2/6",
+  "inset-x-2/12",
+  "inset-x-3/4",
+  "inset-x-3/5",
+  "inset-x-3/6",
+  "inset-x-3/12",
+  "inset-x-4/5",
+  "inset-x-4/6",
+  "inset-x-4/12",
+  "inset-x-5/6",
+  "inset-x-5/12",
+  "inset-x-6/12",
+  "inset-x-7/12",
+  "inset-x-8/12",
+  "inset-x-9/12",
+  "inset-x-10/12",
+  "inset-x-11/12",
   "inset-x-auto",
   "inset-x-full",
   "inset-x-px",
@@ -4309,69 +5785,104 @@ exports[`getClassList 1`] = `
   "inset-y-0.5",
   "inset-y-1",
   "inset-y-1.5",
+  "inset-y-2",
+  "inset-y-2.5",
+  "inset-y-3",
+  "inset-y-3.5",
+  "inset-y-4",
+  "inset-y-5",
+  "inset-y-6",
+  "inset-y-7",
+  "inset-y-8",
+  "inset-y-9",
   "inset-y-10",
   "inset-y-11",
   "inset-y-12",
   "inset-y-14",
   "inset-y-16",
-  "inset-y-2",
-  "inset-y-2.5",
   "inset-y-20",
   "inset-y-24",
   "inset-y-28",
-  "inset-y-3",
-  "inset-y-3.5",
   "inset-y-32",
   "inset-y-36",
-  "inset-y-4",
   "inset-y-40",
   "inset-y-44",
   "inset-y-48",
-  "inset-y-5",
   "inset-y-52",
   "inset-y-56",
-  "inset-y-6",
   "inset-y-60",
   "inset-y-64",
-  "inset-y-7",
   "inset-y-72",
-  "inset-y-8",
   "inset-y-80",
-  "inset-y-9",
   "inset-y-96",
+  "inset-y-1/2",
+  "inset-y-1/3",
+  "inset-y-1/4",
+  "inset-y-1/5",
+  "inset-y-1/6",
+  "inset-y-1/12",
+  "inset-y-2/3",
+  "inset-y-2/4",
+  "inset-y-2/5",
+  "inset-y-2/6",
+  "inset-y-2/12",
+  "inset-y-3/4",
+  "inset-y-3/5",
+  "inset-y-3/6",
+  "inset-y-3/12",
+  "inset-y-4/5",
+  "inset-y-4/6",
+  "inset-y-4/12",
+  "inset-y-5/6",
+  "inset-y-5/12",
+  "inset-y-6/12",
+  "inset-y-7/12",
+  "inset-y-8/12",
+  "inset-y-9/12",
+  "inset-y-10/12",
+  "inset-y-11/12",
   "inset-y-auto",
   "inset-y-full",
   "inset-y-px",
   "invert",
   "invert-0",
-  "invert-100",
   "invert-25",
   "invert-50",
   "invert-75",
+  "invert-100",
   "invisible",
   "isolate",
   "isolation-auto",
   "italic",
   "items-baseline",
+  "items-baseline-last",
   "items-center",
+  "items-center-safe",
   "items-end",
+  "items-end-safe",
   "items-start",
   "items-stretch",
   "justify-around",
   "justify-baseline",
   "justify-between",
   "justify-center",
+  "justify-center-safe",
   "justify-end",
+  "justify-end-safe",
   "justify-evenly",
   "justify-items-center",
+  "justify-items-center-safe",
   "justify-items-end",
+  "justify-items-end-safe",
   "justify-items-normal",
   "justify-items-start",
   "justify-items-stretch",
   "justify-normal",
   "justify-self-auto",
   "justify-self-center",
+  "justify-self-center-safe",
   "justify-self-end",
+  "justify-self-end-safe",
   "justify-self-start",
   "justify-self-stretch",
   "justify-start",
@@ -4380,35 +5891,35 @@ exports[`getClassList 1`] = `
   "leading-0.5",
   "leading-1",
   "leading-1.5",
+  "leading-2",
+  "leading-2.5",
+  "leading-3",
+  "leading-3.5",
+  "leading-4",
+  "leading-5",
+  "leading-6",
+  "leading-7",
+  "leading-8",
+  "leading-9",
   "leading-10",
   "leading-11",
   "leading-12",
   "leading-14",
   "leading-16",
-  "leading-2",
-  "leading-2.5",
   "leading-20",
   "leading-24",
   "leading-28",
-  "leading-3",
-  "leading-3.5",
   "leading-32",
   "leading-36",
-  "leading-4",
   "leading-40",
   "leading-44",
   "leading-48",
-  "leading-5",
   "leading-52",
   "leading-56",
-  "leading-6",
   "leading-60",
   "leading-64",
-  "leading-7",
   "leading-72",
-  "leading-8",
   "leading-80",
-  "leading-9",
   "leading-96",
   "leading-none",
   "leading-px",
@@ -4416,36 +5927,62 @@ exports[`getClassList 1`] = `
   "left-0.5",
   "left-1",
   "left-1.5",
+  "left-2",
+  "left-2.5",
+  "left-3",
+  "left-3.5",
+  "left-4",
+  "left-5",
+  "left-6",
+  "left-7",
+  "left-8",
+  "left-9",
   "left-10",
   "left-11",
   "left-12",
   "left-14",
   "left-16",
-  "left-2",
-  "left-2.5",
   "left-20",
   "left-24",
   "left-28",
-  "left-3",
-  "left-3.5",
   "left-32",
   "left-36",
-  "left-4",
   "left-40",
   "left-44",
   "left-48",
-  "left-5",
   "left-52",
   "left-56",
-  "left-6",
   "left-60",
   "left-64",
-  "left-7",
   "left-72",
-  "left-8",
   "left-80",
-  "left-9",
   "left-96",
+  "left-1/2",
+  "left-1/3",
+  "left-1/4",
+  "left-1/5",
+  "left-1/6",
+  "left-1/12",
+  "left-2/3",
+  "left-2/4",
+  "left-2/5",
+  "left-2/6",
+  "left-2/12",
+  "left-3/4",
+  "left-3/5",
+  "left-3/6",
+  "left-3/12",
+  "left-4/5",
+  "left-4/6",
+  "left-4/12",
+  "left-5/6",
+  "left-5/12",
+  "left-6/12",
+  "left-7/12",
+  "left-8/12",
+  "left-9/12",
+  "left-10/12",
+  "left-11/12",
   "left-auto",
   "left-full",
   "left-px",
@@ -4470,77 +6007,2480 @@ exports[`getClassList 1`] = `
   "m-0.5",
   "m-1",
   "m-1.5",
+  "m-2",
+  "m-2.5",
+  "m-3",
+  "m-3.5",
+  "m-4",
+  "m-5",
+  "m-6",
+  "m-7",
+  "m-8",
+  "m-9",
   "m-10",
   "m-11",
   "m-12",
   "m-14",
   "m-16",
-  "m-2",
-  "m-2.5",
   "m-20",
   "m-24",
   "m-28",
-  "m-3",
-  "m-3.5",
   "m-32",
   "m-36",
-  "m-4",
   "m-40",
   "m-44",
   "m-48",
-  "m-5",
   "m-52",
   "m-56",
-  "m-6",
   "m-60",
   "m-64",
-  "m-7",
   "m-72",
-  "m-8",
   "m-80",
-  "m-9",
   "m-96",
   "m-auto",
   "m-px",
+  "mask-add",
+  "mask-alpha",
+  "mask-auto",
+  "mask-b-from-0",
+  "mask-b-from-0%",
+  "mask-b-from-0.5",
+  "mask-b-from-1",
+  "mask-b-from-1.5",
+  "mask-b-from-2",
+  "mask-b-from-2.5",
+  "mask-b-from-3",
+  "mask-b-from-3.5",
+  "mask-b-from-4",
+  "mask-b-from-5",
+  "mask-b-from-5%",
+  "mask-b-from-6",
+  "mask-b-from-7",
+  "mask-b-from-8",
+  "mask-b-from-9",
+  "mask-b-from-10",
+  "mask-b-from-10%",
+  "mask-b-from-11",
+  "mask-b-from-12",
+  "mask-b-from-14",
+  "mask-b-from-15%",
+  "mask-b-from-16",
+  "mask-b-from-20",
+  "mask-b-from-20%",
+  "mask-b-from-24",
+  "mask-b-from-25%",
+  "mask-b-from-28",
+  "mask-b-from-30%",
+  "mask-b-from-32",
+  "mask-b-from-35%",
+  "mask-b-from-36",
+  "mask-b-from-40",
+  "mask-b-from-40%",
+  "mask-b-from-44",
+  "mask-b-from-45%",
+  "mask-b-from-48",
+  "mask-b-from-50%",
+  "mask-b-from-52",
+  "mask-b-from-55%",
+  "mask-b-from-56",
+  "mask-b-from-60",
+  "mask-b-from-60%",
+  "mask-b-from-64",
+  "mask-b-from-65%",
+  "mask-b-from-70%",
+  "mask-b-from-72",
+  "mask-b-from-75%",
+  "mask-b-from-80",
+  "mask-b-from-80%",
+  "mask-b-from-85%",
+  "mask-b-from-90%",
+  "mask-b-from-95%",
+  "mask-b-from-96",
+  "mask-b-from-100%",
+  "mask-b-from-current",
+  "mask-b-from-current/0",
+  "mask-b-from-current/5",
+  "mask-b-from-current/10",
+  "mask-b-from-current/15",
+  "mask-b-from-current/20",
+  "mask-b-from-current/25",
+  "mask-b-from-current/30",
+  "mask-b-from-current/35",
+  "mask-b-from-current/40",
+  "mask-b-from-current/45",
+  "mask-b-from-current/50",
+  "mask-b-from-current/55",
+  "mask-b-from-current/60",
+  "mask-b-from-current/65",
+  "mask-b-from-current/70",
+  "mask-b-from-current/75",
+  "mask-b-from-current/80",
+  "mask-b-from-current/85",
+  "mask-b-from-current/90",
+  "mask-b-from-current/95",
+  "mask-b-from-current/100",
+  "mask-b-from-current/background",
+  "mask-b-from-inherit",
+  "mask-b-from-inherit/0",
+  "mask-b-from-inherit/5",
+  "mask-b-from-inherit/10",
+  "mask-b-from-inherit/15",
+  "mask-b-from-inherit/20",
+  "mask-b-from-inherit/25",
+  "mask-b-from-inherit/30",
+  "mask-b-from-inherit/35",
+  "mask-b-from-inherit/40",
+  "mask-b-from-inherit/45",
+  "mask-b-from-inherit/50",
+  "mask-b-from-inherit/55",
+  "mask-b-from-inherit/60",
+  "mask-b-from-inherit/65",
+  "mask-b-from-inherit/70",
+  "mask-b-from-inherit/75",
+  "mask-b-from-inherit/80",
+  "mask-b-from-inherit/85",
+  "mask-b-from-inherit/90",
+  "mask-b-from-inherit/95",
+  "mask-b-from-inherit/100",
+  "mask-b-from-inherit/background",
+  "mask-b-from-transparent",
+  "mask-b-from-transparent/0",
+  "mask-b-from-transparent/5",
+  "mask-b-from-transparent/10",
+  "mask-b-from-transparent/15",
+  "mask-b-from-transparent/20",
+  "mask-b-from-transparent/25",
+  "mask-b-from-transparent/30",
+  "mask-b-from-transparent/35",
+  "mask-b-from-transparent/40",
+  "mask-b-from-transparent/45",
+  "mask-b-from-transparent/50",
+  "mask-b-from-transparent/55",
+  "mask-b-from-transparent/60",
+  "mask-b-from-transparent/65",
+  "mask-b-from-transparent/70",
+  "mask-b-from-transparent/75",
+  "mask-b-from-transparent/80",
+  "mask-b-from-transparent/85",
+  "mask-b-from-transparent/90",
+  "mask-b-from-transparent/95",
+  "mask-b-from-transparent/100",
+  "mask-b-from-transparent/background",
+  "mask-b-to-0",
+  "mask-b-to-0%",
+  "mask-b-to-0.5",
+  "mask-b-to-1",
+  "mask-b-to-1.5",
+  "mask-b-to-2",
+  "mask-b-to-2.5",
+  "mask-b-to-3",
+  "mask-b-to-3.5",
+  "mask-b-to-4",
+  "mask-b-to-5",
+  "mask-b-to-5%",
+  "mask-b-to-6",
+  "mask-b-to-7",
+  "mask-b-to-8",
+  "mask-b-to-9",
+  "mask-b-to-10",
+  "mask-b-to-10%",
+  "mask-b-to-11",
+  "mask-b-to-12",
+  "mask-b-to-14",
+  "mask-b-to-15%",
+  "mask-b-to-16",
+  "mask-b-to-20",
+  "mask-b-to-20%",
+  "mask-b-to-24",
+  "mask-b-to-25%",
+  "mask-b-to-28",
+  "mask-b-to-30%",
+  "mask-b-to-32",
+  "mask-b-to-35%",
+  "mask-b-to-36",
+  "mask-b-to-40",
+  "mask-b-to-40%",
+  "mask-b-to-44",
+  "mask-b-to-45%",
+  "mask-b-to-48",
+  "mask-b-to-50%",
+  "mask-b-to-52",
+  "mask-b-to-55%",
+  "mask-b-to-56",
+  "mask-b-to-60",
+  "mask-b-to-60%",
+  "mask-b-to-64",
+  "mask-b-to-65%",
+  "mask-b-to-70%",
+  "mask-b-to-72",
+  "mask-b-to-75%",
+  "mask-b-to-80",
+  "mask-b-to-80%",
+  "mask-b-to-85%",
+  "mask-b-to-90%",
+  "mask-b-to-95%",
+  "mask-b-to-96",
+  "mask-b-to-100%",
+  "mask-b-to-current",
+  "mask-b-to-current/0",
+  "mask-b-to-current/5",
+  "mask-b-to-current/10",
+  "mask-b-to-current/15",
+  "mask-b-to-current/20",
+  "mask-b-to-current/25",
+  "mask-b-to-current/30",
+  "mask-b-to-current/35",
+  "mask-b-to-current/40",
+  "mask-b-to-current/45",
+  "mask-b-to-current/50",
+  "mask-b-to-current/55",
+  "mask-b-to-current/60",
+  "mask-b-to-current/65",
+  "mask-b-to-current/70",
+  "mask-b-to-current/75",
+  "mask-b-to-current/80",
+  "mask-b-to-current/85",
+  "mask-b-to-current/90",
+  "mask-b-to-current/95",
+  "mask-b-to-current/100",
+  "mask-b-to-current/background",
+  "mask-b-to-inherit",
+  "mask-b-to-inherit/0",
+  "mask-b-to-inherit/5",
+  "mask-b-to-inherit/10",
+  "mask-b-to-inherit/15",
+  "mask-b-to-inherit/20",
+  "mask-b-to-inherit/25",
+  "mask-b-to-inherit/30",
+  "mask-b-to-inherit/35",
+  "mask-b-to-inherit/40",
+  "mask-b-to-inherit/45",
+  "mask-b-to-inherit/50",
+  "mask-b-to-inherit/55",
+  "mask-b-to-inherit/60",
+  "mask-b-to-inherit/65",
+  "mask-b-to-inherit/70",
+  "mask-b-to-inherit/75",
+  "mask-b-to-inherit/80",
+  "mask-b-to-inherit/85",
+  "mask-b-to-inherit/90",
+  "mask-b-to-inherit/95",
+  "mask-b-to-inherit/100",
+  "mask-b-to-inherit/background",
+  "mask-b-to-transparent",
+  "mask-b-to-transparent/0",
+  "mask-b-to-transparent/5",
+  "mask-b-to-transparent/10",
+  "mask-b-to-transparent/15",
+  "mask-b-to-transparent/20",
+  "mask-b-to-transparent/25",
+  "mask-b-to-transparent/30",
+  "mask-b-to-transparent/35",
+  "mask-b-to-transparent/40",
+  "mask-b-to-transparent/45",
+  "mask-b-to-transparent/50",
+  "mask-b-to-transparent/55",
+  "mask-b-to-transparent/60",
+  "mask-b-to-transparent/65",
+  "mask-b-to-transparent/70",
+  "mask-b-to-transparent/75",
+  "mask-b-to-transparent/80",
+  "mask-b-to-transparent/85",
+  "mask-b-to-transparent/90",
+  "mask-b-to-transparent/95",
+  "mask-b-to-transparent/100",
+  "mask-b-to-transparent/background",
+  "mask-bottom",
+  "mask-bottom-left",
+  "mask-bottom-right",
+  "mask-center",
+  "mask-circle",
+  "mask-clip-border",
+  "mask-clip-content",
+  "mask-clip-fill",
+  "mask-clip-padding",
+  "mask-clip-stroke",
+  "mask-clip-view",
+  "mask-conic-0",
+  "mask-conic-1",
+  "mask-conic-2",
+  "mask-conic-3",
+  "mask-conic-6",
+  "mask-conic-12",
+  "mask-conic-45",
+  "mask-conic-90",
+  "mask-conic-180",
+  "mask-conic-from-0",
+  "mask-conic-from-0%",
+  "mask-conic-from-0.5",
+  "mask-conic-from-1",
+  "mask-conic-from-1.5",
+  "mask-conic-from-2",
+  "mask-conic-from-2.5",
+  "mask-conic-from-3",
+  "mask-conic-from-3.5",
+  "mask-conic-from-4",
+  "mask-conic-from-5",
+  "mask-conic-from-5%",
+  "mask-conic-from-6",
+  "mask-conic-from-7",
+  "mask-conic-from-8",
+  "mask-conic-from-9",
+  "mask-conic-from-10",
+  "mask-conic-from-10%",
+  "mask-conic-from-11",
+  "mask-conic-from-12",
+  "mask-conic-from-14",
+  "mask-conic-from-15%",
+  "mask-conic-from-16",
+  "mask-conic-from-20",
+  "mask-conic-from-20%",
+  "mask-conic-from-24",
+  "mask-conic-from-25%",
+  "mask-conic-from-28",
+  "mask-conic-from-30%",
+  "mask-conic-from-32",
+  "mask-conic-from-35%",
+  "mask-conic-from-36",
+  "mask-conic-from-40",
+  "mask-conic-from-40%",
+  "mask-conic-from-44",
+  "mask-conic-from-45%",
+  "mask-conic-from-48",
+  "mask-conic-from-50%",
+  "mask-conic-from-52",
+  "mask-conic-from-55%",
+  "mask-conic-from-56",
+  "mask-conic-from-60",
+  "mask-conic-from-60%",
+  "mask-conic-from-64",
+  "mask-conic-from-65%",
+  "mask-conic-from-70%",
+  "mask-conic-from-72",
+  "mask-conic-from-75%",
+  "mask-conic-from-80",
+  "mask-conic-from-80%",
+  "mask-conic-from-85%",
+  "mask-conic-from-90%",
+  "mask-conic-from-95%",
+  "mask-conic-from-96",
+  "mask-conic-from-100%",
+  "mask-conic-from-current",
+  "mask-conic-from-current/0",
+  "mask-conic-from-current/5",
+  "mask-conic-from-current/10",
+  "mask-conic-from-current/15",
+  "mask-conic-from-current/20",
+  "mask-conic-from-current/25",
+  "mask-conic-from-current/30",
+  "mask-conic-from-current/35",
+  "mask-conic-from-current/40",
+  "mask-conic-from-current/45",
+  "mask-conic-from-current/50",
+  "mask-conic-from-current/55",
+  "mask-conic-from-current/60",
+  "mask-conic-from-current/65",
+  "mask-conic-from-current/70",
+  "mask-conic-from-current/75",
+  "mask-conic-from-current/80",
+  "mask-conic-from-current/85",
+  "mask-conic-from-current/90",
+  "mask-conic-from-current/95",
+  "mask-conic-from-current/100",
+  "mask-conic-from-current/background",
+  "mask-conic-from-inherit",
+  "mask-conic-from-inherit/0",
+  "mask-conic-from-inherit/5",
+  "mask-conic-from-inherit/10",
+  "mask-conic-from-inherit/15",
+  "mask-conic-from-inherit/20",
+  "mask-conic-from-inherit/25",
+  "mask-conic-from-inherit/30",
+  "mask-conic-from-inherit/35",
+  "mask-conic-from-inherit/40",
+  "mask-conic-from-inherit/45",
+  "mask-conic-from-inherit/50",
+  "mask-conic-from-inherit/55",
+  "mask-conic-from-inherit/60",
+  "mask-conic-from-inherit/65",
+  "mask-conic-from-inherit/70",
+  "mask-conic-from-inherit/75",
+  "mask-conic-from-inherit/80",
+  "mask-conic-from-inherit/85",
+  "mask-conic-from-inherit/90",
+  "mask-conic-from-inherit/95",
+  "mask-conic-from-inherit/100",
+  "mask-conic-from-inherit/background",
+  "mask-conic-from-transparent",
+  "mask-conic-from-transparent/0",
+  "mask-conic-from-transparent/5",
+  "mask-conic-from-transparent/10",
+  "mask-conic-from-transparent/15",
+  "mask-conic-from-transparent/20",
+  "mask-conic-from-transparent/25",
+  "mask-conic-from-transparent/30",
+  "mask-conic-from-transparent/35",
+  "mask-conic-from-transparent/40",
+  "mask-conic-from-transparent/45",
+  "mask-conic-from-transparent/50",
+  "mask-conic-from-transparent/55",
+  "mask-conic-from-transparent/60",
+  "mask-conic-from-transparent/65",
+  "mask-conic-from-transparent/70",
+  "mask-conic-from-transparent/75",
+  "mask-conic-from-transparent/80",
+  "mask-conic-from-transparent/85",
+  "mask-conic-from-transparent/90",
+  "mask-conic-from-transparent/95",
+  "mask-conic-from-transparent/100",
+  "mask-conic-from-transparent/background",
+  "mask-conic-to-0",
+  "mask-conic-to-0%",
+  "mask-conic-to-0.5",
+  "mask-conic-to-1",
+  "mask-conic-to-1.5",
+  "mask-conic-to-2",
+  "mask-conic-to-2.5",
+  "mask-conic-to-3",
+  "mask-conic-to-3.5",
+  "mask-conic-to-4",
+  "mask-conic-to-5",
+  "mask-conic-to-5%",
+  "mask-conic-to-6",
+  "mask-conic-to-7",
+  "mask-conic-to-8",
+  "mask-conic-to-9",
+  "mask-conic-to-10",
+  "mask-conic-to-10%",
+  "mask-conic-to-11",
+  "mask-conic-to-12",
+  "mask-conic-to-14",
+  "mask-conic-to-15%",
+  "mask-conic-to-16",
+  "mask-conic-to-20",
+  "mask-conic-to-20%",
+  "mask-conic-to-24",
+  "mask-conic-to-25%",
+  "mask-conic-to-28",
+  "mask-conic-to-30%",
+  "mask-conic-to-32",
+  "mask-conic-to-35%",
+  "mask-conic-to-36",
+  "mask-conic-to-40",
+  "mask-conic-to-40%",
+  "mask-conic-to-44",
+  "mask-conic-to-45%",
+  "mask-conic-to-48",
+  "mask-conic-to-50%",
+  "mask-conic-to-52",
+  "mask-conic-to-55%",
+  "mask-conic-to-56",
+  "mask-conic-to-60",
+  "mask-conic-to-60%",
+  "mask-conic-to-64",
+  "mask-conic-to-65%",
+  "mask-conic-to-70%",
+  "mask-conic-to-72",
+  "mask-conic-to-75%",
+  "mask-conic-to-80",
+  "mask-conic-to-80%",
+  "mask-conic-to-85%",
+  "mask-conic-to-90%",
+  "mask-conic-to-95%",
+  "mask-conic-to-96",
+  "mask-conic-to-100%",
+  "mask-conic-to-current",
+  "mask-conic-to-current/0",
+  "mask-conic-to-current/5",
+  "mask-conic-to-current/10",
+  "mask-conic-to-current/15",
+  "mask-conic-to-current/20",
+  "mask-conic-to-current/25",
+  "mask-conic-to-current/30",
+  "mask-conic-to-current/35",
+  "mask-conic-to-current/40",
+  "mask-conic-to-current/45",
+  "mask-conic-to-current/50",
+  "mask-conic-to-current/55",
+  "mask-conic-to-current/60",
+  "mask-conic-to-current/65",
+  "mask-conic-to-current/70",
+  "mask-conic-to-current/75",
+  "mask-conic-to-current/80",
+  "mask-conic-to-current/85",
+  "mask-conic-to-current/90",
+  "mask-conic-to-current/95",
+  "mask-conic-to-current/100",
+  "mask-conic-to-current/background",
+  "mask-conic-to-inherit",
+  "mask-conic-to-inherit/0",
+  "mask-conic-to-inherit/5",
+  "mask-conic-to-inherit/10",
+  "mask-conic-to-inherit/15",
+  "mask-conic-to-inherit/20",
+  "mask-conic-to-inherit/25",
+  "mask-conic-to-inherit/30",
+  "mask-conic-to-inherit/35",
+  "mask-conic-to-inherit/40",
+  "mask-conic-to-inherit/45",
+  "mask-conic-to-inherit/50",
+  "mask-conic-to-inherit/55",
+  "mask-conic-to-inherit/60",
+  "mask-conic-to-inherit/65",
+  "mask-conic-to-inherit/70",
+  "mask-conic-to-inherit/75",
+  "mask-conic-to-inherit/80",
+  "mask-conic-to-inherit/85",
+  "mask-conic-to-inherit/90",
+  "mask-conic-to-inherit/95",
+  "mask-conic-to-inherit/100",
+  "mask-conic-to-inherit/background",
+  "mask-conic-to-transparent",
+  "mask-conic-to-transparent/0",
+  "mask-conic-to-transparent/5",
+  "mask-conic-to-transparent/10",
+  "mask-conic-to-transparent/15",
+  "mask-conic-to-transparent/20",
+  "mask-conic-to-transparent/25",
+  "mask-conic-to-transparent/30",
+  "mask-conic-to-transparent/35",
+  "mask-conic-to-transparent/40",
+  "mask-conic-to-transparent/45",
+  "mask-conic-to-transparent/50",
+  "mask-conic-to-transparent/55",
+  "mask-conic-to-transparent/60",
+  "mask-conic-to-transparent/65",
+  "mask-conic-to-transparent/70",
+  "mask-conic-to-transparent/75",
+  "mask-conic-to-transparent/80",
+  "mask-conic-to-transparent/85",
+  "mask-conic-to-transparent/90",
+  "mask-conic-to-transparent/95",
+  "mask-conic-to-transparent/100",
+  "mask-conic-to-transparent/background",
+  "mask-contain",
+  "mask-cover",
+  "mask-ellipse",
+  "mask-exclude",
+  "mask-intersect",
+  "mask-l-from-0",
+  "mask-l-from-0%",
+  "mask-l-from-0.5",
+  "mask-l-from-1",
+  "mask-l-from-1.5",
+  "mask-l-from-2",
+  "mask-l-from-2.5",
+  "mask-l-from-3",
+  "mask-l-from-3.5",
+  "mask-l-from-4",
+  "mask-l-from-5",
+  "mask-l-from-5%",
+  "mask-l-from-6",
+  "mask-l-from-7",
+  "mask-l-from-8",
+  "mask-l-from-9",
+  "mask-l-from-10",
+  "mask-l-from-10%",
+  "mask-l-from-11",
+  "mask-l-from-12",
+  "mask-l-from-14",
+  "mask-l-from-15%",
+  "mask-l-from-16",
+  "mask-l-from-20",
+  "mask-l-from-20%",
+  "mask-l-from-24",
+  "mask-l-from-25%",
+  "mask-l-from-28",
+  "mask-l-from-30%",
+  "mask-l-from-32",
+  "mask-l-from-35%",
+  "mask-l-from-36",
+  "mask-l-from-40",
+  "mask-l-from-40%",
+  "mask-l-from-44",
+  "mask-l-from-45%",
+  "mask-l-from-48",
+  "mask-l-from-50%",
+  "mask-l-from-52",
+  "mask-l-from-55%",
+  "mask-l-from-56",
+  "mask-l-from-60",
+  "mask-l-from-60%",
+  "mask-l-from-64",
+  "mask-l-from-65%",
+  "mask-l-from-70%",
+  "mask-l-from-72",
+  "mask-l-from-75%",
+  "mask-l-from-80",
+  "mask-l-from-80%",
+  "mask-l-from-85%",
+  "mask-l-from-90%",
+  "mask-l-from-95%",
+  "mask-l-from-96",
+  "mask-l-from-100%",
+  "mask-l-from-current",
+  "mask-l-from-current/0",
+  "mask-l-from-current/5",
+  "mask-l-from-current/10",
+  "mask-l-from-current/15",
+  "mask-l-from-current/20",
+  "mask-l-from-current/25",
+  "mask-l-from-current/30",
+  "mask-l-from-current/35",
+  "mask-l-from-current/40",
+  "mask-l-from-current/45",
+  "mask-l-from-current/50",
+  "mask-l-from-current/55",
+  "mask-l-from-current/60",
+  "mask-l-from-current/65",
+  "mask-l-from-current/70",
+  "mask-l-from-current/75",
+  "mask-l-from-current/80",
+  "mask-l-from-current/85",
+  "mask-l-from-current/90",
+  "mask-l-from-current/95",
+  "mask-l-from-current/100",
+  "mask-l-from-current/background",
+  "mask-l-from-inherit",
+  "mask-l-from-inherit/0",
+  "mask-l-from-inherit/5",
+  "mask-l-from-inherit/10",
+  "mask-l-from-inherit/15",
+  "mask-l-from-inherit/20",
+  "mask-l-from-inherit/25",
+  "mask-l-from-inherit/30",
+  "mask-l-from-inherit/35",
+  "mask-l-from-inherit/40",
+  "mask-l-from-inherit/45",
+  "mask-l-from-inherit/50",
+  "mask-l-from-inherit/55",
+  "mask-l-from-inherit/60",
+  "mask-l-from-inherit/65",
+  "mask-l-from-inherit/70",
+  "mask-l-from-inherit/75",
+  "mask-l-from-inherit/80",
+  "mask-l-from-inherit/85",
+  "mask-l-from-inherit/90",
+  "mask-l-from-inherit/95",
+  "mask-l-from-inherit/100",
+  "mask-l-from-inherit/background",
+  "mask-l-from-transparent",
+  "mask-l-from-transparent/0",
+  "mask-l-from-transparent/5",
+  "mask-l-from-transparent/10",
+  "mask-l-from-transparent/15",
+  "mask-l-from-transparent/20",
+  "mask-l-from-transparent/25",
+  "mask-l-from-transparent/30",
+  "mask-l-from-transparent/35",
+  "mask-l-from-transparent/40",
+  "mask-l-from-transparent/45",
+  "mask-l-from-transparent/50",
+  "mask-l-from-transparent/55",
+  "mask-l-from-transparent/60",
+  "mask-l-from-transparent/65",
+  "mask-l-from-transparent/70",
+  "mask-l-from-transparent/75",
+  "mask-l-from-transparent/80",
+  "mask-l-from-transparent/85",
+  "mask-l-from-transparent/90",
+  "mask-l-from-transparent/95",
+  "mask-l-from-transparent/100",
+  "mask-l-from-transparent/background",
+  "mask-l-to-0",
+  "mask-l-to-0%",
+  "mask-l-to-0.5",
+  "mask-l-to-1",
+  "mask-l-to-1.5",
+  "mask-l-to-2",
+  "mask-l-to-2.5",
+  "mask-l-to-3",
+  "mask-l-to-3.5",
+  "mask-l-to-4",
+  "mask-l-to-5",
+  "mask-l-to-5%",
+  "mask-l-to-6",
+  "mask-l-to-7",
+  "mask-l-to-8",
+  "mask-l-to-9",
+  "mask-l-to-10",
+  "mask-l-to-10%",
+  "mask-l-to-11",
+  "mask-l-to-12",
+  "mask-l-to-14",
+  "mask-l-to-15%",
+  "mask-l-to-16",
+  "mask-l-to-20",
+  "mask-l-to-20%",
+  "mask-l-to-24",
+  "mask-l-to-25%",
+  "mask-l-to-28",
+  "mask-l-to-30%",
+  "mask-l-to-32",
+  "mask-l-to-35%",
+  "mask-l-to-36",
+  "mask-l-to-40",
+  "mask-l-to-40%",
+  "mask-l-to-44",
+  "mask-l-to-45%",
+  "mask-l-to-48",
+  "mask-l-to-50%",
+  "mask-l-to-52",
+  "mask-l-to-55%",
+  "mask-l-to-56",
+  "mask-l-to-60",
+  "mask-l-to-60%",
+  "mask-l-to-64",
+  "mask-l-to-65%",
+  "mask-l-to-70%",
+  "mask-l-to-72",
+  "mask-l-to-75%",
+  "mask-l-to-80",
+  "mask-l-to-80%",
+  "mask-l-to-85%",
+  "mask-l-to-90%",
+  "mask-l-to-95%",
+  "mask-l-to-96",
+  "mask-l-to-100%",
+  "mask-l-to-current",
+  "mask-l-to-current/0",
+  "mask-l-to-current/5",
+  "mask-l-to-current/10",
+  "mask-l-to-current/15",
+  "mask-l-to-current/20",
+  "mask-l-to-current/25",
+  "mask-l-to-current/30",
+  "mask-l-to-current/35",
+  "mask-l-to-current/40",
+  "mask-l-to-current/45",
+  "mask-l-to-current/50",
+  "mask-l-to-current/55",
+  "mask-l-to-current/60",
+  "mask-l-to-current/65",
+  "mask-l-to-current/70",
+  "mask-l-to-current/75",
+  "mask-l-to-current/80",
+  "mask-l-to-current/85",
+  "mask-l-to-current/90",
+  "mask-l-to-current/95",
+  "mask-l-to-current/100",
+  "mask-l-to-current/background",
+  "mask-l-to-inherit",
+  "mask-l-to-inherit/0",
+  "mask-l-to-inherit/5",
+  "mask-l-to-inherit/10",
+  "mask-l-to-inherit/15",
+  "mask-l-to-inherit/20",
+  "mask-l-to-inherit/25",
+  "mask-l-to-inherit/30",
+  "mask-l-to-inherit/35",
+  "mask-l-to-inherit/40",
+  "mask-l-to-inherit/45",
+  "mask-l-to-inherit/50",
+  "mask-l-to-inherit/55",
+  "mask-l-to-inherit/60",
+  "mask-l-to-inherit/65",
+  "mask-l-to-inherit/70",
+  "mask-l-to-inherit/75",
+  "mask-l-to-inherit/80",
+  "mask-l-to-inherit/85",
+  "mask-l-to-inherit/90",
+  "mask-l-to-inherit/95",
+  "mask-l-to-inherit/100",
+  "mask-l-to-inherit/background",
+  "mask-l-to-transparent",
+  "mask-l-to-transparent/0",
+  "mask-l-to-transparent/5",
+  "mask-l-to-transparent/10",
+  "mask-l-to-transparent/15",
+  "mask-l-to-transparent/20",
+  "mask-l-to-transparent/25",
+  "mask-l-to-transparent/30",
+  "mask-l-to-transparent/35",
+  "mask-l-to-transparent/40",
+  "mask-l-to-transparent/45",
+  "mask-l-to-transparent/50",
+  "mask-l-to-transparent/55",
+  "mask-l-to-transparent/60",
+  "mask-l-to-transparent/65",
+  "mask-l-to-transparent/70",
+  "mask-l-to-transparent/75",
+  "mask-l-to-transparent/80",
+  "mask-l-to-transparent/85",
+  "mask-l-to-transparent/90",
+  "mask-l-to-transparent/95",
+  "mask-l-to-transparent/100",
+  "mask-l-to-transparent/background",
+  "mask-left",
+  "mask-linear-0",
+  "mask-linear-1",
+  "mask-linear-2",
+  "mask-linear-3",
+  "mask-linear-6",
+  "mask-linear-12",
+  "mask-linear-45",
+  "mask-linear-90",
+  "mask-linear-180",
+  "mask-linear-from-0",
+  "mask-linear-from-0%",
+  "mask-linear-from-0.5",
+  "mask-linear-from-1",
+  "mask-linear-from-1.5",
+  "mask-linear-from-2",
+  "mask-linear-from-2.5",
+  "mask-linear-from-3",
+  "mask-linear-from-3.5",
+  "mask-linear-from-4",
+  "mask-linear-from-5",
+  "mask-linear-from-5%",
+  "mask-linear-from-6",
+  "mask-linear-from-7",
+  "mask-linear-from-8",
+  "mask-linear-from-9",
+  "mask-linear-from-10",
+  "mask-linear-from-10%",
+  "mask-linear-from-11",
+  "mask-linear-from-12",
+  "mask-linear-from-14",
+  "mask-linear-from-15%",
+  "mask-linear-from-16",
+  "mask-linear-from-20",
+  "mask-linear-from-20%",
+  "mask-linear-from-24",
+  "mask-linear-from-25%",
+  "mask-linear-from-28",
+  "mask-linear-from-30%",
+  "mask-linear-from-32",
+  "mask-linear-from-35%",
+  "mask-linear-from-36",
+  "mask-linear-from-40",
+  "mask-linear-from-40%",
+  "mask-linear-from-44",
+  "mask-linear-from-45%",
+  "mask-linear-from-48",
+  "mask-linear-from-50%",
+  "mask-linear-from-52",
+  "mask-linear-from-55%",
+  "mask-linear-from-56",
+  "mask-linear-from-60",
+  "mask-linear-from-60%",
+  "mask-linear-from-64",
+  "mask-linear-from-65%",
+  "mask-linear-from-70%",
+  "mask-linear-from-72",
+  "mask-linear-from-75%",
+  "mask-linear-from-80",
+  "mask-linear-from-80%",
+  "mask-linear-from-85%",
+  "mask-linear-from-90%",
+  "mask-linear-from-95%",
+  "mask-linear-from-96",
+  "mask-linear-from-100%",
+  "mask-linear-from-current",
+  "mask-linear-from-current/0",
+  "mask-linear-from-current/5",
+  "mask-linear-from-current/10",
+  "mask-linear-from-current/15",
+  "mask-linear-from-current/20",
+  "mask-linear-from-current/25",
+  "mask-linear-from-current/30",
+  "mask-linear-from-current/35",
+  "mask-linear-from-current/40",
+  "mask-linear-from-current/45",
+  "mask-linear-from-current/50",
+  "mask-linear-from-current/55",
+  "mask-linear-from-current/60",
+  "mask-linear-from-current/65",
+  "mask-linear-from-current/70",
+  "mask-linear-from-current/75",
+  "mask-linear-from-current/80",
+  "mask-linear-from-current/85",
+  "mask-linear-from-current/90",
+  "mask-linear-from-current/95",
+  "mask-linear-from-current/100",
+  "mask-linear-from-current/background",
+  "mask-linear-from-inherit",
+  "mask-linear-from-inherit/0",
+  "mask-linear-from-inherit/5",
+  "mask-linear-from-inherit/10",
+  "mask-linear-from-inherit/15",
+  "mask-linear-from-inherit/20",
+  "mask-linear-from-inherit/25",
+  "mask-linear-from-inherit/30",
+  "mask-linear-from-inherit/35",
+  "mask-linear-from-inherit/40",
+  "mask-linear-from-inherit/45",
+  "mask-linear-from-inherit/50",
+  "mask-linear-from-inherit/55",
+  "mask-linear-from-inherit/60",
+  "mask-linear-from-inherit/65",
+  "mask-linear-from-inherit/70",
+  "mask-linear-from-inherit/75",
+  "mask-linear-from-inherit/80",
+  "mask-linear-from-inherit/85",
+  "mask-linear-from-inherit/90",
+  "mask-linear-from-inherit/95",
+  "mask-linear-from-inherit/100",
+  "mask-linear-from-inherit/background",
+  "mask-linear-from-transparent",
+  "mask-linear-from-transparent/0",
+  "mask-linear-from-transparent/5",
+  "mask-linear-from-transparent/10",
+  "mask-linear-from-transparent/15",
+  "mask-linear-from-transparent/20",
+  "mask-linear-from-transparent/25",
+  "mask-linear-from-transparent/30",
+  "mask-linear-from-transparent/35",
+  "mask-linear-from-transparent/40",
+  "mask-linear-from-transparent/45",
+  "mask-linear-from-transparent/50",
+  "mask-linear-from-transparent/55",
+  "mask-linear-from-transparent/60",
+  "mask-linear-from-transparent/65",
+  "mask-linear-from-transparent/70",
+  "mask-linear-from-transparent/75",
+  "mask-linear-from-transparent/80",
+  "mask-linear-from-transparent/85",
+  "mask-linear-from-transparent/90",
+  "mask-linear-from-transparent/95",
+  "mask-linear-from-transparent/100",
+  "mask-linear-from-transparent/background",
+  "mask-linear-to-0",
+  "mask-linear-to-0%",
+  "mask-linear-to-0.5",
+  "mask-linear-to-1",
+  "mask-linear-to-1.5",
+  "mask-linear-to-2",
+  "mask-linear-to-2.5",
+  "mask-linear-to-3",
+  "mask-linear-to-3.5",
+  "mask-linear-to-4",
+  "mask-linear-to-5",
+  "mask-linear-to-5%",
+  "mask-linear-to-6",
+  "mask-linear-to-7",
+  "mask-linear-to-8",
+  "mask-linear-to-9",
+  "mask-linear-to-10",
+  "mask-linear-to-10%",
+  "mask-linear-to-11",
+  "mask-linear-to-12",
+  "mask-linear-to-14",
+  "mask-linear-to-15%",
+  "mask-linear-to-16",
+  "mask-linear-to-20",
+  "mask-linear-to-20%",
+  "mask-linear-to-24",
+  "mask-linear-to-25%",
+  "mask-linear-to-28",
+  "mask-linear-to-30%",
+  "mask-linear-to-32",
+  "mask-linear-to-35%",
+  "mask-linear-to-36",
+  "mask-linear-to-40",
+  "mask-linear-to-40%",
+  "mask-linear-to-44",
+  "mask-linear-to-45%",
+  "mask-linear-to-48",
+  "mask-linear-to-50%",
+  "mask-linear-to-52",
+  "mask-linear-to-55%",
+  "mask-linear-to-56",
+  "mask-linear-to-60",
+  "mask-linear-to-60%",
+  "mask-linear-to-64",
+  "mask-linear-to-65%",
+  "mask-linear-to-70%",
+  "mask-linear-to-72",
+  "mask-linear-to-75%",
+  "mask-linear-to-80",
+  "mask-linear-to-80%",
+  "mask-linear-to-85%",
+  "mask-linear-to-90%",
+  "mask-linear-to-95%",
+  "mask-linear-to-96",
+  "mask-linear-to-100%",
+  "mask-linear-to-current",
+  "mask-linear-to-current/0",
+  "mask-linear-to-current/5",
+  "mask-linear-to-current/10",
+  "mask-linear-to-current/15",
+  "mask-linear-to-current/20",
+  "mask-linear-to-current/25",
+  "mask-linear-to-current/30",
+  "mask-linear-to-current/35",
+  "mask-linear-to-current/40",
+  "mask-linear-to-current/45",
+  "mask-linear-to-current/50",
+  "mask-linear-to-current/55",
+  "mask-linear-to-current/60",
+  "mask-linear-to-current/65",
+  "mask-linear-to-current/70",
+  "mask-linear-to-current/75",
+  "mask-linear-to-current/80",
+  "mask-linear-to-current/85",
+  "mask-linear-to-current/90",
+  "mask-linear-to-current/95",
+  "mask-linear-to-current/100",
+  "mask-linear-to-current/background",
+  "mask-linear-to-inherit",
+  "mask-linear-to-inherit/0",
+  "mask-linear-to-inherit/5",
+  "mask-linear-to-inherit/10",
+  "mask-linear-to-inherit/15",
+  "mask-linear-to-inherit/20",
+  "mask-linear-to-inherit/25",
+  "mask-linear-to-inherit/30",
+  "mask-linear-to-inherit/35",
+  "mask-linear-to-inherit/40",
+  "mask-linear-to-inherit/45",
+  "mask-linear-to-inherit/50",
+  "mask-linear-to-inherit/55",
+  "mask-linear-to-inherit/60",
+  "mask-linear-to-inherit/65",
+  "mask-linear-to-inherit/70",
+  "mask-linear-to-inherit/75",
+  "mask-linear-to-inherit/80",
+  "mask-linear-to-inherit/85",
+  "mask-linear-to-inherit/90",
+  "mask-linear-to-inherit/95",
+  "mask-linear-to-inherit/100",
+  "mask-linear-to-inherit/background",
+  "mask-linear-to-transparent",
+  "mask-linear-to-transparent/0",
+  "mask-linear-to-transparent/5",
+  "mask-linear-to-transparent/10",
+  "mask-linear-to-transparent/15",
+  "mask-linear-to-transparent/20",
+  "mask-linear-to-transparent/25",
+  "mask-linear-to-transparent/30",
+  "mask-linear-to-transparent/35",
+  "mask-linear-to-transparent/40",
+  "mask-linear-to-transparent/45",
+  "mask-linear-to-transparent/50",
+  "mask-linear-to-transparent/55",
+  "mask-linear-to-transparent/60",
+  "mask-linear-to-transparent/65",
+  "mask-linear-to-transparent/70",
+  "mask-linear-to-transparent/75",
+  "mask-linear-to-transparent/80",
+  "mask-linear-to-transparent/85",
+  "mask-linear-to-transparent/90",
+  "mask-linear-to-transparent/95",
+  "mask-linear-to-transparent/100",
+  "mask-linear-to-transparent/background",
+  "mask-luminance",
+  "mask-match",
+  "mask-no-clip",
+  "mask-no-repeat",
+  "mask-none",
+  "mask-origin-border",
+  "mask-origin-content",
+  "mask-origin-fill",
+  "mask-origin-padding",
+  "mask-origin-stroke",
+  "mask-origin-view",
+  "mask-r-from-0",
+  "mask-r-from-0%",
+  "mask-r-from-0.5",
+  "mask-r-from-1",
+  "mask-r-from-1.5",
+  "mask-r-from-2",
+  "mask-r-from-2.5",
+  "mask-r-from-3",
+  "mask-r-from-3.5",
+  "mask-r-from-4",
+  "mask-r-from-5",
+  "mask-r-from-5%",
+  "mask-r-from-6",
+  "mask-r-from-7",
+  "mask-r-from-8",
+  "mask-r-from-9",
+  "mask-r-from-10",
+  "mask-r-from-10%",
+  "mask-r-from-11",
+  "mask-r-from-12",
+  "mask-r-from-14",
+  "mask-r-from-15%",
+  "mask-r-from-16",
+  "mask-r-from-20",
+  "mask-r-from-20%",
+  "mask-r-from-24",
+  "mask-r-from-25%",
+  "mask-r-from-28",
+  "mask-r-from-30%",
+  "mask-r-from-32",
+  "mask-r-from-35%",
+  "mask-r-from-36",
+  "mask-r-from-40",
+  "mask-r-from-40%",
+  "mask-r-from-44",
+  "mask-r-from-45%",
+  "mask-r-from-48",
+  "mask-r-from-50%",
+  "mask-r-from-52",
+  "mask-r-from-55%",
+  "mask-r-from-56",
+  "mask-r-from-60",
+  "mask-r-from-60%",
+  "mask-r-from-64",
+  "mask-r-from-65%",
+  "mask-r-from-70%",
+  "mask-r-from-72",
+  "mask-r-from-75%",
+  "mask-r-from-80",
+  "mask-r-from-80%",
+  "mask-r-from-85%",
+  "mask-r-from-90%",
+  "mask-r-from-95%",
+  "mask-r-from-96",
+  "mask-r-from-100%",
+  "mask-r-from-current",
+  "mask-r-from-current/0",
+  "mask-r-from-current/5",
+  "mask-r-from-current/10",
+  "mask-r-from-current/15",
+  "mask-r-from-current/20",
+  "mask-r-from-current/25",
+  "mask-r-from-current/30",
+  "mask-r-from-current/35",
+  "mask-r-from-current/40",
+  "mask-r-from-current/45",
+  "mask-r-from-current/50",
+  "mask-r-from-current/55",
+  "mask-r-from-current/60",
+  "mask-r-from-current/65",
+  "mask-r-from-current/70",
+  "mask-r-from-current/75",
+  "mask-r-from-current/80",
+  "mask-r-from-current/85",
+  "mask-r-from-current/90",
+  "mask-r-from-current/95",
+  "mask-r-from-current/100",
+  "mask-r-from-current/background",
+  "mask-r-from-inherit",
+  "mask-r-from-inherit/0",
+  "mask-r-from-inherit/5",
+  "mask-r-from-inherit/10",
+  "mask-r-from-inherit/15",
+  "mask-r-from-inherit/20",
+  "mask-r-from-inherit/25",
+  "mask-r-from-inherit/30",
+  "mask-r-from-inherit/35",
+  "mask-r-from-inherit/40",
+  "mask-r-from-inherit/45",
+  "mask-r-from-inherit/50",
+  "mask-r-from-inherit/55",
+  "mask-r-from-inherit/60",
+  "mask-r-from-inherit/65",
+  "mask-r-from-inherit/70",
+  "mask-r-from-inherit/75",
+  "mask-r-from-inherit/80",
+  "mask-r-from-inherit/85",
+  "mask-r-from-inherit/90",
+  "mask-r-from-inherit/95",
+  "mask-r-from-inherit/100",
+  "mask-r-from-inherit/background",
+  "mask-r-from-transparent",
+  "mask-r-from-transparent/0",
+  "mask-r-from-transparent/5",
+  "mask-r-from-transparent/10",
+  "mask-r-from-transparent/15",
+  "mask-r-from-transparent/20",
+  "mask-r-from-transparent/25",
+  "mask-r-from-transparent/30",
+  "mask-r-from-transparent/35",
+  "mask-r-from-transparent/40",
+  "mask-r-from-transparent/45",
+  "mask-r-from-transparent/50",
+  "mask-r-from-transparent/55",
+  "mask-r-from-transparent/60",
+  "mask-r-from-transparent/65",
+  "mask-r-from-transparent/70",
+  "mask-r-from-transparent/75",
+  "mask-r-from-transparent/80",
+  "mask-r-from-transparent/85",
+  "mask-r-from-transparent/90",
+  "mask-r-from-transparent/95",
+  "mask-r-from-transparent/100",
+  "mask-r-from-transparent/background",
+  "mask-r-to-0",
+  "mask-r-to-0%",
+  "mask-r-to-0.5",
+  "mask-r-to-1",
+  "mask-r-to-1.5",
+  "mask-r-to-2",
+  "mask-r-to-2.5",
+  "mask-r-to-3",
+  "mask-r-to-3.5",
+  "mask-r-to-4",
+  "mask-r-to-5",
+  "mask-r-to-5%",
+  "mask-r-to-6",
+  "mask-r-to-7",
+  "mask-r-to-8",
+  "mask-r-to-9",
+  "mask-r-to-10",
+  "mask-r-to-10%",
+  "mask-r-to-11",
+  "mask-r-to-12",
+  "mask-r-to-14",
+  "mask-r-to-15%",
+  "mask-r-to-16",
+  "mask-r-to-20",
+  "mask-r-to-20%",
+  "mask-r-to-24",
+  "mask-r-to-25%",
+  "mask-r-to-28",
+  "mask-r-to-30%",
+  "mask-r-to-32",
+  "mask-r-to-35%",
+  "mask-r-to-36",
+  "mask-r-to-40",
+  "mask-r-to-40%",
+  "mask-r-to-44",
+  "mask-r-to-45%",
+  "mask-r-to-48",
+  "mask-r-to-50%",
+  "mask-r-to-52",
+  "mask-r-to-55%",
+  "mask-r-to-56",
+  "mask-r-to-60",
+  "mask-r-to-60%",
+  "mask-r-to-64",
+  "mask-r-to-65%",
+  "mask-r-to-70%",
+  "mask-r-to-72",
+  "mask-r-to-75%",
+  "mask-r-to-80",
+  "mask-r-to-80%",
+  "mask-r-to-85%",
+  "mask-r-to-90%",
+  "mask-r-to-95%",
+  "mask-r-to-96",
+  "mask-r-to-100%",
+  "mask-r-to-current",
+  "mask-r-to-current/0",
+  "mask-r-to-current/5",
+  "mask-r-to-current/10",
+  "mask-r-to-current/15",
+  "mask-r-to-current/20",
+  "mask-r-to-current/25",
+  "mask-r-to-current/30",
+  "mask-r-to-current/35",
+  "mask-r-to-current/40",
+  "mask-r-to-current/45",
+  "mask-r-to-current/50",
+  "mask-r-to-current/55",
+  "mask-r-to-current/60",
+  "mask-r-to-current/65",
+  "mask-r-to-current/70",
+  "mask-r-to-current/75",
+  "mask-r-to-current/80",
+  "mask-r-to-current/85",
+  "mask-r-to-current/90",
+  "mask-r-to-current/95",
+  "mask-r-to-current/100",
+  "mask-r-to-current/background",
+  "mask-r-to-inherit",
+  "mask-r-to-inherit/0",
+  "mask-r-to-inherit/5",
+  "mask-r-to-inherit/10",
+  "mask-r-to-inherit/15",
+  "mask-r-to-inherit/20",
+  "mask-r-to-inherit/25",
+  "mask-r-to-inherit/30",
+  "mask-r-to-inherit/35",
+  "mask-r-to-inherit/40",
+  "mask-r-to-inherit/45",
+  "mask-r-to-inherit/50",
+  "mask-r-to-inherit/55",
+  "mask-r-to-inherit/60",
+  "mask-r-to-inherit/65",
+  "mask-r-to-inherit/70",
+  "mask-r-to-inherit/75",
+  "mask-r-to-inherit/80",
+  "mask-r-to-inherit/85",
+  "mask-r-to-inherit/90",
+  "mask-r-to-inherit/95",
+  "mask-r-to-inherit/100",
+  "mask-r-to-inherit/background",
+  "mask-r-to-transparent",
+  "mask-r-to-transparent/0",
+  "mask-r-to-transparent/5",
+  "mask-r-to-transparent/10",
+  "mask-r-to-transparent/15",
+  "mask-r-to-transparent/20",
+  "mask-r-to-transparent/25",
+  "mask-r-to-transparent/30",
+  "mask-r-to-transparent/35",
+  "mask-r-to-transparent/40",
+  "mask-r-to-transparent/45",
+  "mask-r-to-transparent/50",
+  "mask-r-to-transparent/55",
+  "mask-r-to-transparent/60",
+  "mask-r-to-transparent/65",
+  "mask-r-to-transparent/70",
+  "mask-r-to-transparent/75",
+  "mask-r-to-transparent/80",
+  "mask-r-to-transparent/85",
+  "mask-r-to-transparent/90",
+  "mask-r-to-transparent/95",
+  "mask-r-to-transparent/100",
+  "mask-r-to-transparent/background",
+  "mask-radial-at-bottom",
+  "mask-radial-at-bottom-left",
+  "mask-radial-at-bottom-right",
+  "mask-radial-at-center",
+  "mask-radial-at-left",
+  "mask-radial-at-right",
+  "mask-radial-at-top",
+  "mask-radial-at-top-left",
+  "mask-radial-at-top-right",
+  "mask-radial-closest-corner",
+  "mask-radial-closest-side",
+  "mask-radial-farthest-corner",
+  "mask-radial-farthest-side",
+  "mask-radial-from-0",
+  "mask-radial-from-0%",
+  "mask-radial-from-0.5",
+  "mask-radial-from-1",
+  "mask-radial-from-1.5",
+  "mask-radial-from-2",
+  "mask-radial-from-2.5",
+  "mask-radial-from-3",
+  "mask-radial-from-3.5",
+  "mask-radial-from-4",
+  "mask-radial-from-5",
+  "mask-radial-from-5%",
+  "mask-radial-from-6",
+  "mask-radial-from-7",
+  "mask-radial-from-8",
+  "mask-radial-from-9",
+  "mask-radial-from-10",
+  "mask-radial-from-10%",
+  "mask-radial-from-11",
+  "mask-radial-from-12",
+  "mask-radial-from-14",
+  "mask-radial-from-15%",
+  "mask-radial-from-16",
+  "mask-radial-from-20",
+  "mask-radial-from-20%",
+  "mask-radial-from-24",
+  "mask-radial-from-25%",
+  "mask-radial-from-28",
+  "mask-radial-from-30%",
+  "mask-radial-from-32",
+  "mask-radial-from-35%",
+  "mask-radial-from-36",
+  "mask-radial-from-40",
+  "mask-radial-from-40%",
+  "mask-radial-from-44",
+  "mask-radial-from-45%",
+  "mask-radial-from-48",
+  "mask-radial-from-50%",
+  "mask-radial-from-52",
+  "mask-radial-from-55%",
+  "mask-radial-from-56",
+  "mask-radial-from-60",
+  "mask-radial-from-60%",
+  "mask-radial-from-64",
+  "mask-radial-from-65%",
+  "mask-radial-from-70%",
+  "mask-radial-from-72",
+  "mask-radial-from-75%",
+  "mask-radial-from-80",
+  "mask-radial-from-80%",
+  "mask-radial-from-85%",
+  "mask-radial-from-90%",
+  "mask-radial-from-95%",
+  "mask-radial-from-96",
+  "mask-radial-from-100%",
+  "mask-radial-from-current",
+  "mask-radial-from-current/0",
+  "mask-radial-from-current/5",
+  "mask-radial-from-current/10",
+  "mask-radial-from-current/15",
+  "mask-radial-from-current/20",
+  "mask-radial-from-current/25",
+  "mask-radial-from-current/30",
+  "mask-radial-from-current/35",
+  "mask-radial-from-current/40",
+  "mask-radial-from-current/45",
+  "mask-radial-from-current/50",
+  "mask-radial-from-current/55",
+  "mask-radial-from-current/60",
+  "mask-radial-from-current/65",
+  "mask-radial-from-current/70",
+  "mask-radial-from-current/75",
+  "mask-radial-from-current/80",
+  "mask-radial-from-current/85",
+  "mask-radial-from-current/90",
+  "mask-radial-from-current/95",
+  "mask-radial-from-current/100",
+  "mask-radial-from-current/background",
+  "mask-radial-from-inherit",
+  "mask-radial-from-inherit/0",
+  "mask-radial-from-inherit/5",
+  "mask-radial-from-inherit/10",
+  "mask-radial-from-inherit/15",
+  "mask-radial-from-inherit/20",
+  "mask-radial-from-inherit/25",
+  "mask-radial-from-inherit/30",
+  "mask-radial-from-inherit/35",
+  "mask-radial-from-inherit/40",
+  "mask-radial-from-inherit/45",
+  "mask-radial-from-inherit/50",
+  "mask-radial-from-inherit/55",
+  "mask-radial-from-inherit/60",
+  "mask-radial-from-inherit/65",
+  "mask-radial-from-inherit/70",
+  "mask-radial-from-inherit/75",
+  "mask-radial-from-inherit/80",
+  "mask-radial-from-inherit/85",
+  "mask-radial-from-inherit/90",
+  "mask-radial-from-inherit/95",
+  "mask-radial-from-inherit/100",
+  "mask-radial-from-inherit/background",
+  "mask-radial-from-transparent",
+  "mask-radial-from-transparent/0",
+  "mask-radial-from-transparent/5",
+  "mask-radial-from-transparent/10",
+  "mask-radial-from-transparent/15",
+  "mask-radial-from-transparent/20",
+  "mask-radial-from-transparent/25",
+  "mask-radial-from-transparent/30",
+  "mask-radial-from-transparent/35",
+  "mask-radial-from-transparent/40",
+  "mask-radial-from-transparent/45",
+  "mask-radial-from-transparent/50",
+  "mask-radial-from-transparent/55",
+  "mask-radial-from-transparent/60",
+  "mask-radial-from-transparent/65",
+  "mask-radial-from-transparent/70",
+  "mask-radial-from-transparent/75",
+  "mask-radial-from-transparent/80",
+  "mask-radial-from-transparent/85",
+  "mask-radial-from-transparent/90",
+  "mask-radial-from-transparent/95",
+  "mask-radial-from-transparent/100",
+  "mask-radial-from-transparent/background",
+  "mask-radial-to-0",
+  "mask-radial-to-0%",
+  "mask-radial-to-0.5",
+  "mask-radial-to-1",
+  "mask-radial-to-1.5",
+  "mask-radial-to-2",
+  "mask-radial-to-2.5",
+  "mask-radial-to-3",
+  "mask-radial-to-3.5",
+  "mask-radial-to-4",
+  "mask-radial-to-5",
+  "mask-radial-to-5%",
+  "mask-radial-to-6",
+  "mask-radial-to-7",
+  "mask-radial-to-8",
+  "mask-radial-to-9",
+  "mask-radial-to-10",
+  "mask-radial-to-10%",
+  "mask-radial-to-11",
+  "mask-radial-to-12",
+  "mask-radial-to-14",
+  "mask-radial-to-15%",
+  "mask-radial-to-16",
+  "mask-radial-to-20",
+  "mask-radial-to-20%",
+  "mask-radial-to-24",
+  "mask-radial-to-25%",
+  "mask-radial-to-28",
+  "mask-radial-to-30%",
+  "mask-radial-to-32",
+  "mask-radial-to-35%",
+  "mask-radial-to-36",
+  "mask-radial-to-40",
+  "mask-radial-to-40%",
+  "mask-radial-to-44",
+  "mask-radial-to-45%",
+  "mask-radial-to-48",
+  "mask-radial-to-50%",
+  "mask-radial-to-52",
+  "mask-radial-to-55%",
+  "mask-radial-to-56",
+  "mask-radial-to-60",
+  "mask-radial-to-60%",
+  "mask-radial-to-64",
+  "mask-radial-to-65%",
+  "mask-radial-to-70%",
+  "mask-radial-to-72",
+  "mask-radial-to-75%",
+  "mask-radial-to-80",
+  "mask-radial-to-80%",
+  "mask-radial-to-85%",
+  "mask-radial-to-90%",
+  "mask-radial-to-95%",
+  "mask-radial-to-96",
+  "mask-radial-to-100%",
+  "mask-radial-to-current",
+  "mask-radial-to-current/0",
+  "mask-radial-to-current/5",
+  "mask-radial-to-current/10",
+  "mask-radial-to-current/15",
+  "mask-radial-to-current/20",
+  "mask-radial-to-current/25",
+  "mask-radial-to-current/30",
+  "mask-radial-to-current/35",
+  "mask-radial-to-current/40",
+  "mask-radial-to-current/45",
+  "mask-radial-to-current/50",
+  "mask-radial-to-current/55",
+  "mask-radial-to-current/60",
+  "mask-radial-to-current/65",
+  "mask-radial-to-current/70",
+  "mask-radial-to-current/75",
+  "mask-radial-to-current/80",
+  "mask-radial-to-current/85",
+  "mask-radial-to-current/90",
+  "mask-radial-to-current/95",
+  "mask-radial-to-current/100",
+  "mask-radial-to-current/background",
+  "mask-radial-to-inherit",
+  "mask-radial-to-inherit/0",
+  "mask-radial-to-inherit/5",
+  "mask-radial-to-inherit/10",
+  "mask-radial-to-inherit/15",
+  "mask-radial-to-inherit/20",
+  "mask-radial-to-inherit/25",
+  "mask-radial-to-inherit/30",
+  "mask-radial-to-inherit/35",
+  "mask-radial-to-inherit/40",
+  "mask-radial-to-inherit/45",
+  "mask-radial-to-inherit/50",
+  "mask-radial-to-inherit/55",
+  "mask-radial-to-inherit/60",
+  "mask-radial-to-inherit/65",
+  "mask-radial-to-inherit/70",
+  "mask-radial-to-inherit/75",
+  "mask-radial-to-inherit/80",
+  "mask-radial-to-inherit/85",
+  "mask-radial-to-inherit/90",
+  "mask-radial-to-inherit/95",
+  "mask-radial-to-inherit/100",
+  "mask-radial-to-inherit/background",
+  "mask-radial-to-transparent",
+  "mask-radial-to-transparent/0",
+  "mask-radial-to-transparent/5",
+  "mask-radial-to-transparent/10",
+  "mask-radial-to-transparent/15",
+  "mask-radial-to-transparent/20",
+  "mask-radial-to-transparent/25",
+  "mask-radial-to-transparent/30",
+  "mask-radial-to-transparent/35",
+  "mask-radial-to-transparent/40",
+  "mask-radial-to-transparent/45",
+  "mask-radial-to-transparent/50",
+  "mask-radial-to-transparent/55",
+  "mask-radial-to-transparent/60",
+  "mask-radial-to-transparent/65",
+  "mask-radial-to-transparent/70",
+  "mask-radial-to-transparent/75",
+  "mask-radial-to-transparent/80",
+  "mask-radial-to-transparent/85",
+  "mask-radial-to-transparent/90",
+  "mask-radial-to-transparent/95",
+  "mask-radial-to-transparent/100",
+  "mask-radial-to-transparent/background",
+  "mask-repeat",
+  "mask-repeat-round",
+  "mask-repeat-space",
+  "mask-repeat-x",
+  "mask-repeat-y",
+  "mask-right",
+  "mask-subtract",
+  "mask-t-from-0",
+  "mask-t-from-0%",
+  "mask-t-from-0.5",
+  "mask-t-from-1",
+  "mask-t-from-1.5",
+  "mask-t-from-2",
+  "mask-t-from-2.5",
+  "mask-t-from-3",
+  "mask-t-from-3.5",
+  "mask-t-from-4",
+  "mask-t-from-5",
+  "mask-t-from-5%",
+  "mask-t-from-6",
+  "mask-t-from-7",
+  "mask-t-from-8",
+  "mask-t-from-9",
+  "mask-t-from-10",
+  "mask-t-from-10%",
+  "mask-t-from-11",
+  "mask-t-from-12",
+  "mask-t-from-14",
+  "mask-t-from-15%",
+  "mask-t-from-16",
+  "mask-t-from-20",
+  "mask-t-from-20%",
+  "mask-t-from-24",
+  "mask-t-from-25%",
+  "mask-t-from-28",
+  "mask-t-from-30%",
+  "mask-t-from-32",
+  "mask-t-from-35%",
+  "mask-t-from-36",
+  "mask-t-from-40",
+  "mask-t-from-40%",
+  "mask-t-from-44",
+  "mask-t-from-45%",
+  "mask-t-from-48",
+  "mask-t-from-50%",
+  "mask-t-from-52",
+  "mask-t-from-55%",
+  "mask-t-from-56",
+  "mask-t-from-60",
+  "mask-t-from-60%",
+  "mask-t-from-64",
+  "mask-t-from-65%",
+  "mask-t-from-70%",
+  "mask-t-from-72",
+  "mask-t-from-75%",
+  "mask-t-from-80",
+  "mask-t-from-80%",
+  "mask-t-from-85%",
+  "mask-t-from-90%",
+  "mask-t-from-95%",
+  "mask-t-from-96",
+  "mask-t-from-100%",
+  "mask-t-from-current",
+  "mask-t-from-current/0",
+  "mask-t-from-current/5",
+  "mask-t-from-current/10",
+  "mask-t-from-current/15",
+  "mask-t-from-current/20",
+  "mask-t-from-current/25",
+  "mask-t-from-current/30",
+  "mask-t-from-current/35",
+  "mask-t-from-current/40",
+  "mask-t-from-current/45",
+  "mask-t-from-current/50",
+  "mask-t-from-current/55",
+  "mask-t-from-current/60",
+  "mask-t-from-current/65",
+  "mask-t-from-current/70",
+  "mask-t-from-current/75",
+  "mask-t-from-current/80",
+  "mask-t-from-current/85",
+  "mask-t-from-current/90",
+  "mask-t-from-current/95",
+  "mask-t-from-current/100",
+  "mask-t-from-current/background",
+  "mask-t-from-inherit",
+  "mask-t-from-inherit/0",
+  "mask-t-from-inherit/5",
+  "mask-t-from-inherit/10",
+  "mask-t-from-inherit/15",
+  "mask-t-from-inherit/20",
+  "mask-t-from-inherit/25",
+  "mask-t-from-inherit/30",
+  "mask-t-from-inherit/35",
+  "mask-t-from-inherit/40",
+  "mask-t-from-inherit/45",
+  "mask-t-from-inherit/50",
+  "mask-t-from-inherit/55",
+  "mask-t-from-inherit/60",
+  "mask-t-from-inherit/65",
+  "mask-t-from-inherit/70",
+  "mask-t-from-inherit/75",
+  "mask-t-from-inherit/80",
+  "mask-t-from-inherit/85",
+  "mask-t-from-inherit/90",
+  "mask-t-from-inherit/95",
+  "mask-t-from-inherit/100",
+  "mask-t-from-inherit/background",
+  "mask-t-from-transparent",
+  "mask-t-from-transparent/0",
+  "mask-t-from-transparent/5",
+  "mask-t-from-transparent/10",
+  "mask-t-from-transparent/15",
+  "mask-t-from-transparent/20",
+  "mask-t-from-transparent/25",
+  "mask-t-from-transparent/30",
+  "mask-t-from-transparent/35",
+  "mask-t-from-transparent/40",
+  "mask-t-from-transparent/45",
+  "mask-t-from-transparent/50",
+  "mask-t-from-transparent/55",
+  "mask-t-from-transparent/60",
+  "mask-t-from-transparent/65",
+  "mask-t-from-transparent/70",
+  "mask-t-from-transparent/75",
+  "mask-t-from-transparent/80",
+  "mask-t-from-transparent/85",
+  "mask-t-from-transparent/90",
+  "mask-t-from-transparent/95",
+  "mask-t-from-transparent/100",
+  "mask-t-from-transparent/background",
+  "mask-t-to-0",
+  "mask-t-to-0%",
+  "mask-t-to-0.5",
+  "mask-t-to-1",
+  "mask-t-to-1.5",
+  "mask-t-to-2",
+  "mask-t-to-2.5",
+  "mask-t-to-3",
+  "mask-t-to-3.5",
+  "mask-t-to-4",
+  "mask-t-to-5",
+  "mask-t-to-5%",
+  "mask-t-to-6",
+  "mask-t-to-7",
+  "mask-t-to-8",
+  "mask-t-to-9",
+  "mask-t-to-10",
+  "mask-t-to-10%",
+  "mask-t-to-11",
+  "mask-t-to-12",
+  "mask-t-to-14",
+  "mask-t-to-15%",
+  "mask-t-to-16",
+  "mask-t-to-20",
+  "mask-t-to-20%",
+  "mask-t-to-24",
+  "mask-t-to-25%",
+  "mask-t-to-28",
+  "mask-t-to-30%",
+  "mask-t-to-32",
+  "mask-t-to-35%",
+  "mask-t-to-36",
+  "mask-t-to-40",
+  "mask-t-to-40%",
+  "mask-t-to-44",
+  "mask-t-to-45%",
+  "mask-t-to-48",
+  "mask-t-to-50%",
+  "mask-t-to-52",
+  "mask-t-to-55%",
+  "mask-t-to-56",
+  "mask-t-to-60",
+  "mask-t-to-60%",
+  "mask-t-to-64",
+  "mask-t-to-65%",
+  "mask-t-to-70%",
+  "mask-t-to-72",
+  "mask-t-to-75%",
+  "mask-t-to-80",
+  "mask-t-to-80%",
+  "mask-t-to-85%",
+  "mask-t-to-90%",
+  "mask-t-to-95%",
+  "mask-t-to-96",
+  "mask-t-to-100%",
+  "mask-t-to-current",
+  "mask-t-to-current/0",
+  "mask-t-to-current/5",
+  "mask-t-to-current/10",
+  "mask-t-to-current/15",
+  "mask-t-to-current/20",
+  "mask-t-to-current/25",
+  "mask-t-to-current/30",
+  "mask-t-to-current/35",
+  "mask-t-to-current/40",
+  "mask-t-to-current/45",
+  "mask-t-to-current/50",
+  "mask-t-to-current/55",
+  "mask-t-to-current/60",
+  "mask-t-to-current/65",
+  "mask-t-to-current/70",
+  "mask-t-to-current/75",
+  "mask-t-to-current/80",
+  "mask-t-to-current/85",
+  "mask-t-to-current/90",
+  "mask-t-to-current/95",
+  "mask-t-to-current/100",
+  "mask-t-to-current/background",
+  "mask-t-to-inherit",
+  "mask-t-to-inherit/0",
+  "mask-t-to-inherit/5",
+  "mask-t-to-inherit/10",
+  "mask-t-to-inherit/15",
+  "mask-t-to-inherit/20",
+  "mask-t-to-inherit/25",
+  "mask-t-to-inherit/30",
+  "mask-t-to-inherit/35",
+  "mask-t-to-inherit/40",
+  "mask-t-to-inherit/45",
+  "mask-t-to-inherit/50",
+  "mask-t-to-inherit/55",
+  "mask-t-to-inherit/60",
+  "mask-t-to-inherit/65",
+  "mask-t-to-inherit/70",
+  "mask-t-to-inherit/75",
+  "mask-t-to-inherit/80",
+  "mask-t-to-inherit/85",
+  "mask-t-to-inherit/90",
+  "mask-t-to-inherit/95",
+  "mask-t-to-inherit/100",
+  "mask-t-to-inherit/background",
+  "mask-t-to-transparent",
+  "mask-t-to-transparent/0",
+  "mask-t-to-transparent/5",
+  "mask-t-to-transparent/10",
+  "mask-t-to-transparent/15",
+  "mask-t-to-transparent/20",
+  "mask-t-to-transparent/25",
+  "mask-t-to-transparent/30",
+  "mask-t-to-transparent/35",
+  "mask-t-to-transparent/40",
+  "mask-t-to-transparent/45",
+  "mask-t-to-transparent/50",
+  "mask-t-to-transparent/55",
+  "mask-t-to-transparent/60",
+  "mask-t-to-transparent/65",
+  "mask-t-to-transparent/70",
+  "mask-t-to-transparent/75",
+  "mask-t-to-transparent/80",
+  "mask-t-to-transparent/85",
+  "mask-t-to-transparent/90",
+  "mask-t-to-transparent/95",
+  "mask-t-to-transparent/100",
+  "mask-t-to-transparent/background",
+  "mask-top",
+  "mask-top-left",
+  "mask-top-right",
+  "mask-type-alpha",
+  "mask-type-luminance",
+  "mask-x-from-0",
+  "mask-x-from-0%",
+  "mask-x-from-0.5",
+  "mask-x-from-1",
+  "mask-x-from-1.5",
+  "mask-x-from-2",
+  "mask-x-from-2.5",
+  "mask-x-from-3",
+  "mask-x-from-3.5",
+  "mask-x-from-4",
+  "mask-x-from-5",
+  "mask-x-from-5%",
+  "mask-x-from-6",
+  "mask-x-from-7",
+  "mask-x-from-8",
+  "mask-x-from-9",
+  "mask-x-from-10",
+  "mask-x-from-10%",
+  "mask-x-from-11",
+  "mask-x-from-12",
+  "mask-x-from-14",
+  "mask-x-from-15%",
+  "mask-x-from-16",
+  "mask-x-from-20",
+  "mask-x-from-20%",
+  "mask-x-from-24",
+  "mask-x-from-25%",
+  "mask-x-from-28",
+  "mask-x-from-30%",
+  "mask-x-from-32",
+  "mask-x-from-35%",
+  "mask-x-from-36",
+  "mask-x-from-40",
+  "mask-x-from-40%",
+  "mask-x-from-44",
+  "mask-x-from-45%",
+  "mask-x-from-48",
+  "mask-x-from-50%",
+  "mask-x-from-52",
+  "mask-x-from-55%",
+  "mask-x-from-56",
+  "mask-x-from-60",
+  "mask-x-from-60%",
+  "mask-x-from-64",
+  "mask-x-from-65%",
+  "mask-x-from-70%",
+  "mask-x-from-72",
+  "mask-x-from-75%",
+  "mask-x-from-80",
+  "mask-x-from-80%",
+  "mask-x-from-85%",
+  "mask-x-from-90%",
+  "mask-x-from-95%",
+  "mask-x-from-96",
+  "mask-x-from-100%",
+  "mask-x-from-current",
+  "mask-x-from-current/0",
+  "mask-x-from-current/5",
+  "mask-x-from-current/10",
+  "mask-x-from-current/15",
+  "mask-x-from-current/20",
+  "mask-x-from-current/25",
+  "mask-x-from-current/30",
+  "mask-x-from-current/35",
+  "mask-x-from-current/40",
+  "mask-x-from-current/45",
+  "mask-x-from-current/50",
+  "mask-x-from-current/55",
+  "mask-x-from-current/60",
+  "mask-x-from-current/65",
+  "mask-x-from-current/70",
+  "mask-x-from-current/75",
+  "mask-x-from-current/80",
+  "mask-x-from-current/85",
+  "mask-x-from-current/90",
+  "mask-x-from-current/95",
+  "mask-x-from-current/100",
+  "mask-x-from-current/background",
+  "mask-x-from-inherit",
+  "mask-x-from-inherit/0",
+  "mask-x-from-inherit/5",
+  "mask-x-from-inherit/10",
+  "mask-x-from-inherit/15",
+  "mask-x-from-inherit/20",
+  "mask-x-from-inherit/25",
+  "mask-x-from-inherit/30",
+  "mask-x-from-inherit/35",
+  "mask-x-from-inherit/40",
+  "mask-x-from-inherit/45",
+  "mask-x-from-inherit/50",
+  "mask-x-from-inherit/55",
+  "mask-x-from-inherit/60",
+  "mask-x-from-inherit/65",
+  "mask-x-from-inherit/70",
+  "mask-x-from-inherit/75",
+  "mask-x-from-inherit/80",
+  "mask-x-from-inherit/85",
+  "mask-x-from-inherit/90",
+  "mask-x-from-inherit/95",
+  "mask-x-from-inherit/100",
+  "mask-x-from-inherit/background",
+  "mask-x-from-transparent",
+  "mask-x-from-transparent/0",
+  "mask-x-from-transparent/5",
+  "mask-x-from-transparent/10",
+  "mask-x-from-transparent/15",
+  "mask-x-from-transparent/20",
+  "mask-x-from-transparent/25",
+  "mask-x-from-transparent/30",
+  "mask-x-from-transparent/35",
+  "mask-x-from-transparent/40",
+  "mask-x-from-transparent/45",
+  "mask-x-from-transparent/50",
+  "mask-x-from-transparent/55",
+  "mask-x-from-transparent/60",
+  "mask-x-from-transparent/65",
+  "mask-x-from-transparent/70",
+  "mask-x-from-transparent/75",
+  "mask-x-from-transparent/80",
+  "mask-x-from-transparent/85",
+  "mask-x-from-transparent/90",
+  "mask-x-from-transparent/95",
+  "mask-x-from-transparent/100",
+  "mask-x-from-transparent/background",
+  "mask-x-to-0",
+  "mask-x-to-0%",
+  "mask-x-to-0.5",
+  "mask-x-to-1",
+  "mask-x-to-1.5",
+  "mask-x-to-2",
+  "mask-x-to-2.5",
+  "mask-x-to-3",
+  "mask-x-to-3.5",
+  "mask-x-to-4",
+  "mask-x-to-5",
+  "mask-x-to-5%",
+  "mask-x-to-6",
+  "mask-x-to-7",
+  "mask-x-to-8",
+  "mask-x-to-9",
+  "mask-x-to-10",
+  "mask-x-to-10%",
+  "mask-x-to-11",
+  "mask-x-to-12",
+  "mask-x-to-14",
+  "mask-x-to-15%",
+  "mask-x-to-16",
+  "mask-x-to-20",
+  "mask-x-to-20%",
+  "mask-x-to-24",
+  "mask-x-to-25%",
+  "mask-x-to-28",
+  "mask-x-to-30%",
+  "mask-x-to-32",
+  "mask-x-to-35%",
+  "mask-x-to-36",
+  "mask-x-to-40",
+  "mask-x-to-40%",
+  "mask-x-to-44",
+  "mask-x-to-45%",
+  "mask-x-to-48",
+  "mask-x-to-50%",
+  "mask-x-to-52",
+  "mask-x-to-55%",
+  "mask-x-to-56",
+  "mask-x-to-60",
+  "mask-x-to-60%",
+  "mask-x-to-64",
+  "mask-x-to-65%",
+  "mask-x-to-70%",
+  "mask-x-to-72",
+  "mask-x-to-75%",
+  "mask-x-to-80",
+  "mask-x-to-80%",
+  "mask-x-to-85%",
+  "mask-x-to-90%",
+  "mask-x-to-95%",
+  "mask-x-to-96",
+  "mask-x-to-100%",
+  "mask-x-to-current",
+  "mask-x-to-current/0",
+  "mask-x-to-current/5",
+  "mask-x-to-current/10",
+  "mask-x-to-current/15",
+  "mask-x-to-current/20",
+  "mask-x-to-current/25",
+  "mask-x-to-current/30",
+  "mask-x-to-current/35",
+  "mask-x-to-current/40",
+  "mask-x-to-current/45",
+  "mask-x-to-current/50",
+  "mask-x-to-current/55",
+  "mask-x-to-current/60",
+  "mask-x-to-current/65",
+  "mask-x-to-current/70",
+  "mask-x-to-current/75",
+  "mask-x-to-current/80",
+  "mask-x-to-current/85",
+  "mask-x-to-current/90",
+  "mask-x-to-current/95",
+  "mask-x-to-current/100",
+  "mask-x-to-current/background",
+  "mask-x-to-inherit",
+  "mask-x-to-inherit/0",
+  "mask-x-to-inherit/5",
+  "mask-x-to-inherit/10",
+  "mask-x-to-inherit/15",
+  "mask-x-to-inherit/20",
+  "mask-x-to-inherit/25",
+  "mask-x-to-inherit/30",
+  "mask-x-to-inherit/35",
+  "mask-x-to-inherit/40",
+  "mask-x-to-inherit/45",
+  "mask-x-to-inherit/50",
+  "mask-x-to-inherit/55",
+  "mask-x-to-inherit/60",
+  "mask-x-to-inherit/65",
+  "mask-x-to-inherit/70",
+  "mask-x-to-inherit/75",
+  "mask-x-to-inherit/80",
+  "mask-x-to-inherit/85",
+  "mask-x-to-inherit/90",
+  "mask-x-to-inherit/95",
+  "mask-x-to-inherit/100",
+  "mask-x-to-inherit/background",
+  "mask-x-to-transparent",
+  "mask-x-to-transparent/0",
+  "mask-x-to-transparent/5",
+  "mask-x-to-transparent/10",
+  "mask-x-to-transparent/15",
+  "mask-x-to-transparent/20",
+  "mask-x-to-transparent/25",
+  "mask-x-to-transparent/30",
+  "mask-x-to-transparent/35",
+  "mask-x-to-transparent/40",
+  "mask-x-to-transparent/45",
+  "mask-x-to-transparent/50",
+  "mask-x-to-transparent/55",
+  "mask-x-to-transparent/60",
+  "mask-x-to-transparent/65",
+  "mask-x-to-transparent/70",
+  "mask-x-to-transparent/75",
+  "mask-x-to-transparent/80",
+  "mask-x-to-transparent/85",
+  "mask-x-to-transparent/90",
+  "mask-x-to-transparent/95",
+  "mask-x-to-transparent/100",
+  "mask-x-to-transparent/background",
+  "mask-y-from-0",
+  "mask-y-from-0%",
+  "mask-y-from-0.5",
+  "mask-y-from-1",
+  "mask-y-from-1.5",
+  "mask-y-from-2",
+  "mask-y-from-2.5",
+  "mask-y-from-3",
+  "mask-y-from-3.5",
+  "mask-y-from-4",
+  "mask-y-from-5",
+  "mask-y-from-5%",
+  "mask-y-from-6",
+  "mask-y-from-7",
+  "mask-y-from-8",
+  "mask-y-from-9",
+  "mask-y-from-10",
+  "mask-y-from-10%",
+  "mask-y-from-11",
+  "mask-y-from-12",
+  "mask-y-from-14",
+  "mask-y-from-15%",
+  "mask-y-from-16",
+  "mask-y-from-20",
+  "mask-y-from-20%",
+  "mask-y-from-24",
+  "mask-y-from-25%",
+  "mask-y-from-28",
+  "mask-y-from-30%",
+  "mask-y-from-32",
+  "mask-y-from-35%",
+  "mask-y-from-36",
+  "mask-y-from-40",
+  "mask-y-from-40%",
+  "mask-y-from-44",
+  "mask-y-from-45%",
+  "mask-y-from-48",
+  "mask-y-from-50%",
+  "mask-y-from-52",
+  "mask-y-from-55%",
+  "mask-y-from-56",
+  "mask-y-from-60",
+  "mask-y-from-60%",
+  "mask-y-from-64",
+  "mask-y-from-65%",
+  "mask-y-from-70%",
+  "mask-y-from-72",
+  "mask-y-from-75%",
+  "mask-y-from-80",
+  "mask-y-from-80%",
+  "mask-y-from-85%",
+  "mask-y-from-90%",
+  "mask-y-from-95%",
+  "mask-y-from-96",
+  "mask-y-from-100%",
+  "mask-y-from-current",
+  "mask-y-from-current/0",
+  "mask-y-from-current/5",
+  "mask-y-from-current/10",
+  "mask-y-from-current/15",
+  "mask-y-from-current/20",
+  "mask-y-from-current/25",
+  "mask-y-from-current/30",
+  "mask-y-from-current/35",
+  "mask-y-from-current/40",
+  "mask-y-from-current/45",
+  "mask-y-from-current/50",
+  "mask-y-from-current/55",
+  "mask-y-from-current/60",
+  "mask-y-from-current/65",
+  "mask-y-from-current/70",
+  "mask-y-from-current/75",
+  "mask-y-from-current/80",
+  "mask-y-from-current/85",
+  "mask-y-from-current/90",
+  "mask-y-from-current/95",
+  "mask-y-from-current/100",
+  "mask-y-from-current/background",
+  "mask-y-from-inherit",
+  "mask-y-from-inherit/0",
+  "mask-y-from-inherit/5",
+  "mask-y-from-inherit/10",
+  "mask-y-from-inherit/15",
+  "mask-y-from-inherit/20",
+  "mask-y-from-inherit/25",
+  "mask-y-from-inherit/30",
+  "mask-y-from-inherit/35",
+  "mask-y-from-inherit/40",
+  "mask-y-from-inherit/45",
+  "mask-y-from-inherit/50",
+  "mask-y-from-inherit/55",
+  "mask-y-from-inherit/60",
+  "mask-y-from-inherit/65",
+  "mask-y-from-inherit/70",
+  "mask-y-from-inherit/75",
+  "mask-y-from-inherit/80",
+  "mask-y-from-inherit/85",
+  "mask-y-from-inherit/90",
+  "mask-y-from-inherit/95",
+  "mask-y-from-inherit/100",
+  "mask-y-from-inherit/background",
+  "mask-y-from-transparent",
+  "mask-y-from-transparent/0",
+  "mask-y-from-transparent/5",
+  "mask-y-from-transparent/10",
+  "mask-y-from-transparent/15",
+  "mask-y-from-transparent/20",
+  "mask-y-from-transparent/25",
+  "mask-y-from-transparent/30",
+  "mask-y-from-transparent/35",
+  "mask-y-from-transparent/40",
+  "mask-y-from-transparent/45",
+  "mask-y-from-transparent/50",
+  "mask-y-from-transparent/55",
+  "mask-y-from-transparent/60",
+  "mask-y-from-transparent/65",
+  "mask-y-from-transparent/70",
+  "mask-y-from-transparent/75",
+  "mask-y-from-transparent/80",
+  "mask-y-from-transparent/85",
+  "mask-y-from-transparent/90",
+  "mask-y-from-transparent/95",
+  "mask-y-from-transparent/100",
+  "mask-y-from-transparent/background",
+  "mask-y-to-0",
+  "mask-y-to-0%",
+  "mask-y-to-0.5",
+  "mask-y-to-1",
+  "mask-y-to-1.5",
+  "mask-y-to-2",
+  "mask-y-to-2.5",
+  "mask-y-to-3",
+  "mask-y-to-3.5",
+  "mask-y-to-4",
+  "mask-y-to-5",
+  "mask-y-to-5%",
+  "mask-y-to-6",
+  "mask-y-to-7",
+  "mask-y-to-8",
+  "mask-y-to-9",
+  "mask-y-to-10",
+  "mask-y-to-10%",
+  "mask-y-to-11",
+  "mask-y-to-12",
+  "mask-y-to-14",
+  "mask-y-to-15%",
+  "mask-y-to-16",
+  "mask-y-to-20",
+  "mask-y-to-20%",
+  "mask-y-to-24",
+  "mask-y-to-25%",
+  "mask-y-to-28",
+  "mask-y-to-30%",
+  "mask-y-to-32",
+  "mask-y-to-35%",
+  "mask-y-to-36",
+  "mask-y-to-40",
+  "mask-y-to-40%",
+  "mask-y-to-44",
+  "mask-y-to-45%",
+  "mask-y-to-48",
+  "mask-y-to-50%",
+  "mask-y-to-52",
+  "mask-y-to-55%",
+  "mask-y-to-56",
+  "mask-y-to-60",
+  "mask-y-to-60%",
+  "mask-y-to-64",
+  "mask-y-to-65%",
+  "mask-y-to-70%",
+  "mask-y-to-72",
+  "mask-y-to-75%",
+  "mask-y-to-80",
+  "mask-y-to-80%",
+  "mask-y-to-85%",
+  "mask-y-to-90%",
+  "mask-y-to-95%",
+  "mask-y-to-96",
+  "mask-y-to-100%",
+  "mask-y-to-current",
+  "mask-y-to-current/0",
+  "mask-y-to-current/5",
+  "mask-y-to-current/10",
+  "mask-y-to-current/15",
+  "mask-y-to-current/20",
+  "mask-y-to-current/25",
+  "mask-y-to-current/30",
+  "mask-y-to-current/35",
+  "mask-y-to-current/40",
+  "mask-y-to-current/45",
+  "mask-y-to-current/50",
+  "mask-y-to-current/55",
+  "mask-y-to-current/60",
+  "mask-y-to-current/65",
+  "mask-y-to-current/70",
+  "mask-y-to-current/75",
+  "mask-y-to-current/80",
+  "mask-y-to-current/85",
+  "mask-y-to-current/90",
+  "mask-y-to-current/95",
+  "mask-y-to-current/100",
+  "mask-y-to-current/background",
+  "mask-y-to-inherit",
+  "mask-y-to-inherit/0",
+  "mask-y-to-inherit/5",
+  "mask-y-to-inherit/10",
+  "mask-y-to-inherit/15",
+  "mask-y-to-inherit/20",
+  "mask-y-to-inherit/25",
+  "mask-y-to-inherit/30",
+  "mask-y-to-inherit/35",
+  "mask-y-to-inherit/40",
+  "mask-y-to-inherit/45",
+  "mask-y-to-inherit/50",
+  "mask-y-to-inherit/55",
+  "mask-y-to-inherit/60",
+  "mask-y-to-inherit/65",
+  "mask-y-to-inherit/70",
+  "mask-y-to-inherit/75",
+  "mask-y-to-inherit/80",
+  "mask-y-to-inherit/85",
+  "mask-y-to-inherit/90",
+  "mask-y-to-inherit/95",
+  "mask-y-to-inherit/100",
+  "mask-y-to-inherit/background",
+  "mask-y-to-transparent",
+  "mask-y-to-transparent/0",
+  "mask-y-to-transparent/5",
+  "mask-y-to-transparent/10",
+  "mask-y-to-transparent/15",
+  "mask-y-to-transparent/20",
+  "mask-y-to-transparent/25",
+  "mask-y-to-transparent/30",
+  "mask-y-to-transparent/35",
+  "mask-y-to-transparent/40",
+  "mask-y-to-transparent/45",
+  "mask-y-to-transparent/50",
+  "mask-y-to-transparent/55",
+  "mask-y-to-transparent/60",
+  "mask-y-to-transparent/65",
+  "mask-y-to-transparent/70",
+  "mask-y-to-transparent/75",
+  "mask-y-to-transparent/80",
+  "mask-y-to-transparent/85",
+  "mask-y-to-transparent/90",
+  "mask-y-to-transparent/95",
+  "mask-y-to-transparent/100",
+  "mask-y-to-transparent/background",
+  "max-block-0",
+  "max-block-0.5",
+  "max-block-1",
+  "max-block-1.5",
+  "max-block-2",
+  "max-block-2.5",
+  "max-block-3",
+  "max-block-3.5",
+  "max-block-4",
+  "max-block-5",
+  "max-block-6",
+  "max-block-7",
+  "max-block-8",
+  "max-block-9",
+  "max-block-10",
+  "max-block-11",
+  "max-block-12",
+  "max-block-14",
+  "max-block-16",
+  "max-block-20",
+  "max-block-24",
+  "max-block-28",
+  "max-block-32",
+  "max-block-36",
+  "max-block-40",
+  "max-block-44",
+  "max-block-48",
+  "max-block-52",
+  "max-block-56",
+  "max-block-60",
+  "max-block-64",
+  "max-block-72",
+  "max-block-80",
+  "max-block-96",
+  "max-block-1/2",
+  "max-block-1/3",
+  "max-block-1/4",
+  "max-block-1/5",
+  "max-block-1/6",
+  "max-block-1/12",
+  "max-block-2/3",
+  "max-block-2/4",
+  "max-block-2/5",
+  "max-block-2/6",
+  "max-block-2/12",
+  "max-block-3/4",
+  "max-block-3/5",
+  "max-block-3/6",
+  "max-block-3/12",
+  "max-block-4/5",
+  "max-block-4/6",
+  "max-block-4/12",
+  "max-block-5/6",
+  "max-block-5/12",
+  "max-block-6/12",
+  "max-block-7/12",
+  "max-block-8/12",
+  "max-block-9/12",
+  "max-block-10/12",
+  "max-block-11/12",
+  "max-block-dvh",
+  "max-block-fit",
+  "max-block-full",
+  "max-block-lh",
+  "max-block-lvh",
+  "max-block-max",
+  "max-block-min",
+  "max-block-none",
+  "max-block-px",
+  "max-block-screen",
+  "max-block-svh",
   "max-h-0",
   "max-h-0.5",
   "max-h-1",
   "max-h-1.5",
+  "max-h-2",
+  "max-h-2.5",
+  "max-h-3",
+  "max-h-3.5",
+  "max-h-4",
+  "max-h-5",
+  "max-h-6",
+  "max-h-7",
+  "max-h-8",
+  "max-h-9",
   "max-h-10",
   "max-h-11",
   "max-h-12",
   "max-h-14",
   "max-h-16",
-  "max-h-2",
-  "max-h-2.5",
   "max-h-20",
   "max-h-24",
   "max-h-28",
-  "max-h-3",
-  "max-h-3.5",
   "max-h-32",
   "max-h-36",
-  "max-h-4",
   "max-h-40",
   "max-h-44",
   "max-h-48",
-  "max-h-5",
   "max-h-52",
   "max-h-56",
-  "max-h-6",
   "max-h-60",
   "max-h-64",
-  "max-h-7",
   "max-h-72",
-  "max-h-8",
   "max-h-80",
-  "max-h-9",
   "max-h-96",
-  "max-h-auto",
+  "max-h-1/2",
+  "max-h-1/3",
+  "max-h-1/4",
+  "max-h-1/5",
+  "max-h-1/6",
+  "max-h-1/12",
+  "max-h-2/3",
+  "max-h-2/4",
+  "max-h-2/5",
+  "max-h-2/6",
+  "max-h-2/12",
+  "max-h-3/4",
+  "max-h-3/5",
+  "max-h-3/6",
+  "max-h-3/12",
+  "max-h-4/5",
+  "max-h-4/6",
+  "max-h-4/12",
+  "max-h-5/6",
+  "max-h-5/12",
+  "max-h-6/12",
+  "max-h-7/12",
+  "max-h-8/12",
+  "max-h-9/12",
+  "max-h-10/12",
+  "max-h-11/12",
   "max-h-dvh",
   "max-h-dvw",
   "max-h-fit",
   "max-h-full",
+  "max-h-lh",
   "max-h-lvh",
   "max-h-lvw",
   "max-h-max",
@@ -4550,218 +8490,584 @@ exports[`getClassList 1`] = `
   "max-h-screen",
   "max-h-svh",
   "max-h-svw",
+  "max-inline-0",
+  "max-inline-0.5",
+  "max-inline-1",
+  "max-inline-1.5",
+  "max-inline-2",
+  "max-inline-2.5",
+  "max-inline-3",
+  "max-inline-3.5",
+  "max-inline-4",
+  "max-inline-5",
+  "max-inline-6",
+  "max-inline-7",
+  "max-inline-8",
+  "max-inline-9",
+  "max-inline-10",
+  "max-inline-11",
+  "max-inline-12",
+  "max-inline-14",
+  "max-inline-16",
+  "max-inline-20",
+  "max-inline-24",
+  "max-inline-28",
+  "max-inline-32",
+  "max-inline-36",
+  "max-inline-40",
+  "max-inline-44",
+  "max-inline-48",
+  "max-inline-52",
+  "max-inline-56",
+  "max-inline-60",
+  "max-inline-64",
+  "max-inline-72",
+  "max-inline-80",
+  "max-inline-96",
+  "max-inline-dvw",
+  "max-inline-fit",
+  "max-inline-full",
+  "max-inline-lg",
+  "max-inline-lvw",
+  "max-inline-max",
+  "max-inline-md",
+  "max-inline-1/2",
+  "max-inline-1/3",
+  "max-inline-1/4",
+  "max-inline-1/5",
+  "max-inline-1/6",
+  "max-inline-1/12",
+  "max-inline-2/3",
+  "max-inline-2/4",
+  "max-inline-2/5",
+  "max-inline-2/6",
+  "max-inline-2/12",
+  "max-inline-3/4",
+  "max-inline-3/5",
+  "max-inline-3/6",
+  "max-inline-3/12",
+  "max-inline-4/5",
+  "max-inline-4/6",
+  "max-inline-4/12",
+  "max-inline-5/6",
+  "max-inline-5/12",
+  "max-inline-6/12",
+  "max-inline-7/12",
+  "max-inline-8/12",
+  "max-inline-9/12",
+  "max-inline-10/12",
+  "max-inline-11/12",
+  "max-inline-min",
+  "max-inline-none",
+  "max-inline-px",
+  "max-inline-screen",
+  "max-inline-svw",
   "max-w-0",
   "max-w-0.5",
   "max-w-1",
   "max-w-1.5",
+  "max-w-2",
+  "max-w-2.5",
+  "max-w-3",
+  "max-w-3.5",
+  "max-w-4",
+  "max-w-5",
+  "max-w-6",
+  "max-w-7",
+  "max-w-8",
+  "max-w-9",
   "max-w-10",
   "max-w-11",
   "max-w-12",
   "max-w-14",
   "max-w-16",
-  "max-w-2",
-  "max-w-2.5",
   "max-w-20",
   "max-w-24",
   "max-w-28",
-  "max-w-3",
-  "max-w-3.5",
   "max-w-32",
   "max-w-36",
-  "max-w-4",
   "max-w-40",
   "max-w-44",
   "max-w-48",
-  "max-w-5",
   "max-w-52",
   "max-w-56",
-  "max-w-6",
   "max-w-60",
   "max-w-64",
-  "max-w-7",
   "max-w-72",
-  "max-w-8",
   "max-w-80",
-  "max-w-9",
   "max-w-96",
-  "max-w-auto",
   "max-w-dvh",
   "max-w-dvw",
   "max-w-fit",
   "max-w-full",
+  "max-w-lg",
   "max-w-lvh",
   "max-w-lvw",
   "max-w-max",
+  "max-w-md",
+  "max-w-1/2",
+  "max-w-1/3",
+  "max-w-1/4",
+  "max-w-1/5",
+  "max-w-1/6",
+  "max-w-1/12",
+  "max-w-2/3",
+  "max-w-2/4",
+  "max-w-2/5",
+  "max-w-2/6",
+  "max-w-2/12",
+  "max-w-3/4",
+  "max-w-3/5",
+  "max-w-3/6",
+  "max-w-3/12",
+  "max-w-4/5",
+  "max-w-4/6",
+  "max-w-4/12",
+  "max-w-5/6",
+  "max-w-5/12",
+  "max-w-6/12",
+  "max-w-7/12",
+  "max-w-8/12",
+  "max-w-9/12",
+  "max-w-10/12",
+  "max-w-11/12",
   "max-w-min",
   "max-w-none",
   "max-w-px",
-  "max-w-screen",
   "max-w-svh",
   "max-w-svw",
   "mb-0",
   "mb-0.5",
   "mb-1",
   "mb-1.5",
+  "mb-2",
+  "mb-2.5",
+  "mb-3",
+  "mb-3.5",
+  "mb-4",
+  "mb-5",
+  "mb-6",
+  "mb-7",
+  "mb-8",
+  "mb-9",
   "mb-10",
   "mb-11",
   "mb-12",
   "mb-14",
   "mb-16",
-  "mb-2",
-  "mb-2.5",
   "mb-20",
   "mb-24",
   "mb-28",
-  "mb-3",
-  "mb-3.5",
   "mb-32",
   "mb-36",
-  "mb-4",
   "mb-40",
   "mb-44",
   "mb-48",
-  "mb-5",
   "mb-52",
   "mb-56",
-  "mb-6",
   "mb-60",
   "mb-64",
-  "mb-7",
   "mb-72",
-  "mb-8",
   "mb-80",
-  "mb-9",
   "mb-96",
   "mb-auto",
   "mb-px",
+  "mbe-0",
+  "mbe-0.5",
+  "mbe-1",
+  "mbe-1.5",
+  "mbe-2",
+  "mbe-2.5",
+  "mbe-3",
+  "mbe-3.5",
+  "mbe-4",
+  "mbe-5",
+  "mbe-6",
+  "mbe-7",
+  "mbe-8",
+  "mbe-9",
+  "mbe-10",
+  "mbe-11",
+  "mbe-12",
+  "mbe-14",
+  "mbe-16",
+  "mbe-20",
+  "mbe-24",
+  "mbe-28",
+  "mbe-32",
+  "mbe-36",
+  "mbe-40",
+  "mbe-44",
+  "mbe-48",
+  "mbe-52",
+  "mbe-56",
+  "mbe-60",
+  "mbe-64",
+  "mbe-72",
+  "mbe-80",
+  "mbe-96",
+  "mbe-auto",
+  "mbe-px",
+  "mbs-0",
+  "mbs-0.5",
+  "mbs-1",
+  "mbs-1.5",
+  "mbs-2",
+  "mbs-2.5",
+  "mbs-3",
+  "mbs-3.5",
+  "mbs-4",
+  "mbs-5",
+  "mbs-6",
+  "mbs-7",
+  "mbs-8",
+  "mbs-9",
+  "mbs-10",
+  "mbs-11",
+  "mbs-12",
+  "mbs-14",
+  "mbs-16",
+  "mbs-20",
+  "mbs-24",
+  "mbs-28",
+  "mbs-32",
+  "mbs-36",
+  "mbs-40",
+  "mbs-44",
+  "mbs-48",
+  "mbs-52",
+  "mbs-56",
+  "mbs-60",
+  "mbs-64",
+  "mbs-72",
+  "mbs-80",
+  "mbs-96",
+  "mbs-auto",
+  "mbs-px",
   "me-0",
   "me-0.5",
   "me-1",
   "me-1.5",
+  "me-2",
+  "me-2.5",
+  "me-3",
+  "me-3.5",
+  "me-4",
+  "me-5",
+  "me-6",
+  "me-7",
+  "me-8",
+  "me-9",
   "me-10",
   "me-11",
   "me-12",
   "me-14",
   "me-16",
-  "me-2",
-  "me-2.5",
   "me-20",
   "me-24",
   "me-28",
-  "me-3",
-  "me-3.5",
   "me-32",
   "me-36",
-  "me-4",
   "me-40",
   "me-44",
   "me-48",
-  "me-5",
   "me-52",
   "me-56",
-  "me-6",
   "me-60",
   "me-64",
-  "me-7",
   "me-72",
-  "me-8",
   "me-80",
-  "me-9",
   "me-96",
   "me-auto",
   "me-px",
+  "min-block-0",
+  "min-block-0.5",
+  "min-block-1",
+  "min-block-1.5",
+  "min-block-2",
+  "min-block-2.5",
+  "min-block-3",
+  "min-block-3.5",
+  "min-block-4",
+  "min-block-5",
+  "min-block-6",
+  "min-block-7",
+  "min-block-8",
+  "min-block-9",
+  "min-block-10",
+  "min-block-11",
+  "min-block-12",
+  "min-block-14",
+  "min-block-16",
+  "min-block-20",
+  "min-block-24",
+  "min-block-28",
+  "min-block-32",
+  "min-block-36",
+  "min-block-40",
+  "min-block-44",
+  "min-block-48",
+  "min-block-52",
+  "min-block-56",
+  "min-block-60",
+  "min-block-64",
+  "min-block-72",
+  "min-block-80",
+  "min-block-96",
+  "min-block-1/2",
+  "min-block-1/3",
+  "min-block-1/4",
+  "min-block-1/5",
+  "min-block-1/6",
+  "min-block-1/12",
+  "min-block-2/3",
+  "min-block-2/4",
+  "min-block-2/5",
+  "min-block-2/6",
+  "min-block-2/12",
+  "min-block-3/4",
+  "min-block-3/5",
+  "min-block-3/6",
+  "min-block-3/12",
+  "min-block-4/5",
+  "min-block-4/6",
+  "min-block-4/12",
+  "min-block-5/6",
+  "min-block-5/12",
+  "min-block-6/12",
+  "min-block-7/12",
+  "min-block-8/12",
+  "min-block-9/12",
+  "min-block-10/12",
+  "min-block-11/12",
+  "min-block-auto",
+  "min-block-dvh",
+  "min-block-fit",
+  "min-block-full",
+  "min-block-lh",
+  "min-block-lvh",
+  "min-block-max",
+  "min-block-min",
+  "min-block-px",
+  "min-block-screen",
+  "min-block-svh",
   "min-h-0",
   "min-h-0.5",
   "min-h-1",
   "min-h-1.5",
+  "min-h-2",
+  "min-h-2.5",
+  "min-h-3",
+  "min-h-3.5",
+  "min-h-4",
+  "min-h-5",
+  "min-h-6",
+  "min-h-7",
+  "min-h-8",
+  "min-h-9",
   "min-h-10",
   "min-h-11",
   "min-h-12",
   "min-h-14",
   "min-h-16",
-  "min-h-2",
-  "min-h-2.5",
   "min-h-20",
   "min-h-24",
   "min-h-28",
-  "min-h-3",
-  "min-h-3.5",
   "min-h-32",
   "min-h-36",
-  "min-h-4",
   "min-h-40",
   "min-h-44",
   "min-h-48",
-  "min-h-5",
   "min-h-52",
   "min-h-56",
-  "min-h-6",
   "min-h-60",
   "min-h-64",
-  "min-h-7",
   "min-h-72",
-  "min-h-8",
   "min-h-80",
-  "min-h-9",
   "min-h-96",
+  "min-h-1/2",
+  "min-h-1/3",
+  "min-h-1/4",
+  "min-h-1/5",
+  "min-h-1/6",
+  "min-h-1/12",
+  "min-h-2/3",
+  "min-h-2/4",
+  "min-h-2/5",
+  "min-h-2/6",
+  "min-h-2/12",
+  "min-h-3/4",
+  "min-h-3/5",
+  "min-h-3/6",
+  "min-h-3/12",
+  "min-h-4/5",
+  "min-h-4/6",
+  "min-h-4/12",
+  "min-h-5/6",
+  "min-h-5/12",
+  "min-h-6/12",
+  "min-h-7/12",
+  "min-h-8/12",
+  "min-h-9/12",
+  "min-h-10/12",
+  "min-h-11/12",
   "min-h-auto",
   "min-h-dvh",
   "min-h-dvw",
   "min-h-fit",
   "min-h-full",
+  "min-h-lh",
   "min-h-lvh",
   "min-h-lvw",
   "min-h-max",
   "min-h-min",
-  "min-h-none",
   "min-h-px",
   "min-h-screen",
   "min-h-svh",
   "min-h-svw",
+  "min-inline-0",
+  "min-inline-0.5",
+  "min-inline-1",
+  "min-inline-1.5",
+  "min-inline-2",
+  "min-inline-2.5",
+  "min-inline-3",
+  "min-inline-3.5",
+  "min-inline-4",
+  "min-inline-5",
+  "min-inline-6",
+  "min-inline-7",
+  "min-inline-8",
+  "min-inline-9",
+  "min-inline-10",
+  "min-inline-11",
+  "min-inline-12",
+  "min-inline-14",
+  "min-inline-16",
+  "min-inline-20",
+  "min-inline-24",
+  "min-inline-28",
+  "min-inline-32",
+  "min-inline-36",
+  "min-inline-40",
+  "min-inline-44",
+  "min-inline-48",
+  "min-inline-52",
+  "min-inline-56",
+  "min-inline-60",
+  "min-inline-64",
+  "min-inline-72",
+  "min-inline-80",
+  "min-inline-96",
+  "min-inline-auto",
+  "min-inline-dvw",
+  "min-inline-fit",
+  "min-inline-full",
+  "min-inline-lg",
+  "min-inline-lvw",
+  "min-inline-max",
+  "min-inline-md",
+  "min-inline-1/2",
+  "min-inline-1/3",
+  "min-inline-1/4",
+  "min-inline-1/5",
+  "min-inline-1/6",
+  "min-inline-1/12",
+  "min-inline-2/3",
+  "min-inline-2/4",
+  "min-inline-2/5",
+  "min-inline-2/6",
+  "min-inline-2/12",
+  "min-inline-3/4",
+  "min-inline-3/5",
+  "min-inline-3/6",
+  "min-inline-3/12",
+  "min-inline-4/5",
+  "min-inline-4/6",
+  "min-inline-4/12",
+  "min-inline-5/6",
+  "min-inline-5/12",
+  "min-inline-6/12",
+  "min-inline-7/12",
+  "min-inline-8/12",
+  "min-inline-9/12",
+  "min-inline-10/12",
+  "min-inline-11/12",
+  "min-inline-min",
+  "min-inline-px",
+  "min-inline-screen",
+  "min-inline-svw",
   "min-w-0",
   "min-w-0.5",
   "min-w-1",
   "min-w-1.5",
+  "min-w-2",
+  "min-w-2.5",
+  "min-w-3",
+  "min-w-3.5",
+  "min-w-4",
+  "min-w-5",
+  "min-w-6",
+  "min-w-7",
+  "min-w-8",
+  "min-w-9",
   "min-w-10",
   "min-w-11",
   "min-w-12",
   "min-w-14",
   "min-w-16",
-  "min-w-2",
-  "min-w-2.5",
   "min-w-20",
   "min-w-24",
   "min-w-28",
-  "min-w-3",
-  "min-w-3.5",
   "min-w-32",
   "min-w-36",
-  "min-w-4",
   "min-w-40",
   "min-w-44",
   "min-w-48",
-  "min-w-5",
   "min-w-52",
   "min-w-56",
-  "min-w-6",
   "min-w-60",
   "min-w-64",
-  "min-w-7",
   "min-w-72",
-  "min-w-8",
   "min-w-80",
-  "min-w-9",
   "min-w-96",
   "min-w-auto",
   "min-w-dvh",
   "min-w-dvw",
   "min-w-fit",
   "min-w-full",
+  "min-w-lg",
   "min-w-lvh",
   "min-w-lvw",
   "min-w-max",
+  "min-w-md",
+  "min-w-1/2",
+  "min-w-1/3",
+  "min-w-1/4",
+  "min-w-1/5",
+  "min-w-1/6",
+  "min-w-1/12",
+  "min-w-2/3",
+  "min-w-2/4",
+  "min-w-2/5",
+  "min-w-2/6",
+  "min-w-2/12",
+  "min-w-3/4",
+  "min-w-3/5",
+  "min-w-3/6",
+  "min-w-3/12",
+  "min-w-4/5",
+  "min-w-4/6",
+  "min-w-4/12",
+  "min-w-5/6",
+  "min-w-5/12",
+  "min-w-6/12",
+  "min-w-7/12",
+  "min-w-8/12",
+  "min-w-9/12",
+  "min-w-10/12",
+  "min-w-11/12",
   "min-w-min",
-  "min-w-none",
   "min-w-px",
   "min-w-screen",
   "min-w-svh",
@@ -4788,35 +9094,35 @@ exports[`getClassList 1`] = `
   "ml-0.5",
   "ml-1",
   "ml-1.5",
+  "ml-2",
+  "ml-2.5",
+  "ml-3",
+  "ml-3.5",
+  "ml-4",
+  "ml-5",
+  "ml-6",
+  "ml-7",
+  "ml-8",
+  "ml-9",
   "ml-10",
   "ml-11",
   "ml-12",
   "ml-14",
   "ml-16",
-  "ml-2",
-  "ml-2.5",
   "ml-20",
   "ml-24",
   "ml-28",
-  "ml-3",
-  "ml-3.5",
   "ml-32",
   "ml-36",
-  "ml-4",
   "ml-40",
   "ml-44",
   "ml-48",
-  "ml-5",
   "ml-52",
   "ml-56",
-  "ml-6",
   "ml-60",
   "ml-64",
-  "ml-7",
   "ml-72",
-  "ml-8",
   "ml-80",
-  "ml-9",
   "ml-96",
   "ml-auto",
   "ml-px",
@@ -4824,35 +9130,35 @@ exports[`getClassList 1`] = `
   "mr-0.5",
   "mr-1",
   "mr-1.5",
+  "mr-2",
+  "mr-2.5",
+  "mr-3",
+  "mr-3.5",
+  "mr-4",
+  "mr-5",
+  "mr-6",
+  "mr-7",
+  "mr-8",
+  "mr-9",
   "mr-10",
   "mr-11",
   "mr-12",
   "mr-14",
   "mr-16",
-  "mr-2",
-  "mr-2.5",
   "mr-20",
   "mr-24",
   "mr-28",
-  "mr-3",
-  "mr-3.5",
   "mr-32",
   "mr-36",
-  "mr-4",
   "mr-40",
   "mr-44",
   "mr-48",
-  "mr-5",
   "mr-52",
   "mr-56",
-  "mr-6",
   "mr-60",
   "mr-64",
-  "mr-7",
   "mr-72",
-  "mr-8",
   "mr-80",
-  "mr-9",
   "mr-96",
   "mr-auto",
   "mr-px",
@@ -4860,35 +9166,35 @@ exports[`getClassList 1`] = `
   "ms-0.5",
   "ms-1",
   "ms-1.5",
+  "ms-2",
+  "ms-2.5",
+  "ms-3",
+  "ms-3.5",
+  "ms-4",
+  "ms-5",
+  "ms-6",
+  "ms-7",
+  "ms-8",
+  "ms-9",
   "ms-10",
   "ms-11",
   "ms-12",
   "ms-14",
   "ms-16",
-  "ms-2",
-  "ms-2.5",
   "ms-20",
   "ms-24",
   "ms-28",
-  "ms-3",
-  "ms-3.5",
   "ms-32",
   "ms-36",
-  "ms-4",
   "ms-40",
   "ms-44",
   "ms-48",
-  "ms-5",
   "ms-52",
   "ms-56",
-  "ms-6",
   "ms-60",
   "ms-64",
-  "ms-7",
   "ms-72",
-  "ms-8",
   "ms-80",
-  "ms-9",
   "ms-96",
   "ms-auto",
   "ms-px",
@@ -4896,35 +9202,35 @@ exports[`getClassList 1`] = `
   "mt-0.5",
   "mt-1",
   "mt-1.5",
+  "mt-2",
+  "mt-2.5",
+  "mt-3",
+  "mt-3.5",
+  "mt-4",
+  "mt-5",
+  "mt-6",
+  "mt-7",
+  "mt-8",
+  "mt-9",
   "mt-10",
   "mt-11",
   "mt-12",
   "mt-14",
   "mt-16",
-  "mt-2",
-  "mt-2.5",
   "mt-20",
   "mt-24",
   "mt-28",
-  "mt-3",
-  "mt-3.5",
   "mt-32",
   "mt-36",
-  "mt-4",
   "mt-40",
   "mt-44",
   "mt-48",
-  "mt-5",
   "mt-52",
   "mt-56",
-  "mt-6",
   "mt-60",
   "mt-64",
-  "mt-7",
   "mt-72",
-  "mt-8",
   "mt-80",
-  "mt-9",
   "mt-96",
   "mt-auto",
   "mt-px",
@@ -4932,35 +9238,35 @@ exports[`getClassList 1`] = `
   "mx-0.5",
   "mx-1",
   "mx-1.5",
+  "mx-2",
+  "mx-2.5",
+  "mx-3",
+  "mx-3.5",
+  "mx-4",
+  "mx-5",
+  "mx-6",
+  "mx-7",
+  "mx-8",
+  "mx-9",
   "mx-10",
   "mx-11",
   "mx-12",
   "mx-14",
   "mx-16",
-  "mx-2",
-  "mx-2.5",
   "mx-20",
   "mx-24",
   "mx-28",
-  "mx-3",
-  "mx-3.5",
   "mx-32",
   "mx-36",
-  "mx-4",
   "mx-40",
   "mx-44",
   "mx-48",
-  "mx-5",
   "mx-52",
   "mx-56",
-  "mx-6",
   "mx-60",
   "mx-64",
-  "mx-7",
   "mx-72",
-  "mx-8",
   "mx-80",
-  "mx-9",
   "mx-96",
   "mx-auto",
   "mx-px",
@@ -4968,35 +9274,35 @@ exports[`getClassList 1`] = `
   "my-0.5",
   "my-1",
   "my-1.5",
+  "my-2",
+  "my-2.5",
+  "my-3",
+  "my-3.5",
+  "my-4",
+  "my-5",
+  "my-6",
+  "my-7",
+  "my-8",
+  "my-9",
   "my-10",
   "my-11",
   "my-12",
   "my-14",
   "my-16",
-  "my-2",
-  "my-2.5",
   "my-20",
   "my-24",
   "my-28",
-  "my-3",
-  "my-3.5",
   "my-32",
   "my-36",
-  "my-4",
   "my-40",
   "my-44",
   "my-48",
-  "my-5",
   "my-52",
   "my-56",
-  "my-6",
   "my-60",
   "my-64",
-  "my-7",
   "my-72",
-  "my-8",
   "my-80",
-  "my-9",
   "my-96",
   "my-auto",
   "my-px",
@@ -5006,23 +9312,23 @@ exports[`getClassList 1`] = `
   "not-italic",
   "not-sr-only",
   "object-bottom",
+  "object-bottom-left",
+  "object-bottom-right",
   "object-center",
   "object-contain",
   "object-cover",
   "object-fill",
   "object-left",
-  "object-left-bottom",
-  "object-left-top",
   "object-none",
   "object-right",
-  "object-right-bottom",
-  "object-right-top",
   "object-scale-down",
   "object-top",
+  "object-top-left",
+  "object-top-right",
   "oldstyle-nums",
   "opacity-0",
+  "opacity-5",
   "opacity-10",
-  "opacity-100",
   "opacity-15",
   "opacity-20",
   "opacity-25",
@@ -5030,7 +9336,6 @@ exports[`getClassList 1`] = `
   "opacity-35",
   "opacity-40",
   "opacity-45",
-  "opacity-5",
   "opacity-50",
   "opacity-55",
   "opacity-60",
@@ -5041,11 +9346,9 @@ exports[`getClassList 1`] = `
   "opacity-85",
   "opacity-90",
   "opacity-95",
+  "opacity-100",
   "opacity-background",
   "order-1",
-  "order-10",
-  "order-11",
-  "order-12",
   "order-2",
   "order-3",
   "order-4",
@@ -5054,9 +9357,11 @@ exports[`getClassList 1`] = `
   "order-7",
   "order-8",
   "order-9",
+  "order-10",
+  "order-11",
+  "order-12",
   "order-first",
   "order-last",
-  "order-none",
   "ordinal",
   "origin-bottom",
   "origin-bottom-left",
@@ -5089,6 +9394,7 @@ exports[`getClassList 1`] = `
   "outline/90",
   "outline/95",
   "outline/100",
+  "outline/background",
   "outline-0",
   "outline-1",
   "outline-2",
@@ -5116,6 +9422,7 @@ exports[`getClassList 1`] = `
   "outline-current/90",
   "outline-current/95",
   "outline-current/100",
+  "outline-current/background",
   "outline-dashed",
   "outline-dotted",
   "outline-double",
@@ -5142,6 +9449,7 @@ exports[`getClassList 1`] = `
   "outline-inherit/90",
   "outline-inherit/95",
   "outline-inherit/100",
+  "outline-inherit/background",
   "outline-none",
   "outline-offset-0",
   "outline-offset-1",
@@ -5171,6 +9479,7 @@ exports[`getClassList 1`] = `
   "outline-transparent/90",
   "outline-transparent/95",
   "outline-transparent/100",
+  "outline-transparent/background",
   "overflow-auto",
   "overflow-clip",
   "overflow-hidden",
@@ -5200,105 +9509,175 @@ exports[`getClassList 1`] = `
   "p-0.5",
   "p-1",
   "p-1.5",
+  "p-2",
+  "p-2.5",
+  "p-3",
+  "p-3.5",
+  "p-4",
+  "p-5",
+  "p-6",
+  "p-7",
+  "p-8",
+  "p-9",
   "p-10",
   "p-11",
   "p-12",
   "p-14",
   "p-16",
-  "p-2",
-  "p-2.5",
   "p-20",
   "p-24",
   "p-28",
-  "p-3",
-  "p-3.5",
   "p-32",
   "p-36",
-  "p-4",
   "p-40",
   "p-44",
   "p-48",
-  "p-5",
   "p-52",
   "p-56",
-  "p-6",
   "p-60",
   "p-64",
-  "p-7",
   "p-72",
-  "p-8",
   "p-80",
-  "p-9",
   "p-96",
   "p-px",
   "pb-0",
   "pb-0.5",
   "pb-1",
   "pb-1.5",
+  "pb-2",
+  "pb-2.5",
+  "pb-3",
+  "pb-3.5",
+  "pb-4",
+  "pb-5",
+  "pb-6",
+  "pb-7",
+  "pb-8",
+  "pb-9",
   "pb-10",
   "pb-11",
   "pb-12",
   "pb-14",
   "pb-16",
-  "pb-2",
-  "pb-2.5",
   "pb-20",
   "pb-24",
   "pb-28",
-  "pb-3",
-  "pb-3.5",
   "pb-32",
   "pb-36",
-  "pb-4",
   "pb-40",
   "pb-44",
   "pb-48",
-  "pb-5",
   "pb-52",
   "pb-56",
-  "pb-6",
   "pb-60",
   "pb-64",
-  "pb-7",
   "pb-72",
-  "pb-8",
   "pb-80",
-  "pb-9",
   "pb-96",
   "pb-px",
+  "pbe-0",
+  "pbe-0.5",
+  "pbe-1",
+  "pbe-1.5",
+  "pbe-2",
+  "pbe-2.5",
+  "pbe-3",
+  "pbe-3.5",
+  "pbe-4",
+  "pbe-5",
+  "pbe-6",
+  "pbe-7",
+  "pbe-8",
+  "pbe-9",
+  "pbe-10",
+  "pbe-11",
+  "pbe-12",
+  "pbe-14",
+  "pbe-16",
+  "pbe-20",
+  "pbe-24",
+  "pbe-28",
+  "pbe-32",
+  "pbe-36",
+  "pbe-40",
+  "pbe-44",
+  "pbe-48",
+  "pbe-52",
+  "pbe-56",
+  "pbe-60",
+  "pbe-64",
+  "pbe-72",
+  "pbe-80",
+  "pbe-96",
+  "pbe-px",
+  "pbs-0",
+  "pbs-0.5",
+  "pbs-1",
+  "pbs-1.5",
+  "pbs-2",
+  "pbs-2.5",
+  "pbs-3",
+  "pbs-3.5",
+  "pbs-4",
+  "pbs-5",
+  "pbs-6",
+  "pbs-7",
+  "pbs-8",
+  "pbs-9",
+  "pbs-10",
+  "pbs-11",
+  "pbs-12",
+  "pbs-14",
+  "pbs-16",
+  "pbs-20",
+  "pbs-24",
+  "pbs-28",
+  "pbs-32",
+  "pbs-36",
+  "pbs-40",
+  "pbs-44",
+  "pbs-48",
+  "pbs-52",
+  "pbs-56",
+  "pbs-60",
+  "pbs-64",
+  "pbs-72",
+  "pbs-80",
+  "pbs-96",
+  "pbs-px",
   "pe-0",
   "pe-0.5",
   "pe-1",
   "pe-1.5",
+  "pe-2",
+  "pe-2.5",
+  "pe-3",
+  "pe-3.5",
+  "pe-4",
+  "pe-5",
+  "pe-6",
+  "pe-7",
+  "pe-8",
+  "pe-9",
   "pe-10",
   "pe-11",
   "pe-12",
   "pe-14",
   "pe-16",
-  "pe-2",
-  "pe-2.5",
   "pe-20",
   "pe-24",
   "pe-28",
-  "pe-3",
-  "pe-3.5",
   "pe-32",
   "pe-36",
-  "pe-4",
   "pe-40",
   "pe-44",
   "pe-48",
-  "pe-5",
   "pe-52",
   "pe-56",
-  "pe-6",
   "pe-60",
   "pe-64",
-  "pe-7",
   "pe-72",
-  "pe-8",
   "pe-80",
-  "pe-9",
   "pe-96",
   "pe-px",
   "perspective-dramatic",
@@ -5317,53 +9696,59 @@ exports[`getClassList 1`] = `
   "pl-0.5",
   "pl-1",
   "pl-1.5",
+  "pl-2",
+  "pl-2.5",
+  "pl-3",
+  "pl-3.5",
+  "pl-4",
+  "pl-5",
+  "pl-6",
+  "pl-7",
+  "pl-8",
+  "pl-9",
   "pl-10",
   "pl-11",
   "pl-12",
   "pl-14",
   "pl-16",
-  "pl-2",
-  "pl-2.5",
   "pl-20",
   "pl-24",
   "pl-28",
-  "pl-3",
-  "pl-3.5",
   "pl-32",
   "pl-36",
-  "pl-4",
   "pl-40",
   "pl-44",
   "pl-48",
-  "pl-5",
   "pl-52",
   "pl-56",
-  "pl-6",
   "pl-60",
   "pl-64",
-  "pl-7",
   "pl-72",
-  "pl-8",
   "pl-80",
-  "pl-9",
   "pl-96",
   "pl-px",
   "place-content-around",
   "place-content-baseline",
   "place-content-between",
   "place-content-center",
+  "place-content-center-safe",
   "place-content-end",
+  "place-content-end-safe",
   "place-content-evenly",
   "place-content-start",
   "place-content-stretch",
   "place-items-baseline",
   "place-items-center",
+  "place-items-center-safe",
   "place-items-end",
+  "place-items-end-safe",
   "place-items-start",
   "place-items-stretch",
   "place-self-auto",
   "place-self-center",
+  "place-self-center-safe",
   "place-self-end",
+  "place-self-end-safe",
   "place-self-start",
   "place-self-stretch",
   "placeholder-current",
@@ -5388,6 +9773,7 @@ exports[`getClassList 1`] = `
   "placeholder-current/90",
   "placeholder-current/95",
   "placeholder-current/100",
+  "placeholder-current/background",
   "placeholder-inherit",
   "placeholder-inherit/0",
   "placeholder-inherit/5",
@@ -5410,6 +9796,7 @@ exports[`getClassList 1`] = `
   "placeholder-inherit/90",
   "placeholder-inherit/95",
   "placeholder-inherit/100",
+  "placeholder-inherit/background",
   "placeholder-transparent",
   "placeholder-transparent/0",
   "placeholder-transparent/5",
@@ -5432,41 +9819,42 @@ exports[`getClassList 1`] = `
   "placeholder-transparent/90",
   "placeholder-transparent/95",
   "placeholder-transparent/100",
+  "placeholder-transparent/background",
   "pointer-events-auto",
   "pointer-events-none",
   "pr-0",
   "pr-0.5",
   "pr-1",
   "pr-1.5",
+  "pr-2",
+  "pr-2.5",
+  "pr-3",
+  "pr-3.5",
+  "pr-4",
+  "pr-5",
+  "pr-6",
+  "pr-7",
+  "pr-8",
+  "pr-9",
   "pr-10",
   "pr-11",
   "pr-12",
   "pr-14",
   "pr-16",
-  "pr-2",
-  "pr-2.5",
   "pr-20",
   "pr-24",
   "pr-28",
-  "pr-3",
-  "pr-3.5",
   "pr-32",
   "pr-36",
-  "pr-4",
   "pr-40",
   "pr-44",
   "pr-48",
-  "pr-5",
   "pr-52",
   "pr-56",
-  "pr-6",
   "pr-60",
   "pr-64",
-  "pr-7",
   "pr-72",
-  "pr-8",
   "pr-80",
-  "pr-9",
   "pr-96",
   "pr-px",
   "proportional-nums",
@@ -5474,140 +9862,140 @@ exports[`getClassList 1`] = `
   "ps-0.5",
   "ps-1",
   "ps-1.5",
+  "ps-2",
+  "ps-2.5",
+  "ps-3",
+  "ps-3.5",
+  "ps-4",
+  "ps-5",
+  "ps-6",
+  "ps-7",
+  "ps-8",
+  "ps-9",
   "ps-10",
   "ps-11",
   "ps-12",
   "ps-14",
   "ps-16",
-  "ps-2",
-  "ps-2.5",
   "ps-20",
   "ps-24",
   "ps-28",
-  "ps-3",
-  "ps-3.5",
   "ps-32",
   "ps-36",
-  "ps-4",
   "ps-40",
   "ps-44",
   "ps-48",
-  "ps-5",
   "ps-52",
   "ps-56",
-  "ps-6",
   "ps-60",
   "ps-64",
-  "ps-7",
   "ps-72",
-  "ps-8",
   "ps-80",
-  "ps-9",
   "ps-96",
   "ps-px",
   "pt-0",
   "pt-0.5",
   "pt-1",
   "pt-1.5",
+  "pt-2",
+  "pt-2.5",
+  "pt-3",
+  "pt-3.5",
+  "pt-4",
+  "pt-5",
+  "pt-6",
+  "pt-7",
+  "pt-8",
+  "pt-9",
   "pt-10",
   "pt-11",
   "pt-12",
   "pt-14",
   "pt-16",
-  "pt-2",
-  "pt-2.5",
   "pt-20",
   "pt-24",
   "pt-28",
-  "pt-3",
-  "pt-3.5",
   "pt-32",
   "pt-36",
-  "pt-4",
   "pt-40",
   "pt-44",
   "pt-48",
-  "pt-5",
   "pt-52",
   "pt-56",
-  "pt-6",
   "pt-60",
   "pt-64",
-  "pt-7",
   "pt-72",
-  "pt-8",
   "pt-80",
-  "pt-9",
   "pt-96",
   "pt-px",
   "px-0",
   "px-0.5",
   "px-1",
   "px-1.5",
+  "px-2",
+  "px-2.5",
+  "px-3",
+  "px-3.5",
+  "px-4",
+  "px-5",
+  "px-6",
+  "px-7",
+  "px-8",
+  "px-9",
   "px-10",
   "px-11",
   "px-12",
   "px-14",
   "px-16",
-  "px-2",
-  "px-2.5",
   "px-20",
   "px-24",
   "px-28",
-  "px-3",
-  "px-3.5",
   "px-32",
   "px-36",
-  "px-4",
   "px-40",
   "px-44",
   "px-48",
-  "px-5",
   "px-52",
   "px-56",
-  "px-6",
   "px-60",
   "px-64",
-  "px-7",
   "px-72",
-  "px-8",
   "px-80",
-  "px-9",
   "px-96",
   "px-px",
   "py-0",
   "py-0.5",
   "py-1",
   "py-1.5",
+  "py-2",
+  "py-2.5",
+  "py-3",
+  "py-3.5",
+  "py-4",
+  "py-5",
+  "py-6",
+  "py-7",
+  "py-8",
+  "py-9",
   "py-10",
   "py-11",
   "py-12",
   "py-14",
   "py-16",
-  "py-2",
-  "py-2.5",
   "py-20",
   "py-24",
   "py-28",
-  "py-3",
-  "py-3.5",
   "py-32",
   "py-36",
-  "py-4",
   "py-40",
   "py-44",
   "py-48",
-  "py-5",
   "py-52",
   "py-56",
-  "py-6",
   "py-60",
   "py-64",
-  "py-7",
   "py-72",
-  "py-8",
   "py-80",
-  "py-9",
   "py-96",
   "py-px",
   "relative",
@@ -5619,36 +10007,62 @@ exports[`getClassList 1`] = `
   "right-0.5",
   "right-1",
   "right-1.5",
+  "right-2",
+  "right-2.5",
+  "right-3",
+  "right-3.5",
+  "right-4",
+  "right-5",
+  "right-6",
+  "right-7",
+  "right-8",
+  "right-9",
   "right-10",
   "right-11",
   "right-12",
   "right-14",
   "right-16",
-  "right-2",
-  "right-2.5",
   "right-20",
   "right-24",
   "right-28",
-  "right-3",
-  "right-3.5",
   "right-32",
   "right-36",
-  "right-4",
   "right-40",
   "right-44",
   "right-48",
-  "right-5",
   "right-52",
   "right-56",
-  "right-6",
   "right-60",
   "right-64",
-  "right-7",
   "right-72",
-  "right-8",
   "right-80",
-  "right-9",
   "right-96",
+  "right-1/2",
+  "right-1/3",
+  "right-1/4",
+  "right-1/5",
+  "right-1/6",
+  "right-1/12",
+  "right-2/3",
+  "right-2/4",
+  "right-2/5",
+  "right-2/6",
+  "right-2/12",
+  "right-3/4",
+  "right-3/5",
+  "right-3/6",
+  "right-3/12",
+  "right-4/5",
+  "right-4/6",
+  "right-4/12",
+  "right-5/6",
+  "right-5/12",
+  "right-6/12",
+  "right-7/12",
+  "right-8/12",
+  "right-9/12",
+  "right-10/12",
+  "right-11/12",
   "right-auto",
   "right-full",
   "right-px",
@@ -5680,6 +10094,7 @@ exports[`getClassList 1`] = `
   "ring-current/90",
   "ring-current/95",
   "ring-current/100",
+  "ring-current/background",
   "ring-inherit",
   "ring-inherit/0",
   "ring-inherit/5",
@@ -5702,6 +10117,7 @@ exports[`getClassList 1`] = `
   "ring-inherit/90",
   "ring-inherit/95",
   "ring-inherit/100",
+  "ring-inherit/background",
   "ring-inset",
   "ring-offset-0",
   "ring-offset-1",
@@ -5730,6 +10146,7 @@ exports[`getClassList 1`] = `
   "ring-offset-current/90",
   "ring-offset-current/95",
   "ring-offset-current/100",
+  "ring-offset-current/background",
   "ring-offset-inherit",
   "ring-offset-inherit/0",
   "ring-offset-inherit/5",
@@ -5752,6 +10169,7 @@ exports[`getClassList 1`] = `
   "ring-offset-inherit/90",
   "ring-offset-inherit/95",
   "ring-offset-inherit/100",
+  "ring-offset-inherit/background",
   "ring-offset-transparent",
   "ring-offset-transparent/0",
   "ring-offset-transparent/5",
@@ -5774,6 +10192,7 @@ exports[`getClassList 1`] = `
   "ring-offset-transparent/90",
   "ring-offset-transparent/95",
   "ring-offset-transparent/100",
+  "ring-offset-transparent/background",
   "ring-transparent",
   "ring-transparent/0",
   "ring-transparent/5",
@@ -5796,43 +10215,44 @@ exports[`getClassList 1`] = `
   "ring-transparent/90",
   "ring-transparent/95",
   "ring-transparent/100",
+  "ring-transparent/background",
   "rotate-0",
   "rotate-1",
-  "rotate-12",
-  "rotate-180",
   "rotate-2",
   "rotate-3",
-  "rotate-45",
   "rotate-6",
+  "rotate-12",
+  "rotate-45",
   "rotate-90",
+  "rotate-180",
   "rotate-none",
   "rotate-x-0",
   "rotate-x-1",
-  "rotate-x-12",
-  "rotate-x-180",
   "rotate-x-2",
   "rotate-x-3",
-  "rotate-x-45",
   "rotate-x-6",
+  "rotate-x-12",
+  "rotate-x-45",
   "rotate-x-90",
+  "rotate-x-180",
   "rotate-y-0",
   "rotate-y-1",
-  "rotate-y-12",
-  "rotate-y-180",
   "rotate-y-2",
   "rotate-y-3",
-  "rotate-y-45",
   "rotate-y-6",
+  "rotate-y-12",
+  "rotate-y-45",
   "rotate-y-90",
+  "rotate-y-180",
   "rotate-z-0",
   "rotate-z-1",
-  "rotate-z-12",
-  "rotate-z-180",
   "rotate-z-2",
   "rotate-z-3",
-  "rotate-z-45",
   "rotate-z-6",
+  "rotate-z-12",
+  "rotate-z-45",
   "rotate-z-90",
+  "rotate-z-180",
   "rounded-b-full",
   "rounded-b-none",
   "rounded-bl-full",
@@ -5865,10 +10285,6 @@ exports[`getClassList 1`] = `
   "rounded-tr-none",
   "row-auto",
   "row-end-1",
-  "row-end-10",
-  "row-end-11",
-  "row-end-12",
-  "row-end-13",
   "row-end-2",
   "row-end-3",
   "row-end-4",
@@ -5877,11 +10293,12 @@ exports[`getClassList 1`] = `
   "row-end-7",
   "row-end-8",
   "row-end-9",
+  "row-end-10",
+  "row-end-11",
+  "row-end-12",
+  "row-end-13",
   "row-end-auto",
   "row-span-1",
-  "row-span-10",
-  "row-span-11",
-  "row-span-12",
   "row-span-2",
   "row-span-3",
   "row-span-4",
@@ -5890,12 +10307,11 @@ exports[`getClassList 1`] = `
   "row-span-7",
   "row-span-8",
   "row-span-9",
+  "row-span-10",
+  "row-span-11",
+  "row-span-12",
   "row-span-full",
   "row-start-1",
-  "row-start-10",
-  "row-start-11",
-  "row-start-12",
-  "row-start-13",
   "row-start-2",
   "row-start-3",
   "row-start-4",
@@ -5904,58 +10320,62 @@ exports[`getClassList 1`] = `
   "row-start-7",
   "row-start-8",
   "row-start-9",
+  "row-start-10",
+  "row-start-11",
+  "row-start-12",
+  "row-start-13",
   "row-start-auto",
   "saturate-0",
+  "saturate-50",
   "saturate-100",
   "saturate-150",
   "saturate-200",
-  "saturate-50",
   "scale-0",
+  "scale-3d",
+  "scale-50",
+  "scale-75",
+  "scale-90",
+  "scale-95",
   "scale-100",
   "scale-105",
   "scale-110",
   "scale-125",
   "scale-150",
   "scale-200",
-  "scale-3d",
-  "scale-50",
-  "scale-75",
-  "scale-90",
-  "scale-95",
   "scale-none",
   "scale-x-0",
+  "scale-x-50",
+  "scale-x-75",
+  "scale-x-90",
+  "scale-x-95",
   "scale-x-100",
   "scale-x-105",
   "scale-x-110",
   "scale-x-125",
   "scale-x-150",
   "scale-x-200",
-  "scale-x-50",
-  "scale-x-75",
-  "scale-x-90",
-  "scale-x-95",
   "scale-y-0",
+  "scale-y-50",
+  "scale-y-75",
+  "scale-y-90",
+  "scale-y-95",
   "scale-y-100",
   "scale-y-105",
   "scale-y-110",
   "scale-y-125",
   "scale-y-150",
   "scale-y-200",
-  "scale-y-50",
-  "scale-y-75",
-  "scale-y-90",
-  "scale-y-95",
   "scale-z-0",
+  "scale-z-50",
+  "scale-z-75",
+  "scale-z-90",
+  "scale-z-95",
   "scale-z-100",
   "scale-z-105",
   "scale-z-110",
   "scale-z-125",
   "scale-z-150",
   "scale-z-200",
-  "scale-z-50",
-  "scale-z-75",
-  "scale-z-90",
-  "scale-z-95",
   "scheme-dark",
   "scheme-light",
   "scheme-light-dark",
@@ -5967,648 +10387,934 @@ exports[`getClassList 1`] = `
   "scroll-m-0.5",
   "scroll-m-1",
   "scroll-m-1.5",
+  "scroll-m-2",
+  "scroll-m-2.5",
+  "scroll-m-3",
+  "scroll-m-3.5",
+  "scroll-m-4",
+  "scroll-m-5",
+  "scroll-m-6",
+  "scroll-m-7",
+  "scroll-m-8",
+  "scroll-m-9",
   "scroll-m-10",
   "scroll-m-11",
   "scroll-m-12",
   "scroll-m-14",
   "scroll-m-16",
-  "scroll-m-2",
-  "scroll-m-2.5",
   "scroll-m-20",
   "scroll-m-24",
   "scroll-m-28",
-  "scroll-m-3",
-  "scroll-m-3.5",
   "scroll-m-32",
   "scroll-m-36",
-  "scroll-m-4",
   "scroll-m-40",
   "scroll-m-44",
   "scroll-m-48",
-  "scroll-m-5",
   "scroll-m-52",
   "scroll-m-56",
-  "scroll-m-6",
   "scroll-m-60",
   "scroll-m-64",
-  "scroll-m-7",
   "scroll-m-72",
-  "scroll-m-8",
   "scroll-m-80",
-  "scroll-m-9",
   "scroll-m-96",
   "scroll-m-px",
   "scroll-mb-0",
   "scroll-mb-0.5",
   "scroll-mb-1",
   "scroll-mb-1.5",
+  "scroll-mb-2",
+  "scroll-mb-2.5",
+  "scroll-mb-3",
+  "scroll-mb-3.5",
+  "scroll-mb-4",
+  "scroll-mb-5",
+  "scroll-mb-6",
+  "scroll-mb-7",
+  "scroll-mb-8",
+  "scroll-mb-9",
   "scroll-mb-10",
   "scroll-mb-11",
   "scroll-mb-12",
   "scroll-mb-14",
   "scroll-mb-16",
-  "scroll-mb-2",
-  "scroll-mb-2.5",
   "scroll-mb-20",
   "scroll-mb-24",
   "scroll-mb-28",
-  "scroll-mb-3",
-  "scroll-mb-3.5",
   "scroll-mb-32",
   "scroll-mb-36",
-  "scroll-mb-4",
   "scroll-mb-40",
   "scroll-mb-44",
   "scroll-mb-48",
-  "scroll-mb-5",
   "scroll-mb-52",
   "scroll-mb-56",
-  "scroll-mb-6",
   "scroll-mb-60",
   "scroll-mb-64",
-  "scroll-mb-7",
   "scroll-mb-72",
-  "scroll-mb-8",
   "scroll-mb-80",
-  "scroll-mb-9",
   "scroll-mb-96",
   "scroll-mb-px",
+  "scroll-mbe-0",
+  "scroll-mbe-0.5",
+  "scroll-mbe-1",
+  "scroll-mbe-1.5",
+  "scroll-mbe-2",
+  "scroll-mbe-2.5",
+  "scroll-mbe-3",
+  "scroll-mbe-3.5",
+  "scroll-mbe-4",
+  "scroll-mbe-5",
+  "scroll-mbe-6",
+  "scroll-mbe-7",
+  "scroll-mbe-8",
+  "scroll-mbe-9",
+  "scroll-mbe-10",
+  "scroll-mbe-11",
+  "scroll-mbe-12",
+  "scroll-mbe-14",
+  "scroll-mbe-16",
+  "scroll-mbe-20",
+  "scroll-mbe-24",
+  "scroll-mbe-28",
+  "scroll-mbe-32",
+  "scroll-mbe-36",
+  "scroll-mbe-40",
+  "scroll-mbe-44",
+  "scroll-mbe-48",
+  "scroll-mbe-52",
+  "scroll-mbe-56",
+  "scroll-mbe-60",
+  "scroll-mbe-64",
+  "scroll-mbe-72",
+  "scroll-mbe-80",
+  "scroll-mbe-96",
+  "scroll-mbe-px",
+  "scroll-mbs-0",
+  "scroll-mbs-0.5",
+  "scroll-mbs-1",
+  "scroll-mbs-1.5",
+  "scroll-mbs-2",
+  "scroll-mbs-2.5",
+  "scroll-mbs-3",
+  "scroll-mbs-3.5",
+  "scroll-mbs-4",
+  "scroll-mbs-5",
+  "scroll-mbs-6",
+  "scroll-mbs-7",
+  "scroll-mbs-8",
+  "scroll-mbs-9",
+  "scroll-mbs-10",
+  "scroll-mbs-11",
+  "scroll-mbs-12",
+  "scroll-mbs-14",
+  "scroll-mbs-16",
+  "scroll-mbs-20",
+  "scroll-mbs-24",
+  "scroll-mbs-28",
+  "scroll-mbs-32",
+  "scroll-mbs-36",
+  "scroll-mbs-40",
+  "scroll-mbs-44",
+  "scroll-mbs-48",
+  "scroll-mbs-52",
+  "scroll-mbs-56",
+  "scroll-mbs-60",
+  "scroll-mbs-64",
+  "scroll-mbs-72",
+  "scroll-mbs-80",
+  "scroll-mbs-96",
+  "scroll-mbs-px",
   "scroll-me-0",
   "scroll-me-0.5",
   "scroll-me-1",
   "scroll-me-1.5",
+  "scroll-me-2",
+  "scroll-me-2.5",
+  "scroll-me-3",
+  "scroll-me-3.5",
+  "scroll-me-4",
+  "scroll-me-5",
+  "scroll-me-6",
+  "scroll-me-7",
+  "scroll-me-8",
+  "scroll-me-9",
   "scroll-me-10",
   "scroll-me-11",
   "scroll-me-12",
   "scroll-me-14",
   "scroll-me-16",
-  "scroll-me-2",
-  "scroll-me-2.5",
   "scroll-me-20",
   "scroll-me-24",
   "scroll-me-28",
-  "scroll-me-3",
-  "scroll-me-3.5",
   "scroll-me-32",
   "scroll-me-36",
-  "scroll-me-4",
   "scroll-me-40",
   "scroll-me-44",
   "scroll-me-48",
-  "scroll-me-5",
   "scroll-me-52",
   "scroll-me-56",
-  "scroll-me-6",
   "scroll-me-60",
   "scroll-me-64",
-  "scroll-me-7",
   "scroll-me-72",
-  "scroll-me-8",
   "scroll-me-80",
-  "scroll-me-9",
   "scroll-me-96",
   "scroll-me-px",
   "scroll-ml-0",
   "scroll-ml-0.5",
   "scroll-ml-1",
   "scroll-ml-1.5",
+  "scroll-ml-2",
+  "scroll-ml-2.5",
+  "scroll-ml-3",
+  "scroll-ml-3.5",
+  "scroll-ml-4",
+  "scroll-ml-5",
+  "scroll-ml-6",
+  "scroll-ml-7",
+  "scroll-ml-8",
+  "scroll-ml-9",
   "scroll-ml-10",
   "scroll-ml-11",
   "scroll-ml-12",
   "scroll-ml-14",
   "scroll-ml-16",
-  "scroll-ml-2",
-  "scroll-ml-2.5",
   "scroll-ml-20",
   "scroll-ml-24",
   "scroll-ml-28",
-  "scroll-ml-3",
-  "scroll-ml-3.5",
   "scroll-ml-32",
   "scroll-ml-36",
-  "scroll-ml-4",
   "scroll-ml-40",
   "scroll-ml-44",
   "scroll-ml-48",
-  "scroll-ml-5",
   "scroll-ml-52",
   "scroll-ml-56",
-  "scroll-ml-6",
   "scroll-ml-60",
   "scroll-ml-64",
-  "scroll-ml-7",
   "scroll-ml-72",
-  "scroll-ml-8",
   "scroll-ml-80",
-  "scroll-ml-9",
   "scroll-ml-96",
   "scroll-ml-px",
   "scroll-mr-0",
   "scroll-mr-0.5",
   "scroll-mr-1",
   "scroll-mr-1.5",
+  "scroll-mr-2",
+  "scroll-mr-2.5",
+  "scroll-mr-3",
+  "scroll-mr-3.5",
+  "scroll-mr-4",
+  "scroll-mr-5",
+  "scroll-mr-6",
+  "scroll-mr-7",
+  "scroll-mr-8",
+  "scroll-mr-9",
   "scroll-mr-10",
   "scroll-mr-11",
   "scroll-mr-12",
   "scroll-mr-14",
   "scroll-mr-16",
-  "scroll-mr-2",
-  "scroll-mr-2.5",
   "scroll-mr-20",
   "scroll-mr-24",
   "scroll-mr-28",
-  "scroll-mr-3",
-  "scroll-mr-3.5",
   "scroll-mr-32",
   "scroll-mr-36",
-  "scroll-mr-4",
   "scroll-mr-40",
   "scroll-mr-44",
   "scroll-mr-48",
-  "scroll-mr-5",
   "scroll-mr-52",
   "scroll-mr-56",
-  "scroll-mr-6",
   "scroll-mr-60",
   "scroll-mr-64",
-  "scroll-mr-7",
   "scroll-mr-72",
-  "scroll-mr-8",
   "scroll-mr-80",
-  "scroll-mr-9",
   "scroll-mr-96",
   "scroll-mr-px",
   "scroll-ms-0",
   "scroll-ms-0.5",
   "scroll-ms-1",
   "scroll-ms-1.5",
+  "scroll-ms-2",
+  "scroll-ms-2.5",
+  "scroll-ms-3",
+  "scroll-ms-3.5",
+  "scroll-ms-4",
+  "scroll-ms-5",
+  "scroll-ms-6",
+  "scroll-ms-7",
+  "scroll-ms-8",
+  "scroll-ms-9",
   "scroll-ms-10",
   "scroll-ms-11",
   "scroll-ms-12",
   "scroll-ms-14",
   "scroll-ms-16",
-  "scroll-ms-2",
-  "scroll-ms-2.5",
   "scroll-ms-20",
   "scroll-ms-24",
   "scroll-ms-28",
-  "scroll-ms-3",
-  "scroll-ms-3.5",
   "scroll-ms-32",
   "scroll-ms-36",
-  "scroll-ms-4",
   "scroll-ms-40",
   "scroll-ms-44",
   "scroll-ms-48",
-  "scroll-ms-5",
   "scroll-ms-52",
   "scroll-ms-56",
-  "scroll-ms-6",
   "scroll-ms-60",
   "scroll-ms-64",
-  "scroll-ms-7",
   "scroll-ms-72",
-  "scroll-ms-8",
   "scroll-ms-80",
-  "scroll-ms-9",
   "scroll-ms-96",
   "scroll-ms-px",
   "scroll-mt-0",
   "scroll-mt-0.5",
   "scroll-mt-1",
   "scroll-mt-1.5",
+  "scroll-mt-2",
+  "scroll-mt-2.5",
+  "scroll-mt-3",
+  "scroll-mt-3.5",
+  "scroll-mt-4",
+  "scroll-mt-5",
+  "scroll-mt-6",
+  "scroll-mt-7",
+  "scroll-mt-8",
+  "scroll-mt-9",
   "scroll-mt-10",
   "scroll-mt-11",
   "scroll-mt-12",
   "scroll-mt-14",
   "scroll-mt-16",
-  "scroll-mt-2",
-  "scroll-mt-2.5",
   "scroll-mt-20",
   "scroll-mt-24",
   "scroll-mt-28",
-  "scroll-mt-3",
-  "scroll-mt-3.5",
   "scroll-mt-32",
   "scroll-mt-36",
-  "scroll-mt-4",
   "scroll-mt-40",
   "scroll-mt-44",
   "scroll-mt-48",
-  "scroll-mt-5",
   "scroll-mt-52",
   "scroll-mt-56",
-  "scroll-mt-6",
   "scroll-mt-60",
   "scroll-mt-64",
-  "scroll-mt-7",
   "scroll-mt-72",
-  "scroll-mt-8",
   "scroll-mt-80",
-  "scroll-mt-9",
   "scroll-mt-96",
   "scroll-mt-px",
   "scroll-mx-0",
   "scroll-mx-0.5",
   "scroll-mx-1",
   "scroll-mx-1.5",
+  "scroll-mx-2",
+  "scroll-mx-2.5",
+  "scroll-mx-3",
+  "scroll-mx-3.5",
+  "scroll-mx-4",
+  "scroll-mx-5",
+  "scroll-mx-6",
+  "scroll-mx-7",
+  "scroll-mx-8",
+  "scroll-mx-9",
   "scroll-mx-10",
   "scroll-mx-11",
   "scroll-mx-12",
   "scroll-mx-14",
   "scroll-mx-16",
-  "scroll-mx-2",
-  "scroll-mx-2.5",
   "scroll-mx-20",
   "scroll-mx-24",
   "scroll-mx-28",
-  "scroll-mx-3",
-  "scroll-mx-3.5",
   "scroll-mx-32",
   "scroll-mx-36",
-  "scroll-mx-4",
   "scroll-mx-40",
   "scroll-mx-44",
   "scroll-mx-48",
-  "scroll-mx-5",
   "scroll-mx-52",
   "scroll-mx-56",
-  "scroll-mx-6",
   "scroll-mx-60",
   "scroll-mx-64",
-  "scroll-mx-7",
   "scroll-mx-72",
-  "scroll-mx-8",
   "scroll-mx-80",
-  "scroll-mx-9",
   "scroll-mx-96",
   "scroll-mx-px",
   "scroll-my-0",
   "scroll-my-0.5",
   "scroll-my-1",
   "scroll-my-1.5",
+  "scroll-my-2",
+  "scroll-my-2.5",
+  "scroll-my-3",
+  "scroll-my-3.5",
+  "scroll-my-4",
+  "scroll-my-5",
+  "scroll-my-6",
+  "scroll-my-7",
+  "scroll-my-8",
+  "scroll-my-9",
   "scroll-my-10",
   "scroll-my-11",
   "scroll-my-12",
   "scroll-my-14",
   "scroll-my-16",
-  "scroll-my-2",
-  "scroll-my-2.5",
   "scroll-my-20",
   "scroll-my-24",
   "scroll-my-28",
-  "scroll-my-3",
-  "scroll-my-3.5",
   "scroll-my-32",
   "scroll-my-36",
-  "scroll-my-4",
   "scroll-my-40",
   "scroll-my-44",
   "scroll-my-48",
-  "scroll-my-5",
   "scroll-my-52",
   "scroll-my-56",
-  "scroll-my-6",
   "scroll-my-60",
   "scroll-my-64",
-  "scroll-my-7",
   "scroll-my-72",
-  "scroll-my-8",
   "scroll-my-80",
-  "scroll-my-9",
   "scroll-my-96",
   "scroll-my-px",
   "scroll-p-0",
   "scroll-p-0.5",
   "scroll-p-1",
   "scroll-p-1.5",
+  "scroll-p-2",
+  "scroll-p-2.5",
+  "scroll-p-3",
+  "scroll-p-3.5",
+  "scroll-p-4",
+  "scroll-p-5",
+  "scroll-p-6",
+  "scroll-p-7",
+  "scroll-p-8",
+  "scroll-p-9",
   "scroll-p-10",
   "scroll-p-11",
   "scroll-p-12",
   "scroll-p-14",
   "scroll-p-16",
-  "scroll-p-2",
-  "scroll-p-2.5",
   "scroll-p-20",
   "scroll-p-24",
   "scroll-p-28",
-  "scroll-p-3",
-  "scroll-p-3.5",
   "scroll-p-32",
   "scroll-p-36",
-  "scroll-p-4",
   "scroll-p-40",
   "scroll-p-44",
   "scroll-p-48",
-  "scroll-p-5",
   "scroll-p-52",
   "scroll-p-56",
-  "scroll-p-6",
   "scroll-p-60",
   "scroll-p-64",
-  "scroll-p-7",
   "scroll-p-72",
-  "scroll-p-8",
   "scroll-p-80",
-  "scroll-p-9",
   "scroll-p-96",
   "scroll-p-px",
   "scroll-pb-0",
   "scroll-pb-0.5",
   "scroll-pb-1",
   "scroll-pb-1.5",
+  "scroll-pb-2",
+  "scroll-pb-2.5",
+  "scroll-pb-3",
+  "scroll-pb-3.5",
+  "scroll-pb-4",
+  "scroll-pb-5",
+  "scroll-pb-6",
+  "scroll-pb-7",
+  "scroll-pb-8",
+  "scroll-pb-9",
   "scroll-pb-10",
   "scroll-pb-11",
   "scroll-pb-12",
   "scroll-pb-14",
   "scroll-pb-16",
-  "scroll-pb-2",
-  "scroll-pb-2.5",
   "scroll-pb-20",
   "scroll-pb-24",
   "scroll-pb-28",
-  "scroll-pb-3",
-  "scroll-pb-3.5",
   "scroll-pb-32",
   "scroll-pb-36",
-  "scroll-pb-4",
   "scroll-pb-40",
   "scroll-pb-44",
   "scroll-pb-48",
-  "scroll-pb-5",
   "scroll-pb-52",
   "scroll-pb-56",
-  "scroll-pb-6",
   "scroll-pb-60",
   "scroll-pb-64",
-  "scroll-pb-7",
   "scroll-pb-72",
-  "scroll-pb-8",
   "scroll-pb-80",
-  "scroll-pb-9",
   "scroll-pb-96",
   "scroll-pb-px",
+  "scroll-pbe-0",
+  "scroll-pbe-0.5",
+  "scroll-pbe-1",
+  "scroll-pbe-1.5",
+  "scroll-pbe-2",
+  "scroll-pbe-2.5",
+  "scroll-pbe-3",
+  "scroll-pbe-3.5",
+  "scroll-pbe-4",
+  "scroll-pbe-5",
+  "scroll-pbe-6",
+  "scroll-pbe-7",
+  "scroll-pbe-8",
+  "scroll-pbe-9",
+  "scroll-pbe-10",
+  "scroll-pbe-11",
+  "scroll-pbe-12",
+  "scroll-pbe-14",
+  "scroll-pbe-16",
+  "scroll-pbe-20",
+  "scroll-pbe-24",
+  "scroll-pbe-28",
+  "scroll-pbe-32",
+  "scroll-pbe-36",
+  "scroll-pbe-40",
+  "scroll-pbe-44",
+  "scroll-pbe-48",
+  "scroll-pbe-52",
+  "scroll-pbe-56",
+  "scroll-pbe-60",
+  "scroll-pbe-64",
+  "scroll-pbe-72",
+  "scroll-pbe-80",
+  "scroll-pbe-96",
+  "scroll-pbe-px",
+  "scroll-pbs-0",
+  "scroll-pbs-0.5",
+  "scroll-pbs-1",
+  "scroll-pbs-1.5",
+  "scroll-pbs-2",
+  "scroll-pbs-2.5",
+  "scroll-pbs-3",
+  "scroll-pbs-3.5",
+  "scroll-pbs-4",
+  "scroll-pbs-5",
+  "scroll-pbs-6",
+  "scroll-pbs-7",
+  "scroll-pbs-8",
+  "scroll-pbs-9",
+  "scroll-pbs-10",
+  "scroll-pbs-11",
+  "scroll-pbs-12",
+  "scroll-pbs-14",
+  "scroll-pbs-16",
+  "scroll-pbs-20",
+  "scroll-pbs-24",
+  "scroll-pbs-28",
+  "scroll-pbs-32",
+  "scroll-pbs-36",
+  "scroll-pbs-40",
+  "scroll-pbs-44",
+  "scroll-pbs-48",
+  "scroll-pbs-52",
+  "scroll-pbs-56",
+  "scroll-pbs-60",
+  "scroll-pbs-64",
+  "scroll-pbs-72",
+  "scroll-pbs-80",
+  "scroll-pbs-96",
+  "scroll-pbs-px",
   "scroll-pe-0",
   "scroll-pe-0.5",
   "scroll-pe-1",
   "scroll-pe-1.5",
+  "scroll-pe-2",
+  "scroll-pe-2.5",
+  "scroll-pe-3",
+  "scroll-pe-3.5",
+  "scroll-pe-4",
+  "scroll-pe-5",
+  "scroll-pe-6",
+  "scroll-pe-7",
+  "scroll-pe-8",
+  "scroll-pe-9",
   "scroll-pe-10",
   "scroll-pe-11",
   "scroll-pe-12",
   "scroll-pe-14",
   "scroll-pe-16",
-  "scroll-pe-2",
-  "scroll-pe-2.5",
   "scroll-pe-20",
   "scroll-pe-24",
   "scroll-pe-28",
-  "scroll-pe-3",
-  "scroll-pe-3.5",
   "scroll-pe-32",
   "scroll-pe-36",
-  "scroll-pe-4",
   "scroll-pe-40",
   "scroll-pe-44",
   "scroll-pe-48",
-  "scroll-pe-5",
   "scroll-pe-52",
   "scroll-pe-56",
-  "scroll-pe-6",
   "scroll-pe-60",
   "scroll-pe-64",
-  "scroll-pe-7",
   "scroll-pe-72",
-  "scroll-pe-8",
   "scroll-pe-80",
-  "scroll-pe-9",
   "scroll-pe-96",
   "scroll-pe-px",
   "scroll-pl-0",
   "scroll-pl-0.5",
   "scroll-pl-1",
   "scroll-pl-1.5",
+  "scroll-pl-2",
+  "scroll-pl-2.5",
+  "scroll-pl-3",
+  "scroll-pl-3.5",
+  "scroll-pl-4",
+  "scroll-pl-5",
+  "scroll-pl-6",
+  "scroll-pl-7",
+  "scroll-pl-8",
+  "scroll-pl-9",
   "scroll-pl-10",
   "scroll-pl-11",
   "scroll-pl-12",
   "scroll-pl-14",
   "scroll-pl-16",
-  "scroll-pl-2",
-  "scroll-pl-2.5",
   "scroll-pl-20",
   "scroll-pl-24",
   "scroll-pl-28",
-  "scroll-pl-3",
-  "scroll-pl-3.5",
   "scroll-pl-32",
   "scroll-pl-36",
-  "scroll-pl-4",
   "scroll-pl-40",
   "scroll-pl-44",
   "scroll-pl-48",
-  "scroll-pl-5",
   "scroll-pl-52",
   "scroll-pl-56",
-  "scroll-pl-6",
   "scroll-pl-60",
   "scroll-pl-64",
-  "scroll-pl-7",
   "scroll-pl-72",
-  "scroll-pl-8",
   "scroll-pl-80",
-  "scroll-pl-9",
   "scroll-pl-96",
   "scroll-pl-px",
   "scroll-pr-0",
   "scroll-pr-0.5",
   "scroll-pr-1",
   "scroll-pr-1.5",
+  "scroll-pr-2",
+  "scroll-pr-2.5",
+  "scroll-pr-3",
+  "scroll-pr-3.5",
+  "scroll-pr-4",
+  "scroll-pr-5",
+  "scroll-pr-6",
+  "scroll-pr-7",
+  "scroll-pr-8",
+  "scroll-pr-9",
   "scroll-pr-10",
   "scroll-pr-11",
   "scroll-pr-12",
   "scroll-pr-14",
   "scroll-pr-16",
-  "scroll-pr-2",
-  "scroll-pr-2.5",
   "scroll-pr-20",
   "scroll-pr-24",
   "scroll-pr-28",
-  "scroll-pr-3",
-  "scroll-pr-3.5",
   "scroll-pr-32",
   "scroll-pr-36",
-  "scroll-pr-4",
   "scroll-pr-40",
   "scroll-pr-44",
   "scroll-pr-48",
-  "scroll-pr-5",
   "scroll-pr-52",
   "scroll-pr-56",
-  "scroll-pr-6",
   "scroll-pr-60",
   "scroll-pr-64",
-  "scroll-pr-7",
   "scroll-pr-72",
-  "scroll-pr-8",
   "scroll-pr-80",
-  "scroll-pr-9",
   "scroll-pr-96",
   "scroll-pr-px",
   "scroll-ps-0",
   "scroll-ps-0.5",
   "scroll-ps-1",
   "scroll-ps-1.5",
+  "scroll-ps-2",
+  "scroll-ps-2.5",
+  "scroll-ps-3",
+  "scroll-ps-3.5",
+  "scroll-ps-4",
+  "scroll-ps-5",
+  "scroll-ps-6",
+  "scroll-ps-7",
+  "scroll-ps-8",
+  "scroll-ps-9",
   "scroll-ps-10",
   "scroll-ps-11",
   "scroll-ps-12",
   "scroll-ps-14",
   "scroll-ps-16",
-  "scroll-ps-2",
-  "scroll-ps-2.5",
   "scroll-ps-20",
   "scroll-ps-24",
   "scroll-ps-28",
-  "scroll-ps-3",
-  "scroll-ps-3.5",
   "scroll-ps-32",
   "scroll-ps-36",
-  "scroll-ps-4",
   "scroll-ps-40",
   "scroll-ps-44",
   "scroll-ps-48",
-  "scroll-ps-5",
   "scroll-ps-52",
   "scroll-ps-56",
-  "scroll-ps-6",
   "scroll-ps-60",
   "scroll-ps-64",
-  "scroll-ps-7",
   "scroll-ps-72",
-  "scroll-ps-8",
   "scroll-ps-80",
-  "scroll-ps-9",
   "scroll-ps-96",
   "scroll-ps-px",
   "scroll-pt-0",
   "scroll-pt-0.5",
   "scroll-pt-1",
   "scroll-pt-1.5",
+  "scroll-pt-2",
+  "scroll-pt-2.5",
+  "scroll-pt-3",
+  "scroll-pt-3.5",
+  "scroll-pt-4",
+  "scroll-pt-5",
+  "scroll-pt-6",
+  "scroll-pt-7",
+  "scroll-pt-8",
+  "scroll-pt-9",
   "scroll-pt-10",
   "scroll-pt-11",
   "scroll-pt-12",
   "scroll-pt-14",
   "scroll-pt-16",
-  "scroll-pt-2",
-  "scroll-pt-2.5",
   "scroll-pt-20",
   "scroll-pt-24",
   "scroll-pt-28",
-  "scroll-pt-3",
-  "scroll-pt-3.5",
   "scroll-pt-32",
   "scroll-pt-36",
-  "scroll-pt-4",
   "scroll-pt-40",
   "scroll-pt-44",
   "scroll-pt-48",
-  "scroll-pt-5",
   "scroll-pt-52",
   "scroll-pt-56",
-  "scroll-pt-6",
   "scroll-pt-60",
   "scroll-pt-64",
-  "scroll-pt-7",
   "scroll-pt-72",
-  "scroll-pt-8",
   "scroll-pt-80",
-  "scroll-pt-9",
   "scroll-pt-96",
   "scroll-pt-px",
   "scroll-px-0",
   "scroll-px-0.5",
   "scroll-px-1",
   "scroll-px-1.5",
+  "scroll-px-2",
+  "scroll-px-2.5",
+  "scroll-px-3",
+  "scroll-px-3.5",
+  "scroll-px-4",
+  "scroll-px-5",
+  "scroll-px-6",
+  "scroll-px-7",
+  "scroll-px-8",
+  "scroll-px-9",
   "scroll-px-10",
   "scroll-px-11",
   "scroll-px-12",
   "scroll-px-14",
   "scroll-px-16",
-  "scroll-px-2",
-  "scroll-px-2.5",
   "scroll-px-20",
   "scroll-px-24",
   "scroll-px-28",
-  "scroll-px-3",
-  "scroll-px-3.5",
   "scroll-px-32",
   "scroll-px-36",
-  "scroll-px-4",
   "scroll-px-40",
   "scroll-px-44",
   "scroll-px-48",
-  "scroll-px-5",
   "scroll-px-52",
   "scroll-px-56",
-  "scroll-px-6",
   "scroll-px-60",
   "scroll-px-64",
-  "scroll-px-7",
   "scroll-px-72",
-  "scroll-px-8",
   "scroll-px-80",
-  "scroll-px-9",
   "scroll-px-96",
   "scroll-px-px",
   "scroll-py-0",
   "scroll-py-0.5",
   "scroll-py-1",
   "scroll-py-1.5",
+  "scroll-py-2",
+  "scroll-py-2.5",
+  "scroll-py-3",
+  "scroll-py-3.5",
+  "scroll-py-4",
+  "scroll-py-5",
+  "scroll-py-6",
+  "scroll-py-7",
+  "scroll-py-8",
+  "scroll-py-9",
   "scroll-py-10",
   "scroll-py-11",
   "scroll-py-12",
   "scroll-py-14",
   "scroll-py-16",
-  "scroll-py-2",
-  "scroll-py-2.5",
   "scroll-py-20",
   "scroll-py-24",
   "scroll-py-28",
-  "scroll-py-3",
-  "scroll-py-3.5",
   "scroll-py-32",
   "scroll-py-36",
-  "scroll-py-4",
   "scroll-py-40",
   "scroll-py-44",
   "scroll-py-48",
-  "scroll-py-5",
   "scroll-py-52",
   "scroll-py-56",
-  "scroll-py-6",
   "scroll-py-60",
   "scroll-py-64",
-  "scroll-py-7",
   "scroll-py-72",
-  "scroll-py-8",
   "scroll-py-80",
-  "scroll-py-9",
   "scroll-py-96",
   "scroll-py-px",
   "scroll-smooth",
+  "scrollbar-auto",
+  "scrollbar-gutter-auto",
+  "scrollbar-gutter-both",
+  "scrollbar-gutter-stable",
+  "scrollbar-none",
+  "scrollbar-thin",
+  "scrollbar-thumb-current",
+  "scrollbar-thumb-current/0",
+  "scrollbar-thumb-current/5",
+  "scrollbar-thumb-current/10",
+  "scrollbar-thumb-current/15",
+  "scrollbar-thumb-current/20",
+  "scrollbar-thumb-current/25",
+  "scrollbar-thumb-current/30",
+  "scrollbar-thumb-current/35",
+  "scrollbar-thumb-current/40",
+  "scrollbar-thumb-current/45",
+  "scrollbar-thumb-current/50",
+  "scrollbar-thumb-current/55",
+  "scrollbar-thumb-current/60",
+  "scrollbar-thumb-current/65",
+  "scrollbar-thumb-current/70",
+  "scrollbar-thumb-current/75",
+  "scrollbar-thumb-current/80",
+  "scrollbar-thumb-current/85",
+  "scrollbar-thumb-current/90",
+  "scrollbar-thumb-current/95",
+  "scrollbar-thumb-current/100",
+  "scrollbar-thumb-current/background",
+  "scrollbar-thumb-inherit",
+  "scrollbar-thumb-inherit/0",
+  "scrollbar-thumb-inherit/5",
+  "scrollbar-thumb-inherit/10",
+  "scrollbar-thumb-inherit/15",
+  "scrollbar-thumb-inherit/20",
+  "scrollbar-thumb-inherit/25",
+  "scrollbar-thumb-inherit/30",
+  "scrollbar-thumb-inherit/35",
+  "scrollbar-thumb-inherit/40",
+  "scrollbar-thumb-inherit/45",
+  "scrollbar-thumb-inherit/50",
+  "scrollbar-thumb-inherit/55",
+  "scrollbar-thumb-inherit/60",
+  "scrollbar-thumb-inherit/65",
+  "scrollbar-thumb-inherit/70",
+  "scrollbar-thumb-inherit/75",
+  "scrollbar-thumb-inherit/80",
+  "scrollbar-thumb-inherit/85",
+  "scrollbar-thumb-inherit/90",
+  "scrollbar-thumb-inherit/95",
+  "scrollbar-thumb-inherit/100",
+  "scrollbar-thumb-inherit/background",
+  "scrollbar-thumb-transparent",
+  "scrollbar-thumb-transparent/0",
+  "scrollbar-thumb-transparent/5",
+  "scrollbar-thumb-transparent/10",
+  "scrollbar-thumb-transparent/15",
+  "scrollbar-thumb-transparent/20",
+  "scrollbar-thumb-transparent/25",
+  "scrollbar-thumb-transparent/30",
+  "scrollbar-thumb-transparent/35",
+  "scrollbar-thumb-transparent/40",
+  "scrollbar-thumb-transparent/45",
+  "scrollbar-thumb-transparent/50",
+  "scrollbar-thumb-transparent/55",
+  "scrollbar-thumb-transparent/60",
+  "scrollbar-thumb-transparent/65",
+  "scrollbar-thumb-transparent/70",
+  "scrollbar-thumb-transparent/75",
+  "scrollbar-thumb-transparent/80",
+  "scrollbar-thumb-transparent/85",
+  "scrollbar-thumb-transparent/90",
+  "scrollbar-thumb-transparent/95",
+  "scrollbar-thumb-transparent/100",
+  "scrollbar-thumb-transparent/background",
+  "scrollbar-track-current",
+  "scrollbar-track-current/0",
+  "scrollbar-track-current/5",
+  "scrollbar-track-current/10",
+  "scrollbar-track-current/15",
+  "scrollbar-track-current/20",
+  "scrollbar-track-current/25",
+  "scrollbar-track-current/30",
+  "scrollbar-track-current/35",
+  "scrollbar-track-current/40",
+  "scrollbar-track-current/45",
+  "scrollbar-track-current/50",
+  "scrollbar-track-current/55",
+  "scrollbar-track-current/60",
+  "scrollbar-track-current/65",
+  "scrollbar-track-current/70",
+  "scrollbar-track-current/75",
+  "scrollbar-track-current/80",
+  "scrollbar-track-current/85",
+  "scrollbar-track-current/90",
+  "scrollbar-track-current/95",
+  "scrollbar-track-current/100",
+  "scrollbar-track-current/background",
+  "scrollbar-track-inherit",
+  "scrollbar-track-inherit/0",
+  "scrollbar-track-inherit/5",
+  "scrollbar-track-inherit/10",
+  "scrollbar-track-inherit/15",
+  "scrollbar-track-inherit/20",
+  "scrollbar-track-inherit/25",
+  "scrollbar-track-inherit/30",
+  "scrollbar-track-inherit/35",
+  "scrollbar-track-inherit/40",
+  "scrollbar-track-inherit/45",
+  "scrollbar-track-inherit/50",
+  "scrollbar-track-inherit/55",
+  "scrollbar-track-inherit/60",
+  "scrollbar-track-inherit/65",
+  "scrollbar-track-inherit/70",
+  "scrollbar-track-inherit/75",
+  "scrollbar-track-inherit/80",
+  "scrollbar-track-inherit/85",
+  "scrollbar-track-inherit/90",
+  "scrollbar-track-inherit/95",
+  "scrollbar-track-inherit/100",
+  "scrollbar-track-inherit/background",
+  "scrollbar-track-transparent",
+  "scrollbar-track-transparent/0",
+  "scrollbar-track-transparent/5",
+  "scrollbar-track-transparent/10",
+  "scrollbar-track-transparent/15",
+  "scrollbar-track-transparent/20",
+  "scrollbar-track-transparent/25",
+  "scrollbar-track-transparent/30",
+  "scrollbar-track-transparent/35",
+  "scrollbar-track-transparent/40",
+  "scrollbar-track-transparent/45",
+  "scrollbar-track-transparent/50",
+  "scrollbar-track-transparent/55",
+  "scrollbar-track-transparent/60",
+  "scrollbar-track-transparent/65",
+  "scrollbar-track-transparent/70",
+  "scrollbar-track-transparent/75",
+  "scrollbar-track-transparent/80",
+  "scrollbar-track-transparent/85",
+  "scrollbar-track-transparent/90",
+  "scrollbar-track-transparent/95",
+  "scrollbar-track-transparent/100",
+  "scrollbar-track-transparent/background",
   "select-all",
   "select-auto",
   "select-none",
   "select-text",
   "self-auto",
   "self-baseline",
+  "self-baseline-last",
   "self-center",
+  "self-center-safe",
   "self-end",
+  "self-end-safe",
   "self-start",
   "self-stretch",
   "sepia",
   "sepia-0",
-  "sepia-100",
   "sepia-50",
-  "shadow",
+  "sepia-100",
   "shadow-current",
   "shadow-current/0",
   "shadow-current/5",
@@ -6631,6 +11337,7 @@ exports[`getClassList 1`] = `
   "shadow-current/90",
   "shadow-current/95",
   "shadow-current/100",
+  "shadow-current/background",
   "shadow-inherit",
   "shadow-inherit/0",
   "shadow-inherit/5",
@@ -6653,6 +11360,7 @@ exports[`getClassList 1`] = `
   "shadow-inherit/90",
   "shadow-inherit/95",
   "shadow-inherit/100",
+  "shadow-inherit/background",
   "shadow-initial",
   "shadow-none",
   "shadow-transparent",
@@ -6677,42 +11385,69 @@ exports[`getClassList 1`] = `
   "shadow-transparent/90",
   "shadow-transparent/95",
   "shadow-transparent/100",
+  "shadow-transparent/background",
   "shrink",
   "shrink-0",
   "size-0",
   "size-0.5",
   "size-1",
   "size-1.5",
+  "size-2",
+  "size-2.5",
+  "size-3",
+  "size-3.5",
+  "size-4",
+  "size-5",
+  "size-6",
+  "size-7",
+  "size-8",
+  "size-9",
   "size-10",
   "size-11",
   "size-12",
   "size-14",
   "size-16",
-  "size-2",
-  "size-2.5",
   "size-20",
   "size-24",
   "size-28",
-  "size-3",
-  "size-3.5",
   "size-32",
   "size-36",
-  "size-4",
   "size-40",
   "size-44",
   "size-48",
-  "size-5",
   "size-52",
   "size-56",
-  "size-6",
   "size-60",
   "size-64",
-  "size-7",
   "size-72",
-  "size-8",
   "size-80",
-  "size-9",
   "size-96",
+  "size-1/2",
+  "size-1/3",
+  "size-1/4",
+  "size-1/5",
+  "size-1/6",
+  "size-1/12",
+  "size-2/3",
+  "size-2/4",
+  "size-2/5",
+  "size-2/6",
+  "size-2/12",
+  "size-3/4",
+  "size-3/5",
+  "size-3/6",
+  "size-3/12",
+  "size-4/5",
+  "size-4/6",
+  "size-4/12",
+  "size-5/6",
+  "size-5/12",
+  "size-6/12",
+  "size-7/12",
+  "size-8/12",
+  "size-9/12",
+  "size-10/12",
+  "size-11/12",
   "size-auto",
   "size-dvh",
   "size-dvw",
@@ -6727,22 +11462,22 @@ exports[`getClassList 1`] = `
   "size-svw",
   "skew-0",
   "skew-1",
-  "skew-12",
   "skew-2",
   "skew-3",
   "skew-6",
+  "skew-12",
   "skew-x-0",
   "skew-x-1",
-  "skew-x-12",
   "skew-x-2",
   "skew-x-3",
   "skew-x-6",
+  "skew-x-12",
   "skew-y-0",
   "skew-y-1",
-  "skew-y-12",
   "skew-y-2",
   "skew-y-3",
   "skew-y-6",
+  "skew-y-12",
   "slashed-zero",
   "snap-align-none",
   "snap-always",
@@ -6760,35 +11495,35 @@ exports[`getClassList 1`] = `
   "space-x-0.5",
   "space-x-1",
   "space-x-1.5",
+  "space-x-2",
+  "space-x-2.5",
+  "space-x-3",
+  "space-x-3.5",
+  "space-x-4",
+  "space-x-5",
+  "space-x-6",
+  "space-x-7",
+  "space-x-8",
+  "space-x-9",
   "space-x-10",
   "space-x-11",
   "space-x-12",
   "space-x-14",
   "space-x-16",
-  "space-x-2",
-  "space-x-2.5",
   "space-x-20",
   "space-x-24",
   "space-x-28",
-  "space-x-3",
-  "space-x-3.5",
   "space-x-32",
   "space-x-36",
-  "space-x-4",
   "space-x-40",
   "space-x-44",
   "space-x-48",
-  "space-x-5",
   "space-x-52",
   "space-x-56",
-  "space-x-6",
   "space-x-60",
   "space-x-64",
-  "space-x-7",
   "space-x-72",
-  "space-x-8",
   "space-x-80",
-  "space-x-9",
   "space-x-96",
   "space-x-px",
   "space-x-reverse",
@@ -6796,74 +11531,40 @@ exports[`getClassList 1`] = `
   "space-y-0.5",
   "space-y-1",
   "space-y-1.5",
+  "space-y-2",
+  "space-y-2.5",
+  "space-y-3",
+  "space-y-3.5",
+  "space-y-4",
+  "space-y-5",
+  "space-y-6",
+  "space-y-7",
+  "space-y-8",
+  "space-y-9",
   "space-y-10",
   "space-y-11",
   "space-y-12",
   "space-y-14",
   "space-y-16",
-  "space-y-2",
-  "space-y-2.5",
   "space-y-20",
   "space-y-24",
   "space-y-28",
-  "space-y-3",
-  "space-y-3.5",
   "space-y-32",
   "space-y-36",
-  "space-y-4",
   "space-y-40",
   "space-y-44",
   "space-y-48",
-  "space-y-5",
   "space-y-52",
   "space-y-56",
-  "space-y-6",
   "space-y-60",
   "space-y-64",
-  "space-y-7",
   "space-y-72",
-  "space-y-8",
   "space-y-80",
-  "space-y-9",
   "space-y-96",
   "space-y-px",
   "space-y-reverse",
   "sr-only",
   "stacked-fractions",
-  "start-0",
-  "start-0.5",
-  "start-1",
-  "start-1.5",
-  "start-10",
-  "start-11",
-  "start-12",
-  "start-14",
-  "start-16",
-  "start-2",
-  "start-2.5",
-  "start-20",
-  "start-24",
-  "start-28",
-  "start-3",
-  "start-3.5",
-  "start-32",
-  "start-36",
-  "start-4",
-  "start-40",
-  "start-44",
-  "start-48",
-  "start-5",
-  "start-52",
-  "start-56",
-  "start-6",
-  "start-60",
-  "start-64",
-  "start-7",
-  "start-72",
-  "start-8",
-  "start-80",
-  "start-9",
-  "start-96",
   "start-auto",
   "start-full",
   "start-px",
@@ -6895,6 +11596,7 @@ exports[`getClassList 1`] = `
   "stroke-current/90",
   "stroke-current/95",
   "stroke-current/100",
+  "stroke-current/background",
   "stroke-inherit",
   "stroke-inherit/0",
   "stroke-inherit/5",
@@ -6917,6 +11619,7 @@ exports[`getClassList 1`] = `
   "stroke-inherit/90",
   "stroke-inherit/95",
   "stroke-inherit/100",
+  "stroke-inherit/background",
   "stroke-none",
   "stroke-transparent",
   "stroke-transparent/0",
@@ -6940,7 +11643,11 @@ exports[`getClassList 1`] = `
   "stroke-transparent/90",
   "stroke-transparent/95",
   "stroke-transparent/100",
+  "stroke-transparent/background",
   "subpixel-antialiased",
+  "tab-2",
+  "tab-4",
+  "tab-8",
   "table",
   "table-auto",
   "table-caption",
@@ -6978,6 +11685,7 @@ exports[`getClassList 1`] = `
   "text-current/90",
   "text-current/95",
   "text-current/100",
+  "text-current/background",
   "text-ellipsis",
   "text-end",
   "text-inherit",
@@ -7002,11 +11710,83 @@ exports[`getClassList 1`] = `
   "text-inherit/90",
   "text-inherit/95",
   "text-inherit/100",
+  "text-inherit/background",
   "text-justify",
   "text-left",
   "text-nowrap",
   "text-pretty",
   "text-right",
+  "text-shadow-current",
+  "text-shadow-current/0",
+  "text-shadow-current/5",
+  "text-shadow-current/10",
+  "text-shadow-current/15",
+  "text-shadow-current/20",
+  "text-shadow-current/25",
+  "text-shadow-current/30",
+  "text-shadow-current/35",
+  "text-shadow-current/40",
+  "text-shadow-current/45",
+  "text-shadow-current/50",
+  "text-shadow-current/55",
+  "text-shadow-current/60",
+  "text-shadow-current/65",
+  "text-shadow-current/70",
+  "text-shadow-current/75",
+  "text-shadow-current/80",
+  "text-shadow-current/85",
+  "text-shadow-current/90",
+  "text-shadow-current/95",
+  "text-shadow-current/100",
+  "text-shadow-current/background",
+  "text-shadow-inherit",
+  "text-shadow-inherit/0",
+  "text-shadow-inherit/5",
+  "text-shadow-inherit/10",
+  "text-shadow-inherit/15",
+  "text-shadow-inherit/20",
+  "text-shadow-inherit/25",
+  "text-shadow-inherit/30",
+  "text-shadow-inherit/35",
+  "text-shadow-inherit/40",
+  "text-shadow-inherit/45",
+  "text-shadow-inherit/50",
+  "text-shadow-inherit/55",
+  "text-shadow-inherit/60",
+  "text-shadow-inherit/65",
+  "text-shadow-inherit/70",
+  "text-shadow-inherit/75",
+  "text-shadow-inherit/80",
+  "text-shadow-inherit/85",
+  "text-shadow-inherit/90",
+  "text-shadow-inherit/95",
+  "text-shadow-inherit/100",
+  "text-shadow-inherit/background",
+  "text-shadow-initial",
+  "text-shadow-none",
+  "text-shadow-transparent",
+  "text-shadow-transparent/0",
+  "text-shadow-transparent/5",
+  "text-shadow-transparent/10",
+  "text-shadow-transparent/15",
+  "text-shadow-transparent/20",
+  "text-shadow-transparent/25",
+  "text-shadow-transparent/30",
+  "text-shadow-transparent/35",
+  "text-shadow-transparent/40",
+  "text-shadow-transparent/45",
+  "text-shadow-transparent/50",
+  "text-shadow-transparent/55",
+  "text-shadow-transparent/60",
+  "text-shadow-transparent/65",
+  "text-shadow-transparent/70",
+  "text-shadow-transparent/75",
+  "text-shadow-transparent/80",
+  "text-shadow-transparent/85",
+  "text-shadow-transparent/90",
+  "text-shadow-transparent/95",
+  "text-shadow-transparent/100",
+  "text-shadow-transparent/background",
   "text-start",
   "text-transparent",
   "text-transparent/0",
@@ -7030,11 +11810,12 @@ exports[`getClassList 1`] = `
   "text-transparent/90",
   "text-transparent/95",
   "text-transparent/100",
+  "text-transparent/background",
   "text-wrap",
   "text-xs",
   "to-0%",
+  "to-5%",
   "to-10%",
-  "to-100%",
   "to-15%",
   "to-20%",
   "to-25%",
@@ -7042,7 +11823,6 @@ exports[`getClassList 1`] = `
   "to-35%",
   "to-40%",
   "to-45%",
-  "to-5%",
   "to-50%",
   "to-55%",
   "to-60%",
@@ -7053,6 +11833,7 @@ exports[`getClassList 1`] = `
   "to-85%",
   "to-90%",
   "to-95%",
+  "to-100%",
   "to-current",
   "to-current/0",
   "to-current/5",
@@ -7075,6 +11856,7 @@ exports[`getClassList 1`] = `
   "to-current/90",
   "to-current/95",
   "to-current/100",
+  "to-current/background",
   "to-inherit",
   "to-inherit/0",
   "to-inherit/5",
@@ -7097,6 +11879,7 @@ exports[`getClassList 1`] = `
   "to-inherit/90",
   "to-inherit/95",
   "to-inherit/100",
+  "to-inherit/background",
   "to-transparent",
   "to-transparent/0",
   "to-transparent/5",
@@ -7119,40 +11902,67 @@ exports[`getClassList 1`] = `
   "to-transparent/90",
   "to-transparent/95",
   "to-transparent/100",
+  "to-transparent/background",
   "top-0",
   "top-0.5",
   "top-1",
   "top-1.5",
+  "top-2",
+  "top-2.5",
+  "top-3",
+  "top-3.5",
+  "top-4",
+  "top-5",
+  "top-6",
+  "top-7",
+  "top-8",
+  "top-9",
   "top-10",
   "top-11",
   "top-12",
   "top-14",
   "top-16",
-  "top-2",
-  "top-2.5",
   "top-20",
   "top-24",
   "top-28",
-  "top-3",
-  "top-3.5",
   "top-32",
   "top-36",
-  "top-4",
   "top-40",
   "top-44",
   "top-48",
-  "top-5",
   "top-52",
   "top-56",
-  "top-6",
   "top-60",
   "top-64",
-  "top-7",
   "top-72",
-  "top-8",
   "top-80",
-  "top-9",
   "top-96",
+  "top-1/2",
+  "top-1/3",
+  "top-1/4",
+  "top-1/5",
+  "top-1/6",
+  "top-1/12",
+  "top-2/3",
+  "top-2/4",
+  "top-2/5",
+  "top-2/6",
+  "top-2/12",
+  "top-3/4",
+  "top-3/5",
+  "top-3/6",
+  "top-3/12",
+  "top-4/5",
+  "top-4/6",
+  "top-4/12",
+  "top-5/6",
+  "top-5/12",
+  "top-6/12",
+  "top-7/12",
+  "top-8/12",
+  "top-9/12",
+  "top-10/12",
+  "top-11/12",
   "top-auto",
   "top-full",
   "top-px",
@@ -7190,37 +12000,63 @@ exports[`getClassList 1`] = `
   "translate-0.5",
   "translate-1",
   "translate-1.5",
+  "translate-2",
+  "translate-2.5",
+  "translate-3",
+  "translate-3.5",
+  "translate-3d",
+  "translate-4",
+  "translate-5",
+  "translate-6",
+  "translate-7",
+  "translate-8",
+  "translate-9",
   "translate-10",
   "translate-11",
   "translate-12",
   "translate-14",
   "translate-16",
-  "translate-2",
-  "translate-2.5",
   "translate-20",
   "translate-24",
   "translate-28",
-  "translate-3",
-  "translate-3.5",
   "translate-32",
   "translate-36",
-  "translate-3d",
-  "translate-4",
   "translate-40",
   "translate-44",
   "translate-48",
-  "translate-5",
   "translate-52",
   "translate-56",
-  "translate-6",
   "translate-60",
   "translate-64",
-  "translate-7",
   "translate-72",
-  "translate-8",
   "translate-80",
-  "translate-9",
   "translate-96",
+  "translate-1/2",
+  "translate-1/3",
+  "translate-1/4",
+  "translate-1/5",
+  "translate-1/6",
+  "translate-1/12",
+  "translate-2/3",
+  "translate-2/4",
+  "translate-2/5",
+  "translate-2/6",
+  "translate-2/12",
+  "translate-3/4",
+  "translate-3/5",
+  "translate-3/6",
+  "translate-3/12",
+  "translate-4/5",
+  "translate-4/6",
+  "translate-4/12",
+  "translate-5/6",
+  "translate-5/12",
+  "translate-6/12",
+  "translate-7/12",
+  "translate-8/12",
+  "translate-9/12",
+  "translate-10/12",
+  "translate-11/12",
   "translate-full",
   "translate-none",
   "translate-px",
@@ -7228,107 +12064,159 @@ exports[`getClassList 1`] = `
   "translate-x-0.5",
   "translate-x-1",
   "translate-x-1.5",
+  "translate-x-2",
+  "translate-x-2.5",
+  "translate-x-3",
+  "translate-x-3.5",
+  "translate-x-4",
+  "translate-x-5",
+  "translate-x-6",
+  "translate-x-7",
+  "translate-x-8",
+  "translate-x-9",
   "translate-x-10",
   "translate-x-11",
   "translate-x-12",
   "translate-x-14",
   "translate-x-16",
-  "translate-x-2",
-  "translate-x-2.5",
   "translate-x-20",
   "translate-x-24",
   "translate-x-28",
-  "translate-x-3",
-  "translate-x-3.5",
   "translate-x-32",
   "translate-x-36",
-  "translate-x-4",
   "translate-x-40",
   "translate-x-44",
   "translate-x-48",
-  "translate-x-5",
   "translate-x-52",
   "translate-x-56",
-  "translate-x-6",
   "translate-x-60",
   "translate-x-64",
-  "translate-x-7",
   "translate-x-72",
-  "translate-x-8",
   "translate-x-80",
-  "translate-x-9",
   "translate-x-96",
+  "translate-x-1/2",
+  "translate-x-1/3",
+  "translate-x-1/4",
+  "translate-x-1/5",
+  "translate-x-1/6",
+  "translate-x-1/12",
+  "translate-x-2/3",
+  "translate-x-2/4",
+  "translate-x-2/5",
+  "translate-x-2/6",
+  "translate-x-2/12",
+  "translate-x-3/4",
+  "translate-x-3/5",
+  "translate-x-3/6",
+  "translate-x-3/12",
+  "translate-x-4/5",
+  "translate-x-4/6",
+  "translate-x-4/12",
+  "translate-x-5/6",
+  "translate-x-5/12",
+  "translate-x-6/12",
+  "translate-x-7/12",
+  "translate-x-8/12",
+  "translate-x-9/12",
+  "translate-x-10/12",
+  "translate-x-11/12",
   "translate-x-full",
   "translate-x-px",
   "translate-y-0",
   "translate-y-0.5",
   "translate-y-1",
   "translate-y-1.5",
+  "translate-y-2",
+  "translate-y-2.5",
+  "translate-y-3",
+  "translate-y-3.5",
+  "translate-y-4",
+  "translate-y-5",
+  "translate-y-6",
+  "translate-y-7",
+  "translate-y-8",
+  "translate-y-9",
   "translate-y-10",
   "translate-y-11",
   "translate-y-12",
   "translate-y-14",
   "translate-y-16",
-  "translate-y-2",
-  "translate-y-2.5",
   "translate-y-20",
   "translate-y-24",
   "translate-y-28",
-  "translate-y-3",
-  "translate-y-3.5",
   "translate-y-32",
   "translate-y-36",
-  "translate-y-4",
   "translate-y-40",
   "translate-y-44",
   "translate-y-48",
-  "translate-y-5",
   "translate-y-52",
   "translate-y-56",
-  "translate-y-6",
   "translate-y-60",
   "translate-y-64",
-  "translate-y-7",
   "translate-y-72",
-  "translate-y-8",
   "translate-y-80",
-  "translate-y-9",
   "translate-y-96",
+  "translate-y-1/2",
+  "translate-y-1/3",
+  "translate-y-1/4",
+  "translate-y-1/5",
+  "translate-y-1/6",
+  "translate-y-1/12",
+  "translate-y-2/3",
+  "translate-y-2/4",
+  "translate-y-2/5",
+  "translate-y-2/6",
+  "translate-y-2/12",
+  "translate-y-3/4",
+  "translate-y-3/5",
+  "translate-y-3/6",
+  "translate-y-3/12",
+  "translate-y-4/5",
+  "translate-y-4/6",
+  "translate-y-4/12",
+  "translate-y-5/6",
+  "translate-y-5/12",
+  "translate-y-6/12",
+  "translate-y-7/12",
+  "translate-y-8/12",
+  "translate-y-9/12",
+  "translate-y-10/12",
+  "translate-y-11/12",
   "translate-y-full",
   "translate-y-px",
   "translate-z-0",
   "translate-z-0.5",
   "translate-z-1",
   "translate-z-1.5",
+  "translate-z-2",
+  "translate-z-2.5",
+  "translate-z-3",
+  "translate-z-3.5",
+  "translate-z-4",
+  "translate-z-5",
+  "translate-z-6",
+  "translate-z-7",
+  "translate-z-8",
+  "translate-z-9",
   "translate-z-10",
   "translate-z-11",
   "translate-z-12",
   "translate-z-14",
   "translate-z-16",
-  "translate-z-2",
-  "translate-z-2.5",
   "translate-z-20",
   "translate-z-24",
   "translate-z-28",
-  "translate-z-3",
-  "translate-z-3.5",
   "translate-z-32",
   "translate-z-36",
-  "translate-z-4",
   "translate-z-40",
   "translate-z-44",
   "translate-z-48",
-  "translate-z-5",
   "translate-z-52",
   "translate-z-56",
-  "translate-z-6",
   "translate-z-60",
   "translate-z-64",
-  "translate-z-7",
   "translate-z-72",
-  "translate-z-8",
   "translate-z-80",
-  "translate-z-9",
   "translate-z-96",
   "translate-z-px",
   "truncate",
@@ -7341,8 +12229,8 @@ exports[`getClassList 1`] = `
   "underline-offset-auto",
   "uppercase",
   "via-0%",
+  "via-5%",
   "via-10%",
-  "via-100%",
   "via-15%",
   "via-20%",
   "via-25%",
@@ -7350,7 +12238,6 @@ exports[`getClassList 1`] = `
   "via-35%",
   "via-40%",
   "via-45%",
-  "via-5%",
   "via-50%",
   "via-55%",
   "via-60%",
@@ -7361,6 +12248,7 @@ exports[`getClassList 1`] = `
   "via-85%",
   "via-90%",
   "via-95%",
+  "via-100%",
   "via-current",
   "via-current/0",
   "via-current/5",
@@ -7383,6 +12271,7 @@ exports[`getClassList 1`] = `
   "via-current/90",
   "via-current/95",
   "via-current/100",
+  "via-current/background",
   "via-inherit",
   "via-inherit/0",
   "via-inherit/5",
@@ -7405,6 +12294,7 @@ exports[`getClassList 1`] = `
   "via-inherit/90",
   "via-inherit/95",
   "via-inherit/100",
+  "via-inherit/background",
   "via-none",
   "via-transparent",
   "via-transparent/0",
@@ -7428,49 +12318,78 @@ exports[`getClassList 1`] = `
   "via-transparent/90",
   "via-transparent/95",
   "via-transparent/100",
+  "via-transparent/background",
   "visible",
   "w-0",
   "w-0.5",
   "w-1",
   "w-1.5",
+  "w-2",
+  "w-2.5",
+  "w-3",
+  "w-3.5",
+  "w-4",
+  "w-5",
+  "w-6",
+  "w-7",
+  "w-8",
+  "w-9",
   "w-10",
   "w-11",
   "w-12",
   "w-14",
   "w-16",
-  "w-2",
-  "w-2.5",
   "w-20",
   "w-24",
   "w-28",
-  "w-3",
-  "w-3.5",
   "w-32",
   "w-36",
-  "w-4",
   "w-40",
   "w-44",
   "w-48",
-  "w-5",
   "w-52",
   "w-56",
-  "w-6",
   "w-60",
   "w-64",
-  "w-7",
   "w-72",
-  "w-8",
   "w-80",
-  "w-9",
   "w-96",
   "w-auto",
   "w-dvh",
   "w-dvw",
   "w-fit",
   "w-full",
+  "w-lg",
   "w-lvh",
   "w-lvw",
   "w-max",
+  "w-md",
+  "w-1/2",
+  "w-1/3",
+  "w-1/4",
+  "w-1/5",
+  "w-1/6",
+  "w-1/12",
+  "w-2/3",
+  "w-2/4",
+  "w-2/5",
+  "w-2/6",
+  "w-2/12",
+  "w-3/4",
+  "w-3/5",
+  "w-3/6",
+  "w-3/12",
+  "w-4/5",
+  "w-4/6",
+  "w-4/12",
+  "w-5/6",
+  "w-5/12",
+  "w-6/12",
+  "w-7/12",
+  "w-8/12",
+  "w-9/12",
+  "w-10/12",
+  "w-11/12",
   "w-min",
   "w-px",
   "w-screen",
@@ -7486,6 +12405,9 @@ exports[`getClassList 1`] = `
   "will-change-contents",
   "will-change-scroll",
   "will-change-transform",
+  "wrap-anywhere",
+  "wrap-break-word",
+  "wrap-normal",
   "z-0",
   "z-10",
   "z-20",
@@ -7493,18 +12415,21 @@ exports[`getClassList 1`] = `
   "z-40",
   "z-50",
   "z-auto",
+  "zoom-50",
+  "zoom-75",
+  "zoom-90",
+  "zoom-95",
+  "zoom-100",
+  "zoom-105",
+  "zoom-110",
+  "zoom-125",
+  "zoom-150",
+  "zoom-200",
 ]
 `;
 
 exports[`getVariants 1`] = `
 [
-  {
-    "hasDash": true,
-    "isArbitrary": false,
-    "name": "force",
-    "selectors": [Function],
-    "values": [],
-  },
   {
     "hasDash": true,
     "isArbitrary": false,
@@ -7548,6 +12473,8 @@ exports[`getVariants 1`] = `
       "required",
       "valid",
       "invalid",
+      "user-valid",
+      "user-invalid",
       "in-range",
       "out-of-range",
       "read-only",
@@ -7586,6 +12513,14 @@ exports[`getVariants 1`] = `
       "dark",
       "print",
       "forced-colors",
+      "inverted-colors",
+      "pointer-none",
+      "pointer-coarse",
+      "pointer-fine",
+      "any-pointer-none",
+      "any-pointer-coarse",
+      "any-pointer-fine",
+      "noscript",
     ],
   },
   {
@@ -7617,6 +12552,8 @@ exports[`getVariants 1`] = `
       "required",
       "valid",
       "invalid",
+      "user-valid",
+      "user-invalid",
       "in-range",
       "out-of-range",
       "read-only",
@@ -7670,6 +12607,8 @@ exports[`getVariants 1`] = `
       "required",
       "valid",
       "invalid",
+      "user-valid",
+      "user-invalid",
       "in-range",
       "out-of-range",
       "read-only",
@@ -7743,6 +12682,13 @@ exports[`getVariants 1`] = `
     "selectors": [Function],
     "values": [],
   },
+  {
+    "hasDash": true,
+    "isArbitrary": false,
+    "name": "details-content",
+    "selectors": [Function],
+    "values": [],
+  },
   {
     "hasDash": true,
     "isArbitrary": false,
@@ -7897,6 +12843,20 @@ exports[`getVariants 1`] = `
     "selectors": [Function],
     "values": [],
   },
+  {
+    "hasDash": true,
+    "isArbitrary": false,
+    "name": "user-valid",
+    "selectors": [Function],
+    "values": [],
+  },
+  {
+    "hasDash": true,
+    "isArbitrary": false,
+    "name": "user-invalid",
+    "selectors": [Function],
+    "values": [],
+  },
   {
     "hasDash": true,
     "isArbitrary": false,
@@ -8010,6 +12970,8 @@ exports[`getVariants 1`] = `
       "required",
       "valid",
       "invalid",
+      "user-valid",
+      "user-invalid",
       "in-range",
       "out-of-range",
       "read-only",
@@ -8063,6 +13025,8 @@ exports[`getVariants 1`] = `
       "required",
       "valid",
       "invalid",
+      "user-valid",
+      "user-invalid",
       "in-range",
       "out-of-range",
       "read-only",
@@ -8204,21 +13168,30 @@ exports[`getVariants 1`] = `
     "isArbitrary": true,
     "name": "@max",
     "selectors": [Function],
-    "values": [],
+    "values": [
+      "md",
+      "lg",
+    ],
   },
   {
-    "hasDash": true,
+    "hasDash": false,
     "isArbitrary": true,
     "name": "@",
     "selectors": [Function],
-    "values": [],
+    "values": [
+      "md",
+      "lg",
+    ],
   },
   {
     "hasDash": true,
     "isArbitrary": true,
     "name": "@min",
     "selectors": [Function],
-    "values": [],
+    "values": [
+      "md",
+      "lg",
+    ],
   },
   {
     "hasDash": true,
@@ -8276,5 +13249,61 @@ exports[`getVariants 1`] = `
     "selectors": [Function],
     "values": [],
   },
+  {
+    "hasDash": true,
+    "isArbitrary": false,
+    "name": "inverted-colors",
+    "selectors": [Function],
+    "values": [],
+  },
+  {
+    "hasDash": true,
+    "isArbitrary": false,
+    "name": "pointer-none",
+    "selectors": [Function],
+    "values": [],
+  },
+  {
+    "hasDash": true,
+    "isArbitrary": false,
+    "name": "pointer-coarse",
+    "selectors": [Function],
+    "values": [],
+  },
+  {
+    "hasDash": true,
+    "isArbitrary": false,
+    "name": "pointer-fine",
+    "selectors": [Function],
+    "values": [],
+  },
+  {
+    "hasDash": true,
+    "isArbitrary": false,
+    "name": "any-pointer-none",
+    "selectors": [Function],
+    "values": [],
+  },
+  {
+    "hasDash": true,
+    "isArbitrary": false,
+    "name": "any-pointer-coarse",
+    "selectors": [Function],
+    "values": [],
+  },
+  {
+    "hasDash": true,
+    "isArbitrary": false,
+    "name": "any-pointer-fine",
+    "selectors": [Function],
+    "values": [],
+  },
+  {
+    "hasDash": true,
+    "isArbitrary": false,
+    "name": "noscript",
+    "selectors": [Function],
+    "values": [],
+  },
 ]
 `;
diff --git a/packages/tailwindcss/src/__snapshots__/utilities.test.ts.snap b/packages/tailwindcss/src/__snapshots__/utilities.test.ts.snap
index c8e1a1137..43e8fdf6f 100644
--- a/packages/tailwindcss/src/__snapshots__/utilities.test.ts.snap
+++ b/packages/tailwindcss/src/__snapshots__/utilities.test.ts.snap
@@ -1,11 +1,18 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`border-* 1`] = `
-":root {
-  --radius-none: 0px;
-  --radius-full: 9999px;
-  --radius-sm: .125rem;
+"
+@layer properties {
+  @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+    *, :before, :after, ::backdrop {
+      --tw-border-style: solid;
+    }
+  }
+}
+
+:root, :host {
   --color-red-500: #ef4444;
+  --border-color-blue-500: #3b82f6;
 }
 
 .border {
@@ -33,11 +40,26 @@ exports[`border-* 1`] = `
   border-width: 123px;
 }
 
+.border-\\[0_1\\] {
+  border-style: var(--tw-border-style);
+  border-width: 0 1px;
+}
+
+.border-\\[0_2px_0_2px\\] {
+  border-style: var(--tw-border-style);
+  border-width: 0 2px;
+}
+
 .border-\\[12px\\] {
   border-style: var(--tw-border-style);
   border-width: 12px;
 }
 
+.border-\\[12px_8px\\] {
+  border-style: var(--tw-border-style);
+  border-width: 12px 8px;
+}
+
 .border-\\[length\\:var\\(--my-width\\)\\], .border-\\[line-width\\:var\\(--my-width\\)\\] {
   border-style: var(--tw-border-style);
   border-width: var(--my-width);
@@ -58,36 +80,51 @@ exports[`border-* 1`] = `
   border-width: thin;
 }
 
+.border-\\[thin_2px\\] {
+  border-style: var(--tw-border-style);
+  border-width: thin 2px;
+}
+
 .border-\\[\\#0088cc\\] {
   border-color: #08c;
 }
 
 .border-\\[\\#0088cc\\]\\/50 {
-  border-color: oklab(59.9824% -.06725 -.12414 / .5);
+  border-color: oklab(59.9824% -.067 -.124 / .5);
 }
 
-.border-\\[color\\:var\\(--my-color\\)\\] {
+.border-\\[color\\:var\\(--my-color\\)\\], .border-\\[color\\:var\\(--my-color\\)\\]\\/50 {
   border-color: var(--my-color);
 }
 
-.border-\\[color\\:var\\(--my-color\\)\\]\\/50 {
-  border-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+    border-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-\\[var\\(--my-color\\)\\] {
+.border-\\[var\\(--my-color\\)\\], .border-\\[var\\(--my-color\\)\\]\\/50 {
   border-color: var(--my-color);
 }
 
-.border-\\[var\\(--my-color\\)\\]\\/50 {
-  border-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-\\[var\\(--my-color\\)\\]\\/50 {
+    border-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-current {
+.border-blue-500 {
+  border-color: var(--border-color-blue-500);
+}
+
+.border-current, .border-current\\/50 {
   border-color: currentColor;
 }
 
-.border-current\\/50 {
-  border-color: color-mix(in oklab, currentColor 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-current\\/50 {
+    border-color: color-mix(in oklab, currentcolor 50%, transparent);
+  }
 }
 
 .border-inherit {
@@ -99,46 +136,70 @@ exports[`border-* 1`] = `
 }
 
 .border-red-500\\/2\\.5 {
-  border-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  border-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-red-500\\/2\\.5 {
+    border-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  }
 }
 
 .border-red-500\\/2\\.25 {
-  border-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  border-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-red-500\\/2\\.25 {
+    border-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  }
 }
 
 .border-red-500\\/2\\.75 {
-  border-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  border-color: #ef444407;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-red-500\\/2\\.75 {
+    border-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  }
 }
 
 .border-red-500\\/50 {
-  border-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  border-color: #ef444480;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-red-500\\/50 {
+    border-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  }
 }
 
 .border-transparent {
   border-color: #0000;
 }
 
-@supports (-moz-orient: inline) {
-  @layer base {
+@property --tw-border-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
+"
+`;
+
+exports[`border-b-* 1`] = `
+"
+@layer properties {
+  @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
     *, :before, :after, ::backdrop {
       --tw-border-style: solid;
     }
   }
 }
 
-@property --tw-border-style {
-  syntax: "*";
-  inherits: false;
-  initial-value: solid;
-}"
-`;
-
-exports[`border-b-* 1`] = `
-":root {
-  --radius-none: 0px;
-  --radius-full: 9999px;
-  --radius-sm: .125rem;
+:root, :host {
   --color-red-500: #ef4444;
+  --border-color-blue-500: #3b82f6;
 }
 
 .border-b {
@@ -166,11 +227,26 @@ exports[`border-b-* 1`] = `
   border-bottom-width: 123px;
 }
 
+.border-b-\\[0_1\\] {
+  border-bottom-style: var(--tw-border-style);
+  border-bottom-width: 0 1;
+}
+
+.border-b-\\[0_2px_0_2px\\] {
+  border-bottom-style: var(--tw-border-style);
+  border-bottom-width: 0 2px 0 2px;
+}
+
 .border-b-\\[12px\\] {
   border-bottom-style: var(--tw-border-style);
   border-bottom-width: 12px;
 }
 
+.border-b-\\[12px_8px\\] {
+  border-bottom-style: var(--tw-border-style);
+  border-bottom-width: 12px 8px;
+}
+
 .border-b-\\[length\\:var\\(--my-width\\)\\], .border-b-\\[line-width\\:var\\(--my-width\\)\\] {
   border-bottom-style: var(--tw-border-style);
   border-bottom-width: var(--my-width);
@@ -191,36 +267,51 @@ exports[`border-b-* 1`] = `
   border-bottom-width: thin;
 }
 
+.border-b-\\[thin_2px\\] {
+  border-bottom-style: var(--tw-border-style);
+  border-bottom-width: thin 2px;
+}
+
 .border-b-\\[\\#0088cc\\] {
   border-bottom-color: #08c;
 }
 
 .border-b-\\[\\#0088cc\\]\\/50 {
-  border-bottom-color: oklab(59.9824% -.06725 -.12414 / .5);
+  border-bottom-color: oklab(59.9824% -.067 -.124 / .5);
 }
 
-.border-b-\\[color\\:var\\(--my-color\\)\\] {
+.border-b-\\[color\\:var\\(--my-color\\)\\], .border-b-\\[color\\:var\\(--my-color\\)\\]\\/50 {
   border-bottom-color: var(--my-color);
 }
 
-.border-b-\\[color\\:var\\(--my-color\\)\\]\\/50 {
-  border-bottom-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-b-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+    border-bottom-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-b-\\[var\\(--my-color\\)\\] {
+.border-b-\\[var\\(--my-color\\)\\], .border-b-\\[var\\(--my-color\\)\\]\\/50 {
   border-bottom-color: var(--my-color);
 }
 
-.border-b-\\[var\\(--my-color\\)\\]\\/50 {
-  border-bottom-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-b-\\[var\\(--my-color\\)\\]\\/50 {
+    border-bottom-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-b-current {
+.border-b-blue-500 {
+  border-bottom-color: var(--border-color-blue-500);
+}
+
+.border-b-current, .border-b-current\\/50 {
   border-bottom-color: currentColor;
 }
 
-.border-b-current\\/50 {
-  border-bottom-color: color-mix(in oklab, currentColor 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-b-current\\/50 {
+    border-bottom-color: color-mix(in oklab, currentcolor 50%, transparent);
+  }
 }
 
 .border-b-inherit {
@@ -232,46 +323,444 @@ exports[`border-b-* 1`] = `
 }
 
 .border-b-red-500\\/2\\.5 {
-  border-bottom-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  border-bottom-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-b-red-500\\/2\\.5 {
+    border-bottom-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  }
 }
 
 .border-b-red-500\\/2\\.25 {
-  border-bottom-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  border-bottom-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-b-red-500\\/2\\.25 {
+    border-bottom-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  }
 }
 
 .border-b-red-500\\/2\\.75 {
-  border-bottom-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  border-bottom-color: #ef444407;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-b-red-500\\/2\\.75 {
+    border-bottom-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  }
 }
 
 .border-b-red-500\\/50 {
-  border-bottom-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  border-bottom-color: #ef444480;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-b-red-500\\/50 {
+    border-bottom-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  }
 }
 
 .border-b-transparent {
   border-bottom-color: #0000;
 }
 
-@supports (-moz-orient: inline) {
-  @layer base {
+@property --tw-border-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
+"
+`;
+
+exports[`border-be-* 1`] = `
+"
+@layer properties {
+  @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
     *, :before, :after, ::backdrop {
       --tw-border-style: solid;
     }
   }
 }
 
+:root, :host {
+  --color-red-500: #ef4444;
+  --border-color-blue-500: #3b82f6;
+}
+
+.border-be {
+  border-block-end-style: var(--tw-border-style);
+  border-block-end-width: 1px;
+}
+
+.border-be-0 {
+  border-block-end-style: var(--tw-border-style);
+  border-block-end-width: 0;
+}
+
+.border-be-2 {
+  border-block-end-style: var(--tw-border-style);
+  border-block-end-width: 2px;
+}
+
+.border-be-4 {
+  border-block-end-style: var(--tw-border-style);
+  border-block-end-width: 4px;
+}
+
+.border-be-123 {
+  border-block-end-style: var(--tw-border-style);
+  border-block-end-width: 123px;
+}
+
+.border-be-\\[0_1\\] {
+  border-block-end-style: var(--tw-border-style);
+  border-block-end-width: 0 1;
+}
+
+.border-be-\\[0_2px_0_2px\\] {
+  border-block-end-style: var(--tw-border-style);
+  border-block-end-width: 0 2px 0 2px;
+}
+
+.border-be-\\[12px\\] {
+  border-block-end-style: var(--tw-border-style);
+  border-block-end-width: 12px;
+}
+
+.border-be-\\[12px_8px\\] {
+  border-block-end-style: var(--tw-border-style);
+  border-block-end-width: 12px 8px;
+}
+
+.border-be-\\[length\\:var\\(--my-width\\)\\], .border-be-\\[line-width\\:var\\(--my-width\\)\\] {
+  border-block-end-style: var(--tw-border-style);
+  border-block-end-width: var(--my-width);
+}
+
+.border-be-\\[medium\\] {
+  border-block-end-style: var(--tw-border-style);
+  border-block-end-width: medium;
+}
+
+.border-be-\\[thick\\] {
+  border-block-end-style: var(--tw-border-style);
+  border-block-end-width: thick;
+}
+
+.border-be-\\[thin\\] {
+  border-block-end-style: var(--tw-border-style);
+  border-block-end-width: thin;
+}
+
+.border-be-\\[thin_2px\\] {
+  border-block-end-style: var(--tw-border-style);
+  border-block-end-width: thin 2px;
+}
+
+.border-be-\\[\\#0088cc\\] {
+  border-block-end-color: #08c;
+}
+
+.border-be-\\[\\#0088cc\\]\\/50 {
+  border-block-end-color: oklab(59.9824% -.067 -.124 / .5);
+}
+
+.border-be-\\[color\\:var\\(--my-color\\)\\], .border-be-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+  border-block-end-color: var(--my-color);
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-be-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+    border-block-end-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
+}
+
+.border-be-\\[var\\(--my-color\\)\\], .border-be-\\[var\\(--my-color\\)\\]\\/50 {
+  border-block-end-color: var(--my-color);
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-be-\\[var\\(--my-color\\)\\]\\/50 {
+    border-block-end-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
+}
+
+.border-be-blue-500 {
+  border-block-end-color: var(--border-color-blue-500);
+}
+
+.border-be-current, .border-be-current\\/50 {
+  border-block-end-color: currentColor;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-be-current\\/50 {
+    border-block-end-color: color-mix(in oklab, currentcolor 50%, transparent);
+  }
+}
+
+.border-be-inherit {
+  border-block-end-color: inherit;
+}
+
+.border-be-red-500 {
+  border-block-end-color: var(--color-red-500);
+}
+
+.border-be-red-500\\/2\\.5 {
+  border-block-end-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-be-red-500\\/2\\.5 {
+    border-block-end-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  }
+}
+
+.border-be-red-500\\/2\\.25 {
+  border-block-end-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-be-red-500\\/2\\.25 {
+    border-block-end-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  }
+}
+
+.border-be-red-500\\/2\\.75 {
+  border-block-end-color: #ef444407;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-be-red-500\\/2\\.75 {
+    border-block-end-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  }
+}
+
+.border-be-red-500\\/50 {
+  border-block-end-color: #ef444480;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-be-red-500\\/50 {
+    border-block-end-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  }
+}
+
+.border-be-transparent {
+  border-block-end-color: #0000;
+}
+
 @property --tw-border-style {
   syntax: "*";
   inherits: false;
   initial-value: solid;
-}"
+}
+"
+`;
+
+exports[`border-bs-* 1`] = `
+"
+@layer properties {
+  @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+    *, :before, :after, ::backdrop {
+      --tw-border-style: solid;
+    }
+  }
+}
+
+:root, :host {
+  --color-red-500: #ef4444;
+  --border-color-blue-500: #3b82f6;
+}
+
+.border-bs {
+  border-block-start-style: var(--tw-border-style);
+  border-block-start-width: 1px;
+}
+
+.border-bs-0 {
+  border-block-start-style: var(--tw-border-style);
+  border-block-start-width: 0;
+}
+
+.border-bs-2 {
+  border-block-start-style: var(--tw-border-style);
+  border-block-start-width: 2px;
+}
+
+.border-bs-4 {
+  border-block-start-style: var(--tw-border-style);
+  border-block-start-width: 4px;
+}
+
+.border-bs-123 {
+  border-block-start-style: var(--tw-border-style);
+  border-block-start-width: 123px;
+}
+
+.border-bs-\\[0_1\\] {
+  border-block-start-style: var(--tw-border-style);
+  border-block-start-width: 0 1;
+}
+
+.border-bs-\\[0_2px_0_2px\\] {
+  border-block-start-style: var(--tw-border-style);
+  border-block-start-width: 0 2px 0 2px;
+}
+
+.border-bs-\\[12px\\] {
+  border-block-start-style: var(--tw-border-style);
+  border-block-start-width: 12px;
+}
+
+.border-bs-\\[12px_8px\\] {
+  border-block-start-style: var(--tw-border-style);
+  border-block-start-width: 12px 8px;
+}
+
+.border-bs-\\[length\\:var\\(--my-width\\)\\], .border-bs-\\[line-width\\:var\\(--my-width\\)\\] {
+  border-block-start-style: var(--tw-border-style);
+  border-block-start-width: var(--my-width);
+}
+
+.border-bs-\\[medium\\] {
+  border-block-start-style: var(--tw-border-style);
+  border-block-start-width: medium;
+}
+
+.border-bs-\\[thick\\] {
+  border-block-start-style: var(--tw-border-style);
+  border-block-start-width: thick;
+}
+
+.border-bs-\\[thin\\] {
+  border-block-start-style: var(--tw-border-style);
+  border-block-start-width: thin;
+}
+
+.border-bs-\\[thin_2px\\] {
+  border-block-start-style: var(--tw-border-style);
+  border-block-start-width: thin 2px;
+}
+
+.border-bs-\\[\\#0088cc\\] {
+  border-block-start-color: #08c;
+}
+
+.border-bs-\\[\\#0088cc\\]\\/50 {
+  border-block-start-color: oklab(59.9824% -.067 -.124 / .5);
+}
+
+.border-bs-\\[color\\:var\\(--my-color\\)\\], .border-bs-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+  border-block-start-color: var(--my-color);
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-bs-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+    border-block-start-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
+}
+
+.border-bs-\\[var\\(--my-color\\)\\], .border-bs-\\[var\\(--my-color\\)\\]\\/50 {
+  border-block-start-color: var(--my-color);
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-bs-\\[var\\(--my-color\\)\\]\\/50 {
+    border-block-start-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
+}
+
+.border-bs-blue-500 {
+  border-block-start-color: var(--border-color-blue-500);
+}
+
+.border-bs-current, .border-bs-current\\/50 {
+  border-block-start-color: currentColor;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-bs-current\\/50 {
+    border-block-start-color: color-mix(in oklab, currentcolor 50%, transparent);
+  }
+}
+
+.border-bs-inherit {
+  border-block-start-color: inherit;
+}
+
+.border-bs-red-500 {
+  border-block-start-color: var(--color-red-500);
+}
+
+.border-bs-red-500\\/2\\.5 {
+  border-block-start-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-bs-red-500\\/2\\.5 {
+    border-block-start-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  }
+}
+
+.border-bs-red-500\\/2\\.25 {
+  border-block-start-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-bs-red-500\\/2\\.25 {
+    border-block-start-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  }
+}
+
+.border-bs-red-500\\/2\\.75 {
+  border-block-start-color: #ef444407;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-bs-red-500\\/2\\.75 {
+    border-block-start-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  }
+}
+
+.border-bs-red-500\\/50 {
+  border-block-start-color: #ef444480;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-bs-red-500\\/50 {
+    border-block-start-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  }
+}
+
+.border-bs-transparent {
+  border-block-start-color: #0000;
+}
+
+@property --tw-border-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
+"
 `;
 
 exports[`border-e-* 1`] = `
-":root {
-  --radius-none: 0px;
-  --radius-full: 9999px;
-  --radius-sm: .125rem;
+"
+@layer properties {
+  @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+    *, :before, :after, ::backdrop {
+      --tw-border-style: solid;
+    }
+  }
+}
+
+:root, :host {
   --color-red-500: #ef4444;
+  --border-color-blue-500: #3b82f6;
 }
 
 .border-e {
@@ -299,11 +788,26 @@ exports[`border-e-* 1`] = `
   border-inline-end-width: 123px;
 }
 
+.border-e-\\[0_1\\] {
+  border-inline-end-style: var(--tw-border-style);
+  border-inline-end-width: 0 1;
+}
+
+.border-e-\\[0_2px_0_2px\\] {
+  border-inline-end-style: var(--tw-border-style);
+  border-inline-end-width: 0 2px 0 2px;
+}
+
 .border-e-\\[12px\\] {
   border-inline-end-style: var(--tw-border-style);
   border-inline-end-width: 12px;
 }
 
+.border-e-\\[12px_8px\\] {
+  border-inline-end-style: var(--tw-border-style);
+  border-inline-end-width: 12px 8px;
+}
+
 .border-e-\\[length\\:var\\(--my-width\\)\\], .border-e-\\[line-width\\:var\\(--my-width\\)\\] {
   border-inline-end-style: var(--tw-border-style);
   border-inline-end-width: var(--my-width);
@@ -324,36 +828,51 @@ exports[`border-e-* 1`] = `
   border-inline-end-width: thin;
 }
 
+.border-e-\\[thin_2px\\] {
+  border-inline-end-style: var(--tw-border-style);
+  border-inline-end-width: thin 2px;
+}
+
 .border-e-\\[\\#0088cc\\] {
   border-inline-end-color: #08c;
 }
 
 .border-e-\\[\\#0088cc\\]\\/50 {
-  border-inline-end-color: oklab(59.9824% -.06725 -.12414 / .5);
+  border-inline-end-color: oklab(59.9824% -.067 -.124 / .5);
 }
 
-.border-e-\\[color\\:var\\(--my-color\\)\\] {
+.border-e-\\[color\\:var\\(--my-color\\)\\], .border-e-\\[color\\:var\\(--my-color\\)\\]\\/50 {
   border-inline-end-color: var(--my-color);
 }
 
-.border-e-\\[color\\:var\\(--my-color\\)\\]\\/50 {
-  border-inline-end-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-e-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+    border-inline-end-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-e-\\[var\\(--my-color\\)\\] {
+.border-e-\\[var\\(--my-color\\)\\], .border-e-\\[var\\(--my-color\\)\\]\\/50 {
   border-inline-end-color: var(--my-color);
 }
 
-.border-e-\\[var\\(--my-color\\)\\]\\/50 {
-  border-inline-end-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-e-\\[var\\(--my-color\\)\\]\\/50 {
+    border-inline-end-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-e-current {
+.border-e-blue-500 {
+  border-inline-end-color: var(--border-color-blue-500);
+}
+
+.border-e-current, .border-e-current\\/50 {
   border-inline-end-color: currentColor;
 }
 
-.border-e-current\\/50 {
-  border-inline-end-color: color-mix(in oklab, currentColor 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-e-current\\/50 {
+    border-inline-end-color: color-mix(in oklab, currentcolor 50%, transparent);
+  }
 }
 
 .border-e-inherit {
@@ -365,46 +884,70 @@ exports[`border-e-* 1`] = `
 }
 
 .border-e-red-500\\/2\\.5 {
-  border-inline-end-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  border-inline-end-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-e-red-500\\/2\\.5 {
+    border-inline-end-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  }
 }
 
 .border-e-red-500\\/2\\.25 {
-  border-inline-end-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  border-inline-end-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-e-red-500\\/2\\.25 {
+    border-inline-end-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  }
 }
 
 .border-e-red-500\\/2\\.75 {
-  border-inline-end-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  border-inline-end-color: #ef444407;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-e-red-500\\/2\\.75 {
+    border-inline-end-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  }
 }
 
 .border-e-red-500\\/50 {
-  border-inline-end-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  border-inline-end-color: #ef444480;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-e-red-500\\/50 {
+    border-inline-end-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  }
 }
 
 .border-e-transparent {
   border-inline-end-color: #0000;
 }
 
-@supports (-moz-orient: inline) {
-  @layer base {
+@property --tw-border-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
+"
+`;
+
+exports[`border-l-* 1`] = `
+"
+@layer properties {
+  @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
     *, :before, :after, ::backdrop {
       --tw-border-style: solid;
     }
   }
 }
 
-@property --tw-border-style {
-  syntax: "*";
-  inherits: false;
-  initial-value: solid;
-}"
-`;
-
-exports[`border-l-* 1`] = `
-":root {
-  --radius-none: 0px;
-  --radius-full: 9999px;
-  --radius-sm: .125rem;
+:root, :host {
   --color-red-500: #ef4444;
+  --border-color-blue-500: #3b82f6;
 }
 
 .border-l {
@@ -432,11 +975,26 @@ exports[`border-l-* 1`] = `
   border-left-width: 123px;
 }
 
+.border-l-\\[0_1\\] {
+  border-left-style: var(--tw-border-style);
+  border-left-width: 0 1;
+}
+
+.border-l-\\[0_2px_0_2px\\] {
+  border-left-style: var(--tw-border-style);
+  border-left-width: 0 2px 0 2px;
+}
+
 .border-l-\\[12px\\] {
   border-left-style: var(--tw-border-style);
   border-left-width: 12px;
 }
 
+.border-l-\\[12px_8px\\] {
+  border-left-style: var(--tw-border-style);
+  border-left-width: 12px 8px;
+}
+
 .border-l-\\[length\\:var\\(--my-width\\)\\], .border-l-\\[line-width\\:var\\(--my-width\\)\\] {
   border-left-style: var(--tw-border-style);
   border-left-width: var(--my-width);
@@ -457,36 +1015,51 @@ exports[`border-l-* 1`] = `
   border-left-width: thin;
 }
 
+.border-l-\\[thin_2px\\] {
+  border-left-style: var(--tw-border-style);
+  border-left-width: thin 2px;
+}
+
 .border-l-\\[\\#0088cc\\] {
   border-left-color: #08c;
 }
 
 .border-l-\\[\\#0088cc\\]\\/50 {
-  border-left-color: oklab(59.9824% -.06725 -.12414 / .5);
+  border-left-color: oklab(59.9824% -.067 -.124 / .5);
 }
 
-.border-l-\\[color\\:var\\(--my-color\\)\\] {
+.border-l-\\[color\\:var\\(--my-color\\)\\], .border-l-\\[color\\:var\\(--my-color\\)\\]\\/50 {
   border-left-color: var(--my-color);
 }
 
-.border-l-\\[color\\:var\\(--my-color\\)\\]\\/50 {
-  border-left-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-l-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+    border-left-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-l-\\[var\\(--my-color\\)\\] {
+.border-l-\\[var\\(--my-color\\)\\], .border-l-\\[var\\(--my-color\\)\\]\\/50 {
   border-left-color: var(--my-color);
 }
 
-.border-l-\\[var\\(--my-color\\)\\]\\/50 {
-  border-left-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-l-\\[var\\(--my-color\\)\\]\\/50 {
+    border-left-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-l-current {
+.border-l-blue-500 {
+  border-left-color: var(--border-color-blue-500);
+}
+
+.border-l-current, .border-l-current\\/50 {
   border-left-color: currentColor;
 }
 
-.border-l-current\\/50 {
-  border-left-color: color-mix(in oklab, currentColor 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-l-current\\/50 {
+    border-left-color: color-mix(in oklab, currentcolor 50%, transparent);
+  }
 }
 
 .border-l-inherit {
@@ -498,46 +1071,70 @@ exports[`border-l-* 1`] = `
 }
 
 .border-l-red-500\\/2\\.5 {
-  border-left-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  border-left-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-l-red-500\\/2\\.5 {
+    border-left-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  }
 }
 
 .border-l-red-500\\/2\\.25 {
-  border-left-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  border-left-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-l-red-500\\/2\\.25 {
+    border-left-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  }
 }
 
 .border-l-red-500\\/2\\.75 {
-  border-left-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  border-left-color: #ef444407;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-l-red-500\\/2\\.75 {
+    border-left-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  }
 }
 
 .border-l-red-500\\/50 {
-  border-left-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  border-left-color: #ef444480;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-l-red-500\\/50 {
+    border-left-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  }
 }
 
 .border-l-transparent {
   border-left-color: #0000;
 }
 
-@supports (-moz-orient: inline) {
-  @layer base {
+@property --tw-border-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
+"
+`;
+
+exports[`border-r-* 1`] = `
+"
+@layer properties {
+  @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
     *, :before, :after, ::backdrop {
       --tw-border-style: solid;
     }
   }
 }
 
-@property --tw-border-style {
-  syntax: "*";
-  inherits: false;
-  initial-value: solid;
-}"
-`;
-
-exports[`border-r-* 1`] = `
-":root {
-  --radius-none: 0px;
-  --radius-full: 9999px;
-  --radius-sm: .125rem;
+:root, :host {
   --color-red-500: #ef4444;
+  --border-color-blue-500: #3b82f6;
 }
 
 .border-r {
@@ -565,11 +1162,26 @@ exports[`border-r-* 1`] = `
   border-right-width: 123px;
 }
 
+.border-r-\\[0_1\\] {
+  border-right-style: var(--tw-border-style);
+  border-right-width: 0 1;
+}
+
+.border-r-\\[0_2px_0_2px\\] {
+  border-right-style: var(--tw-border-style);
+  border-right-width: 0 2px 0 2px;
+}
+
 .border-r-\\[12px\\] {
   border-right-style: var(--tw-border-style);
   border-right-width: 12px;
 }
 
+.border-r-\\[12px_8px\\] {
+  border-right-style: var(--tw-border-style);
+  border-right-width: 12px 8px;
+}
+
 .border-r-\\[length\\:var\\(--my-width\\)\\], .border-r-\\[line-width\\:var\\(--my-width\\)\\] {
   border-right-style: var(--tw-border-style);
   border-right-width: var(--my-width);
@@ -590,36 +1202,51 @@ exports[`border-r-* 1`] = `
   border-right-width: thin;
 }
 
+.border-r-\\[thin_2px\\] {
+  border-right-style: var(--tw-border-style);
+  border-right-width: thin 2px;
+}
+
 .border-r-\\[\\#0088cc\\] {
   border-right-color: #08c;
 }
 
 .border-r-\\[\\#0088cc\\]\\/50 {
-  border-right-color: oklab(59.9824% -.06725 -.12414 / .5);
+  border-right-color: oklab(59.9824% -.067 -.124 / .5);
 }
 
-.border-r-\\[color\\:var\\(--my-color\\)\\] {
+.border-r-\\[color\\:var\\(--my-color\\)\\], .border-r-\\[color\\:var\\(--my-color\\)\\]\\/50 {
   border-right-color: var(--my-color);
 }
 
-.border-r-\\[color\\:var\\(--my-color\\)\\]\\/50 {
-  border-right-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-r-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+    border-right-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-r-\\[var\\(--my-color\\)\\] {
+.border-r-\\[var\\(--my-color\\)\\], .border-r-\\[var\\(--my-color\\)\\]\\/50 {
   border-right-color: var(--my-color);
 }
 
-.border-r-\\[var\\(--my-color\\)\\]\\/50 {
-  border-right-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-r-\\[var\\(--my-color\\)\\]\\/50 {
+    border-right-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-r-current {
+.border-r-blue-500 {
+  border-right-color: var(--border-color-blue-500);
+}
+
+.border-r-current, .border-r-current\\/50 {
   border-right-color: currentColor;
 }
 
-.border-r-current\\/50 {
-  border-right-color: color-mix(in oklab, currentColor 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-r-current\\/50 {
+    border-right-color: color-mix(in oklab, currentcolor 50%, transparent);
+  }
 }
 
 .border-r-inherit {
@@ -631,46 +1258,70 @@ exports[`border-r-* 1`] = `
 }
 
 .border-r-red-500\\/2\\.5 {
-  border-right-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  border-right-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-r-red-500\\/2\\.5 {
+    border-right-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  }
 }
 
 .border-r-red-500\\/2\\.25 {
-  border-right-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  border-right-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-r-red-500\\/2\\.25 {
+    border-right-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  }
 }
 
 .border-r-red-500\\/2\\.75 {
-  border-right-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  border-right-color: #ef444407;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-r-red-500\\/2\\.75 {
+    border-right-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  }
 }
 
 .border-r-red-500\\/50 {
-  border-right-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  border-right-color: #ef444480;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-r-red-500\\/50 {
+    border-right-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  }
 }
 
 .border-r-transparent {
   border-right-color: #0000;
 }
 
-@supports (-moz-orient: inline) {
-  @layer base {
+@property --tw-border-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
+"
+`;
+
+exports[`border-s-* 1`] = `
+"
+@layer properties {
+  @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
     *, :before, :after, ::backdrop {
       --tw-border-style: solid;
     }
   }
 }
 
-@property --tw-border-style {
-  syntax: "*";
-  inherits: false;
-  initial-value: solid;
-}"
-`;
-
-exports[`border-s-* 1`] = `
-":root {
-  --radius-none: 0px;
-  --radius-full: 9999px;
-  --radius-sm: .125rem;
+:root, :host {
   --color-red-500: #ef4444;
+  --border-color-blue-500: #3b82f6;
 }
 
 .border-s {
@@ -698,11 +1349,26 @@ exports[`border-s-* 1`] = `
   border-inline-start-width: 123px;
 }
 
+.border-s-\\[0_1\\] {
+  border-inline-start-style: var(--tw-border-style);
+  border-inline-start-width: 0 1;
+}
+
+.border-s-\\[0_2px_0_2px\\] {
+  border-inline-start-style: var(--tw-border-style);
+  border-inline-start-width: 0 2px 0 2px;
+}
+
 .border-s-\\[12px\\] {
   border-inline-start-style: var(--tw-border-style);
   border-inline-start-width: 12px;
 }
 
+.border-s-\\[12px_8px\\] {
+  border-inline-start-style: var(--tw-border-style);
+  border-inline-start-width: 12px 8px;
+}
+
 .border-s-\\[length\\:var\\(--my-width\\)\\], .border-s-\\[line-width\\:var\\(--my-width\\)\\] {
   border-inline-start-style: var(--tw-border-style);
   border-inline-start-width: var(--my-width);
@@ -723,36 +1389,51 @@ exports[`border-s-* 1`] = `
   border-inline-start-width: thin;
 }
 
+.border-s-\\[thin_2px\\] {
+  border-inline-start-style: var(--tw-border-style);
+  border-inline-start-width: thin 2px;
+}
+
 .border-s-\\[\\#0088cc\\] {
   border-inline-start-color: #08c;
 }
 
 .border-s-\\[\\#0088cc\\]\\/50 {
-  border-inline-start-color: oklab(59.9824% -.06725 -.12414 / .5);
+  border-inline-start-color: oklab(59.9824% -.067 -.124 / .5);
 }
 
-.border-s-\\[color\\:var\\(--my-color\\)\\] {
+.border-s-\\[color\\:var\\(--my-color\\)\\], .border-s-\\[color\\:var\\(--my-color\\)\\]\\/50 {
   border-inline-start-color: var(--my-color);
 }
 
-.border-s-\\[color\\:var\\(--my-color\\)\\]\\/50 {
-  border-inline-start-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-s-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+    border-inline-start-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-s-\\[var\\(--my-color\\)\\] {
+.border-s-\\[var\\(--my-color\\)\\], .border-s-\\[var\\(--my-color\\)\\]\\/50 {
   border-inline-start-color: var(--my-color);
 }
 
-.border-s-\\[var\\(--my-color\\)\\]\\/50 {
-  border-inline-start-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-s-\\[var\\(--my-color\\)\\]\\/50 {
+    border-inline-start-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-s-current {
+.border-s-blue-500 {
+  border-inline-start-color: var(--border-color-blue-500);
+}
+
+.border-s-current, .border-s-current\\/50 {
   border-inline-start-color: currentColor;
 }
 
-.border-s-current\\/50 {
-  border-inline-start-color: color-mix(in oklab, currentColor 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-s-current\\/50 {
+    border-inline-start-color: color-mix(in oklab, currentcolor 50%, transparent);
+  }
 }
 
 .border-s-inherit {
@@ -764,46 +1445,70 @@ exports[`border-s-* 1`] = `
 }
 
 .border-s-red-500\\/2\\.5 {
-  border-inline-start-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  border-inline-start-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-s-red-500\\/2\\.5 {
+    border-inline-start-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  }
 }
 
 .border-s-red-500\\/2\\.25 {
-  border-inline-start-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  border-inline-start-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-s-red-500\\/2\\.25 {
+    border-inline-start-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  }
 }
 
 .border-s-red-500\\/2\\.75 {
-  border-inline-start-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  border-inline-start-color: #ef444407;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-s-red-500\\/2\\.75 {
+    border-inline-start-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  }
 }
 
 .border-s-red-500\\/50 {
-  border-inline-start-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  border-inline-start-color: #ef444480;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-s-red-500\\/50 {
+    border-inline-start-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  }
 }
 
 .border-s-transparent {
   border-inline-start-color: #0000;
 }
 
-@supports (-moz-orient: inline) {
-  @layer base {
+@property --tw-border-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
+"
+`;
+
+exports[`border-t-* 1`] = `
+"
+@layer properties {
+  @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
     *, :before, :after, ::backdrop {
       --tw-border-style: solid;
     }
   }
 }
 
-@property --tw-border-style {
-  syntax: "*";
-  inherits: false;
-  initial-value: solid;
-}"
-`;
-
-exports[`border-t-* 1`] = `
-":root {
-  --radius-none: 0px;
-  --radius-full: 9999px;
-  --radius-sm: .125rem;
+:root, :host {
   --color-red-500: #ef4444;
+  --border-color-blue-500: #3b82f6;
 }
 
 .border-t {
@@ -831,11 +1536,26 @@ exports[`border-t-* 1`] = `
   border-top-width: 123px;
 }
 
+.border-t-\\[0_1\\] {
+  border-top-style: var(--tw-border-style);
+  border-top-width: 0 1;
+}
+
+.border-t-\\[0_2px_0_2px\\] {
+  border-top-style: var(--tw-border-style);
+  border-top-width: 0 2px 0 2px;
+}
+
 .border-t-\\[12px\\] {
   border-top-style: var(--tw-border-style);
   border-top-width: 12px;
 }
 
+.border-t-\\[12px_8px\\] {
+  border-top-style: var(--tw-border-style);
+  border-top-width: 12px 8px;
+}
+
 .border-t-\\[length\\:var\\(--my-width\\)\\], .border-t-\\[line-width\\:var\\(--my-width\\)\\] {
   border-top-style: var(--tw-border-style);
   border-top-width: var(--my-width);
@@ -856,36 +1576,51 @@ exports[`border-t-* 1`] = `
   border-top-width: thin;
 }
 
+.border-t-\\[thin_2px\\] {
+  border-top-style: var(--tw-border-style);
+  border-top-width: thin 2px;
+}
+
 .border-t-\\[\\#0088cc\\] {
   border-top-color: #08c;
 }
 
 .border-t-\\[\\#0088cc\\]\\/50 {
-  border-top-color: oklab(59.9824% -.06725 -.12414 / .5);
+  border-top-color: oklab(59.9824% -.067 -.124 / .5);
 }
 
-.border-t-\\[color\\:var\\(--my-color\\)\\] {
+.border-t-\\[color\\:var\\(--my-color\\)\\], .border-t-\\[color\\:var\\(--my-color\\)\\]\\/50 {
   border-top-color: var(--my-color);
 }
 
-.border-t-\\[color\\:var\\(--my-color\\)\\]\\/50 {
-  border-top-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-t-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+    border-top-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-t-\\[var\\(--my-color\\)\\] {
+.border-t-\\[var\\(--my-color\\)\\], .border-t-\\[var\\(--my-color\\)\\]\\/50 {
   border-top-color: var(--my-color);
 }
 
-.border-t-\\[var\\(--my-color\\)\\]\\/50 {
-  border-top-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-t-\\[var\\(--my-color\\)\\]\\/50 {
+    border-top-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-t-current {
+.border-t-blue-500 {
+  border-top-color: var(--border-color-blue-500);
+}
+
+.border-t-current, .border-t-current\\/50 {
   border-top-color: currentColor;
 }
 
-.border-t-current\\/50 {
-  border-top-color: color-mix(in oklab, currentColor 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-t-current\\/50 {
+    border-top-color: color-mix(in oklab, currentcolor 50%, transparent);
+  }
 }
 
 .border-t-inherit {
@@ -897,46 +1632,70 @@ exports[`border-t-* 1`] = `
 }
 
 .border-t-red-500\\/2\\.5 {
-  border-top-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  border-top-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-t-red-500\\/2\\.5 {
+    border-top-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  }
 }
 
 .border-t-red-500\\/2\\.25 {
-  border-top-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  border-top-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-t-red-500\\/2\\.25 {
+    border-top-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  }
 }
 
 .border-t-red-500\\/2\\.75 {
-  border-top-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  border-top-color: #ef444407;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-t-red-500\\/2\\.75 {
+    border-top-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  }
 }
 
 .border-t-red-500\\/50 {
-  border-top-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  border-top-color: #ef444480;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-t-red-500\\/50 {
+    border-top-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  }
 }
 
 .border-t-transparent {
   border-top-color: #0000;
 }
 
-@supports (-moz-orient: inline) {
-  @layer base {
+@property --tw-border-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
+"
+`;
+
+exports[`border-x-* 1`] = `
+"
+@layer properties {
+  @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
     *, :before, :after, ::backdrop {
       --tw-border-style: solid;
     }
   }
 }
 
-@property --tw-border-style {
-  syntax: "*";
-  inherits: false;
-  initial-value: solid;
-}"
-`;
-
-exports[`border-x-* 1`] = `
-":root {
-  --radius-none: 0px;
-  --radius-full: 9999px;
-  --radius-sm: .125rem;
+:root, :host {
   --color-red-500: #ef4444;
+  --border-color-blue-500: #3b82f6;
 }
 
 .border-x {
@@ -964,11 +1723,26 @@ exports[`border-x-* 1`] = `
   border-inline-width: 123px;
 }
 
+.border-x-\\[0_1\\] {
+  border-inline-style: var(--tw-border-style);
+  border-inline-width: 0 1px;
+}
+
+.border-x-\\[0_2px_0_2px\\] {
+  border-inline-style: var(--tw-border-style);
+  border-inline-width: 0 2px 0 2px;
+}
+
 .border-x-\\[12px\\] {
   border-inline-style: var(--tw-border-style);
   border-inline-width: 12px;
 }
 
+.border-x-\\[12px_8px\\] {
+  border-inline-style: var(--tw-border-style);
+  border-inline-width: 12px 8px;
+}
+
 .border-x-\\[length\\:var\\(--my-width\\)\\], .border-x-\\[line-width\\:var\\(--my-width\\)\\] {
   border-inline-style: var(--tw-border-style);
   border-inline-width: var(--my-width);
@@ -989,36 +1763,51 @@ exports[`border-x-* 1`] = `
   border-inline-width: thin;
 }
 
+.border-x-\\[thin_2px\\] {
+  border-inline-style: var(--tw-border-style);
+  border-inline-width: thin 2px;
+}
+
 .border-x-\\[\\#0088cc\\] {
   border-inline-color: #08c;
 }
 
 .border-x-\\[\\#0088cc\\]\\/50 {
-  border-inline-color: oklab(59.9824% -.06725 -.12414 / .5);
+  border-inline-color: oklab(59.9824% -.067 -.124 / .5);
 }
 
-.border-x-\\[color\\:var\\(--my-color\\)\\] {
+.border-x-\\[color\\:var\\(--my-color\\)\\], .border-x-\\[color\\:var\\(--my-color\\)\\]\\/50 {
   border-inline-color: var(--my-color);
 }
 
-.border-x-\\[color\\:var\\(--my-color\\)\\]\\/50 {
-  border-inline-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-x-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+    border-inline-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-x-\\[var\\(--my-color\\)\\] {
+.border-x-\\[var\\(--my-color\\)\\], .border-x-\\[var\\(--my-color\\)\\]\\/50 {
   border-inline-color: var(--my-color);
 }
 
-.border-x-\\[var\\(--my-color\\)\\]\\/50 {
-  border-inline-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-x-\\[var\\(--my-color\\)\\]\\/50 {
+    border-inline-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-x-current {
+.border-x-blue-500 {
+  border-inline-color: var(--border-color-blue-500);
+}
+
+.border-x-current, .border-x-current\\/50 {
   border-inline-color: currentColor;
 }
 
-.border-x-current\\/50 {
-  border-inline-color: color-mix(in oklab, currentColor 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-x-current\\/50 {
+    border-inline-color: color-mix(in oklab, currentcolor 50%, transparent);
+  }
 }
 
 .border-x-inherit {
@@ -1030,46 +1819,70 @@ exports[`border-x-* 1`] = `
 }
 
 .border-x-red-500\\/2\\.5 {
-  border-inline-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  border-inline-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-x-red-500\\/2\\.5 {
+    border-inline-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  }
 }
 
 .border-x-red-500\\/2\\.25 {
-  border-inline-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  border-inline-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-x-red-500\\/2\\.25 {
+    border-inline-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  }
 }
 
 .border-x-red-500\\/2\\.75 {
-  border-inline-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  border-inline-color: #ef444407;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-x-red-500\\/2\\.75 {
+    border-inline-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  }
 }
 
 .border-x-red-500\\/50 {
-  border-inline-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  border-inline-color: #ef444480;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-x-red-500\\/50 {
+    border-inline-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  }
 }
 
 .border-x-transparent {
   border-inline-color: #0000;
 }
 
-@supports (-moz-orient: inline) {
-  @layer base {
+@property --tw-border-style {
+  syntax: "*";
+  inherits: false;
+  initial-value: solid;
+}
+"
+`;
+
+exports[`border-y-* 1`] = `
+"
+@layer properties {
+  @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
     *, :before, :after, ::backdrop {
       --tw-border-style: solid;
     }
   }
 }
 
-@property --tw-border-style {
-  syntax: "*";
-  inherits: false;
-  initial-value: solid;
-}"
-`;
-
-exports[`border-y-* 1`] = `
-":root {
-  --radius-none: 0px;
-  --radius-full: 9999px;
-  --radius-sm: .125rem;
+:root, :host {
   --color-red-500: #ef4444;
+  --border-color-blue-500: #3b82f6;
 }
 
 .border-y {
@@ -1097,11 +1910,26 @@ exports[`border-y-* 1`] = `
   border-block-width: 123px;
 }
 
+.border-y-\\[0_1\\] {
+  border-block-style: var(--tw-border-style);
+  border-block-width: 0 1px;
+}
+
+.border-y-\\[0_2px_0_2px\\] {
+  border-block-style: var(--tw-border-style);
+  border-block-width: 0 2px 0 2px;
+}
+
 .border-y-\\[12px\\] {
   border-block-style: var(--tw-border-style);
   border-block-width: 12px;
 }
 
+.border-y-\\[12px_8px\\] {
+  border-block-style: var(--tw-border-style);
+  border-block-width: 12px 8px;
+}
+
 .border-y-\\[length\\:var\\(--my-width\\)\\], .border-y-\\[line-width\\:var\\(--my-width\\)\\] {
   border-block-style: var(--tw-border-style);
   border-block-width: var(--my-width);
@@ -1122,36 +1950,51 @@ exports[`border-y-* 1`] = `
   border-block-width: thin;
 }
 
+.border-y-\\[thin_2px\\] {
+  border-block-style: var(--tw-border-style);
+  border-block-width: thin 2px;
+}
+
 .border-y-\\[\\#0088cc\\] {
   border-block-color: #08c;
 }
 
 .border-y-\\[\\#0088cc\\]\\/50 {
-  border-block-color: oklab(59.9824% -.06725 -.12414 / .5);
+  border-block-color: oklab(59.9824% -.067 -.124 / .5);
 }
 
-.border-y-\\[color\\:var\\(--my-color\\)\\] {
+.border-y-\\[color\\:var\\(--my-color\\)\\], .border-y-\\[color\\:var\\(--my-color\\)\\]\\/50 {
   border-block-color: var(--my-color);
 }
 
-.border-y-\\[color\\:var\\(--my-color\\)\\]\\/50 {
-  border-block-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-y-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+    border-block-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-y-\\[var\\(--my-color\\)\\] {
+.border-y-\\[var\\(--my-color\\)\\], .border-y-\\[var\\(--my-color\\)\\]\\/50 {
   border-block-color: var(--my-color);
 }
 
-.border-y-\\[var\\(--my-color\\)\\]\\/50 {
-  border-block-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-y-\\[var\\(--my-color\\)\\]\\/50 {
+    border-block-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+  }
 }
 
-.border-y-current {
+.border-y-blue-500 {
+  border-block-color: var(--border-color-blue-500);
+}
+
+.border-y-current, .border-y-current\\/50 {
   border-block-color: currentColor;
 }
 
-.border-y-current\\/50 {
-  border-block-color: color-mix(in oklab, currentColor 50%, transparent);
+@supports (color: color-mix(in lab, red, red)) {
+  .border-y-current\\/50 {
+    border-block-color: color-mix(in oklab, currentcolor 50%, transparent);
+  }
 }
 
 .border-y-inherit {
@@ -1163,36 +2006,53 @@ exports[`border-y-* 1`] = `
 }
 
 .border-y-red-500\\/2\\.5 {
-  border-block-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  border-block-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-y-red-500\\/2\\.5 {
+    border-block-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+  }
 }
 
 .border-y-red-500\\/2\\.25 {
-  border-block-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  border-block-color: #ef444406;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-y-red-500\\/2\\.25 {
+    border-block-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+  }
 }
 
 .border-y-red-500\\/2\\.75 {
-  border-block-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  border-block-color: #ef444407;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-y-red-500\\/2\\.75 {
+    border-block-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+  }
 }
 
 .border-y-red-500\\/50 {
-  border-block-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  border-block-color: #ef444480;
+}
+
+@supports (color: color-mix(in lab, red, red)) {
+  .border-y-red-500\\/50 {
+    border-block-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+  }
 }
 
 .border-y-transparent {
   border-block-color: #0000;
 }
 
-@supports (-moz-orient: inline) {
-  @layer base {
-    *, :before, :after, ::backdrop {
-      --tw-border-style: solid;
-    }
-  }
-}
-
 @property --tw-border-style {
   syntax: "*";
   inherits: false;
   initial-value: solid;
-}"
+}
+"
 `;
diff --git a/packages/tailwindcss/src/apply.ts b/packages/tailwindcss/src/apply.ts
index 7af9cf10d..2d5e5b847 100644
--- a/packages/tailwindcss/src/apply.ts
+++ b/packages/tailwindcss/src/apply.ts
@@ -1,12 +1,32 @@
 import { Features } from '.'
-import { walk, WalkAction, type AstNode } from './ast'
+import { cloneAstNode, rule, toCss, type AstNode } from './ast'
 import { compileCandidates } from './compile'
 import type { DesignSystem } from './design-system'
-import { escape } from './utils/escape'
+import type { SourceLocation } from './source-maps/source'
+import { DefaultMap } from './utils/default-map'
+import { segment } from './utils/segment'
+import { walk, WalkAction } from './walk'
 
 export function substituteAtApply(ast: AstNode[], designSystem: DesignSystem) {
   let features = Features.None
-  walk(ast, (node, { replaceWith }) => {
+
+  // Wrap the whole AST in a root rule to make sure there is always a parent
+  // available for `@apply` at-rules. In some cases, the incoming `ast` just
+  // contains `@apply` at-rules which means that there is no proper parent to
+  // rely on.
+  let root = rule('&', ast)
+
+  // Track all nodes containing `@apply`
+  let parents = new Set<AstNode>()
+
+  // Track all the dependencies of an `AstNode`
+  let dependencies = new DefaultMap<AstNode, Set<string>>(() => new Set<string>())
+
+  // Track all `@utility` definitions by its root (name)
+  let definitions = new DefaultMap(() => new Set<AstNode>())
+
+  // Collect all new `@utility` definitions and all `@apply` rules first
+  walk([root], (node, ctx) => {
     if (node.kind !== 'at-rule') return
 
     // Do not allow `@apply` rules inside `@keyframes` rules.
@@ -19,64 +39,325 @@ export function substituteAtApply(ast: AstNode[], designSystem: DesignSystem) {
       return WalkAction.Skip
     }
 
-    if (node.name !== '@apply') return
-    features |= Features.AtApply
+    // `@utility` defines a utility, which is important information in order to
+    // do a correct topological sort later on.
+    if (node.name === '@utility') {
+      let name = node.params.replace(/-\*$/, '')
+      definitions.get(name).add(node)
 
-    let candidates = node.params.split(/\s+/g)
+      // In case `@apply` rules are used inside `@utility` rules.
+      walk(node.nodes, (child) => {
+        if (child.kind !== 'at-rule' || child.name !== '@apply') return
 
-    // Replace the `@apply` rule with the actual utility classes
-    {
-      // Parse the candidates to an AST that we can replace the `@apply` rule
-      // with.
-      let candidateAst = compileCandidates(candidates, designSystem, {
-        onInvalidCandidate: (candidate) => {
-          throw new Error(`Cannot apply unknown utility class: ${candidate}`)
-        },
-      }).astNodes
+        parents.add(node)
 
-      // Collect the nodes to insert in place of the `@apply` rule. When a rule
-      // was used, we want to insert its children instead of the rule because we
-      // don't want the wrapping selector.
-      let newNodes: AstNode[] = []
-      for (let candidateNode of candidateAst) {
-        if (candidateNode.kind === 'rule') {
-          for (let child of candidateNode.nodes) {
-            newNodes.push(child)
-          }
-        } else {
-          newNodes.push(candidateNode)
-        }
-      }
-
-      // Verify that we don't have any circular dependencies by verifying that
-      // the current node does not appear in the new nodes.
-      walk(newNodes, (child) => {
-        if (child !== node) return
-
-        // At this point we already know that we have a circular dependency.
-        //
-        // Figure out which candidate caused the circular dependency. This will
-        // help to create a useful error message for the end user.
-        for (let candidate of candidates) {
-          let selector = `.${escape(candidate)}`
-
-          for (let rule of candidateAst) {
-            if (rule.kind !== 'rule') continue
-            if (rule.selector !== selector) continue
-
-            walk(rule.nodes, (child) => {
-              if (child !== node) return
-
-              throw new Error(
-                `You cannot \`@apply\` the \`${candidate}\` utility here because it creates a circular dependency.`,
-              )
-            })
-          }
+        for (let dependency of resolveApplyDependencies(child, designSystem)) {
+          dependencies.get(node).add(dependency)
         }
       })
+      return
+    }
 
-      replaceWith(newNodes)
+    // Any other `@apply` node.
+    if (node.name === '@apply') {
+      // `@apply` cannot be top-level, so we need to have a parent such that we
+      // can replace the `@apply` node with the actual utility classes later.
+      if (ctx.parent === null) return
+
+      features |= Features.AtApply
+
+      parents.add(ctx.parent)
+
+      for (let dependency of resolveApplyDependencies(node, designSystem)) {
+        // Mark every parent in the path as having a dependency to that utility.
+        for (let parent of ctx.path()) {
+          if (!parents.has(parent)) continue
+          dependencies.get(parent).add(dependency)
+        }
+      }
     }
   })
+
+  // Topological sort before substituting `@apply`
+  let seen = new Set<AstNode>()
+  let sorted: AstNode[] = []
+  let wip = new Set<AstNode>()
+
+  function visit(node: AstNode, path: AstNode[] = []) {
+    if (seen.has(node)) {
+      return
+    }
+
+    // Circular dependency detected
+    if (wip.has(node)) {
+      // Next node in the path is the one that caused the circular dependency
+      let next = path[(path.indexOf(node) + 1) % path.length]
+
+      if (
+        node.kind === 'at-rule' &&
+        node.name === '@utility' &&
+        next.kind === 'at-rule' &&
+        next.name === '@utility'
+      ) {
+        walk(node.nodes, (child) => {
+          if (child.kind !== 'at-rule' || child.name !== '@apply') return
+
+          let candidates = child.params.split(/\s+/g)
+          for (let candidate of candidates) {
+            for (let candidateAstNode of designSystem.parseCandidate(candidate)) {
+              switch (candidateAstNode.kind) {
+                case 'arbitrary':
+                  break
+
+                case 'static':
+                case 'functional':
+                  if (next.params.replace(/-\*$/, '') === candidateAstNode.root) {
+                    throw new Error(
+                      `You cannot \`@apply\` the \`${candidate}\` utility here because it creates a circular dependency.`,
+                    )
+                  }
+                  break
+
+                default:
+                  candidateAstNode satisfies never
+              }
+            }
+          }
+        })
+      }
+
+      // Generic fallback error in case we cannot properly detect the origin of
+      // the circular dependency.
+      throw new Error(
+        `Circular dependency detected:\n\n${toCss([node])}\nRelies on:\n\n${toCss([next])}`,
+      )
+    }
+
+    wip.add(node)
+
+    for (let dependencyId of dependencies.get(node)) {
+      for (let dependency of definitions.get(dependencyId)) {
+        path.push(node)
+        visit(dependency, path)
+        path.pop()
+      }
+    }
+
+    seen.add(node)
+    wip.delete(node)
+
+    sorted.push(node)
+  }
+
+  for (let node of parents) {
+    visit(node)
+  }
+
+  // Substitute the `@apply` at-rules in order. Note that the list is going to
+  // be flattened so we do not have to recursively walk over child rules
+  for (let parent of sorted) {
+    if (!('nodes' in parent)) continue
+
+    walk(parent.nodes, (child) => {
+      if (child.kind !== 'at-rule' || child.name !== '@apply') return
+
+      let parts = child.params.split(/(\s+)/g)
+      let candidateOffsets: Record<string, number> = {}
+      let normalIdents: string[] = []
+      let dashedIdents: string[] = []
+
+      let offset = 0
+      for (let [idx, part] of parts.entries()) {
+        if (idx % 2 === 0) {
+          if (part[0] === '-' && part[1] === '-') {
+            dashedIdents.push(part)
+          } else {
+            normalIdents.push(part)
+          }
+
+          candidateOffsets[part] = offset
+        }
+
+        offset += part.length
+      }
+
+      if (dashedIdents.length) {
+        // If we have an `@apply` that only consists of dashed idents then the
+        // user is intending to use a CSS mixin:
+        // https://drafts.csswg.org/css-mixins-1/#apply-rule
+        //
+        // These are not considered utilities and need to be emitted literally.
+        if (normalIdents.length === 0) return WalkAction.Skip
+
+        // If we find a dashed ident *here* it means that someone is trying
+        // to use mixins and our `@apply` behavior together.
+        //
+        // This is invalid and the rules must be written separately. Let the
+        // user know they need to move them into a separate rule.
+        let list = dashedIdents.join(' ')
+
+        throw new Error(
+          `You cannot use \`@apply\` with both mixins and utilities. Please move \`@apply ${list}\` into a separate rule.`,
+        )
+      }
+
+      let hasBody = child.nodes.length > 0
+
+      if (hasBody && normalIdents.length) {
+        let list = normalIdents.join(' ')
+
+        throw new Error(`The rule \`@apply ${list}\` must not have a body.`)
+      }
+
+      // Replace the `@apply` rule with the actual utility classes
+      {
+        // Parse the candidates to an AST that we can replace the `@apply` rule
+        // with.
+        let candidates = Object.keys(candidateOffsets)
+        let compiled = compileCandidates(candidates, designSystem, {
+          respectImportant: false,
+          onInvalidCandidate: (candidate) => {
+            // When using prefix, make sure prefix is used in candidate
+            if (designSystem.theme.prefix && !candidate.startsWith(designSystem.theme.prefix)) {
+              throw new Error(
+                `Cannot apply unprefixed utility class \`${candidate}\`. Did you mean \`${designSystem.theme.prefix}:${candidate}\`?`,
+              )
+            }
+
+            // When the utility is blocklisted, let the user know
+            //
+            // Note: `@apply` is processed before handling incoming classes from
+            // template files. This means that the `invalidCandidates` set will
+            // only contain explicit classes via:
+            //
+            // - `blocklist` from a JS config
+            // - `@source not inline(…)`
+            if (designSystem.invalidCandidates.has(candidate)) {
+              throw new Error(
+                `Cannot apply utility class \`${candidate}\` because it has been explicitly disabled: https://tailwindcss.com/docs/detecting-classes-in-source-files#explicitly-excluding-classes`,
+              )
+            }
+
+            // Verify if variants exist
+            let parts = segment(candidate, ':')
+            if (parts.length > 1) {
+              let utility = parts.pop()!
+
+              // Ensure utility on its own compiles, if not, we will fallback to
+              // the next error
+              if (designSystem.candidatesToCss([utility])[0]) {
+                let compiledVariants = designSystem.candidatesToCss(
+                  parts.map((variant) => `${variant}:[--tw-variant-check:1]`),
+                )
+                let unknownVariants = parts.filter((_, idx) => compiledVariants[idx] === null)
+                if (unknownVariants.length > 0) {
+                  if (unknownVariants.length === 1) {
+                    throw new Error(
+                      `Cannot apply utility class \`${candidate}\` because the ${unknownVariants.map((variant) => `\`${variant}\``)} variant does not exist.`,
+                    )
+                  } else {
+                    let formatter = new Intl.ListFormat('en', {
+                      style: 'long',
+                      type: 'conjunction',
+                    })
+                    throw new Error(
+                      `Cannot apply utility class \`${candidate}\` because the ${formatter.format(unknownVariants.map((variant) => `\`${variant}\``))} variants do not exist.`,
+                    )
+                  }
+                }
+              }
+            }
+
+            // When the theme is empty, it means that no theme was loaded and
+            // `@import "tailwindcss"`, `@reference "app.css"` or similar is
+            // very likely missing.
+            if (designSystem.theme.size === 0) {
+              throw new Error(
+                `Cannot apply unknown utility class \`${candidate}\`. Are you using CSS modules or similar and missing \`@reference\`? https://tailwindcss.com/docs/functions-and-directives#reference-directive`,
+              )
+            }
+
+            // Fallback to most generic error message
+            throw new Error(`Cannot apply unknown utility class \`${candidate}\``)
+          },
+        })
+
+        let src = child.src
+
+        let candidateAst = compiled.astNodes.map((node) => {
+          let candidate = compiled.nodeSorting.get(node)?.candidate
+          let candidateOffset = candidate ? candidateOffsets[candidate] : undefined
+
+          node = cloneAstNode(node)
+
+          if (!src || !candidate || candidateOffset === undefined) {
+            // While the original nodes may have come from an `@utility` we still
+            // want to replace the source because the `@apply` is ultimately the
+            // reason the node was emitted into the AST.
+            walk([node], (node) => {
+              node.src = src
+            })
+
+            return node
+          }
+
+          let candidateSrc: SourceLocation = [src[0], src[1], src[2]]
+
+          candidateSrc[1] += 7 /* '@apply '.length */ + candidateOffset
+          candidateSrc[2] = candidateSrc[1] + candidate.length
+
+          // While the original nodes may have come from an `@utility` we still
+          // want to replace the source because the `@apply` is ultimately the
+          // reason the node was emitted into the AST.
+          walk([node], (node) => {
+            node.src = candidateSrc
+          })
+
+          return node
+        })
+
+        // Collect the nodes to insert in place of the `@apply` rule. When a rule
+        // was used, we want to insert its children instead of the rule because we
+        // don't want the wrapping selector.
+        let newNodes: AstNode[] = []
+        for (let candidateNode of candidateAst) {
+          if (candidateNode.kind === 'rule') {
+            for (let child of candidateNode.nodes) {
+              newNodes.push(child)
+            }
+          } else {
+            newNodes.push(candidateNode)
+          }
+        }
+
+        return WalkAction.Replace(newNodes)
+      }
+    })
+  }
+
   return features
 }
+
+function* resolveApplyDependencies(
+  node: Extract<AstNode, { kind: 'at-rule' }>,
+  designSystem: DesignSystem,
+) {
+  for (let candidate of node.params.split(/\s+/g)) {
+    for (let node of designSystem.parseCandidate(candidate)) {
+      switch (node.kind) {
+        case 'arbitrary':
+          // Doesn't matter, because there is no lookup needed
+          break
+
+        case 'static':
+        case 'functional':
+          // Lookup by "root"
+          yield node.root
+          break
+
+        default:
+          node satisfies never
+      }
+    }
+  }
+}
diff --git a/packages/tailwindcss/src/ast.bench.ts b/packages/tailwindcss/src/ast.bench.ts
new file mode 100644
index 000000000..034faee27
--- /dev/null
+++ b/packages/tailwindcss/src/ast.bench.ts
@@ -0,0 +1,64 @@
+import { bench, describe } from 'vitest'
+import { cloneAstNode, toCss, type AstNode } from './ast'
+import * as CSS from './css-parser'
+
+const css = String.raw
+const input = css`
+  @theme {
+    --color-primary: #333;
+  }
+  @tailwind utilities;
+  .foo {
+    color: red;
+    /* comment */
+    &:hover {
+      color: blue;
+      @apply font-bold;
+    }
+  }
+`
+const ast = CSS.parse(input)
+
+describe('AST to CSS', () => {
+  bench('toCss', () => {
+    toCss(ast)
+  })
+
+  bench('toCss with source maps', () => {
+    toCss(ast, true)
+  })
+})
+
+describe('Cloning AST nodes', () => {
+  bench('cloneAstNode()', () => {
+    ast.map(cloneAstNode)
+  })
+
+  bench('cloneAstNode (with spread)', () => {
+    ast.map(cloneAstNodeSpread)
+  })
+
+  bench('structuredClone()', () => {
+    structuredClone(ast)
+  })
+})
+
+function cloneAstNodeSpread<T extends AstNode>(node: T): T {
+  switch (node.kind) {
+    case 'rule':
+    case 'at-rule':
+    case 'at-root':
+      return { ...node, nodes: node.nodes.map(cloneAstNodeSpread) }
+
+    case 'context':
+      return { ...node, context: { ...node.context }, nodes: node.nodes.map(cloneAstNodeSpread) }
+
+    case 'declaration':
+    case 'comment':
+      return { ...node }
+
+    default:
+      node satisfies never
+      throw new Error(`Unknown node kind: ${(node as any).kind}`)
+  }
+}
diff --git a/packages/tailwindcss/src/ast.test.ts b/packages/tailwindcss/src/ast.test.ts
index c3d9b2f15..14092c9f5 100644
--- a/packages/tailwindcss/src/ast.test.ts
+++ b/packages/tailwindcss/src/ast.test.ts
@@ -1,11 +1,28 @@
-import { expect, it } from 'vitest'
-import { context, decl, optimizeAst, styleRule, toCss, walk, WalkAction } from './ast'
+import { describe, expect, it, test } from 'vitest'
+import {
+  context,
+  cssContext,
+  decl,
+  handleNesting,
+  optimizeAst,
+  rule,
+  styleRule,
+  toCss,
+  type AstNode,
+} from './ast'
 import * as CSS from './css-parser'
+import { buildDesignSystem } from './design-system'
+import { pretty } from './test-utils/run'
+import { Theme } from './theme'
+import { walk, WalkAction } from './walk'
+
+const css = String.raw
+const defaultDesignSystem = buildDesignSystem(new Theme())
 
 it('should pretty print an AST', () => {
-  expect(toCss(optimizeAst(CSS.parse('.foo{color:red;&:hover{color:blue;}}'))))
-    .toMatchInlineSnapshot(`
-    ".foo {
+  expect(pretty(toCss(CSS.parse('.foo{color:red;&:hover{color:blue;}}')))).toMatchInlineSnapshot(`
+    "
+    .foo {
       color: red;
       &:hover {
         color: blue;
@@ -16,7 +33,7 @@ it('should pretty print an AST', () => {
 })
 
 it('allows the placement of context nodes', () => {
-  const ast = [
+  let ast: AstNode[] = [
     styleRule('.foo', [decl('color', 'red')]),
     context({ context: 'a' }, [
       styleRule('.bar', [
@@ -33,17 +50,18 @@ it('allows the placement of context nodes', () => {
   let blueContext
   let greenContext
 
-  walk(ast, (node, { context }) => {
+  walk(ast, (node, _ctx) => {
     if (node.kind !== 'declaration') return
+    let ctx = cssContext(_ctx)
     switch (node.value) {
       case 'red':
-        redContext = context
+        redContext = ctx.context
         break
       case 'blue':
-        blueContext = context
+        blueContext = ctx.context
         break
       case 'green':
-        greenContext = context
+        greenContext = ctx.context
         break
     }
   })
@@ -52,8 +70,9 @@ it('allows the placement of context nodes', () => {
   expect(blueContext).toEqual({ context: 'a' })
   expect(greenContext).toEqual({ context: 'b' })
 
-  expect(toCss(optimizeAst(ast))).toMatchInlineSnapshot(`
-    ".foo {
+  expect(pretty(toCss(optimizeAst(ast, defaultDesignSystem)))).toMatchInlineSnapshot(`
+    "
+    .foo {
       color: red;
     }
     .bar {
@@ -66,32 +85,1580 @@ it('allows the placement of context nodes', () => {
   `)
 })
 
-it('should stop walking when returning `WalkAction.Stop`', () => {
-  let ast = [
-    styleRule('.foo', [styleRule('.nested', [styleRule('.bail', [decl('color', 'red')])])]),
-    styleRule('.bar'),
-    styleRule('.baz'),
-    styleRule('.qux'),
-  ]
-
-  let seen = new Set()
-
-  walk(ast, (node) => {
-    if (node.kind === 'rule') {
-      seen.add(node.selector)
+it('should not emit empty rules once optimized', () => {
+  let ast = CSS.parse(css`
+    /* Empty rule */
+    .foo {
     }
 
-    if (node.kind === 'rule' && node.selector === '.bail') {
-      return WalkAction.Stop
+    /* Empty rule, with nesting */
+    .foo {
+      .bar {
+      }
+      .baz {
+      }
     }
-  })
 
-  // We do not want to see `.bar`, `.baz`, or `.qux` because we bailed early
-  expect(seen).toMatchInlineSnapshot(`
-    Set {
-      ".foo",
-      ".nested",
-      ".bail",
+    /* Empty rule, with special case '&' rules */
+    .foo {
+      & {
+        &:hover {
+        }
+        &:focus {
+        }
+      }
     }
+
+    /* Empty at-rule */
+    @media (min-width: 768px) {
+    }
+
+    /* Empty at-rule with nesting*/
+    @media (min-width: 768px) {
+      .foo {
+      }
+
+      @media (min-width: 1024px) {
+        .bar {
+        }
+      }
+    }
+
+    /* Exceptions: */
+    @charset "UTF-8";
+    @layer foo, bar, baz;
+    @layer foo, bar, baz; /* Will be deduped */
+    @custom-media --modern (color), (hover);
+    @namespace 'http://www.w3.org/1999/xhtml';
+    @import url('https://fonts.googleapis.com/css2?family=Cedarville+Cursive&display=swap');
+  `)
+
+  expect(pretty(toCss(ast))).toMatchInlineSnapshot(`
+    "
+    .foo {
+    }
+    .foo {
+      .bar {
+      }
+      .baz {
+      }
+    }
+    .foo {
+      & {
+        &:hover {
+        }
+        &:focus {
+        }
+      }
+    }
+    @media (min-width: 768px);
+    @media (min-width: 768px) {
+      .foo {
+      }
+      @media (min-width: 1024px) {
+        .bar {
+        }
+      }
+    }
+    @charset "UTF-8";
+    @layer foo, bar, baz;
+    @layer foo, bar, baz;
+    @custom-media --modern (color), (hover);
+    @namespace 'http://www.w3.org/1999/xhtml';
+    @import url('https://fonts.googleapis.com/css2?family=Cedarville+Cursive&display=swap');
+    "
+  `)
+
+  expect(pretty(toCss(optimizeAst(ast, defaultDesignSystem)))).toMatchInlineSnapshot(`
+    "
+    @charset "UTF-8";
+    @layer foo, bar, baz;
+    @custom-media --modern (color), (hover);
+    @namespace 'http://www.w3.org/1999/xhtml';
+    @import url('https://fonts.googleapis.com/css2?family=Cedarville+Cursive&display=swap');
+    "
   `)
 })
+
+it('should not emit exact duplicate declarations in the same rule', () => {
+  let ast = CSS.parse(css`
+    .foo {
+      color: red;
+      .bar {
+        color: green;
+        color: blue;
+        color: green;
+      }
+      color: red;
+    }
+    .foo {
+      color: red;
+      & {
+        color: green;
+        & {
+          color: red;
+          color: green;
+          color: blue;
+        }
+        color: red;
+      }
+      background: blue;
+      .bar {
+        color: green;
+        color: blue;
+        color: green;
+      }
+      caret-color: orange;
+    }
+  `)
+
+  expect(pretty(toCss(ast))).toMatchInlineSnapshot(`
+    "
+    .foo {
+      color: red;
+      .bar {
+        color: green;
+        color: blue;
+        color: green;
+      }
+      color: red;
+    }
+    .foo {
+      color: red;
+      & {
+        color: green;
+        & {
+          color: red;
+          color: green;
+          color: blue;
+        }
+        color: red;
+      }
+      background: blue;
+      .bar {
+        color: green;
+        color: blue;
+        color: green;
+      }
+      caret-color: orange;
+    }
+    "
+  `)
+
+  expect(pretty(toCss(optimizeAst(ast, defaultDesignSystem)))).toMatchInlineSnapshot(`
+    "
+    .foo {
+      .bar {
+        color: green;
+        color: blue;
+        color: green;
+      }
+      color: red;
+      & {
+        color: green;
+        & {
+          color: red;
+          color: green;
+          color: blue;
+        }
+        color: red;
+      }
+      background: blue;
+      .bar {
+        color: green;
+        color: blue;
+        color: green;
+      }
+      caret-color: orange;
+    }
+    "
+  `)
+})
+
+it('should not emit color-mix() fallbacks inside @keyframes', () => {
+  let ast = CSS.parse(css`
+    @keyframes my-animation {
+      0% {
+        color: color-mix(in oklab, var(--color-emerald-600) 0%, transparent);
+      }
+      100% {
+        color: color-mix(in oklab, var(--color-emerald-600) 0%, transparent);
+      }
+    }
+  `)
+
+  let theme = new Theme()
+  theme.add('--color-emerald-600', 'oklch(59.6% 0.145 163.225)')
+
+  let design = buildDesignSystem(theme)
+
+  expect(pretty(toCss(optimizeAst(ast, design)))).toMatchInlineSnapshot(`
+    "
+    @keyframes my-animation {
+      0% {
+        color: color-mix(in oklab, var(--color-emerald-600) 0%, transparent);
+      }
+      100% {
+        color: color-mix(in oklab, var(--color-emerald-600) 0%, transparent);
+      }
+    }
+    "
+  `)
+})
+
+describe('optimization', () => {
+  function optimize(input: string) {
+    let ast = CSS.parse(input)
+    walk(ast, {
+      exit(node) {
+        // Depending on where we use `@scope`, it's handled slightly differently:
+        //
+        // 1. In user authored CSS, we perform the normal CSS nesting and
+        //    hoisting of `@scope` rules
+        // 2. In a `@custom-variant` definition, we need to swap the `@scope`
+        //    with the parent definition. Otherwise you'll never get the
+        //    expected "sandwich" effect.
+        //
+        // This little `@in-variant` hack is just a different way of
+        // differentiating between both cases for these tests.
+        if (node.kind === 'at-rule' && node.name === '@in-variant') {
+          return WalkAction.Replace(context({ source: 'variant' }, node.nodes))
+        }
+      },
+    })
+    return pretty(toCss(handleNesting(ast)))
+  }
+
+  // See: https://drafts.csswg.org/css-nesting-1/
+  describe('CSS Nesting Module Level 1', () => {
+    it('uses the descendant combinator by default', async () => {
+      expect(
+        optimize(css`
+          .a {
+            element {
+              --x: 1;
+            }
+            .class {
+              --x: 2;
+            }
+            #id {
+              --x: 3;
+            }
+            :pseudo-class {
+              --x: 4;
+            }
+            ::pseudo-element {
+              --x: 5;
+            }
+            [attribute] {
+              --x: 6;
+            }
+            * {
+              --x: 7;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .a element {
+          --x: 1;
+        }
+        .a .class {
+          --x: 2;
+        }
+        .a #id {
+          --x: 3;
+        }
+        .a :pseudo-class {
+          --x: 4;
+        }
+        .a ::pseudo-element {
+          --x: 5;
+        }
+        .a [attribute] {
+          --x: 6;
+        }
+        .a * {
+          --x: 7;
+        }
+        "
+      `)
+    })
+
+    it('should be possible to change the combinator', async () => {
+      expect(
+        optimize(css`
+          .a {
+            + .b {
+              --x: 1;
+            }
+            > .c {
+              --x: 2;
+            }
+            ~ .d {
+              --x: 3;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .a + .b {
+          --x: 1;
+        }
+        .a > .c {
+          --x: 2;
+        }
+        .a ~ .d {
+          --x: 3;
+        }
+        "
+      `)
+    })
+
+    it('should replace the first rule, that contains `&` with `:scope`', async () => {
+      expect(
+        optimize(css`
+          /* Standalone */
+          & {
+            --x: 1;
+          }
+
+          /* In an at-rule */
+          @supports (--y: 1) {
+            & {
+              --x: 2;
+            }
+          }
+
+          /* With :is(…) */
+          :is(&) {
+            --x: 3;
+          }
+
+          /* In an at-rule, with :is(…) */
+          @supports (--y: 2) {
+            :is(&) {
+              --x: 4;
+            }
+          }
+
+          /* With multiple selectors */
+          &,
+          .a {
+            --x: 5;
+          }
+
+          /* With multiple selectors + :is(…) */
+          :is(&),
+          .b {
+            --x: 6;
+          }
+
+          /* With multiple selectors in an at-rule */
+          @supports (--y: 3) {
+            &,
+            .c {
+              --x: 7;
+            }
+          }
+
+          /* With multiple selectors in an at-rule + :is(…) */
+          @supports (--y: 4) {
+            :is(&),
+            .d {
+              --x: 8;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        :scope {
+          --x: 1;
+        }
+        @supports (--y: 1) {
+          :scope {
+            --x: 2;
+          }
+        }
+        :is(:scope) {
+          --x: 3;
+        }
+        @supports (--y: 2) {
+          :is(:scope) {
+            --x: 4;
+          }
+        }
+        :scope, .a {
+          --x: 5;
+        }
+        :is(:scope), .b {
+          --x: 6;
+        }
+        @supports (--y: 3) {
+          :scope, .c {
+            --x: 7;
+          }
+        }
+        @supports (--y: 4) {
+          :is(:scope), .d {
+            --x: 8;
+          }
+        }
+        "
+      `)
+    })
+
+    it('should be possible to use `&` to explicitly match the parent', async () => {
+      expect(
+        optimize(css`
+          .a {
+            & + .b {
+              --x: 1;
+            }
+            & > .c {
+              --x: 2;
+            }
+            & ~ .d {
+              --x: 3;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .a + .b {
+          --x: 1;
+        }
+        .a > .c {
+          --x: 2;
+        }
+        .a ~ .d {
+          --x: 3;
+        }
+        "
+      `)
+    })
+
+    it('should be possible to use `&` in a different location', async () => {
+      expect(
+        optimize(css`
+          .a {
+            .b & {
+              --x: 1;
+            }
+            .c + & {
+              --x: 2;
+            }
+            .d > & {
+              --x: 3;
+            }
+            .e ~ & {
+              --x: 4;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .b .a {
+          --x: 1;
+        }
+        .c + .a {
+          --x: 2;
+        }
+        .d > .a {
+          --x: 3;
+        }
+        .e ~ .a {
+          --x: 4;
+        }
+        "
+      `)
+    })
+
+    it('should be possible to use `&` on its own', async () => {
+      expect(
+        optimize(css`
+          .a {
+            & {
+              --x: 1;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .a {
+          --x: 1;
+        }
+        "
+      `)
+    })
+
+    it('should be possible to use `&` nested in `:is(…)`', async () => {
+      expect(
+        optimize(css`
+          .a {
+            :is(&) {
+              --x: 1;
+            }
+            :is(:is(:is(&))) {
+              --x: 2;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        :is(.a) {
+          --x: 1;
+        }
+        :is(:is(:is(.a))) {
+          --x: 2;
+        }
+        "
+      `)
+    })
+
+    it('should be possible to handle nesting with a parent selector list', async () => {
+      expect(
+        optimize(css`
+          .a,
+          .b {
+            .c,
+            .d & {
+              --x: 1;
+              &:hover {
+                --x: 2;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        :is(.a, .b) .c, .d :is(.a, .b) {
+          --x: 1;
+          &:hover {
+            --x: 2;
+          }
+        }
+        "
+      `)
+    })
+
+    it('should not replace `\&`', () => {
+      expect(
+        optimize(css`
+          .a {
+            .b-\& {
+              --x: 1;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .a .b-\\& {
+          --x: 1;
+        }
+        "
+      `)
+    })
+
+    it('should not replace `&` as part of a string', () => {
+      expect(
+        optimize(css`
+          .a {
+            [data-b='c&d'] {
+              --x: 1;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .a [data-b='c&d'] {
+          --x: 1;
+        }
+        "
+      `)
+    })
+
+    it.each([
+      ['element', '&element', ':is(element)element'], // Invalid CSS
+      ['element', 'element&', 'element:is(element)'],
+      ['element', '&.class', 'element.class'],
+      ['element', '.class&', '.class:is(element)'], // Optimization: element.class
+      ['element', '&#id', 'element#id'],
+      ['element', '#id&', '#id:is(element)'], // Optimization: element#id
+      ['element', '&:hover', 'element:hover'],
+      ['element', ':hover&', ':hover:is(element)'],
+      ['element', '&::before', 'element::before'],
+      ['element', '::before&', '::before:is(element)'], // Invalid CSS
+      ['element', '&:not(.x)', 'element:not(.x)'],
+      ['element', ':not(.x)&', ':not(.x):is(element)'], // Optimization: element:not(.x)
+      ['element', '&[attribute]', 'element[attribute]'],
+      ['element', '[attribute]&', '[attribute]:is(element)'], // Optimization: element[attribute]
+      ['element', '&*', ':is(element)*'], // Invalid CSS
+      ['element', '*&', 'element'],
+
+      ['.class', '&element', ':is(.class)element'], // Invalid CSS
+      ['.class', 'element&', 'element.class'],
+      ['.class', '&.class', '.class.class'],
+      ['.class', '.class&', '.class.class'],
+      ['.class', '&#id', '.class#id'],
+      ['.class', '#id&', '#id.class'],
+      ['.class', '&:hover', '.class:hover'],
+      ['.class', ':hover&', ':hover.class'],
+      ['.class', '&::before', '.class::before'],
+      ['.class', '::before&', '::before.class'], // Invalid CSS
+      ['.class', '&:not(.x)', '.class:not(.x)'],
+      ['.class', ':not(.x)&', ':not(.x).class'],
+      ['.class', '&[attribute]', '.class[attribute]'],
+      ['.class', '[attribute]&', '[attribute].class'],
+      ['.class', '&*', ':is(.class)*'], // Invalid CSS
+      ['.class', '*&', '.class'],
+
+      ['#id', '&element', ':is(#id)element'], // Invalid CSS
+      ['#id', 'element&', 'element#id'],
+      ['#id', '&.class', '#id.class'],
+      ['#id', '.class&', '.class#id'],
+      ['#id', '&#id', '#id#id'],
+      ['#id', '#id&', '#id#id'],
+      ['#id', '&:hover', '#id:hover'],
+      ['#id', ':hover&', ':hover#id'],
+      ['#id', '&::before', '#id::before'],
+      ['#id', '::before&', '::before#id'], // Invalid CSS
+      ['#id', '&:not(.x)', '#id:not(.x)'],
+      ['#id', ':not(.x)&', ':not(.x)#id'],
+      ['#id', '&[attribute]', '#id[attribute]'],
+      ['#id', '[attribute]&', '[attribute]#id'],
+      ['#id', '&*', ':is(#id)*'], // Invalid CSS
+      ['#id', '*&', '#id'],
+
+      [':hover', '&element', ':is(:hover)element'], // Invalid CSS
+      [':hover', 'element&', 'element:hover'],
+      [':hover', '&.class', ':hover.class'],
+      [':hover', '.class&', '.class:hover'],
+      [':hover', '&#id', ':hover#id'],
+      [':hover', '#id&', '#id:hover'],
+      [':hover', '&:hover', ':hover:hover'],
+      [':hover', ':hover&', ':hover:hover'],
+      [':hover', '&::before', ':hover::before'],
+      [':hover', '::before&', '::before:hover'],
+      [':hover', '&:not(.x)', ':hover:not(.x)'],
+      [':hover', ':not(.x)&', ':not(.x):hover'],
+      [':hover', '&[attribute]', ':hover[attribute]'],
+      [':hover', '[attribute]&', '[attribute]:hover'],
+      [':hover', '&*', ':is(:hover)*'], // Invalid CSS
+      [':hover', '*&', ':hover'],
+
+      ['::before', '&element', ':is(::before)element'], // Invalid CSS
+      ['::before', 'element&', 'element::before'],
+      ['::before', '&.class', '::before.class'],
+      ['::before', '.class&', '.class::before'],
+      ['::before', '&#id', '::before#id'],
+      ['::before', '#id&', '#id::before'],
+      ['::before', '&:hover', '::before:hover'],
+      ['::before', ':hover&', ':hover::before'],
+      ['::before', '&::before', '::before::before'],
+      ['::before', '::before&', '::before::before'],
+      ['::before', '&:not(.x)', '::before:not(.x)'],
+      ['::before', ':not(.x)&', ':not(.x)::before'],
+      ['::before', '&[attribute]', '::before[attribute]'],
+      ['::before', '[attribute]&', '[attribute]::before'],
+      ['::before', '&*', ':is(::before)*'], // Invalid CSS
+      ['::before', '*&', '::before'],
+
+      [':not(.x)', '&element', ':is(:not(.x))element'], // Invalid CSS
+      [':not(.x)', 'element&', 'element:not(.x)'],
+      [':not(.x)', '&.class', ':not(.x).class'],
+      [':not(.x)', '.class&', '.class:not(.x)'],
+      [':not(.x)', '&#id', ':not(.x)#id'],
+      [':not(.x)', '#id&', '#id:not(.x)'],
+      [':not(.x)', '&:hover', ':not(.x):hover'],
+      [':not(.x)', ':hover&', ':hover:not(.x)'],
+      [':not(.x)', '&::before', ':not(.x)::before'],
+      [':not(.x)', '::before&', '::before:not(.x)'],
+      [':not(.x)', '&:not(.x)', ':not(.x):not(.x)'],
+      [':not(.x)', ':not(.x)&', ':not(.x):not(.x)'],
+      [':not(.x)', '&[attribute]', ':not(.x)[attribute]'],
+      [':not(.x)', '[attribute]&', '[attribute]:not(.x)'],
+      [':not(.x)', '&*', ':is(:not(.x))*'], // Invalid CSS
+      [':not(.x)', '*&', ':not(.x)'],
+
+      ['[attribute]', '&element', ':is([attribute])element'], // Invalid CSS
+      ['[attribute]', 'element&', 'element[attribute]'],
+      ['[attribute]', '&.class', '[attribute].class'],
+      ['[attribute]', '.class&', '.class[attribute]'],
+      ['[attribute]', '&#id', '[attribute]#id'],
+      ['[attribute]', '#id&', '#id[attribute]'],
+      ['[attribute]', '&:hover', '[attribute]:hover'],
+      ['[attribute]', ':hover&', ':hover[attribute]'],
+      ['[attribute]', '&::before', '[attribute]::before'],
+      ['[attribute]', '::before&', '::before[attribute]'],
+      ['[attribute]', '&:not(.x)', '[attribute]:not(.x)'],
+      ['[attribute]', ':not(.x)&', ':not(.x)[attribute]'],
+      ['[attribute]', '&[attribute]', '[attribute][attribute]'],
+      ['[attribute]', '[attribute]&', '[attribute][attribute]'],
+      ['[attribute]', '&*', ':is([attribute])*'], // Invalid CSS
+      ['[attribute]', '*&', '[attribute]'],
+
+      ['*', '&element', ':is(*)element'], // Invalid CSS
+      ['*', 'element&', 'element:is(*)'],
+      ['*', '&.class', '.class'],
+      ['*', '.class&', '.class:is(*)'], // Optimization: *.class → .class
+      ['*', '&#id', '#id'],
+      ['*', '#id&', '#id:is(*)'], // Optimization: *#id → #id
+      ['*', '&:hover', ':hover'],
+      ['*', ':hover&', ':hover:is(*)'],
+      ['*', '&::before', '::before'],
+      ['*', '::before&', '::before:is(*)'], // Invalid CSS
+      ['*', '&:not(.x)', ':not(.x)'],
+      ['*', ':not(.x)&', ':not(.x):is(*)'], // Optimization: *:not(.x) → :not(.x)
+      ['*', '&[attribute]', '[attribute]'],
+      ['*', '[attribute]&', '[attribute]:is(*)'], // Optimization: *[attribute] → [attribute]
+      ['*', '&*', ':is(*)*'], // Invalid CSS
+      ['*', '*&', '*'],
+
+      ['&', '&element', ':is(:scope)element'], // Invalid CSS
+      ['&', 'element&', 'element:scope'],
+      ['&', '&.class', ':scope.class'],
+      ['&', '.class&', '.class:scope'],
+      ['&', '&#id', ':scope#id'],
+      ['&', '#id&', '#id:scope'],
+      ['&', '&:hover', ':scope:hover'],
+      ['&', ':hover&', ':hover:scope'],
+      ['&', '&::before', ':scope::before'],
+      ['&', '::before&', '::before:scope'],
+      ['&', '&:not(.x)', ':scope:not(.x)'],
+      ['&', ':not(.x)&', ':not(.x):scope'],
+      ['&', '&[attribute]', ':scope[attribute]'],
+      ['&', '[attribute]&', '[attribute]:scope'],
+      ['&', '&*', ':is(:scope)*'], // Invalid CSS
+      ['&', '*&', ':scope'],
+    ])(`'%s { %s }' → '%s' (%#)`, async (root, nested, expected) => {
+      let optimized = optimize(toCss([rule(root, [rule(nested, [decl('--x', '0')])])]))
+      let ast = CSS.parse(optimized)
+
+      let count = 0
+      walk(ast, () => void count++)
+
+      // 1 rule, 1 declaration
+      expect(count).toBe(2)
+
+      if (ast[0].kind !== 'rule') throw new Error('expected a rule')
+      expect(ast[0].selector).toEqual(expected)
+    })
+
+    it('should not remove the `*` namespace from namespaced selectors', () => {
+      expect(
+        optimize(css`
+          .a {
+            & *|div {
+              color: red;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .a *|div {
+          color: red;
+        }
+        "
+      `)
+    })
+
+    test('multiple selectors in the list are relative to the parent', async () => {
+      expect(
+        optimize(css`
+          .a,
+          .b {
+            --x: 1;
+            + .c {
+              --x: 2;
+            }
+            &.d {
+              --x: 3;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .a, .b {
+          --x: 1;
+          + .c {
+            --x: 2;
+          }
+          &.d {
+            --x: 3;
+          }
+        }
+        "
+      `)
+    })
+
+    it('should be possible to use `&` multiple times', async () => {
+      expect(
+        optimize(css`
+          .a {
+            & .b & .c & .d {
+              --x: 1;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .a .b .a .c .a .d {
+          --x: 1;
+        }
+        "
+      `)
+    })
+
+    it('should be possible to use `&` multiple times in a row', async () => {
+      expect(
+        optimize(css`
+          .a {
+            &&& {
+              --x: 1;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .a.a.a {
+          --x: 1;
+        }
+        "
+      `)
+    })
+
+    it('should be possible to use `&` inside a selector', async () => {
+      expect(
+        optimize(css`
+          .a {
+            :not(&) {
+              --x: 1;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        :not(.a) {
+          --x: 1;
+        }
+        "
+      `)
+    })
+
+    it('should be possible to use deeply nested CSS', async () => {
+      expect(
+        optimize(css`
+          .a,
+          .b {
+            --x: 1;
+
+            .c & {
+              --x: 2;
+
+              &:hover,
+              &:focus {
+                --x: 3;
+                .d {
+                  --x: 4;
+                }
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .a, .b {
+          --x: 1;
+          .c & {
+            --x: 2;
+            &:hover, &:focus {
+              --x: 3;
+              .d {
+                --x: 4;
+              }
+            }
+          }
+        }
+        "
+      `)
+    })
+
+    it('should properly split rules to guarantee specificity', async () => {
+      expect(
+        optimize(css`
+          .a {
+            --before: 1;
+            &:hover {
+              --inside: 1;
+            }
+            --after: 1;
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .a {
+          --before: 1;
+          &:hover {
+            --inside: 1;
+          }
+          --after: 1;
+        }
+        "
+      `)
+    })
+
+    it.each([
+      ['div', '&', 'div'],
+      ['div', '[before]&', '[before]:is(div)'],
+      ['div', '&[after]', 'div[after]'],
+      ['div', '[before]&[after]', '[before]:is(div)[after]'],
+      ['div', '[before] &', '[before] div'],
+      ['div', '& [after]', 'div [after]'],
+      ['div', '[before] & [after]', '[before] div [after]'],
+
+      ['.parent', '&', '.parent'],
+      ['.parent', '[before]&', '[before].parent'],
+      ['.parent', '&[after]', '.parent[after]'],
+      ['.parent', '[before]&[after]', '[before].parent[after]'],
+      ['.parent', '[before] &', '[before] .parent'],
+      ['.parent', '& [after]', '.parent [after]'],
+      ['.parent', '[before] & [after]', '[before] .parent [after]'],
+
+      ['.a > .b', '&', '.a > .b'],
+      ['.a > .b', '[before]&', '[before]:is(.a > .b)'],
+      ['.a > .b', '&[after]', '.a > .b[after]'],
+      ['.a > .b', '[before]&[after]', '[before]:is(.a > .b)[after]'],
+      ['.a > .b', '[before] &', '[before] :is(.a > .b)'],
+      ['.a > .b', '& [after]', '.a > .b [after]'],
+      ['.a > .b', '[before] & [after]', '[before] :is(.a > .b) [after]'],
+    ])(`should optimize '%s { %s }' → '%s' (%#)`, async (root, nested, expected) => {
+      let optimized = optimize(toCss([rule(root, [rule(nested, [decl('--x', '0')])])]))
+      let ast = CSS.parse(optimized)
+
+      let count = 0
+      walk(ast, () => void count++)
+
+      // 1 rule, 1 declaration
+      expect(count).toBe(2)
+
+      if (ast[0].kind !== 'rule') throw new Error('expected a rule')
+      expect(ast[0].selector).toEqual(expected)
+    })
+
+    it('should hoist at-rules', async () => {
+      expect(
+        optimize(css`
+          @layer utilities {
+            .a,
+            .b {
+              @media (print) {
+                --x: 1;
+                .c {
+                  @media (min-width: 123px) {
+                    --x: 2;
+                  }
+                }
+              }
+            }
+            .d {
+              @media (print) {
+                @media (min-width: 123px) {
+                  --x: 3;
+                }
+              }
+            }
+          }
+          @property --foo {
+            syntax: '*';
+          }
+          @layer utilities {
+            .e {
+              @media (print) {
+                --x: 4;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @layer utilities {
+          @media (print) {
+            .a, .b {
+              --x: 1;
+            }
+            @media (min-width: 123px) {
+              :is(.a, .b) .c {
+                --x: 2;
+              }
+              .d {
+                --x: 3;
+              }
+            }
+          }
+        }
+        @property --foo {
+          syntax: '*';
+        }
+        @layer utilities {
+          @media (print) {
+            .e {
+              --x: 4;
+            }
+          }
+        }
+        "
+      `)
+    })
+
+    it('should hoist `@scope` at-rules', async () => {
+      expect(
+        optimize(css`
+          @layer utilities {
+            .parent {
+              @in-variant {
+                @scope (.from) to (.to) {
+                  --x: 1;
+                }
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @layer utilities {
+          @scope (.from) to (.to) {
+            .parent {
+              --x: 1;
+            }
+          }
+        }
+        "
+      `)
+    })
+
+    // We have an optimization where the moment we see a declaration that we
+    // stop handling the nesting and emit everything as-is. This won't work when
+    // we're dealing with `@scope` and we still want to hoist that out.
+    it('should hoist `@scope` at-rules, even when sibling declarations are present', async () => {
+      expect(
+        optimize(css`
+          @layer utilities {
+            .parent {
+              --x: 1;
+              @in-variant {
+                @scope (.from) {
+                  .inside {
+                    --y: 2;
+                  }
+                }
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @layer utilities {
+          .parent {
+            --x: 1;
+          }
+          @scope (.from) {
+            .parent .inside {
+              --y: 2;
+            }
+          }
+        }
+        "
+      `)
+    })
+
+    it('should resolve `&` in the `@scope` prelude when hoisting', async () => {
+      // `&` in the `<scope-start>` selector refers to the elements matched by
+      // the nearest ancestor style rule, while `&` in the `<scope-end>`
+      // selector refers to the scoping root.
+      //
+      // See: https://drafts.csswg.org/css-nesting-1/#nesting-at-scope
+      expect(
+        optimize(css`
+          .parent {
+            @scope (& > .scope) to (& .limit) {
+              .content {
+                --x: 1;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope (.parent > .scope) to (:where(:scope) .limit) {
+          .content {
+            --x: 1;
+          }
+        }
+        "
+      `)
+
+      // Selector lists need `:is(…)` to keep their meaning
+      expect(
+        optimize(css`
+          .parent-a,
+          .parent-b {
+            @scope (& > .from) {
+              .inside {
+                --x: 1;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope (:is(.parent-a, .parent-b) > .from) {
+          .inside {
+            --x: 1;
+          }
+        }
+        "
+      `)
+
+      // The `<scope-start>` selector is optional, so the first group in the
+      // prelude is not necessarily the `<scope-start>` selector.
+      expect(
+        optimize(css`
+          .parent {
+            @scope to (& .to) {
+              .inside {
+                --x: 1;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope to (:where(:scope) .to) {
+          .parent .inside {
+            --x: 1;
+          }
+        }
+        "
+      `)
+
+      // The parent selector is substituted with the same logic as the nesting
+      // selector in regular style rules: `:is(…)` is used when substituting the
+      // parent as-is would change the meaning (e.g. a type selector cannot
+      // appear after a class selector in a compound selector), …
+      expect(
+        optimize(css`
+          main {
+            @scope (.card&) {
+              .inside {
+                --x: 1;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope (.card:is(main)) {
+          .inside {
+            --x: 1;
+          }
+        }
+        "
+      `)
+
+      // … and dropped when the substitution is provably equivalent, even for
+      // complex parent selectors
+      expect(
+        optimize(css`
+          .a .b {
+            @scope (& > .from) {
+              .inside {
+                --x: 1;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope (.a .b > .from) {
+          .inside {
+            --x: 1;
+          }
+        }
+        "
+      `)
+    })
+
+    it('should wrap bare declarations inside `@scope` in a `&` rule', async () => {
+      // A bug in Lightning CSS causes an error when there are declarations
+      // directly in the `@scope`. To fix this we will ensure a rule with
+      // `:where(:scope)` is available.
+      expect(
+        optimize(css`
+          @scope (.from) to (.to) {
+            --x: 1;
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope (.from) to (.to) {
+          :where(:scope) {
+            --x: 1;
+          }
+        }
+        "
+      `)
+
+      // When generated by a variant, the declarations resolve against the
+      // parent rule: the `@scope` rule scopes _where the utility applies_
+      // (like nesting `@media` does, and like variants do).
+      //
+      // Note: this deviates from native CSS nesting, where the `<scope-start>`
+      // selector would be relative to `.parent` and the declarations would
+      // apply to the scoping root. User-authored `@scope` rules (without the
+      // `@in-variant` marker) keep those native semantics.
+      expect(
+        optimize(css`
+          .parent {
+            @in-variant {
+              @scope (.from) {
+                --x: 1;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope (.from) {
+          .parent {
+            --x: 1;
+          }
+        }
+        "
+      `)
+    })
+
+    it('should replace `&` with `:where(:scope)` for rules directly inside `@scope`', async () => {
+      // Inside an `@scope` rule, the nesting selector behaves like
+      // `:where(:scope)` and matches the scoping root with zero specificity.
+      expect(
+        optimize(css`
+          @scope (.from) {
+            & > p {
+              --x: 1;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope (.from) {
+          :where(:scope) > p {
+            --x: 1;
+          }
+        }
+        "
+      `)
+    })
+
+    it('should handle `&` deeply nested in `@scope` as normal references to a parent', async () => {
+      expect(
+        optimize(css`
+          @scope (.from) {
+            &,
+            .inside {
+              --x: 1;
+
+              &:hover {
+                --x: 2;
+              }
+
+              &:focus {
+                --x: 3;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope (.from) {
+          :where(:scope), .inside {
+            --x: 1;
+            &:hover {
+              --x: 2;
+            }
+            &:focus {
+              --x: 3;
+            }
+          }
+        }
+        "
+      `)
+    })
+
+    it('should compile user-authored `@scope` rules with their native CSS nesting semantics', async () => {
+      // The `<scope-start>` selector is relative to the parent rule (like
+      // nested style rule selectors are), the rules inside are relative to
+      // the scoping root, and `&` refers to the scoping root
+      expect(
+        optimize(css`
+          .parent {
+            @scope (.from) to (.to) {
+              .inside {
+                --x: 1;
+              }
+
+              & > .child {
+                --x: 2;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope (.parent .from) to (.to) {
+          .inside {
+            --x: 1;
+          }
+          :where(:scope) > .child {
+            --x: 2;
+          }
+        }
+        "
+      `)
+
+      // A trailing `&` makes the parent rule the scoping root: the scoping
+      // roots are `.parent` elements inside `.from` elements
+      expect(
+        optimize(css`
+          .parent {
+            @scope (.from &) to (.to) {
+              .inside {
+                --x: 1;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope (.from .parent) to (.to) {
+          .inside {
+            --x: 1;
+          }
+        }
+        "
+      `)
+
+      // Bare declarations apply to the scoping root. They are wrapped in a
+      // `:where(:scope)` rule, which is the spec's exact equivalent, because
+      // Lightning CSS drops bare declarations inside `@scope` entirely.
+      expect(
+        optimize(css`
+          .parent {
+            @scope (.from) {
+              --x: 1;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope (.parent .from) {
+          :where(:scope) {
+            --x: 1;
+          }
+        }
+        "
+      `)
+
+      // Also at the top level
+      expect(
+        optimize(css`
+          @scope (.from) to (.to) {
+            --x: 1;
+
+            .inside {
+              --x: 2;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope (.from) to (.to) {
+          :where(:scope) {
+            --x: 1;
+          }
+          .inside {
+            --x: 2;
+          }
+        }
+        "
+      `)
+
+      // Every selector in a `<scope-start>` selector list is relative to the
+      // parent rule, whether it uses `&` or not
+      expect(
+        optimize(css`
+          .parent {
+            @scope (.a, & > .b) {
+              .inside {
+                --x: 1;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope (.parent .a, .parent > .b) {
+          .inside {
+            --x: 1;
+          }
+        }
+        "
+      `)
+    })
+
+    it('should leave `@property` and `@apply` alone', async () => {
+      expect(
+        optimize(css`
+          .foo {
+            .bar {
+              @apply text-red-500 hover:text-red-600;
+            }
+          }
+
+          .baz {
+            @property --tw-content {
+              syntax: '*';
+              initial-value: '';
+              inherits: false;
+            }
+
+            @property --tw-border-spacing-x {
+              syntax: '<length>';
+              inherits: false;
+              initial-value: 0;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .foo .bar {
+          @apply text-red-500 hover:text-red-600;
+        }
+        .baz {
+          @property --tw-content {
+            syntax: '*';
+            initial-value: '';
+            inherits: false;
+          }
+          @property --tw-border-spacing-x {
+            syntax: '<length>';
+            inherits: false;
+            initial-value: 0;
+          }
+        }
+        "
+      `)
+    })
+
+    it('should merge a body-less @layer with an @layer with the same name that has a body', async () => {
+      expect(
+        optimize(css`
+          @layer a;
+
+          @layer a {
+            @layer b {
+              .x {
+                color: red;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @layer a {
+          @layer b {
+            .x {
+              color: red;
+            }
+          }
+        }
+        "
+      `)
+    })
+
+    it('should not get rid of `:is(…)` when the compound selector is part of a complex selector', async () => {
+      expect(
+        optimize(css`
+          .foo .bar {
+            .system &:focus {
+              --x: 1;
+            }
+          }
+          .foo:hover {
+            .system &:focus {
+              --x: 2;
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .system :is(.foo .bar):focus {
+          --x: 1;
+        }
+        .system .foo:hover:focus {
+          --x: 2;
+        }
+        "
+      `)
+    })
+
+    it('should not dedupe adjacent at-rules with the same prelude but different bodies', async () => {
+      expect(
+        optimize(css`
+          @font-face {
+            font-family: 'A';
+            src: url('/fonts/a.woff2');
+          }
+
+          @font-face {
+            font-family: 'B';
+            src: url('/fonts/b.woff2');
+          }
+
+          @keyframes spin {
+            to {
+              transform: rotate(360deg);
+            }
+          }
+
+          @keyframes spin {
+            to {
+              transform: rotate(-360deg);
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @font-face {
+          font-family: 'A';
+          src: url('/fonts/a.woff2');
+        }
+        @font-face {
+          font-family: 'B';
+          src: url('/fonts/b.woff2');
+        }
+        @keyframes spin {
+          to {
+            transform: rotate(360deg);
+          }
+        }
+        @keyframes spin {
+          to {
+            transform: rotate(-360deg);
+          }
+        }
+        "
+      `)
+    })
+  })
+})
diff --git a/packages/tailwindcss/src/ast.ts b/packages/tailwindcss/src/ast.ts
index 74a2bc63e..09c3ea051 100644
--- a/packages/tailwindcss/src/ast.ts
+++ b/packages/tailwindcss/src/ast.ts
@@ -1,11 +1,25 @@
+import { Polyfills } from '.'
+import * as SelectorParser from '../src/selector-parser'
 import { parseAtRule } from './css-parser'
+import type { DesignSystem } from './design-system'
+import type { Source, SourceLocation } from './source-maps/source'
+import { Theme, ThemeOptions } from './theme'
+import { DefaultMap } from './utils/default-map'
+import { segment } from './utils/segment'
+import { extractUsedVariables } from './utils/variables'
+import * as ValueParser from './value-parser'
+import { walk, WalkAction, type VisitContext } from './walk'
 
 const AT_SIGN = 0x40
+const PIPE = 0x7c
 
 export type StyleRule = {
   kind: 'rule'
   selector: string
   nodes: AstNode[]
+
+  src?: SourceLocation
+  dst?: SourceLocation
 }
 
 export type AtRule = {
@@ -13,6 +27,9 @@ export type AtRule = {
   name: string
   params: string
   nodes: AstNode[]
+
+  src?: SourceLocation
+  dst?: SourceLocation
 }
 
 export type Declaration = {
@@ -20,22 +37,34 @@ export type Declaration = {
   property: string
   value: string | undefined
   important: boolean
+
+  src?: SourceLocation
+  dst?: SourceLocation
 }
 
 export type Comment = {
   kind: 'comment'
   value: string
+
+  src?: SourceLocation
+  dst?: SourceLocation
 }
 
 export type Context = {
   kind: 'context'
   context: Record<string, string | boolean>
   nodes: AstNode[]
+
+  src?: undefined
+  dst?: undefined
 }
 
 export type AtRoot = {
   kind: 'at-root'
   nodes: AstNode[]
+
+  src?: undefined
+  dst?: undefined
 }
 
 export type Rule = StyleRule | AtRule
@@ -97,128 +126,123 @@ export function atRoot(nodes: AstNode[]): AtRoot {
   }
 }
 
-export const enum WalkAction {
-  /** Continue walking, which is the default */
-  Continue,
+export function cloneAstNode<T extends AstNode>(node: T): T {
+  switch (node.kind) {
+    case 'rule':
+      return {
+        kind: node.kind,
+        selector: node.selector,
+        nodes: node.nodes.map(cloneAstNode),
+        src: node.src,
+        dst: node.dst,
+      } satisfies StyleRule as T
 
-  /** Skip visiting the children of this node */
-  Skip,
+    case 'at-rule':
+      return {
+        kind: node.kind,
+        name: node.name,
+        params: node.params,
+        nodes: node.nodes.map(cloneAstNode),
+        src: node.src,
+        dst: node.dst,
+      } satisfies AtRule as T
 
-  /** Stop the walk entirely */
-  Stop,
-}
+    case 'at-root':
+      return {
+        kind: node.kind,
+        nodes: node.nodes.map(cloneAstNode),
+        src: node.src,
+        dst: node.dst,
+      } satisfies AtRoot as T
 
-export function walk(
-  ast: AstNode[],
-  visit: (
-    node: AstNode,
-    utils: {
-      parent: AstNode | null
-      replaceWith(newNode: AstNode | AstNode[]): void
-      context: Record<string, string | boolean>
-      path: AstNode[]
-    },
-  ) => void | WalkAction,
-  parentPath: AstNode[] = [],
-  context: Record<string, string | boolean> = {},
-) {
-  for (let i = 0; i < ast.length; i++) {
-    let node = ast[i]
-    let path = [...parentPath, node]
-    let parent = parentPath.at(-1) ?? null
+    case 'context':
+      return {
+        kind: node.kind,
+        context: { ...node.context },
+        nodes: node.nodes.map(cloneAstNode),
+        src: node.src,
+        dst: node.dst,
+      } satisfies Context as T
 
-    // We want context nodes to be transparent in walks. This means that
-    // whenever we encounter one, we immediately walk through its children and
-    // furthermore we also don't update the parent.
-    if (node.kind === 'context') {
-      if (
-        walk(node.nodes, visit, parentPath, { ...context, ...node.context }) === WalkAction.Stop
-      ) {
-        return WalkAction.Stop
-      }
-      continue
-    }
+    case 'declaration':
+      return {
+        kind: node.kind,
+        property: node.property,
+        value: node.value,
+        important: node.important,
+        src: node.src,
+        dst: node.dst,
+      } satisfies Declaration as T
 
-    let status =
-      visit(node, {
-        parent,
-        context,
-        path,
-        replaceWith(newNode) {
-          ast.splice(i, 1, ...(Array.isArray(newNode) ? newNode : [newNode]))
-          // We want to visit the newly replaced node(s), which start at the
-          // current index (i). By decrementing the index here, the next loop
-          // will process this position (containing the replaced node) again.
-          i--
-        },
-      }) ?? WalkAction.Continue
+    case 'comment':
+      return {
+        kind: node.kind,
+        value: node.value,
+        src: node.src,
+        dst: node.dst,
+      } satisfies Comment as T
 
-    // Stop the walk entirely
-    if (status === WalkAction.Stop) return WalkAction.Stop
-
-    // Skip visiting the children of this node
-    if (status === WalkAction.Skip) continue
-
-    if (node.kind === 'rule' || node.kind === 'at-rule') {
-      if (walk(node.nodes, visit, path, context) === WalkAction.Stop) {
-        return WalkAction.Stop
-      }
-    }
+    default:
+      node satisfies never
+      throw new Error(`Unknown node kind: ${(node as any).kind}`)
   }
 }
 
-// This is a depth-first traversal of the AST
-export function walkDepth(
-  ast: AstNode[],
-  visit: (
-    node: AstNode,
-    utils: {
-      parent: AstNode | null
-      path: AstNode[]
-      context: Record<string, string | boolean>
-      replaceWith(newNode: AstNode[]): void
+export function cssContext(
+  ctx: VisitContext<AstNode>,
+): VisitContext<AstNode> & { context: Record<string, string | boolean> } {
+  return {
+    depth: ctx.depth,
+    index: ctx.index,
+    siblings: ctx.siblings,
+    get context() {
+      let context: Record<string, string | boolean> = {}
+      for (let child of ctx.path()) {
+        if (child.kind === 'context') {
+          Object.assign(context, child.context)
+        }
+      }
+
+      // Once computed, we never need to compute this again
+      Object.defineProperty(this, 'context', { value: context })
+      return context
     },
-  ) => void,
-  parentPath: AstNode[] = [],
-  context: Record<string, string | boolean> = {},
-) {
-  for (let i = 0; i < ast.length; i++) {
-    let node = ast[i]
-    let path = [...parentPath, node]
-    let parent = parentPath.at(-1) ?? null
+    get parent() {
+      let parent = (this.path().pop() as Extract<AstNode, { nodes: AstNode[] }>) ?? null
 
-    if (node.kind === 'rule' || node.kind === 'at-rule') {
-      walkDepth(node.nodes, visit, path, context)
-    } else if (node.kind === 'context') {
-      walkDepth(node.nodes, visit, parentPath, { ...context, ...node.context })
-      continue
-    }
-
-    visit(node, {
-      parent,
-      context,
-      path,
-      replaceWith(newNode) {
-        ast.splice(i, 1, ...newNode)
-
-        // Skip over the newly inserted nodes (being depth-first it doesn't make sense to visit them)
-        i += newNode.length - 1
-      },
-    })
+      // Once computed, we never need to compute this again
+      Object.defineProperty(this, 'parent', { value: parent })
+      return parent
+    },
+    path() {
+      return ctx.path().filter((n) => n.kind !== 'context')
+    },
   }
 }
 
 // Optimize the AST for printing where all the special nodes that require custom
 // handling are handled such that the printing is a 1-to-1 transformation.
-export function optimizeAst(ast: AstNode[]) {
+export function optimizeAst(
+  ast: AstNode[],
+  designSystem: DesignSystem,
+  polyfills: Polyfills = Polyfills.All,
+) {
   let atRoots: AstNode[] = []
   let seenAtProperties = new Set<string>()
+  let cssThemeVariables = new DefaultMap<AstNode[], Set<Declaration>>(() => new Set())
+  let colorMixDeclarations = new DefaultMap<AstNode[], Set<Declaration>>(() => new Set())
+  let keyframes = new Set<AtRule>()
+  let usedKeyframeNames = new Set()
+
   let propertyFallbacksRoot: Declaration[] = []
   let propertyFallbacksUniversal: Declaration[] = []
 
+  let variableDependencies = new DefaultMap<string, Set<string>>(() => new Set())
+
   function transform(
     node: AstNode,
-    parent: Extract<AstNode, { nodes: AstNode[] }>['nodes'],
+    parent: AstNode[],
+    context: Record<string, string | boolean> = {},
     depth = 0,
   ) {
     // Declaration
@@ -226,16 +250,66 @@ export function optimizeAst(ast: AstNode[]) {
       if (node.property === '--tw-sort' || node.value === undefined || node.value === null) {
         return
       }
+
+      // Track variables defined in `@theme`
+      if (context.theme && node.property[0] === '-' && node.property[1] === '-') {
+        // Variables that resolve to `initial` should never be emitted. This can happen because of
+        // the `--theme(…)` being used and evaluated lazily
+        if (node.value === 'initial') {
+          node.value = undefined
+          return
+        }
+
+        if (!context.keyframes) {
+          cssThemeVariables.get(parent).add(node)
+        }
+      }
+
+      // Track used CSS variables
+      if (node.value.includes('var(')) {
+        // Declaring another variable does not count as usage. Instead, we mark
+        // the relationship
+        if (context.theme && node.property[0] === '-' && node.property[1] === '-') {
+          for (let variable of extractUsedVariables(node.value)) {
+            variableDependencies.get(variable).add(node.property)
+          }
+        } else {
+          designSystem.trackUsedVariables(node.value)
+        }
+      }
+
+      // Track used animation names
+      if (node.property === 'animation') {
+        for (let keyframeName of extractKeyframeNames(node.value)) {
+          usedKeyframeNames.add(keyframeName)
+        }
+      }
+
+      // Create fallback values for usages of the `color-mix(…)` function that reference variables
+      // found in the theme config.
+      if (
+        polyfills & Polyfills.ColorMix &&
+        !context.supportsColorMix &&
+        !context.keyframes &&
+        node.value.includes('color-mix(')
+      ) {
+        colorMixDeclarations.get(parent).add(node)
+      }
+
       parent.push(node)
     }
 
     // Rule
     else if (node.kind === 'rule') {
-      let copy = { ...node, nodes: [] }
+      let nodes: AstNode[] = []
+
       for (let child of node.nodes) {
-        transform(child, copy.nodes, depth + 1)
+        transform(child, nodes, context, depth + 1)
+      }
+
+      if (nodes.length > 0) {
+        parent.push({ ...node, nodes })
       }
-      parent.push(copy)
     }
 
     // AtRule `@property`
@@ -245,51 +319,77 @@ export function optimizeAst(ast: AstNode[]) {
         return
       }
 
-      // Collect fallbacks for `@property` rules for Firefox support
-      // We turn these into rules on `:root` or `*` and some pseudo-elements
-      // based on the value of `inherits``
-      let property = node.params
-      let initialValue = null
-      let inherits = false
+      // Collect fallbacks for `@property` rules for Firefox support We turn these into rules on
+      // `:root` or `*` and some pseudo-elements based on the value of `inherits`
+      if (polyfills & Polyfills.AtProperty) {
+        let property = node.params
+        let initialValue = null
+        let inherits = false
 
-      for (let prop of node.nodes) {
-        if (prop.kind !== 'declaration') continue
-        if (prop.property === 'initial-value') {
-          initialValue = prop.value
-        } else if (prop.property === 'inherits') {
-          inherits = prop.value === 'true'
+        for (let prop of node.nodes) {
+          if (prop.kind !== 'declaration') continue
+          if (prop.property === 'initial-value') {
+            initialValue = prop.value
+          } else if (prop.property === 'inherits') {
+            inherits = prop.value === 'true'
+          }
         }
-      }
 
-      if (inherits) {
-        propertyFallbacksRoot.push(decl(property, initialValue ?? 'initial'))
-      } else {
-        propertyFallbacksUniversal.push(decl(property, initialValue ?? 'initial'))
+        let fallback = decl(property, initialValue ?? 'initial')
+        fallback.src = node.src
+
+        if (inherits) {
+          propertyFallbacksRoot.push(fallback)
+        } else {
+          propertyFallbacksUniversal.push(fallback)
+        }
       }
 
       seenAtProperties.add(node.params)
 
       let copy = { ...node, nodes: [] }
       for (let child of node.nodes) {
-        transform(child, copy.nodes, depth + 1)
+        transform(child, copy.nodes, context, depth + 1)
       }
       parent.push(copy)
     }
 
     // AtRule
     else if (node.kind === 'at-rule') {
+      if (node.name === '@keyframes') {
+        context = { ...context, keyframes: true }
+      } else if (node.name === '@supports' && node.params.includes('color-mix(')) {
+        context = { ...context, supportsColorMix: true }
+      }
+
       let copy = { ...node, nodes: [] }
       for (let child of node.nodes) {
-        transform(child, copy.nodes, depth + 1)
+        transform(child, copy.nodes, context, depth + 1)
+      }
+
+      // Only track `@keyframes` that could be removed, when they were defined inside of a `@theme`.
+      if (node.name === '@keyframes' && context.theme) {
+        keyframes.add(copy)
+      }
+
+      if (
+        copy.nodes.length > 0 ||
+        copy.name === '@layer' ||
+        copy.name === '@charset' ||
+        copy.name === '@custom-media' ||
+        copy.name === '@namespace' ||
+        copy.name === '@import' ||
+        copy.name === '@apply'
+      ) {
+        parent.push(copy)
       }
-      parent.push(copy)
     }
 
     // AtRoot
     else if (node.kind === 'at-root') {
       for (let child of node.nodes) {
         let newParent: AstNode[] = []
-        transform(child, newParent, 0)
+        transform(child, newParent, context, 0)
         for (let child of newParent) {
           atRoots.push(child)
         }
@@ -298,8 +398,28 @@ export function optimizeAst(ast: AstNode[]) {
 
     // Context
     else if (node.kind === 'context') {
-      for (let child of node.nodes) {
-        transform(child, parent, depth)
+      // Remove reference imports from printing
+      if (node.context.reference) {
+        return
+      }
+
+      // Preserve context nodes that track the source of their subtree (variant
+      // bodies and the user content slotted into them), so `handleNesting`
+      // knows whether to compose `@scope` rules with the variant semantics or
+      // their native CSS nesting semantics
+      else if (node.context.source) {
+        let copy = { ...node, nodes: [] as AstNode[] }
+        for (let child of node.nodes) {
+          transform(child, copy.nodes, { ...context, ...node.context }, depth)
+        }
+
+        if (copy.nodes.length > 0) {
+          parent.push(copy)
+        }
+      } else {
+        for (let child of node.nodes) {
+          transform(child, parent, { ...context, ...node.context }, depth)
+        }
       }
     }
 
@@ -316,32 +436,1214 @@ export function optimizeAst(ast: AstNode[]) {
 
   let newAst: AstNode[] = []
   for (let node of ast) {
-    transform(node, newAst, 0)
+    transform(node, newAst, {}, 0)
   }
 
+  // Remove unused theme variables
+  next: for (let [parent, declarations] of cssThemeVariables) {
+    for (let declaration of declarations) {
+      // Find out if a variable is either used directly or if any of the
+      // variables referencing it is used.
+      let variableUsed = isVariableUsed(
+        declaration.property,
+        designSystem.theme,
+        variableDependencies,
+      )
+      if (variableUsed) {
+        if (declaration.property.startsWith(designSystem.theme.prefixKey('--animate-'))) {
+          for (let keyframeName of extractKeyframeNames(declaration.value!))
+            usedKeyframeNames.add(keyframeName)
+        }
+
+        continue
+      }
+
+      // Remove the declaration (from its parent)
+      let idx = parent.indexOf(declaration)
+      parent.splice(idx, 1)
+
+      // If the parent is now empty, remove it and any `@layer` rules above it
+      // from the AST
+      if (parent.length === 0) {
+        let path = findNode(newAst, (node) => node.kind === 'rule' && node.nodes === parent)
+
+        if (!path || path.length === 0) continue next
+
+        // Add the root of the AST so we can delete from the top-level
+        path.unshift({
+          kind: 'at-root',
+          nodes: newAst,
+        })
+
+        // Remove nodes from the parent as long as the parent is empty
+        // otherwise and consist of only @layer rules
+        do {
+          let nodeToRemove = path.pop()
+          if (!nodeToRemove) break
+
+          let removeFrom = path[path.length - 1]
+          if (!removeFrom) break
+          if (removeFrom.kind !== 'at-root' && removeFrom.kind !== 'at-rule') break
+
+          let idx = removeFrom.nodes.indexOf(nodeToRemove)
+          if (idx === -1) break
+
+          removeFrom.nodes.splice(idx, 1)
+        } while (true)
+
+        continue next
+      }
+    }
+  }
+
+  // Remove unused keyframes
+  for (let keyframe of keyframes) {
+    if (!usedKeyframeNames.has(keyframe.params)) {
+      let idx = atRoots.indexOf(keyframe)
+      atRoots.splice(idx, 1)
+    }
+  }
+
+  newAst = newAst.concat(atRoots)
+
   // Fallbacks
-  {
+  // Create fallback values for usages of the `color-mix(…)` function that reference variables
+  // found in the theme config.
+  if (polyfills & Polyfills.ColorMix) {
+    for (let [parent, declarations] of colorMixDeclarations) {
+      for (let declaration of declarations) {
+        let idx = parent.indexOf(declaration)
+        // If the declaration is no longer present, we don't need to create a polyfill anymore
+        if (idx === -1 || declaration.value == null) continue
+
+        let ast = ValueParser.parse(declaration.value)
+        let requiresPolyfill = false
+        walk(ast, (node) => {
+          if (node.kind !== 'function' || node.value !== 'color-mix') return
+
+          let containsUnresolvableVars = false
+          let containsCurrentcolor = false
+          walk(node.nodes, (node) => {
+            if (node.kind == 'word' && node.value.toLowerCase() === 'currentcolor') {
+              containsCurrentcolor = true
+              requiresPolyfill = true
+              return
+            }
+
+            let varNode: ValueParser.ValueAstNode | null = node
+            let inlinedColor: string | null = null
+            let seenVariables = new Set<string>()
+            do {
+              if (varNode.kind !== 'function' || varNode.value !== 'var') return
+              let firstChild = varNode.nodes[0]
+              if (!firstChild || firstChild.kind !== 'word') return
+
+              let variableName = firstChild.value
+
+              if (seenVariables.has(variableName)) {
+                containsUnresolvableVars = true
+                return
+              }
+
+              seenVariables.add(variableName)
+
+              requiresPolyfill = true
+
+              inlinedColor = designSystem.theme.resolveValue(null, [firstChild.value as any])
+              if (!inlinedColor) {
+                containsUnresolvableVars = true
+                return
+              }
+              if (inlinedColor.toLowerCase() === 'currentcolor') {
+                containsCurrentcolor = true
+                return
+              }
+
+              if (inlinedColor.startsWith('var(')) {
+                let subAst = ValueParser.parse(inlinedColor)
+                varNode = subAst[0]
+              } else {
+                varNode = null
+              }
+            } while (varNode)
+
+            return WalkAction.Replace({ kind: 'word', value: inlinedColor } as const)
+          })
+
+          if (containsUnresolvableVars || containsCurrentcolor) {
+            let separatorIndex = node.nodes.findIndex(
+              (node) => node.kind === 'separator' && node.value.trim().includes(','),
+            )
+            if (separatorIndex === -1) return
+            let firstColorValue =
+              node.nodes.length > separatorIndex ? node.nodes[separatorIndex + 1] : null
+            if (!firstColorValue) return
+            return WalkAction.Replace(firstColorValue)
+          } else if (requiresPolyfill) {
+            // Change the colorspace to `srgb` since the fallback values should not be represented as
+            // `oklab(…)` functions again as their support in Safari <16 is very limited.
+            let colorspace = node.nodes[2]
+            if (
+              colorspace.kind === 'word' &&
+              (colorspace.value === 'oklab' ||
+                colorspace.value === 'oklch' ||
+                colorspace.value === 'lab' ||
+                colorspace.value === 'lch')
+            ) {
+              colorspace.value = 'srgb'
+            }
+          }
+        })
+        if (!requiresPolyfill) continue
+
+        let fallback = {
+          ...declaration,
+          value: ValueParser.toCss(ast),
+        }
+        let colorMixQuery = rule('@supports (color: color-mix(in lab, red, red))', [declaration])
+        colorMixQuery.src = declaration.src
+        parent.splice(idx, 1, fallback, colorMixQuery)
+      }
+    }
+  }
+
+  if (polyfills & Polyfills.AtProperty) {
     let fallbackAst = []
 
     if (propertyFallbacksRoot.length > 0) {
-      fallbackAst.push(rule(':root', propertyFallbacksRoot))
+      let wrapper = rule(':root, :host', propertyFallbacksRoot)
+      wrapper.src = propertyFallbacksRoot[0].src
+      fallbackAst.push(wrapper)
     }
 
     if (propertyFallbacksUniversal.length > 0) {
-      fallbackAst.push(rule('*, ::before, ::after, ::backdrop', propertyFallbacksUniversal))
+      let wrapper = rule('*, ::before, ::after, ::backdrop', propertyFallbacksUniversal)
+      wrapper.src = propertyFallbacksUniversal[0].src
+      fallbackAst.push(wrapper)
     }
 
     if (fallbackAst.length > 0) {
-      newAst.push(
-        atRule('@supports', '(-moz-orient: inline)', [atRule('@layer', 'base', fallbackAst)]),
+      // Insert an empty `@layer properties;` at the beginning of the document. We need to place it
+      // after eventual external imports as `lightningcss` would otherwise move the content into the
+      // same place.
+      let firstValidNodeIndex = newAst.findIndex((node) => {
+        // License comments
+        if (node.kind === 'comment') return false
+
+        if (node.kind === 'at-rule') {
+          // Charset
+          if (node.name === '@charset') return false
+
+          // External imports
+          if (node.name === '@import') return false
+        }
+
+        return true
+      })
+
+      let layerPropertiesStatement = atRule('@layer', 'properties', [])
+      layerPropertiesStatement.src = fallbackAst[0].src
+
+      newAst.splice(
+        firstValidNodeIndex < 0 ? newAst.length : firstValidNodeIndex,
+        0,
+        layerPropertiesStatement,
       )
+
+      let block = rule('@layer properties', [
+        atRule(
+          '@supports',
+          // We can't write a supports query for `@property` directly so we have to test for
+          // features that are added around the same time in Mozilla and Safari.
+          '((-webkit-hyphens: none) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color:rgb(from red r g b))))',
+          fallbackAst,
+        ),
+      ])
+
+      block.src = fallbackAst[0].src
+      block.nodes[0].src = fallbackAst[0].src
+
+      newAst.push(block)
     }
   }
 
-  return newAst.concat(atRoots)
+  return handleNesting(newAst)
 }
 
-export function toCss(ast: AstNode[]) {
+export function handleNesting(ast: AstNode[]): AstNode[] {
+  let parseSelectorCache = new DefaultMap(SelectorParser.parse)
+
+  // Nodes with an `@scope` rule somewhere in their subtree. These cannot use
+  // the "emit as-is" fast path for rules containing declarations, because
+  // `@scope` rules change meaning when they stay nested inside a style rule and
+  // must go through the hoisting machinery instead.
+  let containsAtScope = new Set<AstNode>()
+  {
+    function scan(nodes: AstNode[]): boolean {
+      let found = false
+      for (let node of nodes) {
+        if (node.kind === 'declaration' || node.kind === 'comment') continue
+
+        if (scan(node.nodes) || (node.kind === 'at-rule' && node.name === '@scope')) {
+          containsAtScope.add(node)
+          found = true
+        }
+      }
+      return found
+    }
+    scan(ast)
+  }
+
+  // Track `rule` selectors as we go
+  let selectorStack: [
+    selector: string,
+    src: SourceLocation | undefined,
+    dst: SourceLocation | undefined,
+  ][] = []
+
+  // Track `at-rule` information as we go. Tracking this separately from the
+  // selector stack for rules such that we can hoist this above all the rules.
+  let atRuleStack: [
+    name: string,
+    params: string,
+    src: SourceLocation | undefined,
+    dst: SourceLocation | undefined,
+  ][] = []
+
+  // The current "nodes" we can push to
+  let nodes = null as AstNode[] | null
+
+  // Optimization: Track the declaration properties we've seen in the current
+  // nodes.
+  let seenDeclarationProperties = new Set<string>()
+
+  // Track nodes lists where we want to dedupe declarations
+  let dedupeDeclarationsInNodes = new Set<AstNode[]>()
+
+  // The final, new AST
+  let result: AstNode[] = []
+
+  // Track whether we should skip a node in the `exit` phase
+  let skipExit = new Set<AstNode>()
+
+  // Track the source of the subtree we are currently in. Variant bodies are
+  // wrapped in a `context` node with `source: 'variant'`, and the user content
+  // slotted into them is wrapped in `source: 'user'`. `@scope` rules whose
+  // nearest source is a variant are hoisted with the variant semantics, all
+  // other `@scope` rules use their native CSS nesting semantics.
+  let sourceStack: (string | boolean)[] = []
+
+  // Selector stacks that are masked while inside an `@scope` rule whose
+  // `<scope-start>` selector consumed the parent selector via `&`.
+  //
+  // Once the parent selector is part of the `<scope-start>` selector, the rules
+  // inside the `@scope` are relative to the scoping root, not to the parent
+  // rule. Selectors in scoped style rules only match elements in scope, and the
+  // parent matches ancestors of the scoping root, so prefixing the rules with
+  // the parent selector would make them match nothing at all.
+  //
+  // E.g.:
+  //
+  // ```css
+  // .parent {
+  //   @scope (& > .scope) {
+  //     .content {
+  //       color: red;
+  //     }
+  //   }
+  // }
+  // ```
+  //
+  // becomes:
+  //
+  // ```css
+  // @scope (.parent > .scope) {
+  //   .content { /* ← not `.parent .content` */
+  //     color: red;
+  //   }
+  // }
+  // ```
+  let maskedSelectorStacks = new Map<AstNode, typeof selectorStack>()
+
+  walk(ast, {
+    enter(node) {
+      switch (node.kind) {
+        case 'rule': {
+          nodes = null // Start a new level
+
+          // First time we see a rule
+          if (selectorStack.length === 0) {
+            // A rule with a selector containing `&` should replace the `&` with
+            // `:scope` if there is no parent rule.
+            //
+            // Note: there could be false positives when the `&` is escaped or
+            // part of a string inside an attribute selector. But the
+            // SelectorParser will take care of that.
+            if (node.selector.includes('&')) {
+              // Inside an `@scope` rule, the nesting selector behaves like
+              // `:where(:scope)` and matches the scoping root with zero
+              // specificity. E.g.:
+              //
+              // ```css
+              // @scope (.checkout) {
+              //   & > p {
+              //     color: red;
+              //   }
+              // }
+              // ```
+              //
+              // becomes:
+              //
+              // ```css
+              // @scope (.checkout) {
+              //   :where(:scope) > p {
+              //     color: red;
+              //   }
+              // }
+              // ```
+              //
+              // See: https://drafts.csswg.org/css-nesting-1/#nesting-at-scope
+              let replacement = atRuleStack.some(([name]) => name === '@scope')
+                ? ':where(:scope)'
+                : ':scope'
+
+              let ast = SelectorParser.parse(node.selector)
+              let changed = false
+
+              walk(ast, (node) => {
+                if (node.kind === 'selector' && node.value === '&') {
+                  changed = true
+                  node.value = replacement
+                }
+              })
+
+              if (changed) {
+                selectorStack.push([SelectorParser.toCss(ast), node.src, node.dst])
+              } else {
+                selectorStack.push([node.selector, node.src, node.dst])
+              }
+            }
+
+            // No nesting markers, track as-is
+            else {
+              selectorStack.push([node.selector, node.src, node.dst])
+            }
+          }
+
+          // Nested rule, ensure `&` is present in each selector. Then track the
+          // selector.
+          else {
+            // A rule with just `&` can be replaced by its children. Let's
+            // ignore this node and keep walking its children.
+            if (node.selector === '&') {
+              skipExit.add(node)
+              return
+            }
+
+            let lastSelector = selectorStack[selectorStack.length - 1][0]
+            let selector = segment(node.selector, ',')
+              .map((selector) => substituteNestingSelector(selector, lastSelector))
+              .join(', ')
+            selectorStack.push([selector, node.src, node.dst])
+          }
+
+          // Once we hit a rule that has at least one declaration, then we can
+          // stop handling the nested selectors.
+          //
+          // This ensures that browser devtools can at least show _something_
+          // for a given rule. This also means that we can leverage CSS nesting
+          // which is better for gzip results due to increased repetition.
+          //
+          // E.g.:
+          //
+          // ```css
+          // .a {
+          //   &[b] {
+          //     color: red;
+          //     &:hover {
+          //       color: blue;
+          //     }
+          //   }
+          // }
+          // ```
+          //
+          // ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
+          //
+          // ```css
+          // .a[b] {          /* ← flattened */
+          //   color: red;    /* ← saw a declaration, therefore */
+          //   &:hover {      /* ← we keep this nested syntax */
+          //     color: blue;
+          //   }
+          // }
+          // ```
+          //
+          // The exception is when the rule contains an `@scope` rule somewhere,
+          // because it must go through the normal hoisting machinery instead.
+          // See `containsAtScope` for more details.
+          if (
+            node.nodes.some((child) => child.kind === 'declaration') &&
+            !containsAtScope.has(node)
+          ) {
+            // Emitting each child instead of the node itself because we do want
+            // to flatten the current node and its selector that is already
+            // pushed to the stack.
+            for (let child of node.nodes) emit(child)
+            return WalkAction.Skip
+          }
+          break
+        }
+
+        case 'at-rule': {
+          nodes = null // Start a new level
+
+          // `@layer` is hoistable, but when it's empty then we have to make
+          // sure that we still emit it because this might influence the layer
+          // order. We can't just get rid of it.
+          if (node.nodes.length === 0 && !DROPPABLE_IF_EMPTY_AT_RULES.has(node.name)) {
+            emit(node)
+            skipExit.add(node)
+            return WalkAction.Skip
+          }
+
+          // Hoist at-rules
+          else if (HOISTABLE_AT_RULES.has(node.name)) {
+            let params = node.params
+
+            // `@scope` is the only hoistable at-rule with selectors in its
+            // prelude, and the only one that changes meaning when it stays
+            // nested inside a style rule. Resolve the prelude and its contents
+            // before hoisting, using one of two composition modes:
+            //
+            // 1. Variant-generated `@scope` rules attach the parent selector
+            //    (the utility) to the rules _inside_ the scope:
+            //
+            //    ```css
+            //    .scoped\:underline {
+            //      @scope (.from) to (.to) {
+            //        text-decoration-line: underline;
+            //      }
+            //    }
+            //    ```
+            //
+            //    becomes:
+            //
+            //    ```css
+            //    @scope (.from) to (.to) {
+            //      .scoped\:underline {
+            //        text-decoration-line: underline;
+            //      }
+            //    }
+            //    ```
+            //    This way the utility is properly sandwiched between the
+            //    `.from` and `.to` boundaries.
+            //
+            // 2. User-authored `@scope` rules keep their native CSS nesting
+            //    semantics: the `<scope-start>` selector is relative to the parent
+            //    rule, and the rules inside are relative to the scoping root:
+            //
+            //    ```css
+            //    .parent {
+            //      @scope (.from) {
+            //        color: red;
+            //      }
+            //    }
+            //    ```
+            //
+            //    becomes:
+            //
+            //    ```css
+            //    @scope (.parent .from) {
+            //      :where(:scope) {
+            //        color: red;
+            //      }
+            //    }
+            //    ```
+            //
+            //    In a perfect world we leave this alone, but Lightning CSS
+            //    seems to incorrectly transform this into a version where the
+            //    `.parent` class is gone entirely:
+            //
+            //    ```css
+            //    @scope (.from) {
+            //      color: red;
+            //    }
+            //    ```
+            //
+            // See: https://drafts.csswg.org/css-nesting-1/#nesting-at-scope
+            if (node.name === '@scope') {
+              let isVariant = sourceStack[sourceStack.length - 1] === 'variant'
+              let hasParent = selectorStack.length > 0
+
+              // Lightning CSS bug: This snippet will error
+              //
+              // ```css
+              // @scope {
+              //   --x: 1;
+              // }
+              // ```
+              //
+              // We will wrap these bare-declarations in a `&` rule to fix the crash:
+              // ```css
+              // @scope {
+              //   & {
+              //     --x: 1;
+              //   }
+              // }
+              // ```
+              {
+                let queue: (AtRule | Context)[] = [node]
+
+                for (let parent of queue) {
+                  let newNodes: AstNode[] = []
+                  let group: AstNode[] | null = null
+
+                  for (let child of parent.nodes) {
+                    if (child.kind === 'context') queue.push(child)
+
+                    if (child.kind === 'declaration' || child.kind === 'comment') {
+                      if (group === null) {
+                        group = []
+                        newNodes.push(styleRule('&', group))
+                      }
+                      group.push(child)
+                    } else {
+                      group = null
+                      newNodes.push(child)
+                    }
+                  }
+
+                  parent.nodes = newNodes
+                }
+              }
+
+              if (params.includes('&') || (!isVariant && hasParent)) {
+                // The selector to substitute for `&` in the `<scope-start>`
+                // selector: the elements matched by the nearest ancestor style
+                // rule, or `:scope` when there is none.
+                let parentSelector = hasParent ? selectorStack[selectorStack.length - 1][0] : null
+
+                let paramsAst = ValueParser.parse(params)
+
+                // Whether the current `(…)` group is a `<scope-end>` selector.
+                //
+                // ```css
+                // @scope (.from) to (.to)
+                //        ^^^^^^^           scope-start (optional)
+                //                   ^^^^^  scope-end
+                //
+                // @scope to (.to)
+                //           ^^^^^          scope-end
+                // ```
+                let isScopeEnd = false
+
+                // Whether the `<scope-start>` selector consumed the parent
+                // selector
+                let consumedParent = false
+
+                for (let paramNode of paramsAst) {
+                  if (paramNode.kind === 'word' && paramNode.value === 'to') {
+                    isScopeEnd = true
+                    continue
+                  }
+
+                  // A `(…)` group parses as a function call without a name
+                  if (paramNode.kind !== 'function' || paramNode.value !== '') continue
+
+                  let selector = ValueParser.toCss(paramNode.nodes)
+
+                  // A user-authored `<scope-start>` selector is relative to the
+                  // parent rule, and resolves exactly like nested style rule
+                  // selectors do: `&` refers to the elements matched by the
+                  // parent rule, and selectors without `&` are prefixed with
+                  // it.
+                  if (!isScopeEnd && !isVariant && parentSelector !== null) {
+                    paramNode.nodes = [
+                      ValueParser.word(
+                        segment(selector, ',')
+                          .map((part) => substituteNestingSelector(part.trim(), parentSelector))
+                          .join(', '),
+                      ),
+                    ]
+                    consumedParent = true
+                  }
+
+                  // Otherwise, only an explicit `&` is resolved. In the
+                  // `<scope-start>` selector, `&` refers to the elements
+                  // matched by the nearest ancestor style rule (or `:scope`
+                  // when there is none). In the `<scope-end>` selector, `&`
+                  // refers to the scoping root and behaves like
+                  // `:where(:scope)`.
+                  else if (selector.includes('&')) {
+                    let replacement = isScopeEnd ? ':where(:scope)' : (parentSelector ?? ':scope')
+
+                    paramNode.nodes = [
+                      ValueParser.word(substituteNestingSelector(selector, replacement)),
+                    ]
+                    if (!isScopeEnd && hasParent) consumedParent = true
+                  }
+                }
+
+                params = ValueParser.toCss(paramsAst)
+
+                // Mask the selector stack for the `@scope` rule's subtree, so
+                // its rules resolve like top-level rules within the scope (and
+                // `&` resolves to `:where(:scope)`). The stack is restored in
+                // the exit phase. See `maskedSelectorStacks` for more details.
+                if (consumedParent) {
+                  maskedSelectorStacks.set(node, selectorStack)
+                  selectorStack = []
+                }
+              }
+            }
+
+            atRuleStack.push([node.name, params, node.src, node.dst])
+          }
+
+          // If we can't hoist them, emit them immediately as-is
+          else {
+            emit(node)
+            skipExit.add(node)
+            return WalkAction.Skip
+          }
+          break
+        }
+
+        case 'declaration':
+        case 'comment': {
+          emit(node)
+          break
+        }
+
+        case 'context':
+          if (node.context.source) sourceStack.push(node.context.source)
+          break
+
+        case 'at-root':
+          break
+
+        default:
+          node satisfies never
+          break
+      }
+    },
+    exit(node) {
+      if (skipExit.delete(node)) return
+
+      switch (node.kind) {
+        case 'rule': {
+          nodes = null
+          selectorStack.pop()
+          break
+        }
+
+        case 'at-rule': {
+          nodes = null
+          atRuleStack.pop()
+
+          // Restore the selector stack that was masked by this `@scope` rule
+          let maskedSelectorStack = maskedSelectorStacks.get(node)
+          if (maskedSelectorStack) {
+            selectorStack = maskedSelectorStack
+            maskedSelectorStacks.delete(node)
+          }
+          break
+        }
+
+        case 'context':
+          if (node.context.source) sourceStack.pop()
+          break
+
+        case 'declaration':
+        case 'comment':
+        case 'at-root':
+          break
+
+        default:
+          node satisfies never
+          break
+      }
+    },
+  })
+
+  // Dedupe declarations that we've already seen before if they match the
+  // `property`, `value` and `important` information.
+  {
+    for (let nodes of dedupeDeclarationsInNodes) {
+      let seen = new Set()
+      for (let i = nodes.length - 1; i >= 0; --i) {
+        let node = nodes[i]
+        if (node.kind !== 'declaration') continue
+
+        let id = `${node.property}\0${node.value}\0${node.important}`
+
+        if (seen.has(id)) nodes.splice(i, 1)
+        else seen.add(id)
+      }
+    }
+  }
+
+  return result
+
+  function emit(node: AstNode) {
+    // Existing nodes are available, emit into those nodes
+    if (nodes) {
+      // Optimization: track used declarations in the current node.
+      if (node.kind === 'declaration') {
+        if (seenDeclarationProperties.has(node.property)) {
+          dedupeDeclarationsInNodes.add(nodes)
+        } else {
+          seenDeclarationProperties.add(node.property)
+        }
+      }
+
+      nodes.push(node)
+      return
+    }
+
+    // Nothing available, setup a fresh node
+    {
+      // There are no parent rules or at-rules available, which means that we
+      // can emit the node as-is.
+      if (selectorStack.length === 0 && atRuleStack.length === 0) {
+        let target = result
+        let lastNode = target[target.length - 1]
+
+        // Optimization: when the current and last node are the same, ignore the
+        // new node entirely otherwise we will get unnecessary duplicate
+        // results.
+        //
+        // We only care about at-rules with no body because some of them (such
+        // as `@charset` or `@layer`) need to be emitted. A normal rule that's
+        // empty doesn't need to be emitted. At-rules _with_ a body (such as
+        // `@font-face` or `@keyframes`) can share the same prelude while
+        // containing different bodies, so they must all be emitted.
+        if (
+          lastNode &&
+          lastNode.kind === 'at-rule' &&
+          node.kind === 'at-rule' &&
+          lastNode.nodes.length === 0 &&
+          node.nodes.length === 0 &&
+          lastNode.name === node.name &&
+          lastNode.params === node.params
+        ) {
+          return
+        }
+
+        result.push(node)
+        return
+      }
+
+      // Track the new "parent" nodes
+      {
+        nodes = [node]
+
+        // Clear out seen declarations from the previous work in progress nodes
+        seenDeclarationProperties.clear()
+
+        // Track new declaration
+        if (node.kind === 'declaration') {
+          seenDeclarationProperties.add(node.property)
+        }
+      }
+
+      // Track the new root node that we build up to store in the final AST
+      let root = null as AstNode | null
+
+      let target = result
+      let atRuleOffset = 0
+
+      // Optimization: merge adjacent at-rules
+      //
+      // Figure out whether we can push our new node into a previous node that
+      // was already emitted.
+      //
+      // We have to make sure that the order stays the same, so therefore we
+      // only ever have to look at the last node that was emitted.
+      {
+        let lastNode = target[target.length - 1]
+        if (lastNode && lastNode.kind === 'at-rule') {
+          for (let i = 0; i < atRuleStack.length; i++) {
+            let atRule = atRuleStack[i]
+            if (!lastNode) break
+            if (lastNode.kind !== 'at-rule') break
+            if (lastNode.name !== atRule[0]) break
+            if (lastNode.params !== atRule[1]) break
+
+            atRuleOffset++
+            target = lastNode.nodes
+            lastNode = lastNode.nodes[lastNode.nodes.length - 1]
+          }
+        }
+      }
+
+      // Build up the rule
+      if (selectorStack.length > 0) {
+        let [selector, src, dst] = selectorStack[selectorStack.length - 1]
+
+        // Optimization: merge adjacent rules with the same selector
+        //
+        // Figure out whether we can push into an existing rule.
+        //
+        // If we have some at-rules that we have to keep into account, then we
+        // definitely can't.
+        if (atRuleStack.length - atRuleOffset <= 0) {
+          let lastNode = target[target.length - 1]
+          if (lastNode && lastNode.kind === 'rule' && lastNode.selector === selector) {
+            lastNode.nodes.push(...nodes)
+
+            // Ensure that our current nodes points to the nodes of the
+            // `lastNode`, otherwise we will lose information.
+            nodes = lastNode.nodes
+
+            // We appended a group that could contain declarations already in the
+            // existing rule, so let the final dedupe pass handle it once.
+            //
+            // Note: we could loop over _all_ previous nodes to figure out if we
+            // really want to dedupe this. But this could result in a bunch of
+            // duplicate work if we have `n` nodes that we want to merge
+            // together.
+            dedupeDeclarationsInNodes.add(nodes)
+
+            // We know that we don't have to handle any more at-rules, so we can
+            // bail early since we just merged the nodes with the same selector.
+            return
+          }
+        }
+
+        // Can't push into existing node, create a new node
+        root = rule(selector, nodes)
+        if (src || dst) Object.assign(root, { src, dst })
+      }
+
+      // Wrap in at-rules, if we can push into an existing node then we can
+      // ignore `offset` amount of nodes since the `root`/`nodes` will already
+      // point to a nested node.
+      for (let i = atRuleStack.length - 1; i >= atRuleOffset; --i) {
+        let [name, params, src, dst] = atRuleStack[i]
+
+        root = atRule(name, params, root ? [root] : nodes)
+        if (src || dst) Object.assign(root, { src, dst })
+      }
+
+      // Track the root node in the AST
+      if (root) {
+        target.push(root)
+      }
+
+      // We didn't build up any new root, so we can move our node directly into
+      // the target. This can happen when we emit a node that is not a
+      // declaration or a comment.
+      else {
+        target.push(...nodes)
+      }
+    }
+  }
+
+  // Substitutes the `&` selector with the parent selector with `:is(…)` semantics.
+  //
+  // If the `&` is not found, we will prepend it using a descendant combinator.
+  // E.g.: `& ${selector}` → `${parentSelector} ${selector}`
+  //
+  // In some situations we can get rid of the `:is(…)` wrapper, but only if it's safe to do so.
+  function substituteNestingSelector(selector: string, parentSelector: string): string {
+    // Slow path: we need to replace the `&` with the parent selector. A simple
+    // `replaceAll(…)` won't work because a `&` could be escaped, or could be
+    // part of an attribute selector.
+    //
+    // Much safer to parse the selector and replace the `&` that way
+    if (selector.includes('&')) {
+      let ast = SelectorParser.parse(selector)
+      let changed = false
+      walk(ast, {
+        enter(node, ctx) {
+          if (node.kind !== 'selector' || node.value !== '&') return
+
+          changed = true
+
+          // Safest option: use `is(…)` semantics when substituting `&` for the
+          // parent selector.
+          node.value = `:is(${parentSelector})`
+
+          // We should always have a parent, so this shouldn't happen
+          if (ctx.parent === null) return
+
+          // Optimizations:
+          let parentAst = parseSelectorCache.get(parentSelector)
+
+          // 1. If we're dealing with multiple selectors, then we know that the
+          //    `:is(…)` needs to stay. Nothing to optimize.
+          if (parentAst.length === 1 && parentAst[0].kind === 'list') {
+            return // Keep `:is(…)` semantics
+          }
+
+          // 2. We know that `&` is standalone when it's inside of a complex
+          //    selector. E.g. `[before] & [after]`
+          if (ctx.parent.kind === 'complex') {
+            // `& [after]`
+            //
+            // `:is(…)` semantics are not required, because these are equivalent:
+            //
+            // - `:is(div) [after]`       → `div [after]`
+            // - `:is(.x) [after]`        → `.x [after]`
+            // - `:is([before]) [after]`  → `[before] [after]`
+            // - `:is(.a > .b) [after]`   → `.a > .b [after]`
+            if (ctx.index === 0) {
+              node.value = parentSelector
+              return
+            }
+
+            // `[before] &`
+            //
+            // `:is(…)` semantics are required if we're dealing with a complex
+            // parent selector. Otherwise the meaning of the selector could
+            // change:
+            //
+            // - `[before] :is(div)`      → `[before] div`
+            // - `[before] :is(.x)`       → `[before] .x`
+            // - `[before] :is([after])`  → `[before] [after]`
+            // - `[before] :is(.a > .b)`  → `[before] :is(.a > .b)` (!)
+            else if (ctx.index === ctx.siblings.length - 1) {
+              if (parentAst[0].kind === 'complex') {
+                return // Keep `:is(…)` semantics
+              }
+
+              node.value = parentSelector
+              return
+            }
+
+            // `[before] & [after]`
+            //
+            // `:is(…)` semantics are required if we're dealing with a complex
+            // parent selector. Otherwise the meaning of the selector could
+            // change:
+            //
+            // - `[before] :is(div) [after]`      → `[before] div [after]`
+            // - `[before] :is(.x) [after]`       → `[before] .x [after]`
+            // - `[before] :is(.a > .b) [after]`  → `[before] :is(.a > .b) [after]` (!)
+            else {
+              if (parentAst[0].kind === 'complex') {
+                return // Keep `:is(…)` semantics
+              }
+
+              node.value = parentSelector
+              return
+            }
+          }
+
+          // 3. We know that `&` is attached to some other selector when it's
+          //    inside of a compound selector.
+          //
+          //    E.g. `[before]&[after]`
+          //
+          //    We have to be careful that our parent, when it's part of a complex
+          //    selector, that the same rules apply
+          //
+          //    E.g.: `[before] &[after]`
+          //                    ^          current node
+          //                    ^^^^^^^^   compound selector
+          //           ^^^^^^^^^^^^^^^^^   complex selector
+          //
+          else if (ctx.parent.kind === 'compound') {
+            if (parentAst[0].kind === 'complex') {
+              let path = ctx.path()
+              let grandParent = path[path.length - 2]
+
+              // When our compound parent is part of a complex selector, and it's
+              // not the very first node, then we can't safely get rid of the
+              // `:is(…)` if the last selector is a complex selector as well,
+              // unless the `&` maps to a single selector or compound selector.
+              //
+              // ```css
+              // .foo .bar {            /* Complex selector */
+              //   .system &:focus {    /* Complex selector + compound selecto*/
+              //     --x: 1;
+              //   }
+              // }
+              // .foo:hover {           /* Compound selector */
+              //   .system &:focus {    /* Complex selector + compound selector */
+              //     --x: 2;
+              //   }
+              // }
+              // ```
+              //
+              // ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
+              //
+              // ```css
+              // .system :is(.foo .bar):focus { /* Cannot drop the `:is(…)`, otherwise `.system` and `.foo` can be swapped in the DOM */
+              //   --x: 1;
+              // }
+              // .system .foo:hover:focus {
+              //   --x: 2;
+              // }
+              // ```
+              if (
+                grandParent &&
+                grandParent.kind === 'complex' &&
+                grandParent.nodes[0] !== ctx.parent
+              ) {
+                return // Keep `:is(…)` semantics
+              }
+            }
+
+            // `&*` and `&div` are invalid CSS so these should stay invalid. They
+            // should be written as `*&` and `div&` instead.
+            if (
+              ctx.siblings
+                .slice(ctx.index + 1)
+                .some(
+                  (sibling) =>
+                    SelectorParser.isUniversalSelector(sibling) ||
+                    SelectorParser.isTypeSelector(sibling),
+                )
+            ) {
+              return // Keep `:is(…)` semantics
+            }
+
+            // `&[after]`
+            //
+            // `:is(…)` semantics are not required, because these are equivalent:
+            //
+            // - `:is(div)[after]`       → `div[after]`
+            // - `:is(.x)[after]`        → `.x[after]`
+            // - `:is([before])[after]`  → `[before][after]`
+            // - `:is(.a > .b)[after]`   → `.a > .b[after]`
+            if (ctx.index === 0) {
+              node.value = parentSelector
+              return
+            }
+
+            // `[before]&`
+            //
+            // `:is(…)` semantics are required if we're dealing with a
+            //
+            // - complex parent selector, to prevent changing the meaning of the selector
+            // - a universal selector, because `*` needs to be first
+            // - a type selector, because `div` needs to be first
+            //
+            // - `[before]:is(div)`      → `[before]:is(div)` (!)
+            // - `[before]:is(*)`        → `[before]:is(*)` (!)
+            // - `[before]:is(.a > .b)`  → `[before]:is(.a > .b)` (!)
+            // - `[before]:is(.x)`       → `[before].x`
+            else if (ctx.index === ctx.siblings.length - 1) {
+              if (
+                parentAst[0].kind === 'complex' ||
+                SelectorParser.isUniversalSelector(parentAst[0]) ||
+                SelectorParser.isTypeSelector(parentAst[0])
+              ) {
+                return // Keep `:is(…)` semantics
+              }
+
+              node.value = parentSelector
+              return
+            }
+
+            // `[before]&[after]`
+            //
+            // `:is(…)` semantics are required if we're dealing with a
+            //
+            // - complex parent selector, to prevent changing the meaning of the selector
+            // - a universal selector, because `*` needs to be first
+            // - a type selector, because `div` needs to be first
+            //
+            // - `[before]:is(div)[after]`      → `[before]:is(div)[after]` (!)
+            // - `[before]:is(*)[after]`        → `[before]:is(*)[after]` (!)
+            // - `[before]:is(.a > .b)[after]`  → `[before]:is(.a > .b)[after]` (!)
+            // - `[before]:is(.x)[after]`       → `[before].x[after]`
+            else {
+              if (
+                parentAst[0].kind === 'complex' ||
+                SelectorParser.isUniversalSelector(parentAst[0]) ||
+                SelectorParser.isTypeSelector(parentAst[0])
+              ) {
+                return // Keep `:is(…)` semantics
+              }
+
+              node.value = parentSelector
+              return
+            }
+          }
+
+          // 4. When the current node is a function argument (e.g. `:not(&))`,
+          //    then we can drop the `:is(…)` entirely.
+          //
+          //    The only exception is when the parent has multiple selectors
+          //    because then we would introduce multiple arguments. Multiple
+          //    selectors are already handled.
+          else if (ctx.parent.kind === 'function') {
+            node.value = parentSelector
+            return
+          }
+        },
+        exit(node, ctx) {
+          // Optimization: We can remove the universal selector `*` if they are
+          // part of a compound selector. E.g.:
+          //
+          // - `*:hover` → `:hover`
+          // - `*[attribute]` → `[attribute]`
+          //
+          // Except when the `*` is a namespace, e.g.: `*|div`, because `*|div`
+          // (any namespace) and `|div` (no namespace) have different meanings.
+          if (
+            ctx.index === 0 &&
+            ctx.siblings.length > 1 &&
+            ctx.parent?.kind === 'compound' &&
+            SelectorParser.isUniversalSelector(node)
+          ) {
+            let next = ctx.siblings[1]
+            if (next.kind === 'selector' && next.value.charCodeAt(0) === PIPE) {
+              return
+            }
+            return WalkAction.ReplaceSkip([])
+          }
+        },
+      })
+
+      if (changed) return SelectorParser.toCss(ast)
+    }
+
+    // Fast path: we know there isn't an `&` so we can prepend the parent
+    // selector immediately.
+    let parentAst = parseSelectorCache.get(parentSelector)
+    return `${parentAst.length === 1 && parentAst[0].kind === 'list' ? `:is(${parentSelector})` : parentSelector} ${selector}`
+  }
+}
+
+// A set of at-rules that can be hoisted to the top without any repercussions.
+// Typically at-rules that rely on the environment, not parent information and
+// contain other rules/declarations.
+const HOISTABLE_AT_RULES = new Set([
+  '@container',
+  '@layer',
+  '@media',
+  '@page',
+  '@scope',
+  '@starting-style',
+  '@supports',
+  '@view-transition',
+])
+
+// A set of at-rules that can be dropped if they don't contain any nodes. We
+// don't have the distinction between an at-rule with no body, or an at-rule
+// with a body that is empty right now.
+const DROPPABLE_IF_EMPTY_AT_RULES = new Set([
+  '@container',
+  '@media',
+  '@page',
+  '@scope',
+  '@starting-style',
+  '@supports',
+  '@view-transition',
+])
+
+export function toCss(ast: AstNode[], track?: boolean) {
+  let pos = 0
+
+  let source: Source = {
+    file: null,
+    code: '',
+  }
+
   function stringify(node: AstNode, depth = 0): string {
     let css = ''
     let indent = '  '.repeat(depth)
@@ -349,15 +1651,70 @@ export function toCss(ast: AstNode[]) {
     // Declaration
     if (node.kind === 'declaration') {
       css += `${indent}${node.property}: ${node.value}${node.important ? ' !important' : ''};\n`
+
+      if (track) {
+        // indent
+        pos += indent.length
+
+        // node.property
+        let start = pos
+        pos += node.property.length
+
+        // `: `
+        pos += 2
+
+        // node.value
+        pos += node.value?.length ?? 0
+
+        // !important
+        if (node.important) {
+          pos += 11
+        }
+
+        let end = pos
+
+        // `;\n`
+        pos += 2
+
+        node.dst = [source, start, end]
+      }
     }
 
     // Rule
     else if (node.kind === 'rule') {
       css += `${indent}${node.selector} {\n`
+
+      if (track) {
+        // indent
+        pos += indent.length
+
+        // node.selector
+        let start = pos
+        pos += node.selector.length
+
+        // ` `
+        pos += 1
+
+        let end = pos
+        node.dst = [source, start, end]
+
+        // `{\n`
+        pos += 2
+      }
+
       for (let child of node.nodes) {
         css += stringify(child, depth + 1)
       }
+
       css += `${indent}}\n`
+
+      if (track) {
+        // indent
+        pos += indent.length
+
+        // `}\n`
+        pos += 2
+      }
     }
 
     // AtRule
@@ -370,22 +1727,97 @@ export function toCss(ast: AstNode[]) {
       // @layer base, components, utilities;
       // ```
       if (node.nodes.length === 0) {
-        return `${indent}${node.name} ${node.params};\n`
+        let css = `${indent}${node.name} ${node.params};\n`
+
+        if (track) {
+          // indent
+          pos += indent.length
+
+          // node.name
+          let start = pos
+          pos += node.name.length
+
+          // ` `
+          pos += 1
+
+          // node.params
+          pos += node.params.length
+          let end = pos
+
+          // `;\n`
+          pos += 2
+
+          node.dst = [source, start, end]
+        }
+
+        return css
       }
 
       css += `${indent}${node.name}${node.params ? ` ${node.params} ` : ' '}{\n`
+
+      if (track) {
+        // indent
+        pos += indent.length
+
+        // node.name
+        let start = pos
+        pos += node.name.length
+
+        if (node.params) {
+          // ` `
+          pos += 1
+
+          // node.params
+          pos += node.params.length
+        }
+
+        // ` `
+        pos += 1
+
+        let end = pos
+        node.dst = [source, start, end]
+
+        // `{\n`
+        pos += 2
+      }
+
       for (let child of node.nodes) {
         css += stringify(child, depth + 1)
       }
+
       css += `${indent}}\n`
+
+      if (track) {
+        // indent
+        pos += indent.length
+
+        // `}\n`
+        pos += 2
+      }
     }
 
     // Comment
     else if (node.kind === 'comment') {
       css += `${indent}/*${node.value}*/\n`
+
+      if (track) {
+        // indent
+        pos += indent.length
+
+        // The comment itself. We do this instead of just the inside because
+        // it seems more useful to have the entire comment span tracked.
+        let start = pos
+        pos += 2 + node.value.length + 2
+        let end = pos
+
+        node.dst = [source, start, end]
+
+        // `\n`
+        pos += 1
+      }
     }
 
-    // These should've been handled already by `prepareAstForPrinting` which
+    // These should've been handled already by `optimizeAst` which
     // means we can safely ignore them here. We return an empty string
     // immediately to signal that something went wrong.
     else if (node.kind === 'context' || node.kind === 'at-root') {
@@ -403,11 +1835,56 @@ export function toCss(ast: AstNode[]) {
   let css = ''
 
   for (let node of ast) {
-    let result = stringify(node)
-    if (result !== '') {
-      css += result
-    }
+    css += stringify(node, 0)
   }
 
+  source.code = css
+
   return css
 }
+
+function findNode(ast: AstNode[], fn: (node: AstNode) => boolean): AstNode[] | null {
+  let foundPath: AstNode[] = []
+  walk(ast, (node, ctx) => {
+    if (fn(node)) {
+      foundPath = ctx.path()
+      foundPath.push(node)
+      return WalkAction.Stop
+    }
+  })
+  return foundPath
+}
+
+// Find out if a variable is either used directly or if any of the variables that depend on it are
+// used
+function isVariableUsed(
+  variable: string,
+  theme: Theme,
+  variableDependencies: Map<string, Set<string>>,
+  alreadySeenVariables: Set<string> = new Set(),
+): boolean {
+  // Break recursions when visiting a variable twice
+  if (alreadySeenVariables.has(variable)) {
+    return true
+  } else {
+    alreadySeenVariables.add(variable)
+  }
+
+  let options = theme.getOptions(variable)
+  if (options & (ThemeOptions.STATIC | ThemeOptions.USED)) {
+    return true
+  } else {
+    let dependencies = variableDependencies.get(variable) ?? []
+    for (let dependency of dependencies) {
+      if (isVariableUsed(dependency, theme, variableDependencies, alreadySeenVariables)) {
+        return true
+      }
+    }
+  }
+
+  return false
+}
+
+function extractKeyframeNames(value: string): string[] {
+  return value.split(/[\s,]+/)
+}
diff --git a/packages/tailwindcss/src/at-import.test.ts b/packages/tailwindcss/src/at-import.test.ts
index dafb8af07..a19123105 100644
--- a/packages/tailwindcss/src/at-import.test.ts
+++ b/packages/tailwindcss/src/at-import.test.ts
@@ -1,37 +1,13 @@
 import dedent from 'dedent'
 import { expect, test, vi } from 'vitest'
-import type { Plugin } from './compat/plugin-api'
 import { compile, type Config } from './index'
 import plugin from './plugin'
-import { optimizeCss } from './test-utils/run'
+import { compileCss, run } from './test-utils/run'
 
 const css = dedent
 
-async function run(
-  css: string,
-  {
-    loadStylesheet = () => Promise.reject(new Error('Unexpected stylesheet')),
-    loadModule = () => Promise.reject(new Error('Unexpected module')),
-    candidates = [],
-    optimize = true,
-  }: {
-    loadStylesheet?: (id: string, base: string) => Promise<{ content: string; base: string }>
-    loadModule?: (
-      id: string,
-      base: string,
-      resourceHint: 'plugin' | 'config',
-    ) => Promise<{ module: Config | Plugin; base: string }>
-    candidates?: string[]
-    optimize?: boolean
-  },
-) {
-  let compiler = await compile(css, { base: '/root', loadStylesheet, loadModule })
-  let result = compiler.build(candidates)
-  return optimize ? optimizeCss(result) : result
-}
-
 test('can resolve relative @imports', async () => {
-  let loadStylesheet = async (id: string, base: string) => {
+  async function loadStylesheet(id: string, base: string) {
     expect(base).toBe('/root')
     expect(id).toBe('./foo/bar.css')
     return {
@@ -41,18 +17,20 @@ test('can resolve relative @imports', async () => {
         }
       `,
       base: '/root/foo',
+      path: '',
     }
   }
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import './foo/bar.css';
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    ".foo {
+  ).toMatchInlineSnapshot(`
+    "
+    .foo {
       color: red;
     }
     "
@@ -60,13 +38,14 @@ test('can resolve relative @imports', async () => {
 })
 
 test('can recursively resolve relative @imports', async () => {
-  let loadStylesheet = async (id: string, base: string) => {
+  async function loadStylesheet(id: string, base: string) {
     if (base === '/root' && id === './foo/bar.css') {
       return {
         content: css`
           @import './bar/baz.css';
         `,
         base: '/root/foo',
+        path: '',
       }
     } else if (base === '/root/foo' && id === './bar/baz.css') {
       return {
@@ -76,21 +55,23 @@ test('can recursively resolve relative @imports', async () => {
           }
         `,
         base: '/root/foo/bar',
+        path: '',
       }
     }
 
     throw new Error(`Unexpected import: ${id}`)
   }
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import './foo/bar.css';
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    ".baz {
+  ).toMatchInlineSnapshot(`
+    "
+    .baz {
       color: #00f;
     }
     "
@@ -102,52 +83,56 @@ let exampleCSS = css`
     color: red;
   }
 `
-let loadStylesheet = async (id: string) => {
+async function loadStylesheet(id: string) {
   if (!id.endsWith('example.css')) throw new Error('Unexpected import: ' + id)
   return {
     content: exampleCSS,
     base: '/root',
+    path: '',
   }
 }
 
 test('extracts path from @import nodes', async () => {
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import 'example.css';
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    "a {
+  ).toMatchInlineSnapshot(`
+    "
+    a {
       color: red;
     }
     "
   `)
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import './example.css';
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    "a {
+  ).toMatchInlineSnapshot(`
+    "
+    a {
       color: red;
     }
     "
   `)
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import '/example.css';
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    "a {
+  ).toMatchInlineSnapshot(`
+    "
+    a {
       color: red;
     }
     "
@@ -155,71 +140,96 @@ test('extracts path from @import nodes', async () => {
 })
 
 test('url() imports are passed-through', async () => {
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import url('example.css');
       `,
-      { loadStylesheet: () => Promise.reject(new Error('Unexpected stylesheet')), optimize: false },
+      { base: '/root', loadStylesheet: () => Promise.reject(new Error('Unexpected stylesheet')) },
     ),
-  ).resolves.toMatchInlineSnapshot(`"@import url('example.css');"`)
+  ).toMatchInlineSnapshot(`
+    "
+    @import "example.css";
+    "
+  `)
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import url('./example.css');
       `,
-      { loadStylesheet: () => Promise.reject(new Error('Unexpected stylesheet')), optimize: false },
+      { base: '/root', loadStylesheet: () => Promise.reject(new Error('Unexpected stylesheet')) },
     ),
-  ).resolves.toMatchInlineSnapshot(`"@import url('./example.css');"`)
+  ).toMatchInlineSnapshot(`
+    "
+    @import "./example.css";
+    "
+  `)
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import url('/example.css');
       `,
-      { loadStylesheet: () => Promise.reject(new Error('Unexpected stylesheet')), optimize: false },
+      { base: '/root', loadStylesheet: () => Promise.reject(new Error('Unexpected stylesheet')) },
     ),
-  ).resolves.toMatchInlineSnapshot(`"@import url('/example.css');"`)
+  ).toMatchInlineSnapshot(`
+    "
+    @import "/example.css";
+    "
+  `)
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import url(example.css);
       `,
-      { loadStylesheet: () => Promise.reject(new Error('Unexpected stylesheet')), optimize: false },
+      { base: '/root', loadStylesheet: () => Promise.reject(new Error('Unexpected stylesheet')) },
     ),
-  ).resolves.toMatchInlineSnapshot(`"@import url(example.css);"`)
+  ).toMatchInlineSnapshot(`
+    "
+    @import "example.css";
+    "
+  `)
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import url(./example.css);
       `,
-      { loadStylesheet: () => Promise.reject(new Error('Unexpected stylesheet')), optimize: false },
+      { base: '/root', loadStylesheet: () => Promise.reject(new Error('Unexpected stylesheet')) },
     ),
-  ).resolves.toMatchInlineSnapshot(`"@import url(./example.css);"`)
+  ).toMatchInlineSnapshot(`
+    "
+    @import "./example.css";
+    "
+  `)
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import url(/example.css);
       `,
-      { loadStylesheet: () => Promise.reject(new Error('Unexpected stylesheet')), optimize: false },
+      { base: '/root', loadStylesheet: () => Promise.reject(new Error('Unexpected stylesheet')) },
     ),
-  ).resolves.toMatchInlineSnapshot(`"@import url(/example.css);"`)
+  ).toMatchInlineSnapshot(`
+    "
+    @import "/example.css";
+    "
+  `)
 })
 
 test('handles case-insensitive @import directive', async () => {
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import 'example.css';
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    "a {
+  ).toMatchInlineSnapshot(`
+    "
+    a {
       color: red;
     }
     "
@@ -227,15 +237,16 @@ test('handles case-insensitive @import directive', async () => {
 })
 
 test('@media', async () => {
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import 'example.css' print;
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    "@media print {
+  ).toMatchInlineSnapshot(`
+    "
+    @media print {
       a {
         color: red;
       }
@@ -243,15 +254,16 @@ test('@media', async () => {
     "
   `)
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import 'example.css' print, screen;
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    "@media print, screen {
+  ).toMatchInlineSnapshot(`
+    "
+    @media print, screen {
       a {
         color: red;
       }
@@ -259,15 +271,16 @@ test('@media', async () => {
     "
   `)
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import 'example.css' screen and (orientation: landscape);
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    "@media screen and (orientation: landscape) {
+  ).toMatchInlineSnapshot(`
+    "
+    @media screen and (orientation: landscape) {
       a {
         color: red;
       }
@@ -275,15 +288,16 @@ test('@media', async () => {
     "
   `)
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import 'example.css' foo(bar);
       `,
-      { loadStylesheet, optimize: false },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    "@media foo(bar) {
+  ).toMatchInlineSnapshot(`
+    "
+    @media foo(bar) {
       a {
         color: red;
       }
@@ -293,15 +307,16 @@ test('@media', async () => {
 })
 
 test('@supports', async () => {
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import 'example.css' supports(display: grid);
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    "@supports (display: grid) {
+  ).toMatchInlineSnapshot(`
+    "
+    @supports (display: grid) {
       a {
         color: red;
       }
@@ -309,16 +324,17 @@ test('@supports', async () => {
     "
   `)
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import 'example.css' supports(display: grid) screen and (max-width: 400px);
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    "@supports (display: grid) {
-      @media screen and (width <= 400px) {
+  ).toMatchInlineSnapshot(`
+    "
+    @supports (display: grid) {
+      @media screen and (max-width: 400px) {
         a {
           color: red;
         }
@@ -327,17 +343,18 @@ test('@supports', async () => {
     "
   `)
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import 'example.css' supports((not (display: grid)) and (display: flex)) screen and
           (max-width: 400px);
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    "@supports (not (display: grid)) and (display: flex) {
-      @media screen and (width <= 400px) {
+  ).toMatchInlineSnapshot(`
+    "
+    @supports (not (display: grid)) and (display: flex) {
+      @media screen and (max-width: 400px) {
         a {
           color: red;
         }
@@ -346,17 +363,18 @@ test('@supports', async () => {
     "
   `)
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       // prettier-ignore
       css`
         @import 'example.css'
         supports((selector(h2 > p)) and (font-tech(color-COLRv1)));
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    "@supports selector(h2 > p) and font-tech(color-COLRv1) {
+  ).toMatchInlineSnapshot(`
+    "
+    @supports selector(h2 > p) and font-tech(color-COLRv1) {
       a {
         color: red;
       }
@@ -366,15 +384,16 @@ test('@supports', async () => {
 })
 
 test('@layer', async () => {
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import 'example.css' layer(utilities);
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    "@layer utilities {
+  ).toMatchInlineSnapshot(`
+    "
+    @layer utilities {
       a {
         color: red;
       }
@@ -382,15 +401,16 @@ test('@layer', async () => {
     "
   `)
 
-  await expect(
-    run(
+  expect(
+    await compileCss(
       css`
         @import 'example.css' layer();
       `,
-      { loadStylesheet },
+      { base: '/root', loadStylesheet },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    "@layer {
+  ).toMatchInlineSnapshot(`
+    "
+    @layer {
       a {
         color: red;
       }
@@ -401,12 +421,14 @@ test('@layer', async () => {
 
 test('supports theme(reference) imports', async () => {
   expect(
-    run(
+    await run(
+      ['text-red-500'],
       css`
         @tailwind utilities;
         @import 'example.css' theme(reference);
       `,
       {
+        base: '/root',
         loadStylesheet: () =>
           Promise.resolve({
             content: css`
@@ -415,40 +437,41 @@ test('supports theme(reference) imports', async () => {
               }
             `,
             base: '',
+            path: '',
           }),
-        candidates: ['text-red-500'],
       },
     ),
-  ).resolves.toMatchInlineSnapshot(`
-    ".text-red-500 {
-      color: var(--color-red-500);
+  ).toMatchInlineSnapshot(`
+    "
+    .text-red-500 {
+      color: var(--color-red-500, red);
     }
     "
   `)
 })
 
 test('updates the base when loading modules inside nested files', async () => {
-  let loadStylesheet = () =>
-    Promise.resolve({
+  async function loadStylesheet() {
+    return {
       content: css`
         @config './nested-config.js';
         @plugin './nested-plugin.js';
       `,
       base: '/root/foo',
-    })
-  let loadModule = vi.fn().mockResolvedValue({ base: '', module: () => {} })
+      path: '',
+    }
+  }
+  using loadModule = vi.fn().mockResolvedValue({ base: '', path: '', module: () => {} })
 
   expect(
-    (
-      await run(
-        css`
-          @import './foo/bar.css';
-          @config './root-config.js';
-          @plugin './root-plugin.js';
-        `,
-        { loadStylesheet, loadModule },
-      )
-    ).trim(),
+    await compileCss(
+      css`
+        @import './foo/bar.css';
+        @config './root-config.js';
+        @plugin './root-plugin.js';
+      `,
+      { base: '/root', loadStylesheet, loadModule },
+    ),
   ).toBe('')
 
   expect(loadModule).toHaveBeenNthCalledWith(1, './nested-config.js', '/root/foo', 'config')
@@ -458,13 +481,15 @@ test('updates the base when loading modules inside nested files', async () => {
 })
 
 test('emits the right base for @source directives inside nested files', async () => {
-  let loadStylesheet = () =>
-    Promise.resolve({
+  async function loadStylesheet() {
+    return {
       content: css`
         @source './nested/**/*.css';
       `,
       base: '/root/foo',
-    })
+      path: '',
+    }
+  }
 
   let compiler = await compile(
     css`
@@ -474,22 +499,25 @@ test('emits the right base for @source directives inside nested files', async ()
     { base: '/root', loadStylesheet },
   )
 
-  expect(compiler.globs).toEqual([
-    { pattern: './nested/**/*.css', base: '/root/foo' },
-    { pattern: './root/**/*.css', base: '/root' },
+  expect(compiler.sources).toEqual([
+    { pattern: './nested/**/*.css', base: '/root/foo', negated: false },
+    { pattern: './root/**/*.css', base: '/root', negated: false },
   ])
 })
 
 test('emits the right base for @source found inside JS configs and plugins from nested imports', async () => {
-  let loadStylesheet = () =>
-    Promise.resolve({
+  async function loadStylesheet() {
+    return {
       content: css`
         @config './nested-config.js';
         @plugin './nested-plugin.js';
       `,
       base: '/root/foo',
-    })
-  let loadModule = vi.fn().mockImplementation((id: string) => {
+      path: '',
+    }
+  }
+
+  using loadModule = vi.fn().mockImplementation((id: string) => {
     let base = id.includes('nested') ? '/root/foo' : '/root'
     if (id.includes('config')) {
       let glob = id.includes('nested') ? './nested-config/*.html' : './root-config/*.html'
@@ -502,12 +530,14 @@ test('emits the right base for @source found inside JS configs and plugins from
           plugins: [plugin(() => {}, { content: [pluginGlob] })],
         } satisfies Config,
         base: base + '-config',
+        path: '',
       }
     } else {
       let glob = id.includes('nested') ? './nested-plugin/*.html' : './root-plugin/*.html'
       return {
         module: plugin(() => {}, { content: [glob] }),
         base: base + '-plugin',
+        path: '',
       }
     }
   })
@@ -521,35 +551,103 @@ test('emits the right base for @source found inside JS configs and plugins from
     { base: '/root', loadStylesheet, loadModule },
   )
 
-  expect(compiler.globs).toEqual([
-    { pattern: './nested-plugin/*.html', base: '/root/foo-plugin' },
-    { pattern: './root-plugin/*.html', base: '/root-plugin' },
+  expect(compiler.sources).toEqual([
+    { pattern: './nested-plugin/*.html', base: '/root/foo-plugin', negated: false },
+    { pattern: './root-plugin/*.html', base: '/root-plugin', negated: false },
 
-    { pattern: './nested-config-plugin/*.html', base: '/root/foo-config' },
-    { pattern: './nested-config/*.html', base: '/root/foo-config' },
+    { pattern: './nested-config-plugin/*.html', base: '/root/foo-config', negated: false },
+    { pattern: './nested-config/*.html', base: '/root/foo-config', negated: false },
 
-    { pattern: './root-config-plugin/*.html', base: '/root-config' },
-    { pattern: './root-config/*.html', base: '/root-config' },
+    { pattern: './root-config-plugin/*.html', base: '/root-config', negated: false },
+    { pattern: './root-config/*.html', base: '/root-config', negated: false },
   ])
 })
 
 test('it crashes when inside a cycle', async () => {
-  let loadStylesheet = () =>
-    Promise.resolve({
-      content: css`
-        @import 'foo.css';
-      `,
-      base: '/root',
-    })
+  let input = css`
+    @import 'foo.css';
+  `
 
-  expect(
-    run(
-      css`
-        @import 'foo.css';
-      `,
-      { loadStylesheet },
-    ),
-  ).rejects.toMatchInlineSnapshot(
+  async function loadStylesheet() {
+    return {
+      content: input,
+      base: '/root',
+      path: '',
+    }
+  }
+
+  await expect(compileCss(input, { base: '/root', loadStylesheet })).rejects.toMatchInlineSnapshot(
     `[Error: Exceeded maximum recursion depth while resolving \`foo.css\` in \`/root\`)]`,
   )
 })
+
+test('resolves @reference as `@import "…" reference`', async () => {
+  async function loadStylesheet(id: string, base: string) {
+    expect(base).toBe('/root')
+    expect(id).toBe('./foo/bar.css')
+    return {
+      content: css`
+        @theme {
+          --color-red-500: red;
+        }
+        .foo {
+          color: red;
+        }
+      `,
+      base: '/root/foo',
+      path: '',
+    }
+  }
+
+  expect(
+    await run(
+      ['text-red-500'],
+      css`
+        @reference './foo/bar.css';
+        @tailwind utilities;
+      `,
+      { base: '/root', loadStylesheet },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .text-red-500 {
+      color: var(--color-red-500, red);
+    }
+    "
+  `)
+})
+
+test('resolves `@variant` used as `@custom-variant` inside `@reference`', async () => {
+  async function loadStylesheet(id: string, base: string) {
+    expect(base).toBe('/root')
+    expect(id).toBe('./foo/bar.css')
+    return {
+      content: css`
+        @variant dark {
+          &:where([data-theme='dark'] *) {
+            @slot;
+          }
+        }
+      `,
+      base: '/root/foo',
+      path: '',
+    }
+  }
+
+  expect(
+    await run(
+      ['dark:flex'],
+      css`
+        @reference './foo/bar.css';
+        @tailwind utilities;
+      `,
+      { base: '/root', loadStylesheet },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .dark\\:flex:where([data-theme="dark"] *) {
+      display: flex;
+    }
+    "
+  `)
+})
diff --git a/packages/tailwindcss/src/at-import.ts b/packages/tailwindcss/src/at-import.ts
index 4a585202d..ba7172f8e 100644
--- a/packages/tailwindcss/src/at-import.ts
+++ b/packages/tailwindcss/src/at-import.ts
@@ -1,23 +1,35 @@
 import { Features } from '.'
-import { atRule, context, walk, WalkAction, type AstNode } from './ast'
+import { atRule, context, type AstNode } from './ast'
 import * as CSS from './css-parser'
 import * as ValueParser from './value-parser'
+import { walk, WalkAction } from './walk'
 
-type LoadStylesheet = (id: string, basedir: string) => Promise<{ base: string; content: string }>
+type LoadStylesheet = (
+  id: string,
+  basedir: string,
+) => Promise<{
+  path: string
+  base: string
+  content: string
+}>
 
 export async function substituteAtImports(
   ast: AstNode[],
   base: string,
   loadStylesheet: LoadStylesheet,
   recurseCount = 0,
+  track = false,
 ) {
   let features = Features.None
   let promises: Promise<void>[] = []
 
-  walk(ast, (node, { replaceWith }) => {
-    if (node.kind === 'at-rule' && node.name === '@import') {
+  walk(ast, (node) => {
+    if (node.kind === 'at-rule' && (node.name === '@import' || node.name === '@reference')) {
       let parsed = parseImportParams(ValueParser.parse(node.params))
       if (parsed === null) return
+      if (node.name === '@reference') {
+        parsed.media = 'reference'
+      }
 
       features |= Features.AtImport
 
@@ -42,10 +54,11 @@ export async function substituteAtImports(
           }
 
           let loaded = await loadStylesheet(uri, base)
-          let ast = CSS.parse(loaded.content)
-          await substituteAtImports(ast, loaded.base, loadStylesheet, recurseCount + 1)
+          let ast = CSS.parse(loaded.content, { from: track ? loaded.path : undefined })
+          await substituteAtImports(ast, loaded.base, loadStylesheet, recurseCount + 1, track)
 
           contextNode.nodes = buildImportNodes(
+            node,
             [context({ base: loaded.base }, ast)],
             layer,
             media,
@@ -54,11 +67,9 @@ export async function substituteAtImports(
         })(),
       )
 
-      replaceWith(contextNode)
-
       // The resolved Stylesheets already have their transitive @imports
       // resolved, so we can skip walking them.
-      return WalkAction.Skip
+      return WalkAction.ReplaceSkip(contextNode)
     }
   })
 
@@ -137,6 +148,7 @@ export function parseImportParams(params: ValueParser.ValueAstNode[]) {
 }
 
 function buildImportNodes(
+  importNode: AstNode,
   importedAst: AstNode[],
   layer: string | null,
   media: string | null,
@@ -145,15 +157,21 @@ function buildImportNodes(
   let root = importedAst
 
   if (layer !== null) {
-    root = [atRule('@layer', layer, root)]
+    let node = atRule('@layer', layer, root)
+    node.src = importNode.src
+    root = [node]
   }
 
   if (media !== null) {
-    root = [atRule('@media', media, root)]
+    let node = atRule('@media', media, root)
+    node.src = importNode.src
+    root = [node]
   }
 
   if (supports !== null) {
-    root = [atRule('@supports', supports[0] === '(' ? supports : `(${supports})`, root)]
+    let node = atRule('@supports', supports[0] === '(' ? supports : `(${supports})`, root)
+    node.src = importNode.src
+    root = [node]
   }
 
   return root
diff --git a/packages/tailwindcss/src/attribute-selector-parser.bench.ts b/packages/tailwindcss/src/attribute-selector-parser.bench.ts
new file mode 100644
index 000000000..2d6e89590
--- /dev/null
+++ b/packages/tailwindcss/src/attribute-selector-parser.bench.ts
@@ -0,0 +1,35 @@
+import { bench, describe } from 'vitest'
+import * as AttributeSelectorParser from './attribute-selector-parser'
+
+let examples = [
+  '[open]',
+  '[data-foo]',
+  '[data-state=expanded]',
+  '[data-state = expanded ]',
+  '[data-state*="expanded"]',
+  '[data-state*="expanded"i]',
+  '[data-state*=expanded i]',
+]
+
+const ATTRIBUTE_REGEX =
+  /\[\s*(?<attribute>[a-zA-Z_-][a-zA-Z0-9_-]*)\s*((?<operator>[*|~^$]?=)\s*(?<quote>['"])?\s*(?<value>.*?)\4\s*(?<sensitivity>[is])?\s*)?\]/
+
+describe('parsing', () => {
+  bench('AttributeSelectorParser.parse', () => {
+    for (let example of examples) {
+      AttributeSelectorParser.parse(example)
+    }
+  })
+
+  bench('REGEX.test(…)', () => {
+    for (let example of examples) {
+      ATTRIBUTE_REGEX.exec(example)
+    }
+  })
+
+  bench('….match(REGEX)', () => {
+    for (let example of examples) {
+      example.match(ATTRIBUTE_REGEX)
+    }
+  })
+})
diff --git a/packages/tailwindcss/src/attribute-selector-parser.test.ts b/packages/tailwindcss/src/attribute-selector-parser.test.ts
new file mode 100644
index 000000000..87f5f3013
--- /dev/null
+++ b/packages/tailwindcss/src/attribute-selector-parser.test.ts
@@ -0,0 +1,69 @@
+import { describe, expect, it } from 'vitest'
+import { parse } from './attribute-selector-parser'
+
+describe('parse', () => {
+  it.each([
+    [''],
+    [']'],
+    ['[]'],
+    ['['],
+    ['="value"'],
+    ['data-foo]'],
+    ['[data-foo'],
+    ['[data-foo="foo]'],
+    ['[data-foo * = foo]'],
+    ['[data-foo*=]'],
+    ['[data-foo=value x]'],
+    ['[data-foo=value ix]'],
+  ])('should parse an invalid attribute selector (%s) as `null`', (input) => {
+    expect(parse(input)).toBeNull()
+  })
+
+  it.each([
+    [
+      '[data-foo]',
+      { attribute: 'data-foo', operator: null, quote: null, value: null, sensitivity: null },
+    ],
+    [
+      '[ data-foo ]',
+      { attribute: 'data-foo', operator: null, quote: null, value: null, sensitivity: null },
+    ],
+    [
+      // Non-ASCII code points are valid in a CSS ident
+      '[data-état]',
+      { attribute: 'data-état', operator: null, quote: null, value: null, sensitivity: null },
+    ],
+    [
+      '[data-state=expanded]',
+      { attribute: 'data-state', operator: '=', quote: null, value: 'expanded', sensitivity: null },
+    ],
+    [
+      '[data-state = expanded ]',
+      { attribute: 'data-state', operator: '=', quote: null, value: 'expanded', sensitivity: null },
+    ],
+    [
+      '[data-state*="expanded"]',
+      { attribute: 'data-state', operator: '*=', quote: '"', value: 'expanded', sensitivity: null },
+    ],
+    [
+      '[data-state*="expanded"i]',
+      { attribute: 'data-state', operator: '*=', quote: '"', value: 'expanded', sensitivity: 'i' },
+    ],
+    [
+      '[data-state*=expanded i]',
+      { attribute: 'data-state', operator: '*=', quote: null, value: 'expanded', sensitivity: 'i' },
+    ],
+  ])('should parse correctly: %s', (selector, expected) => {
+    expect(parse(selector)).toEqual(expected)
+  })
+
+  it('should work with a real-world example', () => {
+    expect(parse('[data-url$=".com"i]')).toEqual({
+      attribute: 'data-url',
+      operator: '$=',
+      quote: '"',
+      value: '.com',
+      sensitivity: 'i',
+    })
+  })
+})
diff --git a/packages/tailwindcss/src/attribute-selector-parser.ts b/packages/tailwindcss/src/attribute-selector-parser.ts
new file mode 100644
index 000000000..624043d59
--- /dev/null
+++ b/packages/tailwindcss/src/attribute-selector-parser.ts
@@ -0,0 +1,232 @@
+const TAB = 9
+const LINE_BREAK = 10
+const CARRIAGE_RETURN = 13
+const SPACE = 32
+const DOUBLE_QUOTE = 34
+const DOLLAR = 36
+const SINGLE_QUOTE = 39
+const ASTERISK = 42
+const EQUALS = 61
+const UPPER_I = 73
+const UPPER_S = 83
+const BACKSLASH = 92
+const CARET = 94
+const LOWER_I = 105
+const LOWER_S = 115
+const PIPE = 124
+const TILDE = 126
+const LOWER_A = 97
+const LOWER_Z = 122
+const UPPER_A = 65
+const UPPER_Z = 90
+const ZERO = 48
+const NINE = 57
+const DASH = 45
+const UNDERSCORE = 95
+const NON_ASCII = 128
+
+interface AttributeSelector {
+  attribute: string
+  operator: '=' | '~=' | '|=' | '^=' | '$=' | '*=' | null
+  quote: '"' | "'" | null
+  value: string | null
+  sensitivity: 'i' | 's' | null
+}
+
+export function parse(input: string): AttributeSelector | null {
+  // Must start with `[` and end with `]`
+  if (input[0] !== '[' || input[input.length - 1] !== ']') {
+    return null
+  }
+
+  let i = 1
+  let start = i
+  let end = input.length - 1
+
+  // Skip whitespace, e.g.: [   data-foo]
+  //                         ^^^
+  while (isAsciiWhitespace(input.charCodeAt(i))) i++
+
+  // Attribute name, e.g.: [data-foo]
+  //                        ^^^^^^^^
+  {
+    start = i
+    for (; i < end; i++) {
+      let currentChar = input.charCodeAt(i)
+      // Skip escaped character
+      if (currentChar === BACKSLASH) {
+        i++
+        continue
+      }
+      if (currentChar >= UPPER_A && currentChar <= UPPER_Z) continue
+      if (currentChar >= LOWER_A && currentChar <= LOWER_Z) continue
+      if (currentChar >= ZERO && currentChar <= NINE) continue
+      if (currentChar === DASH || currentChar === UNDERSCORE) continue
+      // Non-ASCII code points are valid in a CSS ident, e.g.: `[data-état]`
+      if (currentChar >= NON_ASCII) continue
+      break
+    }
+
+    // Must have at least one character in the attribute name
+    if (start === i) {
+      return null
+    }
+  }
+  let attribute = input.slice(start, i)
+
+  // Skip whitespace, e.g.: [data-foo   =value]
+  //                                 ^^^
+  while (isAsciiWhitespace(input.charCodeAt(i))) i++
+
+  // At the end, e.g.: `[data-foo]`
+  if (i === end) {
+    return {
+      attribute,
+      operator: null,
+      quote: null,
+      value: null,
+      sensitivity: null,
+    }
+  }
+
+  // Operator, e.g.: [data-foo*=value]
+  //                          ^^
+  let operator = null
+  let currentChar = input.charCodeAt(i)
+  if (currentChar === EQUALS) {
+    operator = '='
+    i++
+  } else if (
+    (currentChar === TILDE ||
+      currentChar === PIPE ||
+      currentChar === CARET ||
+      currentChar === DOLLAR ||
+      currentChar === ASTERISK) &&
+    input.charCodeAt(i + 1) === EQUALS
+  ) {
+    operator = input[i] + '='
+    i += 2
+  } else {
+    return null // Invalid operator
+  }
+
+  // Skip whitespace, e.g.: [data-foo*=   value]
+  //                                   ^^^
+  while (isAsciiWhitespace(input.charCodeAt(i))) i++
+
+  // At the end, that means that we have an operator but no valid, which is
+  // invalid, e.g.: `[data-foo*=]`
+  if (i === end) {
+    return null
+  }
+
+  // Value, e.g.: [data-foo*=value]
+  //                         ^^^^^
+  let value = ''
+
+  // Quoted value, e.g.: [data-foo*="value"]
+  //                                ^^^^^^^
+  let quote = null
+  currentChar = input.charCodeAt(i)
+  if (currentChar === SINGLE_QUOTE || currentChar === DOUBLE_QUOTE) {
+    quote = input[i] as '"' | "'"
+    i++
+
+    start = i
+    for (let j = i; j < end; j++) {
+      let current = input.charCodeAt(j)
+      // Found ending quote
+      if (current === currentChar) {
+        i = j + 1
+      }
+
+      // Skip escaped character
+      else if (current === BACKSLASH) {
+        j++
+      }
+    }
+
+    value = input.slice(start, i - 1)
+  }
+
+  // Unquoted value, e.g.: [data-foo*=value]
+  //                                  ^^^^^
+  else {
+    start = i
+    // Keep going until we find whitespace or the end
+    while (i < end && !isAsciiWhitespace(input.charCodeAt(i))) i++
+    value = input.slice(start, i)
+  }
+
+  // Skip whitespace, e.g.: [data-foo*=value   ]
+  //                                        ^^^
+  while (isAsciiWhitespace(input.charCodeAt(i))) i++
+
+  // At the end, e.g.: `[data-foo=value]`
+  if (i === end) {
+    return {
+      attribute,
+      operator: operator as '=' | '~=' | '|=' | '^=' | '$=' | '*=',
+      quote: quote as '"' | "'" | null,
+      value,
+      sensitivity: null,
+    }
+  }
+
+  // Sensitivity, e.g.: [data-foo=value i]
+  //                                    ^
+  let sensitivity = null
+  {
+    switch (input.charCodeAt(i)) {
+      case LOWER_I:
+      case UPPER_I: {
+        sensitivity = 'i'
+        i++
+        break
+      }
+
+      case LOWER_S:
+      case UPPER_S: {
+        sensitivity = 's'
+        i++
+        break
+      }
+
+      default:
+        return null // Invalid sensitivity
+    }
+  }
+
+  // Skip whitespace, e.g.: [data-foo=value i   ]
+  //                                         ^^^
+  while (isAsciiWhitespace(input.charCodeAt(i))) i++
+
+  // We must be at the end now, if not, then there is an additional character
+  // after the sensitivity which is invalid, e.g.: [data-foo=value iX]
+  //                                                                ^
+  if (i !== end) {
+    return null
+  }
+
+  // Fully done
+  return {
+    attribute,
+    operator: operator as '=' | '~=' | '|=' | '^=' | '$=' | '*=',
+    quote: quote as '"' | "'" | null,
+    value,
+    sensitivity: sensitivity as 'i' | 's' | null,
+  }
+}
+
+function isAsciiWhitespace(code: number): boolean {
+  switch (code) {
+    case SPACE:
+    case TAB:
+    case LINE_BREAK:
+    case CARRIAGE_RETURN:
+      return true
+
+    default:
+      return false
+  }
+}
diff --git a/packages/tailwindcss/src/candidate.bench.ts b/packages/tailwindcss/src/candidate.bench.ts
index 5b7171432..7ac0dbb0a 100644
--- a/packages/tailwindcss/src/candidate.bench.ts
+++ b/packages/tailwindcss/src/candidate.bench.ts
@@ -1,6 +1,6 @@
 import { Scanner } from '@tailwindcss/oxide'
-import { bench } from 'vitest'
-import { parseCandidate } from './candidate'
+import { bench, describe } from 'vitest'
+import { cloneCandidate, parseCandidate, type Candidate, type Variant } from './candidate'
 import { buildDesignSystem } from './design-system'
 import { Theme } from './theme'
 
@@ -8,13 +8,87 @@ import { Theme } from './theme'
 const root = process.env.FOLDER || process.cwd()
 
 // Auto content detection
-const scanner = new Scanner({ sources: [{ base: root, pattern: '**/*' }] })
+const scanner = new Scanner({ sources: [{ base: root, pattern: '**/*', negated: false }] })
 
 const candidates = scanner.scan()
 const designSystem = buildDesignSystem(new Theme())
 
-bench('parseCandidate', () => {
-  for (let candidate of candidates) {
-    Array.from(parseCandidate(candidate, designSystem))
-  }
+describe('parsing', () => {
+  bench('parseCandidate', () => {
+    for (let candidate of candidates) {
+      Array.from(parseCandidate(candidate, designSystem))
+    }
+  })
 })
+
+describe('Candidate cloning', async () => {
+  let parsedCanddiates = candidates.flatMap((candidate) =>
+    Array.from(parseCandidate(candidate, designSystem)),
+  )
+
+  bench('structuredClone', () => {
+    for (let candidate of parsedCanddiates) {
+      structuredClone(candidate)
+    }
+  })
+
+  bench('cloneCandidate', () => {
+    for (let candidate of parsedCanddiates) {
+      cloneCandidate(candidate)
+    }
+  })
+
+  bench('cloneCandidate (spread)', () => {
+    for (let candidate of parsedCanddiates) {
+      cloneCandidateSpread(candidate)
+    }
+  })
+})
+
+function cloneCandidateSpread(candidate: Candidate): Candidate {
+  switch (candidate.kind) {
+    case 'arbitrary':
+      return {
+        ...candidate,
+        modifier: candidate.modifier ? { ...candidate.modifier } : null,
+        variants: candidate.variants.map(cloneVariantSpread),
+      }
+
+    case 'static':
+      return { ...candidate, variants: candidate.variants.map(cloneVariantSpread) }
+
+    case 'functional':
+      return {
+        ...candidate,
+        value: candidate.value ? { ...candidate.value } : null,
+        modifier: candidate.modifier ? { ...candidate.modifier } : null,
+        variants: candidate.variants.map(cloneVariantSpread),
+      }
+
+    default:
+      candidate satisfies never
+      throw new Error('Unknown candidate kind')
+  }
+}
+
+function cloneVariantSpread(variant: Variant): Variant {
+  switch (variant.kind) {
+    case 'arbitrary':
+    case 'static':
+      return { ...variant }
+
+    case 'functional':
+      return { ...variant, modifier: variant.modifier ? { ...variant.modifier } : null }
+
+    case 'compound':
+      return {
+        ...variant,
+        variant: cloneVariantSpread(variant.variant),
+        modifier: variant.modifier ? { ...variant.modifier } : null,
+      }
+
+    default:
+      variant satisfies never
+      throw new Error('Unknown variant kind')
+  }
+}
diff --git a/packages/tailwindcss/src/candidate.test.ts b/packages/tailwindcss/src/candidate.test.ts
index 4242b11b7..b8f914e1b 100644
--- a/packages/tailwindcss/src/candidate.test.ts
+++ b/packages/tailwindcss/src/candidate.test.ts
@@ -1,4 +1,5 @@
-import { expect, it } from 'vitest'
+import { describe, expect, it, test } from 'vitest'
+import { __unstable__loadDesignSystem } from '.'
 import { buildDesignSystem } from './design-system'
 import { Theme } from './theme'
 import { Utilities } from './utilities'
@@ -515,6 +516,8 @@ it('should not parse functional utilities with multiple modifiers', () => {
   utilities.functional('bg', () => [])
 
   expect(run('bg-red-1/2/3', { utilities })).toMatchInlineSnapshot(`[]`)
+  expect(run('bg-red-500/50/', { utilities })).toMatchInlineSnapshot(`[]`)
+  expect(run('bg-red-500/50//foo', { utilities })).toMatchInlineSnapshot(`[]`)
 })
 
 it('should parse a utility with an arbitrary value', () => {
@@ -540,6 +543,13 @@ it('should parse a utility with an arbitrary value', () => {
   `)
 })
 
+it('should not parse a utility with an incomplete arbitrary value', () => {
+  let utilities = new Utilities()
+  utilities.functional('bg', () => [])
+
+  expect(run('bg-[#0088cc', { utilities })).toMatchInlineSnapshot(`[]`)
+})
+
 it('should parse a utility with an arbitrary value with parens', () => {
   let utilities = new Utilities()
   utilities.functional('bg', () => [])
@@ -563,6 +573,13 @@ it('should parse a utility with an arbitrary value with parens', () => {
   `)
 })
 
+it('should not parse a utility with an arbitrary value with parens that does not start with --', () => {
+  let utilities = new Utilities()
+  utilities.functional('bg', () => [])
+
+  expect(run('bg-(my-color)', { utilities })).toMatchInlineSnapshot(`[]`)
+})
+
 it('should parse a utility with an arbitrary value including a typehint', () => {
   let utilities = new Utilities()
   utilities.functional('bg', () => [])
@@ -609,6 +626,13 @@ it('should parse a utility with an arbitrary value with parens including a typeh
   `)
 })
 
+it('should not parse a utility with an arbitrary value with parens including a typehint that does not start with --', () => {
+  let utilities = new Utilities()
+  utilities.functional('bg', () => [])
+
+  expect(run('bg-(color:my-color)', { utilities })).toMatchInlineSnapshot(`[]`)
+})
+
 it('should parse a utility with an arbitrary value with parens and a fallback', () => {
   let utilities = new Utilities()
   utilities.functional('bg', () => [])
@@ -829,6 +853,65 @@ it('should not parse invalid arbitrary values', () => {
   }
 })
 
+it('should not parse invalid arbitrary values in variants', () => {
+  let utilities = new Utilities()
+  utilities.static('flex', () => [])
+
+  let variants = new Variants()
+  variants.functional('data', () => {})
+
+  for (let candidate of [
+    'data-foo-[#0088cc]:flex',
+    'data-foo[#0088cc]:flex',
+
+    'data-foo-[color:var(--value)]:flex',
+    'data-foo[color:var(--value)]:flex',
+
+    'data-foo-[#0088cc]/50:flex',
+    'data-foo[#0088cc]/50:flex',
+
+    'data-foo-[#0088cc]/[50%]:flex',
+    'data-foo[#0088cc]/[50%]:flex',
+
+    'data-foo-[#0088cc]:flex!',
+    'data-foo[#0088cc]:flex!',
+
+    'data-foo-[var(--value)]:flex',
+    'data-foo[var(--value)]:flex',
+
+    'data-foo-[var(--value)]:flex!',
+    'data-foo[var(--value)]:flex!',
+
+    'data-foo-(color:--value):flex',
+    'data-foo(color:--value):flex',
+
+    'data-foo-(color:--value)/50:flex',
+    'data-foo(color:--value)/50:flex',
+
+    'data-foo-(color:--value)/(--mod):flex',
+    'data-foo(color:--value)/(--mod):flex',
+
+    'data-foo-(color:--value)/(number:--mod):flex',
+    'data-foo(color:--value)/(number:--mod):flex',
+
+    'data-foo-(--value):flex',
+    'data-foo(--value):flex',
+
+    'data-foo-(--value)/50:flex',
+    'data-foo(--value)/50:flex',
+
+    'data-foo-(--value)/(--mod):flex',
+    'data-foo(--value)/(--mod):flex',
+
+    'data-foo-(--value)/(number:--mod):flex',
+    'data-foo(--value)/(number:--mod):flex',
+
+    'data-(value):flex',
+  ]) {
+    expect(run(candidate, { utilities, variants })).toEqual([])
+  }
+})
+
 it('should parse a utility with an implicit variable as the modifier', () => {
   let utilities = new Utilities()
   utilities.functional('bg', () => [])
@@ -855,10 +938,159 @@ it('should parse a utility with an implicit variable as the modifier', () => {
   `)
 })
 
+it('should properly decode escaped underscores but not convert underscores to spaces for CSS variables in arbitrary positions', () => {
+  let utilities = new Utilities()
+  utilities.functional('flex', () => [])
+  let variants = new Variants()
+  variants.functional('supports', () => {})
+
+  expect(run('flex-(--\\_foo)', { utilities, variants })).toMatchInlineSnapshot(`
+    [
+      {
+        "important": false,
+        "kind": "functional",
+        "modifier": null,
+        "raw": "flex-(--\\_foo)",
+        "root": "flex",
+        "value": {
+          "dataType": null,
+          "kind": "arbitrary",
+          "value": "var(--_foo)",
+        },
+        "variants": [],
+      },
+    ]
+  `)
+  expect(run('flex-(--_foo)', { utilities, variants })).toMatchInlineSnapshot(`
+    [
+      {
+        "important": false,
+        "kind": "functional",
+        "modifier": null,
+        "raw": "flex-(--_foo)",
+        "root": "flex",
+        "value": {
+          "dataType": null,
+          "kind": "arbitrary",
+          "value": "var(--_foo)",
+        },
+        "variants": [],
+      },
+    ]
+  `)
+  expect(run('flex-[var(--\\_foo)]', { utilities, variants })).toMatchInlineSnapshot(`
+    [
+      {
+        "important": false,
+        "kind": "functional",
+        "modifier": null,
+        "raw": "flex-[var(--\\_foo)]",
+        "root": "flex",
+        "value": {
+          "dataType": null,
+          "kind": "arbitrary",
+          "value": "var(--_foo)",
+        },
+        "variants": [],
+      },
+    ]
+  `)
+  expect(run('flex-[var(--_foo)]', { utilities, variants })).toMatchInlineSnapshot(`
+    [
+      {
+        "important": false,
+        "kind": "functional",
+        "modifier": null,
+        "raw": "flex-[var(--_foo)]",
+        "root": "flex",
+        "value": {
+          "dataType": null,
+          "kind": "arbitrary",
+          "value": "var(--_foo)",
+        },
+        "variants": [],
+      },
+    ]
+  `)
+
+  expect(run('flex-[calc(var(--\\_foo)*0.2)]', { utilities, variants })).toMatchInlineSnapshot(`
+    [
+      {
+        "important": false,
+        "kind": "functional",
+        "modifier": null,
+        "raw": "flex-[calc(var(--\\_foo)*0.2)]",
+        "root": "flex",
+        "value": {
+          "dataType": null,
+          "kind": "arbitrary",
+          "value": "calc(var(--_foo) * 0.2)",
+        },
+        "variants": [],
+      },
+    ]
+  `)
+  expect(run('flex-[calc(var(--_foo)*0.2)]', { utilities, variants })).toMatchInlineSnapshot(`
+    [
+      {
+        "important": false,
+        "kind": "functional",
+        "modifier": null,
+        "raw": "flex-[calc(var(--_foo)*0.2)]",
+        "root": "flex",
+        "value": {
+          "dataType": null,
+          "kind": "arbitrary",
+          "value": "calc(var(--_foo) * 0.2)",
+        },
+        "variants": [],
+      },
+    ]
+  `)
+
+  // Due to limitations in the CSS value parser, the `var(…)` inside the `calc(…)` is not correctly
+  // scanned here.
+  expect(run('flex-[calc(0.2*var(--\\_foo)]', { utilities, variants })).toMatchInlineSnapshot(`
+    [
+      {
+        "important": false,
+        "kind": "functional",
+        "modifier": null,
+        "raw": "flex-[calc(0.2*var(--\\_foo)]",
+        "root": "flex",
+        "value": {
+          "dataType": null,
+          "kind": "arbitrary",
+          "value": "calc(0.2 * var(--_foo))",
+        },
+        "variants": [],
+      },
+    ]
+  `)
+  expect(run('flex-[calc(0.2*var(--_foo)]', { utilities, variants })).toMatchInlineSnapshot(`
+    [
+      {
+        "important": false,
+        "kind": "functional",
+        "modifier": null,
+        "raw": "flex-[calc(0.2*var(--_foo)]",
+        "root": "flex",
+        "value": {
+          "dataType": null,
+          "kind": "arbitrary",
+          "value": "calc(0.2 * var(-- foo))",
+        },
+        "variants": [],
+      },
+    ]
+  `)
+})
+
 it('should parse a utility with an implicit variable as the modifier using the shorthand', () => {
   let utilities = new Utilities()
   utilities.functional('bg', () => [])
 
+  // Standard case (no underscores)
   expect(run('bg-red-500/(--value)', { utilities })).toMatchInlineSnapshot(`
     [
       {
@@ -879,6 +1111,163 @@ it('should parse a utility with an implicit variable as the modifier using the s
       },
     ]
   `)
+
+  // Should preserve underscores
+  expect(run('bg-red-500/(--with_underscore)', { utilities })).toMatchInlineSnapshot(`
+    [
+      {
+        "important": false,
+        "kind": "functional",
+        "modifier": {
+          "kind": "arbitrary",
+          "value": "var(--with_underscore)",
+        },
+        "raw": "bg-red-500/(--with_underscore)",
+        "root": "bg",
+        "value": {
+          "fraction": null,
+          "kind": "named",
+          "value": "red-500",
+        },
+        "variants": [],
+      },
+    ]
+  `)
+
+  // Should remove underscores in fallback values
+  expect(run('bg-red-500/(--with_underscore,fallback_value)', { utilities }))
+    .toMatchInlineSnapshot(`
+      [
+        {
+          "important": false,
+          "kind": "functional",
+          "modifier": {
+            "kind": "arbitrary",
+            "value": "var(--with_underscore,fallback value)",
+          },
+          "raw": "bg-red-500/(--with_underscore,fallback_value)",
+          "root": "bg",
+          "value": {
+            "fraction": null,
+            "kind": "named",
+            "value": "red-500",
+          },
+          "variants": [],
+        },
+      ]
+    `)
+
+  // Should keep underscores in the CSS variable itself, but remove underscores
+  // in fallback values
+  expect(run('bg-(--a_b,c_d_var(--e_f,g_h))/(--i_j,k_l_var(--m_n,o_p))', { utilities }))
+    .toMatchInlineSnapshot(`
+    [
+      {
+        "important": false,
+        "kind": "functional",
+        "modifier": {
+          "kind": "arbitrary",
+          "value": "var(--i_j,k l var(--m_n,o p))",
+        },
+        "raw": "bg-(--a_b,c_d_var(--e_f,g_h))/(--i_j,k_l_var(--m_n,o_p))",
+        "root": "bg",
+        "value": {
+          "dataType": null,
+          "kind": "arbitrary",
+          "value": "var(--a_b,c d var(--e_f,g h))",
+        },
+        "variants": [],
+      },
+    ]
+  `)
+})
+
+it('should not parse an invalid arbitrary shorthand modifier', () => {
+  let utilities = new Utilities()
+  utilities.functional('bg', () => [])
+
+  // Completely empty
+  expect(run('bg-red-500/()', { utilities })).toMatchInlineSnapshot(`[]`)
+
+  // Invalid due to leading spaces
+  expect(run('bg-red-500/(_--)', { utilities })).toMatchInlineSnapshot(`[]`)
+  expect(run('bg-red-500/(_--x)', { utilities })).toMatchInlineSnapshot(`[]`)
+
+  // Invalid due to leading spaces
+  expect(run('bg-red-500/(_--)', { utilities })).toMatchInlineSnapshot(`[]`)
+  expect(run('bg-red-500/(_--x)', { utilities })).toMatchInlineSnapshot(`[]`)
+
+  // Invalid due to top-level `;` or `}` characters
+  expect(run('bg-red-500/(--x;--y)', { utilities })).toMatchInlineSnapshot(`[]`)
+  expect(run('bg-red-500/(--x:{foo:bar})', { utilities })).toMatchInlineSnapshot(`[]`)
+
+  // Valid, but ensuring that we didn't make an off-by-one error
+  expect(run('bg-red-500/(--x)', { utilities })).toMatchInlineSnapshot(`
+    [
+      {
+        "important": false,
+        "kind": "functional",
+        "modifier": {
+          "kind": "arbitrary",
+          "value": "var(--x)",
+        },
+        "raw": "bg-red-500/(--x)",
+        "root": "bg",
+        "value": {
+          "fraction": null,
+          "kind": "named",
+          "value": "red-500",
+        },
+        "variants": [],
+      },
+    ]
+  `)
+})
+
+it('should not parse an invalid arbitrary shorthand value', () => {
+  let utilities = new Utilities()
+  utilities.functional('bg', () => [])
+
+  // Completely empty
+  expect(run('bg-()', { utilities })).toMatchInlineSnapshot(`[]`)
+
+  // Invalid due to leading spaces
+  expect(run('bg-(_--)', { utilities })).toMatchInlineSnapshot(`[]`)
+  expect(run('bg-(_--x)', { utilities })).toMatchInlineSnapshot(`[]`)
+
+  // Invalid due to leading spaces
+  expect(run('bg-(_--)', { utilities })).toMatchInlineSnapshot(`[]`)
+  expect(run('bg-(_--x)', { utilities })).toMatchInlineSnapshot(`[]`)
+
+  // Invalid due to top-level `;` or `}` characters
+  expect(run('bg-(--x;--y)', { utilities })).toMatchInlineSnapshot(`[]`)
+  expect(run('bg-(--x:{foo:bar})', { utilities })).toMatchInlineSnapshot(`[]`)
+
+  // Valid, but ensuring that we didn't make an off-by-one error
+  expect(run('bg-(--x)', { utilities })).toMatchInlineSnapshot(`
+    [
+      {
+        "important": false,
+        "kind": "functional",
+        "modifier": null,
+        "raw": "bg-(--x)",
+        "root": "bg",
+        "value": {
+          "dataType": null,
+          "kind": "arbitrary",
+          "value": "var(--x)",
+        },
+        "variants": [],
+      },
+    ]
+  `)
+})
+
+it('should not parse a utility with an implicit invalid variable as the modifier using the shorthand', () => {
+  let utilities = new Utilities()
+  utilities.functional('bg', () => [])
+
+  expect(run('bg-red-500/(value)', { utilities })).toMatchInlineSnapshot(`[]`)
 })
 
 it('should parse a utility with an implicit variable as the modifier that is important', () => {
@@ -959,6 +1348,18 @@ it('should parse a utility with an explicit variable as the modifier that is imp
   `)
 })
 
+it('should not parse a partial variant', () => {
+  let utilities = new Utilities()
+  utilities.static('flex', () => [])
+
+  let variants = new Variants()
+  variants.static('open', () => {})
+  variants.functional('data', () => {})
+
+  expect(run('open-:flex', { utilities, variants })).toMatchInlineSnapshot(`[]`)
+  expect(run('data-:flex', { utilities, variants })).toMatchInlineSnapshot(`[]`)
+})
+
 it('should parse a static variant starting with @', () => {
   let utilities = new Utilities()
   utilities.static('flex', () => [])
@@ -1017,6 +1418,19 @@ it('should parse a functional variant with a modifier', () => {
   `)
 })
 
+it('should not parse variants with multiple modifiers', () => {
+  let utilities = new Utilities()
+  utilities.static('flex', () => [])
+
+  let variants = new Variants()
+  variants.static('hover', () => {})
+  variants.compound('group', Compounds.StyleRules, () => {})
+
+  expect(run('group-hover/foo:flex', { utilities, variants })).toHaveLength(1)
+  expect(run('group-hover/foo/:flex', { utilities, variants })).toEqual([])
+  expect(run('group-hover/foo//bar:flex', { utilities, variants })).toEqual([])
+})
+
 it('should parse a functional variant starting with @', () => {
   let utilities = new Utilities()
   utilities.static('flex', () => [])
@@ -1047,6 +1461,36 @@ it('should parse a functional variant starting with @', () => {
   `)
 })
 
+it('should parse a functional variant starting with @ that has a hyphen', () => {
+  let utilities = new Utilities()
+  utilities.static('flex', () => [])
+
+  let variants = new Variants()
+  variants.functional('@', () => {})
+
+  expect(run('@foo-bar:flex', { utilities, variants })).toMatchInlineSnapshot(`
+    [
+      {
+        "important": false,
+        "kind": "static",
+        "raw": "@foo-bar:flex",
+        "root": "flex",
+        "variants": [
+          {
+            "kind": "functional",
+            "modifier": null,
+            "root": "@",
+            "value": {
+              "kind": "named",
+              "value": "foo-bar",
+            },
+          },
+        ],
+      },
+    ]
+  `)
+})
+
 it('should parse a functional variant starting with @ and a modifier', () => {
   let utilities = new Utilities()
   utilities.static('flex', () => [])
@@ -1347,6 +1791,14 @@ it('should not parse compound group with a non-compoundable variant', () => {
   expect(run('group-*:flex', { utilities, variants })).toMatchInlineSnapshot(`[]`)
 })
 
+it('empty data types are invalid', () => {
+  let utilities = new Utilities()
+  utilities.functional('bg', () => [])
+  let variants = new Variants()
+
+  expect(run('bg-[:foo]', { utilities, variants })).toMatchInlineSnapshot(`[]`)
+})
+
 it('should parse a variant containing an arbitrary string with unbalanced parens, brackets, curlies and other quotes', () => {
   let utilities = new Utilities()
   utilities.static('flex', () => [])
@@ -1543,3 +1995,162 @@ it.each([
 
   expect(run(rawCandidate, { utilities, variants })).toEqual([])
 })
+
+it.each([
+  // Arbitrary properties with `;` or `}`
+  '[color:red;color:blue]',
+  '[color:red}html{color:blue]',
+
+  // Arbitrary values that end the declaration
+  'bg-[red;color:blue]',
+
+  // Arbitrary values that end the block
+  'bg-[red}html{color:blue]',
+
+  // Arbitrary variants that end the block
+  '[&{color:red}]:flex',
+
+  // Arbitrary variant values that end the block
+  'data-[a]{color:red}foo[a]:flex',
+
+  // Named values contain invalid characters
+  'data-foo=bar:flex',
+  'bg-foo=bar',
+  'bg-red-500/foo=bar',
+])('should not parse invalid values: %s', (rawCandidate) => {
+  let utilities = new Utilities()
+  utilities.static('flex', () => [])
+  utilities.functional('bg', () => [])
+
+  let variants = new Variants()
+  variants.functional('data', () => {})
+  variants.compound('group', Compounds.StyleRules, () => {})
+
+  expect(run(rawCandidate, { utilities, variants })).toEqual([])
+})
+
+const candidates = [
+  // Arbitrary candidates
+  ['[color:red]', '[color:red]'],
+  ['[color:red]/50', '[color:red]/50'],
+  ['[color:red]/[0.5]', '[color:red]/[0.5]'],
+  ['[color:red]/50!', '[color:red]/50!'],
+  ['![color:red]/50', '[color:red]/50!'],
+  ['[color:red]/[0.5]!', '[color:red]/[0.5]!'],
+
+  // Static candidates
+  ['box-border', 'box-border'],
+  ['underline!', 'underline!'],
+  ['!underline', 'underline!'],
+  ['-inset-full', '-inset-full'],
+
+  // Functional candidates
+  ['bg-red-500', 'bg-red-500'],
+  ['bg-red-500/50', 'bg-red-500/50'],
+  ['bg-red-500/[0.5]', 'bg-red-500/[0.5]'],
+  ['bg-red-500!', 'bg-red-500!'],
+  ['!bg-red-500', 'bg-red-500!'],
+  ['bg-[#0088cc]/50', 'bg-[#0088cc]/50'],
+  ['bg-[#0088cc]/[0.5]', 'bg-[#0088cc]/[0.5]'],
+  ['bg-[#0088cc]!', 'bg-[#0088cc]!'],
+  ['!bg-[#0088cc]', 'bg-[#0088cc]!'],
+  ['bg-[var(--spacing)-1px]', 'bg-[var(--spacing)-1px]'],
+  ['bg-[var(--spacing)_-_1px]', 'bg-[var(--spacing)-1px]'],
+  ['bg-[var(--_spacing)]', 'bg-(--_spacing)'],
+  ['bg-(--_spacing)', 'bg-(--_spacing)'],
+  ['bg-[-1px_-1px]', 'bg-[-1px_-1px]'],
+  ['p-[round(to-zero,1px)]', 'p-[round(to-zero,1px)]'],
+  ['w-1/2', 'w-1/2'],
+  ['p-[calc((100vw-theme(maxWidth.2xl))_/_2)]', 'p-[calc((100vw-theme(maxWidth.2xl))/2)]'],
+
+  // Keep spaces in strings
+  ['content-["hello_world"]', 'content-["hello_world"]'],
+  ['content-[____"hello_world"___]', 'content-["hello_world"]'],
+
+  // Do not escape underscores for url() and CSS variable in var()
+  ['bg-[no-repeat_url(/image_13.png)]', 'bg-[no-repeat_url(/image_13.png)]'],
+  [
+    'bg-[var(--spacing-0_5,_var(--spacing-1_5,_3rem))]',
+    'bg-(--spacing-0_5,var(--spacing-1_5,3rem))',
+  ],
+
+  // Normalize whitespace in arbitrary properties
+  ['[display:flex]', '[display:flex]'],
+  ['[display:_flex]', '[display:flex]'],
+  ['[display:flex_]', '[display:flex]'],
+  ['[display:_flex_]', '[display:flex]'],
+
+  // Normalize whitespace in `calc` expressions
+  ['w-[calc(100%-2rem)]', 'w-[calc(100%-2rem)]'],
+  ['w-[calc(100%_-_2rem)]', 'w-[calc(100%-2rem)]'],
+
+  // Normalize the important modifier
+  ['!flex', 'flex!'],
+  ['flex!', 'flex!'],
+]
+
+const variants = [
+  ['', ''], // no variant
+  ['*:', '*:'],
+  ['focus:', 'focus:'],
+  ['group-focus:', 'group-focus:'],
+
+  ['hover:focus:', 'hover:focus:'],
+  ['hover:group-focus:', 'hover:group-focus:'],
+  ['group-hover:focus:', 'group-hover:focus:'],
+  ['group-hover:group-focus:', 'group-hover:group-focus:'],
+
+  ['min-[10px]:', 'min-[10px]:'],
+
+  // Normalize spaces
+  ['min-[calc(1000px_+_12em)]:', 'min-[calc(1000px+12em)]:'],
+  ['min-[calc(1000px_+12em)]:', 'min-[calc(1000px+12em)]:'],
+  ['min-[calc(1000px+_12em)]:', 'min-[calc(1000px+12em)]:'],
+  ['min-[calc(1000px___+___12em)]:', 'min-[calc(1000px+12em)]:'],
+
+  ['peer-[&_p]:', 'peer-[&_p]:'],
+  ['peer-[&_p]:hover:', 'peer-[&_p]:hover:'],
+  ['hover:peer-[&_p]:', 'hover:peer-[&_p]:'],
+  ['hover:peer-[&_p]:focus:', 'hover:peer-[&_p]:focus:'],
+  ['peer-[&:hover]:peer-[&_p]:', 'peer-[&:hover]:peer-[&_p]:'],
+
+  ['[p]:', '[p]:'],
+  ['[_p_]:', '[p]:'],
+  ['has-[p]:', 'has-[p]:'],
+  ['has-[_p_]:', 'has-[p]:'],
+
+  // Simplify `&:is(p)` to `p`
+  ['[&:is(p)]:', '[p]:'],
+  ['[&:is(_p_)]:', '[p]:'],
+  ['has-[&:is(p)]:', 'has-[p]:'],
+  ['has-[&:is(_p_)]:', 'has-[p]:'],
+
+  // Handle special `@` variants. These shouldn't be printed as `@-`
+  ['@xl:', '@xl:'],
+  ['@[123px]:', '@[123px]:'],
+
+  // Compound variants that forward modifiers
+  ['not-group-hover/name:', 'not-group-hover/name:'],
+  ['has-group-peer-hover/name:', 'has-group-peer-hover/name:'],
+  ['in-group-peer-hover/name:', 'in-group-peer-hover/name:'],
+]
+
+let combinations: [string, string][] = []
+
+for (let [inputVariant, outputVariant] of variants) {
+  for (let [inputCandidate, outputCandidate] of candidates) {
+    combinations.push([`${inputVariant}${inputCandidate}`, `${outputVariant}${outputCandidate}`])
+  }
+}
+
+describe('normalize candidates', () => {
+  test.each(combinations)('`%s` -> `%s`', async (candidate: string, result: string) => {
+    let designSystem = await __unstable__loadDesignSystem('@tailwind utilities', {
+      base: __dirname,
+    })
+
+    let [parsed] = designSystem.parseCandidate(candidate)
+
+    expect(designSystem.printCandidate(parsed)).toEqual(result)
+  })
+})
diff --git a/packages/tailwindcss/src/candidate.ts b/packages/tailwindcss/src/candidate.ts
index 26def1bff..a389af365 100644
--- a/packages/tailwindcss/src/candidate.ts
+++ b/packages/tailwindcss/src/candidate.ts
@@ -1,13 +1,19 @@
 import type { DesignSystem } from './design-system'
 import { decodeArbitraryValue } from './utils/decode-arbitrary-value'
+import { DefaultMap } from './utils/default-map'
+import { isValidArbitrary } from './utils/is-valid-arbitrary'
 import { segment } from './utils/segment'
+import type { ValueFunctionNode } from './value-parser'
+import * as ValueParser from './value-parser'
+import { walk, WalkAction } from './walk'
 
 const COLON = 0x3a
 const DASH = 0x2d
 const LOWER_A = 0x61
 const LOWER_Z = 0x7a
+const IS_VALID_NAMED_VALUE = /^[a-zA-Z0-9_.%-]+$/
 
-type ArbitraryUtilityValue = {
+export type ArbitraryUtilityValue = {
   kind: 'arbitrary'
 
   /**
@@ -59,7 +65,7 @@ export type NamedUtilityValue = {
   fraction: string | null
 }
 
-type ArbitraryModifier = {
+export type ArbitraryModifier = {
   kind: 'arbitrary'
 
   /**
@@ -71,7 +77,7 @@ type ArbitraryModifier = {
   value: string
 }
 
-type NamedModifier = {
+export type NamedModifier = {
   kind: 'named'
 
   /**
@@ -212,6 +218,102 @@ export type Candidate =
       raw: string
     }
 
+export function cloneCandidate<T extends Candidate>(candidate: T): T {
+  switch (candidate.kind) {
+    case 'arbitrary':
+      return {
+        kind: candidate.kind,
+        property: candidate.property,
+        value: candidate.value,
+        modifier: candidate.modifier
+          ? { kind: candidate.modifier.kind, value: candidate.modifier.value }
+          : null,
+        variants: candidate.variants.map(cloneVariant),
+        important: candidate.important,
+        raw: candidate.raw,
+      } satisfies Extract<Candidate, { kind: 'arbitrary' }> as T
+
+    case 'static':
+      return {
+        kind: candidate.kind,
+        root: candidate.root,
+        variants: candidate.variants.map(cloneVariant),
+        important: candidate.important,
+        raw: candidate.raw,
+      } satisfies Extract<Candidate, { kind: 'static' }> as T
+
+    case 'functional':
+      return {
+        kind: candidate.kind,
+        root: candidate.root,
+        value: candidate.value
+          ? candidate.value.kind === 'arbitrary'
+            ? {
+                kind: candidate.value.kind,
+                dataType: candidate.value.dataType,
+                value: candidate.value.value,
+              }
+            : {
+                kind: candidate.value.kind,
+                value: candidate.value.value,
+                fraction: candidate.value.fraction,
+              }
+          : null,
+        modifier: candidate.modifier
+          ? { kind: candidate.modifier.kind, value: candidate.modifier.value }
+          : null,
+        variants: candidate.variants.map(cloneVariant),
+        important: candidate.important,
+        raw: candidate.raw,
+      } satisfies Extract<Candidate, { kind: 'functional' }> as T
+
+    default:
+      candidate satisfies never
+      throw new Error('Unknown candidate kind')
+  }
+}
+
+export function cloneVariant<T extends Variant>(variant: T): T {
+  switch (variant.kind) {
+    case 'arbitrary':
+      return {
+        kind: variant.kind,
+        selector: variant.selector,
+        relative: variant.relative,
+      } satisfies Extract<Variant, { kind: 'arbitrary' }> as T
+
+    case 'static':
+      return { kind: variant.kind, root: variant.root } satisfies Extract<
+        Variant,
+        { kind: 'static' }
+      > as T
+
+    case 'functional':
+      return {
+        kind: variant.kind,
+        root: variant.root,
+        value: variant.value ? { kind: variant.value.kind, value: variant.value.value } : null,
+        modifier: variant.modifier
+          ? { kind: variant.modifier.kind, value: variant.modifier.value }
+          : null,
+      } satisfies Extract<Variant, { kind: 'functional' }> as T
+
+    case 'compound':
+      return {
+        kind: variant.kind,
+        root: variant.root,
+        variant: cloneVariant(variant.variant),
+        modifier: variant.modifier
+          ? { kind: variant.modifier.kind, value: variant.modifier.value }
+          : null,
+      } satisfies Extract<Variant, { kind: 'compound' }> as T
+
+    default:
+      variant satisfies never
+      throw new Error('Unknown variant kind')
+  }
+}
+
 export function* parseCandidate(input: string, designSystem: DesignSystem): Iterable<Candidate> {
   // hover:focus:underline
   // ^^^^^ ^^^^^^           -> Variants
@@ -270,6 +372,14 @@ export function* parseCandidate(input: string, designSystem: DesignSystem): Iter
     }
   }
 
+  // If there's more than one modifier, the utility is invalid.
+  //
+  // E.g.:
+  //
+  // - `bg-red-500/50/50`
+  let parts = segment(base, '/')
+  if (parts.length > 2) return
+
   // Figure out the new base and the modifier segment if present.
   //
   // E.g.:
@@ -279,14 +389,7 @@ export function* parseCandidate(input: string, designSystem: DesignSystem): Iter
   // ^^^^^^^^^^    -> Base without modifier
   //            ^^ -> Modifier segment
   // ```
-  let [baseWithoutModifier, modifierSegment = null, additionalModifier] = segment(base, '/')
-
-  // If there's more than one modifier, the utility is invalid.
-  //
-  // E.g.:
-  //
-  // - `bg-red-500/50/50`
-  if (additionalModifier) return
+  let [baseWithoutModifier, modifierSegment = null] = parts
 
   let parsedModifier = modifierSegment === null ? null : parseModifier(modifierSegment)
 
@@ -326,6 +429,9 @@ export function* parseCandidate(input: string, designSystem: DesignSystem): Iter
     let property = baseWithoutModifier.slice(0, idx)
     let value = decodeArbitraryValue(baseWithoutModifier.slice(idx + 1))
 
+    // Values can't contain `;` or `}` characters at the top-level.
+    if (!isValidArbitrary(value)) return
+
     yield {
       kind: 'arbitrary',
       property,
@@ -379,6 +485,7 @@ export function* parseCandidate(input: string, designSystem: DesignSystem): Iter
   //
   // E.g.:
   //
+  // ```
   // bg-(--my-var)
   // ^^            -> Root
   //    ^^^^^^^^^^ -> Arbitrary value
@@ -405,7 +512,10 @@ export function* parseCandidate(input: string, designSystem: DesignSystem): Iter
 
     // An arbitrary value with `(…)` should always start with `--` since it
     // represents a CSS variable.
-    if (value[0] !== '-' && value[1] !== '-') return
+    if (value[0] !== '-' || value[1] !== '-') return
+
+    // Values can't contain `;` or `}` characters at the top-level.
+    if (!isValidArbitrary(value)) return
 
     roots = [[root, dataType === null ? `[var(${value})]` : `[${dataType}:var(${value})]`]]
   }
@@ -438,10 +548,16 @@ export function* parseCandidate(input: string, designSystem: DesignSystem): Iter
       let valueIsArbitrary = startArbitraryIdx !== -1
 
       if (valueIsArbitrary) {
+        // Arbitrary values must end with a `]`.
+        if (value[value.length - 1] !== ']') return
+
         let arbitraryValue = decodeArbitraryValue(value.slice(startArbitraryIdx + 1, -1))
 
+        // Values can't contain `;` or `}` characters at the top-level.
+        if (!isValidArbitrary(arbitraryValue)) continue
+
         // Extract an explicit typehint if present, e.g. `bg-[color:var(--my-var)])`
-        let typehint = ''
+        let typehint: string | null = null
         for (let i = 0; i < arbitraryValue.length; i++) {
           let code = arbitraryValue.charCodeAt(i)
 
@@ -467,6 +583,8 @@ export function* parseCandidate(input: string, designSystem: DesignSystem): Iter
           continue
         }
 
+        if (typehint === '') continue
+
         candidate.value = {
           kind: 'arbitrary',
           dataType: typehint || null,
@@ -481,6 +599,8 @@ export function* parseCandidate(input: string, designSystem: DesignSystem): Iter
             ? null
             : `${value}/${modifierSegment}`
 
+        if (!IS_VALID_NAMED_VALUE.test(value)) continue
+
         candidate.value = {
           kind: 'named',
           value,
@@ -497,6 +617,9 @@ function parseModifier(modifier: string): CandidateModifier | null {
   if (modifier[0] === '[' && modifier[modifier.length - 1] === ']') {
     let arbitraryValue = decodeArbitraryValue(modifier.slice(1, -1))
 
+    // Values can't contain `;` or `}` characters at the top-level.
+    if (!isValidArbitrary(arbitraryValue)) return null
+
     // Empty arbitrary values are invalid. E.g.: `data-[]:`
     //                                                 ^^
     if (arbitraryValue.length === 0 || arbitraryValue.trim().length === 0) return null
@@ -508,18 +631,29 @@ function parseModifier(modifier: string): CandidateModifier | null {
   }
 
   if (modifier[0] === '(' && modifier[modifier.length - 1] === ')') {
-    let arbitraryValue = decodeArbitraryValue(modifier.slice(1, -1))
+    // Drop the `(` and `)` characters
+    modifier = modifier.slice(1, -1)
 
-    // Empty arbitrary values are invalid. E.g.: `data-():`
-    //                                                 ^^
-    if (arbitraryValue.length === 0 || arbitraryValue.trim().length === 0) return null
+    // A modifier with `(…)` should always start with `--` since it
+    // represents a CSS variable.
+    if (modifier[0] !== '-' || modifier[1] !== '-') return null
+
+    // Values can't contain `;` or `}` characters at the top-level.
+    if (!isValidArbitrary(modifier)) return null
+
+    // Wrap the value in `var(…)` to ensure that it is a valid CSS variable.
+    modifier = `var(${modifier})`
+
+    let arbitraryValue = decodeArbitraryValue(modifier)
 
     return {
       kind: 'arbitrary',
-      value: `var(${arbitraryValue})`,
+      value: arbitraryValue,
     }
   }
 
+  if (!IS_VALID_NAMED_VALUE.test(modifier)) return null
+
   return {
     kind: 'named',
     value: modifier,
@@ -546,6 +680,9 @@ export function parseVariant(variant: string, designSystem: DesignSystem): Varia
 
     let selector = decodeArbitraryValue(variant.slice(1, -1))
 
+    // Values can't contain `;` or `}` characters at the top-level.
+    if (!isValidArbitrary(selector)) return null
+
     // Empty arbitrary values are invalid. E.g.: `[]:`
     //                                            ^^
     if (selector.length === 0 || selector.trim().length === 0) return null
@@ -571,17 +708,18 @@ export function parseVariant(variant: string, designSystem: DesignSystem): Varia
 
   // Static, functional and compound variants
   {
-    // group-hover/group-name
-    // ^^^^^^^^^^^            -> Variant without modifier
-    //             ^^^^^^^^^^ -> Modifier
-    let [variantWithoutModifier, modifier = null, additionalModifier] = segment(variant, '/')
-
     // If there's more than one modifier, the variant is invalid.
     //
     // E.g.:
     //
     // - `group-hover/foo/bar`
-    if (additionalModifier) return null
+    let parts = segment(variant, '/')
+    if (parts.length > 2) return null
+
+    // group-hover/group-name
+    // ^^^^^^^^^^^            -> Variant without modifier
+    //             ^^^^^^^^^^ -> Modifier
+    let [variantWithoutModifier, modifier = null] = parts
 
     let roots = findRoots(variantWithoutModifier, (root) => {
       return designSystem.variants.has(root)
@@ -617,9 +755,15 @@ export function parseVariant(variant: string, designSystem: DesignSystem): Varia
             }
           }
 
-          if (value[0] === '[' && value[value.length - 1] === ']') {
+          if (value[value.length - 1] === ']') {
+            // Discard values like `foo-[#bar]`
+            if (value[0] !== '[') continue
+
             let arbitraryValue = decodeArbitraryValue(value.slice(1, -1))
 
+            // Values can't contain `;` or `}` characters at the top-level.
+            if (!isValidArbitrary(arbitraryValue)) return null
+
             // Empty arbitrary values are invalid. E.g.: `data-[]:`
             //                                                 ^^
             if (arbitraryValue.length === 0 || arbitraryValue.trim().length === 0) return null
@@ -635,13 +779,22 @@ export function parseVariant(variant: string, designSystem: DesignSystem): Varia
             }
           }
 
-          if (value[0] === '(' && value[value.length - 1] === ')') {
+          if (value[value.length - 1] === ')') {
+            // Discard values like `foo-(--bar)`
+            if (value[0] !== '(') continue
+
             let arbitraryValue = decodeArbitraryValue(value.slice(1, -1))
 
+            // Values can't contain `;` or `}` characters at the top-level.
+            if (!isValidArbitrary(arbitraryValue)) return null
+
             // Empty arbitrary values are invalid. E.g.: `data-():`
             //                                                 ^^
             if (arbitraryValue.length === 0 || arbitraryValue.trim().length === 0) return null
 
+            // Arbitrary values must start with `--` since it represents a CSS variable.
+            if (arbitraryValue[0] !== '-' || arbitraryValue[1] !== '-') return null
+
             return {
               kind: 'functional',
               root,
@@ -653,6 +806,8 @@ export function parseVariant(variant: string, designSystem: DesignSystem): Varia
             }
           }
 
+          if (!IS_VALID_NAMED_VALUE.test(value)) continue
+
           return {
             kind: 'functional',
             root,
@@ -664,6 +819,13 @@ export function parseVariant(variant: string, designSystem: DesignSystem): Varia
         case 'compound': {
           if (value === null) return null
 
+          // Forward the modifier of the compound variants to its subVariant.
+          // This allows for `not-group-hover/name:flex` to work.
+          if (modifier && (root === 'not' || root === 'has' || root === 'in')) {
+            value = `${value}/${modifier}`
+            modifier = null
+          }
+
           let subVariant = designSystem.parseVariant(value)
           if (subVariant === null) return null
 
@@ -708,14 +870,6 @@ function* findRoots(input: string, exists: (input: string) => boolean): Iterable
   // Otherwise test every permutation of the input by iteratively removing
   // everything after the last dash.
   let idx = input.lastIndexOf('-')
-  if (idx === -1) {
-    // Variants starting with `@` are special because they don't need a `-`
-    // after the `@` (E.g.: `@-lg` should be written as `@lg`).
-    if (input[0] === '@' && exists('@')) {
-      yield ['@', input.slice(1)]
-    }
-    return
-  }
 
   // Determine the root and value by testing permutations of the incoming input.
   //
@@ -724,7 +878,7 @@ function* findRoots(input: string, exists: (input: string) => boolean): Iterable
   // `bg-red-500` -> No match
   // `bg-red`     -> No match
   // `bg`         -> Match
-  do {
+  while (idx > 0) {
     let maybeRoot = input.slice(0, idx)
 
     if (exists(maybeRoot)) {
@@ -735,9 +889,351 @@ function* findRoots(input: string, exists: (input: string) => boolean): Iterable
       // can skip any further parsing.
       if (root[1] === '') break
 
+      // Edge case: `@-…` is not valid as a variant or a utility so we want to
+      // skip if an `@` is followed by a `-`. Otherwise `@-2xl:flex` and
+      // `@-2xl:flex` would be considered the same.
+      if (root[0] === '@' && exists('@') && input[idx] === '-') break
+
       yield root
     }
 
     idx = input.lastIndexOf('-', idx - 1)
-  } while (idx > 0)
+  }
+
+  // Try '@' variant after permutations. This allows things like `@max` of `@max-foo-bar`
+  // to match before looking for `@`.
+  if (input[0] === '@' && exists('@')) {
+    yield ['@', input.slice(1)]
+  }
+}
+
+export function printCandidate(designSystem: DesignSystem, candidate: Candidate) {
+  let parts: string[] = []
+
+  for (let variant of candidate.variants) {
+    parts.unshift(printVariant(variant))
+  }
+
+  // Handle prefix
+  if (designSystem.theme.prefix) {
+    parts.unshift(designSystem.theme.prefix)
+  }
+
+  let base: string = ''
+
+  // Handle static
+  if (candidate.kind === 'static') {
+    base += candidate.root
+  }
+
+  // Handle functional
+  if (candidate.kind === 'functional') {
+    base += candidate.root
+
+    if (candidate.value) {
+      if (candidate.value.kind === 'arbitrary') {
+        if (candidate.value !== null) {
+          let isVarValue = isVar(candidate.value.value)
+          let value = isVarValue ? candidate.value.value.slice(4, -1) : candidate.value.value
+          let [open, close] = isVarValue ? ['(', ')'] : ['[', ']']
+
+          if (candidate.value.dataType) {
+            base += `-${open}${candidate.value.dataType}:${printArbitraryValue(value)}${close}`
+          } else {
+            base += `-${open}${printArbitraryValue(value)}${close}`
+          }
+        }
+      } else if (candidate.value.kind === 'named') {
+        base += `-${candidate.value.value}`
+      }
+    }
+  }
+
+  // Handle arbitrary
+  if (candidate.kind === 'arbitrary') {
+    base += `[${candidate.property}:${printArbitraryValue(candidate.value)}]`
+  }
+
+  // Handle modifier
+  if (candidate.kind === 'arbitrary' || candidate.kind === 'functional') {
+    base += printModifier(candidate.modifier)
+  }
+
+  // Handle important
+  if (candidate.important) {
+    base += '!'
+  }
+
+  parts.push(base)
+
+  return parts.join(':')
+}
+
+export function printModifier(modifier: ArbitraryModifier | NamedModifier | null) {
+  if (modifier === null) return ''
+
+  let isVarValue = isVar(modifier.value)
+  let value = isVarValue ? modifier.value.slice(4, -1) : modifier.value
+  let [open, close] = isVarValue ? ['(', ')'] : ['[', ']']
+
+  if (modifier.kind === 'arbitrary') {
+    return `/${open}${printArbitraryValue(value)}${close}`
+  } else if (modifier.kind === 'named') {
+    return `/${modifier.value}`
+  } else {
+    modifier satisfies never
+    return ''
+  }
+}
+
+export function printVariant(variant: Variant) {
+  // Handle static variants
+  if (variant.kind === 'static') {
+    return variant.root
+  }
+
+  // Handle arbitrary variants
+  if (variant.kind === 'arbitrary') {
+    return `[${printArbitraryValue(simplifyArbitraryVariant(variant.selector))}]`
+  }
+
+  let base: string = ''
+
+  // Handle functional variants
+  if (variant.kind === 'functional') {
+    base += variant.root
+    // `@` is a special case for functional variants. We want to print: `@lg`
+    // instead of `@-lg`
+    let hasDash = variant.root !== '@'
+    if (variant.value) {
+      if (variant.value.kind === 'arbitrary') {
+        let isVarValue = isVar(variant.value.value)
+        let value = isVarValue ? variant.value.value.slice(4, -1) : variant.value.value
+        let [open, close] = isVarValue ? ['(', ')'] : ['[', ']']
+
+        base += `${hasDash ? '-' : ''}${open}${printArbitraryValue(value)}${close}`
+      } else if (variant.value.kind === 'named') {
+        base += `${hasDash ? '-' : ''}${variant.value.value}`
+      }
+    }
+  }
+
+  // Handle compound variants
+  if (variant.kind === 'compound') {
+    base += variant.root
+    base += '-'
+    base += printVariant(variant.variant)
+  }
+
+  // Handle modifiers
+  if (variant.kind === 'functional' || variant.kind === 'compound') {
+    base += printModifier(variant.modifier)
+  }
+
+  return base
+}
+
+const printArbitraryValueCache = new DefaultMap<string, string>((input) => {
+  let ast = ValueParser.parse(input)
+
+  let drop = new Set<ValueParser.ValueAstNode>()
+
+  let symbols = new Set([
+    // Selectors
+    '~', // Subsequent sibling combinator
+    '>', // Child combinator
+
+    // Math operators
+    '+', // or next sibling combinator
+    '-',
+    '*', // or universal selector
+    '/',
+  ])
+  walk(ast, (node, ctx) => {
+    // Handle operators (e.g.: inside of `calc(…)`)
+    if (node.kind === 'word' && symbols.has(node.value)) {
+      let idx = ctx.index
+
+      // This should not be possible
+      if (idx === -1) return
+
+      // a + b
+      //   ^ node
+      //  ^ previous (whitespace)
+      let previous = ctx.siblings[idx - 1]
+      if (previous?.kind !== 'separator' || previous.value !== ' ') return
+
+      // a + b
+      //   ^ node
+      //    ^ next (whitespace)
+      let next = ctx.siblings[idx + 1]
+      if (next?.kind !== 'separator' || next.value !== ' ') return
+
+      // a + b
+      //   ^ node
+      // ^ previous (node)
+      let previousPrevious = ctx.siblings[idx - 2]
+      if (previousPrevious && symbols.has(previousPrevious.value)) return
+
+      // a + b
+      //   ^ node
+      //     ^ next (node)
+      let nextNext = ctx.siblings[idx + 2]
+      if (nextNext && symbols.has(nextNext.value)) return
+
+      drop.add(previous)
+      drop.add(next)
+    }
+
+    // Leading and trailing whitespace
+    else if (node.kind === 'separator' && node.value.length > 0 && node.value.trim() === '') {
+      if (ctx.siblings[0] === node || ctx.siblings[ctx.siblings.length - 1] === node) {
+        drop.add(node)
+      }
+    }
+
+    // Whitespace around `,` separators can be removed.
+    // E.g.: `min(1px , 2px)` -> `min(1px,2px)`
+    else if (node.kind === 'separator' && node.value.trim() === ',') {
+      node.value = ','
+    }
+
+    // Wrap custom functions starting with `--`, in parentheses if preceded by
+    // a symbol. E.g.: `calc(100%---spacing(2))` → `calc(100%-(--spacing(2)))`
+    else if (node.kind === 'function' && node.value.startsWith('--')) {
+      let idx = ctx.index
+
+      // When it's the first argument, then we don't have to wrap it in `(…)`
+      //
+      // E.g.: `--spacing(…)`, no need to wrap
+      //       `calc(100%---spacing(…))`, we want to wrap
+      //
+      if (idx <= 0) return
+
+      // When it's not the first argument, we likely want to wrap it. However,
+      // when it's separated by a `,` then it's readable enough.
+      //
+      // E.g.: `min(100%,--spacing(2))` is readable, in fact
+      //       `min(100%,(--spacing(2)))` would make it worse
+      let previous = ctx.siblings[idx - 1]
+      if (previous?.kind === 'separator' && previous.value === ',') return
+
+      // When it's part of a bigger list, aka no special symbols were used, then
+      // we don't have to wrap it either.
+      //
+      // E.g.: `shadow-[inset_0px_1px_--theme(--color-white/15%)]`, wrapping would look unnecessary:
+      //       `shadow-[inset_0px_1px_(--theme(--color-white/15%))]`
+      let previousPrevious = ctx.siblings[idx - 2]
+      if (previousPrevious && !symbols.has(previousPrevious.value)) return
+
+      return WalkAction.ReplaceSkip({
+        kind: 'function',
+        value: '', // Unnamed, so will result in `(…)`
+        nodes: [node],
+      } satisfies ValueFunctionNode)
+    }
+  })
+
+  if (drop.size > 0) {
+    walk(ast, (node) => {
+      if (drop.has(node)) {
+        drop.delete(node)
+        return WalkAction.ReplaceSkip([])
+      }
+    })
+  }
+
+  recursivelyEscapeUnderscores(ast)
+
+  return ValueParser.toCss(ast)
+})
+export function printArbitraryValue(input: string) {
+  return printArbitraryValueCache.get(input)
+}
+
+const simplifyArbitraryVariantCache = new DefaultMap<string, string>((input) => {
+  let ast = ValueParser.parse(input)
+
+  // &:is(…)
+  if (
+    ast.length === 3 &&
+    // &
+    ast[0].kind === 'word' &&
+    ast[0].value === '&' &&
+    // :
+    ast[1].kind === 'separator' &&
+    ast[1].value === ':' &&
+    // is(…)
+    ast[2].kind === 'function' &&
+    ast[2].value === 'is'
+  ) {
+    return ValueParser.toCss(ast[2].nodes)
+  }
+
+  return input
+})
+function simplifyArbitraryVariant(input: string) {
+  return simplifyArbitraryVariantCache.get(input)
+}
+
+function recursivelyEscapeUnderscores(ast: ValueParser.ValueAstNode[]) {
+  for (let node of ast) {
+    switch (node.kind) {
+      case 'function': {
+        if (node.value === 'url' || node.value.endsWith('_url')) {
+          // Don't decode underscores in url() but do decode the function name
+          node.value = escapeUnderscore(node.value)
+          break
+        }
+
+        if (
+          node.value === 'var' ||
+          node.value.endsWith('_var') ||
+          node.value === 'theme' ||
+          node.value.endsWith('_theme')
+        ) {
+          node.value = escapeUnderscore(node.value)
+          for (let i = 0; i < node.nodes.length; i++) {
+            recursivelyEscapeUnderscores([node.nodes[i]])
+          }
+          break
+        }
+
+        node.value = escapeUnderscore(node.value)
+        recursivelyEscapeUnderscores(node.nodes)
+        break
+      }
+      case 'separator':
+        node.value = escapeUnderscore(node.value)
+        break
+      case 'word': {
+        // Dashed idents and variables `var(--my-var)` and `--my-var` should not
+        // have underscores escaped
+        if (node.value[0] !== '-' || node.value[1] !== '-') {
+          node.value = escapeUnderscore(node.value)
+        }
+        break
+      }
+      default:
+        never(node)
+    }
+  }
+}
+
+const isVarCache = new DefaultMap<string, boolean>((value) => {
+  let ast = ValueParser.parse(value)
+  return ast.length === 1 && ast[0].kind === 'function' && ast[0].value === 'var'
+})
+function isVar(value: string) {
+  return isVarCache.get(value)
+}
+
+function never(value: never): never {
+  throw new Error(`Unexpected value: ${value}`)
+}
+
+function escapeUnderscore(value: string): string {
+  return value
+    .replaceAll('_', String.raw`\_`) // Escape underscores to keep them as-is
+    .replaceAll(' ', '_') // Replace spaces with underscores
 }
diff --git a/packages/tailwindcss/src/canonicalize-calc-expressions.test.ts b/packages/tailwindcss/src/canonicalize-calc-expressions.test.ts
new file mode 100644
index 000000000..f612e5f7b
--- /dev/null
+++ b/packages/tailwindcss/src/canonicalize-calc-expressions.test.ts
@@ -0,0 +1,24 @@
+import { expect, it } from 'vitest'
+import { canonicalizeCalcExpressions } from './canonicalize-calc-expressions'
+
+it.each([
+  ['calc(-1 * var(--foo))', 'calc(var(--foo) * -1)'],
+  ['calc(1rem + var(--foo))', 'calc(var(--foo) + 1rem)'],
+  ['calc(2rem * calc(3px * var(--foo)))', 'calc(calc(var(--foo) * 3px) * 2rem)'],
+  ['calc(var(--b) + var(--a))', 'calc(var(--a) + var(--b))'],
+  ['calc(3px * 2rem)', 'calc(2rem * 3px)'],
+  ['calc(5px * 3px)', 'calc(3px * 5px)'],
+  ['calc(1 * 1rem)', 'calc(1rem * 1)'],
+  ['calc(10 + 2)', 'calc(2 + 10)'],
+])('`%s` → `%s` (%#)', (input, expected) => {
+  expect(canonicalizeCalcExpressions(input)).toBe(expected)
+})
+
+it.each([
+  ['calc(1rem - var(--foo))'],
+  ['calc(1rem / 2)'],
+  ['calc(var(--a) + 1rem)'],
+  ['calc(2rem * 3px)'],
+])('should keep `%s` (%#)', (input) => {
+  expect(canonicalizeCalcExpressions(input)).toBe(input)
+})
diff --git a/packages/tailwindcss/src/canonicalize-calc-expressions.ts b/packages/tailwindcss/src/canonicalize-calc-expressions.ts
new file mode 100644
index 000000000..7e08f8622
--- /dev/null
+++ b/packages/tailwindcss/src/canonicalize-calc-expressions.ts
@@ -0,0 +1,82 @@
+import { dimensions } from './utils/dimensions'
+import * as ValueParser from './value-parser'
+import { walk, WalkAction } from './walk'
+
+// Assumption: We already assume that we receive somewhat valid `calc()`
+// expressions. So we will see `calc(1 + 1)` and not `calc(1+1)`
+export function canonicalizeCalcExpressions(input: string): string {
+  let [canonicalized, valueAst] = canonicalizeCalcExpressionsAst(ValueParser.parse(input))
+
+  return canonicalized ? ValueParser.toCss(valueAst) : input
+}
+
+export function canonicalizeCalcExpressionsAst(
+  ast: ValueParser.ValueAstNode[],
+): [canonicalized: boolean, ast: ValueParser.ValueAstNode[]] {
+  let canonicalized = false
+
+  walk(ast, {
+    exit(valueNode) {
+      // We are only interested in binary expressions in `calc(…)` and `(…)`,
+      // and only with the `*` or `+` operators.
+      if (valueNode.kind !== 'function') return
+      if (valueNode.value !== 'calc' && valueNode.value !== '') return
+      if (valueNode.nodes.length !== 5) return
+      if (valueNode.nodes[2].kind !== 'word') return
+      if (valueNode.nodes[2].value !== '*' && valueNode.nodes[2].value !== '+') return
+
+      let lhs = valueNode.nodes[0]
+      let rhs = valueNode.nodes[4]
+
+      if (shouldSwap(lhs, rhs)) {
+        canonicalized = true
+
+        let replacement: ValueParser.ValueFunctionNode = {
+          kind: 'function',
+          value: valueNode.value,
+          nodes: [
+            rhs, // Now lhs
+            valueNode.nodes[1], // Separator
+            valueNode.nodes[2], // Operator
+            valueNode.nodes[3], // Separator
+            lhs, // Now rhs
+          ],
+        }
+
+        return WalkAction.ReplaceSkip(replacement)
+      }
+    },
+  })
+
+  return [canonicalized, ast]
+}
+
+function shouldSwap(lhs: ValueParser.ValueAstNode, rhs: ValueParser.ValueAstNode): boolean {
+  let lhsDimension = lhs.kind === 'word' ? dimensions.get(lhs.value) : null
+  let rhsDimension = rhs.kind === 'word' ? dimensions.get(rhs.value) : null
+
+  if (lhsDimension !== null && rhsDimension === null) return true
+  if (lhsDimension === null && rhsDimension !== null) return false
+
+  if (lhsDimension !== null && rhsDimension !== null) {
+    let [lhsValue, lhsUnit] = lhsDimension
+    let [rhsValue, rhsUnit] = rhsDimension
+
+    // Within dimensions, keep unit-bearing values ahead of unitless numbers so
+    // `1rem` sorts before `1`.
+    if (lhsUnit === null && rhsUnit !== null) return true
+    if (lhsUnit !== null && rhsUnit === null) return false
+
+    // Then sort dimensions numerically, and finally by unit for ties.
+    if (lhsValue !== rhsValue) {
+      return lhsValue - rhsValue > 0
+    }
+
+    if (lhsUnit !== rhsUnit) {
+      return (lhsUnit ?? '').localeCompare(rhsUnit ?? '') > 0
+    }
+  }
+
+  // Both nodes are unknown values (not dimensions), sort them as strings
+  return ValueParser.toCss([lhs]).localeCompare(ValueParser.toCss([rhs])) > 0
+}
diff --git a/packages/tailwindcss/src/canonicalize-candidates.test.ts b/packages/tailwindcss/src/canonicalize-candidates.test.ts
new file mode 100644
index 000000000..567f0ad0d
--- /dev/null
+++ b/packages/tailwindcss/src/canonicalize-candidates.test.ts
@@ -0,0 +1,1663 @@
+import { randomUUID } from 'node:crypto'
+import fs from 'node:fs'
+import path from 'node:path'
+import { describe, expect, test } from 'vitest'
+import { __unstable__loadDesignSystem } from '.'
+import { cartesian } from './cartesian'
+import type { CanonicalizeOptions } from './intellisense'
+import plugin from './plugin'
+import { DefaultMap } from './utils/default-map'
+
+const css = String.raw
+const timeout = 25_000
+const defaultTheme = fs.readFileSync(path.resolve(__dirname, '../theme.css'), 'utf8')
+
+const designSystems = new DefaultMap((base: string) => {
+  return new DefaultMap((input: string) => {
+    return __unstable__loadDesignSystem(input, {
+      base,
+      async loadStylesheet() {
+        return {
+          path: '',
+          base: '',
+          content: css`
+            @tailwind utilities;
+
+            ${defaultTheme}
+
+            /* TODO(perf): Only here to speed up the tests */
+            @theme {
+              --*: initial;
+              --breakpoint-lg: 64rem;
+              --breakpoint-md: 48rem;
+              --color-blue-200: oklch(88.2% 0.059 254.128);
+              --color-blue-500: oklch(62.3% 0.214 259.815);
+              --color-red-500: oklch(63.7% 0.237 25.331);
+              --color-white: #fff;
+              --container-md: 28rem;
+              --font-weight-normal: 400;
+              --leading-relaxed: 1.625;
+              --spacing: 0.25rem;
+              --text-sm--line-height: calc(1.25 / 0.875);
+              --text-sm: 0.875rem;
+              --text-xs--line-height: calc(1 / 0.75);
+              --text-xs: 0.75rem;
+            }
+          `,
+        }
+      },
+    })
+  })
+})
+
+const DEFAULT_CANONICALIZATION_OPTIONS: CanonicalizeOptions = {
+  rem: 16,
+  collapse: true,
+  logicalToPhysical: true,
+}
+
+describe.each([['default'], ['with-variant'], ['important'], ['prefix']])('%s', (strategy) => {
+  let testName = '%s → %s (%#)'
+  if (strategy === 'with-variant') {
+    testName = testName.replaceAll('%s', 'focus:%s')
+  } else if (strategy === 'important') {
+    testName = testName.replaceAll('%s', '%s!')
+  } else if (strategy === 'prefix') {
+    testName = testName.replaceAll('%s', 'tw:%s')
+  }
+
+  function prepare(candidate: string) {
+    if (strategy === 'with-variant') {
+      candidate = `focus:${candidate}`
+    } else if (strategy === 'important') {
+      candidate = `${candidate}!`
+    } else if (strategy === 'prefix') {
+      candidate = `tw:${candidate}`
+
+      // Prefix all known CSS variables with `--tw-`, except when used inside of `--theme(…)`.
+      if (candidate.includes('--')) {
+        candidate = candidate
+          .replace(
+            // Replace the variable, as long as it is preceded by a `(`, e.g.:
+            // `bg-(--foo)` or an `:` in case of `bg-(color:--foo)`.
+            //
+            // It also has to end in a `,` or `)` to prevent replacing functions
+            // that look like variables, e.g.: `--spacing(…)`
+            /([(:])--([\w-]+)([,)])/g,
+            (_, start, variable, end) => `${start}--tw-${variable}${end}`,
+          )
+          .replaceAll('--theme(--tw-', '--theme(--')
+      }
+    }
+
+    return candidate
+  }
+
+  async function expectCanonicalization(
+    input: string,
+    candidates: string,
+    expected: string,
+    options: CanonicalizeOptions = DEFAULT_CANONICALIZATION_OPTIONS,
+  ) {
+    let preparedCandidates = candidates.split(/\s+/g).map(prepare)
+    let preparedExpected = expected.split(/\s+/g).map(prepare)
+
+    if (strategy === 'prefix') {
+      input = input.replace("@import 'tailwindcss';", "@import 'tailwindcss' prefix(tw);")
+    }
+
+    let designSystem = await designSystems.get(__dirname).get(input)
+    let actual = designSystem.canonicalizeCandidates(preparedCandidates, options)
+
+    try {
+      expect(actual).toEqual(preparedExpected)
+    } catch (err) {
+      if (err instanceof Error) Error.captureStackTrace(err, expectCanonicalization)
+      throw err
+    }
+  }
+
+  /// ----------------------------------
+
+  describe('deprecated utilities', () => {
+    test.each([
+      /// Legacy bg-gradient-* → bg-linear-*
+      ['bg-gradient-to-t', 'bg-linear-to-t'],
+      ['bg-gradient-to-tr', 'bg-linear-to-tr'],
+      ['bg-gradient-to-r', 'bg-linear-to-r'],
+      ['bg-gradient-to-br', 'bg-linear-to-br'],
+      ['bg-gradient-to-b', 'bg-linear-to-b'],
+      ['bg-gradient-to-bl', 'bg-linear-to-bl'],
+      ['bg-gradient-to-l', 'bg-linear-to-l'],
+      ['bg-gradient-to-tl', 'bg-linear-to-tl'],
+    ])(testName, { timeout }, async (candidate, expected) => {
+      let input = css`
+        @import 'tailwindcss';
+      `
+
+      await expectCanonicalization(input, candidate, expected)
+    })
+
+    let deprecated: [string, string][] = [
+      ['order-none', 'order-0'],
+      ['break-words', 'wrap-break-word'],
+      ['overflow-ellipsis', 'text-ellipsis'],
+
+      ['start-full', 'inset-s-full'],
+      ['-start-full', '-inset-s-full'],
+      ['start-auto', 'inset-s-auto'],
+      ['start-px', 'inset-s-px'],
+      ['-start-px', '-inset-s-px'],
+      ['start-8', 'inset-s-8'], // Within default spacing scale
+      ['-start-8', '-inset-s-8'], // Within default spacing scale
+      ['start-123', 'inset-s-123'], // Outside of default spacing scale
+      ['-start-123', '-inset-s-123'], // Outside of default spacing scale
+
+      ['end-full', 'inset-e-full'],
+      ['-end-full', '-inset-e-full'],
+      ['end-auto', 'inset-e-auto'],
+      ['end-px', 'inset-e-px'],
+      ['-end-px', '-inset-e-px'],
+      ['end-8', 'inset-e-8'], // Within default spacing scale
+      ['-end-8', '-inset-e-8'], // Within default spacing scale
+      ['end-123', 'inset-e-123'], // Outside of default spacing scale
+      ['-end-123', '-inset-e-123'], // Outside of default spacing scale
+    ]
+
+    test.each(deprecated)(testName, { timeout }, async (candidate, expected) => {
+      let input = css`
+        @import 'tailwindcss';
+      `
+
+      await expectCanonicalization(input, candidate, expected)
+    })
+
+    describe('With custom implementation', () => {
+      // Creating a shared CSS file such that we can re-use the same design
+      // system for all of these.
+      let customImplementations = deprecated
+        .map(
+          ([candidate]) => css`
+          @utility ${candidate} {
+            --custom-${randomUUID()}: implementation;
+          }
+        `,
+        )
+        .join('\n')
+
+      // Keep the current utility because of the custom implementation
+      test.each(deprecated.map(([candidate]) => [candidate, candidate]))(
+        testName,
+        { timeout },
+        async (candidate, expected) => {
+          let input = css`
+            @import 'tailwindcss';
+
+            ${customImplementations}
+          `
+
+          await expectCanonicalization(input, candidate, expected)
+        },
+      )
+    })
+  })
+
+  describe('arbitrary properties', () => {
+    test.each([
+      /// theme(…) to `var(…)`
+      // Keep candidates that don't contain `theme(…)` or `theme(…, …)`
+      ['[color:red]', 'text-[red]'],
+
+      // Handle special cases around `.1` in the `theme(…)`
+      ['[--value:theme(spacing.1)]', '[--value:--spacing(1)]'],
+      ['[--value:theme(fontSize.xs.1.lineHeight)]', '[--value:var(--text-xs--line-height)]'],
+      ['[--value:theme(spacing[1.25])]', '[--value:--spacing(1.25)]'],
+
+      // Should not convert invalid spacing values to calc
+      ['[--value:theme(spacing[1.1])]', '[--value:theme(spacing[1.1])]'],
+
+      // Convert to `var(…)` if we can resolve the path
+      ['[color:theme(colors.red.500)]', 'text-red-500'], // Arbitrary property
+      ['[color:theme(colors.red.500)]/50', 'text-red-500/50'], // Arbitrary property + modifier
+
+      // Multiple `theme(… / …)` calls should result in modern syntax of `theme(…)`
+      // - Can't convert to `var(…)` because that would lose the modifier.
+      // - Can't convert to a candidate modifier because there are multiple
+      //   `theme(…)` calls.
+      //
+      //   If we really want to, we can make a fancy migration that tries to move it
+      //   to a candidate modifier _if_ all `theme(…)` calls use the same modifier.
+      [
+        '[color:theme(colors.red.500/50,theme(colors.blue.500/50))]',
+        'text-[--theme(--color-red-500/50,--theme(--color-blue-500/50))]',
+      ],
+      [
+        '[color:theme(colors.red.500/50,theme(colors.blue.500/50))]/50',
+        'text-[--theme(--color-red-500/50,--theme(--color-blue-500/50))]/50',
+      ],
+
+      // Convert the `theme(…)`, but try to move the inline modifier (e.g. `50%`),
+      // to a candidate modifier.
+      // Arbitrary property, with simple percentage modifier
+      ['[color:theme(colors.red.500/75%)]', 'text-red-500/75'],
+
+      // Arbitrary property, with numbers (0-1) without a unit
+      ['[color:theme(colors.red.500/.12)]', 'text-red-500/12'],
+      ['[color:theme(colors.red.500/0.12)]', 'text-red-500/12'],
+
+      // Arbitrary property, with more complex modifier (we only allow whole numbers
+      // as bare modifiers). Convert the complex numbers to arbitrary values instead.
+      ['[color:theme(colors.red.500/12.34%)]', 'text-red-500/[12.34%]'],
+      ['[color:theme(colors.red.500/var(--opacity))]', 'text-red-500/(--opacity)'],
+      ['[color:theme(colors.red.500/.12345)]', 'text-red-500/1234.5'],
+      ['[color:theme(colors.red.500/50.25%)]', 'text-red-500/50.25'],
+
+      // Arbitrary property that already contains a modifier
+      ['[color:theme(colors.red.500/50%)]/50', 'text-[--theme(--color-red-500/50%)]/50'],
+
+      // `calc(var(--spacing)*…)` to `--spacing(…)`
+      ['[padding-top:min(20%,calc(var(--spacing)*8))]', 'pt-[min(20%,--spacing(8))]'],
+      [
+        '[padding-top:min(20%,calc(var(--spacing)*var(--other)))]',
+        'pt-[min(20%,--spacing(var(--other)))]',
+      ],
+      ['[padding-top:calc(var(--spacing)*8)]', 'pt-8'],
+      ['[padding-top:calc(var(--spacing)*var(--other))]', 'pt-[--spacing(var(--other))]'],
+
+      // `theme(…)` calls valid in v3, but not in v4 should still be converted.
+      ['[--foo:theme(transitionDuration.500)]', '[--foo:theme(transitionDuration.500)]'],
+
+      // Invalid cases
+      ['[--foo:theme(colors.red.500/50/50)]', '[--foo:theme(colors.red.500/50/50)]'],
+      ['[--foo:theme(colors.red.500/50/50)]/50', '[--foo:theme(colors.red.500/50/50)]/50'],
+
+      // Partially invalid cases
+      [
+        '[--foo:theme(colors.red.500/50/50)_theme(colors.blue.200)]',
+        '[--foo:theme(colors.red.500/50/50)_var(--color-blue-200)]',
+      ],
+      [
+        '[--foo:theme(colors.red.500/50/50)_theme(colors.blue.200)]/50',
+        '[--foo:theme(colors.red.500/50/50)_var(--color-blue-200)]/50',
+      ],
+
+      // If a utility sets `property` and `--tw-{property}` with the same value,
+      // we can ignore the `--tw-{property}`. This is just here for composition.
+      // This means that we should be able to upgrade the one _without_ to the one
+      // _with_ the variable
+      ['[font-weight:400]', 'font-normal'],
+      ['[line-height:0]', 'leading-0'],
+      ['[border-style:solid]', 'border-solid'],
+
+      // Do not constant fold `0<unit>` to `0` when the type is unknown (which
+      // is often the case with CSS variables)
+      ['[--foo:0px]', '[--foo:0px]'],
+      ['[--foo:calc(0px*1)]', '[--foo:calc(0px*1)]'],
+      ['[--foo:calc(0*1rem)]', '[--foo:calc(0*1rem)]'],
+    ])(testName, { timeout }, async (candidate, expected) => {
+      let input = css`
+        @import 'tailwindcss';
+      `
+
+      await expectCanonicalization(input, candidate, expected)
+    })
+
+    test.each([
+      // Arbitrary property to static utility
+      ['[text-wrap:balance]', 'text-balance'],
+
+      // Arbitrary property to static utility with slight differences in
+      // whitespace. This will require some canonicalization.
+      ['[display:_flex_]', 'flex'],
+      ['[display:_flex]', 'flex'],
+      ['[display:flex_]', 'flex'],
+
+      // Arbitrary property to named functional utility
+      ['[color:var(--color-red-500)]', 'text-red-500'],
+      ['[background-color:var(--color-red-500)]', 'bg-red-500'],
+
+      // Arbitrary property to named utility (case insensitive)
+      ['[color:#fff]', 'text-white'],
+      ['[color:#FFF]', 'text-white'],
+
+      // Arbitrary property with modifier to named functional utility with modifier
+      ['[color:var(--color-red-500)]/25', 'text-red-500/25'],
+
+      // Arbitrary property with arbitrary modifier to named functional utility with
+      // arbitrary modifier
+      ['[color:var(--color-red-500)]/[25%]', 'text-red-500/25'],
+      ['[color:var(--color-red-500)]/[100%]', 'text-red-500'],
+      ['[color:var(--color-red-500)]/100', 'text-red-500'],
+      ['[color:var(--color-red-500)]/[10%]', 'text-red-500/10'],
+      ['[color:var(--color-red-500)]/[10.0%]', 'text-red-500/10'],
+      ['[color:var(--color-red-500)]/[.1]', 'text-red-500/10'],
+      ['[color:var(--color-red-500)]/[.10]', 'text-red-500/10'],
+      // No need for `/50` because that's already encoded in the `--color-primary`
+      // value
+      ['[color:oklch(62.3%_0.214_259.815)]/50', 'text-primary'],
+
+      // Arbitrary property to arbitrary value
+      ['[max-height:20%]', 'max-h-[20%]'],
+
+      // Arbitrary property to bare value
+      ['[grid-column:2]', 'col-2'],
+      ['[grid-column:1234]', 'col-1234'],
+
+      // Complex arbitrary property to arbitrary value
+      [
+        '[grid-template-columns:repeat(2,minmax(100px,1fr))]',
+        'grid-cols-[repeat(2,minmax(100px,1fr))]',
+      ],
+      // Complex arbitrary property to bare value
+      ['[grid-template-columns:repeat(2,minmax(0,1fr))]', 'grid-cols-2'],
+    ])(testName, { timeout }, async (candidate, expected) => {
+      let input = css`
+        @import 'tailwindcss';
+
+        @theme {
+          --*: initial;
+          --spacing: 0.25rem;
+          --color-red-500: red;
+          --color-white: #fff;
+
+          /* Equivalent of blue-500/50 */
+          --color-primary: color-mix(in oklab, oklch(62.3% 0.214 259.815) 50%, transparent);
+        }
+      `
+
+      await expectCanonicalization(input, candidate, expected)
+    })
+  })
+
+  describe('arbitrary values', () => {
+    test.each([
+      // Convert to `var(…)` if we can resolve the path
+      ['bg-[theme(colors.red.500)]', 'bg-red-500'], // Arbitrary value
+      ['bg-[size:theme(spacing.4)]', 'bg-size-[--spacing(4)]'], // Arbitrary value + data type hint
+
+      // Pretty print CSS functions preceded by an operator to prevent consecutive
+      // operator characters.
+      ['w-[calc(100dvh-theme(spacing.2))]', 'w-[calc(100dvh-(--spacing(2)))]'],
+      ['w-[calc(100dvh+theme(spacing.2))]', 'w-[calc(100dvh+(--spacing(2)))]'],
+      ['w-[calc(100dvh/theme(spacing.2))]', 'w-[calc(100dvh/(--spacing(2)))]'],
+      ['w-[calc(100dvh*theme(spacing.2))]', 'w-[calc(100dvh*(--spacing(2)))]'],
+
+      // Convert to `var(…)` if we can resolve the path, but keep fallback values
+      ['bg-[theme(colors.red.500,red)]', 'bg-(--color-red-500,red)'],
+
+      // Keep `theme(…)` if we can't resolve the path
+      ['bg-[theme(colors.foo.1000)]', 'bg-[theme(colors.foo.1000)]'],
+
+      // Keep `theme(…)` if we can't resolve the path, but still try to convert the
+      // fallback value.
+      ['bg-[theme(colors.foo.1000,theme(colors.red.500))]', 'bg-red-500'],
+
+      // Use `theme(…)` (deeply nested) inside of a `calc(…)` function
+      ['text-[calc(theme(fontSize.xs)*2)]', 'text-[calc(var(--text-xs)*2)]'],
+
+      // Arbitrary value
+      ['bg-[theme(colors.red.500/75%)]', 'bg-red-500/75'],
+      ['bg-[theme(colors.red.500/12.34%)]', 'bg-red-500/[12.34%]'],
+
+      // Arbitrary value with different casing
+      ['bg-[#fff]', 'bg-white'],
+      ['bg-[#FFF]', 'bg-white'],
+
+      // Values that don't contain only `theme(…)` calls should not be converted to
+      // use a modifier since the color is not the whole value.
+      [
+        'shadow-[shadow:inset_0px_1px_theme(colors.white/15%)]',
+        'shadow-[inset_0px_1px_--theme(--color-white/15%)]',
+      ],
+
+      // Arbitrary value, where the candidate already contains a modifier
+      // This should still migrate the `theme(…)` syntax to the modern syntax.
+      ['bg-[theme(colors.red.500/50%)]/50', 'bg-[--theme(--color-red-500/50%)]/50'],
+
+      // Variants, we can't use `var(…)` especially inside of `@media(…)`. But
+      // since the value matches the `lg` breakpoint exactly, we can migrate to
+      // the `max-lg` variant.
+      ['max-[theme(screens.lg)]:flex', 'max-lg:flex'],
+      ['min-[theme(screens.lg)]:flex', 'lg:flex'], // We could also map to `min-lg:flex`
+      // There are no variables for `--spacing` multiples, so we can't convert this
+      ['max-[theme(spacing.4)]:flex', 'max-[theme(spacing.4)]:flex'],
+
+      // This test in itself doesn't make much sense. But we need to make sure
+      // that this doesn't end up as the modifier in the candidate itself.
+      ['max-[theme(spacing.4/50)]:flex', 'max-[theme(spacing.4/50)]:flex'],
+
+      // `theme(…)` calls in another CSS function is replaced correctly.
+      // Additionally we remove unnecessary whitespace.
+      ['grid-cols-[min(50%_,_theme(spacing.80))_auto]', 'grid-cols-[min(50%,--spacing(80))_auto]'],
+
+      // `calc(var(--spacing)*…)` to `--spacing(…)`
+      ['pt-[min(20%,calc(var(--spacing)*8))]', 'pt-[min(20%,--spacing(8))]'],
+      ['pt-[min(20%,calc(var(--spacing)*var(--other)))]', 'pt-[min(20%,--spacing(var(--other)))]'],
+      ['pt-[calc(var(--spacing)*8)]', 'pt-8'],
+      ['pt-[calc(var(--spacing)*var(--other))]', 'pt-[--spacing(var(--other))]'],
+
+      // Renamed theme keys
+      ['max-w-[theme(screens.md)]', 'max-w-(--breakpoint-md)'],
+      ['w-[theme(maxWidth.md)]', 'w-md'],
+
+      // Arbitrary property to static utility
+      // Map number to keyword-like value
+      ['leading-[1]', 'leading-none'],
+
+      // Arbitrary value to bare value
+      ['border-[2px]', 'border-2'],
+      ['border-[1234px]', 'border-1234'],
+
+      // Arbitrary value with data type, to more specific arbitrary value
+      ['bg-[position:123px]', 'bg-position-[123px]'],
+      ['bg-[size:123px]', 'bg-size-[123px]'],
+
+      // Arbitrary value with inferred data type, to more specific arbitrary value
+      ['bg-[123px]', 'bg-position-[123px]'],
+
+      // Arbitrary value with spacing mul
+      ['w-[64rem]', 'w-256'],
+
+      // Arbitrary value to bare value with percentage
+      ['from-[25%]', 'from-25%'],
+
+      // Arbitrary percentage value must be a whole number. Should not migrate to
+      // a bare value.
+      ['from-[2.5%]', 'from-[2.5%]'],
+
+      // Negative arbitrary values can be simplified
+      // 1. Try to move the sign _inside_ the arbitrary value
+      // 2. Try to move the sign _out_ of the arbitrary value
+      ['-mt-[12rem]', '-mt-48'], // Arbitrary value → bare value
+      ['-mt-[-12rem]', 'mt-48'], // Double negation
+      ['-mt-[12.34rem]', 'mt-[-12.34rem]'], // Move `-` inside
+      ['-mt-[-12.34rem]', 'mt-[12.34rem]'], // Move `-` inside, double negation
+      ['-mt-[12.34px]', 'mt-[-12.34px]'],
+      ['-mt-[-12.34px]', 'mt-[12.34px]'],
+      ['-mt-[492px]', '-mt-123'], // Moving inside, allows us to migrate to a bare value
+      ['-mt-[calc(-1*492px)]', 'mt-123'], // Double negation and constant folding into bare value
+      ['-mt-[-492px]', 'mt-123'],
+      ['-mt-[calc(-1*-492px)]', '-mt-123'], // Constant folding with calc expressions
+      ['-mt-(--my-var)', '-mt-(--my-var)'], // Keep as-is
+      ['-mt-[var(--my-var)]', '-mt-(--my-var)'], // Keep as-is, but convert to shorthand
+      ['mt-[calc(var(--my-var)*-1)]', '-mt-(--my-var)'], // Move `-` out
+      ['mt-[calc(-1*var(--my-var))]', '-mt-(--my-var)'], // Move `-` out
+      ['-mt-[calc(var(--my-var)*-1)]', 'mt-(--my-var)'], // Move `-` out
+      ['-mt-[calc(-1*var(--my-var))]', 'mt-(--my-var)'], // Move `-` out
+      ['mt-[calc(-1*calc(-1*var(--my-var)))]', 'mt-(--my-var)'], // Move `-` out
+      ['-mt-[calc(-1*calc(-1*var(--my-var)))]', '-mt-(--my-var)'], // Move `-` out
+    ])(testName, { timeout }, async (candidate, expected) => {
+      let input = css`
+        @import 'tailwindcss';
+        @theme {
+          --color-white: #fff;
+        }
+      `
+
+      await expectCanonicalization(input, candidate, expected)
+    })
+  })
+
+  describe('arbitrary utilities', () => {
+    test('migrate with custom static utility `@utility custom {…}`', { timeout }, async () => {
+      let candidate = '[--key:value]'
+      let expected = 'custom'
+
+      let input = css`
+        @import 'tailwindcss';
+        @theme {
+          --*: initial;
+        }
+        @utility custom {
+          --key: value;
+        }
+      `
+
+      await expectCanonicalization(input, candidate, expected)
+    })
+
+    test(
+      'migrate with custom functional utility `@utility custom-* {…}`',
+      { timeout },
+      async () => {
+        let candidate = '[--key:value]'
+        let expected = 'custom-value'
+
+        let input = css`
+          @import 'tailwindcss';
+          @theme {
+            --*: initial;
+          }
+          @utility custom-* {
+            --key: --value('value');
+          }
+        `
+
+        await expectCanonicalization(input, candidate, expected)
+      },
+    )
+
+    test(
+      'migrate with custom functional utility `@utility custom-* {…}` that supports bare values',
+      { timeout },
+      async () => {
+        let candidate = '[--resolved-value:4]'
+        let expected = 'example-4'
+
+        let input = css`
+          @import 'tailwindcss';
+          @theme {
+            --*: initial;
+          }
+          @utility example-* {
+            --resolved-value: --value(integer);
+          }
+        `
+
+        await expectCanonicalization(input, candidate, expected)
+      },
+    )
+
+    test.each([
+      ['[--resolved-value:0]', 'example-0'],
+      ['[--resolved-value:4]', 'example-4'],
+      ['[--resolved-value:8]', 'example-a'],
+      ['example-[0]', 'example-0'],
+      ['example-[4]', 'example-4'],
+      ['example-[8]', 'example-a'],
+    ])(
+      'migrate custom @utility from arbitrary values to bare values and named values (based on theme)',
+      async (candidate, expected) => {
+        let input = css`
+          @import 'tailwindcss';
+          @theme {
+            --*: initial;
+            --example-a: 8;
+          }
+
+          @utility example-* {
+            --resolved-value: --value(--example, integer, [integer]);
+          }
+        `
+
+        await expectCanonicalization(input, candidate, expected)
+      },
+    )
+
+    describe.each([['@theme'], ['@theme inline']])('%s', (theme) => {
+      test.each([
+        ['[color:CanvasText]', 'text-canvas'],
+        ['text-[CanvasText]', 'text-canvas'],
+      ])(`migrate arbitrary value to theme value ${testName}`, async (candidate, expected) => {
+        let input = css`
+          @import 'tailwindcss';
+          ${theme} {
+            --*: initial;
+            --color-canvas: CanvasText;
+          }
+        `
+
+        await expectCanonicalization(input, candidate, expected)
+      })
+
+      // Some utilities read from specific namespaces, in this case we do not want
+      // to migrate to a value in that namespace if we reference a variable that
+      // results in the same value, but comes from a different namespace.
+      //
+      // E.g.: `max-w` reads from: ['--max-width', '--spacing', '--container']
+      test.each([
+        // `max-w` does not read from `--breakpoint-md`, but `--breakpoint-md`  and
+        // `--container-3xl` happen to result in the same value. The difference is
+        // the semantics of the value.
+        ['max-w-(--breakpoint-md)', 'max-w-(--breakpoint-md)'],
+        ['max-w-(--container-3xl)', 'max-w-3xl'],
+      ])(
+        `migrate arbitrary value to theme value ${testName}`,
+        { timeout },
+        async (candidate, expected) => {
+          let input = css`
+            @import 'tailwindcss';
+            ${theme} {
+              --*: initial;
+              --breakpoint-md: 48rem;
+              --container-3xl: 48rem;
+            }
+          `
+
+          await expectCanonicalization(input, candidate, expected)
+        },
+      )
+    })
+
+    test(
+      'migrate an arbitrary property without spaces, to a theme value with spaces (canonicalization)',
+      { timeout },
+      async () => {
+        let candidate = 'font-[foo,bar,baz]'
+        let expected = 'font-example'
+        let input = css`
+          @import 'tailwindcss';
+          @theme {
+            --*: initial;
+            --font-example: foo, bar, baz;
+          }
+        `
+
+        await expectCanonicalization(input, candidate, expected)
+      },
+    )
+
+    test.each([
+      // Default spacing scale
+      ['w-[64rem]', 'w-256', '0.25rem'],
+
+      // Non-suggested numbers
+      ['gap-[7.25rem]', 'gap-29', '0.25rem'],
+      ['gap-[calc(7rem+0.25rem)]', 'gap-29', '0.25rem'],
+      ['gap-[116px]', 'gap-29', '0.25rem'],
+
+      // Non-suggested numbers, with the same spacing scale with different
+      // units
+      ['gap-[7.25rem]', 'gap-29', '4px'],
+      ['gap-[calc(7rem+0.25rem)]', 'gap-29', '4px'],
+      ['gap-[116px]', 'gap-29', '4px'],
+
+      // Non-suggested numbers, with a different spacing scale
+      ['gap-[7.25rem]', 'gap-116', '1px'],
+      ['gap-[calc(7rem+0.25rem)]', 'gap-116', '1px'],
+      ['gap-[116px]', 'gap-116', '1px'],
+
+      // Keep arbitrary value if units are different
+      ['w-[124px]', 'w-31', '0.25rem'],
+
+      // Keep arbitrary value if bare value doesn't fit in steps of .25
+      ['w-[0.123rem]', 'w-[0.123rem]', '0.25rem'],
+
+      // Custom pixel based spacing scale
+      ['w-[123px]', 'w-123', '1px'],
+      ['w-[256px]', 'w-128', '2px'],
+    ])(`${testName} (spacing = \`%s\`)`, { timeout }, async (candidate, expected, spacing) => {
+      let input = css`
+        @import 'tailwindcss';
+
+        @theme {
+          --*: initial;
+          --spacing: ${spacing};
+        }
+      `
+
+      await expectCanonicalization(input, candidate, expected)
+    })
+  })
+
+  describe('bare values', () => {
+    let input = css`
+      @import 'tailwindcss';
+      @theme {
+        --*: initial;
+        --spacing: 0.25rem;
+        --aspect-video: 16 / 9;
+        --example-a: 8;
+      }
+
+      @utility example-* {
+        --resolved-value: --value(--example, integer);
+      }
+    `
+
+    test.each([
+      // Built-in utility with bare value fraction
+      ['aspect-16/9', 'aspect-video'],
+
+      // Custom utility with bare value integer
+      ['example-8', 'example-a'],
+    ])(testName, { timeout }, async (candidate, expected) => {
+      await expectCanonicalization(input, candidate, expected)
+    })
+  })
+
+  describe('arbitrary variants', () => {
+    let input = css`
+      @import 'tailwindcss';
+      @theme {
+        --*: initial;
+        --breakpoint-lg: 64rem;
+      }
+    `
+
+    test.each([
+      // Arbitrary variant to static variant
+      ['[&:focus]:flex', 'focus:flex'],
+
+      // Arbitrary variant to static variant with at-rules
+      ['[@media(scripting:_none)]:flex', 'noscript:flex'],
+
+      // Arbitrary variant to static utility at-rules and with slight differences
+      // in whitespace. This will require some canonicalization.
+      ['[@media(scripting:none)]:flex', 'noscript:flex'],
+      ['[@media(scripting:_none)]:flex', 'noscript:flex'],
+      ['[@media_(scripting:_none)]:flex', 'noscript:flex'],
+
+      // Arbitrary variants with media queries cannot use `var(…)`, but if an
+      // equivalent variant exists we can use that one instead.
+      ['[@media(width>=theme(screens.lg))]:flex', 'lg:flex'], // `min-lg:flex` would also be valid
+      ['[@media(width<theme(screens.lg))]:flex', 'max-lg:flex'],
+
+      // With compound variants
+      ['has-[&:focus]:flex', 'has-focus:flex'],
+      ['not-[&:focus]:flex', 'not-focus:flex'],
+      ['group-[&:focus]:flex', 'group-focus:flex'],
+      ['peer-[&:focus]:flex', 'peer-focus:flex'],
+      ['in-[&:focus]:flex', 'in-focus:flex'],
+    ])(testName, { timeout }, async (candidate, expected) => {
+      await expectCanonicalization(input, candidate, expected)
+    })
+
+    test('unsafe migrations keep the candidate as-is', { timeout }, async () => {
+      // `hover:` also includes an `@media` query in addition to the `&:hover`
+      // state. Migration is not safe because the functionality would be different.
+      let candidate = '[&:hover]:flex'
+      let expected = '[&:hover]:flex'
+      let input = css`
+        @import 'tailwindcss';
+        @theme {
+          --*: initial;
+        }
+      `
+
+      await expectCanonicalization(input, candidate, expected)
+    })
+
+    test('make unsafe migration safe (1)', { timeout }, async () => {
+      // Overriding the `hover:` variant to only use a selector will make the
+      // migration safe.
+      let candidate = '[&:hover]:flex'
+      let expected = 'hover:flex'
+      let input = css`
+        @import 'tailwindcss';
+        @theme {
+          --*: initial;
+        }
+        @variant hover (&:hover);
+      `
+
+      await expectCanonicalization(input, candidate, expected)
+    })
+
+    test('make unsafe migration safe (2)', { timeout }, async () => {
+      // Overriding the `hover:` variant to only use a selector will make the
+      // migration safe. This time with the long-hand `@variant` syntax.
+      let candidate = '[&:hover]:flex'
+      let expected = 'hover:flex'
+      let input = css`
+        @import 'tailwindcss';
+        @theme {
+          --*: initial;
+        }
+        @variant hover {
+          &:hover {
+            @slot;
+          }
+        }
+      `
+
+      await expectCanonicalization(input, candidate, expected)
+    })
+
+    test('custom selector-based variants', { timeout }, async () => {
+      let candidate = '[&.macos]:flex'
+      let expected = 'is-macos:flex'
+      let input = css`
+        @import 'tailwindcss';
+        @theme {
+          --*: initial;
+        }
+        @variant is-macos (&.macos);
+      `
+
+      await expectCanonicalization(input, candidate, expected)
+    })
+
+    test('custom @media-based variants', { timeout }, async () => {
+      let candidate = '[@media(prefers-reduced-transparency:reduce)]:flex'
+      let expected = 'transparency-safe:flex'
+      let input = css`
+        @import 'tailwindcss';
+        @theme {
+          --*: initial;
+        }
+        @variant transparency-safe {
+          @media (prefers-reduced-transparency: reduce) {
+            @slot;
+          }
+        }
+      `
+
+      await expectCanonicalization(input, candidate, expected)
+    })
+  })
+
+  describe('drop unnecessary data types', () => {
+    let input = css`
+      @import 'tailwindcss';
+      @theme {
+        --*: initial;
+        --color-red-500: red;
+      }
+    `
+
+    test.each([
+      // A color value can be inferred from the value
+      ['bg-[color:#008cc]', 'bg-[#008cc]'],
+
+      // A color is the default for `bg-*`
+      ['bg-(color:--my-value)', 'bg-(--my-value)'],
+
+      // A color with a known theme variable migrates to the full utility
+      ['bg-(color:--color-red-500)', 'bg-red-500'],
+    ])(testName, { timeout }, async (candidate, expected) => {
+      await expectCanonicalization(input, candidate, expected)
+    })
+  })
+
+  describe('arbitrary value to bare value', () => {
+    test.each([
+      ['aspect-[12/34]', 'aspect-12/34'],
+      ['aspect-[1.2/34]', 'aspect-[1.2/34]'],
+      ['col-start-[7]', 'col-start-7'],
+      ['flex-[2]', 'flex-2'], // `flex` is implemented as static and functional utilities
+
+      ['grid-cols-[subgrid]', 'grid-cols-subgrid'],
+      ['grid-rows-[subgrid]', 'grid-rows-subgrid'],
+
+      // Handle zeroes
+      ['m-[0]', 'm-0'],
+      ['m-[0px]', 'm-0'],
+      ['m-[0rem]', 'm-0'],
+
+      ['-m-[0]', 'm-0'],
+      ['-m-[0px]', 'm-0'],
+      ['-m-[0rem]', 'm-0'],
+
+      ['m-[-0]', 'm-0'],
+      ['m-[-0px]', 'm-0'],
+      ['m-[-0rem]', 'm-0'],
+
+      ['-m-[-0]', 'm-0'],
+      ['-m-[-0px]', 'm-0'],
+      ['-m-[-0rem]', 'm-0'],
+
+      ['[margin:0]', 'm-0'],
+      ['[margin:-0]', 'm-0'],
+      ['[margin:0px]', 'm-0'],
+
+      // Limit conversions for big values using the `--spacing` multiplier
+      ['left-[99999px]', 'left-[99999px]'], // This would otherwise result in `left-24999.75`
+      ['left-[-99999px]', 'left-[-99999px]'], // This would otherwise result in `-left-24999.75`
+      ['left-[96rem]', 'left-384'], // Within the limit
+      ['left-[-96rem]', '-left-384'], // Within the limit
+      ['left-[calc(96rem+1px)]', 'left-[calc(96rem+1px)]'], // Out of the positive limit
+      ['left-[calc(-96rem-1px)]', 'left-[calc(-96rem-1px)]'], // Out of the negative limit
+      ['z-[9999999]', 'z-9999999'], // `--spacing` multiplier is not used
+
+      // Not a length-unit, can't safely constant fold
+      ['[margin:0%]', 'm-[0%]'],
+
+      // Only 50-200% (inclusive) are valid:
+      // https://developer.mozilla.org/en-US/docs/Web/CSS/font-stretch#percentage
+      ['font-stretch-[50%]', 'font-stretch-50%'],
+      ['font-stretch-[50.5%]', 'font-stretch-[50.5%]'],
+      ['font-stretch-[201%]', 'font-stretch-[201%]'],
+      ['font-stretch-[49%]', 'font-stretch-[49%]'],
+      // Should stay as-is
+      ['font-stretch-[1/2]', 'font-stretch-[1/2]'],
+
+      // Bare value with % is valid for these utilities
+      ['from-[28%]', 'from-28%'],
+      ['via-[28%]', 'via-28%'],
+      ['to-[28%]', 'to-28%'],
+      ['from-[28.5%]', 'from-[28.5%]'],
+      ['via-[28.5%]', 'via-[28.5%]'],
+      ['to-[28.5%]', 'to-[28.5%]'],
+
+      // This test in itself is a bit flawed because `text-[1/2]` currently
+      // generates something. Converting it to `text-1/2` doesn't produce anything.
+      ['text-[1/2]', 'text-[1/2]'],
+
+      // Leading is special, because `leading-[123]` is the direct value of 123, but
+      // `leading-123` maps to `calc(--spacing(123))`.
+      ['leading-[123]', 'leading-[123]'],
+
+      ['data-[selected]:flex', 'data-selected:flex'],
+      ['data-[foo=bar]:flex', 'data-[foo=bar]:flex'],
+
+      ['supports-[gap]:flex', 'supports-gap:flex'],
+      ['supports-[display:grid]:flex', 'supports-[display:grid]:flex'],
+
+      ['group-data-[selected]:flex', 'group-data-selected:flex'],
+      ['group-data-[foo=bar]:flex', 'group-data-[foo=bar]:flex'],
+      ['group-has-data-[selected]:flex', 'group-has-data-selected:flex'],
+
+      ['aria-[selected]:flex', 'aria-[selected]:flex'],
+      ['aria-[selected="true"]:flex', 'aria-selected:flex'],
+      ['aria-[selected*="true"]:flex', 'aria-[selected*="true"]:flex'],
+
+      ['group-aria-[selected]:flex', 'group-aria-[selected]:flex'],
+      ['group-aria-[selected="true"]:flex', 'group-aria-selected:flex'],
+      ['group-has-aria-[selected]:flex', 'group-has-aria-[selected]:flex'],
+
+      ['max-lg:hover:data-[selected]:flex', 'max-lg:hover:data-selected:flex'],
+      [
+        'data-[selected]:aria-[selected="true"]:aspect-[12/34]',
+        'data-selected:aria-selected:aspect-12/34',
+      ],
+    ])(testName, { timeout }, async (candidate, expected) => {
+      let input = css`
+        @import 'tailwindcss';
+      `
+      await expectCanonicalization(input, candidate, expected)
+    })
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/20365
+  describe('media query and container query variants', () => {
+    test.each([
+      // Breakpoints (`--breakpoint-lg: 64rem`, `--breakpoint-md: 48rem`)
+      ['min-[64rem]:flex', 'lg:flex'],
+      ['max-[64rem]:flex', 'max-lg:flex'],
+      ['min-[48rem]:flex', 'md:flex'],
+      ['max-[48rem]:flex', 'max-md:flex'],
+
+      // With the `rem` option set, equivalent `px` values should also be
+      // canonicalized to the breakpoint variants.
+      ['min-[1024px]:flex', 'lg:flex'],
+      ['max-[1024px]:flex', 'max-lg:flex'],
+
+      // Container queries (`--container-md: 28rem`)
+      ['@min-[28rem]:flex', '@md:flex'],
+      ['@max-[28rem]:flex', '@max-md:flex'],
+      ['@min-[448px]:flex', '@md:flex'],
+      ['@max-[448px]:flex', '@max-md:flex'],
+
+      // Values that don't map to a known breakpoint or container size should
+      // stay as-is.
+      ['min-[123px]:flex', 'min-[123px]:flex'],
+      ['max-[123px]:flex', 'max-[123px]:flex'],
+      ['@min-[123px]:flex', '@min-[123px]:flex'],
+      ['@max-[123px]:flex', '@max-[123px]:flex'],
+
+      // Named variants that produce the same CSS should be kept as-is
+      ['min-lg:flex', 'min-lg:flex'],
+      ['@min-md:flex', '@min-md:flex'],
+    ])(testName, { timeout }, async (candidate, expected) => {
+      let input = css`
+        @import 'tailwindcss';
+      `
+
+      await expectCanonicalization(input, candidate, expected)
+    })
+
+    test.each([
+      // Without the `rem` option, `px` values cannot be safely converted to
+      // `rem` based breakpoints.
+      ['min-[1024px]:flex', 'min-[1024px]:flex'],
+      ['@min-[448px]:flex', '@min-[448px]:flex'],
+
+      // Same unit still works without the `rem` option
+      ['min-[64rem]:flex', 'lg:flex'],
+      ['max-[64rem]:flex', 'max-lg:flex'],
+      ['@min-[28rem]:flex', '@md:flex'],
+      ['@max-[28rem]:flex', '@max-md:flex'],
+    ])(`${testName} (no rem option)`, { timeout }, async (candidate, expected) => {
+      let input = css`
+        @import 'tailwindcss';
+      `
+
+      await expectCanonicalization(input, candidate, expected, {
+        collapse: true,
+        logicalToPhysical: true,
+      })
+    })
+  })
+
+  describe('modernize arbitrary variants', () => {
+    test.each([
+      // Arbitrary variants
+      ['[[data-visible]]:flex', 'data-visible:flex'],
+      ['[&[data-visible]]:flex', 'data-visible:flex'],
+      ['[[data-visible]&]:flex', 'data-visible:flex'],
+      ['[&>[data-visible]]:flex', '*:data-visible:flex'],
+      ['[&_>_[data-visible]]:flex', '*:data-visible:flex'],
+      ['[&>*]:flex', '*:flex'],
+      ['[&_>_*]:flex', '*:flex'],
+      ['[&_>_[foo]]:flex', '*:[[foo]]:flex'],
+      ['[&_[foo]]:flex', '**:[[foo]]:flex'],
+      ['[&_>_[foo=bar]]:flex', '*:[[foo=bar]]:flex'],
+      ['[&_[foo=bar]]:flex', '**:[[foo=bar]]:flex'],
+
+      ['[&_[data-visible]]:flex', '**:data-visible:flex'],
+      ['[&_*]:flex', '**:flex'],
+
+      ['[&:first-child]:flex', 'first:flex'],
+      ['[&:not(:first-child)]:flex', 'not-first:flex'],
+
+      ['[&_:first-child]:flex', '**:first:flex'],
+      ['[&_>_:first-child]:flex', '*:first:flex'],
+      ['[&_:--custom]:flex', '**:[:--custom]:flex'],
+      ['[&_>_:--custom]:flex', '*:[:--custom]:flex'],
+
+      // in-* variants
+      ['[p_&]:flex', 'in-[p]:flex'],
+      ['[.foo_&]:flex', 'in-[.foo]:flex'],
+      ['[[data-visible]_&]:flex', 'in-data-visible:flex'],
+      // Multiple selectors, should stay as-is
+      ['[[data-foo][data-bar]_&]:flex', '[[data-foo][data-bar]_&]:flex'],
+      // Using `>` instead of ` ` should not be transformed:
+      ['[figure>&]:my-0', '[figure>&]:my-0'],
+
+      // nth-child
+      ['[&:nth-child(2)]:flex', 'nth-2:flex'],
+      ['[&:not(:nth-child(2))]:flex', 'not-nth-2:flex'],
+
+      ['[&:nth-child(-n+3)]:flex', 'nth-[-n+3]:flex'],
+      ['[&:not(:nth-child(-n+3))]:flex', 'not-nth-[-n+3]:flex'],
+      ['[&:nth-child(-n_+_3)]:flex', 'nth-[-n+3]:flex'],
+      ['[&:not(:nth-child(-n_+_3))]:flex', 'not-nth-[-n+3]:flex'],
+
+      // nth-last-child
+      ['[&:nth-last-child(2)]:flex', 'nth-last-2:flex'],
+      ['[&:not(:nth-last-child(2))]:flex', 'not-nth-last-2:flex'],
+
+      ['[&:nth-last-child(-n+3)]:flex', 'nth-last-[-n+3]:flex'],
+      ['[&:not(:nth-last-child(-n+3))]:flex', 'not-nth-last-[-n+3]:flex'],
+      ['[&:nth-last-child(-n_+_3)]:flex', 'nth-last-[-n+3]:flex'],
+      ['[&:not(:nth-last-child(-n_+_3))]:flex', 'not-nth-last-[-n+3]:flex'],
+
+      // nth-child odd/even
+      ['[&:nth-child(odd)]:flex', 'odd:flex'],
+      ['[&:not(:nth-child(odd))]:flex', 'even:flex'],
+      ['[&:nth-child(even)]:flex', 'even:flex'],
+      ['[&:not(:nth-child(even))]:flex', 'odd:flex'],
+
+      // Keep multiple attribute selectors as-is
+      ['[[data-visible][data-dark]]:flex', '[[data-visible][data-dark]]:flex'],
+
+      // Keep `:where(…)` as is
+      ['[:where([data-visible])]:flex', '[:where([data-visible])]:flex'],
+
+      // Complex attribute selectors with operators, quotes and insensitivity flags
+      ['[[data-url*="example"]]:flex', 'data-[url*="example"]:flex'],
+      ['[[data-url$=".com"_i]]:flex', 'data-[url$=".com"_i]:flex'],
+      ['[[data-url$=.com_i]]:flex', 'data-[url$=.com_i]:flex'],
+
+      // Attribute selector wrapped in `&:is(…)`
+      ['[&:is([data-visible])]:flex', 'data-visible:flex'],
+
+      // Media queries
+      ['[@media(pointer:fine)]:flex', 'pointer-fine:flex'],
+      ['[@media_(pointer_:_fine)]:flex', 'pointer-fine:flex'],
+      ['[@media_not_(pointer_:_fine)]:flex', 'not-pointer-fine:flex'],
+      ['[@media_print]:flex', 'print:flex'],
+      ['[@media_not_print]:flex', 'not-print:flex'],
+
+      // Hoist the `:not` part to a compound variant
+      ['[@media_not_(prefers-color-scheme:dark)]:flex', 'not-dark:flex'],
+      [
+        '[@media_not_(prefers-color-scheme:unknown)]:flex',
+        'not-[@media_(prefers-color-scheme:unknown)]:flex',
+      ],
+
+      // Compound arbitrary variants
+      ['has-[[data-visible]]:flex', 'has-data-visible:flex'],
+      ['has-[&:is([data-visible])]:flex', 'has-data-visible:flex'],
+      ['has-[&>[data-visible]]:flex', 'has-[&>[data-visible]]:flex'],
+
+      ['has-[[data-slot=description]]:flex', 'has-data-[slot=description]:flex'],
+      ['has-[&:is([data-slot=description])]:flex', 'has-data-[slot=description]:flex'],
+
+      ['has-[[aria-visible="true"]]:flex', 'has-aria-visible:flex'],
+      ['has-[[aria-visible]]:flex', 'has-aria-[visible]:flex'],
+
+      ['has-[&:not(:nth-child(even))]:flex', 'has-odd:flex'],
+
+      // Arbitrary variant to compound + arbitrary variants
+      ['[&:has([role=checkbox])]:flex', 'has-[[role=checkbox]]:flex'],
+      ['[&:has([aria-visible="true"])]:flex', 'has-aria-visible:flex'],
+      ['[&:has([data-slot=description])]:flex', 'has-data-[slot=description]:flex'],
+    ])(testName, { timeout }, async (candidate, expected) => {
+      let input = css`
+        @import 'tailwindcss';
+      `
+      await expectCanonicalization(input, candidate, expected)
+    })
+  })
+
+  describe('optimize modifier', () => {
+    let input = css`
+      @import 'tailwindcss';
+      @theme {
+        --*: initial;
+        --color-red-500: red;
+      }
+    `
+
+    test.each([
+      // Keep the modifier as-is, nothing to optimize
+      ['bg-red-500/25', 'bg-red-500/25'],
+
+      // Use a bare value modifier
+      ['bg-red-500/[25%]', 'bg-red-500/25'],
+
+      // Convert 0-1 values to bare values
+      ['bg-[#f00]/[0.16]', 'bg-[#f00]/16'],
+
+      // Drop unnecessary modifiers
+      ['bg-red-500/[100%]', 'bg-red-500'],
+      ['bg-red-500/100', 'bg-red-500'],
+
+      // Keep modifiers on classes that don't _really_ exist
+      ['group/name', 'group/name'],
+    ])(testName, { timeout }, async (candidate, expected) => {
+      await expectCanonicalization(input, candidate, expected)
+    })
+  })
+
+  describe('combine to shorthand utilities', () => {
+    test.each([
+      // 4 to 1
+      ['mt-1 mr-1 mb-1 ml-1', 'm-1'],
+      ['border-t-123 border-r-123 border-b-123 border-l-123', 'border-123'],
+      ['border-t-1 border-r-1 border-b-1 border-l-1', 'border'], // `border` is shorter than `border-1`
+      ['border-t-red-500 border-r-red-500 border-b-red-500 border-l-red-500', 'border-red-500'],
+      ['scroll-mt-1 scroll-mr-1 scroll-mb-1 scroll-ml-1', 'scroll-m-1'],
+      ['scroll-pt-1 scroll-pr-1 scroll-pb-1 scroll-pl-1', 'scroll-p-1'],
+
+      // 2 to 1
+      ['mt-1 mb-1', 'my-1'],
+      ['border-t-123 border-b-123', 'border-y-123'],
+      ['border-t-1 border-b-1', 'border-y'], // `border-y` is shorter than `border-y-1`
+      ['border-t-red-500 border-b-red-500', 'border-y-red-500'],
+      ['scroll-mt-1 scroll-mb-1', 'scroll-my-1'],
+      ['scroll-pt-1 scroll-pb-1', 'scroll-py-1'],
+      ['overflow-x-hidden overflow-y-hidden', 'overflow-hidden'],
+      ['overscroll-x-contain overscroll-y-contain', 'overscroll-contain'],
+
+      // Different order as above
+      ['mb-1 mt-1', 'my-1'],
+
+      // To completely different utility
+      ['w-4 h-4', 'size-4'],
+
+      // Goes beyond the default spacing scale that's being used in intellisense
+      // for code completion. Since it's about bare values, we should still be
+      // able to combine them.
+      ['w-123 h-123', 'size-123'],
+      ['w-128 h-128', 'size-128'], // `w-128` on its own would become `w-lg`
+      ['mt-123 mb-123', 'my-123'],
+
+      // Collapse duplicates into themselves
+      ['w-8 w-8', 'w-8'],
+
+      // `w-*` and `h-*` would canonicalize to `size-5`
+      // `size-5` and `size-5` should then canonicalize to `size-5`
+      ['w-[calc(1rem+0.25rem)] h-[calc(1rem+0.25rem)] size-5', 'size-5'],
+
+      // Same as above, but with an additional unrelated class
+      ['w-[calc(1rem+0.25rem)] h-[calc(1rem+0.25rem)] size-5 flex', 'size-5 flex'],
+
+      // Do not touch if not operating on the same variants
+      ['hover:w-4 h-4', 'hover:w-4 h-4'],
+
+      // Arbitrary properties to combined class
+      ['[width:_16px_] [height:16px]', 'size-4'],
+
+      // Arbitrary properties to combined class with modifier
+      ['[font-size:14px] [line-height:1.625]', 'text-sm/relaxed'],
+    ])(testName, { timeout }, async (candidates, expected) => {
+      let input = css`
+        @import 'tailwindcss';
+      `
+      await expectCanonicalization(input, candidates, expected)
+    })
+  })
+
+  describe('font-size/line-height to text-{x}/{y}', () => {
+    test.each([
+      ...Array.from(
+        cartesian(
+          ['[font-size:14px]', 'text-[14px]', 'text-[14px]/6', 'text-sm', 'text-sm/6'],
+          ['[line-height:28px]', 'leading-[28px]', 'leading-7'],
+        ),
+      ).map((classes) => [classes.join(' ').padEnd(40, ' '), 'text-sm/7']),
+      ...Array.from(
+        cartesian(
+          ['[font-size:15px]', 'text-[15px]', 'text-[15px]/6'],
+          ['[line-height:28px]', 'leading-[28px]', 'leading-7'],
+        ),
+      ).map((classes) => [classes.join(' ').padEnd(40, ' '), 'text-[15px]/7']),
+      ...Array.from(
+        cartesian(
+          ['[font-size:14px]', 'text-[14px]', 'text-[14px]/6', 'text-sm', 'text-sm/6'],
+          ['[line-height:28.5px]', 'leading-[28.5px]'],
+        ),
+      ).map((classes) => [classes.join(' ').padEnd(40, ' '), 'text-sm/[28.5px]']),
+      ...Array.from(
+        cartesian(
+          ['[font-size:15px]', 'text-[15px]', 'text-[15px]/6'],
+          ['[line-height:28.5px]', 'leading-[28.5px]'],
+        ),
+      ).map((classes) => [classes.join(' ').padEnd(40, ' '), 'text-[15px]/[28.5px]']),
+    ])(testName, { timeout }, async (candidates, expected) => {
+      let input = css`
+        @import 'tailwindcss';
+      `
+      await expectCanonicalization(input, candidates.trim(), expected)
+    })
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss-intellisense/issues/1558
+  test.each([
+    ['tracking-[-0.05em]', 'tracking-tighter'],
+    ['tracking-[-0.025em]', 'tracking-tight'],
+    ['tracking-[0em]', 'tracking-normal'],
+    ['tracking-[0.025em]', 'tracking-wide'],
+    ['tracking-[0.05em]', 'tracking-wider'],
+    ['tracking-[0.1em]', 'tracking-widest'],
+
+    // Negative values that don't make sense
+    // See: https://tailwindcss.com/docs/letter-spacing#using-negative-values
+    ['-tracking-tighter', 'tracking-wider'],
+    ['-tracking-tight', 'tracking-wide'],
+    ['-tracking-normal', 'tracking-normal'],
+    ['-tracking-wide', 'tracking-tight'],
+    ['-tracking-wider', 'tracking-tighter'],
+  ])(testName, { timeout }, async (candidate, expected) => {
+    await expectCanonicalization(
+      css`
+        @import 'tailwindcss';
+        @theme {
+          --tracking-tighter: -0.05em;
+          --tracking-tight: -0.025em;
+          --tracking-normal: 0em;
+          --tracking-wide: 0.025em;
+          --tracking-wider: 0.05em;
+          --tracking-widest: 0.1em;
+        }
+      `,
+      candidate,
+      expected,
+    )
+  })
+
+  test.each([
+    // Keep whitespace characters that are significant
+    ['[&:has(~_*_*:checked)]:flex', '[&:has(~_*_*:checked)]:flex'],
+    [
+      'shadow-[inset_0px_1px_--theme(--color-white/15%)]',
+      'shadow-[inset_0px_1px_--theme(--color-white/15%)]',
+    ],
+
+    // Improve readability when whitespace was used for readability
+    ['w-[calc(100%_-_calc(var(--spacing)*60))]', 'w-[calc(100%-(--spacing(60)))]'],
+    ['w-[calc(100%_-_--spacing(60))]', 'w-[calc(100%-(--spacing(60)))]'],
+
+    // No need to wrap in `(…)` after a `,`
+    ['m-[min(100%,_--spacing(6))]', 'm-[min(100%,--spacing(6))]'],
+    ['m-[min(100%_,_--spacing(6))]', 'm-[min(100%,--spacing(6))]'],
+    ['m-[min(100%,--spacing(6))]', 'm-[min(100%,--spacing(6))]'],
+  ])(testName, async (candidate, expected) => {
+    let input = css`
+      @import 'tailwindcss';
+    `
+
+    await expectCanonicalization(input, candidate, expected)
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss-intellisense/issues/1573
+  test.each([
+    ['-mt-[0.04in]', 'mt-[-0.04in]'],
+    ['mt-[-0.04in]', 'mt-[-0.04in]'],
+    ['-mt-[-0.04in]', 'mt-[0.04in]'],
+  ])(testName, { timeout }, async (candidate, expected) => {
+    let input = css`
+      @import 'tailwindcss';
+    `
+
+    await expectCanonicalization(input, candidate, expected)
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss-intellisense/issues/1591
+  test.each([
+    ['w-[calc(100%/3.5)]', 'w-[calc(100%/3.5)]'], // Not w-[28.571428571428573%]
+  ])(testName, { timeout }, async (candidate, expected) => {
+    let input = css`
+      @import 'tailwindcss';
+    `
+
+    await expectCanonicalization(input, candidate, expected)
+  })
+})
+
+describe('theme to var', () => {
+  test('extended space scale converts to var or calc', { timeout }, async () => {
+    let designSystem = await __unstable__loadDesignSystem(
+      css`
+        @tailwind utilities;
+        @theme {
+          --spacing: 0.25rem;
+          --spacing-2: 2px;
+          --spacing-miami: 0.875rem;
+        }
+      `,
+      { base: __dirname },
+    )
+    expect(
+      designSystem.canonicalizeCandidates([
+        '[--value:theme(spacing.1)]',
+        '[--value:theme(spacing.2)]',
+        '[--value:theme(spacing.miami)]',
+        '[--value:theme(spacing.nyc)]',
+      ]),
+    ).toEqual([
+      '[--value:--spacing(1)]',
+      '[--value:var(--spacing-2)]',
+      '[--value:var(--spacing-miami)]',
+      '[--value:theme(spacing.nyc)]',
+    ])
+  })
+
+  test('custom space scale converts to var', { timeout }, async () => {
+    let designSystem = await __unstable__loadDesignSystem(
+      css`
+        @tailwind utilities;
+        @theme {
+          --spacing-*: initial;
+          --spacing-1: 0.25rem;
+          --spacing-2: 0.5rem;
+        }
+      `,
+      { base: __dirname },
+    )
+    expect(
+      designSystem.canonicalizeCandidates([
+        '[--value:theme(spacing.1)]',
+        '[--value:theme(spacing.2)]',
+        '[--value:theme(spacing.3)]',
+      ]),
+    ).toEqual([
+      '[--value:var(--spacing-1)]',
+      '[--value:var(--spacing-2)]',
+      '[--value:theme(spacing.3)]',
+    ])
+  })
+})
+
+describe('options', () => {
+  test('normalize `rem` units to `px`', { timeout }, async () => {
+    let designSystem = await __unstable__loadDesignSystem(
+      css`
+        @tailwind utilities;
+        @theme {
+          --spacing: 0.25rem;
+        }
+      `,
+      { base: __dirname },
+    )
+
+    expect(designSystem.canonicalizeCandidates(['m-[16px]'])).toEqual(['m-[16px]'])
+    expect(designSystem.canonicalizeCandidates(['m-[16px]'], { rem: 16 })).toEqual(['m-4'])
+    expect(designSystem.canonicalizeCandidates(['m-[16px]'], { rem: 64 })).toEqual(['m-1'])
+    expect(designSystem.canonicalizeCandidates(['m-[16px]'])).toEqual(['m-[16px]']) // Ensure options don't influence shared state
+  })
+})
+
+describe('regressions', () => {
+  // https://github.com/schoero/eslint-plugin-better-tailwindcss/issues/321
+  {
+    test('a subset of classes should be canonicalizable', { timeout }, async () => {
+      let designSystem = await designSystems.get(__dirname).get(css`
+        @import 'tailwindcss';
+      `)
+
+      let options: CanonicalizeOptions = {
+        collapse: true,
+        logicalToPhysical: true,
+        rem: 16,
+      }
+
+      expect(
+        designSystem.canonicalizeCandidates(['underline', 'h-4', 'w-4', 'text-sm'], options),
+      ).toEqual(['underline', 'text-sm', 'size-4'])
+    })
+
+    test('collapse canonicalization is not affected by previous calls', { timeout }, async () => {
+      let designSystem = await designSystems.get(__dirname).get(css`
+        @import 'tailwindcss';
+      `)
+
+      let options: CanonicalizeOptions = {
+        collapse: true,
+        logicalToPhysical: true,
+        rem: 16,
+      }
+
+      let target = ['underline', 'h-4', 'w-4']
+
+      expect(designSystem.canonicalizeCandidates(target, options)).toEqual(['underline', 'size-4'])
+
+      designSystem.canonicalizeCandidates(['mb-4', 'text-sm'], options)
+      designSystem.canonicalizeCandidates(['underline', 'mb-4'], options)
+
+      expect(designSystem.canonicalizeCandidates(target, options)).toEqual(['underline', 'size-4'])
+      expect(designSystem.canonicalizeCandidates(target.concat('text-sm'), options)).toEqual([
+        'underline',
+        'text-sm',
+        'size-4',
+      ])
+    })
+  }
+
+  // https://github.com/tailwindlabs/tailwindcss/pull/19727
+  test(
+    'collapse does not crash when utilities with no standard properties are present',
+    { timeout },
+    async () => {
+      let designSystem = await designSystems.get(__dirname).get(css`
+        @import 'tailwindcss';
+      `)
+
+      let options: CanonicalizeOptions = {
+        collapse: true,
+        logicalToPhysical: true,
+        rem: 16,
+      }
+
+      // Shadow utilities use CSS custom properties and @property rules but may
+      // produce empty property maps in the collapse algorithm. This should not
+      // crash with "Cannot read properties of null" or "X is not iterable".
+      expect(() =>
+        designSystem.canonicalizeCandidates(['shadow-sm', 'border'], options),
+      ).not.toThrow()
+
+      expect(() => designSystem.canonicalizeCandidates(['shadow-md', 'p-4'], options)).not.toThrow()
+
+      expect(() =>
+        designSystem.canonicalizeCandidates(['shadow-sm', 'shadow-md'], options),
+      ).not.toThrow()
+
+      // Verify the candidates are returned (not collapsed, since shadows can't
+      // meaningfully collapse with unrelated utilities)
+      expect(designSystem.canonicalizeCandidates(['shadow-sm', 'border'], options)).toEqual(
+        expect.arrayContaining(['shadow-sm', 'border']),
+      )
+
+      expect(designSystem.canonicalizeCandidates(['shadow-sm', 'shadow-md'], options)).toEqual(
+        expect.arrayContaining(['shadow-sm', 'shadow-md']),
+      )
+    },
+  )
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/19835
+  test.each([
+    // Arbitrary values should be collapsed to another arbitrary value
+    [
+      ['px-[1.2rem]', 'py-[1.2rem]', 'text-left'],
+      ['text-left', 'p-[1.2rem]'],
+    ],
+
+    // Arbitrary values could also be collapsed into a bare value
+    [
+      ['px-[30.75rem]', 'py-[30.75rem]', 'text-left'],
+      ['text-left', 'p-123'],
+    ],
+  ])(
+    'collapse canonicalization works for arbitrary values',
+    { timeout },
+    async (candidates, expected) => {
+      let designSystem = await designSystems.get(__dirname).get(css`
+        @import 'tailwindcss';
+      `)
+
+      let options: CanonicalizeOptions = {
+        collapse: true,
+        logicalToPhysical: true,
+        rem: 16,
+      }
+
+      expect(designSystem.canonicalizeCandidates(candidates, options)).toEqual(expected)
+    },
+  )
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/20051
+  test(
+    'does not crash when plugin matchComponents rejects speculative values during collapse',
+    { timeout },
+    async () => {
+      let designSystem = await __unstable__loadDesignSystem(
+        css`
+          @import 'tailwindcss';
+          @plugin "./plugin.js";
+        `,
+        {
+          async loadStylesheet(_, base) {
+            return {
+              base,
+              path: '',
+              content: '@tailwind utilities;',
+            }
+          },
+          async loadModule() {
+            return {
+              base: '',
+              path: '',
+              module: plugin(({ matchComponents }) => {
+                matchComponents(
+                  {
+                    myicon: () => {
+                      throw new Error('Mimic as-if a custom plugin failed for some reason')
+                    },
+                  },
+                  { values: { icon: __filename } },
+                )
+              }),
+            }
+          },
+        },
+      )
+
+      expect(
+        designSystem.canonicalizeCandidates(['border-[1.5px]', 'flex'], {
+          collapse: true,
+          logicalToPhysical: true,
+          rem: 16,
+        }),
+      ).toEqual(expect.arrayContaining(['border-[1.5px]', 'flex']))
+    },
+  )
+
+  // https://github.com/tailwindlabs/tailwindcss-intellisense/issues/1579
+  test('does not suggest invalid alternative when canonicalizing calc expressions', async () => {
+    let designSystem = await designSystems.get(__dirname).get(css`
+      @import 'tailwindcss';
+    `)
+
+    let options: CanonicalizeOptions = {
+      collapse: true,
+      logicalToPhysical: true,
+      rem: 16,
+    }
+
+    expect(designSystem.canonicalizeCandidates(['px-[calc(1rem+0px)]'], options)).toEqual(['px-4'])
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/20295
+  test('canonicalizations work when casing of arbitrary values is different', async () => {
+    let designSystem = await designSystems.get(__dirname).get(css`
+      @import 'tailwindcss';
+      @theme {
+        --color-brand-purple: #3f3cbb;
+      }
+    `)
+
+    let options: CanonicalizeOptions = {
+      collapse: true,
+      logicalToPhysical: true,
+      rem: 16,
+    }
+
+    expect(designSystem.canonicalizeCandidates(['bg-[#3F3cbb]'], options)).toEqual([
+      'bg-brand-purple',
+    ])
+    expect(designSystem.canonicalizeCandidates(['bg-[#3F3Cbb]'], options)).toEqual([
+      'bg-brand-purple',
+    ])
+    expect(designSystem.canonicalizeCandidates(['bg-[#3F3CBB]'], options)).toEqual([
+      'bg-brand-purple',
+    ])
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/20365
+  test('canonicalizes min/max media query and container query variants', async () => {
+    let designSystem = await __unstable__loadDesignSystem(
+      css`
+        @tailwind utilities;
+        @theme {
+          --breakpoint-lg: 64rem;
+          --container-lg: 32rem;
+          --spacing: 0.25rem;
+        }
+      `,
+      { base: __dirname },
+    )
+
+    expect(designSystem.canonicalizeCandidates(['min-[64rem]:flex'])).toEqual(['lg:flex'])
+    expect(designSystem.canonicalizeCandidates(['max-[64rem]:flex'])).toEqual(['max-lg:flex'])
+    expect(designSystem.canonicalizeCandidates(['@min-[32rem]:flex'])).toEqual(['@lg:flex'])
+    expect(designSystem.canonicalizeCandidates(['@max-[32rem]:flex'])).toEqual(['@max-lg:flex'])
+    expect(designSystem.canonicalizeCandidates(['min-[1024px]:flex'], { rem: 16 })).toEqual([
+      'lg:flex',
+    ])
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss-intellisense/issues/1610
+  test('does not merge utilities whose theme variables resolve to CSS-wide keywords', async () => {
+    let designSystem = await __unstable__loadDesignSystem(
+      css`
+        @tailwind utilities;
+        @theme {
+          --foreground: unset;
+          --default: unset;
+        }
+        @theme inline {
+          --color-foreground: var(--foreground);
+          --color-default-soft-hover: color-mix(in oklab, var(--default) 60%, transparent);
+        }
+      `,
+      { base: __dirname },
+    )
+
+    expect(
+      designSystem.canonicalizeCandidates(['text-foreground/60', 'text-default-soft-hover']),
+    ).toEqual(['text-foreground/60', 'text-default-soft-hover'])
+  })
+})
diff --git a/packages/tailwindcss/src/canonicalize-candidates.ts b/packages/tailwindcss/src/canonicalize-candidates.ts
new file mode 100644
index 000000000..d1dfc09de
--- /dev/null
+++ b/packages/tailwindcss/src/canonicalize-candidates.ts
@@ -0,0 +1,3062 @@
+import { substituteAtApply } from './apply'
+import { atRule, cloneAstNode, styleRule, toCss, type AstNode } from './ast'
+import * as AttributeSelectorParser from './attribute-selector-parser'
+import {
+  cloneCandidate,
+  cloneVariant,
+  printArbitraryValue,
+  printModifier,
+  type Candidate,
+  type CandidateModifier,
+  type NamedUtilityValue,
+  type Variant,
+} from './candidate'
+import { canonicalizeCalcExpressionsAst } from './canonicalize-calc-expressions'
+import { keyPathToCssProperty } from './compat/apply-config-to-theme'
+import { constantFoldDeclaration, constantFoldDeclarationAst } from './constant-fold-declaration'
+import type { DesignSystem as BaseDesignSystem } from './design-system'
+import { CompileAstFlags } from './design-system'
+import { expandDeclaration } from './expand-declaration'
+import * as SelectorParser from './selector-parser'
+import { ThemeOptions } from './theme'
+import type { Writable } from './types'
+import { DefaultMap } from './utils/default-map'
+import { dimensions } from './utils/dimensions'
+import { isPositiveInteger, isValidSpacingMultiplier } from './utils/infer-data-type'
+import { replaceObject } from './utils/replace-object'
+import { segment } from './utils/segment'
+import { toKeyPath } from './utils/to-key-path'
+import * as ValueParser from './value-parser'
+import { walk, WalkAction } from './walk'
+
+export interface CanonicalizeOptions {
+  /**
+   * The root font size in pixels. If provided, `rem` values will be normalized
+   * to `px` values.
+   *
+   * E.g.: `mt-[16px]` with `rem: 16` will become `mt-4` (assuming `--spacing: 0.25rem`).
+   */
+  rem?: number
+
+  /**
+   * Whether to collapse multiple utilities into a single utility if possible.
+   *
+   * E.g.: `mt-2 mr-2 mb-2 ml-2` → `m-2`
+   */
+  collapse?: boolean
+
+  /**
+   * Whether to convert between logical and physical properties when collapsing
+   * utilities.
+   *
+   * E.g.: `mr-2 ml-2` → `mx-2`
+   */
+  logicalToPhysical?: boolean
+}
+
+enum Features {
+  /**
+   * No features enabled (default)
+   */
+  None = 0,
+
+  /**
+   * Collapse multiple utilities into a single utility if possible.
+   */
+  CollapseUtilities = 1 << 0,
+}
+
+interface InternalCanonicalizeOptions {
+  features: Features
+  designSystem: DesignSystem
+  signatureOptions: SignatureOptions
+}
+
+type RemValue = number | null
+
+interface DesignSystem extends BaseDesignSystem {
+  storage: {
+    [SIGNATURE_OPTIONS_KEY]: DefaultMap<RemValue, DefaultMap<SignatureFeatures, SignatureOptions>>
+    [COMPARE_CANDIDATES_KEY]: DefaultMap<
+      SignatureOptions,
+      (a: Candidate | string, b: Candidate | string) => boolean
+    >
+    [INTERNAL_OPTIONS_KEY]: DefaultMap<
+      SignatureOptions,
+      DefaultMap<Features, InternalCanonicalizeOptions>
+    >
+    [CANONICALIZE_CANDIDATE_KEY]: DefaultMap<
+      InternalCanonicalizeOptions,
+      DefaultMap<string, string>
+    >
+    [CANONICALIZE_VARIANT_KEY]: DefaultMap<
+      InternalCanonicalizeOptions,
+      DefaultMap<Variant, Variant[]>
+    >
+    [CANONICALIZE_UTILITY_KEY]: DefaultMap<InternalCanonicalizeOptions, DefaultMap<string, string>>
+    [CONVERTER_KEY]: (input: string, options?: Convert) => [string, CandidateModifier | null]
+    [SPACING_KEY]: DefaultMap<string, number | null> | null
+    [UTILITY_SIGNATURE_KEY]: DefaultMap<SignatureOptions, DefaultMap<string, string | symbol>>
+    [STATIC_UTILITIES_KEY]: DefaultMap<
+      SignatureOptions,
+      DefaultMap<string, DefaultMap<string, Set<string>>>
+    >
+    [UTILITY_PROPERTIES_KEY]: DefaultMap<
+      SignatureOptions,
+      DefaultMap<string, DefaultMap<string, Set<string>>>
+    >
+    [PRE_COMPUTED_UTILITIES_KEY]: DefaultMap<SignatureOptions, DefaultMap<string, string[]>>
+    [VARIANT_SIGNATURE_KEY]: DefaultMap<RemValue, DefaultMap<string, string | symbol>>
+    [PRE_COMPUTED_VARIANTS_KEY]: DefaultMap<RemValue, DefaultMap<string, string[]>>
+  }
+}
+
+export function prepareDesignSystemStorage(
+  baseDesignSystem: BaseDesignSystem,
+  options?: CanonicalizeOptions,
+): DesignSystem {
+  let designSystem = baseDesignSystem as DesignSystem
+
+  designSystem.storage[SIGNATURE_OPTIONS_KEY] ??= createSignatureOptionsCache()
+  designSystem.storage[INTERNAL_OPTIONS_KEY] ??= createInternalOptionsCache(designSystem)
+  designSystem.storage[CANONICALIZE_CANDIDATE_KEY] ??= createCanonicalizeCandidateCache()
+  designSystem.storage[CANONICALIZE_VARIANT_KEY] ??= createCanonicalizeVariantCache()
+  designSystem.storage[CANONICALIZE_UTILITY_KEY] ??= createCanonicalizeUtilityCache()
+  designSystem.storage[CONVERTER_KEY] ??= createConverterCache(designSystem)
+  designSystem.storage[SPACING_KEY] ??= createSpacingCache(designSystem, options)
+  designSystem.storage[UTILITY_SIGNATURE_KEY] ??= createUtilitySignatureCache(designSystem)
+  designSystem.storage[STATIC_UTILITIES_KEY] ??= createStaticUtilitiesCache()
+  designSystem.storage[UTILITY_PROPERTIES_KEY] ??= createUtilityPropertiesCache(designSystem)
+  designSystem.storage[PRE_COMPUTED_UTILITIES_KEY] ??= createPreComputedUtilitiesCache(designSystem)
+  designSystem.storage[VARIANT_SIGNATURE_KEY] ??= createVariantSignatureCache(designSystem)
+  designSystem.storage[PRE_COMPUTED_VARIANTS_KEY] ??= createPreComputedVariantsCache(designSystem)
+  designSystem.storage[COMPARE_CANDIDATES_KEY] ??= createSignatureComparison(designSystem)
+
+  return designSystem
+}
+
+const SIGNATURE_OPTIONS_KEY = Symbol()
+function createSignatureOptionsCache(): DesignSystem['storage'][typeof SIGNATURE_OPTIONS_KEY] {
+  return new DefaultMap((rem: number | null) => {
+    return new DefaultMap((features: SignatureFeatures) => {
+      return { rem, features } satisfies SignatureOptions
+    })
+  })
+}
+
+const COMPARE_CANDIDATES_KEY = Symbol()
+function createSignatureComparison(designSystem: DesignSystem) {
+  return new DefaultMap((options: SignatureOptions) => {
+    let signatures = designSystem.storage[UTILITY_SIGNATURE_KEY].get(options)
+
+    return function hasSameSignature(a: Candidate | string, b: Candidate | string): boolean {
+      let aCandidateString = typeof a === 'string' ? a : designSystem.printCandidate(a)
+      let aSignature = signatures.get(aCandidateString)
+      if (typeof aSignature !== 'string') return false
+
+      let bCandidateString = typeof b === 'string' ? b : designSystem.printCandidate(b)
+      let bSignature = signatures.get(bCandidateString)
+      if (typeof bSignature !== 'string') return false
+
+      return aSignature === bSignature
+    }
+  })
+}
+
+export function createSignatureOptions(
+  baseDesignSystem: BaseDesignSystem,
+  options?: CanonicalizeOptions,
+): SignatureOptions {
+  let features = SignatureFeatures.None
+  if (options?.collapse) features |= SignatureFeatures.ExpandProperties
+  if (options?.logicalToPhysical) features |= SignatureFeatures.LogicalToPhysical
+
+  let designSystem = prepareDesignSystemStorage(baseDesignSystem, options)
+
+  return designSystem.storage[SIGNATURE_OPTIONS_KEY].get(options?.rem ?? null).get(features)
+}
+
+const INTERNAL_OPTIONS_KEY = Symbol()
+function createInternalOptionsCache(
+  designSystem: DesignSystem,
+): DesignSystem['storage'][typeof INTERNAL_OPTIONS_KEY] {
+  return new DefaultMap((signatureOptions: SignatureOptions) => {
+    return new DefaultMap((features: Features) => {
+      return { features, designSystem, signatureOptions } satisfies InternalCanonicalizeOptions
+    })
+  })
+}
+
+function createCanonicalizeOptions(
+  baseDesignSystem: BaseDesignSystem,
+  signatureOptions: SignatureOptions,
+  options?: CanonicalizeOptions,
+) {
+  let features = Features.None
+  if (options?.collapse) features |= Features.CollapseUtilities
+
+  let designSystem = prepareDesignSystemStorage(baseDesignSystem)
+
+  return designSystem.storage[INTERNAL_OPTIONS_KEY].get(signatureOptions).get(features)
+}
+
+export function canonicalizeCandidates(
+  baseDesignSystem: BaseDesignSystem,
+  candidates: string[],
+  options?: CanonicalizeOptions,
+): string[] {
+  let signatureOptions = createSignatureOptions(baseDesignSystem, options)
+  let canonicalizeOptions = createCanonicalizeOptions(baseDesignSystem, signatureOptions, options)
+
+  let designSystem = prepareDesignSystemStorage(baseDesignSystem)
+
+  let result = new Set<string>()
+  let cache = designSystem.storage[CANONICALIZE_CANDIDATE_KEY].get(canonicalizeOptions)
+  for (let candidate of candidates) {
+    result.add(cache.get(candidate))
+  }
+
+  return result.size <= 1 || !(canonicalizeOptions.features & Features.CollapseUtilities)
+    ? Array.from(result)
+    : collapseCandidates(canonicalizeOptions, Array.from(result))
+}
+
+function collapseCandidates(options: InternalCanonicalizeOptions, candidates: string[]): string[] {
+  let designSystem = options.designSystem
+
+  // To keep things simple, we group candidates such that we only collapse
+  // candidates with the same variants and important modifier together.
+  let groups = new DefaultMap((_before: string) => {
+    return new DefaultMap((_after: string) => {
+      return new Set<string>()
+    })
+  })
+
+  let prefix = options.designSystem.theme.prefix ? `${options.designSystem.theme.prefix}:` : ''
+
+  for (let candidate of candidates) {
+    let variants = segment(candidate, ':')
+    let utility = variants.pop()!
+
+    let important = utility.endsWith('!')
+    if (important) {
+      utility = utility.slice(0, -1)
+    }
+
+    let before = variants.length > 0 ? `${variants.join(':')}:` : ''
+    let after = important ? '!' : ''
+
+    // Group by variants and important flag
+    groups.get(before).get(after).add(`${prefix}${utility}`)
+  }
+
+  let result = new Set<string>()
+  for (let [before, group] of groups.entries()) {
+    for (let [after, candidates] of group.entries()) {
+      for (let candidate of collapseGroup(Array.from(candidates))) {
+        // Drop the prefix if we had one, because the prefix is already there as
+        // part of the variants.
+        if (prefix && candidate.startsWith(prefix)) {
+          candidate = candidate.slice(prefix.length)
+        }
+
+        result.add(`${before}${candidate}${after}`)
+      }
+    }
+  }
+
+  return Array.from(result)
+
+  function collapseGroup(candidates: string[]) {
+    let signatureOptions = options.signatureOptions
+    let computeUtilitiesPropertiesLookup =
+      designSystem.storage[UTILITY_PROPERTIES_KEY].get(signatureOptions)
+    let staticUtilities = designSystem.storage[STATIC_UTILITIES_KEY].get(signatureOptions)
+
+    // For each candidate, compute the used properties and values. E.g.: `mt-1` → `margin-top` → `0.25rem`
+    //
+    // NOTE: Currently assuming we are dealing with static utilities only. This
+    // will change the moment we have `@utility` for most built-ins.
+    let candidatePropertiesValues = candidates.map((candidate) =>
+      computeUtilitiesPropertiesLookup.get(candidate),
+    )
+
+    // Hard-coded optimization: if any candidate sets `line-height` and another
+    // candidate sets `font-size`, we pre-compute the `text-*` utilities with
+    // this line-height to try and collapse to those combined values.
+    if (candidatePropertiesValues.some((x) => x.has('line-height'))) {
+      let fontSizeNames = designSystem.theme.keysInNamespaces(['--text'])
+      if (fontSizeNames.length > 0) {
+        let interestingLineHeights = new Set<string | number>()
+        let seenLineHeights = new Set<string>()
+        for (let pairs of candidatePropertiesValues) {
+          if (!pairs.has('line-height')) continue
+
+          for (let lineHeight of pairs.get('line-height')) {
+            if (seenLineHeights.has(lineHeight)) continue
+            seenLineHeights.add(lineHeight)
+
+            let bareValue = designSystem.storage[SPACING_KEY]?.get(lineHeight) ?? null
+            if (bareValue !== null) {
+              if (isValidSpacingMultiplier(bareValue)) {
+                interestingLineHeights.add(bareValue)
+
+                for (let name of fontSizeNames) {
+                  computeUtilitiesPropertiesLookup.get(`text-${name}/${bareValue}`)
+                }
+              } else {
+                interestingLineHeights.add(lineHeight)
+
+                for (let name of fontSizeNames) {
+                  computeUtilitiesPropertiesLookup.get(`text-${name}/[${lineHeight}]`)
+                }
+              }
+            }
+          }
+        }
+
+        let seenFontSizes = new Set<string>()
+        for (let pairs of candidatePropertiesValues) {
+          if (!pairs.has('font-size')) continue
+
+          for (let fontSize of pairs.get('font-size')) {
+            if (seenFontSizes.has(fontSize)) continue
+            seenFontSizes.add(fontSize)
+
+            for (let lineHeight of interestingLineHeights) {
+              if (isValidSpacingMultiplier(lineHeight)) {
+                computeUtilitiesPropertiesLookup.get(`text-[${fontSize}]/${lineHeight}`)
+              } else {
+                computeUtilitiesPropertiesLookup.get(`text-[${fontSize}]/[${lineHeight}]`)
+              }
+            }
+          }
+        }
+      }
+    }
+
+    let dynamicUtilities = new DefaultMap((candidate: string) => {
+      let result = new DefaultMap(
+        (_property: string) => new DefaultMap((_value: string) => new Set<string>()),
+      )
+
+      let relevantProperties = new Set(computeUtilitiesPropertiesLookup.get(candidate).keys())
+      if (relevantProperties.size === 0) return result
+
+      for (let parsedCandidate of parseCandidate(designSystem, candidate)) {
+        if (parsedCandidate.kind !== 'functional' || parsedCandidate.value === null) {
+          continue
+        }
+
+        for (let root of designSystem.utilities.keys('functional')) {
+          if (root === parsedCandidate.root) continue // Skip self
+
+          let replacement = printUnprefixedCandidate(designSystem, {
+            ...cloneCandidate(parsedCandidate),
+            root,
+          })
+
+          let propertyValues = computeUtilitiesPropertiesLookup.get(replacement)
+          for (let [property, values] of propertyValues) {
+            if (!relevantProperties.has(property)) continue // Skip properties that are not relevant for the current candidate
+
+            for (let value of values) {
+              result.get(property).get(value).add(replacement)
+            }
+          }
+        }
+
+        return result
+      }
+
+      return result
+    })
+
+    // For each property, lookup other utilities that also set this property and
+    // this exact value. If multiple properties are used, use the intersection of
+    // each property.
+    //
+    // E.g.: `margin-top` → `mt-1`, `my-1`, `m-1`
+    let otherUtilities = candidatePropertiesValues.map((propertyValues, idx) => {
+      let result: Set<string> | null = null
+      for (let property of propertyValues.keys()) {
+        let otherUtilities = new Set<string>()
+        for (let group of staticUtilities.get(property).values()) {
+          for (let candidate of group) {
+            otherUtilities.add(candidate)
+          }
+        }
+
+        for (let value of propertyValues.get(property)) {
+          for (let candidate of dynamicUtilities.get(candidates[idx]).get(property).get(value)) {
+            otherUtilities.add(candidate)
+          }
+        }
+
+        if (result === null) result = otherUtilities
+        else result = intersection(result, otherUtilities)
+
+        // The moment no other utilities match, we can stop searching because
+        // all intersections with an empty set will remain empty.
+        if (result!.size === 0) return result!
+      }
+      return result ?? new Set<string>()
+    })
+
+    // Link each candidate that could be linked via another utility
+    // (intersection). This way we can reduce the amount of required combinations.
+    //
+    // E.g.: `mt-1` and `mb-1` can be linked via `my-1`.
+    //
+    // Candidates that cannot be linked won't be able to be collapsed.
+    // E.g.: `mt-1` and `text-red-500` cannot be collapsed because there is no 3rd
+    // utility with overlapping property/value combinations.
+    let linked = new DefaultMap<number, Set<number>>((key) => new Set<number>([key]))
+    for (let i = 0; i < otherUtilities.length; i++) {
+      let current = otherUtilities[i]
+      for (let j = i + 1; j < otherUtilities.length; j++) {
+        let other = otherUtilities[j]
+
+        for (let property of current) {
+          if (other.has(property)) {
+            linked.get(i).add(j)
+            linked.get(j).add(i)
+
+            // The moment we find a link, we can stop comparing and move on to the
+            // next candidate. This will safe us some time
+            break
+          }
+        }
+      }
+    }
+
+    // Not a single candidate can be linked to another one, nothing left to do
+    if (linked.size === 0) return candidates
+
+    // Each candidate index will now have a set of other candidate indexes as
+    // its value. Let's make the lists unique combinations so that we can
+    // iterate over them.
+    let uniqueCombinations = new DefaultMap((key: string) => key.split(',').map(Number))
+    for (let group of linked.values()) {
+      let sorted = Array.from(group).sort((a, b) => a - b)
+      uniqueCombinations.get(sorted.join(','))
+    }
+
+    // Let's try to actually collapse them now.
+    let result = new Set<string>(candidates)
+    let drop = new Set<string>()
+
+    for (let idxs of uniqueCombinations.values()) {
+      for (let combo of combinations(idxs)) {
+        if (combo.some((idx) => drop.has(candidates[idx]))) continue // Skip already dropped items
+
+        let potentialReplacements = combo.flatMap((idx) => otherUtilities[idx]).reduce(intersection)
+
+        let collapsedSignature = designSystem.storage[UTILITY_SIGNATURE_KEY].get(
+          signatureOptions,
+        ).get(
+          combo
+            .map((idx) => candidates[idx])
+            .sort((a, z) => a.localeCompare(z)) // Sort to increase cache hits
+            .join(' '),
+        )
+
+        for (let replacement of potentialReplacements) {
+          let signature =
+            designSystem.storage[UTILITY_SIGNATURE_KEY].get(signatureOptions).get(replacement)
+          if (signature !== collapsedSignature) continue // Not a safe replacement
+
+          // Use the replacement
+          result.add(replacement)
+
+          // We can replace all items in the combo with the replacement. If the
+          // replacement is already part of the combo, keep that one around.
+          for (let item of combo) {
+            if (candidates[item] !== replacement) {
+              drop.add(candidates[item])
+            }
+          }
+
+          break
+        }
+      }
+    }
+
+    for (let item of drop) {
+      result.delete(item)
+    }
+
+    return Array.from(result)
+  }
+}
+
+const CANONICALIZE_CANDIDATE_KEY = Symbol()
+function createCanonicalizeCandidateCache(): DesignSystem['storage'][typeof CANONICALIZE_CANDIDATE_KEY] {
+  return new DefaultMap((options: InternalCanonicalizeOptions) => {
+    let ds = options.designSystem
+    let prefix = ds.theme.prefix ? `${ds.theme.prefix}:` : ''
+    let variantCache = ds.storage[CANONICALIZE_VARIANT_KEY].get(options)
+    let utilityCache = ds.storage[CANONICALIZE_UTILITY_KEY].get(options)
+
+    return new DefaultMap<string, string>((rawCandidate: string, self) => {
+      for (let candidate of ds.parseCandidate(rawCandidate)) {
+        let variants = candidate.variants
+          .slice()
+          .reverse()
+          .flatMap((variant) => variantCache.get(variant))
+        let important = candidate.important
+
+        // Canonicalize the base candidate (utility), and re-attach the variants
+        // and important flag afterwards. This way we can maximize cache hits for
+        // the base candidate and each individual variant.
+        if (important || variants.length > 0) {
+          let canonicalizedUtility = self.get(
+            ds.printCandidate({ ...candidate, variants: [], important: false }),
+          )
+
+          // Rebuild the final candidate
+          let result = canonicalizedUtility
+
+          // Remove the prefix if there are variants, because the variants exist
+          // between the prefix and the base candidate.
+          if (ds.theme.prefix !== null && variants.length > 0) {
+            result = result.slice(prefix.length)
+          }
+
+          // Re-attach the variants
+          if (variants.length > 0) {
+            result = `${variants.map((v) => ds.printVariant(v)).join(':')}:${result}`
+          }
+
+          // Re-attach the important flag
+          if (important) {
+            result += '!'
+          }
+
+          // Re-attach the prefix if there were variants
+          if (ds.theme.prefix !== null && variants.length > 0) {
+            result = `${prefix}${result}`
+          }
+
+          return result
+        }
+
+        // We are guaranteed to have no variants and no important flag, just the
+        // base candidate left to canonicalize.
+        let result = utilityCache.get(rawCandidate)
+        if (result !== rawCandidate) {
+          return result
+        }
+      }
+
+      return rawCandidate
+    })
+  })
+}
+
+type VariantCanonicalizationFunction = (
+  variant: Variant,
+  options: InternalCanonicalizeOptions,
+) => Variant | Variant[]
+
+const VARIANT_CANONICALIZATIONS: VariantCanonicalizationFunction[] = [
+  themeToVarVariant,
+  arbitraryValueToBareValueVariant,
+  modernizeArbitraryValuesVariant,
+  arbitraryVariants,
+]
+
+const CANONICALIZE_VARIANT_KEY = Symbol()
+function createCanonicalizeVariantCache(): DesignSystem['storage'][typeof CANONICALIZE_VARIANT_KEY] {
+  return new DefaultMap((options: InternalCanonicalizeOptions) => {
+    return new DefaultMap((variant: Variant): Variant[] => {
+      let replacement = [variant]
+      for (let fn of VARIANT_CANONICALIZATIONS) {
+        for (let current of replacement.splice(0)) {
+          // A single variant can result in multiple variants, e.g.:
+          // `[&>[data-selected]]:flex` → `*:data-selected:flex`
+          let result = fn(cloneVariant(current), options)
+          if (Array.isArray(result)) {
+            replacement.push(...result)
+            continue
+          } else {
+            replacement.push(result)
+          }
+        }
+      }
+      return replacement
+    })
+  })
+}
+
+type UtilityCanonicalizationFunction = (
+  candidate: Candidate,
+  options: InternalCanonicalizeOptions,
+) => Candidate
+
+const UTILITY_CANONICALIZATIONS: UtilityCanonicalizationFunction[] = [
+  bgGradientToLinear,
+  themeToVarUtility,
+  calcToSpacingFunction,
+  optimizeArbitraryValueExpressions,
+  arbitraryUtilities,
+  bareValueUtilities,
+  deprecatedUtilities,
+  dropUnnecessaryDataTypes,
+  arbitraryValueToBareValueUtility,
+  optimizeModifier,
+]
+
+const CANONICALIZE_UTILITY_KEY = Symbol()
+function createCanonicalizeUtilityCache(): DesignSystem['storage'][typeof CANONICALIZE_UTILITY_KEY] {
+  return new DefaultMap((options: InternalCanonicalizeOptions) => {
+    let designSystem = options.designSystem
+    return new DefaultMap((rawCandidate: string): string => {
+      for (let readonlyCandidate of designSystem.parseCandidate(rawCandidate)) {
+        let replacement = cloneCandidate(readonlyCandidate) as Writable<typeof readonlyCandidate>
+
+        for (let fn of UTILITY_CANONICALIZATIONS) {
+          replacement = fn(replacement, options)
+        }
+
+        let canonicalizedCandidate = designSystem.printCandidate(replacement)
+        if (rawCandidate !== canonicalizedCandidate) {
+          return canonicalizedCandidate
+        }
+      }
+
+      return rawCandidate
+    })
+  })
+}
+
+// ----
+
+const DIRECTIONS = ['t', 'tr', 'r', 'br', 'b', 'bl', 'l', 'tl']
+function bgGradientToLinear(candidate: Candidate) {
+  if (candidate.kind === 'static' && candidate.root.startsWith('bg-gradient-to-')) {
+    let direction = candidate.root.slice(15)
+
+    if (!DIRECTIONS.includes(direction)) {
+      return candidate
+    }
+
+    candidate.root = `bg-linear-to-${direction}`
+    return candidate
+  }
+
+  return candidate
+}
+
+// ----
+
+const enum Convert {
+  All = 0,
+  MigrateModifier = 1 << 0,
+  MigrateThemeOnly = 1 << 1,
+}
+
+function themeToVarUtility(candidate: Candidate, options: InternalCanonicalizeOptions): Candidate {
+  let convert = options.designSystem.storage[CONVERTER_KEY]
+
+  if (candidate.kind === 'arbitrary') {
+    let [newValue, modifier] = convert(
+      candidate.value,
+      candidate.modifier === null ? Convert.MigrateModifier : Convert.All,
+    )
+    if (newValue !== candidate.value) {
+      candidate.value = newValue
+
+      if (modifier !== null) {
+        candidate.modifier = modifier
+      }
+    }
+  } else if (candidate.kind === 'functional' && candidate.value?.kind === 'arbitrary') {
+    let [newValue, modifier] = convert(
+      candidate.value.value,
+      candidate.modifier === null ? Convert.MigrateModifier : Convert.All,
+    )
+    if (newValue !== candidate.value.value) {
+      candidate.value.value = newValue
+
+      if (modifier !== null) {
+        candidate.modifier = modifier
+      }
+    }
+  }
+
+  return candidate
+}
+
+function themeToVarVariant(
+  variant: Variant,
+  options: InternalCanonicalizeOptions,
+): Variant | Variant[] {
+  let convert = options.designSystem.storage[CONVERTER_KEY]
+
+  let iterator = walkVariants(variant)
+  for (let [variant] of iterator) {
+    if (variant.kind === 'arbitrary') {
+      let [newValue] = convert(variant.selector, Convert.MigrateThemeOnly)
+      if (newValue !== variant.selector) {
+        variant.selector = newValue
+      }
+    } else if (variant.kind === 'functional' && variant.value?.kind === 'arbitrary') {
+      let [newValue] = convert(variant.value.value, Convert.MigrateThemeOnly)
+      if (newValue !== variant.value.value) {
+        variant.value.value = newValue
+      }
+    }
+  }
+
+  return variant
+}
+
+function calcToSpacingFunction(
+  candidate: Candidate,
+  options: InternalCanonicalizeOptions,
+): Candidate {
+  if (candidate.kind === 'arbitrary') {
+    candidate.value = spacingCalcToSpacingFunction(candidate.value, options.designSystem)
+  } else if (candidate.kind === 'functional' && candidate.value?.kind === 'arbitrary') {
+    candidate.value.value = spacingCalcToSpacingFunction(
+      candidate.value.value,
+      options.designSystem,
+    )
+  }
+
+  return candidate
+}
+
+function spacingCalcToSpacingFunction(input: string, designSystem: DesignSystem) {
+  let spacingVariable = designSystem.theme.prefix
+    ? `--${designSystem.theme.prefix}-spacing`
+    : '--spacing'
+
+  let ast = ValueParser.parse(input)
+
+  walk(ast, (node) => {
+    // calc(…)
+    if (node.kind !== 'function' || node.value !== 'calc') return
+
+    // calc(var(--spacing) * 2)
+    //      --------------       1. function        (var)
+    //                    -      2. separator       ( )
+    //                     -     3. word            (*)
+    //                      -    4. separator       ( )
+    //                       -   5. any value, word (2)
+    if (node.nodes.length !== 5) return
+
+    // *
+    if (node.nodes[2].kind !== 'word' || node.nodes[2].value !== '*') {
+      return
+    }
+
+    // var(--spacing)
+    if (
+      node.nodes[0].kind !== 'function' ||
+      node.nodes[0].value !== 'var' ||
+      node.nodes[0].nodes.length !== 1 ||
+      node.nodes[0].nodes[0].kind !== 'word' ||
+      node.nodes[0].nodes[0].value !== spacingVariable
+    ) {
+      return
+    }
+
+    return WalkAction.Replace(
+      ValueParser.parse(
+        `--spacing(${
+          ValueParser.toCss([node.nodes[4]]) // Value node
+        })`,
+      ),
+    )
+  })
+
+  return ValueParser.toCss(ast)
+}
+
+const CONVERTER_KEY = Symbol()
+function createConverterCache(
+  designSystem: DesignSystem,
+): DesignSystem['storage'][typeof CONVERTER_KEY] {
+  return createConverter(designSystem)
+
+  function createConverter(designSystem: DesignSystem) {
+    function convert(input: string, options = Convert.All): [string, CandidateModifier | null] {
+      let ast = ValueParser.parse(input)
+
+      // In some scenarios (e.g.: variants), we can't migrate to `var(…)` if it
+      // ends up in the `@media (…)` part. In this case we only have to migrate to
+      // the new `theme(…)` notation.
+      if (options & Convert.MigrateThemeOnly) {
+        return [substituteFunctionsInValue(ast, toTheme), null]
+      }
+
+      let themeUsageCount = 0
+      let themeModifierCount = 0
+
+      // Analyze AST
+      walk(ast, (node) => {
+        if (node.kind !== 'function') return
+        if (node.value !== 'theme') return
+
+        // We are only interested in the `theme` function
+        themeUsageCount += 1
+
+        // Figure out if a modifier is used
+        walk(node.nodes, (child) => {
+          // If we see a `,`, it means that we have a fallback value
+          if (child.kind === 'separator' && child.value.includes(',')) {
+            return WalkAction.Stop
+          }
+
+          // If we see a `/`, we have a modifier
+          else if (child.kind === 'word' && child.value === '/') {
+            themeModifierCount += 1
+            return WalkAction.Stop
+          }
+
+          return WalkAction.Skip
+        })
+      })
+
+      // No `theme(…)` calls, nothing to do
+      if (themeUsageCount === 0) {
+        return [input, null]
+      }
+
+      // No `theme(…)` with modifiers, we can migrate to `var(…)`
+      if (themeModifierCount === 0) {
+        return [substituteFunctionsInValue(ast, toVar), null]
+      }
+
+      // Multiple modifiers which means that there are multiple `theme(…/…)`
+      // values. In this case, we can't convert the modifier to a candidate
+      // modifier.
+      //
+      // We also can't migrate to `var(…)` because that would lose the modifier.
+      //
+      // Try to convert each `theme(…)` call to the modern syntax.
+      if (themeModifierCount > 1) {
+        return [substituteFunctionsInValue(ast, toTheme), null]
+      }
+
+      // Only a single `theme(…)` with a modifier left, that modifier will be
+      // migrated to a candidate modifier.
+      let modifier: CandidateModifier | null = null
+      let result = substituteFunctionsInValue(ast, (path, fallback) => {
+        let parts = segment(path, '/').map((part) => part.trim())
+
+        // Multiple `/` separators, which makes this an invalid path
+        if (parts.length > 2) return null
+
+        // The path contains a `/`, which means that there is a modifier such as
+        // `theme(colors.red.500/50%)`.
+        //
+        // Currently, we are assuming that this is only being used for colors,
+        // which means that we can typically convert them to a modifier on the
+        // candidate itself.
+        //
+        // If there is more than one node in the AST though, `theme(…)` must not
+        // be the whole value so it's not safe to use a modifier instead.
+        //
+        // E.g.: `inset 0px 1px theme(colors.red.500/50%)` is a shadow, not a color.
+        if (ast.length === 1 && parts.length === 2 && options & Convert.MigrateModifier) {
+          let [pathPart, modifierPart] = parts
+
+          // 50% -> /50
+          if (/^\d+%$/.test(modifierPart)) {
+            modifier = { kind: 'named', value: modifierPart.slice(0, -1) }
+          }
+
+          // .12 -> /12
+          // .12345 -> /[12.345]
+          else if (/^0?\.\d+$/.test(modifierPart)) {
+            let value = Number(modifierPart) * 100
+            modifier = {
+              kind: Number.isInteger(value) ? 'named' : 'arbitrary',
+              value: value.toString(),
+            }
+          }
+
+          // Anything else becomes arbitrary
+          else {
+            modifier = { kind: 'arbitrary', value: modifierPart }
+          }
+
+          // Update path to be the first part
+          path = pathPart
+        }
+
+        return toVar(path, fallback) || toTheme(path, fallback)
+      })
+
+      return [result, modifier]
+    }
+
+    function pathToVariableName(path: string, shouldPrefix = true) {
+      let variable = `--${keyPathToCssProperty(toKeyPath(path))}` as const
+      if (!designSystem.theme.get([variable])) return null
+
+      if (shouldPrefix && designSystem.theme.prefix) {
+        return `--${designSystem.theme.prefix}-${variable.slice(2)}`
+      }
+
+      return variable
+    }
+
+    function toVar(path: string, fallback?: string) {
+      let variable = pathToVariableName(path)
+      if (variable) return fallback ? `var(${variable}, ${fallback})` : `var(${variable})`
+
+      let keyPath = toKeyPath(path)
+      if (keyPath[0] === 'spacing' && designSystem.theme.get(['--spacing'])) {
+        let multiplier = keyPath[1]
+        if (!isValidSpacingMultiplier(multiplier)) return null
+
+        return `--spacing(${multiplier})`
+      }
+
+      return null
+    }
+
+    function toTheme(path: string, fallback?: string) {
+      let parts = segment(path, '/').map((part) => part.trim())
+      path = parts.shift()!
+
+      let variable = pathToVariableName(path, false)
+      if (!variable) return null
+
+      let modifier = parts.length > 0 ? `/${parts.join('/')}` : ''
+      return fallback
+        ? `--theme(${variable}${modifier}, ${fallback})`
+        : `--theme(${variable}${modifier})`
+    }
+
+    return convert
+  }
+}
+
+function substituteFunctionsInValue(
+  ast: ValueParser.ValueAstNode[],
+  handle: (value: string, fallback?: string) => string | null,
+) {
+  walk(ast, (node, ctx) => {
+    if (node.kind === 'function' && node.value === 'theme') {
+      if (node.nodes.length < 1) return
+
+      // Ignore whitespace before the first argument
+      if (node.nodes[0].kind === 'separator' && node.nodes[0].value.trim() === '') {
+        node.nodes.shift()
+      }
+
+      let pathNode = node.nodes[0]
+      if (pathNode.kind !== 'word') return
+
+      let path = pathNode.value
+
+      // For the theme function arguments, we require all separators to contain
+      // comma (`,`), spaces alone should be merged into the previous word to
+      // avoid splitting in this case:
+      //
+      // theme(--color-red-500 / 75%) theme(--color-red-500 / 75%, foo, bar)
+      //
+      // We only need to do this for the first node, as the fallback values are
+      // passed through as-is.
+      let skipUntilIndex = 1
+      for (let i = skipUntilIndex; i < node.nodes.length; i++) {
+        if (node.nodes[i].value.includes(',')) {
+          break
+        }
+        path += ValueParser.toCss([node.nodes[i]])
+        skipUntilIndex = i + 1
+      }
+
+      path = eventuallyUnquote(path)
+      let fallbackValues = node.nodes.slice(skipUntilIndex + 1)
+
+      let replacement =
+        fallbackValues.length > 0 ? handle(path, ValueParser.toCss(fallbackValues)) : handle(path)
+      if (replacement === null) return
+
+      {
+        let idx = ctx.index - 1
+        while (idx !== -1) {
+          let previous = ctx.siblings[idx]
+          // Skip the space separator
+          if (previous.kind === 'separator' && previous.value.trim() === '') {
+            idx -= 1
+            continue
+          }
+
+          // If the previous node is a word and contains an operator, we need to
+          // wrap the replacement in parentheses to make the output less
+          // ambiguous.
+          //
+          // Input:
+          // - `calc(100dvh-theme(spacing.2))`
+          //
+          // Output:
+          // - `calc(100dvh-(--spacing(2)))`
+          //
+          // Not:
+          // -`calc(100dvh---spacing(2))`
+          //
+          if (/^[-+*/]$/.test(previous.value.trim())) {
+            replacement = `(${replacement})`
+          }
+
+          break
+        }
+      }
+
+      return WalkAction.Replace(ValueParser.parse(replacement))
+    }
+  })
+
+  return ValueParser.toCss(ast)
+}
+
+function eventuallyUnquote(value: string) {
+  if (value[0] !== "'" && value[0] !== '"') return value
+
+  let unquoted = ''
+  let quoteChar = value[0]
+  for (let i = 1; i < value.length - 1; i++) {
+    let currentChar = value[i]
+    let nextChar = value[i + 1]
+
+    if (currentChar === '\\' && (nextChar === quoteChar || nextChar === '\\')) {
+      unquoted += nextChar
+      i++
+    } else {
+      unquoted += currentChar
+    }
+  }
+
+  return unquoted
+}
+
+// ----
+
+function* walkVariants(variant: Variant) {
+  function* inner(
+    variant: Variant,
+    parent: Extract<Variant, { kind: 'compound' }> | null = null,
+  ): Iterable<[Variant, Extract<Variant, { kind: 'compound' }> | null]> {
+    yield [variant, parent]
+
+    if (variant.kind === 'compound') {
+      yield* inner(variant.variant, variant)
+    }
+  }
+
+  yield* inner(variant, null)
+}
+
+function parseCandidate(designSystem: DesignSystem, input: string) {
+  return designSystem.parseCandidate(
+    designSystem.theme.prefix && !input.startsWith(`${designSystem.theme.prefix}:`)
+      ? `${designSystem.theme.prefix}:${input}`
+      : input,
+  )
+}
+
+function printUnprefixedCandidate(designSystem: DesignSystem, candidate: Candidate) {
+  let candidateString = designSystem.printCandidate(candidate)
+
+  return designSystem.theme.prefix && candidateString.startsWith(`${designSystem.theme.prefix}:`)
+    ? candidateString.slice(designSystem.theme.prefix.length + 1)
+    : candidateString
+}
+
+// ----
+
+const SPACING_KEY = Symbol()
+
+// We prefer bare values over arbitrary values such as `left-[6px]` →
+// `left-1.5`.
+//
+// There are situations where this doesn't always make sense. E.g.:
+// `left-[99999px]` → `left-24999.75`.
+//
+// We could try and analyze the incoming value and bail out if we detect certain
+// patterns. But a first step would be to limit the bare values for large values
+// and keep them low. The largest rem value we have is for the 2xl breakpoint,
+// which is 96rem, which is 1536px.
+const MAX_BARE_VALUE_IN_PX = 1536
+const MAX_BARE_VALUE_IN_REM = MAX_BARE_VALUE_IN_PX / 16
+
+function isReasonableBareValue(value: number, designSystem: DesignSystem, rem: number | null) {
+  let spacingMultiplier = designSystem.resolveThemeValue('--spacing')
+  if (spacingMultiplier === undefined) return false
+
+  let parsed = dimensions.get(constantFoldDeclaration(spacingMultiplier, rem))
+  if (parsed === null) return false
+
+  let [spacingValue, spacingUnit] = parsed
+  let bareValueInPixels = value * spacingValue
+
+  if (spacingUnit === 'px') return bareValueInPixels <= MAX_BARE_VALUE_IN_PX
+  if (spacingUnit === 'rem') return bareValueInPixels <= MAX_BARE_VALUE_IN_REM
+  return false
+}
+
+function createSpacingCache(
+  designSystem: DesignSystem,
+  options?: CanonicalizeOptions,
+): DesignSystem['storage'][typeof SPACING_KEY] {
+  let spacingMultiplier = designSystem.resolveThemeValue('--spacing')
+  if (spacingMultiplier === undefined) return null
+
+  spacingMultiplier = constantFoldDeclaration(spacingMultiplier, options?.rem ?? null)
+
+  let parsed = dimensions.get(spacingMultiplier)
+  if (!parsed) return null
+
+  let [value, unit] = parsed
+
+  return new DefaultMap<string, number | null>((input) => {
+    // If we already know that the spacing multiplier is 0, all spacing
+    // multipliers will also be 0. No need to even try and parse/canonicalize
+    // the input value.
+    if (value === 0) return null
+
+    let parsed = dimensions.get(constantFoldDeclaration(input, options?.rem ?? null))
+    if (!parsed) return null
+
+    let [myValue, myUnit] = parsed
+    if (myUnit !== unit) return null
+
+    return myValue / value
+  })
+}
+
+function arbitraryUtilities(candidate: Candidate, options: InternalCanonicalizeOptions): Candidate {
+  // We are only interested in arbitrary properties and arbitrary values
+  if (
+    // Arbitrary property
+    candidate.kind !== 'arbitrary' &&
+    // Arbitrary value
+    !(candidate.kind === 'functional' && candidate.value?.kind === 'arbitrary')
+  ) {
+    return candidate
+  }
+
+  let designSystem = options.designSystem
+  let utilities = designSystem.storage[PRE_COMPUTED_UTILITIES_KEY].get(options.signatureOptions)
+  let signatures = designSystem.storage[UTILITY_SIGNATURE_KEY].get(options.signatureOptions)
+  let hasSameSignature = designSystem.storage[COMPARE_CANDIDATES_KEY].get(options.signatureOptions)
+
+  let targetCandidateString = designSystem.printCandidate(candidate)
+
+  // Compute the signature for the target candidate
+  let targetSignature = signatures.get(targetCandidateString)
+  if (typeof targetSignature !== 'string') return candidate
+
+  // Try a few options to find a suitable replacement utility
+  for (let replacementCandidate of tryReplacements(targetSignature, candidate)) {
+    if (!hasSameSignature(candidate, replacementCandidate)) {
+      continue
+    }
+
+    // Ensure that if CSS variables were used, that they are still used
+    if (!allVariablesAreUsed(designSystem, candidate, replacementCandidate)) {
+      continue
+    }
+
+    return replacementCandidate
+  }
+
+  return candidate
+
+  function* tryReplacements(
+    targetSignature: string,
+    candidate: Extract<Candidate, { kind: 'functional' | 'arbitrary' }>,
+  ): Generator<Candidate> {
+    // Find a corresponding utility for the same signature
+    let replacements = utilities.get(targetSignature)
+
+    // Multiple utilities can map to the same signature.
+    if (replacements.length > 1) {
+      // Prefer positive values over negative values
+      let maybeReplacement: string | undefined = undefined
+      for (let replacement of replacements) {
+        if (replacement[0] === '-') continue // Skip negative values
+
+        // If multiple non-negative replacements exists then we are unsure
+        // what to do, so let's bail.
+        if (maybeReplacement) return
+
+        // Consider this replacement
+        maybeReplacement = replacement
+      }
+
+      if (maybeReplacement) {
+        for (let replacementCandidate of parseCandidate(designSystem, maybeReplacement)) {
+          yield replacementCandidate
+        }
+      }
+
+      return
+    }
+
+    // If we didn't find any replacement utilities, let's try to strip the
+    // modifier and find a replacement then. If we do, we can try to re-add the
+    // modifier later and verify if we have a valid migration.
+    //
+    // This is necessary because `text-red-500/50` will not be pre-computed,
+    // only `text-red-500` will.
+    if (replacements.length === 0 && candidate.modifier) {
+      let candidateWithoutModifier = { ...candidate, modifier: null }
+      let targetSignatureWithoutModifier = signatures.get(
+        designSystem.printCandidate(candidateWithoutModifier),
+      )
+      if (typeof targetSignatureWithoutModifier === 'string') {
+        for (let replacementCandidate of tryReplacements(
+          targetSignatureWithoutModifier,
+          candidateWithoutModifier,
+        )) {
+          yield Object.assign({}, replacementCandidate, { modifier: candidate.modifier })
+        }
+      }
+    }
+
+    // If only a single utility maps to the signature, we can use that as the
+    // replacement.
+    if (replacements.length === 1) {
+      for (let replacementCandidate of parseCandidate(designSystem, replacements[0])) {
+        yield replacementCandidate
+      }
+    }
+
+    // Find a corresponding functional utility for the same signature
+    else if (replacements.length === 0) {
+      // An arbitrary property will only set a single property, we can use that
+      // to find functional utilities that also set this property.
+      let value =
+        candidate.kind === 'arbitrary' ? candidate.value : (candidate.value?.value ?? null)
+      if (value === null) return
+
+      // Try to canonicalize any incoming arbitrary value. Canonicalization of
+      // `rem` and `px` values will be converted to `px`, so we have to
+      // canonicalize the spacing multiplier as well.
+      if (
+        options.signatureOptions.rem !== null &&
+        candidate.kind === 'functional' &&
+        candidate.value?.kind === 'arbitrary'
+      ) {
+        let bareValue = designSystem.storage[SPACING_KEY]?.get(value) ?? null
+        if (bareValue !== null) {
+          if (
+            isValidSpacingMultiplier(bareValue) &&
+            isReasonableBareValue(bareValue, designSystem, options.signatureOptions.rem)
+          ) {
+            yield Object.assign({}, candidate, {
+              value: { kind: 'named', value: bareValue, fraction: null },
+            })
+          }
+        }
+      }
+
+      let spacingMultiplier = designSystem.storage[SPACING_KEY]?.get(value) ?? null
+      let rootPrefix = ''
+      if (spacingMultiplier !== null && spacingMultiplier < 0) {
+        rootPrefix = '-'
+        spacingMultiplier = Math.abs(spacingMultiplier)
+      }
+
+      for (let root of Array.from(designSystem.utilities.keys('functional')).sort(
+        // Sort negative roots after positive roots so that we can try
+        // `mt-*` before `-mt-*`. This is especially useful in situations where
+        // `-mt-[0px]` can be translated to `mt-[0px]`.
+        (a, z) => Number(a[0] === '-') - Number(z[0] === '-'),
+      )) {
+        if (rootPrefix) root = `${rootPrefix}${root}`
+
+        // Try as bare value
+        for (let replacementCandidate of parseCandidate(designSystem, `${root}-${value}`)) {
+          yield replacementCandidate
+        }
+
+        // Try as bare value with modifier
+        if (candidate.modifier) {
+          for (let replacementCandidate of parseCandidate(
+            designSystem,
+            `${root}-${value}${candidate.modifier}`,
+          )) {
+            yield replacementCandidate
+          }
+        }
+
+        // Try bare value based on the `--spacing` value. E.g.:
+        //
+        // - `w-[64rem]` → `w-256`
+        if (
+          spacingMultiplier !== null &&
+          isValidSpacingMultiplier(spacingMultiplier) &&
+          isReasonableBareValue(spacingMultiplier, designSystem, options.signatureOptions.rem)
+        ) {
+          for (let replacementCandidate of parseCandidate(
+            designSystem,
+            `${root}-${spacingMultiplier}`,
+          )) {
+            yield replacementCandidate
+          }
+
+          // Try bare value based on the `--spacing` value, but with a modifier
+          if (candidate.modifier) {
+            for (let replacementCandidate of parseCandidate(
+              designSystem,
+              `${root}-${spacingMultiplier}${printModifier(candidate.modifier)}`,
+            )) {
+              yield replacementCandidate
+            }
+          }
+        }
+
+        // Try as arbitrary value
+        for (let replacementCandidate of parseCandidate(designSystem, `${root}-[${value}]`)) {
+          yield replacementCandidate
+        }
+
+        // Try as arbitrary value with modifier
+        if (candidate.modifier) {
+          for (let replacementCandidate of parseCandidate(
+            designSystem,
+            `${root}-[${value}]${printModifier(candidate.modifier)}`,
+          )) {
+            yield replacementCandidate
+          }
+        }
+      }
+    }
+  }
+}
+
+// Let's make sure that all variables used in the value are also all used in the
+// found replacement. If not, then we are dealing with a different namespace or
+// we could lose functionality in case the variable was changed higher up in the
+// DOM tree.
+function allVariablesAreUsed(
+  designSystem: DesignSystem,
+  candidate: Candidate,
+  replacement: Candidate,
+) {
+  let value: string | null = null
+
+  // Functional utility with arbitrary value and variables
+  if (
+    candidate.kind === 'functional' &&
+    candidate.value?.kind === 'arbitrary' &&
+    candidate.value.value.includes('var(--')
+  ) {
+    value = candidate.value.value
+  }
+
+  // Arbitrary property with variables
+  else if (candidate.kind === 'arbitrary' && candidate.value.includes('var(--')) {
+    value = candidate.value
+  }
+
+  // No variables in the value, so this is a safe migration
+  if (value === null) {
+    return true
+  }
+
+  let replacementAsCss = designSystem
+    .candidatesToCss([designSystem.printCandidate(replacement)])
+    .join('\n')
+
+  let isSafeMigration = true
+  walk(ValueParser.parse(value), (node) => {
+    if (node.kind === 'function' && node.value === 'var') {
+      let variable = node.nodes[0].value
+      let r = new RegExp(`var\\(${variable}[,)]\\s*`, 'g')
+      if (
+        // We need to check if the variable is used in the replacement
+        !r.test(replacementAsCss) ||
+        // The value cannot be set to a different value in the
+        // replacement because that would make it an unsafe migration
+        replacementAsCss.includes(`${variable}:`)
+      ) {
+        isSafeMigration = false
+        return WalkAction.Stop
+      }
+    }
+  })
+
+  return isSafeMigration
+}
+
+// ----
+
+function bareValueUtilities(candidate: Candidate, options: InternalCanonicalizeOptions): Candidate {
+  // We are only interested in bare value utilities
+  if (candidate.kind !== 'functional' || candidate.value?.kind !== 'named') {
+    return candidate
+  }
+
+  let designSystem = options.designSystem
+  let utilities = designSystem.storage[PRE_COMPUTED_UTILITIES_KEY].get(options.signatureOptions)
+  let signatures = designSystem.storage[UTILITY_SIGNATURE_KEY].get(options.signatureOptions)
+  let hasSameSignature = designSystem.storage[COMPARE_CANDIDATES_KEY].get(options.signatureOptions)
+
+  let targetCandidateString = designSystem.printCandidate(candidate)
+
+  // Compute the signature for the target candidate
+  let targetSignature = signatures.get(targetCandidateString)
+  if (typeof targetSignature !== 'string') return candidate
+
+  // Try a few options to find a suitable replacement utility
+  for (let replacementCandidate of tryReplacements(targetSignature, candidate)) {
+    if (!hasSameSignature(candidate, replacementCandidate)) {
+      continue
+    }
+
+    return replacementCandidate
+  }
+
+  return candidate
+
+  function* tryReplacements(
+    targetSignature: string,
+    candidate: Extract<Candidate, { kind: 'functional' }>,
+  ): Generator<Candidate> {
+    // Find a corresponding utility for the same signature
+    let replacements = utilities.get(targetSignature)
+
+    // Multiple utilities can map to the same signature.
+    if (replacements.length > 1) {
+      // Prefer positive values over negative values
+      let maybeReplacement: string | undefined = undefined
+      for (let replacement of replacements) {
+        if (replacement[0] === '-') continue // Skip negative values
+
+        // If multiple non-negative replacements exists then we are unsure
+        // what to do, so let's bail.
+        if (maybeReplacement) return
+
+        // Consider this replacement
+        maybeReplacement = replacement
+      }
+
+      if (maybeReplacement) {
+        for (let replacementCandidate of parseCandidate(designSystem, maybeReplacement)) {
+          yield replacementCandidate
+        }
+      }
+
+      return
+    }
+
+    // If we didn't find any replacement utilities, let's try to strip the
+    // modifier and find a replacement then. If we do, we can try to re-add the
+    // modifier later and verify if we have a valid migration.
+    //
+    // This is necessary because `text-red-500/50` will not be pre-computed,
+    // only `text-red-500` will.
+    if (replacements.length === 0 && candidate.modifier) {
+      let candidateWithoutModifier = { ...candidate, modifier: null }
+      let targetSignatureWithoutModifier = signatures.get(
+        designSystem.printCandidate(candidateWithoutModifier),
+      )
+      if (typeof targetSignatureWithoutModifier === 'string') {
+        for (let replacementCandidate of tryReplacements(
+          targetSignatureWithoutModifier,
+          candidateWithoutModifier,
+        )) {
+          yield Object.assign({}, replacementCandidate, { modifier: candidate.modifier })
+        }
+      }
+    }
+
+    // If only a single utility maps to the signature, we can use that as the
+    // replacement.
+    if (replacements.length === 1) {
+      for (let replacementCandidate of parseCandidate(designSystem, replacements[0])) {
+        yield replacementCandidate
+      }
+    }
+  }
+}
+
+// ----
+
+const DEPRECATION_MAP = new Map([
+  ['order-none', 'order-0'],
+  ['break-words', 'wrap-break-word'],
+  ['overflow-ellipsis', 'text-ellipsis'],
+])
+
+const DEPRECATION_TRANSFORMATION_MAP = new Map([
+  [/^(-)?start-(.*?)$/, '$1inset-s-$2'],
+  [/^(-)?end-(.*?)$/, '$1inset-e-$2'],
+])
+
+function* tryDeprecatedUtilities(candidate: string) {
+  // Try static replacements
+  let replacement = DEPRECATION_MAP.get(candidate)
+  if (replacement) yield replacement
+
+  // Try dynamic replacements
+  for (let [searchValue, replaceValue] of DEPRECATION_TRANSFORMATION_MAP) {
+    let replacement = candidate.replace(searchValue, replaceValue)
+    if (replacement === candidate) continue
+
+    yield replacement
+  }
+}
+
+function deprecatedUtilities(
+  candidate: Candidate,
+  options: InternalCanonicalizeOptions,
+): Candidate {
+  let designSystem = options.designSystem
+  let hasSameSignature = designSystem.storage[COMPARE_CANDIDATES_KEY].get(options.signatureOptions)
+
+  let targetCandidateString = printUnprefixedCandidate(designSystem, candidate)
+
+  for (let replacementString of tryDeprecatedUtilities(targetCandidateString)) {
+    if (!hasSameSignature(candidate, replacementString)) {
+      continue
+    }
+
+    let [replacement] = parseCandidate(designSystem, replacementString)
+    return replacement
+  }
+
+  return candidate
+}
+
+// ----
+
+function arbitraryVariants(
+  variant: Variant,
+  options: InternalCanonicalizeOptions,
+): Variant | Variant[] {
+  let designSystem = options.designSystem
+  let signatures = designSystem.storage[VARIANT_SIGNATURE_KEY].get(options.signatureOptions.rem)
+  let variants = designSystem.storage[PRE_COMPUTED_VARIANTS_KEY].get(options.signatureOptions.rem)
+
+  let iterator = walkVariants(variant)
+  for (let [variant] of iterator) {
+    if (variant.kind === 'compound') continue
+
+    let targetString = designSystem.printVariant(variant)
+    let targetSignature = signatures.get(targetString)
+    if (typeof targetSignature !== 'string') continue
+
+    let foundVariants = variants.get(targetSignature)
+    if (foundVariants.length === 0) continue
+
+    // The variant is already in a canonical form, e.g.: `min-lg` and `lg`
+    // produce the same CSS, but both are valid so we keep them as-is.
+    if (foundVariants.includes(targetString)) continue
+
+    let foundVariant = foundVariants[0]
+    let parsedVariant = designSystem.parseVariant(foundVariant)
+    if (parsedVariant === null) continue
+
+    replaceObject(variant, parsedVariant)
+  }
+
+  return variant
+}
+
+// ----
+
+function dropUnnecessaryDataTypes(
+  candidate: Candidate,
+  options: InternalCanonicalizeOptions,
+): Candidate {
+  let designSystem = options.designSystem
+  let signatures = designSystem.storage[UTILITY_SIGNATURE_KEY].get(options.signatureOptions)
+
+  if (
+    candidate.kind === 'functional' &&
+    candidate.value?.kind === 'arbitrary' &&
+    candidate.value.dataType !== null
+  ) {
+    let replacement = designSystem.printCandidate({
+      ...candidate,
+      value: { ...candidate.value, dataType: null },
+    })
+
+    if (signatures.get(designSystem.printCandidate(candidate)) === signatures.get(replacement)) {
+      candidate.value.dataType = null
+    }
+  }
+
+  return candidate
+}
+
+// ----
+
+function arbitraryValueToBareValueUtility(
+  candidate: Candidate,
+  options: InternalCanonicalizeOptions,
+): Candidate {
+  // We are only interested in functional utilities with arbitrary values
+  if (candidate.kind !== 'functional' || candidate.value?.kind !== 'arbitrary') {
+    return candidate
+  }
+
+  let designSystem = options.designSystem
+  let signatures = designSystem.storage[UTILITY_SIGNATURE_KEY].get(options.signatureOptions)
+
+  let expectedSignature = signatures.get(designSystem.printCandidate(candidate))
+  if (expectedSignature === null) return candidate
+
+  for (let value of tryValueReplacements(candidate)) {
+    let newSignature = signatures.get(designSystem.printCandidate({ ...candidate, value }))
+    if (newSignature === expectedSignature) {
+      candidate.value = value
+      return candidate
+    }
+  }
+
+  return candidate
+}
+
+function arbitraryValueToBareValueVariant(variant: Variant): Variant | Variant[] {
+  let iterator = walkVariants(variant)
+  for (let [variant] of iterator) {
+    // Convert `data-[selected]` to `data-selected`
+    if (
+      variant.kind === 'functional' &&
+      variant.root === 'data' &&
+      variant.value?.kind === 'arbitrary' &&
+      !variant.value.value.includes('=')
+    ) {
+      variant.value = {
+        kind: 'named',
+        value: variant.value.value,
+      }
+    }
+
+    // Convert `aria-[selected="true"]` to `aria-selected`
+    else if (
+      variant.kind === 'functional' &&
+      variant.root === 'aria' &&
+      variant.value?.kind === 'arbitrary' &&
+      (variant.value.value.endsWith('=true') ||
+        variant.value.value.endsWith('="true"') ||
+        variant.value.value.endsWith("='true'"))
+    ) {
+      let [key, _value] = segment(variant.value.value, '=')
+      if (
+        // aria-[foo~="true"]
+        key[key.length - 1] === '~' ||
+        // aria-[foo|="true"]
+        key[key.length - 1] === '|' ||
+        // aria-[foo^="true"]
+        key[key.length - 1] === '^' ||
+        // aria-[foo$="true"]
+        key[key.length - 1] === '$' ||
+        // aria-[foo*="true"]
+        key[key.length - 1] === '*'
+      ) {
+        continue
+      }
+
+      variant.value = {
+        kind: 'named',
+        value: variant.value.value.slice(0, variant.value.value.indexOf('=')),
+      }
+    }
+
+    // Convert `supports-[gap]` to `supports-gap`
+    else if (
+      variant.kind === 'functional' &&
+      variant.root === 'supports' &&
+      variant.value?.kind === 'arbitrary' &&
+      /^[a-z-][a-z0-9-]*$/i.test(variant.value.value)
+    ) {
+      variant.value = {
+        kind: 'named',
+        value: variant.value.value,
+      }
+    }
+  }
+
+  return variant
+}
+
+// Convert functional utilities with arbitrary values to bare values if we can.
+// We know that bare values can only be:
+//
+// 1. A number (with increments of .25)
+// 2. A percentage (with increments of .25 followed by a `%`)
+// 3. A ratio with whole numbers
+//
+// Not a bare value per se, but if we are dealing with a keyword, that could
+// potentially also look like a bare value (aka no `[` or `]`). E.g.:
+// ```diff
+// grid-cols-[subgrid]
+// grid-cols-subgrid
+// ```
+function* tryValueReplacements(
+  candidate: Extract<Candidate, { kind: 'functional' }>,
+  value: string = candidate.value?.value ?? '',
+  seen: Set<string> = new Set(),
+): Generator<NamedUtilityValue> {
+  if (seen.has(value)) return
+  seen.add(value)
+
+  // 0. Just try to drop the square brackets and see if it works
+  // 1. A number (with increments of .25)
+  yield {
+    kind: 'named',
+    value,
+    fraction: null,
+  }
+
+  // 2. A percentage (with increments of .25 followed by a `%`)
+  //    Try to drop the `%` and see if it works
+  if (value.endsWith('%') && isValidSpacingMultiplier(value.slice(0, -1))) {
+    yield {
+      kind: 'named',
+      value: value.slice(0, -1),
+      fraction: null,
+    }
+  }
+
+  // 3. A ratio with whole numbers
+  if (value.includes('/')) {
+    let [numerator, denominator] = value.split('/')
+    if (isPositiveInteger(numerator) && isPositiveInteger(denominator)) {
+      yield {
+        kind: 'named',
+        value: numerator,
+        fraction: `${numerator}/${denominator}`,
+      }
+    }
+  }
+
+  // It could also be that we have `20px`, we can try just `20` and see if it
+  // results in the same signature.
+  let allNumbersAndFractions = new Set<string>()
+
+  // Figure out all numbers and fractions in the value
+  for (let match of value.matchAll(/(\d+\/\d+)|(\d+\.?\d+)/g)) {
+    allNumbersAndFractions.add(match[0].trim())
+  }
+
+  // Sort the numbers and fractions where the smallest length comes first. This
+  // will result in the smallest replacement.
+  let options = Array.from(allNumbersAndFractions).sort((a, z) => {
+    return a.length - z.length
+  })
+
+  // Try all the options
+  for (let option of options) {
+    yield* tryValueReplacements(candidate, option, seen)
+  }
+}
+
+// ----
+
+function isSingleSelector(ast: SelectorParser.SelectorAstNode[]): boolean {
+  if (ast.length === 1 && ast[0].kind === 'list') return false
+  return true
+}
+
+function isAttributeSelector(node: SelectorParser.SelectorNode): boolean {
+  return node.value[0] === '[' && node.value[node.value.length - 1] === ']'
+}
+
+function modernizeArbitraryValuesVariant(
+  variant: Variant,
+  options: InternalCanonicalizeOptions,
+): Variant | Variant[] {
+  let result = [variant]
+  let designSystem = options.designSystem
+  let signatures = designSystem.storage[VARIANT_SIGNATURE_KEY].get(options.signatureOptions.rem)
+
+  let iterator = walkVariants(variant)
+  for (let [variant, parent] of iterator) {
+    // Forward modifier from the root to the compound variant
+    if (
+      variant.kind === 'compound' &&
+      (variant.root === 'has' || variant.root === 'not' || variant.root === 'in')
+    ) {
+      if (variant.modifier !== null) {
+        if ('modifier' in variant.variant) {
+          variant.variant.modifier = variant.modifier
+          variant.modifier = null
+        }
+      }
+    }
+
+    // Expecting an arbitrary variant
+    if (variant.kind === 'arbitrary') {
+      // Expecting a non-relative arbitrary variant
+      if (variant.relative) continue
+
+      let ast = SelectorParser.parse(variant.selector)
+
+      // Expecting a single selector node
+      if (!isSingleSelector(ast)) continue
+
+      // Keep the existing arbitrary variant modernizations working on a flat
+      // selector sequence while the parser exposes complex selectors as a node.
+      if (ast.length === 1 && ast[0].kind === 'complex') {
+        ast = ast[0].nodes
+      }
+
+      // `[&>*]` can be replaced with `*`
+      if (
+        // Only top-level, so `has-[&>*]` is not supported
+        parent === null &&
+        // [&_>_*]:flex
+        //  ^ ^ ^
+        ast.length === 3 &&
+        ast[0].kind === 'selector' &&
+        ast[0].value === '&' &&
+        ast[1].kind === 'combinator' &&
+        ast[1].value === '>' &&
+        ast[2].kind === 'selector' &&
+        ast[2].value === '*'
+      ) {
+        replaceObject(variant, designSystem.parseVariant('*'))
+        continue
+      }
+
+      // `[&_*]` can be replaced with `**`
+      if (
+        // Only top-level, so `has-[&_*]` is not supported
+        parent === null &&
+        // [&_*]:flex
+        //  ^ ^
+        ast.length === 3 &&
+        ast[0].kind === 'selector' &&
+        ast[0].value === '&' &&
+        ast[1].kind === 'combinator' &&
+        ast[1].value === ' ' &&
+        ast[2].kind === 'selector' &&
+        ast[2].value === '*'
+      ) {
+        replaceObject(variant, designSystem.parseVariant('**'))
+        continue
+      }
+
+      // `[&:has(…)]` can be replaced with `has-[…]`
+      if (
+        // Only top-level, so `group-[&:has(…)]` is not covered
+
+        parent === null &&
+        // [&:has(…)]:flex
+        //  ^ ^^^^^^
+        ast.length === 1 &&
+        ast[0].kind === 'compound' &&
+        ast[0].nodes.length === 2 &&
+        ast[0].nodes[0].kind === 'selector' &&
+        ast[0].nodes[0].value === '&' &&
+        ast[0].nodes[1].kind === 'function' &&
+        ast[0].nodes[1].value === ':has' &&
+        ast[0].nodes[1].nodes.length === 1 &&
+        ast[0].nodes[1].nodes[0].kind === 'selector'
+      ) {
+        replaceObject(
+          variant,
+          designSystem.parseVariant(`has-[${SelectorParser.toCss(ast[0].nodes[1].nodes, true)}]`),
+        )
+        continue
+      }
+
+      // `in-*` variant. If the selector ends with ` &`, we can convert it to an
+      // `in-*` variant.
+      //
+      // E.g.: `[[data-visible]_&]` => `in-data-visible`
+      if (
+        // Only top-level, so `in-[&_[data-visible]]` is not supported
+        parent === null &&
+        // [[data-visible]___&]:flex
+        //  ^^^^^^^^^^^^^^ ^ ^
+        ast.length === 3 &&
+        ast[0].kind === 'selector' &&
+        ast[1].kind === 'combinator' &&
+        ast[1].value === ' ' &&
+        ast[2].kind === 'selector' &&
+        ast[2].value === '&'
+      ) {
+        ast.pop() // Remove the nesting node
+        ast.pop() // Remove the combinator
+
+        // When handling a compound like `in-[[data-visible]]`, we will first
+        // handle `[[data-visible]]`, then the parent `in-*` part. This means
+        // that we can convert `[[data-visible]_&]` to `in-[[data-visible]]`.
+        //
+        // Later this gets converted to `in-data-visible`.
+        replaceObject(variant, designSystem.parseVariant(`in-[${SelectorParser.toCss(ast, true)}]`))
+        continue
+      }
+
+      // Hoist `not` modifier for `@media` or `@supports` variants
+      //
+      // E.g.: `[@media_not_(scripting:none)]:` -> `not-[@media_(scripting:none)]:`
+      if (
+        // Only top-level, so something like `in-[@media(scripting:none)]`
+        // (which is not valid anyway) is not supported
+        parent === null &&
+        // [@media_not(scripting:none)]:flex
+        //  ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+        ast[0].kind === 'selector' &&
+        (ast[0].value === '@media' || ast[0].value === '@supports')
+      ) {
+        let targetSignature = signatures.get(designSystem.printVariant(variant))
+
+        let parsed = ValueParser.parse(SelectorParser.toCss(ast, true))
+        let containsNot = false
+        walk(parsed, (node) => {
+          if (node.kind === 'word' && node.value === 'not') {
+            containsNot = true
+            return WalkAction.Replace([])
+          }
+        })
+
+        // Remove unnecessary whitespace
+        parsed = ValueParser.parse(ValueParser.toCss(parsed))
+        walk(parsed, (node) => {
+          if (node.kind === 'separator' && node.value !== ' ' && node.value.trim() === '') {
+            // node.value contains at least 2 spaces. Normalize it to a single
+            // space.
+            node.value = ' '
+          }
+        })
+
+        if (containsNot) {
+          let hoistedNot = designSystem.parseVariant(`not-[${ValueParser.toCss(parsed)}]`)
+          if (hoistedNot === null) continue
+          let hoistedNotSignature = signatures.get(designSystem.printVariant(hoistedNot))
+          if (targetSignature === hoistedNotSignature) {
+            replaceObject(variant, hoistedNot)
+            continue
+          }
+        }
+      }
+
+      let prefixedVariant: Variant | null = null
+
+      // Handling a child combinator. E.g.: `[&>[data-visible]]` => `*:data-visible`
+      if (
+        // Only top-level, so `has-[&>[data-visible]]` is not supported
+        parent === null &&
+        // [&_>_[data-visible]]:flex
+        //  ^ ^ ^^^^^^^^^^^^^^
+        ast.length === 3 &&
+        ast[0].kind === 'selector' &&
+        ast[0].value === '&' &&
+        ast[1].kind === 'combinator' &&
+        ast[1].value === '>' &&
+        ast[2].kind === 'selector' &&
+        (ast[2].value[0] === ':' || isAttributeSelector(ast[2]))
+      ) {
+        ast = [ast[2]]
+        prefixedVariant = designSystem.parseVariant('*')
+      }
+
+      // Handling a grand child combinator. E.g.: `[&_[data-visible]]` => `**:data-visible`
+      if (
+        // Only top-level, so `has-[&_[data-visible]]` is not supported
+        parent === null &&
+        // [&_[data-visible]]:flex
+        //  ^ ^^^^^^^^^^^^^^
+        ast.length === 3 &&
+        ast[0].kind === 'selector' &&
+        ast[0].value === '&' &&
+        ast[1].kind === 'combinator' &&
+        ast[1].value === ' ' &&
+        ast[2].kind === 'selector' &&
+        (ast[2].value[0] === ':' || isAttributeSelector(ast[2]))
+      ) {
+        ast = [ast[2]]
+        prefixedVariant = designSystem.parseVariant('**')
+      }
+
+      let selectorNodes = ast
+      walk(selectorNodes, {
+        enter(node) {
+          // Filter out `&`. E.g.: `&[data-foo]` => `[data-foo]`
+          if (node.kind === 'selector' && node.value === '&') {
+            return WalkAction.Replace([])
+          }
+
+          if (node.kind === 'function') {
+            return WalkAction.Skip
+          }
+        },
+        exit(node) {
+          if (node.kind === 'compound' && node.nodes.length === 1) {
+            return WalkAction.ReplaceSkip(node.nodes)
+          }
+        },
+      })
+
+      // Expecting a single selector (normal selector or attribute selector)
+      if (selectorNodes.length !== 1) continue
+
+      let target = selectorNodes[0]
+      if (target.kind === 'function' && target.value === ':is') {
+        // Expecting a single selector node
+        if (
+          !isSingleSelector(target.nodes) ||
+          // [foo][bar] is considered a single selector but has multiple nodes
+          target.nodes.length !== 1
+        ) {
+          continue
+        }
+
+        // Expecting a single attribute selector
+        if (target.nodes[0].kind === 'selector' && !isAttributeSelector(target.nodes[0])) continue
+
+        // Unwrap the selector from inside `&:is(…)`
+        target = target.nodes[0]
+      }
+
+      // Expecting a pseudo selector (or function)
+      if (
+        (target.kind === 'function' && target.value[0] === ':') ||
+        (target.kind === 'selector' && target.value[0] === ':')
+      ) {
+        let targetNode = target
+        let compoundNot = false
+        if (targetNode.kind === 'function' && targetNode.value === ':not') {
+          compoundNot = true
+          if (targetNode.nodes.length !== 1) continue
+          if (targetNode.nodes[0].kind !== 'selector' && targetNode.nodes[0].kind !== 'function') {
+            continue
+          }
+          if (targetNode.nodes[0].value[0] !== ':') continue
+
+          targetNode = targetNode.nodes[0]
+        }
+
+        let newVariant = ((value) => {
+          if (
+            value === ':nth-child' &&
+            targetNode.kind === 'function' &&
+            targetNode.nodes.length === 1 &&
+            targetNode.nodes[0].kind === 'value' &&
+            targetNode.nodes[0].value === 'odd'
+          ) {
+            if (compoundNot) {
+              compoundNot = false
+              return 'even'
+            }
+            return 'odd'
+          }
+
+          if (
+            value === ':nth-child' &&
+            targetNode.kind === 'function' &&
+            targetNode.nodes.length === 1 &&
+            targetNode.nodes[0].kind === 'value' &&
+            targetNode.nodes[0].value === 'even'
+          ) {
+            if (compoundNot) {
+              compoundNot = false
+              return 'odd'
+            }
+            return 'even'
+          }
+
+          for (let [selector, variantName] of [
+            [':nth-child', 'nth'],
+            [':nth-last-child', 'nth-last'],
+            [':nth-of-type', 'nth-of-type'],
+            [':nth-last-of-type', 'nth-of-last-type'],
+          ]) {
+            if (
+              value === selector &&
+              targetNode.kind === 'function' &&
+              targetNode.nodes.length === 1
+            ) {
+              if (
+                targetNode.nodes.length === 1 &&
+                targetNode.nodes[0].kind === 'value' &&
+                isPositiveInteger(targetNode.nodes[0].value)
+              ) {
+                return `${variantName}-${targetNode.nodes[0].value}`
+              }
+
+              return `${variantName}-[${SelectorParser.toCss(targetNode.nodes, true)}]`
+            }
+          }
+
+          // Hoist `not` modifier
+          if (compoundNot) {
+            let targetSignature = signatures.get(designSystem.printVariant(variant))
+            let replacementSignature = signatures.get(`not-[${value}]`)
+            if (targetSignature === replacementSignature) {
+              return `[&${value}]`
+            }
+          }
+
+          return null
+        })(targetNode.value)
+
+        if (newVariant === null) {
+          if (prefixedVariant) {
+            replaceObject(variant, {
+              kind: 'arbitrary',
+              selector: target.value,
+              relative: false,
+            } satisfies Variant)
+
+            return [prefixedVariant, variant]
+          }
+
+          continue
+        }
+
+        // Add `not-` prefix
+        if (compoundNot) newVariant = `not-${newVariant}`
+
+        let parsed = designSystem.parseVariant(newVariant)
+        if (parsed === null) continue
+
+        // Update original variant
+        replaceObject(variant, parsed)
+      }
+
+      // Expecting an attribute selector
+      else if (target.kind === 'selector' && isAttributeSelector(target)) {
+        let attributeSelector = AttributeSelectorParser.parse(target.value)
+        if (attributeSelector === null) continue // Invalid attribute selector
+
+        // Migrate `data-*`
+        if (attributeSelector.attribute.startsWith('data-')) {
+          let name = attributeSelector.attribute.slice(5) // Remove `data-`
+
+          replaceObject(variant, {
+            kind: 'functional',
+            root: 'data',
+            modifier: null,
+            value:
+              attributeSelector.value === null
+                ? { kind: 'named', value: name }
+                : {
+                    kind: 'arbitrary',
+                    value: `${name}${attributeSelector.operator}${attributeSelector.quote ?? ''}${attributeSelector.value}${attributeSelector.quote ?? ''}${attributeSelector.sensitivity ? ` ${attributeSelector.sensitivity}` : ''}`,
+                  },
+          } satisfies Variant)
+        }
+
+        // Migrate `aria-*`
+        else if (attributeSelector.attribute.startsWith('aria-')) {
+          let name = attributeSelector.attribute.slice(5) // Remove `aria-`
+          replaceObject(variant, {
+            kind: 'functional',
+            root: 'aria',
+            modifier: null,
+            value:
+              attributeSelector.value === null
+                ? { kind: 'arbitrary', value: name } // aria-[foo]
+                : attributeSelector.operator === '=' &&
+                    attributeSelector.value === 'true' &&
+                    attributeSelector.sensitivity === null
+                  ? { kind: 'named', value: name } // aria-[foo="true"] or aria-[foo='true'] or aria-[foo=true]
+                  : {
+                      kind: 'arbitrary',
+                      value: `${attributeSelector.attribute}${attributeSelector.operator}${attributeSelector.quote ?? ''}${attributeSelector.value}${attributeSelector.quote ?? ''}${attributeSelector.sensitivity ? ` ${attributeSelector.sensitivity}` : ''}`,
+                    }, // aria-[foo~="true"], aria-[foo|="true"], …
+          } satisfies Variant)
+        }
+
+        // Arbitrary attributes
+        else {
+          replaceObject(variant, {
+            kind: 'arbitrary',
+            selector: target.value,
+            relative: false,
+          } satisfies Variant)
+        }
+      }
+
+      if (prefixedVariant) {
+        return [prefixedVariant, variant]
+      }
+    }
+  }
+
+  return result
+}
+
+// ---
+
+function optimizeArbitraryValueExpressions(
+  candidate: Candidate,
+  options: InternalCanonicalizeOptions,
+): Candidate {
+  if (candidate.kind !== 'functional' || candidate.value?.kind !== 'arbitrary') {
+    return candidate
+  }
+
+  let designSystem = options.designSystem
+  let hasSameSignature = designSystem.storage[COMPARE_CANDIDATES_KEY].get(options.signatureOptions)
+
+  let valueAst = ValueParser.parse(candidate.value.value)
+
+  // Start by constant folding the value expression, when dealing with `calc(…)`
+  if (valueAst.length === 1 && valueAst[0].kind === 'function' && valueAst[0].value === 'calc') {
+    let [folded, foldedValueAst] = constantFoldDeclarationAst(valueAst, null, false)
+    if (folded) {
+      let replacement = cloneCandidate(candidate)
+      replacement.value!.value = ValueParser.toCss(foldedValueAst)
+
+      if (hasSameSignature(candidate, replacement)) {
+        candidate = replacement
+        valueAst = foldedValueAst
+      }
+    }
+  }
+
+  // Move `-` sign into the arbitrary value itself
+  if (candidate.root[0] === '-') {
+    // We're dealing with a `var(…)`, keep as-is
+    if (valueAst.length === 1 && valueAst[0].kind === 'function' && valueAst[0].value === 'var') {
+      return candidate
+    }
+
+    // Move `* -1` inside, and try to constant fold to see if it's even worth
+    // updating the candidate or not.
+    let expressionAst = ValueParser.parse(`calc(${candidate.value!.value} * -1)`)
+    let [folded, foldedExpressionAst] = constantFoldDeclarationAst(expressionAst, null, false)
+    if (folded) {
+      let replacement = cloneCandidate(candidate)
+
+      replacement.root = replacement.root.slice(1) // Drop the leading `-`
+      replacement.value!.value = ValueParser.toCss(foldedExpressionAst)
+
+      if (hasSameSignature(candidate, replacement)) {
+        candidate = replacement
+        valueAst = foldedExpressionAst
+      }
+    }
+  }
+
+  // Move `-` sign out of the arbitrary value
+  if (valueAst.length === 1 && valueAst[0].kind === 'function' && valueAst[0].value === 'calc') {
+    let calcArgs = valueAst[0].nodes
+
+    // `calc(arg * -1)` or `calc(-1  * arg)`
+    if (
+      calcArgs.length === 5 &&
+      calcArgs[1].kind === 'separator' &&
+      calcArgs[1].value === ' ' &&
+      calcArgs[2].kind === 'word' &&
+      calcArgs[2].value === '*' &&
+      calcArgs[3].kind === 'separator' &&
+      calcArgs[3].value === ' '
+    ) {
+      let arg =
+        calcArgs[4].kind === 'word' && calcArgs[4].value === '-1'
+          ? calcArgs[0]
+          : calcArgs[0].kind === 'word' && calcArgs[0].value === '-1'
+            ? calcArgs[4]
+            : null
+
+      if (arg) {
+        let replacement = cloneCandidate(candidate)
+        replacement.root = `-${candidate.root}`
+        replacement.value!.value = ValueParser.toCss([arg])
+
+        if (hasSameSignature(candidate, replacement)) {
+          candidate = replacement
+        }
+      }
+    }
+  }
+
+  return candidate
+}
+
+// ----
+
+// Optimize the modifier
+//
+// E.g.:
+//
+// - `/[25%]`   → `/25`
+// - `/[100%]`  → `/100`    → <empty>
+// - `/100`     → <empty>
+//
+function optimizeModifier(candidate: Candidate, options: InternalCanonicalizeOptions): Candidate {
+  // We are only interested in functional or arbitrary utilities with a modifier
+  if (
+    (candidate.kind !== 'functional' && candidate.kind !== 'arbitrary') ||
+    candidate.modifier === null
+  ) {
+    return candidate
+  }
+
+  let designSystem = options.designSystem
+  let signatures = designSystem.storage[UTILITY_SIGNATURE_KEY].get(options.signatureOptions)
+
+  let targetSignature = signatures.get(designSystem.printCandidate(candidate))
+  let modifier = candidate.modifier
+
+  // 1. Try to drop the modifier entirely
+  if (
+    targetSignature ===
+    signatures.get(designSystem.printCandidate({ ...candidate, modifier: null }))
+  ) {
+    candidate.modifier = null
+    return candidate
+  }
+
+  // 2. Try to remove the square brackets and the `%` sign
+  {
+    let newModifier: NamedUtilityValue = {
+      kind: 'named',
+      value: modifier.value.endsWith('%')
+        ? modifier.value.includes('.')
+          ? `${Number(modifier.value.slice(0, -1))}`
+          : modifier.value.slice(0, -1)
+        : modifier.value,
+      fraction: null,
+    }
+
+    if (
+      targetSignature ===
+      signatures.get(designSystem.printCandidate({ ...candidate, modifier: newModifier }))
+    ) {
+      candidate.modifier = newModifier
+      return candidate
+    }
+  }
+
+  // 3. Try to remove the square brackets, but multiply by 100. E.g.: `[0.16]` -> `16`
+  {
+    let newModifier: NamedUtilityValue = {
+      kind: 'named',
+      value: `${parseFloat(modifier.value) * 100}`,
+      fraction: null,
+    }
+
+    if (
+      targetSignature ===
+      signatures.get(designSystem.printCandidate({ ...candidate, modifier: newModifier }))
+    ) {
+      candidate.modifier = newModifier
+      return candidate
+    }
+  }
+
+  return candidate
+}
+
+export enum SignatureFeatures {
+  None = 0,
+  ExpandProperties = 1 << 0,
+  LogicalToPhysical = 1 << 1,
+}
+
+interface SignatureOptions {
+  /**
+   * The root font size in pixels. If provided, `rem` values will be normalized
+   * to `px` values.
+   *
+   * E.g.: `mt-[16px]` with `rem: 16` will become `mt-4` (assuming `--spacing: 0.25rem`).
+   */
+  rem: number | null
+
+  /**
+   * Features that influence how signatures are computed.
+   */
+  features: SignatureFeatures
+}
+
+// Given a utility, compute a signature that represents the utility. The
+// signature will be a normalised form of the generated CSS for the utility, or
+// a unique symbol if the utility is not valid. The class in the selector will
+// be replaced with the `.x` selector.
+//
+// This function should only be passed the base utility so `flex`, `hover:flex`
+// and `focus:flex` will all use just `flex`. Variants are handled separately.
+//
+// E.g.:
+//
+// | UTILITY          | GENERATED SIGNATURE     |
+// | ---------------- | ----------------------- |
+// | `[display:flex]` | `.x { display: flex; }` |
+// | `flex`           | `.x { display: flex; }` |
+//
+// These produce the same signature, therefore they represent the same utility.
+export const UTILITY_SIGNATURE_KEY = Symbol()
+function createUtilitySignatureCache(
+  designSystem: DesignSystem,
+): DesignSystem['storage'][typeof UTILITY_SIGNATURE_KEY] {
+  return new DefaultMap((options: SignatureOptions) => {
+    return new DefaultMap<string, string | symbol>((utility) => {
+      try {
+        // Ensure the prefix is added to the utility if it is not already present.
+        utility =
+          designSystem.theme.prefix && !utility.startsWith(designSystem.theme.prefix)
+            ? `${designSystem.theme.prefix}:${utility}`
+            : utility
+
+        // Use `@apply` to normalize the selector to `.x`
+        let ast: AstNode[] = [styleRule('.x', [atRule('@apply', utility)])]
+
+        temporarilyDisableThemeInline(designSystem, () => {
+          // There's separate utility caches for respect important vs not
+          // so we want to compile them both with `@theme inline` disabled
+          for (let candidate of designSystem.parseCandidate(utility)) {
+            designSystem.compileAstNodes(candidate, CompileAstFlags.RespectImportant)
+          }
+
+          substituteAtApply(ast, designSystem)
+        })
+
+        // Optimize the AST. This is needed such that any internal intermediate
+        // nodes are gone. This will also cleanup declaration nodes with undefined
+        // values or `--tw-sort` declarations.
+        canonicalizeAst(designSystem, ast, options)
+
+        // Compute the final signature, by generating the CSS for the utility
+        let signature = toCss(ast)
+        return signature
+      } catch {
+        // A unique symbol is returned to ensure that 2 signatures resulting in
+        // `null` are not considered equal.
+        return Symbol()
+      }
+    })
+  })
+}
+
+// #RGB
+// #RGBA
+// #RRGGBB
+// #RRGGBBAA
+const HEX_REGEX = /#(?:[a-f0-9]{8}|[a-f0-9]{6}|[a-f0-9]{4}|[a-f0-9]{3})/gi
+
+// Optimize the CSS AST to make it suitable for signature comparison. We want to
+// expand declarations, ignore comments, sort declarations etc...
+function canonicalizeAst(designSystem: DesignSystem, ast: AstNode[], options: SignatureOptions) {
+  let { rem } = options
+
+  walk(ast, {
+    enter(node, ctx) {
+      // Optimize declarations
+      if (node.kind === 'declaration') {
+        if (node.value === undefined || node.property === '--tw-sort') {
+          return WalkAction.Replace([])
+        }
+
+        // Ignore `--tw-{property}` if `{property}` exists with the same value
+        if (node.property.startsWith('--tw-')) {
+          if (
+            ctx.siblings.some(
+              (sibling) =>
+                sibling.kind === 'declaration' &&
+                node.value === sibling.value &&
+                node.important === sibling.important &&
+                !sibling.property.startsWith('--tw-'),
+            )
+          ) {
+            return WalkAction.Replace([])
+          }
+        }
+
+        if (options.features & SignatureFeatures.ExpandProperties) {
+          let replacement = expandDeclaration(node, options.features)
+          if (replacement) return WalkAction.Replace(replacement)
+        }
+
+        // Resolve theme values to their inlined value.
+        if (node.value.includes('var(')) {
+          node.value = resolveVariablesInValue(node.value, designSystem)
+        }
+
+        let valueAst = ValueParser.parse(node.value)
+
+        // Very basic `calc(…)` constant folding to handle the spacing scale
+        // multiplier:
+        //
+        // Input:  `--spacing(4)`
+        //       → `calc(var(--spacing, 0.25rem) * 4)`
+        //       → `calc(0.25rem * 4)`       ← this is the case we will see
+        //                                     after inlining the variable
+        //       → `1rem`
+        let [folded, foldedValueAst] = constantFoldDeclarationAst(valueAst, rem)
+
+        // Normalize `calc(…)` expressions such that arguments that are
+        // associatively equivalent are rendered in the same way.
+        //
+        // `calc(var(--foo) * -1)` === `calc(-1 * var(--foo))`
+        let [normalized, canonicalizedValueAst] = canonicalizeCalcExpressionsAst(foldedValueAst)
+
+        if (folded || normalized) {
+          node.value = ValueParser.toCss(canonicalizedValueAst)
+        }
+
+        // We will normalize the `node.value`, this is the same kind of logic
+        // we use when printing arbitrary values. It will remove unnecessary
+        // whitespace.
+        //
+        // Essentially normalizing the `node.value` to a canonical form.
+        node.value = printArbitraryValue(node.value)
+      }
+
+      // Replace special nodes with its children
+      else if (node.kind === 'context' || node.kind === 'at-root') {
+        return WalkAction.Replace(node.nodes)
+      }
+
+      // Remove comments
+      else if (node.kind === 'comment') {
+        return WalkAction.Replace([])
+      }
+
+      // Remove at-rules that are not needed for the signature
+      else if (node.kind === 'at-rule' && node.name === '@property') {
+        return WalkAction.Replace([])
+      }
+    },
+    exit(node) {
+      if (node.kind === 'rule' || node.kind === 'at-rule') {
+        // Remove declarations that are re-defined again later.
+        //
+        // This could maybe result in unwanted behavior (because similar
+        // properties typically exist for backwards compatibility), but for
+        // signature purposes we can assume that the last declaration wins.
+        if (node.nodes.length > 1) {
+          let seen = new Set<string>()
+          for (let i = node.nodes.length - 1; i >= 0; i--) {
+            let child = node.nodes[i]
+            if (child.kind !== 'declaration') continue
+            if (child.value === undefined) continue
+
+            if (seen.has(child.property)) {
+              node.nodes.splice(i, 1)
+            }
+            seen.add(child.property)
+          }
+        }
+
+        // Sort declarations alphabetically by property name
+        node.nodes.sort((a, b) => {
+          if (a.kind !== 'declaration') return 0
+          if (b.kind !== 'declaration') return 0
+          return a.property.localeCompare(b.property)
+        })
+      }
+
+      //
+      else if (node.kind === 'declaration' && node.value) {
+        // Leave CSS variables alone
+        if (node.property[0] === '-' && node.property[1] === '-') return
+
+        // Ensure hex colors are always lowercased
+        {
+          HEX_REGEX.lastIndex = 0
+          node.value = node.value.replace(HEX_REGEX, (color) => color.toLowerCase())
+        }
+      }
+    },
+  })
+
+  return ast
+}
+
+// Variables whose theme value is a CSS-wide keyword (e.g.: `unset`) are never
+// inlined. These are typically registered as a placeholder to be re-assigned at
+// runtime, so two variables that share such a value are not interchangeable.
+//
+// E.g.:
+//
+// ```css
+// @theme {
+//   --foreground: unset;
+//   --background: unset;
+// }
+// ```
+//
+// Inlining would make `text-(--foreground)` and `text-(--background)` produce
+// the same signature `color: unset`, even though they are different at runtime.
+//
+// https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Values/Data_types#css-wide_keywords
+const CSS_WIDE_KEYWORDS = ['initial', 'inherit', 'revert', 'revert-layer', 'revert-rule', 'unset']
+
+// Resolve theme values to their inlined value.
+//
+// E.g.:
+//
+// `[color:var(--color-red-500)]` → `[color:oklch(63.7%_0.237_25.331)]`
+// `[color:oklch(63.7%_0.237_25.331)]` → `[color:oklch(63.7%_0.237_25.331)]`
+//
+// Due to the `@apply` from above, this will become:
+//
+// ```css
+// .example {
+//   color: oklch(63.7% 0.237 25.331);
+// }
+// ```
+//
+// Which conveniently will be equivalent to: `text-red-500` when we inline the
+// value.
+//
+// Without inlining:
+// ```css
+// .example {
+//   color: var(--color-red-500, oklch(63.7% 0.237 25.331));
+// }
+// ```
+//
+// Inlined:
+// ```css
+// .example {
+//   color: oklch(63.7% 0.237 25.331);
+// }
+// ```
+//
+// Recently we made sure that utilities like `text-red-500` also generate the
+// fallback value for usage in `@reference` mode.
+//
+// The second assumption is that if you use `var(--key, fallback)` that happens
+// to match a known variable _and_ its inlined value. Then we can replace it
+// with the inlined variable. This allows us to handle custom `@theme` and
+// `@theme inline` definitions.
+function resolveVariablesInValue(value: string, designSystem: DesignSystem): string {
+  let changed = false
+  let valueAst = ValueParser.parse(value)
+
+  let seen = new Set<string>()
+  walk(valueAst, (valueNode) => {
+    if (valueNode.kind !== 'function') return
+    if (valueNode.value !== 'var') return
+
+    // Resolve the underlying value of the variable
+    if (valueNode.nodes.length !== 1 && valueNode.nodes.length < 3) {
+      return
+    }
+
+    let variable = valueNode.nodes[0].value
+
+    // Drop the prefix from the variable name if it is present. The
+    // internal variable doesn't have the prefix.
+    if (designSystem.theme.prefix && variable.startsWith(`--${designSystem.theme.prefix}-`)) {
+      variable = variable.slice(`--${designSystem.theme.prefix}-`.length)
+    }
+    let variableValue = designSystem.resolveThemeValue(variable)
+    // Prevent infinite recursion when the variable value contains the
+    // variable itself.
+    if (seen.has(variable)) return
+    seen.add(variable)
+    if (variableValue === undefined) return // Couldn't resolve the variable
+
+    // CSS-wide keywords are never inlined
+    if (CSS_WIDE_KEYWORDS.includes(variableValue.toLowerCase())) return
+
+    // Inject variable fallbacks when no fallback is present yet.
+    //
+    // A fallback could consist of multiple values.
+    //
+    // E.g.:
+    //
+    // ```
+    // var(--font-sans, ui-sans-serif, system-ui, sans-serif, …)
+    // ```
+    {
+      // More than 1 argument means that a fallback is already present
+      if (valueNode.nodes.length === 1) {
+        // Inject the fallback value into the variable lookup
+        changed = true
+        valueNode.nodes.push(...ValueParser.parse(`,${variableValue}`))
+      }
+    }
+
+    // Replace known variable + inlined fallback value with the value
+    // itself again
+    {
+      // We need at least 3 arguments. The variable, the separator and a fallback value.
+      if (valueNode.nodes.length >= 3) {
+        let nodeAsString = ValueParser.toCss(valueNode.nodes) // This could include more than just the variable
+        let constructedValue = `${valueNode.nodes[0].value},${variableValue}`
+        if (nodeAsString === constructedValue) {
+          changed = true
+          return WalkAction.Replace(ValueParser.parse(variableValue))
+        }
+      }
+    }
+  })
+
+  // Replace the value with the new value
+  if (changed) return ValueParser.toCss(valueAst)
+  return value
+}
+
+// Index all static utilities by property and value
+const STATIC_UTILITIES_KEY = Symbol()
+function createStaticUtilitiesCache(): DesignSystem['storage'][typeof STATIC_UTILITIES_KEY] {
+  return new DefaultMap((_optiones: SignatureOptions) => {
+    return new DefaultMap((_property: string) => {
+      return new DefaultMap((_value: string) => {
+        return new Set<string>()
+      })
+    })
+  })
+}
+
+const UTILITY_PROPERTIES_KEY = Symbol()
+function createUtilityPropertiesCache(
+  designSystem: DesignSystem,
+): DesignSystem['storage'][typeof UTILITY_PROPERTIES_KEY] {
+  return new DefaultMap((options: SignatureOptions) => {
+    return new DefaultMap((className) => {
+      let localPropertyValueLookup = new DefaultMap((_property) => new Set<string>())
+
+      if (designSystem.theme.prefix && !className.startsWith(designSystem.theme.prefix)) {
+        className = `${designSystem.theme.prefix}:${className}`
+      }
+      let parsed = designSystem.parseCandidate(className)
+      if (parsed.length === 0) return localPropertyValueLookup
+
+      try {
+        let ast = designSystem.compileAstNodes(parsed[0]).map((x) => cloneAstNode(x.node))
+        walk(canonicalizeAst(designSystem, ast, options), (node) => {
+          if (node.kind === 'declaration') {
+            localPropertyValueLookup.get(node.property).add(node.value!)
+            designSystem.storage[STATIC_UTILITIES_KEY].get(options)
+              .get(node.property)
+              .get(node.value!)
+              .add(className)
+          }
+        })
+      } catch {
+        // Ignore errors, this could happen when we call a plugin with a value
+        // it didn't expect. But since plugins are functions, we can't know
+        // ahead of time what it expects.
+      }
+
+      return localPropertyValueLookup
+    })
+  })
+}
+
+// For all static utilities in the system, compute a lookup table that maps the
+// utility signature to the utility name. This is used to find the utility name
+// for a given utility signature.
+//
+// For all functional utilities, we can compute static-like utilities by
+// essentially pre-computing the values and modifiers. This is a bit slow, but
+// also only has to happen once per design system.
+const PRE_COMPUTED_UTILITIES_KEY = Symbol()
+function createPreComputedUtilitiesCache(
+  designSystem: DesignSystem,
+): DesignSystem['storage'][typeof PRE_COMPUTED_UTILITIES_KEY] {
+  return new DefaultMap((options: SignatureOptions) => {
+    let signatures = designSystem.storage[UTILITY_SIGNATURE_KEY].get(options)
+    let lookup = new DefaultMap<string, string[]>(() => [])
+
+    // Right now all plugins are implemented using functions so they are a black
+    // box. Let's use the `getClassList` and consider every known suggestion as a
+    // static utility for now.
+    for (let [className, meta] of designSystem.getClassList()) {
+      let signature = signatures.get(className)
+      if (typeof signature !== 'string') continue
+
+      // Skip the utility if `-{utility}-0` has the same signature as
+      // `{utility}-0` (its positive version). This will prefer positive values
+      // over negative values.
+      if (className[0] === '-' && className.endsWith('-0')) {
+        let positiveSignature = signatures.get(className.slice(1))
+        if (typeof positiveSignature === 'string' && signature === positiveSignature) {
+          continue
+        }
+      }
+
+      lookup.get(signature).push(className)
+      designSystem.storage[UTILITY_PROPERTIES_KEY].get(options).get(className)
+
+      for (let modifier of meta.modifiers) {
+        // Modifiers representing numbers can be computed and don't need to be
+        // pre-computed. Doing the math and at the time of writing this, this
+        // would save you 250k additionally pre-computed utilities...
+        if (isValidSpacingMultiplier(modifier)) {
+          continue
+        }
+
+        let classNameWithModifier = `${className}/${modifier}`
+        let signature = signatures.get(classNameWithModifier)
+        if (typeof signature !== 'string') continue
+        lookup.get(signature).push(classNameWithModifier)
+        designSystem.storage[UTILITY_PROPERTIES_KEY].get(options).get(classNameWithModifier)
+      }
+    }
+
+    return lookup
+  })
+}
+
+// Given a variant, compute a signature that represents the variant. The
+// signature will be a normalised form of the generated CSS for the variant, or
+// a unique symbol if the variant is not valid. The class in the selector will
+// be replaced with `.x`.
+//
+// E.g.:
+//
+// | VARIANT          | GENERATED SIGNATURE           |
+// | ---------------- | ----------------------------- |
+// | `[&:focus]:flex` | `.x:focus { display: flex; }` |
+// | `focus:flex`     | `.x:focus { display: flex; }` |
+//
+// These produce the same signature, therefore they represent the same variant.
+export const VARIANT_SIGNATURE_KEY = Symbol()
+function createVariantSignatureCache(
+  designSystem: DesignSystem,
+): DesignSystem['storage'][typeof VARIANT_SIGNATURE_KEY] {
+  return new DefaultMap((rem: number | null) => {
+    return new DefaultMap<string, string | symbol>((variant) => {
+      try {
+        // Ensure the prefix is added to the utility if it is not already present.
+        variant =
+          designSystem.theme.prefix && !variant.startsWith(designSystem.theme.prefix)
+            ? `${designSystem.theme.prefix}:${variant}`
+            : variant
+
+        // Use `@apply` to normalize the selector to `.x`
+        let ast: AstNode[] = [styleRule('.x', [atRule('@apply', `${variant}:flex`)])]
+        substituteAtApply(ast, designSystem)
+
+        // Canonicalize selectors to their minimal form
+        walk(ast, (node) => {
+          // At-rules
+          if (node.kind === 'at-rule') {
+            // Normalize dimensions such that equivalent values in different
+            // units are considered the same. E.g.: with a root font size of
+            // `16px`, `@media (width >= 64rem)` and `@media (width >= 1024px)`
+            // are equivalent.
+            node.params = constantFoldDeclaration(node.params, rem)
+
+            if (node.params.includes(' ')) {
+              node.params = node.params.replaceAll(' ', '')
+            }
+          }
+
+          // Style rules
+          else if (node.kind === 'rule') {
+            let selectorAst = SelectorParser.parse(node.selector)
+            let changed = false
+            walk(selectorAst, (node) => {
+              // Assumption: when we have a list of selectors: `.foo, .bar` we
+              // want to mark this as changed because this will be re-printed as
+              // `.foo,.bar`.
+              //
+              // Similarly, when we receive a combinator like `.foo + .bar`, this
+              // will be printed as `.foo+.bar`.
+              //
+              // It could be that this was already optimal, but then this would be
+              // a no-op situation.
+              if (node.kind === 'list' || node.kind === 'combinator') {
+                changed = true
+              }
+
+              // Remove unnecessary `:is(…)` selectors
+              else if (node.kind === 'function' && node.value === ':is') {
+                // A single selector inside of `:is(…)` can be replaced with the
+                // selector itself.
+                //
+                // E.g.: `:is(.foo)` → `.foo`
+                if (node.nodes.length === 1) {
+                  changed = true
+                  return WalkAction.Replace(node.nodes)
+                }
+
+                // A selector with the universal selector `*` followed by a pseudo
+                // class, can be replaced with the pseudo class itself.
+                else if (
+                  node.nodes.length === 2 &&
+                  node.nodes[0].kind === 'selector' &&
+                  node.nodes[0].value === '*' &&
+                  node.nodes[1].kind === 'selector' &&
+                  node.nodes[1].value[0] === ':'
+                ) {
+                  changed = true
+                  return WalkAction.Replace(node.nodes[1])
+                }
+              }
+
+              // Ensure `*` exists before pseudo selectors inside of `:not(…)`,
+              // `:where(…)`, …
+              //
+              // E.g.:
+              //
+              // `:not(:first-child)` → `:not(*:first-child)`
+              //
+              else if (
+                node.kind === 'function' &&
+                node.value[0] === ':' &&
+                node.nodes[0]?.kind === 'selector' &&
+                node.nodes[0]?.value[0] === ':'
+              ) {
+                changed = true
+                node.nodes.unshift({ kind: 'selector', value: '*' })
+              }
+            })
+
+            if (changed) {
+              node.selector = SelectorParser.toCss(selectorAst, true)
+            }
+          }
+        })
+
+        // Compute the final signature, by generating the CSS for the variant
+        let signature = toCss(ast)
+        return signature
+      } catch {
+        // A unique symbol is returned to ensure that 2 signatures resulting in
+        // `null` are not considered equal.
+        return Symbol()
+      }
+    })
+  })
+}
+
+export const PRE_COMPUTED_VARIANTS_KEY = Symbol()
+function createPreComputedVariantsCache(
+  designSystem: DesignSystem,
+): DesignSystem['storage'][typeof PRE_COMPUTED_VARIANTS_KEY] {
+  return new DefaultMap((rem: number | null) => {
+    let signatures = designSystem.storage[VARIANT_SIGNATURE_KEY].get(rem)
+    let lookup = new DefaultMap<string, string[]>(() => [])
+
+    for (let [root, variant] of designSystem.variants.entries()) {
+      // Actual static variants
+      if (variant.kind === 'static') {
+        let signature = signatures.get(root)
+        if (typeof signature !== 'string') continue
+        lookup.get(signature).push(root)
+      }
+
+      // Functional variants with known values, e.g.: `max-lg`, `@min-md`, …
+      else if (variant.kind === 'functional') {
+        for (let value of designSystem.variants.getCompletions(root)) {
+          let name = root === '@' ? `@${value}` : `${root}-${value}`
+          let signature = signatures.get(name)
+          if (typeof signature !== 'string') continue
+          lookup.get(signature).push(name)
+        }
+      }
+    }
+
+    return lookup
+  })
+}
+
+function temporarilyDisableThemeInline<T>(designSystem: DesignSystem, cb: () => T): T {
+  // Turn off `@theme inline` feature such that `@theme` and `@theme inline` are
+  // considered the same. The biggest motivation for this is referencing
+  // variables in another namespace that happen to contain the same value as the
+  // utility's own namespaces it is reading from.
+  //
+  // E.g.:
+  //
+  // The `max-w-*` utility doesn't read from the `--breakpoint-*` namespace.
+  // But it does read from the `--container-*` namespace. It also happens to
+  // be the case that `--breakpoint-md` and `--container-3xl` are the exact
+  // same value.
+  //
+  // If you then use the `max-w-(--breakpoint-md)` utility, inlining the
+  // variable would mean:
+  //  - `max-w-(--breakpoint-md)` → `max-width: 48rem;` → `max-w-3xl`
+  //  - `max-w-(--contianer-3xl)` → `max-width: 48rem;` → `max-w-3xl`
+  //
+  // Not inlining the variable would mean:
+  // - `max-w-(--breakpoint-md)` → `max-width: var(--breakpoint-md);` → `max-w-(--breakpoint-md)`
+  // - `max-w-(--container-3xl)` → `max-width: var(--container-3xl);` → `max-w-3xl`
+
+  // @ts-expect-error We are monkey-patching a method that's considered private
+  // in TypeScript
+  let originalGet = designSystem.theme.values.get
+
+  // Track all values with the inline option set, so we can restore them later.
+  let restorableInlineOptions = new Set<{ options: ThemeOptions }>()
+
+  // @ts-expect-error We are monkey-patching a method that's considered private
+  // in TypeScript
+  designSystem.theme.values.get = (key: string) => {
+    // @ts-expect-error We are monkey-patching a method that's considered private
+    // in TypeScript
+    let value = originalGet.call(designSystem.theme.values, key)
+    if (value === undefined) return value
+
+    // Remove `inline` if it was set
+    if (value.options & ThemeOptions.INLINE) {
+      restorableInlineOptions.add(value)
+      value.options &= ~ThemeOptions.INLINE
+    }
+
+    return value
+  }
+
+  try {
+    // Run the callback with the `@theme inline` feature disabled
+    return cb()
+  } finally {
+    // Restore the `@theme inline` to the original value
+    // @ts-expect-error We are monkey-patching a method that's private
+    designSystem.theme.values.get = originalGet
+
+    // Re-add the `inline` option, in case future lookups are done
+    for (let value of restorableInlineOptions) {
+      value.options |= ThemeOptions.INLINE
+    }
+  }
+}
+
+// Generator that generates all combinations of the given set. Using a generator
+// so we can stop early when we found a suitable combination.
+//
+// NOTE:
+//
+// 1. Yield biggest combinations first
+// 2. Sets of size 1 and 0 are not yielded
+function* combinations<T>(arr: T[]): Generator<T[]> {
+  let n = arr.length
+  let limit = 1n << BigInt(n)
+
+  for (let k = n; k >= 2; k--) {
+    let mask = (1n << BigInt(k)) - 1n
+
+    while (mask < limit) {
+      let out = []
+      for (let i = 0; i < n; i++) {
+        if ((mask >> BigInt(i)) & 1n) {
+          out.push(arr[i])
+        }
+      }
+      yield out
+
+      // Gosper's hack:
+      // - https://programmingforinsomniacs.blogspot.com/2018/03/gospers-hack-explained.html
+      // - https://rosettacode.org/wiki/Gosper%27s_hack
+      //
+      // We need to generate the next mask in lexicographical order.
+      let carry = mask & -mask
+      let ripple = mask + carry
+      mask = (((ripple ^ mask) >> 2n) / carry) | ripple
+    }
+  }
+}
+
+function intersection<T>(a: Set<T>, b: Set<T>): Set<T> {
+  // @ts-expect-error Set.prototype.intersection is only available in Node.js v22+
+  if (typeof a.intersection === 'function') return a.intersection(b)
+
+  // Polyfill for environments that do not support Set.prototype.intersection yet
+  if (a.size === 0 || b.size === 0) return new Set<T>()
+
+  let result = new Set<T>(a)
+  for (let item of b) {
+    if (!result.has(item)) {
+      result.delete(item)
+    }
+  }
+
+  return result
+}
diff --git a/packages/tailwindcss/src/cartesian.ts b/packages/tailwindcss/src/cartesian.ts
new file mode 100644
index 000000000..f0f7bbba4
--- /dev/null
+++ b/packages/tailwindcss/src/cartesian.ts
@@ -0,0 +1,45 @@
+type CartesianInput = readonly unknown[][]
+
+type CartesianResult<T extends CartesianInput> = T extends [
+  infer Head extends unknown[],
+  ...infer Tail extends CartesianInput,
+]
+  ? [Head[number], ...CartesianResult<Tail>]
+  : []
+
+export function* cartesian<T extends CartesianInput>(...sets: T): Generator<CartesianResult<T>> {
+  let n = sets.length
+  if (n === 0) return
+
+  // If any input set is empty, the Cartesian product is empty.
+  if (sets.some((set) => set.length === 0)) {
+    return
+  }
+
+  // Index lookup
+  let idx = Array(n).fill(0)
+
+  while (true) {
+    // Compute current combination
+    let result = [] as CartesianResult<T>
+    for (let i = 0; i < n; i++) {
+      result[i] = sets[i][idx[i]]
+    }
+    yield result
+
+    // Update index vector
+    let k = n - 1
+    while (k >= 0) {
+      idx[k]++
+      if (idx[k] < sets[k].length) {
+        break
+      }
+      idx[k] = 0
+      k--
+    }
+
+    if (k < 0) {
+      return
+    }
+  }
+}
diff --git a/packages/tailwindcss/src/compat/apply-compat-hooks.ts b/packages/tailwindcss/src/compat/apply-compat-hooks.ts
index 0564bcf91..036b9d88e 100644
--- a/packages/tailwindcss/src/compat/apply-compat-hooks.ts
+++ b/packages/tailwindcss/src/compat/apply-compat-hooks.ts
@@ -1,7 +1,9 @@
 import { Features } from '..'
-import { styleRule, toCss, walk, WalkAction, type AstNode } from '../ast'
+import { cssContext, styleRule, toCss, type AstNode } from '../ast'
 import type { DesignSystem } from '../design-system'
+import type { SourceLocation } from '../source-maps/source'
 import { segment } from '../utils/segment'
+import { walk, WalkAction } from '../walk'
 import { applyConfigToTheme } from './apply-config-to-theme'
 import { applyKeyframesToTheme } from './apply-keyframes-to-theme'
 import { createCompatConfig } from './config/create-compat-config'
@@ -21,7 +23,7 @@ export async function applyCompatibilityHooks({
   base,
   ast,
   loadModule,
-  globs,
+  sources,
 }: {
   designSystem: DesignSystem
   base: string
@@ -30,20 +32,32 @@ export async function applyCompatibilityHooks({
     path: string,
     base: string,
     resourceHint: 'plugin' | 'config',
-  ) => Promise<{ module: any; base: string }>
-  globs: { origin?: string; pattern: string }[]
+  ) => Promise<{
+    path: string
+    base: string
+    module: any
+  }>
+  sources: { base: string; pattern: string; negated: boolean }[]
 }) {
   let features = Features.None
-  let pluginPaths: [{ id: string; base: string; reference: boolean }, CssPluginOptions | null][] =
-    []
-  let configPaths: { id: string; base: string; reference: boolean }[] = []
+  let pluginPaths: [
+    { id: string; base: string; reference: boolean; src: SourceLocation | undefined },
+    CssPluginOptions | null,
+  ][] = []
+  let configPaths: {
+    id: string
+    base: string
+    reference: boolean
+    src: SourceLocation | undefined
+  }[] = []
 
-  walk(ast, (node, { parent, replaceWith, context }) => {
+  walk(ast, (node, _ctx) => {
     if (node.kind !== 'at-rule') return
+    let ctx = cssContext(_ctx)
 
     // Collect paths from `@plugin` at-rules
     if (node.name === '@plugin') {
-      if (parent !== null) {
+      if (ctx.parent !== null) {
         throw new Error('`@plugin` cannot be nested.')
       }
 
@@ -96,13 +110,17 @@ export async function applyCompatibilityHooks({
       }
 
       pluginPaths.push([
-        { id: pluginPath, base: context.base as string, reference: !!context.reference },
+        {
+          id: pluginPath,
+          base: ctx.context.base as string,
+          reference: !!ctx.context.reference,
+          src: node.src,
+        },
         Object.keys(options).length > 0 ? options : null,
       ])
 
-      replaceWith([])
       features |= Features.JsPluginCompat
-      return
+      return WalkAction.Replace([])
     }
 
     // Collect paths from `@config` at-rules
@@ -111,18 +129,18 @@ export async function applyCompatibilityHooks({
         throw new Error('`@config` cannot have a body.')
       }
 
-      if (parent !== null) {
+      if (ctx.parent !== null) {
         throw new Error('`@config` cannot be nested.')
       }
 
       configPaths.push({
         id: node.params.slice(1, -1),
-        base: context.base as string,
-        reference: !!context.reference,
+        base: ctx.context.base as string,
+        reference: !!ctx.context.reference,
+        src: node.src,
       })
-      replaceWith([])
       features |= Features.JsPluginCompat
-      return
+      return WalkAction.Replace([])
     }
   })
 
@@ -134,9 +152,9 @@ export async function applyCompatibilityHooks({
   // compatibility concerns localized to our compatibility layer.
   let resolveThemeVariableValue = designSystem.resolveThemeValue
 
-  designSystem.resolveThemeValue = function resolveThemeValue(path: string) {
+  designSystem.resolveThemeValue = function resolveThemeValue(path: string, forceInline?: boolean) {
     if (path.startsWith('--')) {
-      return resolveThemeVariableValue(path)
+      return resolveThemeVariableValue(path, forceInline)
     }
 
     // If the theme value is not found in the simple resolver, we upgrade to the full backward
@@ -145,11 +163,11 @@ export async function applyCompatibilityHooks({
       designSystem,
       base,
       ast,
-      globs,
+      sources,
       configs: [],
       pluginDetails: [],
     })
-    return designSystem.resolveThemeValue(path)
+    return designSystem.resolveThemeValue(path, forceInline)
   }
 
   // If there are no plugins or configs registered, we don't need to register
@@ -158,18 +176,19 @@ export async function applyCompatibilityHooks({
 
   let [configs, pluginDetails] = await Promise.all([
     Promise.all(
-      configPaths.map(async ({ id, base, reference }) => {
+      configPaths.map(async ({ id, base, reference, src }) => {
         let loaded = await loadModule(id, base, 'config')
         return {
           path: id,
           base: loaded.base,
           config: loaded.module as UserConfig,
           reference,
+          src,
         }
       }),
     ),
     Promise.all(
-      pluginPaths.map(async ([{ id, base, reference }, pluginOptions]) => {
+      pluginPaths.map(async ([{ id, base, reference, src }, pluginOptions]) => {
         let loaded = await loadModule(id, base, 'plugin')
         return {
           path: id,
@@ -177,6 +196,7 @@ export async function applyCompatibilityHooks({
           plugin: loaded.module as Plugin,
           options: pluginOptions,
           reference,
+          src,
         }
       }),
     ),
@@ -186,7 +206,7 @@ export async function applyCompatibilityHooks({
     designSystem,
     base,
     ast,
-    globs,
+    sources,
     configs,
     pluginDetails,
   })
@@ -198,19 +218,20 @@ function upgradeToFullPluginSupport({
   designSystem,
   base,
   ast,
-  globs,
+  sources,
   configs,
   pluginDetails,
 }: {
   designSystem: DesignSystem
   base: string
   ast: AstNode[]
-  globs: { origin?: string; pattern: string }[]
+  sources: { base: string; pattern: string; negated: boolean }[]
   configs: {
     path: string
     base: string
     config: UserConfig
     reference: boolean
+    src: SourceLocation | undefined
   }[]
   pluginDetails: {
     path: string
@@ -218,6 +239,7 @@ function upgradeToFullPluginSupport({
     plugin: Plugin
     options: CssPluginOptions | null
     reference: boolean
+    src: SourceLocation | undefined
   }[]
 }) {
   let features = Features.None
@@ -227,6 +249,7 @@ function upgradeToFullPluginSupport({
         config: { plugins: [detail.plugin] },
         base: detail.base,
         reference: detail.reference,
+        src: detail.src,
       }
     }
 
@@ -235,6 +258,7 @@ function upgradeToFullPluginSupport({
         config: { plugins: [detail.plugin(detail.options)] },
         base: detail.base,
         reference: detail.reference,
+        src: detail.src,
       }
     }
 
@@ -244,30 +268,95 @@ function upgradeToFullPluginSupport({
   let userConfig = [...pluginConfigs, ...configs]
 
   let { resolvedConfig } = resolveConfig(designSystem, [
-    { config: createCompatConfig(designSystem.theme), base, reference: true },
+    { config: createCompatConfig(designSystem.theme), base, reference: true, src: undefined },
     ...userConfig,
-    { config: { plugins: [darkModePlugin] }, base, reference: true },
+    { config: { plugins: [darkModePlugin] }, base, reference: true, src: undefined },
   ])
   let { resolvedConfig: resolvedUserConfig, replacedThemeKeys } = resolveConfig(
     designSystem,
     userConfig,
   )
 
-  let pluginApi = buildPluginApi(designSystem, ast, resolvedConfig, {
-    set current(value: number) {
-      features |= value
+  let pluginApiConfig = {
+    designSystem,
+    ast,
+    resolvedConfig,
+    featuresRef: {
+      set current(value: number) {
+        features |= value
+      },
     },
+  }
+
+  let sharedPluginApi = buildPluginApi({
+    ...pluginApiConfig,
+    referenceMode: false,
+    src: undefined,
   })
 
-  for (let { handler, reference } of resolvedConfig.plugins) {
-    handler(reference ? { ...pluginApi, addBase: () => {} } : pluginApi)
+  // Replace `resolveThemeValue` with a version that is backwards compatible
+  // with dot-notation but also aware of any JS theme configurations registered
+  // by plugins or JS config files. This is significantly slower than just
+  // upgrading dot-notation keys so we only use this version if plugins or
+  // config files are actually being used. In the future we may want to optimize
+  // this further by only doing this if plugins or config files _actually_
+  // registered JS config objects.
+  let defaultResolveThemeValue = designSystem.resolveThemeValue
+  designSystem.resolveThemeValue = function resolveThemeValue(path: string, forceInline?: boolean) {
+    if (path[0] === '-' && path[1] === '-') {
+      return defaultResolveThemeValue(path, forceInline)
+    }
+
+    let resolvedValue = sharedPluginApi.theme(path, undefined)
+
+    // If we're dealing with an object that has the `DEFAULT` key, unwrap it to
+    // the default value first. This happens for namespace root lookups where
+    // the CSS theme defines a bare value, e.g. `--shadow` resolved via
+    // `theme('shadow')`.
+    if (
+      typeof resolvedValue === 'object' &&
+      resolvedValue !== null &&
+      !Array.isArray(resolvedValue) &&
+      'DEFAULT' in resolvedValue
+    ) {
+      resolvedValue = resolvedValue.DEFAULT
+    }
+
+    // When a tuple is returned, return the first element
+    if (Array.isArray(resolvedValue) && resolvedValue.length === 2) {
+      return resolvedValue[0]
+    }
+
+    // Arrays get serialized into a comma-separated lists
+    else if (Array.isArray(resolvedValue)) {
+      return resolvedValue.join(', ')
+    }
+
+    // Otherwise only allow string values here, objects (and namespace maps)
+    // are treated as non-resolved values for the CSS `theme()` function.
+    else if (typeof resolvedValue === 'string') {
+      return resolvedValue
+    }
+  }
+
+  for (let { handler, reference, src } of resolvedConfig.plugins) {
+    // Each plugin gets its own instance of the plugin API because nodes added
+    // to the AST may need to point to the `@config` or `@plugin` that they
+    // originated from
+    let api = buildPluginApi({
+      ...pluginApiConfig,
+      referenceMode: reference ?? false,
+      src,
+    })
+
+    handler(api)
   }
 
   // Merge the user-configured theme keys into the design system. The compat
   // config would otherwise expand into namespaces like `background-color` which
   // core utilities already read from.
   applyConfigToTheme(designSystem, resolvedUserConfig, replacedThemeKeys)
-  applyKeyframesToTheme(designSystem, resolvedUserConfig, replacedThemeKeys)
+  applyKeyframesToTheme(designSystem, resolvedUserConfig)
 
   registerThemeVariantOverrides(resolvedUserConfig, designSystem)
   registerScreensConfig(resolvedUserConfig, designSystem)
@@ -300,18 +389,18 @@ function upgradeToFullPluginSupport({
   if (typeof resolvedConfig.important === 'string') {
     let wrappingSelector = resolvedConfig.important
 
-    walk(ast, (node, { replaceWith, parent }) => {
+    walk(ast, (node, _ctx) => {
       if (node.kind !== 'at-rule') return
       if (node.name !== '@tailwind' || node.params !== 'utilities') return
 
+      let ctx = cssContext(_ctx)
+
       // The AST node was already manually wrapped so there's nothing to do
-      if (parent?.kind === 'rule' && parent.selector === wrappingSelector) {
+      if (ctx.parent?.kind === 'rule' && ctx.parent.selector === wrappingSelector) {
         return WalkAction.Stop
       }
 
-      replaceWith(styleRule(wrappingSelector, [node]))
-
-      return WalkAction.Stop
+      return WalkAction.ReplaceStop(styleRule(wrappingSelector, [node]))
     })
   }
 
@@ -319,29 +408,6 @@ function upgradeToFullPluginSupport({
     designSystem.invalidCandidates.add(candidate)
   }
 
-  // Replace `resolveThemeValue` with a version that is backwards compatible
-  // with dot-notation but also aware of any JS theme configurations registered
-  // by plugins or JS config files. This is significantly slower than just
-  // upgrading dot-notation keys so we only use this version if plugins or
-  // config files are actually being used. In the future we may want to optimize
-  // this further by only doing this if plugins or config files _actually_
-  // registered JS config objects.
-  designSystem.resolveThemeValue = function resolveThemeValue(path: string, defaultValue?: string) {
-    let resolvedValue = pluginApi.theme(path, defaultValue)
-
-    if (Array.isArray(resolvedValue) && resolvedValue.length === 2) {
-      // When a tuple is returned, return the first element
-      return resolvedValue[0]
-    } else if (Array.isArray(resolvedValue)) {
-      // Arrays get serialized into a comma-separated lists
-      return resolvedValue.join(', ')
-    } else if (typeof resolvedValue === 'string') {
-      // Otherwise only allow string values here, objects (and namespace maps)
-      // are treated as non-resolved values for the CSS `theme()` function.
-      return resolvedValue
-    }
-  }
-
   for (let file of resolvedConfig.content.files) {
     if ('raw' in file) {
       throw new Error(
@@ -349,7 +415,12 @@ function upgradeToFullPluginSupport({
       )
     }
 
-    globs.push(file)
+    let negated = false
+    if (file.pattern[0] == '!') {
+      negated = true
+      file.pattern = file.pattern.slice(1)
+    }
+    sources.push({ ...file, negated })
   }
   return features
 }
diff --git a/packages/tailwindcss/src/compat/apply-config-to-theme.test.ts b/packages/tailwindcss/src/compat/apply-config-to-theme.test.ts
index 23f5c46cb..12f195e94 100644
--- a/packages/tailwindcss/src/compat/apply-config-to-theme.test.ts
+++ b/packages/tailwindcss/src/compat/apply-config-to-theme.test.ts
@@ -31,6 +31,16 @@ test('config values can be merged into the theme', () => {
             normal: '0 1px 3px black',
           },
 
+          borderWidth: {
+            DEFAULT: '1.5px',
+          },
+          outlineWidth: {
+            DEFAULT: '2.5px',
+          },
+          ringWidth: {
+            DEFAULT: '3.5px',
+          },
+
           borderRadius: {
             sm: '0.33rem',
           },
@@ -52,6 +62,13 @@ test('config values can be merged into the theme', () => {
                 lineHeight: '1.5',
               },
             ],
+            lg: ['1.125rem', '2'],
+            xl: ['1.5rem', '3rem', 'invalid'],
+            '2xl': ['2rem'],
+          },
+
+          ringColor: {
+            DEFAULT: '#fff',
           },
 
           letterSpacing: {
@@ -74,12 +91,17 @@ test('config values can be merged into the theme', () => {
           },
 
           transitionTimingFunction: {
+            DEFAULT: 'ease-in-out',
             fast: 'cubic-bezier(0, 0.55, 0.45, 1)',
           },
+          transitionDuration: {
+            DEFAULT: '1234ms',
+          },
         },
       },
       base: '/root',
       reference: false,
+      src: undefined,
     },
   ])
   applyConfigToTheme(design, resolvedConfig, replacedThemeKeys)
@@ -102,13 +124,42 @@ test('config values can be merged into the theme', () => {
     '1rem',
     { '--line-height': '1.5' },
   ])
-  expect(theme.resolve('super-wide', ['--tracking'])).toEqual('0.25em')
-  expect(theme.resolve('super-loose', ['--leading'])).toEqual('3')
+  expect(theme.resolve('lg', ['--text'])).toEqual('1.125rem')
+  expect(theme.resolveWith('lg', ['--text'], ['--line-height'])).toEqual([
+    '1.125rem',
+    { '--line-height': '2' },
+  ])
+  expect(theme.resolve('xl', ['--text'])).toEqual('1.5rem')
+  expect(theme.resolveWith('xl', ['--text'], ['--line-height'])).toEqual([
+    '1.5rem',
+    { '--line-height': '3rem' },
+  ])
+  expect(theme.resolve('2xl', ['--text'])).toEqual('2rem')
+  expect(theme.resolveWith('2xl', ['--text'], ['--line-height'])).toEqual(['2rem', {}])
+  expect(theme.resolve('superWide', ['--tracking'])).toEqual('0.25em')
+  expect(theme.resolve('superLoose', ['--leading'])).toEqual('3')
   expect(theme.resolve('1/2', ['--width'])).toEqual('60%')
   expect(theme.resolve('0.5', ['--width'])).toEqual('60%')
   expect(theme.resolve('100%', ['--width'])).toEqual('100%')
   expect(theme.resolve('9xs', ['--container'])).toEqual('6rem')
   expect(theme.resolve('fast', ['--ease'])).toEqual('cubic-bezier(0, 0.55, 0.45, 1)')
+
+  expect(theme.get(['--border'])).toEqual(null)
+  expect(theme.get(['--default-border-width'])).toEqual('1.5px')
+
+  expect(theme.get(['--outline'])).toEqual(null)
+  expect(theme.get(['--default-outline-width'])).toEqual('2.5px')
+
+  expect(theme.get(['--ring-color'])).toEqual(null)
+  expect(theme.get(['--default-ring-color'])).toEqual('#fff')
+
+  expect(theme.get(['--ring-width'])).toEqual(null)
+  expect(theme.get(['--default-ring-width'])).toEqual('3.5px')
+
+  expect(theme.get(['--default-transition-duration'])).toEqual('1234ms')
+
+  expect(theme.get(['--ease'])).toEqual(null)
+  expect(theme.get(['--default-transition-timing-function'])).toEqual('ease-in-out')
 })
 
 test('will reset default theme values with overwriting theme values', () => {
@@ -145,6 +196,8 @@ test('will reset default theme values with overwriting theme values', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
   applyConfigToTheme(design, resolvedConfig, replacedThemeKeys)
@@ -174,6 +227,8 @@ test('invalid keys are not merged into the theme', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
 
@@ -212,6 +267,8 @@ test('converts opacity modifiers from decimal to percentage values', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
   applyConfigToTheme(design, resolvedConfig, replacedThemeKeys)
@@ -223,3 +280,40 @@ test('converts opacity modifiers from decimal to percentage values', () => {
   expect(theme.resolve('20', ['--opacity'])).toEqual('20%')
   expect(theme.resolve('25', ['--opacity'])).toEqual('25%')
 })
+
+test('handles setting theme keys to null', async () => {
+  let theme = new Theme()
+  let design = buildDesignSystem(theme)
+
+  theme.add('--color-blue-400', 'blue', ThemeOptions.DEFAULT)
+  theme.add('--color-blue-500', '#3b82f6')
+  theme.add('--color-red-400', 'red', ThemeOptions.DEFAULT)
+  theme.add('--color-red-500', '#ef4444')
+
+  let { resolvedConfig, replacedThemeKeys } = resolveConfig(design, [
+    {
+      config: {
+        theme: {
+          extend: {
+            colors: {
+              blue: null,
+            },
+          },
+        },
+      },
+      base: '/root',
+      reference: false,
+      src: undefined,
+    },
+  ])
+  applyConfigToTheme(design, resolvedConfig, replacedThemeKeys)
+
+  expect(theme.namespace('--color')).toMatchInlineSnapshot(`
+    Map {
+      "blue-400" => "blue",
+      "blue-500" => "#3b82f6",
+      "red-400" => "red",
+      "red-500" => "#ef4444",
+    }
+  `)
+})
diff --git a/packages/tailwindcss/src/compat/apply-config-to-theme.ts b/packages/tailwindcss/src/compat/apply-config-to-theme.ts
index 3f18711c7..8757520ee 100644
--- a/packages/tailwindcss/src/compat/apply-config-to-theme.ts
+++ b/packages/tailwindcss/src/compat/apply-config-to-theme.ts
@@ -1,6 +1,5 @@
 import type { DesignSystem } from '../design-system'
 import { ThemeOptions } from '../theme'
-import { escape } from '../utils/escape'
 import type { ResolvedConfig } from './config/types'
 
 function resolveThemeValue(value: unknown, subValue: string | null = null): string | null {
@@ -55,7 +54,7 @@ export function applyConfigToTheme(
     if (!name) continue
 
     designSystem.theme.add(
-      `--${escape(name)}`,
+      `--${name}`,
       '' + value,
       ThemeOptions.INLINE | ThemeOptions.REFERENCE | ThemeOptions.DEFAULT,
     )
@@ -131,7 +130,16 @@ export function themeableValues(config: ResolvedConfig['theme']): [string[], unk
     }
 
     if (Array.isArray(value) && value.every((v) => typeof v === 'string')) {
-      toAdd.push([path, value.join(', ')])
+      if (path[0] === 'fontSize') {
+        toAdd.push([path, value[0]])
+
+        if (value.length >= 2) {
+          toAdd.push([[...path, '-line-height'], value[1]])
+        }
+      } else {
+        toAdd.push([path, value.join(', ')])
+      }
+
       return WalkAction.Skip
     }
   })
@@ -139,31 +147,57 @@ export function themeableValues(config: ResolvedConfig['theme']): [string[], unk
   return toAdd
 }
 
-const IS_VALID_KEY = /^[a-zA-Z0-9-_%/\.]+$/
+const SPECIAL_DEFAULT_KEYS: Record<string, string> = {
+  borderWidth: 'border-width',
+  outlineWidth: 'outline-width',
+  ringColor: 'ring-color',
+  ringWidth: 'ring-width',
+  transitionDuration: 'transition-duration',
+  transitionTimingFunction: 'transition-timing-function',
+}
+
+const OLD_TO_NEW_NAMESPACE: Record<string, string> = {
+  animation: 'animate',
+  aspectRatio: 'aspect',
+  borderRadius: 'radius',
+  boxShadow: 'shadow',
+  colors: 'color',
+  containers: 'container',
+  fontFamily: 'font',
+  fontSize: 'text',
+  letterSpacing: 'tracking',
+  lineHeight: 'leading',
+  maxWidth: 'container',
+  screens: 'breakpoint',
+  transitionTimingFunction: 'ease',
+}
+
+const IS_VALID_KEY = /^[a-zA-Z0-9-_%/.]+$/
 
 export function keyPathToCssProperty(path: string[]) {
+  // In some special cases the `DEFAULT` key did not map to a "default" utility
+  // e.g. `ringColor.DEFAULT` wasn't *just* used for `ring`. It was used for
+  // all ring utilities as the color when one wasn't specified.
+  //
+  // We place these specialty values under the `--default-*` namespace to signal
+  // that they are defaults used by (potentially) multiple utilities.
+  let specialDefault = SPECIAL_DEFAULT_KEYS[path[0]]
+  if (specialDefault && path[1] === 'DEFAULT') return `default-${specialDefault}`
+
   // The legacy container component config should not be included in the Theme
   if (path[0] === 'container') return null
 
-  path = structuredClone(path)
-
-  if (path[0] === 'animation') path[0] = 'animate'
-  if (path[0] === 'aspectRatio') path[0] = 'aspect'
-  if (path[0] === 'borderRadius') path[0] = 'radius'
-  if (path[0] === 'boxShadow') path[0] = 'shadow'
-  if (path[0] === 'colors') path[0] = 'color'
-  if (path[0] === 'fontFamily') path[0] = 'font'
-  if (path[0] === 'fontSize') path[0] = 'text'
-  if (path[0] === 'letterSpacing') path[0] = 'tracking'
-  if (path[0] === 'lineHeight') path[0] = 'leading'
-  if (path[0] === 'maxWidth') path[0] = 'container'
-  if (path[0] === 'screens') path[0] = 'breakpoint'
-  if (path[0] === 'transitionTimingFunction') path[0] = 'ease'
-
   for (let part of path) {
     if (!IS_VALID_KEY.test(part)) return null
   }
 
+  // Map old v3 namespaces to new theme namespaces
+  let ns = OLD_TO_NEW_NAMESPACE[path[0]]
+  if (ns) {
+    path = path.slice()
+    path[0] = ns
+  }
+
   return (
     path
       // [1] should move into the nested object tuple. To create the CSS variable
@@ -176,11 +210,27 @@ export function keyPathToCssProperty(path: string[]) {
       .map((path, idx, all) => (path === '1' && idx !== all.length - 1 ? '' : path))
 
       // Resolve the key path to a CSS variable segment
-      .map((part) =>
-        part
-          .replaceAll('.', '_')
-          .replace(/([a-z])([A-Z])/g, (_, a, b) => `${a}-${b.toLowerCase()}`),
-      )
+      .map((part, idx) => {
+        part = part.replaceAll('.', '_')
+
+        let shouldConvert =
+          // The first "namespace" part should be converted to kebab-case
+          // This converts things like backgroundColor to `background-color`
+          idx === 0 ||
+          // Any tuple nested key should be converted to kebab-case
+          // These are identified with a leading `-`
+          // e.g. `fontSize.xs.1.lineHeight` -> `font-size-xs--line-height`
+          part.startsWith('-') ||
+          // `lineHeight` is a bit of a special case in which it does not
+          // always begin with a leading `-` even when as a nested tuple key
+          part === 'lineHeight'
+
+        if (shouldConvert) {
+          part = part.replace(/([a-z])([A-Z])/g, (_, a, b) => `${a}-${b.toLowerCase()}`)
+        }
+
+        return part
+      })
 
       // Remove the `DEFAULT` key at the end of a path
       // We're reading from CSS anyway so it'll be a string
diff --git a/packages/tailwindcss/src/compat/apply-keyframes-to-theme.test.ts b/packages/tailwindcss/src/compat/apply-keyframes-to-theme.test.ts
index a0b1c54d5..aed761fce 100644
--- a/packages/tailwindcss/src/compat/apply-keyframes-to-theme.test.ts
+++ b/packages/tailwindcss/src/compat/apply-keyframes-to-theme.test.ts
@@ -9,7 +9,7 @@ test('keyframes can be merged into the theme', () => {
   let theme = new Theme()
   let design = buildDesignSystem(theme)
 
-  let { resolvedConfig, replacedThemeKeys } = resolveConfig(design, [
+  let { resolvedConfig } = resolveConfig(design, [
     {
       config: {
         theme: {
@@ -28,9 +28,11 @@ test('keyframes can be merged into the theme', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
-  applyKeyframesToTheme(design, resolvedConfig, replacedThemeKeys)
+  applyKeyframesToTheme(design, resolvedConfig)
 
   expect(toCss(design.theme.getKeyframes())).toMatchInlineSnapshot(`
     "@keyframes fade-in {
@@ -70,7 +72,7 @@ test('will append to the default keyframes with new keyframes', () => {
     ]),
   )
 
-  let { resolvedConfig, replacedThemeKeys } = resolveConfig(design, [
+  let { resolvedConfig } = resolveConfig(design, [
     {
       config: {
         theme: {
@@ -91,9 +93,11 @@ test('will append to the default keyframes with new keyframes', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
-  applyKeyframesToTheme(design, resolvedConfig, replacedThemeKeys)
+  applyKeyframesToTheme(design, resolvedConfig)
 
   expect(toCss(design.theme.getKeyframes())).toMatchInlineSnapshot(`
     "@keyframes slide-in {
diff --git a/packages/tailwindcss/src/compat/apply-keyframes-to-theme.ts b/packages/tailwindcss/src/compat/apply-keyframes-to-theme.ts
index a58ca13df..d5855545f 100644
--- a/packages/tailwindcss/src/compat/apply-keyframes-to-theme.ts
+++ b/packages/tailwindcss/src/compat/apply-keyframes-to-theme.ts
@@ -6,7 +6,6 @@ import { objectToAst } from './plugin-api'
 export function applyKeyframesToTheme(
   designSystem: DesignSystem,
   resolvedConfig: Pick<ResolvedConfig, 'theme'>,
-  replacedThemeKeys: Set<string>,
 ) {
   for (let rule of keyframesToRules(resolvedConfig)) {
     designSystem.theme.addKeyframes(rule)
diff --git a/packages/tailwindcss/src/compat/colors.ts b/packages/tailwindcss/src/compat/colors.ts
index 0a6cba403..64e3bc9c7 100644
--- a/packages/tailwindcss/src/compat/colors.ts
+++ b/packages/tailwindcss/src/compat/colors.ts
@@ -1,293 +1,345 @@
 export default {
   inherit: 'inherit',
-  current: 'currentColor',
+  current: 'currentcolor',
   transparent: 'transparent',
   black: '#000',
   white: '#fff',
   slate: {
-    '50': 'oklch(0.984 0.003 247.858)',
-    '100': 'oklch(0.968 0.007 247.896)',
-    '200': 'oklch(0.929 0.013 255.508)',
-    '300': 'oklch(0.869 0.022 252.894)',
-    '400': 'oklch(0.704 0.04 256.788)',
-    '500': 'oklch(0.554 0.046 257.417)',
-    '600': 'oklch(0.446 0.043 257.281)',
-    '700': 'oklch(0.372 0.044 257.287)',
-    '800': 'oklch(0.279 0.041 260.031)',
-    '900': 'oklch(0.208 0.042 265.755)',
-    '950': 'oklch(0.129 0.042 264.695)',
+    '50': 'oklch(98.4% 0.003 247.858)',
+    '100': 'oklch(96.8% 0.007 247.896)',
+    '200': 'oklch(92.9% 0.013 255.508)',
+    '300': 'oklch(86.9% 0.022 252.894)',
+    '400': 'oklch(70.4% 0.04 256.788)',
+    '500': 'oklch(55.4% 0.046 257.417)',
+    '600': 'oklch(44.6% 0.043 257.281)',
+    '700': 'oklch(37.2% 0.044 257.287)',
+    '800': 'oklch(27.9% 0.041 260.031)',
+    '900': 'oklch(20.8% 0.042 265.755)',
+    '950': 'oklch(12.9% 0.042 264.695)',
   },
   gray: {
-    '50': 'oklch(0.985 0.002 247.839)',
-    '100': 'oklch(0.967 0.003 264.542)',
-    '200': 'oklch(0.928 0.006 264.531)',
-    '300': 'oklch(0.872 0.01 258.338)',
-    '400': 'oklch(0.707 0.022 261.325)',
-    '500': 'oklch(0.551 0.027 264.364)',
-    '600': 'oklch(0.446 0.03 256.802)',
-    '700': 'oklch(0.373 0.034 259.733)',
-    '800': 'oklch(0.278 0.033 256.848)',
-    '900': 'oklch(0.21 0.034 264.665)',
-    '950': 'oklch(0.13 0.028 261.692)',
+    '50': 'oklch(98.5% 0.002 247.839)',
+    '100': 'oklch(96.7% 0.003 264.542)',
+    '200': 'oklch(92.8% 0.006 264.531)',
+    '300': 'oklch(87.2% 0.01 258.338)',
+    '400': 'oklch(70.7% 0.022 261.325)',
+    '500': 'oklch(55.1% 0.027 264.364)',
+    '600': 'oklch(44.6% 0.03 256.802)',
+    '700': 'oklch(37.3% 0.034 259.733)',
+    '800': 'oklch(27.8% 0.033 256.848)',
+    '900': 'oklch(21% 0.034 264.665)',
+    '950': 'oklch(13% 0.028 261.692)',
   },
   zinc: {
-    '50': 'oklch(0.985 0 0)',
-    '100': 'oklch(0.967 0.001 286.375)',
-    '200': 'oklch(0.92 0.004 286.32)',
-    '300': 'oklch(0.871 0.006 286.286)',
-    '400': 'oklch(0.705 0.015 286.067)',
-    '500': 'oklch(0.552 0.016 285.938)',
-    '600': 'oklch(0.442 0.017 285.786)',
-    '700': 'oklch(0.37 0.013 285.805)',
-    '800': 'oklch(0.274 0.006 286.033)',
-    '900': 'oklch(0.21 0.006 285.885)',
-    '950': 'oklch(0.141 0.005 285.823)',
+    '50': 'oklch(98.5% 0 none)',
+    '100': 'oklch(96.7% 0.001 286.375)',
+    '200': 'oklch(92% 0.004 286.32)',
+    '300': 'oklch(87.1% 0.006 286.286)',
+    '400': 'oklch(70.5% 0.015 286.067)',
+    '500': 'oklch(55.2% 0.016 285.938)',
+    '600': 'oklch(44.2% 0.017 285.786)',
+    '700': 'oklch(37% 0.013 285.805)',
+    '800': 'oklch(27.4% 0.006 286.033)',
+    '900': 'oklch(21% 0.006 285.885)',
+    '950': 'oklch(14.1% 0.005 285.823)',
   },
   neutral: {
-    '50': 'oklch(0.985 0 0)',
-    '100': 'oklch(0.97 0 0)',
-    '200': 'oklch(0.922 0 0)',
-    '300': 'oklch(0.87 0 0)',
-    '400': 'oklch(0.708 0 0)',
-    '500': 'oklch(0.556 0 0)',
-    '600': 'oklch(0.439 0 0)',
-    '700': 'oklch(0.371 0 0)',
-    '800': 'oklch(0.269 0 0)',
-    '900': 'oklch(0.205 0 0)',
-    '950': 'oklch(0.145 0 0)',
+    '50': 'oklch(98.5% 0 none)',
+    '100': 'oklch(97% 0 none)',
+    '200': 'oklch(92.2% 0 none)',
+    '300': 'oklch(87% 0 none)',
+    '400': 'oklch(70.8% 0 none)',
+    '500': 'oklch(55.6% 0 none)',
+    '600': 'oklch(43.9% 0 none)',
+    '700': 'oklch(37.1% 0 none)',
+    '800': 'oklch(26.9% 0 none)',
+    '900': 'oklch(20.5% 0 none)',
+    '950': 'oklch(14.5% 0 none)',
   },
   stone: {
-    '50': 'oklch(0.985 0.001 106.423)',
-    '100': 'oklch(0.97 0.001 106.424)',
-    '200': 'oklch(0.923 0.003 48.717)',
-    '300': 'oklch(0.869 0.005 56.366)',
-    '400': 'oklch(0.709 0.01 56.259)',
-    '500': 'oklch(0.553 0.013 58.071)',
-    '600': 'oklch(0.444 0.011 73.639)',
-    '700': 'oklch(0.374 0.01 67.558)',
-    '800': 'oklch(0.268 0.007 34.298)',
-    '900': 'oklch(0.216 0.006 56.043)',
-    '950': 'oklch(0.147 0.004 49.25)',
+    '50': 'oklch(98.5% 0.001 106.423)',
+    '100': 'oklch(97% 0.001 106.424)',
+    '200': 'oklch(92.3% 0.003 48.717)',
+    '300': 'oklch(86.9% 0.005 56.366)',
+    '400': 'oklch(70.9% 0.01 56.259)',
+    '500': 'oklch(55.3% 0.013 58.071)',
+    '600': 'oklch(44.4% 0.011 73.639)',
+    '700': 'oklch(37.4% 0.01 67.558)',
+    '800': 'oklch(26.8% 0.007 34.298)',
+    '900': 'oklch(21.6% 0.006 56.043)',
+    '950': 'oklch(14.7% 0.004 49.25)',
+  },
+  mauve: {
+    '50': 'oklch(98.5% 0 none)',
+    '100': 'oklch(96% 0.003 325.6)',
+    '200': 'oklch(92.2% 0.005 325.62)',
+    '300': 'oklch(86.5% 0.012 325.68)',
+    '400': 'oklch(71.1% 0.019 323.02)',
+    '500': 'oklch(54.2% 0.034 322.5)',
+    '600': 'oklch(43.5% 0.029 321.78)',
+    '700': 'oklch(36.4% 0.029 323.89)',
+    '800': 'oklch(26.3% 0.024 320.12)',
+    '900': 'oklch(21.2% 0.019 322.12)',
+    '950': 'oklch(14.5% 0.008 326)',
+  },
+  olive: {
+    '50': 'oklch(98.8% 0.003 106.5)',
+    '100': 'oklch(96.6% 0.005 106.5)',
+    '200': 'oklch(93% 0.007 106.5)',
+    '300': 'oklch(88% 0.011 106.6)',
+    '400': 'oklch(73.7% 0.021 106.9)',
+    '500': 'oklch(58% 0.031 107.3)',
+    '600': 'oklch(46.6% 0.025 107.3)',
+    '700': 'oklch(39.4% 0.023 107.4)',
+    '800': 'oklch(28.6% 0.016 107.4)',
+    '900': 'oklch(22.8% 0.013 107.4)',
+    '950': 'oklch(15.3% 0.006 107.1)',
+  },
+  mist: {
+    '50': 'oklch(98.7% 0.002 197.1)',
+    '100': 'oklch(96.3% 0.002 197.1)',
+    '200': 'oklch(92.5% 0.005 214.3)',
+    '300': 'oklch(87.2% 0.007 219.6)',
+    '400': 'oklch(72.3% 0.014 214.4)',
+    '500': 'oklch(56% 0.021 213.5)',
+    '600': 'oklch(45% 0.017 213.2)',
+    '700': 'oklch(37.8% 0.015 216)',
+    '800': 'oklch(27.5% 0.011 216.9)',
+    '900': 'oklch(21.8% 0.008 223.9)',
+    '950': 'oklch(14.8% 0.004 228.8)',
+  },
+  taupe: {
+    '50': 'oklch(98.6% 0.002 67.8)',
+    '100': 'oklch(96% 0.002 17.2)',
+    '200': 'oklch(92.2% 0.005 34.3)',
+    '300': 'oklch(86.8% 0.007 39.5)',
+    '400': 'oklch(71.4% 0.014 41.2)',
+    '500': 'oklch(54.7% 0.021 43.1)',
+    '600': 'oklch(43.8% 0.017 39.3)',
+    '700': 'oklch(36.7% 0.016 35.7)',
+    '800': 'oklch(26.8% 0.011 36.5)',
+    '900': 'oklch(21.4% 0.009 43.1)',
+    '950': 'oklch(14.7% 0.004 49.3)',
   },
   red: {
-    '50': 'oklch(0.971 0.013 17.38)',
-    '100': 'oklch(0.936 0.032 17.717)',
-    '200': 'oklch(0.885 0.062 18.334)',
-    '300': 'oklch(0.808 0.114 19.571)',
-    '400': 'oklch(0.704 0.191 22.216)',
-    '500': 'oklch(0.637 0.237 25.331)',
-    '600': 'oklch(0.577 0.245 27.325)',
-    '700': 'oklch(0.505 0.213 27.518)',
-    '800': 'oklch(0.444 0.177 26.899)',
-    '900': 'oklch(0.396 0.141 25.723)',
-    '950': 'oklch(0.258 0.092 26.042)',
+    '50': 'oklch(97.1% 0.013 17.38)',
+    '100': 'oklch(93.6% 0.032 17.717)',
+    '200': 'oklch(88.5% 0.062 18.334)',
+    '300': 'oklch(80.8% 0.114 19.571)',
+    '400': 'oklch(70.4% 0.191 22.216)',
+    '500': 'oklch(63.7% 0.237 25.331)',
+    '600': 'oklch(57.7% 0.245 27.325)',
+    '700': 'oklch(50.5% 0.213 27.518)',
+    '800': 'oklch(44.4% 0.177 26.899)',
+    '900': 'oklch(39.6% 0.141 25.723)',
+    '950': 'oklch(25.8% 0.092 26.042)',
   },
   orange: {
-    '50': 'oklch(0.98 0.016 73.684)',
-    '100': 'oklch(0.954 0.038 75.164)',
-    '200': 'oklch(0.901 0.076 70.697)',
-    '300': 'oklch(0.837 0.128 66.29)',
-    '400': 'oklch(0.75 0.183 55.934)',
-    '500': 'oklch(0.705 0.213 47.604)',
-    '600': 'oklch(0.646 0.222 41.116)',
-    '700': 'oklch(0.553 0.195 38.402)',
-    '800': 'oklch(0.47 0.157 37.304)',
-    '900': 'oklch(0.408 0.123 38.172)',
-    '950': 'oklch(0.266 0.079 36.259)',
+    '50': 'oklch(98% 0.016 73.684)',
+    '100': 'oklch(95.4% 0.038 75.164)',
+    '200': 'oklch(90.1% 0.076 70.697)',
+    '300': 'oklch(83.7% 0.128 66.29)',
+    '400': 'oklch(75% 0.183 55.934)',
+    '500': 'oklch(70.5% 0.213 47.604)',
+    '600': 'oklch(64.6% 0.222 41.116)',
+    '700': 'oklch(55.3% 0.195 38.402)',
+    '800': 'oklch(47% 0.157 37.304)',
+    '900': 'oklch(40.8% 0.123 38.172)',
+    '950': 'oklch(26.6% 0.079 36.259)',
   },
   amber: {
-    '50': 'oklch(0.987 0.022 95.277)',
-    '100': 'oklch(0.962 0.059 95.617)',
-    '200': 'oklch(0.924 0.12 95.746)',
-    '300': 'oklch(0.879 0.169 91.605)',
-    '400': 'oklch(0.828 0.189 84.429)',
-    '500': 'oklch(0.769 0.188 70.08)',
-    '600': 'oklch(0.666 0.179 58.318)',
-    '700': 'oklch(0.555 0.163 48.998)',
-    '800': 'oklch(0.473 0.137 46.201)',
-    '900': 'oklch(0.414 0.112 45.904)',
-    '950': 'oklch(0.279 0.077 45.635)',
+    '50': 'oklch(98.7% 0.022 95.277)',
+    '100': 'oklch(96.2% 0.059 95.617)',
+    '200': 'oklch(92.4% 0.12 95.746)',
+    '300': 'oklch(87.9% 0.169 91.605)',
+    '400': 'oklch(82.8% 0.189 84.429)',
+    '500': 'oklch(76.9% 0.188 70.08)',
+    '600': 'oklch(66.6% 0.179 58.318)',
+    '700': 'oklch(55.5% 0.163 48.998)',
+    '800': 'oklch(47.3% 0.137 46.201)',
+    '900': 'oklch(41.4% 0.112 45.904)',
+    '950': 'oklch(27.9% 0.077 45.635)',
   },
   yellow: {
-    '50': 'oklch(0.987 0.026 102.212)',
-    '100': 'oklch(0.973 0.071 103.193)',
-    '200': 'oklch(0.945 0.129 101.54)',
-    '300': 'oklch(0.905 0.182 98.111)',
-    '400': 'oklch(0.852 0.199 91.936)',
-    '500': 'oklch(0.795 0.184 86.047)',
-    '600': 'oklch(0.681 0.162 75.834)',
-    '700': 'oklch(0.554 0.135 66.442)',
-    '800': 'oklch(0.476 0.114 61.907)',
-    '900': 'oklch(0.421 0.095 57.708)',
-    '950': 'oklch(0.286 0.066 53.813)',
+    '50': 'oklch(98.7% 0.026 102.212)',
+    '100': 'oklch(97.3% 0.071 103.193)',
+    '200': 'oklch(94.5% 0.129 101.54)',
+    '300': 'oklch(90.5% 0.182 98.111)',
+    '400': 'oklch(85.2% 0.199 91.936)',
+    '500': 'oklch(79.5% 0.184 86.047)',
+    '600': 'oklch(68.1% 0.162 75.834)',
+    '700': 'oklch(55.4% 0.135 66.442)',
+    '800': 'oklch(47.6% 0.114 61.907)',
+    '900': 'oklch(42.1% 0.095 57.708)',
+    '950': 'oklch(28.6% 0.066 53.813)',
   },
   lime: {
-    '50': 'oklch(0.986 0.031 120.757)',
-    '100': 'oklch(0.967 0.067 122.328)',
-    '200': 'oklch(0.938 0.127 124.321)',
-    '300': 'oklch(0.897 0.196 126.665)',
-    '400': 'oklch(0.841 0.238 128.85)',
-    '500': 'oklch(0.768 0.233 130.85)',
-    '600': 'oklch(0.648 0.2 131.684)',
-    '700': 'oklch(0.532 0.157 131.589)',
-    '800': 'oklch(0.453 0.124 130.933)',
-    '900': 'oklch(0.405 0.101 131.063)',
-    '950': 'oklch(0.274 0.072 132.109)',
+    '50': 'oklch(98.6% 0.031 120.757)',
+    '100': 'oklch(96.7% 0.067 122.328)',
+    '200': 'oklch(93.8% 0.127 124.321)',
+    '300': 'oklch(89.7% 0.196 126.665)',
+    '400': 'oklch(84.1% 0.238 128.85)',
+    '500': 'oklch(76.8% 0.233 130.85)',
+    '600': 'oklch(64.8% 0.2 131.684)',
+    '700': 'oklch(53.2% 0.157 131.589)',
+    '800': 'oklch(45.3% 0.124 130.933)',
+    '900': 'oklch(40.5% 0.101 131.063)',
+    '950': 'oklch(27.4% 0.072 132.109)',
   },
   green: {
-    '50': 'oklch(0.982 0.018 155.826)',
-    '100': 'oklch(0.962 0.044 156.743)',
-    '200': 'oklch(0.925 0.084 155.995)',
-    '300': 'oklch(0.871 0.15 154.449)',
-    '400': 'oklch(0.792 0.209 151.711)',
-    '500': 'oklch(0.723 0.219 149.579)',
-    '600': 'oklch(0.627 0.194 149.214)',
-    '700': 'oklch(0.527 0.154 150.069)',
-    '800': 'oklch(0.448 0.119 151.328)',
-    '900': 'oklch(0.393 0.095 152.535)',
-    '950': 'oklch(0.266 0.065 152.934)',
+    '50': 'oklch(98.2% 0.018 155.826)',
+    '100': 'oklch(96.2% 0.044 156.743)',
+    '200': 'oklch(92.5% 0.084 155.995)',
+    '300': 'oklch(87.1% 0.15 154.449)',
+    '400': 'oklch(79.2% 0.209 151.711)',
+    '500': 'oklch(72.3% 0.219 149.579)',
+    '600': 'oklch(62.7% 0.194 149.214)',
+    '700': 'oklch(52.7% 0.154 150.069)',
+    '800': 'oklch(44.8% 0.119 151.328)',
+    '900': 'oklch(39.3% 0.095 152.535)',
+    '950': 'oklch(26.6% 0.065 152.934)',
   },
   emerald: {
-    '50': 'oklch(0.979 0.021 166.113)',
-    '100': 'oklch(0.95 0.052 163.051)',
-    '200': 'oklch(0.905 0.093 164.15)',
-    '300': 'oklch(0.845 0.143 164.978)',
-    '400': 'oklch(0.765 0.177 163.223)',
-    '500': 'oklch(0.696 0.17 162.48)',
-    '600': 'oklch(0.596 0.145 163.225)',
-    '700': 'oklch(0.508 0.118 165.612)',
-    '800': 'oklch(0.432 0.095 166.913)',
-    '900': 'oklch(0.378 0.077 168.94)',
-    '950': 'oklch(0.262 0.051 172.552)',
+    '50': 'oklch(97.9% 0.021 166.113)',
+    '100': 'oklch(95% 0.052 163.051)',
+    '200': 'oklch(90.5% 0.093 164.15)',
+    '300': 'oklch(84.5% 0.143 164.978)',
+    '400': 'oklch(76.5% 0.177 163.223)',
+    '500': 'oklch(69.6% 0.17 162.48)',
+    '600': 'oklch(59.6% 0.145 163.225)',
+    '700': 'oklch(50.8% 0.118 165.612)',
+    '800': 'oklch(43.2% 0.095 166.913)',
+    '900': 'oklch(37.8% 0.077 168.94)',
+    '950': 'oklch(26.2% 0.051 172.552)',
   },
   teal: {
-    '50': 'oklch(0.984 0.014 180.72)',
-    '100': 'oklch(0.953 0.051 180.801)',
-    '200': 'oklch(0.91 0.096 180.426)',
-    '300': 'oklch(0.855 0.138 181.071)',
-    '400': 'oklch(0.777 0.152 181.912)',
-    '500': 'oklch(0.704 0.14 182.503)',
-    '600': 'oklch(0.6 0.118 184.704)',
-    '700': 'oklch(0.511 0.096 186.391)',
-    '800': 'oklch(0.437 0.078 188.216)',
-    '900': 'oklch(0.386 0.063 188.416)',
-    '950': 'oklch(0.277 0.046 192.524)',
+    '50': 'oklch(98.4% 0.014 180.72)',
+    '100': 'oklch(95.3% 0.051 180.801)',
+    '200': 'oklch(91% 0.096 180.426)',
+    '300': 'oklch(85.5% 0.138 181.071)',
+    '400': 'oklch(77.7% 0.152 181.912)',
+    '500': 'oklch(70.4% 0.14 182.503)',
+    '600': 'oklch(60% 0.118 184.704)',
+    '700': 'oklch(51.1% 0.096 186.391)',
+    '800': 'oklch(43.7% 0.078 188.216)',
+    '900': 'oklch(38.6% 0.063 188.416)',
+    '950': 'oklch(27.7% 0.046 192.524)',
   },
   cyan: {
-    '50': 'oklch(0.984 0.019 200.873)',
-    '100': 'oklch(0.956 0.045 203.388)',
-    '200': 'oklch(0.917 0.08 205.041)',
-    '300': 'oklch(0.865 0.127 207.078)',
-    '400': 'oklch(0.789 0.154 211.53)',
-    '500': 'oklch(0.715 0.143 215.221)',
-    '600': 'oklch(0.609 0.126 221.723)',
-    '700': 'oklch(0.52 0.105 223.128)',
-    '800': 'oklch(0.45 0.085 224.283)',
-    '900': 'oklch(0.398 0.07 227.392)',
-    '950': 'oklch(0.302 0.056 229.695)',
+    '50': 'oklch(98.4% 0.019 200.873)',
+    '100': 'oklch(95.6% 0.045 203.388)',
+    '200': 'oklch(91.7% 0.08 205.041)',
+    '300': 'oklch(86.5% 0.127 207.078)',
+    '400': 'oklch(78.9% 0.154 211.53)',
+    '500': 'oklch(71.5% 0.143 215.221)',
+    '600': 'oklch(60.9% 0.126 221.723)',
+    '700': 'oklch(52% 0.105 223.128)',
+    '800': 'oklch(45% 0.085 224.283)',
+    '900': 'oklch(39.8% 0.07 227.392)',
+    '950': 'oklch(30.2% 0.056 229.695)',
   },
   sky: {
-    '50': 'oklch(0.977 0.013 236.62)',
-    '100': 'oklch(0.951 0.026 236.824)',
-    '200': 'oklch(0.901 0.058 230.902)',
-    '300': 'oklch(0.828 0.111 230.318)',
-    '400': 'oklch(0.746 0.16 232.661)',
-    '500': 'oklch(0.685 0.169 237.323)',
-    '600': 'oklch(0.588 0.158 241.966)',
-    '700': 'oklch(0.5 0.134 242.749)',
-    '800': 'oklch(0.443 0.11 240.79)',
-    '900': 'oklch(0.391 0.09 240.876)',
-    '950': 'oklch(0.293 0.066 243.157)',
+    '50': 'oklch(97.7% 0.013 236.62)',
+    '100': 'oklch(95.1% 0.026 236.824)',
+    '200': 'oklch(90.1% 0.058 230.902)',
+    '300': 'oklch(82.8% 0.111 230.318)',
+    '400': 'oklch(74.6% 0.16 232.661)',
+    '500': 'oklch(68.5% 0.169 237.323)',
+    '600': 'oklch(58.8% 0.158 241.966)',
+    '700': 'oklch(50% 0.134 242.749)',
+    '800': 'oklch(44.3% 0.11 240.79)',
+    '900': 'oklch(39.1% 0.09 240.876)',
+    '950': 'oklch(29.3% 0.066 243.157)',
   },
   blue: {
-    '50': 'oklch(0.97 0.014 254.604)',
-    '100': 'oklch(0.932 0.032 255.585)',
-    '200': 'oklch(0.882 0.059 254.128)',
-    '300': 'oklch(0.809 0.105 251.813)',
-    '400': 'oklch(0.707 0.165 254.624)',
-    '500': 'oklch(0.623 0.214 259.815)',
-    '600': 'oklch(0.546 0.245 262.881)',
-    '700': 'oklch(0.488 0.243 264.376)',
-    '800': 'oklch(0.424 0.199 265.638)',
-    '900': 'oklch(0.379 0.146 265.522)',
-    '950': 'oklch(0.282 0.091 267.935)',
+    '50': 'oklch(97% 0.014 254.604)',
+    '100': 'oklch(93.2% 0.032 255.585)',
+    '200': 'oklch(88.2% 0.059 254.128)',
+    '300': 'oklch(80.9% 0.105 251.813)',
+    '400': 'oklch(70.7% 0.165 254.624)',
+    '500': 'oklch(62.3% 0.214 259.815)',
+    '600': 'oklch(54.6% 0.245 262.881)',
+    '700': 'oklch(48.8% 0.243 264.376)',
+    '800': 'oklch(42.4% 0.199 265.638)',
+    '900': 'oklch(37.9% 0.146 265.522)',
+    '950': 'oklch(28.2% 0.091 267.935)',
   },
   indigo: {
-    '50': 'oklch(0.962 0.018 272.314)',
-    '100': 'oklch(0.93 0.034 272.788)',
-    '200': 'oklch(0.87 0.065 274.039)',
-    '300': 'oklch(0.785 0.115 274.713)',
-    '400': 'oklch(0.673 0.182 276.935)',
-    '500': 'oklch(0.585 0.233 277.117)',
-    '600': 'oklch(0.511 0.262 276.966)',
-    '700': 'oklch(0.457 0.24 277.023)',
-    '800': 'oklch(0.398 0.195 277.366)',
-    '900': 'oklch(0.359 0.144 278.697)',
-    '950': 'oklch(0.257 0.09 281.288)',
+    '50': 'oklch(96.2% 0.018 272.314)',
+    '100': 'oklch(93% 0.034 272.788)',
+    '200': 'oklch(87% 0.065 274.039)',
+    '300': 'oklch(78.5% 0.115 274.713)',
+    '400': 'oklch(67.3% 0.182 276.935)',
+    '500': 'oklch(58.5% 0.233 277.117)',
+    '600': 'oklch(51.1% 0.262 276.966)',
+    '700': 'oklch(45.7% 0.24 277.023)',
+    '800': 'oklch(39.8% 0.195 277.366)',
+    '900': 'oklch(35.9% 0.144 278.697)',
+    '950': 'oklch(25.7% 0.09 281.288)',
   },
   violet: {
-    '50': 'oklch(0.969 0.016 293.756)',
-    '100': 'oklch(0.943 0.029 294.588)',
-    '200': 'oklch(0.894 0.057 293.283)',
-    '300': 'oklch(0.811 0.111 293.571)',
-    '400': 'oklch(0.702 0.183 293.541)',
-    '500': 'oklch(0.606 0.25 292.717)',
-    '600': 'oklch(0.541 0.281 293.009)',
-    '700': 'oklch(0.491 0.27 292.581)',
-    '800': 'oklch(0.432 0.232 292.759)',
-    '900': 'oklch(0.38 0.189 293.745)',
-    '950': 'oklch(0.283 0.141 291.089)',
+    '50': 'oklch(96.9% 0.016 293.756)',
+    '100': 'oklch(94.3% 0.029 294.588)',
+    '200': 'oklch(89.4% 0.057 293.283)',
+    '300': 'oklch(81.1% 0.111 293.571)',
+    '400': 'oklch(70.2% 0.183 293.541)',
+    '500': 'oklch(60.6% 0.25 292.717)',
+    '600': 'oklch(54.1% 0.281 293.009)',
+    '700': 'oklch(49.1% 0.27 292.581)',
+    '800': 'oklch(43.2% 0.232 292.759)',
+    '900': 'oklch(38% 0.189 293.745)',
+    '950': 'oklch(28.3% 0.141 291.089)',
   },
   purple: {
-    '50': 'oklch(0.977 0.014 308.299)',
-    '100': 'oklch(0.946 0.033 307.174)',
-    '200': 'oklch(0.902 0.063 306.703)',
-    '300': 'oklch(0.827 0.119 306.383)',
-    '400': 'oklch(0.714 0.203 305.504)',
-    '500': 'oklch(0.627 0.265 303.9)',
-    '600': 'oklch(0.558 0.288 302.321)',
-    '700': 'oklch(0.496 0.265 301.924)',
-    '800': 'oklch(0.438 0.218 303.724)',
-    '900': 'oklch(0.381 0.176 304.987)',
-    '950': 'oklch(0.291 0.149 302.717)',
+    '50': 'oklch(97.7% 0.014 308.299)',
+    '100': 'oklch(94.6% 0.033 307.174)',
+    '200': 'oklch(90.2% 0.063 306.703)',
+    '300': 'oklch(82.7% 0.119 306.383)',
+    '400': 'oklch(71.4% 0.203 305.504)',
+    '500': 'oklch(62.7% 0.265 303.9)',
+    '600': 'oklch(55.8% 0.288 302.321)',
+    '700': 'oklch(49.6% 0.265 301.924)',
+    '800': 'oklch(43.8% 0.218 303.724)',
+    '900': 'oklch(38.1% 0.176 304.987)',
+    '950': 'oklch(29.1% 0.149 302.717)',
   },
   fuchsia: {
-    '50': 'oklch(0.977 0.017 320.058)',
-    '100': 'oklch(0.952 0.037 318.852)',
-    '200': 'oklch(0.903 0.076 319.62)',
-    '300': 'oklch(0.833 0.145 321.434)',
-    '400': 'oklch(0.74 0.238 322.16)',
-    '500': 'oklch(0.667 0.295 322.15)',
-    '600': 'oklch(0.591 0.293 322.896)',
-    '700': 'oklch(0.518 0.253 323.949)',
-    '800': 'oklch(0.452 0.211 324.591)',
-    '900': 'oklch(0.401 0.17 325.612)',
-    '950': 'oklch(0.293 0.136 325.661)',
+    '50': 'oklch(97.7% 0.017 320.058)',
+    '100': 'oklch(95.2% 0.037 318.852)',
+    '200': 'oklch(90.3% 0.076 319.62)',
+    '300': 'oklch(83.3% 0.145 321.434)',
+    '400': 'oklch(74% 0.238 322.16)',
+    '500': 'oklch(66.7% 0.295 322.15)',
+    '600': 'oklch(59.1% 0.293 322.896)',
+    '700': 'oklch(51.8% 0.253 323.949)',
+    '800': 'oklch(45.2% 0.211 324.591)',
+    '900': 'oklch(40.1% 0.17 325.612)',
+    '950': 'oklch(29.3% 0.136 325.661)',
   },
   pink: {
-    '50': 'oklch(0.971 0.014 343.198)',
-    '100': 'oklch(0.948 0.028 342.258)',
-    '200': 'oklch(0.899 0.061 343.231)',
-    '300': 'oklch(0.823 0.12 346.018)',
-    '400': 'oklch(0.718 0.202 349.761)',
-    '500': 'oklch(0.656 0.241 354.308)',
-    '600': 'oklch(0.592 0.249 0.584)',
-    '700': 'oklch(0.525 0.223 3.958)',
-    '800': 'oklch(0.459 0.187 3.815)',
-    '900': 'oklch(0.408 0.153 2.432)',
-    '950': 'oklch(0.284 0.109 3.907)',
+    '50': 'oklch(97.1% 0.014 343.198)',
+    '100': 'oklch(94.8% 0.028 342.258)',
+    '200': 'oklch(89.9% 0.061 343.231)',
+    '300': 'oklch(82.3% 0.12 346.018)',
+    '400': 'oklch(71.8% 0.202 349.761)',
+    '500': 'oklch(65.6% 0.241 354.308)',
+    '600': 'oklch(59.2% 0.249 0.584)',
+    '700': 'oklch(52.5% 0.223 3.958)',
+    '800': 'oklch(45.9% 0.187 3.815)',
+    '900': 'oklch(40.8% 0.153 2.432)',
+    '950': 'oklch(28.4% 0.109 3.907)',
   },
   rose: {
-    '50': 'oklch(0.969 0.015 12.422)',
-    '100': 'oklch(0.941 0.03 12.58)',
-    '200': 'oklch(0.892 0.058 10.001)',
-    '300': 'oklch(0.81 0.117 11.638)',
-    '400': 'oklch(0.712 0.194 13.428)',
-    '500': 'oklch(0.645 0.246 16.439)',
-    '600': 'oklch(0.586 0.253 17.585)',
-    '700': 'oklch(0.514 0.222 16.935)',
-    '800': 'oklch(0.455 0.188 13.697)',
-    '900': 'oklch(0.41 0.159 10.272)',
-    '950': 'oklch(0.271 0.105 12.094)',
+    '50': 'oklch(96.9% 0.015 12.422)',
+    '100': 'oklch(94.1% 0.03 12.58)',
+    '200': 'oklch(89.2% 0.058 10.001)',
+    '300': 'oklch(81% 0.117 11.638)',
+    '400': 'oklch(71.2% 0.194 13.428)',
+    '500': 'oklch(64.5% 0.246 16.439)',
+    '600': 'oklch(58.6% 0.253 17.585)',
+    '700': 'oklch(51.4% 0.222 16.935)',
+    '800': 'oklch(45.5% 0.188 13.697)',
+    '900': 'oklch(41% 0.159 10.272)',
+    '950': 'oklch(27.1% 0.105 12.094)',
   },
 }
diff --git a/packages/tailwindcss/src/compat/config.test.ts b/packages/tailwindcss/src/compat/config.test.ts
index 2d0ee4b7a..1f69ae446 100644
--- a/packages/tailwindcss/src/compat/config.test.ts
+++ b/packages/tailwindcss/src/compat/config.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, test, vi } from 'vitest'
 import { compile, type Config } from '..'
 import { default as plugin } from '../plugin'
+import { compileCss, run } from '../test-utils/run'
 import flattenColorPalette from './flatten-color-palette'
 
 const css = String.raw
@@ -12,25 +13,28 @@ test('Config files can add content', async () => {
   `
 
   let compiler = await compile(input, {
-    loadModule: async () => ({ module: { content: ['./file.txt'] }, base: '/root' }),
+    loadModule: async () => ({ module: { content: ['./file.txt'] }, base: '/root', path: '' }),
   })
 
-  expect(compiler.globs).toEqual([{ base: '/root', pattern: './file.txt' }])
+  expect(compiler.sources).toEqual([{ base: '/root', pattern: './file.txt', negated: false }])
 })
 
 test('Config files can change dark mode (media)', async () => {
-  let input = css`
-    @tailwind utilities;
-    @config "./config.js";
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({ module: { darkMode: 'media' }, base: '/root' }),
-  })
-
-  expect(compiler.build(['dark:underline'])).toMatchInlineSnapshot(`
-    ".dark\\:underline {
-      @media (prefers-color-scheme: dark) {
+  expect(
+    await run(
+      ['dark:underline'],
+      css`
+        @tailwind utilities;
+        @config "./config.js";
+      `,
+      {
+        loadModule: async () => ({ module: { darkMode: 'media' }, base: '/root', path: '' }),
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @media (prefers-color-scheme: dark) {
+      .dark\\:underline {
         text-decoration-line: underline;
       }
     }
@@ -39,73 +43,80 @@ test('Config files can change dark mode (media)', async () => {
 })
 
 test('Config files can change dark mode (selector)', async () => {
-  let input = css`
-    @tailwind utilities;
-    @config "./config.js";
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({ module: { darkMode: 'selector' }, base: '/root' }),
-  })
-
-  expect(compiler.build(['dark:underline'])).toMatchInlineSnapshot(`
-    ".dark\\:underline {
-      &:where(.dark, .dark *) {
-        text-decoration-line: underline;
-      }
+  expect(
+    await run(
+      ['dark:underline'],
+      css`
+        @tailwind utilities;
+        @config "./config.js";
+      `,
+      {
+        loadModule: async () => ({ module: { darkMode: 'selector' }, base: '/root', path: '' }),
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .dark\\:underline:where(.dark, .dark *) {
+      text-decoration-line: underline;
     }
     "
   `)
 })
 
 test('Config files can change dark mode (variant)', async () => {
-  let input = css`
-    @tailwind utilities;
-    @config "./config.js";
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: { darkMode: ['variant', '&:where(:not(.light))'] },
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build(['dark:underline'])).toMatchInlineSnapshot(`
-    ".dark\\:underline {
-      &:where(:not(.light)) {
-        text-decoration-line: underline;
-      }
+  expect(
+    await run(
+      ['dark:underline'],
+      css`
+        @tailwind utilities;
+        @config "./config.js";
+      `,
+      {
+        loadModule: async () => ({
+          module: { darkMode: ['variant', '&:where(:not(.light))'] },
+          base: '/root',
+          path: '',
+        }),
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .dark\\:underline:where(:not(.light)) {
+      text-decoration-line: underline;
     }
     "
   `)
 })
 
 test('Config files can add plugins', async () => {
-  let input = css`
-    @tailwind utilities;
-    @config "./config.js";
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        plugins: [
-          plugin(function ({ addUtilities }) {
-            addUtilities({
-              '.no-scrollbar': {
-                'scrollbar-width': 'none',
-              },
-            })
-          }),
-        ],
+  expect(
+    await run(
+      ['no-scrollbar'],
+      css`
+        @tailwind utilities;
+        @config "./config.js";
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            plugins: [
+              plugin(function ({ addUtilities }) {
+                addUtilities({
+                  '.no-scrollbar': {
+                    'scrollbar-width': 'none',
+                  },
+                })
+              }),
+            ],
+          },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build(['no-scrollbar'])).toMatchInlineSnapshot(`
-    ".no-scrollbar {
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .no-scrollbar {
       scrollbar-width: none;
     }
     "
@@ -113,137 +124,181 @@ test('Config files can add plugins', async () => {
 })
 
 test('Plugins loaded from config files can contribute to the config', async () => {
-  let input = css`
-    @tailwind utilities;
-    @config "./config.js";
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        plugins: [
-          plugin(() => {}, {
-            darkMode: ['variant', '&:where(:not(.light))'],
-          }),
-        ],
+  expect(
+    await run(
+      ['dark:underline'],
+      css`
+        @tailwind utilities;
+        @config "./config.js";
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            plugins: [
+              plugin(() => {}, {
+                darkMode: ['variant', '&:where(:not(.light))'],
+              }),
+            ],
+          },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build(['dark:underline'])).toMatchInlineSnapshot(`
-    ".dark\\:underline {
-      &:where(:not(.light)) {
-        text-decoration-line: underline;
-      }
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .dark\\:underline:where(:not(.light)) {
+      text-decoration-line: underline;
     }
     "
   `)
 })
 
 test('Config file presets can contribute to the config', async () => {
-  let input = css`
-    @tailwind utilities;
-    @config "./config.js";
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        presets: [
-          {
-            darkMode: ['variant', '&:where(:not(.light))'],
-          },
-        ],
+  expect(
+    await run(
+      ['dark:underline'],
+      css`
+        @tailwind utilities;
+        @config "./config.js";
+      `,
+      {
+        loadModule: async () => ({
+          module: { presets: [{ darkMode: ['variant', '&:where(:not(.light))'] }] },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build(['dark:underline'])).toMatchInlineSnapshot(`
-    ".dark\\:underline {
-      &:where(:not(.light)) {
-        text-decoration-line: underline;
-      }
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .dark\\:underline:where(:not(.light)) {
+      text-decoration-line: underline;
     }
     "
   `)
 })
 
 test('Config files can affect the theme', async () => {
-  let input = css`
-    @tailwind utilities;
-    @config "./config.js";
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          extend: {
-            colors: {
-              primary: '#c0ffee',
-            },
-          },
-        },
-
-        plugins: [
-          plugin(function ({ addUtilities, theme }) {
-            addUtilities({
-              '.scrollbar-primary': {
-                scrollbarColor: theme('colors.primary'),
+  expect(
+    await run(
+      ['bg-primary', 'scrollbar-primary'],
+      css`
+        @tailwind utilities;
+        @config "./config.js";
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              extend: {
+                colors: {
+                  primary: '#c0ffee',
+                },
               },
-            })
-          }),
-        ],
-      },
-      base: '/root',
-    }),
-  })
+            },
 
-  expect(compiler.build(['bg-primary', 'scrollbar-primary'])).toMatchInlineSnapshot(`
-    ".bg-primary {
-      background-color: #c0ffee;
-    }
+            plugins: [
+              plugin(function ({ addUtilities, theme }) {
+                addUtilities({
+                  '.scrollbar-primary': {
+                    scrollbarColor: theme('colors.primary'),
+                  },
+                })
+              }),
+            ],
+          },
+          base: '/root',
+          path: '',
+        }),
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
     .scrollbar-primary {
       scrollbar-color: #c0ffee;
     }
+
+    .bg-primary {
+      background-color: #c0ffee;
+    }
+    "
+  `)
+})
+
+// https://github.com/tailwindlabs/tailwindcss/issues/19091
+test('Accessing a default color if a sub-color exists via CSS should work as expected', async () => {
+  expect(
+    await compileCss(
+      css`
+        @tailwind utilities;
+        @config "./config.js";
+
+        .example {
+          color: theme('colors.foo-bar');
+          border-color: theme('colors.foo');
+        }
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              // Internally this object gets converted to something like:
+              // ```
+              // {
+              //   foo: { DEFAULT: 'var(--foo-foo)', bar: 'var(--foo-foo-bar)' },
+              // }
+              // ```
+              colors: {
+                foo: 'var(--foo-foo)',
+                'foo-bar': 'var(--foo-foo-bar)',
+              },
+            },
+          },
+          base: '/root',
+          path: '',
+        }),
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .example {
+      color: var(--foo-foo-bar);
+      border-color: var(--foo-foo);
+    }
     "
   `)
 })
 
 test('Variants in CSS overwrite variants from plugins', async () => {
-  let input = css`
-    @tailwind utilities;
-    @config "./config.js";
-    @variant dark (&:is(.my-dark));
-    @variant light (&:is(.my-light));
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        darkMode: ['variant', '&:is(.dark)'],
-        plugins: [
-          plugin(function ({ addVariant }) {
-            addVariant('light', '&:is(.light)')
-          }),
-        ],
+  expect(
+    await run(
+      ['dark:underline', 'light:underline'],
+      css`
+        @tailwind utilities;
+        @config "./config.js";
+        @custom-variant dark (&:is(.my-dark));
+        @custom-variant light (&:is(.my-light));
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            darkMode: ['variant', '&:is(.dark)'],
+            plugins: [
+              plugin(function ({ addVariant }) {
+                addVariant('light', '&:is(.light)')
+              }),
+            ],
+          },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build(['dark:underline', 'light:underline'])).toMatchInlineSnapshot(`
-    ".dark\\:underline {
-      &:is(.my-dark) {
-        text-decoration-line: underline;
-      }
-    }
-    .light\\:underline {
-      &:is(.my-light) {
-        text-decoration-line: underline;
-      }
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .dark\\:underline.my-dark, .light\\:underline.my-light {
+      text-decoration-line: underline;
     }
     "
   `)
@@ -253,157 +308,167 @@ describe('theme callbacks', () => {
   test('tuple values from the config overwrite `@theme default` tuple-ish values from the CSS theme', async ({
     expect,
   }) => {
-    let input = css`
-      @theme default {
-        --text-base: 0rem;
-        --text-base--line-height: 1rem;
-        --text-md: 0rem;
-        --text-md--line-height: 1rem;
-        --text-xl: 0rem;
-        --text-xl--line-height: 1rem;
-      }
-      @theme {
-        --text-base: 100rem;
-        --text-md--line-height: 101rem;
-      }
-      @tailwind utilities;
-      @config "./config.js";
-    `
+    expect(
+      await run(
+        ['leading-base', 'leading-md', 'leading-xl', 'prose'],
+        css`
+          @theme default {
+            --text-base: 0rem;
+            --text-base--line-height: 1rem;
+            --text-md: 0rem;
+            --text-md--line-height: 1rem;
+            --text-xl: 0rem;
+            --text-xl--line-height: 1rem;
+          }
+          @theme {
+            --text-base: 100rem;
+            --text-md--line-height: 101rem;
+          }
+          @tailwind utilities;
+          @config "./config.js";
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                extend: {
+                  fontSize: {
+                    base: ['200rem', { lineHeight: '201rem' }],
+                    md: ['200rem', { lineHeight: '201rem' }],
+                    xl: ['200rem', { lineHeight: '201rem' }],
+                  },
 
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            extend: {
-              fontSize: {
-                base: ['200rem', { lineHeight: '201rem' }],
-                md: ['200rem', { lineHeight: '201rem' }],
-                xl: ['200rem', { lineHeight: '201rem' }],
+                  // Direct access
+                  lineHeight: ({ theme }) => ({
+                    base: theme('fontSize.base[1].lineHeight'),
+                    md: theme('fontSize.md[1].lineHeight'),
+                    xl: theme('fontSize.xl[1].lineHeight'),
+                  }),
+
+                  // Tuple access
+                  typography: ({ theme }) => ({
+                    '[class~=lead-base]': {
+                      fontSize: theme('fontSize.base')[0],
+                      ...theme('fontSize.base')[1],
+                    },
+                    '[class~=lead-md]': {
+                      fontSize: theme('fontSize.md')[0],
+                      ...theme('fontSize.md')[1],
+                    },
+                    '[class~=lead-xl]': {
+                      fontSize: theme('fontSize.xl')[0],
+                      ...theme('fontSize.xl')[1],
+                    },
+                  }),
+                },
               },
 
-              // Direct access
-              lineHeight: ({ theme }) => ({
-                base: theme('fontSize.base[1].lineHeight'),
-                md: theme('fontSize.md[1].lineHeight'),
-                xl: theme('fontSize.xl[1].lineHeight'),
-              }),
+              plugins: [
+                plugin(function ({ addUtilities, theme }) {
+                  addUtilities({
+                    '.prose': {
+                      ...theme('typography'),
+                    },
+                  })
+                }),
+              ],
+            } satisfies Config,
+            base: '/root',
+            path: '',
+          }),
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer properties {
+        @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+          *, :before, :after, ::backdrop {
+            --tw-leading: initial;
+          }
+        }
+      }
 
-              // Tuple access
-              typography: ({ theme }) => ({
-                '[class~=lead-base]': {
-                  fontSize: theme('fontSize.base')[0],
-                  ...theme('fontSize.base')[1],
-                },
-                '[class~=lead-md]': {
-                  fontSize: theme('fontSize.md')[0],
-                  ...theme('fontSize.md')[1],
-                },
-                '[class~=lead-xl]': {
-                  fontSize: theme('fontSize.xl')[0],
-                  ...theme('fontSize.xl')[1],
-                },
-              }),
-            },
-          },
+      .prose [class~="lead-base"] {
+        font-size: 100rem;
+        line-height: 201rem;
+      }
 
-          plugins: [
-            plugin(function ({ addUtilities, theme }) {
-              addUtilities({
-                '.prose': {
-                  ...theme('typography'),
-                },
-              })
-            }),
-          ],
-        } satisfies Config,
-        base: '/root',
-      }),
-    })
+      .prose [class~="lead-md"] {
+        font-size: 200rem;
+        line-height: 101rem;
+      }
 
-    expect(compiler.build(['leading-base', 'leading-md', 'leading-xl', 'prose']))
-      .toMatchInlineSnapshot(`
-        ":root {
-          --text-base: 100rem;
-          --text-md--line-height: 101rem;
-        }
-        .prose {
-          [class~=lead-base] {
-            font-size: 100rem;
-            line-height: 201rem;
-          }
-          [class~=lead-md] {
-            font-size: 200rem;
-            line-height: 101rem;
-          }
-          [class~=lead-xl] {
-            font-size: 200rem;
-            line-height: 201rem;
-          }
-        }
-        .leading-base {
-          --tw-leading: 201rem;
-          line-height: 201rem;
-        }
-        .leading-md {
-          --tw-leading: 101rem;
-          line-height: 101rem;
-        }
-        .leading-xl {
-          --tw-leading: 201rem;
-          line-height: 201rem;
-        }
-        @supports (-moz-orient: inline) {
-          @layer base {
-            *, ::before, ::after, ::backdrop {
-              --tw-leading: initial;
-            }
-          }
-        }
-        @property --tw-leading {
-          syntax: "*";
-          inherits: false;
-        }
-        "
-      `)
+      .prose [class~="lead-xl"] {
+        font-size: 200rem;
+        line-height: 201rem;
+      }
+
+      .leading-base {
+        --tw-leading: 201rem;
+        line-height: 201rem;
+      }
+
+      .leading-md {
+        --tw-leading: 101rem;
+        line-height: 101rem;
+      }
+
+      .leading-xl {
+        --tw-leading: 201rem;
+        line-height: 201rem;
+      }
+
+      @property --tw-leading {
+        syntax: "*";
+        inherits: false
+      }
+      "
+    `)
   })
 })
 
 describe('theme overrides order', () => {
   test('user theme > js config > default theme', async () => {
-    let input = css`
-      @theme default {
-        --color-red: red;
-      }
-      @theme {
-        --color-blue: blue;
-      }
-      @tailwind utilities;
-      @config "./config.js";
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            extend: {
-              colors: {
-                red: 'very-red',
-                blue: 'very-blue',
+    expect(
+      await run(
+        ['bg-red', 'bg-blue'],
+        css`
+          @theme default {
+            --color-red: red;
+          }
+          @theme {
+            --color-blue: blue;
+          }
+          @tailwind utilities;
+          @config "./config.js";
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                extend: {
+                  colors: {
+                    red: 'very-red',
+                    blue: 'very-blue',
+                  },
+                },
               },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(compiler.build(['bg-red', 'bg-blue'])).toMatchInlineSnapshot(`
-      ":root {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
         --color-blue: blue;
       }
+
       .bg-blue {
         background-color: var(--color-blue);
       }
+
       .bg-red {
         background-color: very-red;
       }
@@ -412,131 +477,134 @@ describe('theme overrides order', () => {
   })
 
   test('user theme > js config > default theme (with nested object)', async () => {
-    let input = css`
-      @theme default {
-        --color-slate-100: #000100;
-        --color-slate-200: #000200;
-        --color-slate-300: #000300;
-      }
-      @theme {
-        --color-slate-400: #100400;
-        --color-slate-500: #100500;
-      }
-      @tailwind utilities;
-      @config "./config.js";
-      @plugin "./plugin.js";
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async (id) => {
-        if (id.includes('config.js')) {
-          return {
-            module: {
-              theme: {
-                extend: {
-                  colors: {
-                    slate: {
-                      200: '#200200',
-                      400: '#200400',
-                      600: '#200600',
+    expect(
+      await run(
+        [
+          'bg-slate-100',
+          'bg-slate-200',
+          'bg-slate-300',
+          'bg-slate-400',
+          'bg-slate-500',
+          'bg-slate-600',
+          'hover-bg-slate-100',
+          'hover-bg-slate-200',
+          'hover-bg-slate-300',
+          'hover-bg-slate-400',
+          'hover-bg-slate-500',
+          'hover-bg-slate-600',
+        ],
+        css`
+          @theme default {
+            --color-slate-100: #000100;
+            --color-slate-200: #000200;
+            --color-slate-300: #000300;
+          }
+          @theme {
+            --color-slate-400: #100400;
+            --color-slate-500: #100500;
+          }
+          @tailwind utilities;
+          @config "./config.js";
+          @plugin "./plugin.js";
+        `,
+        {
+          loadModule: async (id) => {
+            if (id.includes('config.js')) {
+              return {
+                module: {
+                  theme: {
+                    extend: {
+                      colors: {
+                        slate: {
+                          200: '#200200',
+                          400: '#200400',
+                          600: '#200600',
+                        },
+                      },
                     },
                   },
-                },
-              },
-            } satisfies Config,
-            base: '/root',
-          }
-        } else {
-          return {
-            module: plugin(({ matchUtilities, theme }) => {
-              matchUtilities(
-                {
-                  'hover-bg': (value) => {
-                    return {
-                      '&:hover': {
-                        backgroundColor: value,
+                } satisfies Config,
+                base: '/root',
+                path: '',
+              }
+            } else {
+              return {
+                module: plugin(({ matchUtilities, theme }) => {
+                  matchUtilities(
+                    {
+                      'hover-bg': (value) => {
+                        return {
+                          '&:hover': {
+                            backgroundColor: value,
+                          },
+                        }
                       },
-                    }
-                  },
-                },
-                { values: flattenColorPalette(theme('colors')) },
-              )
-            }),
-            base: '/root',
-          }
-        }
-      },
-    })
-
-    expect(
-      compiler.build([
-        'bg-slate-100',
-        'bg-slate-200',
-        'bg-slate-300',
-        'bg-slate-400',
-        'bg-slate-500',
-        'bg-slate-600',
-        'hover-bg-slate-100',
-        'hover-bg-slate-200',
-        'hover-bg-slate-300',
-        'hover-bg-slate-400',
-        'hover-bg-slate-500',
-        'hover-bg-slate-600',
-      ]),
+                    },
+                    { values: flattenColorPalette(theme('colors')) },
+                  )
+                }),
+                base: '/root',
+                path: '',
+              }
+            }
+          },
+        },
+      ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --color-slate-100: #000100;
         --color-slate-300: #000300;
         --color-slate-400: #100400;
         --color-slate-500: #100500;
       }
+
       .bg-slate-100 {
         background-color: var(--color-slate-100);
       }
+
       .bg-slate-200 {
         background-color: #200200;
       }
+
       .bg-slate-300 {
         background-color: var(--color-slate-300);
       }
+
       .bg-slate-400 {
         background-color: var(--color-slate-400);
       }
+
       .bg-slate-500 {
         background-color: var(--color-slate-500);
       }
+
       .bg-slate-600 {
         background-color: #200600;
       }
-      .hover-bg-slate-100 {
-        &:hover {
-          background-color: #000100;
-        }
+
+      .hover-bg-slate-100:hover {
+        background-color: #000100;
       }
-      .hover-bg-slate-200 {
-        &:hover {
-          background-color: #200200;
-        }
+
+      .hover-bg-slate-200:hover {
+        background-color: #200200;
       }
-      .hover-bg-slate-300 {
-        &:hover {
-          background-color: #000300;
-        }
+
+      .hover-bg-slate-300:hover {
+        background-color: #000300;
       }
-      .hover-bg-slate-400 {
-        &:hover {
-          background-color: #100400;
-        }
+
+      .hover-bg-slate-400:hover {
+        background-color: #100400;
       }
-      .hover-bg-slate-500 {
-        &:hover {
-          background-color: #100500;
-        }
+
+      .hover-bg-slate-500:hover {
+        background-color: #100500;
       }
-      .hover-bg-slate-600 {
-        &:hover {
-          background-color: #200600;
-        }
+
+      .hover-bg-slate-600:hover {
+        background-color: #200600;
       }
       "
     `)
@@ -545,35 +613,34 @@ describe('theme overrides order', () => {
 
 describe('default font family compatibility', () => {
   test('overriding `fontFamily.sans` sets `--default-font-family`', async () => {
-    let input = css`
-      @theme default {
-        --default-font-family: var(--font-family-sans);
-        --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
-        --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
-      }
-      @config "./config.js";
-      @tailwind utilities;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            fontFamily: {
-              sans: 'Potato Sans',
+    expect(
+      await run(
+        ['font-sans'],
+        css`
+          @theme default {
+            --default-font-family: var(--font-family-sans);
+            --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
+            --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
+          }
+          @config "./config.js";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                fontFamily: {
+                  sans: 'Potato Sans',
+                },
+              },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
-      ":root {
-        --default-font-family: Potato Sans;
-        --default-font-feature-settings: normal;
-        --default-font-variation-settings: normal;
-      }
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       .font-sans {
         font-family: Potato Sans;
       }
@@ -584,38 +651,37 @@ describe('default font family compatibility', () => {
   test('overriding `fontFamily.sans[1].fontFeatureSettings` sets `--default-font-feature-settings`', async ({
     expect,
   }) => {
-    let input = css`
-      @theme default {
-        --default-font-family: var(--font-family-sans);
-        --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
-        --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
-      }
-      @config "./config.js";
-      @tailwind utilities;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            fontFamily: {
-              sans: ['Potato Sans', { fontFeatureSettings: '"cv06"' }],
+    expect(
+      await run(
+        ['font-sans'],
+        css`
+          @theme default {
+            --default-font-family: var(--font-family-sans);
+            --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
+            --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
+          }
+          @config "./config.js";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                fontFamily: {
+                  sans: ['Potato Sans', { fontFeatureSettings: '"cv06"' }],
+                },
+              },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
-      ":root {
-        --default-font-family: Potato Sans;
-        --default-font-feature-settings: "cv06";
-        --default-font-variation-settings: normal;
-      }
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       .font-sans {
-        font-family: Potato Sans;
         font-feature-settings: "cv06";
+        font-family: Potato Sans;
       }
       "
     `)
@@ -624,38 +690,37 @@ describe('default font family compatibility', () => {
   test('overriding `fontFamily.sans[1].fontVariationSettings` sets `--default-font-variation-settings`', async ({
     expect,
   }) => {
-    let input = css`
-      @theme default {
-        --default-font-family: var(--font-family-sans);
-        --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
-        --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
-      }
-      @config "./config.js";
-      @tailwind utilities;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            fontFamily: {
-              sans: ['Potato Sans', { fontVariationSettings: '"XHGT" 0.7' }],
+    expect(
+      await run(
+        ['font-sans'],
+        css`
+          @theme default {
+            --default-font-family: var(--font-family-sans);
+            --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
+            --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
+          }
+          @config "./config.js";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                fontFamily: {
+                  sans: ['Potato Sans', { fontVariationSettings: '"XHGT" 0.7' }],
+                },
+              },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
-      ":root {
-        --default-font-family: Potato Sans;
-        --default-font-feature-settings: normal;
-        --default-font-variation-settings: "XHGT" 0.7;
-      }
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       .font-sans {
+        font-variation-settings: "XHGT" .7;
         font-family: Potato Sans;
-        font-variation-settings: "XHGT" 0.7;
       }
       "
     `)
@@ -664,42 +729,41 @@ describe('default font family compatibility', () => {
   test('overriding `fontFeatureSettings` and `fontVariationSettings` for `fontFamily.sans` sets `--default-font-feature-settings` and `--default-font-variation-settings`', async ({
     expect,
   }) => {
-    let input = css`
-      @theme default {
-        --default-font-family: var(--font-family-sans);
-        --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
-        --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
-      }
-      @config "./config.js";
-      @tailwind utilities;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            fontFamily: {
-              sans: [
-                'Potato Sans',
-                { fontFeatureSettings: '"cv06"', fontVariationSettings: '"XHGT" 0.7' },
-              ],
+    expect(
+      await run(
+        ['font-sans'],
+        css`
+          @theme default {
+            --default-font-family: var(--font-family-sans);
+            --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
+            --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
+          }
+          @config "./config.js";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                fontFamily: {
+                  sans: [
+                    'Potato Sans',
+                    { fontFeatureSettings: '"cv06"', fontVariationSettings: '"XHGT" 0.7' },
+                  ],
+                },
+              },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
-      ":root {
-        --default-font-family: Potato Sans;
-        --default-font-feature-settings: "cv06";
-        --default-font-variation-settings: "XHGT" 0.7;
-      }
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       .font-sans {
-        font-family: Potato Sans;
         font-feature-settings: "cv06";
-        font-variation-settings: "XHGT" 0.7;
+        font-variation-settings: "XHGT" .7;
+        font-family: Potato Sans;
       }
       "
     `)
@@ -708,39 +772,41 @@ describe('default font family compatibility', () => {
   test('overriding `--font-family-sans` in `@theme` without `default` preserves the original `--default-font-*` values', async ({
     expect,
   }) => {
-    let input = css`
-      @theme default {
-        --default-font-family: var(--font-family-sans);
-        --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
-        --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
-      }
-      @config "./config.js";
-      @theme {
-        --font-sans: Sandwich Sans;
-      }
-      @tailwind utilities;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            fontFamily: {
-              sans: 'Potato Sans',
+    expect(
+      await run(
+        ['font-sans'],
+        css`
+          @theme default {
+            --default-font-family: var(--font-family-sans);
+            --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
+            --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
+          }
+          @config "./config.js";
+          @theme {
+            --font-sans: Sandwich Sans;
+          }
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                fontFamily: {
+                  sans: 'Potato Sans',
+                },
+              },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
-      ":root {
-        --default-font-family: var(--font-family-sans);
-        --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
-        --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
         --font-sans: Sandwich Sans;
       }
+
       .font-sans {
         font-family: var(--font-sans);
       }
@@ -751,35 +817,34 @@ describe('default font family compatibility', () => {
   test('overriding `fontFamily.sans` in a config file with an array sets `--default-font-family`', async ({
     expect,
   }) => {
-    let input = css`
-      @theme default {
-        --default-font-family: var(--font-family-sans);
-        --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
-        --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
-      }
-      @config "./config.js";
-      @tailwind utilities;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            fontFamily: {
-              sans: ['Inter', 'system-ui', 'sans-serif'],
+    expect(
+      await run(
+        ['font-sans'],
+        css`
+          @theme default {
+            --default-font-family: var(--font-family-sans);
+            --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
+            --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
+          }
+          @config "./config.js";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                fontFamily: {
+                  sans: ['Inter', 'system-ui', 'sans-serif'],
+                },
+              },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
-      ":root {
-        --default-font-family: Inter, system-ui, sans-serif;
-        --default-font-feature-settings: normal;
-        --default-font-variation-settings: normal;
-      }
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       .font-sans {
         font-family: Inter, system-ui, sans-serif;
       }
@@ -790,69 +855,66 @@ describe('default font family compatibility', () => {
   test('overriding `fontFamily.sans` in a config file with an unexpected type is ignored', async ({
     expect,
   }) => {
-    let input = css`
-      @theme default {
-        --default-font-family: var(--font-family-sans);
-        --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
-        --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
-      }
-      @config "./config.js";
-      @tailwind utilities;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            fontFamily: {
-              sans: { foo: 'bar', banana: 'sandwich' },
+    expect(
+      await run(
+        ['font-sans'],
+        css`
+          @theme default {
+            --default-font-family: var(--font-family-sans);
+            --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
+            --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
+          }
+          @config "./config.js";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                fontFamily: {
+                  sans: { foo: 'bar', banana: 'sandwich' },
+                },
+              },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(compiler.build(['font-sans'])).toMatchInlineSnapshot(`
-      ":root {
-        --default-font-family: var(--font-family-sans);
-        --default-font-feature-settings: var(--font-family-sans--font-feature-settings);
-        --default-font-variation-settings: var(--font-family-sans--font-variation-settings);
-      }
-      "
-    `)
+      ),
+    ).toEqual('')
   })
 
   test('overriding `fontFamily.mono` sets `--default-mono-font-family`', async () => {
-    let input = css`
-      @theme default {
-        --default-mono-font-family: var(--font-family-mono);
-        --default-mono-font-feature-settings: var(--font-family-mono--font-feature-settings);
-        --default-mono-font-variation-settings: var(--font-family-mono--font-variation-settings);
-      }
-      @config "./config.js";
-      @tailwind utilities;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            fontFamily: {
-              mono: 'Potato Mono',
+    expect(
+      await run(
+        ['font-mono'],
+        css`
+          @theme default {
+            --default-mono-font-family: var(--font-family-mono);
+            --default-mono-font-feature-settings: var(--font-family-mono--font-feature-settings);
+            --default-mono-font-variation-settings: var(
+              --font-family-mono--font-variation-settings
+            );
+          }
+          @config "./config.js";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                fontFamily: {
+                  mono: 'Potato Mono',
+                },
+              },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`
-      ":root {
-        --default-mono-font-family: Potato Mono;
-        --default-mono-font-feature-settings: normal;
-        --default-mono-font-variation-settings: normal;
-      }
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       .font-mono {
         font-family: Potato Mono;
       }
@@ -863,38 +925,39 @@ describe('default font family compatibility', () => {
   test('overriding `fontFamily.mono[1].fontFeatureSettings` sets `--default-mono-font-feature-settings`', async ({
     expect,
   }) => {
-    let input = css`
-      @theme default {
-        --default-mono-font-family: var(--font-family-mono);
-        --default-mono-font-feature-settings: var(--font-family-mono--font-feature-settings);
-        --default-mono-font-variation-settings: var(--font-family-mono--font-variation-settings);
-      }
-      @config "./config.js";
-      @tailwind utilities;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            fontFamily: {
-              mono: ['Potato Mono', { fontFeatureSettings: '"cv06"' }],
+    expect(
+      await run(
+        ['font-mono'],
+        css`
+          @theme default {
+            --default-mono-font-family: var(--font-family-mono);
+            --default-mono-font-feature-settings: var(--font-family-mono--font-feature-settings);
+            --default-mono-font-variation-settings: var(
+              --font-family-mono--font-variation-settings
+            );
+          }
+          @config "./config.js";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                fontFamily: {
+                  mono: ['Potato Mono', { fontFeatureSettings: '"cv06"' }],
+                },
+              },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`
-      ":root {
-        --default-mono-font-family: Potato Mono;
-        --default-mono-font-feature-settings: "cv06";
-        --default-mono-font-variation-settings: normal;
-      }
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       .font-mono {
-        font-family: Potato Mono;
         font-feature-settings: "cv06";
+        font-family: Potato Mono;
       }
       "
     `)
@@ -903,38 +966,39 @@ describe('default font family compatibility', () => {
   test('overriding `fontFamily.mono[1].fontVariationSettings` sets `--default-mono-font-variation-settings`', async ({
     expect,
   }) => {
-    let input = css`
-      @theme default {
-        --default-mono-font-family: var(--font-family-mono);
-        --default-mono-font-feature-settings: var(--font-family-mono--font-feature-settings);
-        --default-mono-font-variation-settings: var(--font-family-mono--font-variation-settings);
-      }
-      @config "./config.js";
-      @tailwind utilities;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            fontFamily: {
-              mono: ['Potato Mono', { fontVariationSettings: '"XHGT" 0.7' }],
+    expect(
+      await run(
+        ['font-mono'],
+        css`
+          @theme default {
+            --default-mono-font-family: var(--font-family-mono);
+            --default-mono-font-feature-settings: var(--font-family-mono--font-feature-settings);
+            --default-mono-font-variation-settings: var(
+              --font-family-mono--font-variation-settings
+            );
+          }
+          @config "./config.js";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                fontFamily: {
+                  mono: ['Potato Mono', { fontVariationSettings: '"XHGT" 0.7' }],
+                },
+              },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`
-      ":root {
-        --default-mono-font-family: Potato Mono;
-        --default-mono-font-feature-settings: normal;
-        --default-mono-font-variation-settings: "XHGT" 0.7;
-      }
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       .font-mono {
+        font-variation-settings: "XHGT" .7;
         font-family: Potato Mono;
-        font-variation-settings: "XHGT" 0.7;
       }
       "
     `)
@@ -943,42 +1007,41 @@ describe('default font family compatibility', () => {
   test('overriding `fontFeatureSettings` and `fontVariationSettings` for `fontFamily.mono` sets `--default-mono-font-feature-settings` and `--default-mono-font-variation-settings`', async ({
     expect,
   }) => {
-    let input = css`
-      @theme default {
-        --default-mono-font-family: var(--font-mono);
-        --default-mono-font-feature-settings: var(--font-mono--font-feature-settings);
-        --default-mono-font-variation-settings: var(--font-mono--font-variation-settings);
-      }
-      @config "./config.js";
-      @tailwind utilities;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            fontFamily: {
-              mono: [
-                'Potato Mono',
-                { fontFeatureSettings: '"cv06"', fontVariationSettings: '"XHGT" 0.7' },
-              ],
+    expect(
+      await run(
+        ['font-mono'],
+        css`
+          @theme default {
+            --default-mono-font-family: var(--font-mono);
+            --default-mono-font-feature-settings: var(--font-mono--font-feature-settings);
+            --default-mono-font-variation-settings: var(--font-mono--font-variation-settings);
+          }
+          @config "./config.js";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                fontFamily: {
+                  mono: [
+                    'Potato Mono',
+                    { fontFeatureSettings: '"cv06"', fontVariationSettings: '"XHGT" 0.7' },
+                  ],
+                },
+              },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`
-      ":root {
-        --default-mono-font-family: Potato Mono;
-        --default-mono-font-feature-settings: "cv06";
-        --default-mono-font-variation-settings: "XHGT" 0.7;
-      }
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       .font-mono {
-        font-family: Potato Mono;
         font-feature-settings: "cv06";
-        font-variation-settings: "XHGT" 0.7;
+        font-variation-settings: "XHGT" .7;
+        font-family: Potato Mono;
       }
       "
     `)
@@ -987,39 +1050,41 @@ describe('default font family compatibility', () => {
   test('overriding `--font-family-mono` in `@theme` without `default` preserves the original `--default-mono-font-*` values', async ({
     expect,
   }) => {
-    let input = css`
-      @theme default {
-        --default-mono-font-family: var(--font-mono);
-        --default-mono-font-feature-settings: var(--font-mono--font-feature-settings);
-        --default-mono-font-variation-settings: var(--font-mono--font-variation-settings);
-      }
-      @config "./config.js";
-      @theme {
-        --font-mono: Sandwich Mono;
-      }
-      @tailwind utilities;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            fontFamily: {
-              mono: 'Potato Mono',
+    expect(
+      await run(
+        ['font-mono'],
+        css`
+          @theme default {
+            --default-mono-font-family: var(--font-mono);
+            --default-mono-font-feature-settings: var(--font-mono--font-feature-settings);
+            --default-mono-font-variation-settings: var(--font-mono--font-variation-settings);
+          }
+          @config "./config.js";
+          @theme {
+            --font-mono: Sandwich Mono;
+          }
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                fontFamily: {
+                  mono: 'Potato Mono',
+                },
+              },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`
-      ":root {
-        --default-mono-font-family: var(--font-mono);
-        --default-mono-font-feature-settings: var(--font-mono--font-feature-settings);
-        --default-mono-font-variation-settings: var(--font-mono--font-variation-settings);
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
         --font-mono: Sandwich Mono;
       }
+
       .font-mono {
         font-family: var(--font-mono);
       }
@@ -1030,122 +1095,117 @@ describe('default font family compatibility', () => {
   test('overriding `fontFamily.mono` in a config file with an unexpected type is ignored', async ({
     expect,
   }) => {
-    let input = css`
-      @theme default {
-        --default-mono-font-family: var(--font-family-mono);
-        --default-mono-font-feature-settings: var(--font-family-mono--font-feature-settings);
-        --default-mono-font-variation-settings: var(--font-family-mono--font-variation-settings);
-      }
-      @config "./config.js";
-      @tailwind utilities;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            fontFamily: {
-              mono: { foo: 'bar', banana: 'sandwich' },
+    expect(
+      await run(
+        ['font-mono'],
+        css`
+          @theme default {
+            --default-mono-font-family: var(--font-family-mono);
+            --default-mono-font-feature-settings: var(--font-family-mono--font-feature-settings);
+            --default-mono-font-variation-settings: var(
+              --font-family-mono--font-variation-settings
+            );
+          }
+          @config "./config.js";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                fontFamily: {
+                  mono: { foo: 'bar', banana: 'sandwich' },
+                },
+              },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(compiler.build(['font-mono'])).toMatchInlineSnapshot(`
-      ":root {
-        --default-mono-font-family: var(--font-family-mono);
-        --default-mono-font-feature-settings: var(--font-family-mono--font-feature-settings);
-        --default-mono-font-variation-settings: var(--font-family-mono--font-variation-settings);
-      }
-      "
-    `)
+      ),
+    ).toEqual('')
   })
 })
 
 test('creates variants for `data`, `supports`, and `aria` theme options at the same level as the core utility ', async () => {
-  let input = css`
-    @tailwind utilities;
-    @config "./config.js";
-  `
+  expect(
+    await run(
+      [
+        'aria-polite:underline',
+        'supports-child-combinator:underline',
+        'supports-foo:underline',
+        'data-checked:underline',
 
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          extend: {
-            aria: {
-              polite: 'live="polite"',
-            },
-            supports: {
-              'child-combinator': 'selector(h2 > p)',
-              foo: 'bar',
-            },
-            data: {
-              checked: 'ui~="checked"',
+        // Ensure core variants still work
+        'aria-hidden:flex',
+        'supports-grid:flex',
+        'data-foo:flex',
+
+        // The `print` variant should still be sorted last, even after registering
+        // the other custom variants.
+        'print:flex',
+      ],
+      css`
+        @tailwind utilities;
+        @config "./config.js";
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              extend: {
+                aria: {
+                  polite: 'live="polite"',
+                },
+                supports: {
+                  'child-combinator': 'selector(h2 > p)',
+                  foo: 'bar',
+                },
+                data: {
+                  checked: 'ui~="checked"',
+                },
+              },
             },
           },
-        },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(
-    compiler.build([
-      'aria-polite:underline',
-      'supports-child-combinator:underline',
-      'supports-foo:underline',
-      'data-checked:underline',
-
-      // Ensure core variants still work
-      'aria-hidden:flex',
-      'supports-grid:flex',
-      'data-foo:flex',
-
-      // The `print` variant should still be sorted last, even after registering
-      // the other custom variants.
-      'print:flex',
-    ]),
+    ),
   ).toMatchInlineSnapshot(`
-    ".aria-hidden\\:flex {
-      &[aria-hidden="true"] {
+    "
+    .aria-hidden\\:flex[aria-hidden="true"] {
+      display: flex;
+    }
+
+    .aria-polite\\:underline[aria-live="polite"], .data-checked\\:underline[data-ui~="checked"] {
+      text-decoration-line: underline;
+    }
+
+    .data-foo\\:flex[data-foo] {
+      display: flex;
+    }
+
+    @supports selector(h2 > p) {
+      .supports-child-combinator\\:underline {
+        text-decoration-line: underline;
+      }
+    }
+
+    @supports (bar: var(--tw)) {
+      .supports-foo\\:underline {
+        text-decoration-line: underline;
+      }
+    }
+
+    @supports (grid: var(--tw)) {
+      .supports-grid\\:flex {
         display: flex;
       }
     }
-    .aria-polite\\:underline {
-      &[aria-live="polite"] {
-        text-decoration-line: underline;
-      }
-    }
-    .data-checked\\:underline {
-      &[data-ui~="checked"] {
-        text-decoration-line: underline;
-      }
-    }
-    .data-foo\\:flex {
-      &[data-foo] {
-        display: flex;
-      }
-    }
-    .supports-child-combinator\\:underline {
-      @supports selector(h2 > p) {
-        text-decoration-line: underline;
-      }
-    }
-    .supports-foo\\:underline {
-      @supports (bar: var(--tw)) {
-        text-decoration-line: underline;
-      }
-    }
-    .supports-grid\\:flex {
-      @supports (grid: var(--tw)) {
-        display: flex;
-      }
-    }
-    .print\\:flex {
-      @media print {
+
+    @media print {
+      .print\\:flex {
         display: flex;
       }
     }
@@ -1154,68 +1214,66 @@ test('creates variants for `data`, `supports`, and `aria` theme options at the s
 })
 
 test('merges css breakpoints with js config screens', async () => {
-  let input = css`
-    @theme default {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
-    @theme {
-      --breakpoint-md: 50rem;
-    }
-    @config "./config.js";
-    @tailwind utilities;
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          extend: {
-            screens: {
-              sm: '44rem',
+  expect(
+    await run(
+      ['sm:flex', 'md:flex', 'lg:flex', 'min-sm:max-md:underline'],
+      css`
+        @theme default {
+          --breakpoint-sm: 40rem;
+          --breakpoint-md: 48rem;
+          --breakpoint-lg: 64rem;
+          --breakpoint-xl: 80rem;
+          --breakpoint-2xl: 96rem;
+        }
+        @theme {
+          --breakpoint-md: 50rem;
+        }
+        @config "./config.js";
+        @tailwind utilities;
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              extend: {
+                screens: {
+                  sm: '44rem',
+                },
+              },
             },
           },
-        },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build(['sm:flex', 'md:flex', 'lg:flex', 'min-sm:max-md:underline']))
-    .toMatchInlineSnapshot(`
-      ":root {
-        --breakpoint-md: 50rem;
-        --breakpoint-lg: 64rem;
-        --breakpoint-xl: 80rem;
-        --breakpoint-2xl: 96rem;
-      }
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @media (min-width: 44rem) {
       .sm\\:flex {
-        @media (width >= 44rem) {
-          display: flex;
-        }
-      }
-      .min-sm\\:max-md\\:underline {
-        @media (width >= 44rem) {
-          @media (width < 50rem) {
-            text-decoration-line: underline;
-          }
+        display: flex;
+      }
+
+      @media not all and (min-width: 50rem) {
+        .min-sm\\:max-md\\:underline {
+          text-decoration-line: underline;
         }
       }
+    }
+
+    @media (min-width: 50rem) {
       .md\\:flex {
-        @media (width >= 50rem) {
-          display: flex;
-        }
+        display: flex;
       }
+    }
+
+    @media (min-width: 64rem) {
       .lg\\:flex {
-        @media (width >= 64rem) {
-          display: flex;
-        }
+        display: flex;
       }
-      "
-    `)
+    }
+    "
+  `)
 })
 
 test('utilities must be prefixed', async () => {
@@ -1228,72 +1286,70 @@ test('utilities must be prefixed', async () => {
     }
   `
 
-  let compiler = await compile(input, {
-    loadModule: async (id, base) => ({
+  let options: Partial<Parameters<typeof compile>[1]> = {
+    loadModule: async (_id, base) => ({
+      path: '',
       base,
       module: { prefix: 'tw' },
     }),
-  })
+  }
 
   // Prefixed utilities are generated
-  expect(compiler.build(['tw:underline', 'tw:hover:line-through', 'tw:custom']))
+  expect(await run(['tw:underline', 'tw:hover:line-through', 'tw:custom'], input, options))
     .toMatchInlineSnapshot(`
-    ".tw\\:custom {
-      color: red;
-    }
-    .tw\\:underline {
-      text-decoration-line: underline;
-    }
-    .tw\\:hover\\:line-through {
-      &:hover {
-        @media (hover: hover) {
+      "
+      .tw\\:custom {
+        color: red;
+      }
+
+      .tw\\:underline {
+        text-decoration-line: underline;
+      }
+
+      @media (hover: hover) {
+        .tw\\:hover\\:line-through:hover {
           text-decoration-line: line-through;
         }
       }
-    }
-    "
-  `)
+      "
+    `)
 
   // Non-prefixed utilities are ignored
-  compiler = await compile(input, {
-    loadModule: async (id, base) => ({
-      base,
-      module: { prefix: 'tw' },
-    }),
-  })
-
-  expect(compiler.build(['underline', 'hover:line-through', 'custom'])).toEqual('')
+  expect(await run(['underline', 'hover:line-through', 'custom'], input, options)).toEqual('')
 })
 
 test('utilities used in @apply must be prefixed', async () => {
-  let compiler = await compile(
-    css`
-      @config "./config.js";
-
-      .my-underline {
-        @apply tw:underline;
-      }
-    `,
-    {
-      loadModule: async (id, base) => ({
-        base,
-        module: { prefix: 'tw' },
-      }),
-    },
-  )
-
   // Prefixed utilities are generated
-  expect(compiler.build([])).toMatchInlineSnapshot(`
-    ".my-underline {
+  expect(
+    await compileCss(
+      css`
+        @config "./config.js";
+
+        .my-underline {
+          @apply tw:underline;
+        }
+      `,
+      {
+        loadModule: async (_id, base) => ({
+          path: '',
+          base,
+          module: { prefix: 'tw' },
+        }),
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .my-underline {
       text-decoration-line: underline;
     }
     "
   `)
 
   // Non-prefixed utilities cause an error
-  expect(() =>
+  await expect(
     compile(
       css`
+        @tailwind utilities;
         @config "./config.js";
 
         .my-underline {
@@ -1301,50 +1357,49 @@ test('utilities used in @apply must be prefixed', async () => {
         }
       `,
       {
-        loadModule: async (id, base) => ({
+        loadModule: async (_id, base) => ({
+          path: '',
           base,
           module: { prefix: 'tw' },
         }),
       },
     ),
   ).rejects.toThrowErrorMatchingInlineSnapshot(
-    `[Error: Cannot apply unknown utility class: underline]`,
+    `[Error: Cannot apply unprefixed utility class \`underline\`. Did you mean \`tw:underline\`?]`,
   )
 })
 
 test('Prefixes configured in CSS take precedence over those defined in JS configs', async () => {
-  let compiler = await compile(
-    css`
-      @theme prefix(wat) {
-        --color-red: #f00;
-        --color-green: #0f0;
-        --breakpoint-sm: 640px;
-      }
-
-      @config "./plugin.js";
-
-      @tailwind utilities;
-
-      @utility custom {
-        color: red;
-      }
-    `,
-    {
-      async loadModule(id, base) {
-        return {
-          base,
-          module: { prefix: 'tw' },
+  expect(
+    await run(
+      ['wat:custom'],
+      css`
+        @theme prefix(wat) {
+          --color-red: #f00;
+          --color-green: #0f0;
+          --breakpoint-sm: 640px;
         }
-      },
-    },
-  )
 
-  expect(compiler.build(['wat:custom'])).toMatchInlineSnapshot(`
-    ":root {
-      --wat-color-red: #f00;
-      --wat-color-green: #0f0;
-      --wat-breakpoint-sm: 640px;
-    }
+        @config "./plugin.js";
+
+        @tailwind utilities;
+
+        @utility custom {
+          color: red;
+        }
+      `,
+      {
+        async loadModule(_id, base) {
+          return {
+            path: '',
+            base,
+            module: { prefix: 'tw' },
+          }
+        },
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
     .wat\\:custom {
       color: red;
     }
@@ -1359,8 +1414,9 @@ test('a prefix must be letters only', async () => {
         @config "./plugin.js";
       `,
       {
-        async loadModule(id, base) {
+        async loadModule(_id, base) {
           return {
+            path: '',
             base,
             module: { prefix: '__' },
           }
@@ -1373,36 +1429,38 @@ test('a prefix must be letters only', async () => {
 })
 
 test('important: `#app`', async () => {
-  let input = css`
-    @tailwind utilities;
-    @config "./config.js";
+  expect(
+    await run(
+      ['underline', 'hover:line-through', 'custom'],
+      css`
+        @tailwind utilities;
+        @config "./config.js";
 
-    @utility custom {
+        @utility custom {
+          color: red;
+        }
+      `,
+      {
+        loadModule: async (_id, base) => ({
+          path: '',
+          base,
+          module: { important: '#app' },
+        }),
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    #app .custom {
       color: red;
     }
-  `
 
-  let compiler = await compile(input, {
-    loadModule: async (_, base) => ({
-      base,
-      module: { important: '#app' },
-    }),
-  })
+    #app .underline {
+      text-decoration-line: underline;
+    }
 
-  expect(compiler.build(['underline', 'hover:line-through', 'custom'])).toMatchInlineSnapshot(`
-    "#app {
-      .custom {
-        color: red;
-      }
-      .underline {
-        text-decoration-line: underline;
-      }
-      .hover\\:line-through {
-        &:hover {
-          @media (hover: hover) {
-            text-decoration-line: line-through;
-          }
-        }
+    @media (hover: hover) {
+      #app .hover\\:line-through:hover {
+        text-decoration-line: line-through;
       }
     }
     "
@@ -1410,34 +1468,38 @@ test('important: `#app`', async () => {
 })
 
 test('important: true', async () => {
-  let input = css`
-    @tailwind utilities;
-    @config "./config.js";
+  expect(
+    await run(
+      ['underline', 'hover:line-through', 'custom'],
+      css`
+        @tailwind utilities;
+        @config "./config.js";
 
-    @utility custom {
-      color: red;
-    }
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async (_, base) => ({
-      base,
-      module: { important: true },
-    }),
-  })
-
-  expect(compiler.build(['underline', 'hover:line-through', 'custom'])).toMatchInlineSnapshot(`
-    ".custom {
+        @utility custom {
+          color: red;
+        }
+      `,
+      {
+        loadModule: async (_id, base) => ({
+          path: '',
+          base,
+          module: { important: true },
+        }),
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .custom {
       color: red !important;
     }
+
     .underline {
       text-decoration-line: underline !important;
     }
-    .hover\\:line-through {
-      &:hover {
-        @media (hover: hover) {
-          text-decoration-line: line-through !important;
-        }
+
+    @media (hover: hover) {
+      .hover\\:line-through:hover {
+        text-decoration-line: line-through !important;
       }
     }
     "
@@ -1445,46 +1507,49 @@ test('important: true', async () => {
 })
 
 test('blocklisted candidates are not generated', async () => {
-  let compiler = await compile(
-    css`
-      @theme reference {
-        --color-white: #fff;
-        --breakpoint-md: 48rem;
+  let input = css`
+    @theme reference {
+      --color-white: #fff;
+      --breakpoint-md: 48rem;
+    }
+    @tailwind utilities;
+    @config "./config.js";
+  `
+
+  let options: Partial<Parameters<typeof compile>[1]> = {
+    async loadModule(_id, base) {
+      return {
+        path: '',
+        base,
+        module: {
+          blocklist: ['bg-white'],
+        },
       }
-      @tailwind utilities;
-      @config "./config.js";
-    `,
-    {
-      async loadModule(id, base) {
-        return {
-          base,
-          module: {
-            blocklist: ['bg-white'],
-          },
-        }
-      },
     },
-  )
+  }
 
   // bg-white will not get generated
-  expect(compiler.build(['bg-white'])).toEqual('')
+  expect(await run(['bg-white'], input, options)).toEqual('')
 
   // underline will as will md:bg-white
-  expect(compiler.build(['underline', 'bg-white', 'md:bg-white'])).toMatchInlineSnapshot(`
-    ".underline {
-      text-decoration-line: underline;
-    }
-    .md\\:bg-white {
-      @media (width >= 48rem) {
-        background-color: var(--color-white);
+  expect(await run(['underline', 'bg-white', 'md:bg-white'], input, options))
+    .toMatchInlineSnapshot(`
+      "
+      .underline {
+        text-decoration-line: underline;
       }
-    }
-    "
-  `)
+
+      @media (min-width: 48rem) {
+        .md\\:bg-white {
+          background-color: var(--color-white, #fff);
+        }
+      }
+      "
+    `)
 })
 
 test('blocklisted candidates cannot be used with `@apply`', async () => {
-  await expect(() =>
+  await expect(
     compile(
       css`
         @theme reference {
@@ -1498,8 +1563,9 @@ test('blocklisted candidates cannot be used with `@apply`', async () => {
         }
       `,
       {
-        async loadModule(id, base) {
+        async loadModule(_id, base) {
           return {
+            path: '',
             base,
             module: {
               blocklist: ['bg-white'],
@@ -1509,12 +1575,12 @@ test('blocklisted candidates cannot be used with `@apply`', async () => {
       },
     ),
   ).rejects.toThrowErrorMatchingInlineSnapshot(
-    `[Error: Cannot apply unknown utility class: bg-white]`,
+    `[Error: Cannot apply utility class \`bg-white\` because it has been explicitly disabled: https://tailwindcss.com/docs/detecting-classes-in-source-files#explicitly-excluding-classes]`,
   )
 })
 
 test('old theme values are merged with their renamed counterparts in the CSS theme', async () => {
-  let didCallPluginFn = vi.fn()
+  using didCallPluginFn = vi.fn()
 
   await compile(
     css`
@@ -1550,8 +1616,9 @@ test('old theme values are merged with their renamed counterparts in the CSS the
       @plugin "./plugin.js";
     `,
     {
-      async loadModule(id, base) {
+      async loadModule(_id, base) {
         return {
+          path: '',
           base,
           module: plugin(function ({ theme }) {
             didCallPluginFn()
@@ -1635,3 +1702,148 @@ test('old theme values are merged with their renamed counterparts in the CSS the
 
   expect(didCallPluginFn).toHaveBeenCalled()
 })
+
+test('handles setting theme keys to null', async () => {
+  expect(
+    await run(
+      ['bg-red-50', 'bg-red-100', 'bg-red-200'],
+      css`
+        @theme default {
+          --color-red-50: oklch(0.971 0.013 17.38);
+          --color-red-100: oklch(0.936 0.032 17.717);
+        }
+        @config "./my-config.js";
+        @tailwind utilities;
+        @theme {
+          --color-red-100: oklch(0.936 0.032 17.717);
+          --color-red-200: oklch(0.885 0.062 18.334);
+        }
+      `,
+      {
+        loadModule: async () => {
+          return {
+            module: {
+              theme: {
+                extend: {
+                  colors: {
+                    red: null,
+                  },
+                },
+              },
+            },
+            base: '/root',
+            path: '',
+          }
+        },
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --color-red-50: oklch(97.1% .013 17.38);
+      --color-red-100: oklch(93.6% .032 17.717);
+      --color-red-200: oklch(88.5% .062 18.334);
+    }
+
+    .bg-red-50 {
+      background-color: var(--color-red-50);
+    }
+
+    .bg-red-100 {
+      background-color: var(--color-red-100);
+    }
+
+    .bg-red-200 {
+      background-color: var(--color-red-200);
+    }
+    "
+  `)
+})
+
+test('The theme() function does not try indexing into strings', async () => {
+  expect(
+    await compileCss(css`
+      @theme default {
+        --color-what-50: #f00;
+        --color-what-950: #f00;
+      }
+
+      @theme {
+        /*
+       * The value of this theme variable is > 50 chars because colors.what.50 was previously
+       * indexing the string: "light-dark(theme(colors.what.950), theme(colors.what.50))"
+       * because the resolved config contained an object with a "what" key that was that string
+       */
+        --color-what: light-dark(theme(colors.what.950), theme(colors.what.50));
+      }
+
+      @source inline("text-what");
+
+      @tailwind utilities;
+    `),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --color-what: red;
+    }
+
+    .text-what {
+      color: var(--color-what);
+    }
+    "
+  `)
+})
+
+test('camel case keys are preserved', async () => {
+  expect(
+    await run(
+      [
+        // From CSS
+        'bg-blue-green', // should be output
+        'bg-blueGreen', // should not
+
+        // From JS config
+        'bg-light-green', // should not be output
+        'bg-lightGreen', // should be
+      ],
+      css`
+        @tailwind utilities;
+        @theme {
+          --color-blue-green: slate;
+        }
+        @config "./plugin.js";
+      `,
+      {
+        loadModule: async () => {
+          return {
+            base: '/',
+            path: '',
+            module: {
+              theme: {
+                extend: {
+                  backgroundColor: {
+                    lightGreen: '#c0ffee',
+                  },
+                },
+              },
+            },
+          }
+        },
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .bg-blue-green {
+      background-color: var(--color-blue-green);
+    }
+
+    .bg-lightGreen {
+      background-color: #c0ffee;
+    }
+
+    :root, :host {
+      --color-blue-green: slate;
+    }
+    "
+  `)
+})
diff --git a/packages/tailwindcss/src/compat/config/create-compat-config.test.ts b/packages/tailwindcss/src/compat/config/create-compat-config.test.ts
new file mode 100644
index 000000000..aa1b21cb7
--- /dev/null
+++ b/packages/tailwindcss/src/compat/config/create-compat-config.test.ts
@@ -0,0 +1,189 @@
+import { describe, expect, test } from 'vitest'
+import { buildDesignSystem } from '../../design-system'
+import { Theme } from '../../theme'
+import { createCompatConfig } from './create-compat-config'
+import { resolveConfig } from './resolve-config'
+
+function buildCompatConfig(cssValues: Record<string, string>) {
+  let theme = new Theme()
+  for (let [key, value] of Object.entries(cssValues)) {
+    theme.add(key, value)
+  }
+  let design = buildDesignSystem(theme)
+
+  let { resolvedConfig } = resolveConfig(design, [
+    { config: createCompatConfig(design.theme), base: '/root', reference: true, src: undefined },
+  ])
+
+  return resolvedConfig
+}
+
+describe('theme namespace lookups', () => {
+  test('a namespace that only defines a bare value resolves to `{ DEFAULT: … }`, not a string', () => {
+    // When the CSS theme only defines `--text` (a single bare value),
+    // `theme('text', {})` used to return the string `'1rem'`.
+    //
+    // Spreading that string, like the compat config does, produced char-indexed
+    // garbage (`{ '0': '1', '1': 'r', … }`) instead of `{ DEFAULT: '1rem' }`.
+    let config = buildCompatConfig({ '--text': '1rem' })
+
+    expect(config.theme?.fontSize?.DEFAULT).toBe('1rem')
+    expect(config.theme?.fontSize).not.toHaveProperty('0')
+  })
+
+  test('a bare value is kept alongside suffixed values in the same namespace', () => {
+    let config = buildCompatConfig({
+      '--text': '1rem',
+      '--text-sm': '0.875rem',
+    })
+
+    expect(config.theme?.fontSize?.DEFAULT).toBe('1rem')
+    expect(config.theme?.fontSize?.sm).toBe('0.875rem')
+  })
+
+  test('a naive spread of a theme namespace in a user config is safe', () => {
+    let theme = new Theme()
+    theme.add('--text', '1rem')
+    let design = buildDesignSystem(theme)
+
+    let { resolvedConfig } = resolveConfig(design, [
+      {
+        config: {
+          theme: {
+            extend: {
+              fontSize: ({ theme }: any) => ({ ...theme('text', {}) }),
+            },
+          },
+        },
+        base: '/root',
+        reference: true,
+        src: undefined,
+      },
+    ])
+
+    expect(resolvedConfig.theme?.fontSize?.DEFAULT).toBe('1rem')
+    expect(resolvedConfig.theme?.fontSize).not.toHaveProperty('0')
+  })
+
+  test('namespace root lookups resolve to an object, key lookups resolve to the value', () => {
+    let theme = new Theme()
+    theme.add('--text', '1rem')
+    theme.add('--animate-spin', 'spin 1s linear infinite')
+    let design = buildDesignSystem(theme)
+
+    let root: unknown
+    let rootWithDefault: unknown
+    let leaf: unknown
+
+    resolveConfig(design, [
+      {
+        config: {
+          theme: {
+            extend: {
+              fontSize: ({ theme }: any) => {
+                root = theme('text')
+                rootWithDefault = theme('text', {})
+                leaf = theme('animate.spin')
+                return {}
+              },
+            },
+          },
+        },
+        base: '/root',
+        reference: true,
+        src: undefined,
+      },
+    ])
+
+    // A namespace root lookup always resolves to an object, like in v3, even
+    // when the namespace only contains a bare value
+    expect(root).toMatchObject({ DEFAULT: '1rem' })
+    expect(rootWithDefault).toMatchObject({ DEFAULT: '1rem' })
+
+    // Lookups of a specific key resolve to the value itself
+    expect(leaf).toBe('spin 1s linear infinite')
+  })
+
+  test('lookups of a specific key still resolve to the value itself', () => {
+    let theme = new Theme()
+    theme.add('--animate-spin', 'spin 1s linear infinite')
+    let design = buildDesignSystem(theme)
+
+    let { resolvedConfig } = resolveConfig(design, [
+      {
+        config: {
+          theme: {
+            extend: {
+              animation: ({ theme }: any) => ({ spin: theme('animate.spin') }),
+            },
+          },
+        },
+        base: '/root',
+        reference: true,
+        src: undefined,
+      },
+    ])
+
+    expect(resolvedConfig.theme?.animation?.spin).toBe('spin 1s linear infinite')
+  })
+})
+
+describe('createCompatConfig namespace mappings', () => {
+  test('fontSize maps from CSS text namespace', () => {
+    let config = buildCompatConfig({ '--text-base': '1rem' })
+    expect(config.theme?.fontSize?.base).toBe('1rem')
+  })
+
+  test('boxShadow maps from CSS shadow namespace', () => {
+    let config = buildCompatConfig({ '--shadow-md': '0 4px 6px #000' })
+    expect(config.theme?.boxShadow?.md).toBe('0 4px 6px #000')
+  })
+
+  test('animation maps from CSS animate namespace', () => {
+    let config = buildCompatConfig({ '--animate-spin': 'spin 1s linear infinite' })
+    expect(config.theme?.animation?.spin).toBe('spin 1s linear infinite')
+  })
+
+  test('aspectRatio maps from CSS aspect namespace', () => {
+    let config = buildCompatConfig({ '--aspect-square': '1 / 1' })
+    expect(config.theme?.aspectRatio?.square).toBe('1 / 1')
+  })
+
+  test('borderRadius maps from CSS radius namespace', () => {
+    let config = buildCompatConfig({ '--radius-lg': '0.5rem' })
+    expect(config.theme?.borderRadius?.lg).toBe('0.5rem')
+  })
+
+  test('screens maps from CSS breakpoint namespace', () => {
+    let config = buildCompatConfig({ '--breakpoint-sm': '640px' })
+    expect(config.theme?.screens?.sm).toBe('640px')
+  })
+
+  test('letterSpacing maps from CSS tracking namespace', () => {
+    let config = buildCompatConfig({ '--tracking-wide': '0.025em' })
+    expect(config.theme?.letterSpacing?.wide).toBe('0.025em')
+  })
+
+  test('lineHeight maps from CSS leading namespace', () => {
+    let config = buildCompatConfig({ '--leading-relaxed': '1.75' })
+    expect(config.theme?.lineHeight?.relaxed).toBe('1.75')
+  })
+
+  test('maxWidth maps from the container namespace in the default theme', () => {
+    let config = buildCompatConfig({})
+    // The default theme has container.sm = '24rem'
+    expect(config.theme?.maxWidth?.sm).toBe('24rem')
+  })
+
+  test('transitionDuration gets DEFAULT from --default-transition-duration', () => {
+    let config = buildCompatConfig({ '--default-transition-duration': '150ms' })
+    expect(config.theme?.transitionDuration?.DEFAULT).toBe('150ms')
+  })
+
+  test('transitionTimingFunction gets DEFAULT from --default-transition-timing-function', () => {
+    let config = buildCompatConfig({
+      '--default-transition-timing-function': 'cubic-bezier(0.4, 0, 0.2, 1)',
+    })
+    expect(config.theme?.transitionTimingFunction?.DEFAULT).toBe('cubic-bezier(0.4, 0, 0.2, 1)')
+  })
+})
diff --git a/packages/tailwindcss/src/compat/config/deep-merge.ts b/packages/tailwindcss/src/compat/config/deep-merge.ts
index 3bbae51dd..2bf15c9b3 100644
--- a/packages/tailwindcss/src/compat/config/deep-merge.ts
+++ b/packages/tailwindcss/src/compat/config/deep-merge.ts
@@ -11,7 +11,7 @@ export function deepMerge<T extends object>(
   target: T,
   sources: (Partial<T> | null | undefined)[],
   customizer: (a: any, b: any, keypath: (keyof T)[]) => any,
-  parentPath: (keyof T)[] = [],
+  path: (keyof T)[] = [],
 ) {
   type Key = keyof T
   type Value = T[Key]
@@ -22,21 +22,17 @@ export function deepMerge<T extends object>(
     }
 
     for (let k of Reflect.ownKeys(source) as Key[]) {
-      let currentParentPath = [...parentPath, k]
-      let merged = customizer(target[k], source[k], currentParentPath)
+      path.push(k)
+      let merged = customizer(target[k], source[k], path)
 
       if (merged !== undefined) {
         target[k] = merged
       } else if (!isPlainObject(target[k]) || !isPlainObject(source[k])) {
         target[k] = source[k] as Value
       } else {
-        target[k] = deepMerge(
-          {},
-          [target[k], source[k]],
-          customizer,
-          currentParentPath as any,
-        ) as Value
+        target[k] = deepMerge({}, [target[k], source[k]], customizer, path as any) as Value
       }
+      path.pop()
     }
   }
 
diff --git a/packages/tailwindcss/src/compat/config/resolve-config.test.ts b/packages/tailwindcss/src/compat/config/resolve-config.test.ts
index 0a1daeee6..d8cc21a10 100644
--- a/packages/tailwindcss/src/compat/config/resolve-config.test.ts
+++ b/packages/tailwindcss/src/compat/config/resolve-config.test.ts
@@ -20,6 +20,8 @@ test('top level theme keys are replaced', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
     {
       config: {
@@ -30,6 +32,8 @@ test('top level theme keys are replaced', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
     {
       config: {
@@ -40,6 +44,8 @@ test('top level theme keys are replaced', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
 
@@ -73,6 +79,8 @@ test('theme can be extended', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
     {
       config: {
@@ -85,6 +93,8 @@ test('theme can be extended', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
 
@@ -120,6 +130,8 @@ test('theme keys can reference other theme keys using the theme function regardl
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
     {
       config: {
@@ -133,6 +145,8 @@ test('theme keys can reference other theme keys using the theme function regardl
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
     {
       config: {
@@ -145,6 +159,8 @@ test('theme keys can reference other theme keys using the theme function regardl
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
 
@@ -212,6 +228,8 @@ test('theme keys can read from the CSS theme', () => {
         },
       },
       base: '/root',
+      reference: false,
+      src: undefined,
     },
   ])
 
@@ -231,17 +249,17 @@ test('theme keys can read from the CSS theme', () => {
       },
       caretColor: {
         primary: {
-          '50': 'oklch(0.982 0.018 155.826)',
-          '100': 'oklch(0.962 0.044 156.743)',
-          '200': 'oklch(0.925 0.084 155.995)',
-          '300': 'oklch(0.871 0.15 154.449)',
-          '400': 'oklch(0.792 0.209 151.711)',
-          '500': 'oklch(0.723 0.219 149.579)',
-          '600': 'oklch(0.627 0.194 149.214)',
-          '700': 'oklch(0.527 0.154 150.069)',
-          '800': 'oklch(0.448 0.119 151.328)',
-          '900': 'oklch(0.393 0.095 152.535)',
-          '950': 'oklch(0.266 0.065 152.934)',
+          '100': 'oklch(96.2% 0.044 156.743)',
+          '200': 'oklch(92.5% 0.084 155.995)',
+          '300': 'oklch(87.1% 0.15 154.449)',
+          '400': 'oklch(79.2% 0.209 151.711)',
+          '50': 'oklch(98.2% 0.018 155.826)',
+          '500': 'oklch(72.3% 0.219 149.579)',
+          '600': 'oklch(62.7% 0.194 149.214)',
+          '700': 'oklch(52.7% 0.154 150.069)',
+          '800': 'oklch(44.8% 0.119 151.328)',
+          '900': 'oklch(39.3% 0.095 152.535)',
+          '950': 'oklch(26.6% 0.065 152.934)',
         },
       },
       transitionColor: {
@@ -254,3 +272,50 @@ test('theme keys can read from the CSS theme', () => {
     new Set(['colors', 'accentColor', 'placeholderColor', 'caretColor', 'transitionColor']),
   )
 })
+
+test('handles null as theme values', () => {
+  let theme = new Theme()
+  theme.add('--color-red-50', 'red')
+  theme.add('--color-red-100', 'red')
+
+  let design = buildDesignSystem(theme)
+
+  let { resolvedConfig, replacedThemeKeys } = resolveConfig(design, [
+    {
+      config: {
+        theme: {
+          colors: ({ theme }) => ({
+            // Reads from the --color-* namespace
+            ...theme('color'),
+          }),
+        },
+      },
+      base: '/root',
+      reference: false,
+      src: undefined,
+    },
+    {
+      config: {
+        theme: {
+          extend: {
+            colors: {
+              red: null,
+            },
+          },
+        },
+      },
+      base: '/root',
+      reference: false,
+      src: undefined,
+    },
+  ])
+
+  expect(resolvedConfig).toMatchObject({
+    theme: {
+      colors: {
+        red: null,
+      },
+    },
+  })
+  expect(replacedThemeKeys).toEqual(new Set(['colors']))
+})
diff --git a/packages/tailwindcss/src/compat/config/resolve-config.ts b/packages/tailwindcss/src/compat/config/resolve-config.ts
index 6801c7b60..858f4bbbe 100644
--- a/packages/tailwindcss/src/compat/config/resolve-config.ts
+++ b/packages/tailwindcss/src/compat/config/resolve-config.ts
@@ -1,4 +1,5 @@
 import type { DesignSystem } from '../../design-system'
+import type { SourceLocation } from '../../source-maps/source'
 import colors from '../colors'
 import type { PluginWithConfig } from '../plugin-api'
 import { createThemeFn } from '../plugin-functions'
@@ -16,6 +17,7 @@ export interface ConfigFile {
   base: string
   config: UserConfig
   reference: boolean
+  src: SourceLocation | undefined
 }
 
 interface ResolutionContext {
@@ -31,6 +33,7 @@ interface ResolutionContext {
 let minimal: ResolvedConfig = {
   blocklist: [],
   future: {},
+  experimental: {},
   prefix: '',
   important: false,
   darkMode: null,
@@ -131,7 +134,7 @@ export type PluginUtils = {
 
 function extractConfigs(
   ctx: ResolutionContext,
-  { config, base, path, reference }: ConfigFile,
+  { config, base, path, reference, src }: ConfigFile,
 ): void {
   let plugins: PluginWithConfig[] = []
 
@@ -140,17 +143,17 @@ function extractConfigs(
     if ('__isOptionsFunction' in plugin) {
       // Happens with `plugin.withOptions()` when no options were passed:
       // e.g. `require("my-plugin")` instead of `require("my-plugin")(options)`
-      plugins.push({ ...plugin(), reference })
+      plugins.push({ ...plugin(), reference, src })
     } else if ('handler' in plugin) {
       // Happens with `plugin(…)`:
       // e.g. `require("my-plugin")`
       //
       // or with `plugin.withOptions()` when the user passed options:
       // e.g. `require("my-plugin")(options)`
-      plugins.push({ ...plugin, reference })
+      plugins.push({ ...plugin, reference, src })
     } else {
       // Just a plain function without using the plugin(…) API
-      plugins.push({ handler: plugin, reference })
+      plugins.push({ handler: plugin, reference, src })
     }
   }
 
@@ -162,7 +165,7 @@ function extractConfigs(
   }
 
   for (let preset of config.presets ?? []) {
-    extractConfigs(ctx, { path, base, config: preset, reference })
+    extractConfigs(ctx, { path, base, config: preset, reference, src })
   }
 
   // Apply configs from plugins
@@ -170,7 +173,13 @@ function extractConfigs(
     ctx.plugins.push(plugin)
 
     if (plugin.config) {
-      extractConfigs(ctx, { path, base, config: plugin.config, reference: !!plugin.reference })
+      extractConfigs(ctx, {
+        path,
+        base,
+        config: plugin.config,
+        reference: !!plugin.reference,
+        src: plugin.src ?? src,
+      })
     }
   }
 
diff --git a/packages/tailwindcss/src/compat/config/types.ts b/packages/tailwindcss/src/compat/config/types.ts
index dbcb30de3..76851a397 100644
--- a/packages/tailwindcss/src/compat/config/types.ts
+++ b/packages/tailwindcss/src/compat/config/types.ts
@@ -52,7 +52,7 @@ type DarkModeStrategy =
   // Use the `class` strategy with a custom class instead of `.dark`.
   | ['class', string]
 
-  // Use the `selector` strategy — same as `class` but uses `:where()` for more predicable behavior
+  // Use the `selector` strategy — same as `class` but uses `:where()` for more predictable behavior
   | 'selector'
 
   // Use the `selector` strategy with a custom selector instead of `.dark`.
@@ -105,3 +105,12 @@ export interface UserConfig {
 export interface ResolvedConfig {
   future: Record<string, boolean>
 }
+
+// `experimental` key support
+export interface UserConfig {
+  experimental?: 'all' | Record<string, boolean>
+}
+
+export interface ResolvedConfig {
+  experimental: Record<string, boolean>
+}
diff --git a/packages/tailwindcss/src/compat/container-config.test.ts b/packages/tailwindcss/src/compat/container-config.test.ts
index 965e79a21..39a12557c 100644
--- a/packages/tailwindcss/src/compat/container-config.test.ts
+++ b/packages/tailwindcss/src/compat/container-config.test.ts
@@ -1,61 +1,74 @@
 import { expect, test } from 'vitest'
-import { compile } from '..'
+import { run } from '../test-utils/run'
 
 const css = String.raw
 
 test('creates a custom utility to extend the built-in container', async () => {
-  let input = css`
-    @theme default {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
-    @config "./config.js";
-    @tailwind utilities;
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          container: {
-            center: true,
-            padding: '2rem',
+  expect(
+    await run(
+      ['container'],
+      css`
+        @theme default {
+          --breakpoint-sm: 40rem;
+          --breakpoint-md: 48rem;
+          --breakpoint-lg: 64rem;
+          --breakpoint-xl: 80rem;
+          --breakpoint-2xl: 96rem;
+        }
+        @config "./config.js";
+        @tailwind utilities;
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              container: {
+                center: true,
+                padding: '2rem',
+              },
+            },
           },
-        },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build(['container'])).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
+    ),
+  ).toMatchInlineSnapshot(`
+    "
     .container {
       width: 100%;
-      @media (width >= 40rem) {
+    }
+
+    @media (min-width: 40rem) {
+      .container {
         max-width: 40rem;
       }
-      @media (width >= 48rem) {
+    }
+
+    @media (min-width: 48rem) {
+      .container {
         max-width: 48rem;
       }
-      @media (width >= 64rem) {
+    }
+
+    @media (min-width: 64rem) {
+      .container {
         max-width: 64rem;
       }
-      @media (width >= 80rem) {
+    }
+
+    @media (min-width: 80rem) {
+      .container {
         max-width: 80rem;
       }
-      @media (width >= 96rem) {
+    }
+
+    @media (min-width: 96rem) {
+      .container {
         max-width: 96rem;
       }
     }
+
     .container {
       margin-inline: auto;
       padding-inline: 2rem;
@@ -65,68 +78,87 @@ test('creates a custom utility to extend the built-in container', async () => {
 })
 
 test('allows padding to be defined at custom breakpoints', async () => {
-  let input = css`
-    @theme default {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
-    @config "./config.js";
-    @tailwind utilities;
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          container: {
-            padding: {
-              // The order here is messed up on purpose
-              '2xl': '3rem',
-              DEFAULT: '1rem',
-              lg: '2rem',
+  expect(
+    await run(
+      ['container'],
+      css`
+        @theme default {
+          --breakpoint-sm: 40rem;
+          --breakpoint-md: 48rem;
+          --breakpoint-lg: 64rem;
+          --breakpoint-xl: 80rem;
+          --breakpoint-2xl: 96rem;
+        }
+        @config "./config.js";
+        @tailwind utilities;
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              container: {
+                padding: {
+                  // The order here is messed up on purpose
+                  '2xl': '3rem',
+                  DEFAULT: '1rem',
+                  lg: '2rem',
+                },
+              },
             },
           },
-        },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build(['container'])).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
+    ),
+  ).toMatchInlineSnapshot(`
+    "
     .container {
       width: 100%;
-      @media (width >= 40rem) {
+    }
+
+    @media (min-width: 40rem) {
+      .container {
         max-width: 40rem;
       }
-      @media (width >= 48rem) {
+    }
+
+    @media (min-width: 48rem) {
+      .container {
         max-width: 48rem;
       }
-      @media (width >= 64rem) {
+    }
+
+    @media (min-width: 64rem) {
+      .container {
         max-width: 64rem;
       }
-      @media (width >= 80rem) {
+    }
+
+    @media (min-width: 80rem) {
+      .container {
         max-width: 80rem;
       }
-      @media (width >= 96rem) {
+    }
+
+    @media (min-width: 96rem) {
+      .container {
         max-width: 96rem;
       }
     }
+
     .container {
       padding-inline: 1rem;
-      @media (width >= 64rem) {
+    }
+
+    @media (min-width: 64rem) {
+      .container {
         padding-inline: 2rem;
       }
-      @media (width >= 96rem) {
+    }
+
+    @media (min-width: 96rem) {
+      .container {
         padding-inline: 3rem;
       }
     }
@@ -135,68 +167,87 @@ test('allows padding to be defined at custom breakpoints', async () => {
 })
 
 test('allows breakpoints to be overwritten', async () => {
-  let input = css`
-    @theme default {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
-    @config "./config.js";
-    @tailwind utilities;
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          container: {
-            screens: {
-              xl: '1280px',
-              '2xl': '1536px',
+  expect(
+    await run(
+      ['container'],
+      css`
+        @theme default {
+          --breakpoint-sm: 40rem;
+          --breakpoint-md: 48rem;
+          --breakpoint-lg: 64rem;
+          --breakpoint-xl: 80rem;
+          --breakpoint-2xl: 96rem;
+        }
+        @config "./config.js";
+        @tailwind utilities;
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              container: {
+                screens: {
+                  xl: '1280px',
+                  '2xl': '1536px',
+                },
+              },
             },
           },
-        },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build(['container'])).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
+    ),
+  ).toMatchInlineSnapshot(`
+    "
     .container {
       width: 100%;
-      @media (width >= 40rem) {
+    }
+
+    @media (min-width: 40rem) {
+      .container {
         max-width: 40rem;
       }
-      @media (width >= 48rem) {
+    }
+
+    @media (min-width: 48rem) {
+      .container {
         max-width: 48rem;
       }
-      @media (width >= 64rem) {
+    }
+
+    @media (min-width: 64rem) {
+      .container {
         max-width: 64rem;
       }
-      @media (width >= 80rem) {
+    }
+
+    @media (min-width: 80rem) {
+      .container {
         max-width: 80rem;
       }
-      @media (width >= 96rem) {
+    }
+
+    @media (min-width: 96rem) {
+      .container {
         max-width: 96rem;
       }
     }
-    .container {
-      @media (width >= 40rem) {
+
+    @media (min-width: 40rem) {
+      .container {
         max-width: none;
       }
-      @media (width >= 1280px) {
+    }
+
+    @media (min-width: 1280px) {
+      .container {
         max-width: 1280px;
       }
-      @media (width >= 1536px) {
+    }
+
+    @media (min-width: 1536px) {
+      .container {
         max-width: 1536px;
       }
     }
@@ -205,68 +256,84 @@ test('allows breakpoints to be overwritten', async () => {
 })
 
 test('padding applies to custom `container` screens', async () => {
-  let input = css`
-    @theme default {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
-    @config "./config.js";
-    @tailwind utilities;
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          container: {
-            padding: {
-              sm: '2rem',
-              md: '3rem',
-            },
-            screens: {
-              md: '48rem',
+  expect(
+    await run(
+      ['container'],
+      css`
+        @theme default {
+          --breakpoint-sm: 40rem;
+          --breakpoint-md: 48rem;
+          --breakpoint-lg: 64rem;
+          --breakpoint-xl: 80rem;
+          --breakpoint-2xl: 96rem;
+        }
+        @config "./config.js";
+        @tailwind utilities;
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              container: {
+                padding: {
+                  sm: '2rem',
+                  md: '3rem',
+                },
+                screens: {
+                  md: '48rem',
+                },
+              },
             },
           },
-        },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build(['container'])).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
+    ),
+  ).toMatchInlineSnapshot(`
+    "
     .container {
       width: 100%;
-      @media (width >= 40rem) {
+    }
+
+    @media (min-width: 40rem) {
+      .container {
         max-width: 40rem;
       }
-      @media (width >= 48rem) {
+    }
+
+    @media (min-width: 48rem) {
+      .container {
         max-width: 48rem;
       }
-      @media (width >= 64rem) {
+    }
+
+    @media (min-width: 64rem) {
+      .container {
         max-width: 64rem;
       }
-      @media (width >= 80rem) {
+    }
+
+    @media (min-width: 80rem) {
+      .container {
         max-width: 80rem;
       }
-      @media (width >= 96rem) {
+    }
+
+    @media (min-width: 96rem) {
+      .container {
         max-width: 96rem;
       }
     }
-    .container {
-      @media (width >= 40rem) {
+
+    @media (min-width: 40rem) {
+      .container {
         max-width: none;
       }
-      @media (width >= 48rem) {
+    }
+
+    @media (min-width: 48rem) {
+      .container {
         max-width: 48rem;
         padding-inline: 3rem;
       }
@@ -276,65 +343,81 @@ test('padding applies to custom `container` screens', async () => {
 })
 
 test("an empty `screen` config will undo all custom media screens and won't apply any breakpoint-specific padding", async () => {
-  let input = css`
-    @theme default {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
-    @config "./config.js";
-    @tailwind utilities;
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          container: {
-            padding: {
-              DEFAULT: '1rem',
-              sm: '2rem',
-              md: '3rem',
+  expect(
+    await run(
+      ['container'],
+      css`
+        @theme default {
+          --breakpoint-sm: 40rem;
+          --breakpoint-md: 48rem;
+          --breakpoint-lg: 64rem;
+          --breakpoint-xl: 80rem;
+          --breakpoint-2xl: 96rem;
+        }
+        @config "./config.js";
+        @tailwind utilities;
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              container: {
+                padding: {
+                  DEFAULT: '1rem',
+                  sm: '2rem',
+                  md: '3rem',
+                },
+                screens: {},
+              },
             },
-            screens: {},
           },
-        },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build(['container'])).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
+    ),
+  ).toMatchInlineSnapshot(`
+    "
     .container {
       width: 100%;
-      @media (width >= 40rem) {
+    }
+
+    @media (min-width: 40rem) {
+      .container {
         max-width: 40rem;
       }
-      @media (width >= 48rem) {
+    }
+
+    @media (min-width: 48rem) {
+      .container {
         max-width: 48rem;
       }
-      @media (width >= 64rem) {
+    }
+
+    @media (min-width: 64rem) {
+      .container {
         max-width: 64rem;
       }
-      @media (width >= 80rem) {
+    }
+
+    @media (min-width: 80rem) {
+      .container {
         max-width: 80rem;
       }
-      @media (width >= 96rem) {
+    }
+
+    @media (min-width: 96rem) {
+      .container {
         max-width: 96rem;
       }
     }
+
     .container {
       padding-inline: 1rem;
-      @media (width >= 40rem) {
+    }
+
+    @media (min-width: 40rem) {
+      .container {
         max-width: none;
       }
     }
@@ -343,58 +426,50 @@ test("an empty `screen` config will undo all custom media screens and won't appl
 })
 
 test('legacy container component does not interfere with new --container variables', async () => {
-  let input = css`
-    @theme default {
-      --container-3xs: 16rem;
-      --container-2xs: 18rem;
-      --container-xs: 20rem;
-      --container-sm: 24rem;
-      --container-md: 28rem;
-      --container-lg: 32rem;
-      --container-xl: 36rem;
-      --container-2xl: 42rem;
-      --container-3xl: 48rem;
-      --container-4xl: 56rem;
-      --container-5xl: 64rem;
-      --container-6xl: 72rem;
-      --container-7xl: 80rem;
-      --container-prose: 65ch;
-    }
-    @config "./config.js";
-    @tailwind utilities;
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          container: {
-            center: true,
-            padding: '2rem',
+  expect(
+    await run(
+      ['max-w-sm'],
+      css`
+        @theme default {
+          --container-3xs: 16rem;
+          --container-2xs: 18rem;
+          --container-xs: 20rem;
+          --container-sm: 24rem;
+          --container-md: 28rem;
+          --container-lg: 32rem;
+          --container-xl: 36rem;
+          --container-2xl: 42rem;
+          --container-3xl: 48rem;
+          --container-4xl: 56rem;
+          --container-5xl: 64rem;
+          --container-6xl: 72rem;
+          --container-7xl: 80rem;
+          --container-prose: 65ch;
+        }
+        @config "./config.js";
+        @tailwind utilities;
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              container: {
+                center: true,
+                padding: '2rem',
+              },
+            },
           },
-        },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build(['max-w-sm'])).toMatchInlineSnapshot(`
-    ":root {
-      --container-3xs: 16rem;
-      --container-2xs: 18rem;
-      --container-xs: 20rem;
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
       --container-sm: 24rem;
-      --container-md: 28rem;
-      --container-lg: 32rem;
-      --container-xl: 36rem;
-      --container-2xl: 42rem;
-      --container-3xl: 48rem;
-      --container-4xl: 56rem;
-      --container-5xl: 64rem;
-      --container-6xl: 72rem;
-      --container-7xl: 80rem;
-      --container-prose: 65ch;
     }
+
     .max-w-sm {
       max-width: var(--container-sm);
     }
@@ -403,114 +478,168 @@ test('legacy container component does not interfere with new --container variabl
 })
 
 test('combines custom padding and screen overwrites', async () => {
-  let input = css`
-    @theme default {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
-    @config "./config.js";
-    @tailwind utilities;
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          container: {
-            center: true,
-            padding: {
-              DEFAULT: '2rem',
-              '2xl': '4rem',
-            },
-            screens: {
-              md: '48rem', // Matches a default --breakpoint
-              xl: '1280px',
-              '2xl': '1536px',
+  expect(
+    await run(
+      ['container', '!container'],
+      css`
+        @theme default {
+          --breakpoint-sm: 40rem;
+          --breakpoint-md: 48rem;
+          --breakpoint-lg: 64rem;
+          --breakpoint-xl: 80rem;
+          --breakpoint-2xl: 96rem;
+        }
+        @config "./config.js";
+        @tailwind utilities;
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              container: {
+                center: true,
+                padding: {
+                  DEFAULT: '2rem',
+                  '2xl': '4rem',
+                },
+                screens: {
+                  md: '48rem', // Matches a default --breakpoint
+                  xl: '1280px',
+                  '2xl': '1536px',
+                },
+              },
             },
           },
-        },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build(['container', '!container'])).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
+    ),
+  ).toMatchInlineSnapshot(`
+    "
     .\\!container {
       width: 100% !important;
-      @media (width >= 40rem) {
+    }
+
+    @media (min-width: 40rem) {
+      .\\!container {
         max-width: 40rem !important;
       }
-      @media (width >= 48rem) {
+    }
+
+    @media (min-width: 48rem) {
+      .\\!container {
         max-width: 48rem !important;
       }
-      @media (width >= 64rem) {
+    }
+
+    @media (min-width: 64rem) {
+      .\\!container {
         max-width: 64rem !important;
       }
-      @media (width >= 80rem) {
+    }
+
+    @media (min-width: 80rem) {
+      .\\!container {
         max-width: 80rem !important;
       }
-      @media (width >= 96rem) {
+    }
+
+    @media (min-width: 96rem) {
+      .\\!container {
         max-width: 96rem !important;
       }
     }
+
     .container {
       width: 100%;
-      @media (width >= 40rem) {
+    }
+
+    @media (min-width: 40rem) {
+      .container {
         max-width: 40rem;
       }
-      @media (width >= 48rem) {
+    }
+
+    @media (min-width: 48rem) {
+      .container {
         max-width: 48rem;
       }
-      @media (width >= 64rem) {
+    }
+
+    @media (min-width: 64rem) {
+      .container {
         max-width: 64rem;
       }
-      @media (width >= 80rem) {
+    }
+
+    @media (min-width: 80rem) {
+      .container {
         max-width: 80rem;
       }
-      @media (width >= 96rem) {
+    }
+
+    @media (min-width: 96rem) {
+      .container {
         max-width: 96rem;
       }
     }
+
     .\\!container {
       margin-inline: auto !important;
       padding-inline: 2rem !important;
-      @media (width >= 40rem) {
+    }
+
+    @media (min-width: 40rem) {
+      .\\!container {
         max-width: none !important;
       }
-      @media (width >= 48rem) {
+    }
+
+    @media (min-width: 48rem) {
+      .\\!container {
         max-width: 48rem !important;
       }
-      @media (width >= 1280px) {
+    }
+
+    @media (min-width: 1280px) {
+      .\\!container {
         max-width: 1280px !important;
       }
-      @media (width >= 1536px) {
+    }
+
+    @media (min-width: 1536px) {
+      .\\!container {
         max-width: 1536px !important;
         padding-inline: 4rem !important;
       }
     }
+
     .container {
       margin-inline: auto;
       padding-inline: 2rem;
-      @media (width >= 40rem) {
+    }
+
+    @media (min-width: 40rem) {
+      .container {
         max-width: none;
       }
-      @media (width >= 48rem) {
+    }
+
+    @media (min-width: 48rem) {
+      .container {
         max-width: 48rem;
       }
-      @media (width >= 1280px) {
+    }
+
+    @media (min-width: 1280px) {
+      .container {
         max-width: 1280px;
       }
-      @media (width >= 1536px) {
+    }
+
+    @media (min-width: 1536px) {
+      .container {
         max-width: 1536px;
         padding-inline: 4rem;
       }
@@ -520,81 +649,106 @@ test('combines custom padding and screen overwrites', async () => {
 })
 
 test('filters out complex breakpoints', async () => {
-  let input = css`
-    @theme default {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
-    @config "./config.js";
-    @tailwind utilities;
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          container: {
-            center: true,
-            padding: {
-              DEFAULT: '2rem',
-              '2xl': '4rem',
-            },
-            screens: {
-              sm: '20px',
-              md: { min: '100px' },
-              lg: { max: '200px' },
-              xl: { min: '300px', max: '400px' },
-              '2xl': { raw: 'print' },
+  expect(
+    await run(
+      ['container'],
+      css`
+        @theme default {
+          --breakpoint-sm: 40rem;
+          --breakpoint-md: 48rem;
+          --breakpoint-lg: 64rem;
+          --breakpoint-xl: 80rem;
+          --breakpoint-2xl: 96rem;
+        }
+        @config "./config.js";
+        @tailwind utilities;
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              container: {
+                center: true,
+                padding: {
+                  DEFAULT: '2rem',
+                  '2xl': '4rem',
+                },
+                screens: {
+                  sm: '20px',
+                  md: { min: '100px' },
+                  lg: { max: '200px' },
+                  xl: { min: '300px', max: '400px' },
+                  '2xl': { raw: 'print' },
+                },
+              },
             },
           },
-        },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build(['container'])).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
+    ),
+  ).toMatchInlineSnapshot(`
+    "
     .container {
       width: 100%;
-      @media (width >= 40rem) {
+    }
+
+    @media (min-width: 40rem) {
+      .container {
         max-width: 40rem;
       }
-      @media (width >= 48rem) {
+    }
+
+    @media (min-width: 48rem) {
+      .container {
         max-width: 48rem;
       }
-      @media (width >= 64rem) {
+    }
+
+    @media (min-width: 64rem) {
+      .container {
         max-width: 64rem;
       }
-      @media (width >= 80rem) {
+    }
+
+    @media (min-width: 80rem) {
+      .container {
         max-width: 80rem;
       }
-      @media (width >= 96rem) {
+    }
+
+    @media (min-width: 96rem) {
+      .container {
         max-width: 96rem;
       }
     }
+
     .container {
       margin-inline: auto;
       padding-inline: 2rem;
-      @media (width >= 40rem) {
+    }
+
+    @media (min-width: 40rem) {
+      .container {
         max-width: none;
       }
-      @media (width >= 20px) {
+    }
+
+    @media (min-width: 20px) {
+      .container {
         max-width: 20px;
       }
-      @media (width >= 100px) {
+    }
+
+    @media (min-width: 100px) {
+      .container {
         max-width: 100px;
       }
-      @media (width >= 300px) {
+    }
+
+    @media (min-width: 300px) {
+      .container {
         max-width: 300px;
       }
     }
diff --git a/packages/tailwindcss/src/compat/container.ts b/packages/tailwindcss/src/compat/container.ts
index 99aea1e42..98f23ce7a 100644
--- a/packages/tailwindcss/src/compat/container.ts
+++ b/packages/tailwindcss/src/compat/container.ts
@@ -1,4 +1,4 @@
-import { atRule, decl, type AstNode, type AtRule } from '../ast'
+import { atRule, cloneAstNode, decl, type AstNode, type AtRule } from '../ast'
 import type { DesignSystem } from '../design-system'
 import { compareBreakpoints } from '../utils/compare-breakpoints'
 import type { ResolvedConfig } from './config/types'
@@ -16,7 +16,7 @@ export function registerContainerCompat(userConfig: ResolvedConfig, designSystem
     return
   }
 
-  designSystem.utilities.static('container', () => structuredClone(rules))
+  designSystem.utilities.static('container', () => rules.map(cloneAstNode))
 }
 
 export function buildCustomContainerUtilityRules(
@@ -50,7 +50,7 @@ export function buildCustomContainerUtilityRules(
   if (typeof screens === 'object' && screens !== null) {
     breakpointOverwrites = new Map()
 
-    // When setting a the `screens` in v3, you were overwriting the default
+    // When setting the `screens` in v3, you were overwriting the default
     // screens config. To do this in v4, you have to manually unset all core
     // screens.
 
@@ -60,7 +60,7 @@ export function buildCustomContainerUtilityRules(
       let [key] = breakpoints[0]
       // Unset all default breakpoints
       rules.push(
-        atRule('@media', `(width >= theme(--breakpoint-${key}))`, [decl('max-width', 'none')]),
+        atRule('@media', `(width >= --theme(--breakpoint-${key}))`, [decl('max-width', 'none')]),
       )
     }
 
diff --git a/packages/tailwindcss/src/compat/default-theme.ts b/packages/tailwindcss/src/compat/default-theme.ts
index 85924057e..90e699c1c 100644
--- a/packages/tailwindcss/src/compat/default-theme.ts
+++ b/packages/tailwindcss/src/compat/default-theme.ts
@@ -156,7 +156,7 @@ export default {
     '3xl': '64px',
   },
   borderColor: ({ theme }) => ({
-    DEFAULT: 'currentColor',
+    DEFAULT: 'currentcolor',
     ...theme('colors'),
   }),
   borderOpacity: ({ theme }) => theme('opacity'),
@@ -353,8 +353,13 @@ export default {
   },
   fontFamily: {
     sans: [
-      'ui-sans-serif',
-      'system-ui',
+      '-apple-system',
+      'BlinkMacSystemFont',
+      '"Segoe UI"',
+      'Roboto',
+      '"Helvetica Neue"',
+      '"Noto Sans"',
+      'Arial',
       'sans-serif',
       '"Apple Color Emoji"',
       '"Segoe UI Emoji"',
@@ -825,7 +830,7 @@ export default {
   placeholderColor: ({ theme }) => theme('colors'),
   placeholderOpacity: ({ theme }) => theme('opacity'),
   ringColor: ({ theme }) => ({
-    DEFAULT: 'currentColor',
+    DEFAULT: 'currentcolor',
     ...theme('colors'),
   }),
   ringOffsetColor: ({ theme }) => theme('colors'),
@@ -1019,8 +1024,9 @@ export default {
     none: 'none',
     all: 'all',
     DEFAULT:
-      'color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter',
-    colors: 'color, background-color, border-color, text-decoration-color, fill, stroke',
+      'color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter',
+    colors:
+      'color, background-color, border-color, outline-color, text-decoration-color, fill, stroke',
     opacity: 'opacity',
     shadow: 'box-shadow',
     transform: 'transform',
diff --git a/packages/tailwindcss/src/compat/legacy-utilities.test.ts b/packages/tailwindcss/src/compat/legacy-utilities.test.ts
index 6db8b6df4..c90eae845 100644
--- a/packages/tailwindcss/src/compat/legacy-utilities.test.ts
+++ b/packages/tailwindcss/src/compat/legacy-utilities.test.ts
@@ -1,71 +1,75 @@
 import { expect, test } from 'vitest'
-import { compileCss, run } from '../test-utils/run'
+import { run } from '../test-utils/run'
 
 const css = String.raw
 
 test('bg-gradient-*', async () => {
   expect(
-    await compileCss(
-      css`
-        @tailwind utilities;
-      `,
-      [
-        'bg-gradient-to-t',
-        'bg-gradient-to-tr',
-        'bg-gradient-to-r',
-        'bg-gradient-to-br',
-        'bg-gradient-to-b',
-        'bg-gradient-to-bl',
-        'bg-gradient-to-l',
-        'bg-gradient-to-tl',
-      ],
-    ),
+    await run([
+      'bg-gradient-to-t',
+      'bg-gradient-to-tr',
+      'bg-gradient-to-r',
+      'bg-gradient-to-br',
+      'bg-gradient-to-b',
+      'bg-gradient-to-bl',
+      'bg-gradient-to-l',
+      'bg-gradient-to-tl',
+    ]),
   ).toMatchInlineSnapshot(`
-    ".bg-gradient-to-b {
-      --tw-gradient-position: to bottom in oklab, ;
+    "
+    .bg-gradient-to-b {
+      --tw-gradient-position: to bottom in oklab;
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-gradient-to-bl {
-      --tw-gradient-position: to bottom left in oklab, ;
+      --tw-gradient-position: to bottom left in oklab;
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-gradient-to-br {
-      --tw-gradient-position: to bottom right in oklab, ;
+      --tw-gradient-position: to bottom right in oklab;
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-gradient-to-l {
-      --tw-gradient-position: to left in oklab, ;
+      --tw-gradient-position: to left in oklab;
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-gradient-to-r {
-      --tw-gradient-position: to right in oklab, ;
+      --tw-gradient-position: to right in oklab;
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-gradient-to-t {
-      --tw-gradient-position: to top in oklab, ;
+      --tw-gradient-position: to top in oklab;
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-gradient-to-tl {
-      --tw-gradient-position: to top left in oklab, ;
+      --tw-gradient-position: to top left in oklab;
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-gradient-to-tr {
-      --tw-gradient-position: to top right in oklab, ;
+      --tw-gradient-position: to top right in oklab;
       background-image: linear-gradient(var(--tw-gradient-stops));
-    }"
+    }
+    "
   `)
 })
 
 test('max-w-screen', async () => {
   expect(
-    await compileCss(
+    await run(
+      [
+        'max-w-screen-sm',
+        'max-w-screen-md',
+        'max-w-screen-lg',
+        'max-w-screen-xl',
+        'max-w-screen-2xl',
+      ],
       css`
         @theme {
           --breakpoint-sm: 40rem;
@@ -76,16 +80,10 @@ test('max-w-screen', async () => {
         }
         @tailwind utilities;
       `,
-      [
-        'max-w-screen-sm',
-        'max-w-screen-md',
-        'max-w-screen-lg',
-        'max-w-screen-xl',
-        'max-w-screen-2xl',
-      ],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --breakpoint-sm: 40rem;
       --breakpoint-md: 48rem;
       --breakpoint-lg: 64rem;
@@ -111,7 +109,8 @@ test('max-w-screen', async () => {
 
     .max-w-screen-xl {
       max-width: var(--breakpoint-xl);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -134,7 +133,8 @@ test('max-w-screen', async () => {
 
 test('box-decoration', async () => {
   expect(await run(['decoration-slice', 'decoration-clone'])).toMatchInlineSnapshot(`
-    ".decoration-clone {
+    "
+    .decoration-clone {
       -webkit-box-decoration-break: clone;
       box-decoration-break: clone;
     }
@@ -142,21 +142,25 @@ test('box-decoration', async () => {
     .decoration-slice {
       -webkit-box-decoration-break: slice;
       box-decoration-break: slice;
-    }"
+    }
+    "
   `)
 })
 
 test('overflow-ellipsis', async () => {
   expect(await run(['overflow-ellipsis'])).toMatchInlineSnapshot(`
-    ".overflow-ellipsis {
+    "
+    .overflow-ellipsis {
       text-overflow: ellipsis;
-    }"
+    }
+    "
   `)
 })
 
 test('flex-grow', async () => {
   expect(await run(['flex-grow', 'flex-grow-0', 'flex-grow-[123]'])).toMatchInlineSnapshot(`
-    ".flex-grow {
+    "
+    .flex-grow {
       flex-grow: 1;
     }
 
@@ -166,7 +170,8 @@ test('flex-grow', async () => {
 
     .flex-grow-\\[123\\] {
       flex-grow: 123;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -185,7 +190,8 @@ test('flex-grow', async () => {
 
 test('flex-shrink', async () => {
   expect(await run(['flex-shrink', 'flex-shrink-0', 'flex-shrink-[123]'])).toMatchInlineSnapshot(`
-    ".flex-shrink {
+    "
+    .flex-shrink {
       flex-shrink: 1;
     }
 
@@ -195,7 +201,8 @@ test('flex-shrink', async () => {
 
     .flex-shrink-\\[123\\] {
       flex-shrink: 123;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -211,3 +218,181 @@ test('flex-shrink', async () => {
     ]),
   ).toEqual('')
 })
+
+test('start', async () => {
+  expect(
+    await run(
+      [
+        'start-shadowned',
+        'start-auto',
+        '-start-full',
+        'start-full',
+        'start-3/4',
+        'start-4',
+        '-start-4',
+        'start-[4px]',
+      ],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --inset-shadowned: 1940px;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing: .25rem;
+      --inset-shadowned: 1940px;
+    }
+
+    .-start-4 {
+      inset-inline-start: calc(var(--spacing) * -4);
+    }
+
+    .-start-full {
+      inset-inline-start: -100%;
+    }
+
+    .start-3\\/4 {
+      inset-inline-start: 75%;
+    }
+
+    .start-4 {
+      inset-inline-start: calc(var(--spacing) * 4);
+    }
+
+    .start-\\[4px\\] {
+      inset-inline-start: 4px;
+    }
+
+    .start-auto {
+      inset-inline-start: auto;
+    }
+
+    .start-full {
+      inset-inline-start: 100%;
+    }
+
+    .start-shadowned {
+      inset-inline-start: var(--inset-shadowned);
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'start-shadow-sm',
+        'start',
+        'start--1',
+        'start--1/2',
+        'start--1/-2',
+        'start-1/-2',
+        'start-auto/foo',
+        '-start-full/foo',
+        'start-full/foo',
+        'start-3/4/foo',
+        'start-4/foo',
+        '-start-4/foo',
+        'start-[4px]/foo',
+      ],
+      css`
+        @theme reference {
+          --spacing: 0.25rem;
+          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toEqual('')
+})
+
+test('end', async () => {
+  expect(
+    await run(
+      [
+        'end-shadowned',
+        'end-auto',
+        '-end-full',
+        'end-full',
+        'end-3/4',
+        'end-4',
+        '-end-4',
+        'end-[4px]',
+      ],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --inset-shadowned: 1940px;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing: .25rem;
+      --inset-shadowned: 1940px;
+    }
+
+    .-end-4 {
+      inset-inline-end: calc(var(--spacing) * -4);
+    }
+
+    .-end-full {
+      inset-inline-end: -100%;
+    }
+
+    .end-3\\/4 {
+      inset-inline-end: 75%;
+    }
+
+    .end-4 {
+      inset-inline-end: calc(var(--spacing) * 4);
+    }
+
+    .end-\\[4px\\] {
+      inset-inline-end: 4px;
+    }
+
+    .end-auto {
+      inset-inline-end: auto;
+    }
+
+    .end-full {
+      inset-inline-end: 100%;
+    }
+
+    .end-shadowned {
+      inset-inline-end: var(--inset-shadowned);
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'end-shadow-sm',
+        'end',
+        'end--1',
+        'end--1/2',
+        'end--1/-2',
+        'end-1/-2',
+        'end-auto/foo',
+        '-end-full/foo',
+        'end-full/foo',
+        'end-3/4/foo',
+        'end-4/foo',
+        '-end-4/foo',
+        'end-[4px]/foo',
+      ],
+      css`
+        @theme reference {
+          --spacing: 0.25rem;
+          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toEqual('')
+})
diff --git a/packages/tailwindcss/src/compat/legacy-utilities.ts b/packages/tailwindcss/src/compat/legacy-utilities.ts
index d86b1770a..8e7829035 100644
--- a/packages/tailwindcss/src/compat/legacy-utilities.ts
+++ b/packages/tailwindcss/src/compat/legacy-utilities.ts
@@ -1,6 +1,7 @@
 import { decl } from '../ast'
 import type { DesignSystem } from '../design-system'
-import { isPositiveInteger } from '../utils/infer-data-type'
+import { isPositiveInteger, isValidSpacingMultiplier } from '../utils/infer-data-type'
+import { segment } from '../utils/segment'
 
 export function registerLegacyUtilities(designSystem: DesignSystem) {
   for (let [value, direction] of [
@@ -13,12 +14,42 @@ export function registerLegacyUtilities(designSystem: DesignSystem) {
     ['l', 'left'],
     ['tl', 'top left'],
   ]) {
+    designSystem.utilities.suggest(`bg-gradient-to-${value}`, () => [])
     designSystem.utilities.static(`bg-gradient-to-${value}`, () => [
-      decl('--tw-gradient-position', `to ${direction} in oklab,`),
+      decl('--tw-gradient-position', `to ${direction} in oklab`),
       decl('background-image', `linear-gradient(var(--tw-gradient-stops))`),
     ])
   }
 
+  // Legacy `background-position` utilities for compatibility with v4.0 and earlier
+  designSystem.utilities.suggest('bg-left-top', () => [])
+  designSystem.utilities.static('bg-left-top', () => [decl('background-position', 'left top')])
+  designSystem.utilities.suggest('bg-right-top', () => [])
+  designSystem.utilities.static('bg-right-top', () => [decl('background-position', 'right top')])
+  designSystem.utilities.suggest('bg-left-bottom', () => [])
+  designSystem.utilities.static('bg-left-bottom', () => [
+    decl('background-position', 'left bottom'),
+  ])
+  designSystem.utilities.suggest('bg-right-bottom', () => [])
+  designSystem.utilities.static('bg-right-bottom', () => [
+    decl('background-position', 'right bottom'),
+  ])
+
+  // Legacy `object-position` utilities for compatibility with v4.0 and earlier
+  designSystem.utilities.suggest('object-left-top', () => [])
+  designSystem.utilities.static('object-left-top', () => [decl('object-position', 'left top')])
+  designSystem.utilities.suggest('object-right-top', () => [])
+  designSystem.utilities.static('object-right-top', () => [decl('object-position', 'right top')])
+  designSystem.utilities.suggest('object-left-bottom', () => [])
+  designSystem.utilities.static('object-left-bottom', () => [
+    decl('object-position', 'left bottom'),
+  ])
+  designSystem.utilities.suggest('object-right-bottom', () => [])
+  designSystem.utilities.static('object-right-bottom', () => [
+    decl('object-position', 'right bottom'),
+  ])
+
+  designSystem.utilities.suggest('max-w-screen', () => [])
   designSystem.utilities.functional('max-w-screen', (candidate) => {
     if (!candidate.value) return
     if (candidate.value.kind === 'arbitrary') return
@@ -27,18 +58,22 @@ export function registerLegacyUtilities(designSystem: DesignSystem) {
     return [decl('max-width', value)]
   })
 
+  designSystem.utilities.suggest('overflow-ellipsis', () => [])
   designSystem.utilities.static(`overflow-ellipsis`, () => [decl('text-overflow', `ellipsis`)])
 
+  designSystem.utilities.suggest('decoration-slice', () => [])
   designSystem.utilities.static(`decoration-slice`, () => [
     decl('-webkit-box-decoration-break', `slice`),
     decl('box-decoration-break', `slice`),
   ])
 
+  designSystem.utilities.suggest('decoration-clone', () => [])
   designSystem.utilities.static(`decoration-clone`, () => [
     decl('-webkit-box-decoration-break', `clone`),
     decl('box-decoration-break', `clone`),
   ])
 
+  designSystem.utilities.suggest('flex-shrink', () => [])
   designSystem.utilities.functional('flex-shrink', (candidate) => {
     if (candidate.modifier) return
 
@@ -55,6 +90,7 @@ export function registerLegacyUtilities(designSystem: DesignSystem) {
     }
   })
 
+  designSystem.utilities.suggest('flex-grow', () => [])
   designSystem.utilities.functional('flex-grow', (candidate) => {
     if (candidate.modifier) return
 
@@ -70,4 +106,69 @@ export function registerLegacyUtilities(designSystem: DesignSystem) {
       return [decl('flex-grow', candidate.value.value)]
     }
   })
+
+  designSystem.utilities.suggest('order-none', () => [])
+  designSystem.utilities.static('order-none', () => [decl('order', '0')])
+
+  designSystem.utilities.suggest('break-words', () => [])
+  designSystem.utilities.static('break-words', () => [decl('overflow-wrap', 'break-word')])
+
+  // Legacy `start` and `end` inset utilities, replaced by `inset-s` and `inset-e`
+  for (let [name, property] of [
+    ['start', 'inset-inline-start'],
+    ['end', 'inset-inline-end'],
+  ] as const) {
+    designSystem.utilities.static(`${name}-auto`, () => [decl(property, 'auto')])
+    designSystem.utilities.static(`${name}-full`, () => [decl(property, '100%')])
+    designSystem.utilities.static(`-${name}-full`, () => [decl(property, '-100%')])
+    designSystem.utilities.static(`${name}-px`, () => [decl(property, '1px')])
+    designSystem.utilities.static(`-${name}-px`, () => [decl(property, '-1px')])
+
+    function handleInset({ negative }: { negative: boolean }) {
+      return (candidate: Extract<import('../candidate').Candidate, { kind: 'functional' }>) => {
+        if (candidate.value === null) return
+
+        if (candidate.value.kind === 'arbitrary') {
+          if (candidate.modifier) return
+          let value = candidate.value.value
+          return [decl(property, negative ? `calc(${value} * -1)` : value)]
+        }
+
+        let value = designSystem.theme.resolve(candidate.value.fraction ?? candidate.value.value, [
+          '--inset',
+          '--spacing',
+        ])
+
+        // Handle fractions like `start-1/2`
+        if (value === null && candidate.value.fraction) {
+          let [lhs, rhs] = segment(candidate.value.fraction, '/')
+          if (!isPositiveInteger(lhs) || !isPositiveInteger(rhs)) return
+          value = `calc(${candidate.value.fraction} * 100%)`
+        }
+
+        // Handle bare spacing multiplier values like `start-4`
+        if (value === null && negative) {
+          let multiplier = designSystem.theme.resolve(null, ['--spacing'])
+          if (multiplier && isValidSpacingMultiplier(candidate.value.value)) {
+            value = `calc(${multiplier} * -${candidate.value.value})`
+            if (value !== null) return [decl(property, value)]
+          }
+        }
+
+        if (value === null) {
+          let multiplier = designSystem.theme.resolve(null, ['--spacing'])
+          if (multiplier && isValidSpacingMultiplier(candidate.value.value)) {
+            value = `calc(${multiplier} * ${candidate.value.value})`
+          }
+        }
+
+        if (value === null) return
+
+        return [decl(property, negative ? `calc(${value} * -1)` : value)]
+      }
+    }
+
+    designSystem.utilities.functional(`-${name}`, handleInset({ negative: true }))
+    designSystem.utilities.functional(name, handleInset({ negative: false }))
+  }
 }
diff --git a/packages/tailwindcss/src/compat/plugin-api.test.ts b/packages/tailwindcss/src/compat/plugin-api.test.ts
index b1c04e655..5fcacb5cd 100644
--- a/packages/tailwindcss/src/compat/plugin-api.test.ts
+++ b/packages/tailwindcss/src/compat/plugin-api.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test, vi } from 'vitest'
 import { compile } from '..'
 import plugin from '../plugin'
-import { optimizeCss } from '../test-utils/run'
+import { compileCss, run } from '../test-utils/run'
 import defaultTheme from './default-theme'
 import type { CssInJs, PluginAPI } from './plugin-api'
 
@@ -9,57 +9,61 @@ const css = String.raw
 
 describe('theme', async () => {
   test('plugin theme can contain objects', async () => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(
-            function ({ addBase, theme }) {
-              addBase({
-                '@keyframes enter': theme('keyframes.enter'),
-                '@keyframes exit': theme('keyframes.exit'),
-              })
-            },
-            {
-              theme: {
-                extend: {
-                  keyframes: {
-                    enter: {
-                      from: {
-                        opacity: 'var(--tw-enter-opacity, 1)',
-                        transform:
-                          'translate3d(var(--tw-enter-translate-x, 0), var(--tw-enter-translate-y, 0), 0) scale3d(var(--tw-enter-scale, 1), var(--tw-enter-scale, 1), var(--tw-enter-scale, 1)) rotate(var(--tw-enter-rotate, 0))',
-                      },
-                    },
-                    exit: {
-                      to: {
-                        opacity: 'var(--tw-exit-opacity, 1)',
-                        transform:
-                          'translate3d(var(--tw-exit-translate-x, 0), var(--tw-exit-translate-y, 0), 0) scale3d(var(--tw-exit-scale, 1), var(--tw-exit-scale, 1), var(--tw-exit-scale, 1)) rotate(var(--tw-exit-rotate, 0))',
+    expect(
+      await compileCss(
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(
+                function ({ addBase, theme }) {
+                  addBase({
+                    '@keyframes enter': theme('keyframes.enter'),
+                    '@keyframes exit': theme('keyframes.exit'),
+                  })
+                },
+                {
+                  theme: {
+                    extend: {
+                      keyframes: {
+                        enter: {
+                          from: {
+                            opacity: 'var(--tw-enter-opacity, 1)',
+                            transform:
+                              'translate3d(var(--tw-enter-translate-x, 0), var(--tw-enter-translate-y, 0), 0) scale3d(var(--tw-enter-scale, 1), var(--tw-enter-scale, 1), var(--tw-enter-scale, 1)) rotate(var(--tw-enter-rotate, 0))',
+                          },
+                        },
+                        exit: {
+                          to: {
+                            opacity: 'var(--tw-exit-opacity, 1)',
+                            transform:
+                              'translate3d(var(--tw-exit-translate-x, 0), var(--tw-exit-translate-y, 0), 0) scale3d(var(--tw-exit-scale, 1), var(--tw-exit-scale, 1), var(--tw-exit-scale, 1)) rotate(var(--tw-exit-rotate, 0))',
+                          },
+                        },
                       },
                     },
                   },
                 },
-              },
-            },
-          ),
-        }
-      },
-    })
-
-    expect(compiler.build([])).toMatchInlineSnapshot(`
-      "@layer base {
+              ),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer base {
         @keyframes enter {
           from {
             opacity: var(--tw-enter-opacity, 1);
             transform: translate3d(var(--tw-enter-translate-x, 0), var(--tw-enter-translate-y, 0), 0) scale3d(var(--tw-enter-scale, 1), var(--tw-enter-scale, 1), var(--tw-enter-scale, 1)) rotate(var(--tw-enter-rotate, 0));
           }
         }
+
         @keyframes exit {
           to {
             opacity: var(--tw-exit-opacity, 1);
@@ -72,30 +76,29 @@ describe('theme', async () => {
   })
 
   test('keyframes added via addUtilities are appended to the AST', async () => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(function ({ addUtilities, theme }) {
-            addUtilities({
-              '@keyframes enter': {
-                from: {
-                  opacity: 'var(--tw-enter-opacity, 1)',
-                },
-              },
-            })
-          }),
-        }
-      },
-    })
-
-    expect(compiler.build([])).toMatchInlineSnapshot(`
-      "@keyframes enter {
+    expect(
+      await compileCss(
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(function ({ addUtilities }) {
+                addUtilities({
+                  '@keyframes enter': { from: { opacity: 'var(--tw-enter-opacity, 1)' } },
+                })
+              }),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @keyframes enter {
         from {
           opacity: var(--tw-enter-opacity, 1);
         }
@@ -105,47 +108,40 @@ describe('theme', async () => {
   })
 
   test('plugin theme can extend colors', async () => {
-    let input = css`
-      @theme reference {
-        --color-red-500: #ef4444;
-      }
-      @tailwind utilities;
-      @plugin "my-plugin";
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(
-            function ({ matchUtilities, theme }) {
-              matchUtilities(
-                {
-                  scrollbar: (value) => ({ 'scrollbar-color': value }),
+    expect(
+      await run(
+        ['scrollbar-red-500', 'scrollbar-russet-700'],
+        css`
+          @theme reference {
+            --color-red-500: #ef4444;
+          }
+          @tailwind utilities;
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(
+                function ({ matchUtilities, theme }) {
+                  matchUtilities(
+                    { scrollbar: (value) => ({ 'scrollbar-color': value }) },
+                    { values: theme('colors') },
+                  )
                 },
-                {
-                  values: theme('colors'),
-                },
-              )
-            },
-            {
-              theme: {
-                extend: {
-                  colors: {
-                    'russet-700': '#7a4724',
-                  },
-                },
-              },
-            },
-          ),
-        }
-      },
-    })
-
-    expect(compiler.build(['scrollbar-red-500', 'scrollbar-russet-700'])).toMatchInlineSnapshot(`
-      ".scrollbar-red-500 {
+                { theme: { extend: { colors: { 'russet-700': '#7a4724' } } } },
+              ),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .scrollbar-red-500 {
         scrollbar-color: #ef4444;
       }
+
       .scrollbar-russet-700 {
         scrollbar-color: #7a4724;
       }
@@ -156,45 +152,43 @@ describe('theme', async () => {
   test('plugin theme values can reference legacy theme keys that have been replaced with bare value support', async ({
     expect,
   }) => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(
-            function ({ matchUtilities, theme }) {
-              matchUtilities(
-                {
-                  'animate-duration': (value) => ({ 'animation-duration': value }),
+    expect(
+      await run(
+        ['animate-duration-316'],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(
+                function ({ matchUtilities, theme }) {
+                  matchUtilities(
+                    { 'animate-duration': (value) => ({ 'animation-duration': value }) },
+                    { values: theme('animationDuration') },
+                  )
                 },
                 {
-                  values: theme('animationDuration'),
-                },
-              )
-            },
-            {
-              theme: {
-                extend: {
-                  animationDuration: ({ theme }: { theme: (path: string) => any }) => {
-                    return {
-                      ...theme('transitionDuration'),
-                    }
+                  theme: {
+                    extend: {
+                      animationDuration: ({ theme }: { theme: (path: string) => any }) => {
+                        return { ...theme('transitionDuration') }
+                      },
+                    },
                   },
                 },
-              },
-            },
-          ),
-        }
-      },
-    })
-
-    expect(compiler.build(['animate-duration-316'])).toMatchInlineSnapshot(`
-      ".animate-duration-316 {
-        animation-duration: 316ms;
+              ),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .animate-duration-316 {
+        animation-duration: .316s;
       }
       "
     `)
@@ -203,439 +197,402 @@ describe('theme', async () => {
   test('plugin theme values that support bare values are merged with other values for that theme key', async ({
     expect,
   }) => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(
-            function ({ matchUtilities, theme }) {
-              matchUtilities(
-                {
-                  'animate-duration': (value) => ({ 'animation-duration': value }),
+    expect(
+      await run(
+        ['animate-duration-316', 'animate-duration-slow'],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(
+                function ({ matchUtilities, theme }) {
+                  matchUtilities(
+                    { 'animate-duration': (value) => ({ 'animation-duration': value }) },
+                    { values: theme('animationDuration') },
+                  )
                 },
                 {
-                  values: theme('animationDuration'),
-                },
-              )
-            },
-            {
-              theme: {
-                extend: {
-                  transitionDuration: {
-                    slow: '800ms',
+                  theme: {
+                    extend: {
+                      transitionDuration: { slow: '800ms' },
+                      animationDuration: ({ theme }: { theme: (path: string) => any }) => ({
+                        ...theme('transitionDuration'),
+                      }),
+                    },
                   },
-
-                  animationDuration: ({ theme }: { theme: (path: string) => any }) => ({
-                    ...theme('transitionDuration'),
-                  }),
                 },
-              },
-            },
-          ),
-        }
-      },
-    })
-
-    expect(compiler.build(['animate-duration-316', 'animate-duration-slow']))
-      .toMatchInlineSnapshot(`
-      ".animate-duration-316 {
-        animation-duration: 316ms;
+              ),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .animate-duration-316 {
+        animation-duration: .316s;
       }
+
       .animate-duration-slow {
-        animation-duration: 800ms;
+        animation-duration: .8s;
       }
       "
     `)
   })
 
   test('plugin theme can have opacity modifiers', async () => {
-    let input = css`
-      @tailwind utilities;
-      @theme {
-        --color-red-500: #ef4444;
+    expect(
+      await run(
+        ['percentage', 'fraction', 'variable'],
+        css`
+          @tailwind utilities;
+          @theme {
+            --color-red-500: #ef4444;
+          }
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(function ({ addUtilities, theme }) {
+                addUtilities({
+                  '.percentage': { color: theme('colors.red.500 / 50%') },
+                  '.fraction': { color: theme('colors.red.500 / 0.5') },
+                  '.variable': { color: theme('colors.red.500 / var(--opacity)') },
+                })
+              }),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .fraction, .percentage {
+        color: oklab(63.6834% .187 .088 / .5);
       }
-      @plugin "my-plugin";
-    `
 
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(function ({ addUtilities, theme }) {
-            addUtilities({
-              '.percentage': {
-                color: theme('colors.red.500 / 50%'),
-              },
-              '.fraction': {
-                color: theme('colors.red.500 / 0.5'),
-              },
-              '.variable': {
-                color: theme('colors.red.500 / var(--opacity)'),
-              },
-            })
-          }),
-        }
-      },
-    })
-
-    expect(compiler.build(['percentage', 'fraction', 'variable'])).toMatchInlineSnapshot(`
-      ".fraction {
-        color: color-mix(in oklab, #ef4444 50%, transparent);
-      }
-      .percentage {
-        color: color-mix(in oklab, #ef4444 50%, transparent);
-      }
       .variable {
-        color: color-mix(in oklab, #ef4444 var(--opacity), transparent);
+        color: #ef4444;
       }
-      :root {
-        --color-red-500: #ef4444;
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .variable {
+          color: color-mix(in oklab, #ef4444 var(--opacity), transparent);
+        }
       }
       "
     `)
   })
 
   test('plugin theme colors can use <alpha-value>', async () => {
-    let input = css`
-      @tailwind utilities;
-      @theme {
-        /* This should not work */
-        --color-custom-css: rgba(255 0 0 / <alpha-value>);
-      }
-      @plugin "my-plugin";
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(
-            function ({ addUtilities, theme }) {
-              addUtilities({
-                '.css-percentage': {
-                  color: theme('colors.custom-css / 50%'),
-                },
-                '.css-fraction': {
-                  color: theme('colors.custom-css / 0.5'),
-                },
-                '.css-variable': {
-                  color: theme('colors.custom-css / var(--opacity)'),
-                },
-                '.js-percentage': {
-                  color: theme('colors.custom-js / 50%'),
-                },
-                '.js-fraction': {
-                  color: theme('colors.custom-js / 0.5'),
-                },
-                '.js-variable': {
-                  color: theme('colors.custom-js / var(--opacity)'),
-                },
-              })
-            },
-            {
-              theme: {
-                colors: {
-                  /* This should work */
-                  'custom-js': 'rgb(255 0 0 / <alpha-value>)',
-                },
-              },
-            },
-          ),
-        }
-      },
-    })
-
     expect(
-      compiler.build([
-        'bg-custom',
-        'css-percentage',
-        'css-fraction',
-        'css-variable',
-        'js-percentage',
-        'js-fraction',
-        'js-variable',
-      ]),
+      await run(
+        [
+          'bg-custom',
+          'css-percentage',
+          'css-fraction',
+          'css-variable',
+          'js-percentage',
+          'js-fraction',
+          'js-variable',
+        ],
+        css`
+          @tailwind utilities;
+          @theme {
+            /* This should not work */
+            --color-custom-css: rgba(255 0 0 / <alpha-value>);
+          }
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(
+                function ({ addUtilities, theme }) {
+                  addUtilities({
+                    '.css-percentage': { color: theme('colors.custom-css / 50%') },
+                    '.css-fraction': { color: theme('colors.custom-css / 0.5') },
+                    '.css-variable': { color: theme('colors.custom-css / var(--opacity)') },
+                    '.js-percentage': { color: theme('colors.custom-js / 50%') },
+                    '.js-fraction': { color: theme('colors.custom-js / 0.5') },
+                    '.js-variable': { color: theme('colors.custom-js / var(--opacity)') },
+                  })
+                },
+                {
+                  theme: {
+                    colors: {
+                      /* This should work */
+                      'custom-js': 'rgb(255 0 0 / <alpha-value>)',
+                    },
+                  },
+                },
+              ),
+            }
+          },
+        },
+      ),
     ).toMatchInlineSnapshot(`
-      ".css-fraction {
-        color: color-mix(in oklab, rgba(255 0 0 / <alpha-value>) 50%, transparent);
-      }
-      .css-percentage {
+      "
+      .css-fraction, .css-percentage {
         color: color-mix(in oklab, rgba(255 0 0 / <alpha-value>) 50%, transparent);
       }
+
       .css-variable {
-        color: color-mix(in oklab, rgba(255 0 0 / <alpha-value>) var(--opacity), transparent);
+        color: rgba(255 0 0 / <alpha-value>);
       }
-      .js-fraction {
-        color: color-mix(in oklab, rgb(255 0 0 / 1) 50%, transparent);
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .css-variable {
+          color: color-mix(in oklab, rgba(255 0 0 / <alpha-value>) var(--opacity), transparent);
+        }
       }
-      .js-percentage {
-        color: color-mix(in oklab, rgb(255 0 0 / 1) 50%, transparent);
+
+      .js-fraction, .js-percentage {
+        color: oklab(62.7955% .224 .125 / .5);
       }
+
       .js-variable {
-        color: color-mix(in oklab, rgb(255 0 0 / 1) var(--opacity), transparent);
+        color: red;
       }
-      :root {
-        --color-custom-css: rgba(255 0 0 / <alpha-value>);
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .js-variable {
+          color: color-mix(in oklab, red var(--opacity), transparent);
+        }
       }
       "
     `)
   })
 
   test('theme value functions are resolved correctly regardless of order', async () => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(
-            function ({ matchUtilities, theme }) {
-              matchUtilities(
-                {
-                  'animate-delay': (value) => ({ 'animation-delay': value }),
+    expect(
+      await run(
+        ['animate-delay-316', 'animate-delay-slow'],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(
+                function ({ matchUtilities, theme }) {
+                  matchUtilities(
+                    { 'animate-delay': (value) => ({ 'animation-delay': value }) },
+                    { values: theme('animationDelay') },
+                  )
                 },
                 {
-                  values: theme('animationDelay'),
-                },
-              )
-            },
-            {
-              theme: {
-                extend: {
-                  animationDuration: ({ theme }: { theme: (path: string) => any }) => ({
-                    ...theme('transitionDuration'),
-                  }),
-
-                  animationDelay: ({ theme }: { theme: (path: string) => any }) => ({
-                    ...theme('animationDuration'),
-                  }),
-
-                  transitionDuration: {
-                    slow: '800ms',
+                  theme: {
+                    extend: {
+                      animationDuration: ({ theme }: { theme: (path: string) => any }) => ({
+                        ...theme('transitionDuration'),
+                      }),
+                      animationDelay: ({ theme }: { theme: (path: string) => any }) => ({
+                        ...theme('animationDuration'),
+                      }),
+                      transitionDuration: { slow: '800ms' },
+                    },
                   },
                 },
-              },
-            },
-          ),
-        }
-      },
-    })
-
-    expect(compiler.build(['animate-delay-316', 'animate-delay-slow'])).toMatchInlineSnapshot(`
-      ".animate-delay-316 {
-        animation-delay: 316ms;
+              ),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .animate-delay-316 {
+        animation-delay: .316s;
       }
+
       .animate-delay-slow {
-        animation-delay: 800ms;
+        animation-delay: .8s;
       }
       "
     `)
   })
 
   test('plugins can override the default key', async () => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(
-            function ({ matchUtilities, theme }) {
-              matchUtilities(
-                {
-                  'animate-duration': (value) => ({ 'animation-delay': value }),
+    expect(
+      await run(
+        ['animate-duration'],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(
+                function ({ matchUtilities, theme }) {
+                  matchUtilities(
+                    { 'animate-duration': (value) => ({ 'animation-delay': value }) },
+                    { values: theme('transitionDuration') },
+                  )
                 },
-                {
-                  values: theme('transitionDuration'),
-                },
-              )
-            },
-            {
-              theme: {
-                extend: {
-                  transitionDuration: {
-                    DEFAULT: '1500ms',
-                  },
-                },
-              },
-            },
-          ),
-        }
-      },
-    })
-
-    expect(compiler.build(['animate-duration'])).toMatchInlineSnapshot(`
-      ".animate-duration {
-        animation-delay: 1500ms;
+                { theme: { extend: { transitionDuration: { DEFAULT: '1500ms' } } } },
+              ),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .animate-duration {
+        animation-delay: 1.5s;
       }
       "
     `)
   })
 
   test('plugins can read CSS theme keys using the old theme key notation', async () => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
-      @theme reference {
-        --animate: pulse 1s linear infinite;
-        --animate-spin: spin 1s linear infinite;
+    expect(
+      await run(
+        ['animation-spin', 'animation', 'animation2', 'animation2-twist'],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
+          @theme reference {
+            --animate: pulse 1s linear infinite;
+            --animate-spin: spin 1s linear infinite;
+          }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(function ({ matchUtilities, theme }) {
+                matchUtilities(
+                  { animation: (value) => ({ animation: value }) },
+                  { values: theme('animation') },
+                )
+
+                matchUtilities(
+                  { animation2: (value) => ({ animation: value }) },
+                  {
+                    values: { DEFAULT: theme('animation.DEFAULT'), twist: theme('animation.spin') },
+                  },
+                )
+              }),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .animation {
+        animation: 1s linear infinite pulse;
       }
-    `
 
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(function ({ matchUtilities, theme }) {
-            matchUtilities(
-              {
-                animation: (value) => ({ animation: value }),
-              },
-              {
-                values: theme('animation'),
-              },
-            )
+      .animation-spin {
+        animation: 1s linear infinite spin;
+      }
 
-            matchUtilities(
-              {
-                animation2: (value) => ({ animation: value }),
-              },
-              {
-                values: {
-                  DEFAULT: theme('animation.DEFAULT'),
-                  twist: theme('animation.spin'),
-                },
-              },
-            )
-          }),
-        }
-      },
-    })
+      .animation2 {
+        animation: 1s linear infinite pulse;
+      }
 
-    expect(compiler.build(['animation-spin', 'animation', 'animation2', 'animation2-twist']))
-      .toMatchInlineSnapshot(`
-        ".animation {
-          animation: pulse 1s linear infinite;
-        }
-        .animation-spin {
-          animation: spin 1s linear infinite;
-        }
-        .animation2 {
-          animation: pulse 1s linear infinite;
-        }
-        .animation2-twist {
-          animation: spin 1s linear infinite;
-        }
-        "
-      `)
+      .animation2-twist {
+        animation: 1s linear infinite spin;
+      }
+      "
+    `)
   })
 
   test('CSS theme values are merged with JS theme values', async () => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
-      @theme reference {
-        --animate: pulse 1s linear infinite;
-        --animate-spin: spin 1s linear infinite;
+    expect(
+      await run(
+        ['animation', 'animation-spin', 'animation-bounce'],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
+          @theme reference {
+            --animate: pulse 1s linear infinite;
+            --animate-spin: spin 1s linear infinite;
+          }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(
+                function ({ matchUtilities, theme }) {
+                  matchUtilities(
+                    { animation: (value) => ({ '--animation': value }) },
+                    { values: theme('animation') },
+                  )
+                },
+                { theme: { extend: { animation: { bounce: 'bounce 1s linear infinite' } } } },
+              ),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .animation {
+        --animation: pulse 1s linear infinite;
       }
-    `
 
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(
-            function ({ matchUtilities, theme }) {
-              matchUtilities(
-                {
-                  animation: (value) => ({ '--animation': value }),
-                },
-                {
-                  values: theme('animation'),
-                },
-              )
-            },
-            {
-              theme: {
-                extend: {
-                  animation: {
-                    bounce: 'bounce 1s linear infinite',
-                  },
-                },
-              },
-            },
-          ),
-        }
-      },
-    })
+      .animation-bounce {
+        --animation: bounce 1s linear infinite;
+      }
 
-    expect(compiler.build(['animation', 'animation-spin', 'animation-bounce']))
-      .toMatchInlineSnapshot(`
-        ".animation {
-          --animation: pulse 1s linear infinite;
-        }
-        .animation-bounce {
-          --animation: bounce 1s linear infinite;
-        }
-        .animation-spin {
-          --animation: spin 1s linear infinite;
-        }
-        "
-      `)
+      .animation-spin {
+        --animation: spin 1s linear infinite;
+      }
+      "
+    `)
   })
 
   test('CSS theme defaults take precedence over JS theme defaults', async () => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
-      @theme reference {
-        --animate: pulse 1s linear infinite;
-        --animate-spin: spin 1s linear infinite;
-      }
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(
-            function ({ matchUtilities, theme }) {
-              matchUtilities(
-                {
-                  animation: (value) => ({ '--animation': value }),
+    expect(
+      await run(
+        ['animation'],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
+          @theme reference {
+            --animate: pulse 1s linear infinite;
+            --animate-spin: spin 1s linear infinite;
+          }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(
+                function ({ matchUtilities, theme }) {
+                  matchUtilities(
+                    { animation: (value) => ({ '--animation': value }) },
+                    { values: theme('animation') },
+                  )
                 },
-                {
-                  values: theme('animation'),
-                },
-              )
-            },
-            {
-              theme: {
-                extend: {
-                  animation: {
-                    DEFAULT: 'twist 1s linear infinite',
-                  },
-                },
-              },
-            },
-          ),
-        }
-      },
-    })
-
-    expect(compiler.build(['animation'])).toMatchInlineSnapshot(`
-      ".animation {
+                { theme: { extend: { animation: { DEFAULT: 'twist 1s linear infinite' } } } },
+              ),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .animation {
         --animation: pulse 1s linear infinite;
       }
       "
@@ -652,24 +609,19 @@ describe('theme', async () => {
       }
     `
 
-    let fn = vi.fn()
+    using fn = vi.fn()
 
     await compile(input, {
-      loadModule: async (id, base) => {
+      loadModule: async (_id, base) => {
         return {
+          path: '',
           base,
           module: plugin(
             function ({ theme }) {
               fn(theme('animation.simple'))
             },
             {
-              theme: {
-                extend: {
-                  animation: {
-                    simple: 'simple 1s linear',
-                  },
-                },
-              },
+              theme: { extend: { animation: { simple: 'simple 1s linear' } } },
             },
           ),
         }
@@ -683,240 +635,259 @@ describe('theme', async () => {
     })
   })
 
-  test('all necessary theme keys support bare values', async () => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
-    `
-
-    let { build } = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(function ({ matchUtilities, theme }) {
-            function utility(name: string, themeKey: string) {
-              matchUtilities(
-                { [name]: (value) => ({ '--value': value }) },
-                { values: theme(themeKey) },
-              )
+  test('theme() resolves the DEFAULT value when a bare CSS theme key shares a prefix with a sibling key', async () => {
+    expect(
+      await run(
+        ['example-foo', 'example-foo-bar'],
+        css`
+          @tailwind utilities;
+          @theme {
+            --color-foo: red;
+            --color-foo-bar: blue;
+          }
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(function ({ addUtilities, theme }) {
+                addUtilities({
+                  '.example-foo': { color: theme('colors.foo') },
+                  '.example-foo-bar': { color: theme('colors.foo-bar') },
+                })
+              }),
             }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .example-foo {
+        color: red;
+      }
 
-            utility('my-aspect', 'aspectRatio')
-            utility('my-backdrop-brightness', 'backdropBrightness')
-            utility('my-backdrop-contrast', 'backdropContrast')
-            utility('my-backdrop-grayscale', 'backdropGrayscale')
-            utility('my-backdrop-hue-rotate', 'backdropHueRotate')
-            utility('my-backdrop-invert', 'backdropInvert')
-            utility('my-backdrop-opacity', 'backdropOpacity')
-            utility('my-backdrop-saturate', 'backdropSaturate')
-            utility('my-backdrop-sepia', 'backdropSepia')
-            utility('my-border-width', 'borderWidth')
-            utility('my-brightness', 'brightness')
-            utility('my-columns', 'columns')
-            utility('my-contrast', 'contrast')
-            utility('my-divide-width', 'divideWidth')
-            utility('my-flex-grow', 'flexGrow')
-            utility('my-flex-shrink', 'flexShrink')
-            utility('my-gradient-color-stop-positions', 'gradientColorStopPositions')
-            utility('my-grayscale', 'grayscale')
-            utility('my-grid-row-end', 'gridRowEnd')
-            utility('my-grid-row-start', 'gridRowStart')
-            utility('my-grid-template-columns', 'gridTemplateColumns')
-            utility('my-grid-template-rows', 'gridTemplateRows')
-            utility('my-hue-rotate', 'hueRotate')
-            utility('my-invert', 'invert')
-            utility('my-line-clamp', 'lineClamp')
-            utility('my-opacity', 'opacity')
-            utility('my-order', 'order')
-            utility('my-outline-offset', 'outlineOffset')
-            utility('my-outline-width', 'outlineWidth')
-            utility('my-ring-offset-width', 'ringOffsetWidth')
-            utility('my-ring-width', 'ringWidth')
-            utility('my-rotate', 'rotate')
-            utility('my-saturate', 'saturate')
-            utility('my-scale', 'scale')
-            utility('my-sepia', 'sepia')
-            utility('my-skew', 'skew')
-            utility('my-stroke-width', 'strokeWidth')
-            utility('my-text-decoration-thickness', 'textDecorationThickness')
-            utility('my-text-underline-offset', 'textUnderlineOffset')
-            utility('my-transition-delay', 'transitionDelay')
-            utility('my-transition-duration', 'transitionDuration')
-            utility('my-z-index', 'zIndex')
-          }),
-        }
-      },
-    })
+      .example-foo-bar {
+        color: #00f;
+      }
+      "
+    `)
+  })
 
-    let output = build([
-      'my-aspect-2/5',
-      'my-backdrop-brightness-1',
-      'my-backdrop-contrast-1',
-      'my-backdrop-grayscale-1',
-      'my-backdrop-hue-rotate-1',
-      'my-backdrop-invert-1',
-      'my-backdrop-opacity-1',
-      'my-backdrop-saturate-1',
-      'my-backdrop-sepia-1',
-      'my-border-width-1',
-      'my-brightness-1',
-      'my-columns-1',
-      'my-contrast-1',
-      'my-divide-width-1',
-      'my-flex-grow-1',
-      'my-flex-shrink-1',
-      'my-gradient-color-stop-positions-1',
-      'my-grayscale-1',
-      'my-grid-row-end-1',
-      'my-grid-row-start-1',
-      'my-grid-template-columns-1',
-      'my-grid-template-rows-1',
-      'my-hue-rotate-1',
-      'my-invert-1',
-      'my-line-clamp-1',
-      'my-opacity-1',
-      'my-order-1',
-      'my-outline-offset-1',
-      'my-outline-width-1',
-      'my-ring-offset-width-1',
-      'my-ring-width-1',
-      'my-rotate-1',
-      'my-saturate-1',
-      'my-scale-1',
-      'my-sepia-1',
-      'my-skew-1',
-      'my-stroke-width-1',
-      'my-text-decoration-thickness-1',
-      'my-text-underline-offset-1',
-      'my-transition-delay-1',
-      'my-transition-duration-1',
-      'my-z-index-1',
-    ])
+  test('all necessary theme keys support bare values', async () => {
+    expect(
+      await run(
+        [
+          'my-aspect-2/5',
+          'my-backdrop-brightness-1',
+          'my-backdrop-contrast-1',
+          'my-backdrop-grayscale-1',
+          'my-backdrop-hue-rotate-1',
+          'my-backdrop-invert-1',
+          'my-backdrop-opacity-1',
+          'my-backdrop-saturate-1',
+          'my-backdrop-sepia-1',
+          'my-border-width-1',
+          'my-brightness-1',
+          'my-columns-1',
+          'my-contrast-1',
+          'my-divide-width-1',
+          'my-flex-grow-1',
+          'my-flex-shrink-1',
+          'my-gradient-color-stop-positions-1',
+          'my-grayscale-1',
+          'my-grid-row-end-1',
+          'my-grid-row-start-1',
+          'my-grid-template-columns-1',
+          'my-grid-template-rows-1',
+          'my-hue-rotate-1',
+          'my-invert-1',
+          'my-line-clamp-1',
+          'my-opacity-1',
+          'my-order-1',
+          'my-outline-offset-1',
+          'my-outline-width-1',
+          'my-ring-offset-width-1',
+          'my-ring-width-1',
+          'my-rotate-1',
+          'my-saturate-1',
+          'my-scale-1',
+          'my-sepia-1',
+          'my-skew-1',
+          'my-stroke-width-1',
+          'my-text-decoration-thickness-1',
+          'my-text-underline-offset-1',
+          'my-transition-delay-1',
+          'my-transition-duration-1',
+          'my-z-index-1',
+        ],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(function ({ matchUtilities, theme }) {
+                function utility(name: string, themeKey: string) {
+                  matchUtilities(
+                    { [name]: (value) => ({ '--value': value }) },
+                    { values: theme(themeKey) },
+                  )
+                }
 
-    expect(output).toMatchInlineSnapshot(`
-      ".my-aspect-2\\/5 {
+                utility('my-aspect', 'aspectRatio')
+                utility('my-backdrop-brightness', 'backdropBrightness')
+                utility('my-backdrop-contrast', 'backdropContrast')
+                utility('my-backdrop-grayscale', 'backdropGrayscale')
+                utility('my-backdrop-hue-rotate', 'backdropHueRotate')
+                utility('my-backdrop-invert', 'backdropInvert')
+                utility('my-backdrop-opacity', 'backdropOpacity')
+                utility('my-backdrop-saturate', 'backdropSaturate')
+                utility('my-backdrop-sepia', 'backdropSepia')
+                utility('my-border-width', 'borderWidth')
+                utility('my-brightness', 'brightness')
+                utility('my-columns', 'columns')
+                utility('my-contrast', 'contrast')
+                utility('my-divide-width', 'divideWidth')
+                utility('my-flex-grow', 'flexGrow')
+                utility('my-flex-shrink', 'flexShrink')
+                utility('my-gradient-color-stop-positions', 'gradientColorStopPositions')
+                utility('my-grayscale', 'grayscale')
+                utility('my-grid-row-end', 'gridRowEnd')
+                utility('my-grid-row-start', 'gridRowStart')
+                utility('my-grid-template-columns', 'gridTemplateColumns')
+                utility('my-grid-template-rows', 'gridTemplateRows')
+                utility('my-hue-rotate', 'hueRotate')
+                utility('my-invert', 'invert')
+                utility('my-line-clamp', 'lineClamp')
+                utility('my-opacity', 'opacity')
+                utility('my-order', 'order')
+                utility('my-outline-offset', 'outlineOffset')
+                utility('my-outline-width', 'outlineWidth')
+                utility('my-ring-offset-width', 'ringOffsetWidth')
+                utility('my-ring-width', 'ringWidth')
+                utility('my-rotate', 'rotate')
+                utility('my-saturate', 'saturate')
+                utility('my-scale', 'scale')
+                utility('my-sepia', 'sepia')
+                utility('my-skew', 'skew')
+                utility('my-stroke-width', 'strokeWidth')
+                utility('my-text-decoration-thickness', 'textDecorationThickness')
+                utility('my-text-underline-offset', 'textUnderlineOffset')
+                utility('my-transition-delay', 'transitionDelay')
+                utility('my-transition-duration', 'transitionDuration')
+                utility('my-z-index', 'zIndex')
+              }),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .my-aspect-2\\/5 {
         --value: 2/5;
       }
-      .my-backdrop-brightness-1 {
-        --value: 1%;
-      }
-      .my-backdrop-contrast-1 {
-        --value: 1%;
-      }
-      .my-backdrop-grayscale-1 {
+
+      .my-backdrop-brightness-1, .my-backdrop-contrast-1, .my-backdrop-grayscale-1 {
         --value: 1%;
       }
+
       .my-backdrop-hue-rotate-1 {
         --value: 1deg;
       }
-      .my-backdrop-invert-1 {
-        --value: 1%;
-      }
-      .my-backdrop-opacity-1 {
-        --value: 1%;
-      }
-      .my-backdrop-saturate-1 {
-        --value: 1%;
-      }
-      .my-backdrop-sepia-1 {
+
+      .my-backdrop-invert-1, .my-backdrop-opacity-1, .my-backdrop-saturate-1, .my-backdrop-sepia-1 {
         --value: 1%;
       }
+
       .my-border-width-1 {
         --value: 1px;
       }
+
       .my-brightness-1 {
         --value: 1%;
       }
+
       .my-columns-1 {
         --value: 1;
       }
+
       .my-contrast-1 {
         --value: 1%;
       }
+
       .my-divide-width-1 {
         --value: 1px;
       }
-      .my-flex-grow-1 {
+
+      .my-flex-grow-1, .my-flex-shrink-1 {
         --value: 1;
       }
-      .my-flex-shrink-1 {
-        --value: 1;
-      }
-      .my-gradient-color-stop-positions-1 {
+
+      .my-gradient-color-stop-positions-1, .my-grayscale-1 {
         --value: 1%;
       }
-      .my-grayscale-1 {
-        --value: 1%;
-      }
-      .my-grid-row-end-1 {
+
+      .my-grid-row-end-1, .my-grid-row-start-1 {
         --value: 1;
       }
-      .my-grid-row-start-1 {
-        --value: 1;
-      }
-      .my-grid-template-columns-1 {
-        --value: repeat(1, minmax(0, 1fr));
-      }
-      .my-grid-template-rows-1 {
+
+      .my-grid-template-columns-1, .my-grid-template-rows-1 {
         --value: repeat(1, minmax(0, 1fr));
       }
+
       .my-hue-rotate-1 {
         --value: 1deg;
       }
+
       .my-invert-1 {
         --value: 1%;
       }
+
       .my-line-clamp-1 {
         --value: 1;
       }
+
       .my-opacity-1 {
         --value: 1%;
       }
+
       .my-order-1 {
         --value: 1;
       }
-      .my-outline-offset-1 {
-        --value: 1px;
-      }
-      .my-outline-width-1 {
-        --value: 1px;
-      }
-      .my-ring-offset-width-1 {
-        --value: 1px;
-      }
-      .my-ring-width-1 {
+
+      .my-outline-offset-1, .my-outline-width-1, .my-ring-offset-width-1, .my-ring-width-1 {
         --value: 1px;
       }
+
       .my-rotate-1 {
         --value: 1deg;
       }
-      .my-saturate-1 {
-        --value: 1%;
-      }
-      .my-scale-1 {
-        --value: 1%;
-      }
-      .my-sepia-1 {
+
+      .my-saturate-1, .my-scale-1, .my-sepia-1 {
         --value: 1%;
       }
+
       .my-skew-1 {
         --value: 1deg;
       }
+
       .my-stroke-width-1 {
         --value: 1;
       }
-      .my-text-decoration-thickness-1 {
+
+      .my-text-decoration-thickness-1, .my-text-underline-offset-1 {
         --value: 1px;
       }
-      .my-text-underline-offset-1 {
-        --value: 1px;
-      }
-      .my-transition-delay-1 {
-        --value: 1ms;
-      }
-      .my-transition-duration-1 {
+
+      .my-transition-delay-1, .my-transition-duration-1 {
         --value: 1ms;
       }
+
       .my-z-index-1 {
         --value: 1;
       }
@@ -934,11 +905,12 @@ describe('theme', async () => {
       }
     `
 
-    let fn = vi.fn()
+    using fn = vi.fn()
 
     await compile(input, {
-      loadModule: async (id, base) => {
+      loadModule: async (_id, base) => {
         return {
+          path: '',
           base,
           module: plugin(
             ({ theme }) => {
@@ -976,11 +948,12 @@ describe('theme', async () => {
       }
     `
 
-    let fn = vi.fn()
+    using fn = vi.fn()
 
     await compile(input, {
-      loadModule: async (id, base) => {
+      loadModule: async (_id, base) => {
         return {
+          path: '',
           base,
           module: plugin(({ theme }) => {
             fn(theme('transitionTimingFunction.DEFAULT'))
@@ -1007,11 +980,12 @@ describe('theme', async () => {
       }
     `
 
-    let fn = vi.fn()
+    using fn = vi.fn()
 
     await compile(input, {
-      loadModule: async (id, base) => {
+      loadModule: async (_id, base) => {
         return {
+          path: '',
           base,
           module: plugin(({ theme }) => {
             fn(theme('color.red.100'))
@@ -1035,11 +1009,12 @@ describe('theme', async () => {
       @plugin "my-plugin";
     `
 
-    let fn = vi.fn()
+    using fn = vi.fn()
 
     await compile(input, {
-      loadModule: async (id, base) => {
+      loadModule: async (_id, base) => {
         return {
+          path: '',
           base,
           module: plugin(({ theme }) => {
             fn(theme('i.do.not.exist'))
@@ -1058,271 +1033,242 @@ describe('theme', async () => {
   })
 
   test('Candidates can match multiple utility definitions', async () => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
-    `
-
-    let { build } = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(({ addUtilities, matchUtilities }) => {
-            addUtilities({
-              '.foo-bar': {
-                color: 'red',
-              },
-            })
-
-            matchUtilities(
-              {
-                foo: (value) => ({
-                  '--my-prop': value,
-                }),
-              },
-              {
-                values: {
-                  bar: 'bar-valuer',
-                  baz: 'bar-valuer',
-                },
-              },
-            )
-
-            addUtilities({
-              '.foo-bar': {
-                backgroundColor: 'red',
-              },
-            })
-          }),
-        }
-      },
-    })
-
-    expect(build(['foo-bar'])).toMatchInlineSnapshot(`
-      ".foo-bar {
-        background-color: red;
-      }
+    expect(
+      await run(
+        ['foo-bar'],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(({ addUtilities, matchUtilities }) => {
+                addUtilities({ '.foo-bar': { color: 'red' } })
+                matchUtilities(
+                  { foo: (value) => ({ '--my-prop': value }) },
+                  { values: { bar: 'bar-valuer', baz: 'bar-valuer' } },
+                )
+                addUtilities({ '.foo-bar': { backgroundColor: 'red' } })
+              }),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       .foo-bar {
         color: red;
-      }
-      .foo-bar {
         --my-prop: bar-valuer;
+        background-color: red;
       }
       "
     `)
   })
 
   test('spreading `tailwindcss/defaultTheme` exports keeps bare values', async () => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
-    `
+    expect(
+      await run(
+        [
+          'my-aspect-2/5',
+          // 'my-backdrop-brightness-1',
+          // 'my-backdrop-contrast-1',
+          // 'my-backdrop-grayscale-1',
+          // 'my-backdrop-hue-rotate-1',
+          // 'my-backdrop-invert-1',
+          // 'my-backdrop-opacity-1',
+          // 'my-backdrop-saturate-1',
+          // 'my-backdrop-sepia-1',
+          // 'my-divide-width-1',
+          'my-border-width-1',
+          'my-brightness-1',
+          'my-columns-1',
+          'my-contrast-1',
+          'my-flex-grow-1',
+          'my-flex-shrink-1',
+          'my-gradient-color-stop-positions-1',
+          'my-grayscale-1',
+          'my-grid-row-end-1',
+          'my-grid-row-start-1',
+          'my-grid-template-columns-1',
+          'my-grid-template-rows-1',
+          'my-hue-rotate-1',
+          'my-invert-1',
+          'my-line-clamp-1',
+          'my-opacity-1',
+          'my-order-1',
+          'my-outline-offset-1',
+          'my-outline-width-1',
+          'my-ring-offset-width-1',
+          'my-ring-width-1',
+          'my-rotate-1',
+          'my-saturate-1',
+          'my-scale-1',
+          'my-sepia-1',
+          'my-skew-1',
+          'my-stroke-width-1',
+          'my-text-decoration-thickness-1',
+          'my-text-underline-offset-1',
+          'my-transition-delay-1',
+          'my-transition-duration-1',
+          'my-z-index-1',
+        ],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(function ({ matchUtilities }) {
+                function utility(name: string, themeKey: string) {
+                  matchUtilities(
+                    { [name]: (value) => ({ '--value': value }) },
+                    // @ts-ignore
+                    { values: defaultTheme[themeKey] },
+                  )
+                }
 
-    let { build } = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(function ({ matchUtilities }) {
-            function utility(name: string, themeKey: string) {
-              matchUtilities(
-                { [name]: (value) => ({ '--value': value }) },
-                // @ts-ignore
-                { values: defaultTheme[themeKey] },
-              )
+                utility('my-aspect', 'aspectRatio')
+                // The following keys deliberately doesn't work as these are exported
+                // as functions from the compat config.
+                //
+                // utility('my-backdrop-brightness', 'backdropBrightness')
+                // utility('my-backdrop-contrast', 'backdropContrast')
+                // utility('my-backdrop-grayscale', 'backdropGrayscale')
+                // utility('my-backdrop-hue-rotate', 'backdropHueRotate')
+                // utility('my-backdrop-invert', 'backdropInvert')
+                // utility('my-backdrop-opacity', 'backdropOpacity')
+                // utility('my-backdrop-saturate', 'backdropSaturate')
+                // utility('my-backdrop-sepia', 'backdropSepia')
+                // utility('my-divide-width', 'divideWidth')
+                utility('my-border-width', 'borderWidth')
+                utility('my-brightness', 'brightness')
+                utility('my-columns', 'columns')
+                utility('my-contrast', 'contrast')
+                utility('my-flex-grow', 'flexGrow')
+                utility('my-flex-shrink', 'flexShrink')
+                utility('my-gradient-color-stop-positions', 'gradientColorStopPositions')
+                utility('my-grayscale', 'grayscale')
+                utility('my-grid-row-end', 'gridRowEnd')
+                utility('my-grid-row-start', 'gridRowStart')
+                utility('my-grid-template-columns', 'gridTemplateColumns')
+                utility('my-grid-template-rows', 'gridTemplateRows')
+                utility('my-hue-rotate', 'hueRotate')
+                utility('my-invert', 'invert')
+                utility('my-line-clamp', 'lineClamp')
+                utility('my-opacity', 'opacity')
+                utility('my-order', 'order')
+                utility('my-outline-offset', 'outlineOffset')
+                utility('my-outline-width', 'outlineWidth')
+                utility('my-ring-offset-width', 'ringOffsetWidth')
+                utility('my-ring-width', 'ringWidth')
+                utility('my-rotate', 'rotate')
+                utility('my-saturate', 'saturate')
+                utility('my-scale', 'scale')
+                utility('my-sepia', 'sepia')
+                utility('my-skew', 'skew')
+                utility('my-stroke-width', 'strokeWidth')
+                utility('my-text-decoration-thickness', 'textDecorationThickness')
+                utility('my-text-underline-offset', 'textUnderlineOffset')
+                utility('my-transition-delay', 'transitionDelay')
+                utility('my-transition-duration', 'transitionDuration')
+                utility('my-z-index', 'zIndex')
+              }),
             }
-
-            utility('my-aspect', 'aspectRatio')
-            // The following keys deliberately doesn't work as these are exported
-            // as functions from the compat config.
-            //
-            // utility('my-backdrop-brightness', 'backdropBrightness')
-            // utility('my-backdrop-contrast', 'backdropContrast')
-            // utility('my-backdrop-grayscale', 'backdropGrayscale')
-            // utility('my-backdrop-hue-rotate', 'backdropHueRotate')
-            // utility('my-backdrop-invert', 'backdropInvert')
-            // utility('my-backdrop-opacity', 'backdropOpacity')
-            // utility('my-backdrop-saturate', 'backdropSaturate')
-            // utility('my-backdrop-sepia', 'backdropSepia')
-            // utility('my-divide-width', 'divideWidth')
-            utility('my-border-width', 'borderWidth')
-            utility('my-brightness', 'brightness')
-            utility('my-columns', 'columns')
-            utility('my-contrast', 'contrast')
-            utility('my-flex-grow', 'flexGrow')
-            utility('my-flex-shrink', 'flexShrink')
-            utility('my-gradient-color-stop-positions', 'gradientColorStopPositions')
-            utility('my-grayscale', 'grayscale')
-            utility('my-grid-row-end', 'gridRowEnd')
-            utility('my-grid-row-start', 'gridRowStart')
-            utility('my-grid-template-columns', 'gridTemplateColumns')
-            utility('my-grid-template-rows', 'gridTemplateRows')
-            utility('my-hue-rotate', 'hueRotate')
-            utility('my-invert', 'invert')
-            utility('my-line-clamp', 'lineClamp')
-            utility('my-opacity', 'opacity')
-            utility('my-order', 'order')
-            utility('my-outline-offset', 'outlineOffset')
-            utility('my-outline-width', 'outlineWidth')
-            utility('my-ring-offset-width', 'ringOffsetWidth')
-            utility('my-ring-width', 'ringWidth')
-            utility('my-rotate', 'rotate')
-            utility('my-saturate', 'saturate')
-            utility('my-scale', 'scale')
-            utility('my-sepia', 'sepia')
-            utility('my-skew', 'skew')
-            utility('my-stroke-width', 'strokeWidth')
-            utility('my-text-decoration-thickness', 'textDecorationThickness')
-            utility('my-text-underline-offset', 'textUnderlineOffset')
-            utility('my-transition-delay', 'transitionDelay')
-            utility('my-transition-duration', 'transitionDuration')
-            utility('my-z-index', 'zIndex')
-          }),
-        }
-      },
-    })
-
-    let output = build([
-      'my-aspect-2/5',
-      // 'my-backdrop-brightness-1',
-      // 'my-backdrop-contrast-1',
-      // 'my-backdrop-grayscale-1',
-      // 'my-backdrop-hue-rotate-1',
-      // 'my-backdrop-invert-1',
-      // 'my-backdrop-opacity-1',
-      // 'my-backdrop-saturate-1',
-      // 'my-backdrop-sepia-1',
-      // 'my-divide-width-1',
-      'my-border-width-1',
-      'my-brightness-1',
-      'my-columns-1',
-      'my-contrast-1',
-      'my-flex-grow-1',
-      'my-flex-shrink-1',
-      'my-gradient-color-stop-positions-1',
-      'my-grayscale-1',
-      'my-grid-row-end-1',
-      'my-grid-row-start-1',
-      'my-grid-template-columns-1',
-      'my-grid-template-rows-1',
-      'my-hue-rotate-1',
-      'my-invert-1',
-      'my-line-clamp-1',
-      'my-opacity-1',
-      'my-order-1',
-      'my-outline-offset-1',
-      'my-outline-width-1',
-      'my-ring-offset-width-1',
-      'my-ring-width-1',
-      'my-rotate-1',
-      'my-saturate-1',
-      'my-scale-1',
-      'my-sepia-1',
-      'my-skew-1',
-      'my-stroke-width-1',
-      'my-text-decoration-thickness-1',
-      'my-text-underline-offset-1',
-      'my-transition-delay-1',
-      'my-transition-duration-1',
-      'my-z-index-1',
-    ])
-
-    expect(output).toMatchInlineSnapshot(`
-      ".my-aspect-2\\/5 {
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .my-aspect-2\\/5 {
         --value: 2/5;
       }
+
       .my-border-width-1 {
         --value: 1px;
       }
+
       .my-brightness-1 {
         --value: 1%;
       }
+
       .my-columns-1 {
         --value: 1;
       }
+
       .my-contrast-1 {
         --value: 1%;
       }
-      .my-flex-grow-1 {
+
+      .my-flex-grow-1, .my-flex-shrink-1 {
         --value: 1;
       }
-      .my-flex-shrink-1 {
-        --value: 1;
-      }
-      .my-gradient-color-stop-positions-1 {
+
+      .my-gradient-color-stop-positions-1, .my-grayscale-1 {
         --value: 1%;
       }
-      .my-grayscale-1 {
-        --value: 1%;
-      }
-      .my-grid-row-end-1 {
+
+      .my-grid-row-end-1, .my-grid-row-start-1 {
         --value: 1;
       }
-      .my-grid-row-start-1 {
-        --value: 1;
-      }
-      .my-grid-template-columns-1 {
-        --value: repeat(1, minmax(0, 1fr));
-      }
-      .my-grid-template-rows-1 {
+
+      .my-grid-template-columns-1, .my-grid-template-rows-1 {
         --value: repeat(1, minmax(0, 1fr));
       }
+
       .my-hue-rotate-1 {
         --value: 1deg;
       }
+
       .my-invert-1 {
         --value: 1%;
       }
+
       .my-line-clamp-1 {
         --value: 1;
       }
+
       .my-opacity-1 {
         --value: 1%;
       }
+
       .my-order-1 {
         --value: 1;
       }
-      .my-outline-offset-1 {
-        --value: 1px;
-      }
-      .my-outline-width-1 {
-        --value: 1px;
-      }
-      .my-ring-offset-width-1 {
-        --value: 1px;
-      }
-      .my-ring-width-1 {
+
+      .my-outline-offset-1, .my-outline-width-1, .my-ring-offset-width-1, .my-ring-width-1 {
         --value: 1px;
       }
+
       .my-rotate-1 {
         --value: 1deg;
       }
-      .my-saturate-1 {
-        --value: 1%;
-      }
-      .my-scale-1 {
-        --value: 1%;
-      }
-      .my-sepia-1 {
+
+      .my-saturate-1, .my-scale-1, .my-sepia-1 {
         --value: 1%;
       }
+
       .my-skew-1 {
         --value: 1deg;
       }
+
       .my-stroke-width-1 {
         --value: 1;
       }
-      .my-text-decoration-thickness-1 {
+
+      .my-text-decoration-thickness-1, .my-text-underline-offset-1 {
         --value: 1px;
       }
-      .my-text-underline-offset-1 {
-        --value: 1px;
-      }
-      .my-transition-delay-1 {
-        --value: 1ms;
-      }
-      .my-transition-duration-1 {
+
+      .my-transition-delay-1, .my-transition-duration-1 {
         --value: 1ms;
       }
+
       .my-z-index-1 {
         --value: 1;
       }
@@ -1331,202 +1277,211 @@ describe('theme', async () => {
   })
 
   test('can use escaped JS variables in theme values', async () => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(
-            function ({ matchUtilities, theme }) {
-              matchUtilities(
-                { 'my-width': (value) => ({ width: value }) },
-                { values: theme('width') },
-              )
-            },
-            {
-              theme: {
-                extend: {
-                  width: {
-                    '1': '0.25rem',
-                    // Purposely setting to something different from the v3 default
-                    '1/2': '60%',
-                    '1.5': '0.375rem',
+    expect(
+      await run(
+        ['my-width-1', 'my-width-1/2', 'my-width-1.5'],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(
+                function ({ matchUtilities, theme }) {
+                  matchUtilities(
+                    { 'my-width': (value) => ({ width: value }) },
+                    { values: theme('width') },
+                  )
+                },
+                {
+                  theme: {
+                    extend: {
+                      width: {
+                        '1': '0.25rem',
+                        // Purposely setting to something different from the v3 default
+                        '1/2': '60%',
+                        '1.5': '0.375rem',
+                      },
+                    },
                   },
                 },
-              },
-            },
-          ),
-        }
-      },
-    })
+              ),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .my-width-1 {
+        width: .25rem;
+      }
 
-    expect(compiler.build(['my-width-1', 'my-width-1/2', 'my-width-1.5'])).toMatchInlineSnapshot(
-      `
-      ".my-width-1 {
-        width: 0.25rem;
-      }
       .my-width-1\\.5 {
-        width: 0.375rem;
+        width: .375rem;
       }
+
       .my-width-1\\/2 {
         width: 60%;
       }
       "
-    `,
-    )
+    `)
   })
 
   test('can use escaped CSS variables in theme values', async () => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
+    expect(
+      await run(
+        ['my-width-1', 'my-width-1.5', 'my-width-1/2', 'my-width-2.5'],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
 
-      @theme {
-        --width-1: 0.25rem;
-        /* Purposely setting to something different from the v3 default */
-        --width-1\/2: 60%;
-        --width-1\.5: 0.375rem;
-        --width-2_5: 0.625rem;
+          @theme {
+            --width-1: 0.25rem;
+            /* Purposely setting to something different from the v3 default */
+            --width-1\/2: 60%;
+            --width-1\.5: 0.375rem;
+            --width-2_5: 0.625rem;
+          }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(function ({ matchUtilities, theme }) {
+                matchUtilities(
+                  { 'my-width': (value) => ({ width: value }) },
+                  { values: theme('width') },
+                )
+              }),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .my-width-1 {
+        width: .25rem;
       }
-    `
 
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(function ({ matchUtilities, theme }) {
-            matchUtilities(
-              { 'my-width': (value) => ({ width: value }) },
-              { values: theme('width') },
-            )
-          }),
-        }
-      },
-    })
+      .my-width-1\\.5 {
+        width: .375rem;
+      }
 
-    expect(compiler.build(['my-width-1', 'my-width-1.5', 'my-width-1/2', 'my-width-2.5']))
-      .toMatchInlineSnapshot(`
-        ".my-width-1 {
-          width: 0.25rem;
-        }
-        .my-width-1\\.5 {
-          width: 0.375rem;
-        }
-        .my-width-1\\/2 {
-          width: 60%;
-        }
-        .my-width-2\\.5 {
-          width: 0.625rem;
-        }
-        :root {
-          --width-1: 0.25rem;
-          --width-1\\/2: 60%;
-          --width-1\\.5: 0.375rem;
-          --width-2_5: 0.625rem;
-        }
-        "
-      `)
+      .my-width-1\\/2 {
+        width: 60%;
+      }
+
+      .my-width-2\\.5 {
+        width: .625rem;
+      }
+      "
+    `)
   })
 
   test('can use escaped CSS variables in referenced theme namespace', async () => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "my-plugin";
+    expect(
+      await run(
+        ['my-width-1', 'my-width-1.5', 'my-width-1/2', 'my-width-2.5'],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
 
-      @theme {
-        --width-1: 0.25rem;
-        /* Purposely setting to something different from the v3 default */
-        --width-1\/2: 60%;
-        --width-1\.5: 0.375rem;
-        --width-2_5: 0.625rem;
+          @theme {
+            --width-1: 0.25rem;
+            /* Purposely setting to something different from the v3 default */
+            --width-1\/2: 60%;
+            --width-1\.5: 0.375rem;
+            --width-2_5: 0.625rem;
+          }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(
+                function ({ matchUtilities, theme }) {
+                  matchUtilities(
+                    { 'my-width': (value) => ({ width: value }) },
+                    { values: theme('myWidth') },
+                  )
+                },
+                {
+                  theme: { myWidth: ({ theme }) => theme('width') },
+                },
+              ),
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .my-width-1 {
+        width: .25rem;
       }
-    `
 
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        return {
-          base,
-          module: plugin(
-            function ({ matchUtilities, theme }) {
-              matchUtilities(
-                { 'my-width': (value) => ({ width: value }) },
-                { values: theme('myWidth') },
-              )
-            },
-            {
-              theme: { myWidth: ({ theme }) => theme('width') },
-            },
-          ),
-        }
-      },
-    })
+      .my-width-1\\.5 {
+        width: .375rem;
+      }
 
-    expect(compiler.build(['my-width-1', 'my-width-1.5', 'my-width-1/2', 'my-width-2.5']))
-      .toMatchInlineSnapshot(`
-        ".my-width-1 {
-          width: 0.25rem;
-        }
-        .my-width-1\\.5 {
-          width: 0.375rem;
-        }
-        .my-width-1\\/2 {
-          width: 60%;
-        }
-        .my-width-2\\.5 {
-          width: 0.625rem;
-        }
-        :root {
-          --width-1: 0.25rem;
-          --width-1\\/2: 60%;
-          --width-1\\.5: 0.375rem;
-          --width-2_5: 0.625rem;
-        }
-        "
-      `)
+      .my-width-1\\/2 {
+        width: 60%;
+      }
+
+      .my-width-2\\.5 {
+        width: .625rem;
+      }
+      "
+    `)
   })
 })
 
 describe('addBase', () => {
   test('does not create rules when imported via `@import "…" reference`', async () => {
-    let input = css`
-      @tailwind utilities;
-      @plugin "outside";
-      @import './inside.css' reference;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async (id, base) => {
-        if (id === 'inside') {
-          return {
-            base,
-            module: plugin(function ({ addBase }) {
-              addBase({ inside: { color: 'red' } })
-            }),
-          }
-        }
-        return {
-          base,
-          module: plugin(function ({ addBase }) {
-            addBase({ outside: { color: 'red' } })
-          }),
-        }
-      },
-      async loadStylesheet() {
-        return {
-          content: css`
-            @plugin "inside";
-          `,
-          base: '',
-        }
-      },
-    })
-
-    expect(compiler.build([])).toMatchInlineSnapshot(`
-      "@layer base {
+    expect(
+      await compileCss(
+        css`
+          @tailwind utilities;
+          @plugin "outside";
+          @import './inside.css' reference;
+        `,
+        {
+          loadModule: async (_id, base) => {
+            if (_id === 'inside') {
+              return {
+                path: '',
+                base,
+                module: plugin(function ({ addBase }) {
+                  addBase({ inside: { color: 'red' } })
+                }),
+              }
+            }
+            return {
+              path: '',
+              base,
+              module: plugin(function ({ addBase }) {
+                addBase({ outside: { color: 'red' } })
+              }),
+            }
+          },
+          async loadStylesheet() {
+            return {
+              path: '',
+              base: '',
+              content: css`
+                @plugin "inside";
+              `,
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer base {
         outside {
           color: red;
         }
@@ -1534,150 +1489,350 @@ describe('addBase', () => {
       "
     `)
   })
+
+  test('does not modify CSS variables', async () => {
+    expect(
+      await compileCss(
+        css`
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: plugin(function ({ addBase }) {
+              addBase({ ':root': { '--PascalCase': '1', '--camelCase': '1', '--UPPERCASE': '1' } })
+            }),
+          }),
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer base {
+        :root {
+          --PascalCase: 1;
+          --camelCase: 1;
+          --UPPERCASE: 1;
+        }
+      }
+      "
+    `)
+  })
+
+  test('@variant is replaced inside rules using addBase', async () => {
+    expect(
+      await compileCss(
+        css`
+          @plugin "my-plugin";
+          @theme {
+            --breakpoint-supertiny: 128px;
+          }
+        `,
+        {
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: plugin(function ({ addBase }) {
+              addBase({
+                ':root': {
+                  '@variant supertiny': {
+                    '--PascalCase': '1',
+                    '--camelCase': '1',
+                    '--UPPERCASE': '1',
+                  },
+                  '@variant data-enabled:focus, disabled': {
+                    '--x': '1',
+                  },
+                },
+              })
+            }),
+          }),
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer base {
+        @media (min-width: 128px) {
+          :root {
+            --PascalCase: 1;
+            --camelCase: 1;
+            --UPPERCASE: 1;
+          }
+        }
+
+        :root[data-enabled]:focus, :root:disabled {
+          --x: 1;
+        }
+      }
+      "
+    `)
+  })
+
+  test('@variant inside addBase works with custom variants', async () => {
+    expect(
+      await compileCss(
+        css`
+          @plugin "my-plugin";
+
+          @custom-variant custom (&.custom);
+        `,
+        {
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: plugin(function ({ addBase }) {
+              addBase({
+                ':root': {
+                  '@variant custom': {
+                    '--x': '1',
+                  },
+                },
+              })
+            }),
+          }),
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer base {
+        :root.custom {
+          --x: 1;
+        }
+      }
+      "
+    `)
+  })
 })
 
 describe('addVariant', () => {
   test('addVariant with string selector', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ addVariant }: PluginAPI) => {
-              addVariant('hocus', '&:hover, &:focus')
-            },
+    expect(
+      await run(
+        ['hocus:underline', 'group-hocus:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ addVariant }: PluginAPI) => {
+                addVariant('hocus', '&:hover, &:focus')
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build(['hocus:underline', 'group-hocus:flex'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
-        .group-hocus\\:flex:is(:is(:where(.group):hover, :where(.group):focus) *) {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        :is(:is(:where(.group):hover, :where(.group):focus) .group-hocus\\:flex) {
           display: flex;
         }
 
         .hocus\\:underline:hover, .hocus\\:underline:focus {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
+    `)
+  })
+
+  test('addVariant with `@scope`', async () => {
+    expect(
+      await run(
+        ['blue:underline', 'green:underline'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ addVariant }: PluginAPI) => {
+                addVariant('blue', '@scope ([data-theme=blue]) to ([data-theme])')
+                addVariant('green', '@scope ([data-theme=green]) to ([data-theme]) { & }')
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        @scope ([data-theme="blue"]) to ([data-theme]) {
+          .blue\\:underline {
+            text-decoration-line: underline;
+          }
+        }
+
+        @scope ([data-theme="green"]) to ([data-theme]) {
+          .green\\:underline {
+            text-decoration-line: underline;
+          }
+        }
+      }
+      "
+    `)
+  })
+
+  test('matchVariant with `@scope`', async () => {
+    expect(
+      await run(
+        ['theme-[blue]:underline'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('theme', (value) => `@scope ([data-theme=${value}]) to ([data-theme])`)
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        @scope ([data-theme="blue"]) to ([data-theme]) {
+          .theme-\\[blue\\]\\:underline {
+            text-decoration-line: underline;
+          }
+        }
+      }
+      "
     `)
   })
 
   test('addVariant with array of selectors', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ addVariant }: PluginAPI) => {
-              addVariant('hocus', ['&:hover', '&:focus'])
-            },
+    expect(
+      await run(
+        ['hocus:underline', 'group-hocus:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ addVariant }: PluginAPI) => {
+                addVariant('hocus', ['&:hover', '&:focus'])
+              },
+            }
+          },
         },
-      },
-    )
-
-    let compiled = build(['hocus:underline', 'group-hocus:flex'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
-        .group-hocus\\:flex:is(:where(.group):hover *), .group-hocus\\:flex:is(:where(.group):focus *) {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        :is(:where(.group):hover .group-hocus\\:flex), :is(:where(.group):focus .group-hocus\\:flex) {
           display: flex;
         }
 
         .hocus\\:underline:hover, .hocus\\:underline:focus {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('addVariant with object syntax and @slot', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ addVariant }: PluginAPI) => {
-              addVariant('hocus', {
-                '&:hover': '@slot',
-                '&:focus': '@slot',
-              })
-            },
+    expect(
+      await run(
+        ['hocus:underline', 'group-hocus:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ addVariant }: PluginAPI) => {
+                addVariant('hocus', {
+                  '&:hover': '@slot',
+                  '&:focus': '@slot',
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build(['hocus:underline', 'group-hocus:flex'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
-        .group-hocus\\:flex:is(:where(.group):hover *), .group-hocus\\:flex:is(:where(.group):focus *) {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        :is(:where(.group):hover .group-hocus\\:flex), :is(:where(.group):focus .group-hocus\\:flex) {
           display: flex;
         }
 
         .hocus\\:underline:hover, .hocus\\:underline:focus {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('addVariant with object syntax, media, nesting and multiple @slot', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ addVariant }: PluginAPI) => {
-              addVariant('hocus', {
-                '@media (hover: hover)': {
-                  '&:hover': '@slot',
-                },
-                '&:focus': '@slot',
-              })
-            },
+    expect(
+      await run(
+        ['hocus:underline', 'group-hocus:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ addVariant }: PluginAPI) => {
+                addVariant('hocus', {
+                  '@media (hover: hover)': {
+                    '&:hover': '@slot',
+                  },
+                  '&:focus': '@slot',
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build(['hocus:underline', 'group-hocus:flex'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         @media (hover: hover) {
-          .group-hocus\\:flex:is(:where(.group):hover *) {
+          :is(:where(.group):hover .group-hocus\\:flex) {
             display: flex;
           }
         }
 
-        .group-hocus\\:flex:is(:where(.group):focus *) {
+        :is(:where(.group):focus .group-hocus\\:flex) {
           display: flex;
         }
 
@@ -1690,37 +1845,40 @@ describe('addVariant', () => {
         .hocus\\:underline:focus {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('addVariant with at-rules and placeholder', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ addVariant }: PluginAPI) => {
-              addVariant(
-                'potato',
-                '@media (max-width: 400px) { @supports (font:bold) { &:large-potato } }',
-              )
-            },
+    expect(
+      await run(
+        ['potato:underline', 'potato:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ addVariant }: PluginAPI) => {
+                addVariant(
+                  'potato',
+                  '@media (max-width: 400px) { @supports (font:bold) { &:large-potato } }',
+                )
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build(['potato:underline', 'potato:flex'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
-        @media (width <= 400px) {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        @media (max-width: 400px) {
           @supports (font: bold) {
             .potato\\:flex:large-potato {
               display: flex;
@@ -1731,39 +1889,42 @@ describe('addVariant', () => {
             }
           }
         }
-      }"
+      }
+      "
     `)
   })
 
   test('@slot is preserved when used as a custom property value', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ addVariant }: PluginAPI) => {
-              addVariant('hocus', {
-                '&': {
-                  '--custom-property': '@slot',
-                  '&:hover': '@slot',
-                  '&:focus': '@slot',
-                },
-              })
-            },
+    expect(
+      await run(
+        ['hocus:underline'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ addVariant }: PluginAPI) => {
+                addVariant('hocus', {
+                  '&': {
+                    '--custom-property': '@slot',
+                    '&:hover': '@slot',
+                    '&:focus': '@slot',
+                  },
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build(['hocus:underline'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         .hocus\\:underline {
           --custom-property: @slot;
         }
@@ -1771,35 +1932,73 @@ describe('addVariant', () => {
         .hocus\\:underline:hover, .hocus\\:underline:focus {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
+    `)
+  })
+
+  test('ignores variants that use :merge(…) and ensures `peer-*` and `group-*` rules work out of the box', async () => {
+    expect(
+      await run(
+        ['optional:flex', 'group-optional:flex', 'peer-optional:flex', 'group-optional/foo:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ addVariant }: PluginAPI) => {
+                addVariant('optional', '&:optional')
+                addVariant('group-optional', { ':merge(.group):optional &': '@slot' })
+                addVariant('peer-optional', { '&': { ':merge(.peer):optional ~ &': '@slot' } })
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        :is(:where(.group):optional .group-optional\\:flex), :is(:where(.group\\/foo):optional .group-optional\\/foo\\:flex), :is(:where(.peer):optional ~ .peer-optional\\:flex), .optional\\:flex:optional {
+          display: flex;
+        }
+      }
+      "
     `)
   })
 })
 
 describe('matchVariant', () => {
   test('partial arbitrary variants', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('potato', (flavor) => `.potato-${flavor} &`)
-            },
+    expect(
+      await run(
+        ['potato-[yellow]:underline', 'potato-[baked]:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('potato', (flavor) => `.potato-${flavor} &`)
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build(['potato-[yellow]:underline', 'potato-[baked]:flex'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         .potato-baked .potato-\\[baked\\]\\:flex {
           display: flex;
         }
@@ -1807,33 +2006,36 @@ describe('matchVariant', () => {
         .potato-yellow .potato-\\[yellow\\]\\:underline {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('partial arbitrary variants with at-rules', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('potato', (flavor) => `@media (potato: ${flavor})`)
-            },
+    expect(
+      await run(
+        ['potato-[yellow]:underline', 'potato-[baked]:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('potato', (flavor) => `@media (potato: ${flavor})`)
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build(['potato-[yellow]:underline', 'potato-[baked]:flex'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         @media (potato: baked) {
           .potato-\\[baked\\]\\:flex {
             display: flex;
@@ -1845,37 +2047,38 @@ describe('matchVariant', () => {
             text-decoration-line: underline;
           }
         }
-      }"
+      }
+      "
     `)
   })
 
   test('partial arbitrary variants with at-rules and placeholder', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant(
-                'potato',
-                (flavor) =>
-                  `@media (potato: ${flavor}) { @supports (font:bold) { &:large-potato } }`,
-              )
-            },
+    expect(
+      await run(
+        ['potato-[yellow]:underline', 'potato-[baked]:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('potato', (flavor) => {
+                  return `@media (potato: ${flavor}) { @supports (font:bold) { &:large-potato } }`
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build(['potato-[yellow]:underline', 'potato-[baked]:flex'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         @media (potato: baked) {
           @supports (font: bold) {
             .potato-\\[baked\\]\\:flex:large-potato {
@@ -1891,38 +2094,41 @@ describe('matchVariant', () => {
             }
           }
         }
-      }"
+      }
+      "
     `)
   })
 
   test('partial arbitrary variants with default values', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('tooltip', (side) => `&${side}`, {
-                values: {
-                  bottom: '[data-location="bottom"]',
-                  top: '[data-location="top"]',
-                },
-              })
-            },
+    expect(
+      await run(
+        ['tooltip-bottom:underline', 'tooltip-top:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('tooltip', (side) => `&${side}`, {
+                  values: {
+                    bottom: '[data-location="bottom"]',
+                    top: '[data-location="top"]',
+                  },
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build(['tooltip-bottom:underline', 'tooltip-top:flex'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         .tooltip-bottom\\:underline[data-location="bottom"] {
           text-decoration-line: underline;
         }
@@ -1930,302 +2136,309 @@ describe('matchVariant', () => {
         .tooltip-top\\:flex[data-location="top"] {
           display: flex;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('matched variant values maintain the sort order they are registered in', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('alphabet', (side) => `&${side}`, {
-                values: {
-                  d: '[data-order="1"]',
-                  a: '[data-order="2"]',
-                  c: '[data-order="3"]',
-                  b: '[data-order="4"]',
-                },
-              })
-            },
+    expect(
+      await run(
+        [
+          'alphabet-c:underline',
+          'alphabet-a:underline',
+          'alphabet-d:underline',
+          'alphabet-b:underline',
+        ],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('alphabet', (side) => `&${side}`, {
+                  values: {
+                    d: '[data-order="1"]',
+                    a: '[data-order="2"]',
+                    c: '[data-order="3"]',
+                    b: '[data-order="4"]',
+                  },
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build([
-      'alphabet-c:underline',
-      'alphabet-a:underline',
-      'alphabet-d:underline',
-      'alphabet-b:underline',
-    ])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         .alphabet-d\\:underline[data-order="1"], .alphabet-a\\:underline[data-order="2"], .alphabet-c\\:underline[data-order="3"], .alphabet-b\\:underline[data-order="4"] {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('matchVariant can return an array of format strings from the function', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('test', (selector) =>
-                selector.split(',').map((selector) => `&.${selector} > *`),
-              )
-            },
+    expect(
+      await run(
+        ['test-[a,b,c]:underline'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('test', (selector) =>
+                  selector.split(',').map((selector) => `&.${selector} > *`),
+                )
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build(['test-[a,b,c]:underline'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         .test-\\[a\\,b\\,c\\]\\:underline.a > *, .test-\\[a\\,b\\,c\\]\\:underline.b > *, .test-\\[a\\,b\\,c\\]\\:underline.c > * {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('should be possible to sort variants', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('testmin', (value) => `@media (min-width: ${value})`, {
-                sort(a, z) {
-                  return parseInt(a.value) - parseInt(z.value)
-                },
-              })
-            },
+    expect(
+      await run(
+        ['testmin-[600px]:flex', 'testmin-[500px]:underline', 'testmin-[700px]:italic'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('testmin', (value) => `@media (min-width: ${value})`, {
+                  sort(a, z) {
+                    return parseInt(a.value) - parseInt(z.value)
+                  },
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build([
-      'testmin-[600px]:flex',
-      'testmin-[500px]:underline',
-      'testmin-[700px]:italic',
-    ])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
-        @media (width >= 500px) {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        @media (min-width: 500px) {
           .testmin-\\[500px\\]\\:underline {
             text-decoration-line: underline;
           }
         }
 
-        @media (width >= 600px) {
+        @media (min-width: 600px) {
           .testmin-\\[600px\\]\\:flex {
             display: flex;
           }
         }
 
-        @media (width >= 700px) {
+        @media (min-width: 700px) {
           .testmin-\\[700px\\]\\:italic {
             font-style: italic;
           }
         }
-      }"
+      }
+      "
     `)
   })
 
   test('should be possible to compare arbitrary variants and hardcoded variants', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('testmin', (value) => `@media (min-width: ${value})`, {
-                values: {
-                  example: '600px',
-                },
-                sort(a, z) {
-                  return parseInt(a.value) - parseInt(z.value)
-                },
-              })
-            },
+    expect(
+      await run(
+        ['testmin-[700px]:italic', 'testmin-example:italic', 'testmin-[500px]:italic'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('testmin', (value) => `@media (min-width: ${value})`, {
+                  values: { example: '600px' },
+                  sort(a, z) {
+                    return parseInt(a.value) - parseInt(z.value)
+                  },
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build([
-      'testmin-[700px]:italic',
-      'testmin-example:italic',
-      'testmin-[500px]:italic',
-    ])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
-        @media (width >= 500px) {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        @media (min-width: 500px) {
           .testmin-\\[500px\\]\\:italic {
             font-style: italic;
           }
         }
 
-        @media (width >= 600px) {
+        @media (min-width: 600px) {
           .testmin-example\\:italic {
             font-style: italic;
           }
         }
 
-        @media (width >= 700px) {
+        @media (min-width: 700px) {
           .testmin-\\[700px\\]\\:italic {
             font-style: italic;
           }
         }
-      }"
+      }
+      "
     `)
   })
 
   test('should be possible to sort stacked arbitrary variants correctly', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('testmin', (value) => `@media (min-width: ${value})`, {
-                sort(a, z) {
-                  return parseInt(a.value) - parseInt(z.value)
-                },
-              })
-
-              matchVariant('testmax', (value) => `@media (max-width: ${value})`, {
-                sort(a, z) {
-                  return parseInt(z.value) - parseInt(a.value)
-                },
-              })
-            },
+    expect(
+      await run(
+        [
+          'testmin-[150px]:testmax-[400px]:order-2',
+          'testmin-[100px]:testmax-[350px]:order-3',
+          'testmin-[100px]:testmax-[300px]:order-4',
+          'testmin-[100px]:testmax-[400px]:order-1',
+        ],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('testmin', (value) => `@media (min-width: ${value})`, {
+                  sort(a, z) {
+                    return parseInt(a.value) - parseInt(z.value)
+                  },
+                })
+
+                matchVariant('testmax', (value) => `@media (max-width: ${value})`, {
+                  sort(a, z) {
+                    return parseInt(z.value) - parseInt(a.value)
+                  },
+                })
+              },
+            }
+          },
         },
-      },
-    )
-
-    let compiled = build([
-      'testmin-[150px]:testmax-[400px]:order-2',
-      'testmin-[100px]:testmax-[350px]:order-3',
-      'testmin-[100px]:testmax-[300px]:order-4',
-      'testmin-[100px]:testmax-[400px]:order-1',
-    ])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
-        @media (width >= 100px) {
-          @media (width <= 400px) {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        @media (min-width: 100px) {
+          @media (max-width: 400px) {
             .testmin-\\[100px\\]\\:testmax-\\[400px\\]\\:order-1 {
               order: 1;
             }
           }
         }
 
-        @media (width >= 150px) {
-          @media (width <= 400px) {
+        @media (min-width: 150px) {
+          @media (max-width: 400px) {
             .testmin-\\[150px\\]\\:testmax-\\[400px\\]\\:order-2 {
               order: 2;
             }
           }
         }
 
-        @media (width >= 100px) {
-          @media (width <= 350px) {
+        @media (min-width: 100px) {
+          @media (max-width: 350px) {
             .testmin-\\[100px\\]\\:testmax-\\[350px\\]\\:order-3 {
               order: 3;
             }
           }
 
-          @media (width <= 300px) {
+          @media (max-width: 300px) {
             .testmin-\\[100px\\]\\:testmax-\\[300px\\]\\:order-4 {
               order: 4;
             }
           }
         }
-      }"
+      }
+      "
     `)
   })
 
   test('should maintain sort from other variants, if sort functions of arbitrary variants return 0', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('testmin', (value) => `@media (min-width: ${value})`, {
-                sort(a, z) {
-                  return parseInt(a.value) - parseInt(z.value)
-                },
-              })
-
-              matchVariant('testmax', (value) => `@media (max-width: ${value})`, {
-                sort(a, z) {
-                  return parseInt(z.value) - parseInt(a.value)
-                },
-              })
-            },
-          }
-        },
-      },
-    )
-    let compiled = build([
-      'testmin-[100px]:testmax-[200px]:focus:underline',
-      'testmin-[100px]:testmax-[200px]:hover:underline',
-    ])
-
     // Expect :focus to come after :hover
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
-        @media (width >= 100px) {
-          @media (width <= 200px) {
+    expect(
+      await run(
+        [
+          'testmin-[100px]:testmax-[200px]:focus:underline',
+          'testmin-[100px]:testmax-[200px]:hover:underline',
+        ],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('testmin', (value) => `@media (min-width: ${value})`, {
+                  sort(a, z) {
+                    return parseInt(a.value) - parseInt(z.value)
+                  },
+                })
+
+                matchVariant('testmax', (value) => `@media (max-width: ${value})`, {
+                  sort(a, z) {
+                    return parseInt(z.value) - parseInt(a.value)
+                  },
+                })
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        @media (min-width: 100px) {
+          @media (max-width: 200px) {
             @media (hover: hover) {
               .testmin-\\[100px\\]\\:testmax-\\[200px\\]\\:hover\\:underline:hover {
                 text-decoration-line: underline;
@@ -2237,618 +2450,782 @@ describe('matchVariant', () => {
             }
           }
         }
-      }"
+      }
+      "
     `)
   })
 
   test('should sort arbitrary variants left to right (1)', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('testmin', (value) => `@media (min-width: ${value})`, {
-                sort(a, z) {
-                  return parseInt(a.value) - parseInt(z.value)
-                },
-              })
-              matchVariant('testmax', (value) => `@media (max-width: ${value})`, {
-                sort(a, z) {
-                  return parseInt(z.value) - parseInt(a.value)
-                },
-              })
-            },
+    expect(
+      await run(
+        [
+          'testmin-[200px]:testmax-[400px]:order-2',
+          'testmin-[200px]:testmax-[300px]:order-4',
+          'testmin-[100px]:testmax-[400px]:order-1',
+          'testmin-[100px]:testmax-[300px]:order-3',
+        ],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('testmin', (value) => `@media (min-width: ${value})`, {
+                  sort(a, z) {
+                    return parseInt(a.value) - parseInt(z.value)
+                  },
+                })
+                matchVariant('testmax', (value) => `@media (max-width: ${value})`, {
+                  sort(a, z) {
+                    return parseInt(z.value) - parseInt(a.value)
+                  },
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build([
-      'testmin-[200px]:testmax-[400px]:order-2',
-      'testmin-[200px]:testmax-[300px]:order-4',
-      'testmin-[100px]:testmax-[400px]:order-1',
-      'testmin-[100px]:testmax-[300px]:order-3',
-    ])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
-        @media (width >= 100px) {
-          @media (width <= 400px) {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        @media (min-width: 100px) {
+          @media (max-width: 400px) {
             .testmin-\\[100px\\]\\:testmax-\\[400px\\]\\:order-1 {
               order: 1;
             }
           }
         }
 
-        @media (width >= 200px) {
-          @media (width <= 400px) {
+        @media (min-width: 200px) {
+          @media (max-width: 400px) {
             .testmin-\\[200px\\]\\:testmax-\\[400px\\]\\:order-2 {
               order: 2;
             }
           }
         }
 
-        @media (width >= 100px) {
-          @media (width <= 300px) {
+        @media (min-width: 100px) {
+          @media (max-width: 300px) {
             .testmin-\\[100px\\]\\:testmax-\\[300px\\]\\:order-3 {
               order: 3;
             }
           }
         }
 
-        @media (width >= 200px) {
-          @media (width <= 300px) {
+        @media (min-width: 200px) {
+          @media (max-width: 300px) {
             .testmin-\\[200px\\]\\:testmax-\\[300px\\]\\:order-4 {
               order: 4;
             }
           }
         }
-      }"
+      }
+      "
     `)
   })
 
   test('should sort arbitrary variants left to right (2)', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('testmin', (value) => `@media (min-width: ${value})`, {
-                sort(a, z) {
-                  return parseInt(a.value) - parseInt(z.value)
-                },
-              })
-              matchVariant('testmax', (value) => `@media (max-width: ${value})`, {
-                sort(a, z) {
-                  return parseInt(z.value) - parseInt(a.value)
-                },
-              })
-            },
+    expect(
+      await run(
+        [
+          'testmax-[400px]:testmin-[200px]:underline',
+          'testmax-[300px]:testmin-[200px]:underline',
+          'testmax-[400px]:testmin-[100px]:underline',
+          'testmax-[300px]:testmin-[100px]:underline',
+        ],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('testmin', (value) => `@media (min-width: ${value})`, {
+                  sort(a, z) {
+                    return parseInt(a.value) - parseInt(z.value)
+                  },
+                })
+                matchVariant('testmax', (value) => `@media (max-width: ${value})`, {
+                  sort(a, z) {
+                    return parseInt(z.value) - parseInt(a.value)
+                  },
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build([
-      'testmax-[400px]:testmin-[200px]:underline',
-      'testmax-[300px]:testmin-[200px]:underline',
-      'testmax-[400px]:testmin-[100px]:underline',
-      'testmax-[300px]:testmin-[100px]:underline',
-    ])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
-        @media (width <= 400px) {
-          @media (width >= 100px) {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        @media (max-width: 400px) {
+          @media (min-width: 100px) {
             .testmax-\\[400px\\]\\:testmin-\\[100px\\]\\:underline {
               text-decoration-line: underline;
             }
           }
 
-          @media (width >= 200px) {
+          @media (min-width: 200px) {
             .testmax-\\[400px\\]\\:testmin-\\[200px\\]\\:underline {
               text-decoration-line: underline;
             }
           }
         }
 
-        @media (width <= 300px) {
-          @media (width >= 100px) {
+        @media (max-width: 300px) {
+          @media (min-width: 100px) {
             .testmax-\\[300px\\]\\:testmin-\\[100px\\]\\:underline {
               text-decoration-line: underline;
             }
           }
 
-          @media (width >= 200px) {
+          @media (min-width: 200px) {
             .testmax-\\[300px\\]\\:testmin-\\[200px\\]\\:underline {
               text-decoration-line: underline;
             }
           }
         }
-      }"
+      }
+      "
     `)
   })
 
   test('should guarantee that we are not passing values from other variants to the wrong function', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('testmin', (value) => `@media (min-width: ${value})`, {
-                sort(a, z) {
-                  let lookup = ['100px', '200px']
-                  if (lookup.indexOf(a.value) === -1 || lookup.indexOf(z.value) === -1) {
-                    throw new Error('We are seeing values that should not be there!')
-                  }
-                  return lookup.indexOf(a.value) - lookup.indexOf(z.value)
-                },
-              })
-              matchVariant('testmax', (value) => `@media (max-width: ${value})`, {
-                sort(a, z) {
-                  let lookup = ['300px', '400px']
-                  if (lookup.indexOf(a.value) === -1 || lookup.indexOf(z.value) === -1) {
-                    throw new Error('We are seeing values that should not be there!')
-                  }
-                  return lookup.indexOf(z.value) - lookup.indexOf(a.value)
-                },
-              })
-            },
+    expect(
+      await run(
+        [
+          'testmin-[200px]:testmax-[400px]:order-2',
+          'testmin-[200px]:testmax-[300px]:order-4',
+          'testmin-[100px]:testmax-[400px]:order-1',
+          'testmin-[100px]:testmax-[300px]:order-3',
+        ],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('testmin', (value) => `@media (min-width: ${value})`, {
+                  sort(a, z) {
+                    let lookup = ['100px', '200px']
+                    if (lookup.indexOf(a.value) === -1 || lookup.indexOf(z.value) === -1) {
+                      throw new Error('We are seeing values that should not be there!')
+                    }
+                    return lookup.indexOf(a.value) - lookup.indexOf(z.value)
+                  },
+                })
+                matchVariant('testmax', (value) => `@media (max-width: ${value})`, {
+                  sort(a, z) {
+                    let lookup = ['300px', '400px']
+                    if (lookup.indexOf(a.value) === -1 || lookup.indexOf(z.value) === -1) {
+                      throw new Error('We are seeing values that should not be there!')
+                    }
+                    return lookup.indexOf(z.value) - lookup.indexOf(a.value)
+                  },
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build([
-      'testmin-[200px]:testmax-[400px]:order-2',
-      'testmin-[200px]:testmax-[300px]:order-4',
-      'testmin-[100px]:testmax-[400px]:order-1',
-      'testmin-[100px]:testmax-[300px]:order-3',
-    ])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
-        @media (width >= 100px) {
-          @media (width <= 400px) {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        @media (min-width: 100px) {
+          @media (max-width: 400px) {
             .testmin-\\[100px\\]\\:testmax-\\[400px\\]\\:order-1 {
               order: 1;
             }
           }
         }
 
-        @media (width >= 200px) {
-          @media (width <= 400px) {
+        @media (min-width: 200px) {
+          @media (max-width: 400px) {
             .testmin-\\[200px\\]\\:testmax-\\[400px\\]\\:order-2 {
               order: 2;
             }
           }
         }
 
-        @media (width >= 100px) {
-          @media (width <= 300px) {
+        @media (min-width: 100px) {
+          @media (max-width: 300px) {
             .testmin-\\[100px\\]\\:testmax-\\[300px\\]\\:order-3 {
               order: 3;
             }
           }
         }
 
-        @media (width >= 200px) {
-          @media (width <= 300px) {
+        @media (min-width: 200px) {
+          @media (max-width: 300px) {
             .testmin-\\[200px\\]\\:testmax-\\[300px\\]\\:order-4 {
               order: 4;
             }
           }
         }
-      }"
+      }
+      "
     `)
   })
 
   test('should default to the DEFAULT value for variants', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('foo', (value) => `.foo${value} &`, {
-                values: {
-                  DEFAULT: '.bar',
-                },
-              })
-            },
+    expect(
+      await run(
+        ['foo:underline'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('foo', (value) => `.foo${value} &`, {
+                  values: { DEFAULT: '.bar' },
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build(['foo:underline'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         .foo.bar .foo\\:underline {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('should not generate anything if the matchVariant does not have a DEFAULT value configured', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('foo', (value) => `.foo${value} &`)
-            },
+    expect(
+      await run(
+        ['foo:underline'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('foo', (value) => `.foo${value} &`)
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build(['foo:underline'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`"@layer utilities;"`)
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities;
+      "
+    `)
   })
 
   test('should be possible to use `null` as a DEFAULT value', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('foo', (value) => `.foo${value === null ? '-good' : '-bad'} &`, {
-                values: { DEFAULT: null },
-              })
-            },
+    expect(
+      await run(
+        ['foo:underline'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('foo', (value) => `.foo${value === null ? '-good' : '-bad'} &`, {
+                  values: { DEFAULT: null },
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build(['foo:underline'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         .foo-good .foo\\:underline {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('should be possible to use `undefined` as a DEFAULT value', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('foo', (value) => `.foo${value === undefined ? '-good' : '-bad'} &`, {
-                values: { DEFAULT: undefined },
-              })
-            },
+    expect(
+      await run(
+        ['foo:underline'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('foo', (value) => `.foo${value === undefined ? '-good' : '-bad'} &`, {
+                  values: { DEFAULT: undefined },
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build(['foo:underline'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         .foo-good .foo\\:underline {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('should be called with eventual modifiers', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @tailwind utilities;
-      `,
-      {
-        loadModule: async (id, base) => {
-          return {
-            base,
-            module: ({ matchVariant }: PluginAPI) => {
-              matchVariant('my-container', (value, { modifier }) => {
-                function parseValue(value: string) {
-                  const numericValue = value.match(/^(\d+\.\d+|\d+|\.\d+)\D+/)?.[1] ?? null
-                  if (numericValue === null) return null
+    expect(
+      await run(
+        ['my-container-[250px]:underline', 'my-container-[250px]/placement:underline'],
+        css`
+          @plugin "my-plugin";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('my-container', (value, { modifier }) => {
+                  function parseValue(value: string) {
+                    const numericValue = value.match(/^(\d+\.\d+|\d+|\.\d+)\D+/)?.[1] ?? null
+                    if (numericValue === null) return null
 
-                  return parseFloat(value)
-                }
+                    return parseFloat(value)
+                  }
 
-                const parsed = parseValue(value)
-                return parsed !== null ? `@container ${modifier ?? ''} (min-width: ${value})` : []
-              })
-            },
-          }
+                  const parsed = parseValue(value)
+                  return parsed !== null ? `@container ${modifier ?? ''} (min-width: ${value})` : []
+                })
+              },
+            }
+          },
         },
-      },
-    )
-    let compiled = build([
-      'my-container-[250px]:underline',
-      'my-container-[250px]/placement:underline',
-    ])
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@container (width >= 250px) {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @container (min-width: 250px) {
         .my-container-\\[250px\\]\\:underline {
           text-decoration-line: underline;
         }
       }
 
-      @container placement (width >= 250px) {
+      @container placement (min-width: 250px) {
         .my-container-\\[250px\\]\\/placement\\:underline {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
+    `)
+  })
+
+  test('ignores variants that use :merge(…)', async () => {
+    expect(
+      await run(
+        [
+          'optional-[test]:flex',
+          'group-optional-[test]:flex',
+          'peer-optional-[test]:flex',
+          'group-optional-[test]/foo:flex',
+        ],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('optional', (flavor) => `&:optional:has(${flavor}) &`)
+                matchVariant(
+                  'group-optional',
+                  (flavor) => `:merge(.group):optional:has(${flavor}) &`,
+                )
+                matchVariant(
+                  'peer-optional',
+                  (flavor) => `:merge(.peer):optional:has(${flavor}) ~ &`,
+                )
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        :is(:where(.group):optional:has(test) :where(.group) .group-optional-\\[test\\]\\:flex), :is(:where(.group\\/foo):optional:has(test) :where(.group\\/foo) .group-optional-\\[test\\]\\/foo\\:flex), :is(:where(.peer):optional:has(test) :where(.peer) ~ .peer-optional-\\[test\\]\\:flex), .optional-\\[test\\]\\:flex:optional:has(test) .optional-\\[test\\]\\:flex {
+          display: flex;
+        }
+      }
+      "
+    `)
+  })
+
+  test('ignores variants that use unknown values', async () => {
+    expect(
+      await run(
+        ['foo-[test]:flex', 'foo-known:flex', 'foo-unknown:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('foo', (flavor) => `&:is(${flavor})`, {
+                  values: { known: 'known' },
+                })
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        .foo-known\\:flex:is(known), .foo-\\[test\\]\\:flex:is(test) {
+          display: flex;
+        }
+      }
+      "
+    `)
+  })
+
+  test('ignores variants that produce non-string values', async () => {
+    expect(
+      await run(
+        ['foo-[test]:flex', 'foo-string:flex', 'foo-object:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: ({ matchVariant }: PluginAPI) => {
+                matchVariant('foo', (flavor) => `&:is(${flavor})`, {
+                  values: {
+                    string: 'some string',
+                    object: { some: 'object' },
+                  },
+                })
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        .foo-string\\:flex:is(some string), .foo-\\[test\\]\\:flex:is(test) {
+          display: flex;
+        }
+      }
+      "
     `)
   })
 })
 
 describe('addUtilities()', () => {
   test('custom static utility', async () => {
-    let compiled = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-
-        @theme reference {
-          --breakpoint-lg: 1024px;
-        }
-      `,
-      {
-        async loadModule(id, base) {
-          return {
-            base,
-            module: ({ addUtilities }: PluginAPI) => {
-              addUtilities({
-                '.text-trim': {
-                  'text-box-trim': 'both',
-                  'text-box-edge': 'cap alphabetic',
-                },
-              })
-            },
+    expect(
+      await run(
+        ['text-trim', 'lg:text-trim'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
-        },
-      },
-    )
 
-    expect(optimizeCss(compiled.build(['text-trim', 'lg:text-trim'])).trim())
-      .toMatchInlineSnapshot(`
-      "@layer utilities {
+          @theme reference {
+            --breakpoint-lg: 1024px;
+          }
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ addUtilities }: PluginAPI) => {
+                addUtilities({
+                  '.text-trim': {
+                    'text-box-trim': 'both',
+                    'text-box-edge': 'cap alphabetic',
+                  },
+                })
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         .text-trim {
           text-box-trim: both;
           text-box-edge: cap alphabetic;
         }
 
-        @media (width >= 1024px) {
+        @media (min-width: 1024px) {
           .lg\\:text-trim {
             text-box-trim: both;
             text-box-edge: cap alphabetic;
           }
         }
-      }"
+      }
+      "
     `)
   })
 
   test('return multiple rule objects from a custom utility', async () => {
-    let compiled = await compile(
-      css`
-        @plugin "my-plugin";
-        @tailwind utilities;
-      `,
-      {
-        async loadModule(id, base) {
-          return {
-            base,
-            module: ({ addUtilities }: PluginAPI) => {
-              addUtilities([
-                {
-                  '.text-trim': [
-                    { 'text-box-trim': 'both' },
-                    { 'text-box-edge': 'cap alphabetic' },
-                  ],
-                },
-              ])
-            },
-          }
+    expect(
+      await run(
+        ['text-trim'],
+        css`
+          @plugin "my-plugin";
+          @tailwind utilities;
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ addUtilities }: PluginAPI) => {
+                addUtilities([
+                  {
+                    '.text-trim': [
+                      { 'text-box-trim': 'both' },
+                      { 'text-box-edge': 'cap alphabetic' },
+                    ],
+                  },
+                ])
+              },
+            }
+          },
         },
-      },
-    )
-
-    expect(optimizeCss(compiled.build(['text-trim'])).trim()).toMatchInlineSnapshot(`
-      ".text-trim {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .text-trim {
         text-box-trim: both;
         text-box-edge: cap alphabetic;
-      }"
+      }
+      "
     `)
   })
 
   test('define multiple utilities with array syntax', async () => {
-    let compiled = await compile(
-      css`
-        @plugin "my-plugin";
-        @tailwind utilities;
-      `,
-      {
-        async loadModule(id, base) {
-          return {
-            base,
-            module: ({ addUtilities }: PluginAPI) => {
-              addUtilities([
-                {
-                  '.text-trim': {
-                    'text-box-trim': 'both',
-                    'text-box-edge': 'cap alphabetic',
+    expect(
+      await run(
+        ['text-trim', 'text-trim-2'],
+        css`
+          @plugin "my-plugin";
+          @tailwind utilities;
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ addUtilities }: PluginAPI) => {
+                addUtilities([
+                  {
+                    '.text-trim': {
+                      'text-box-trim': 'both',
+                      'text-box-edge': 'cap alphabetic',
+                    },
                   },
-                },
-                {
-                  '.text-trim-2': {
-                    'text-box-trim': 'both',
-                    'text-box-edge': 'cap alphabetic',
+                  {
+                    '.text-trim-2': {
+                      'text-box-trim': 'both',
+                      'text-box-edge': 'cap alphabetic',
+                    },
                   },
-                },
-              ])
-            },
-          }
+                ])
+              },
+            }
+          },
         },
-      },
-    )
-
-    expect(optimizeCss(compiled.build(['text-trim', 'text-trim-2'])).trim()).toMatchInlineSnapshot(`
-      ".text-trim, .text-trim-2 {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .text-trim, .text-trim-2 {
         text-box-trim: both;
         text-box-edge: cap alphabetic;
-      }"
+      }
+      "
     `)
   })
 
   test('utilities can use arrays for fallback declaration values', async () => {
-    let compiled = await compile(
-      css`
-        @plugin "my-plugin";
-        @tailwind utilities;
-      `,
-      {
-        async loadModule(id, base) {
-          return {
-            base,
-            module: ({ addUtilities }: PluginAPI) => {
-              addUtilities([
-                {
-                  '.outlined': {
-                    outline: ['1px solid ButtonText', '1px auto -webkit-focus-ring-color'],
+    expect(
+      await run(
+        ['outlined'],
+        css`
+          @plugin "my-plugin";
+          @tailwind utilities;
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ addUtilities }: PluginAPI) => {
+                addUtilities([
+                  {
+                    '.outlined': {
+                      outline: ['1px solid ButtonText', '1px auto -webkit-focus-ring-color'],
+                    },
                   },
-                },
-              ])
-            },
-          }
+                ])
+              },
+            }
+          },
         },
-      },
-    )
-
-    expect(optimizeCss(compiled.build(['outlined'])).trim()).toMatchInlineSnapshot(`
-      ".outlined {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .outlined {
         outline: 1px solid buttontext;
         outline: 1px auto -webkit-focus-ring-color;
-      }"
+      }
+      "
     `)
   })
 
   test('camel case properties are converted to kebab-case', async () => {
-    let compiled = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        async loadModule(id, base) {
-          return {
-            base,
-            module: ({ addUtilities }: PluginAPI) => {
-              addUtilities({
-                '.text-trim': {
-                  WebkitAppearance: 'none',
-                  textBoxTrim: 'both',
-                  textBoxEdge: 'cap alphabetic',
-                },
-              })
-            },
+    expect(
+      await run(
+        ['text-trim'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ addUtilities }: PluginAPI) => {
+                addUtilities({
+                  '.text-trim': {
+                    WebkitAppearance: 'none',
+                    textBoxTrim: 'both',
+                    textBoxEdge: 'cap alphabetic',
+                  },
+                })
+              },
+            }
+          },
         },
-      },
-    )
-
-    expect(optimizeCss(compiled.build(['text-trim'])).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         .text-trim {
           -webkit-appearance: none;
           text-box-trim: both;
           text-box-edge: cap alphabetic;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('custom static utilities support `@apply`', async () => {
-    let compiled = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-
-        @theme reference {
-          --breakpoint-lg: 1024px;
-        }
-      `,
-      {
-        async loadModule(id, base) {
-          return {
-            base,
-            module: ({ addUtilities }: PluginAPI) => {
-              addUtilities({
-                '.foo': {
-                  '@apply flex dark:underline': {},
-                },
-              })
-            },
+    expect(
+      await run(
+        ['foo', 'lg:foo'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
           }
-        },
-      },
-    )
 
-    expect(optimizeCss(compiled.build(['foo', 'lg:foo'])).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+          @theme reference {
+            --breakpoint-lg: 1024px;
+          }
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ addUtilities }: PluginAPI) => {
+                addUtilities({
+                  '.foo': {
+                    '@apply flex dark:underline': {},
+                  },
+                })
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         .foo {
           display: flex;
         }
@@ -2859,7 +3236,7 @@ describe('addUtilities()', () => {
           }
         }
 
-        @media (width >= 1024px) {
+        @media (min-width: 1024px) {
           .lg\\:foo {
             display: flex;
           }
@@ -2870,7 +3247,8 @@ describe('addUtilities()', () => {
             }
           }
         }
-      }"
+      }
+      "
     `)
   })
 
@@ -2888,8 +3266,9 @@ describe('addUtilities()', () => {
           }
         `,
         {
-          async loadModule(id, base) {
+          async loadModule(_id, base) {
             return {
+              path: '',
               base,
               module: ({ addUtilities }: PluginAPI) => {
                 addUtilities({
@@ -2903,297 +3282,336 @@ describe('addUtilities()', () => {
           },
         },
       )
-    }).rejects.toThrowError(/invalid utility selector/)
+    }).rejects.toThrow(/invalid utility selector/)
   })
 
   test('supports multiple selector names', async () => {
-    let compiled = await compile(
-      css`
-        @plugin "my-plugin";
-        @tailwind utilities;
-
-        @theme reference {
-          --breakpoint-lg: 1024px;
-        }
-      `,
-      {
-        async loadModule(id, base) {
-          return {
-            base,
-            module: ({ addUtilities }: PluginAPI) => {
-              addUtilities({
-                '.form-input, .form-textarea': {
-                  appearance: 'none',
-                  'background-color': '#fff',
-                },
-              })
-            },
-          }
-        },
-      },
-    )
-
-    expect(optimizeCss(compiled.build(['form-input', 'lg:form-textarea'])).trim())
-      .toMatchInlineSnapshot(`
-        ".form-input {
-          appearance: none;
-          background-color: #fff;
-        }
-
-        @media (width >= 1024px) {
-          .lg\\:form-textarea {
-            appearance: none;
-            background-color: #fff;
-          }
-        }"
-      `)
-  })
-
-  test('supports pseudo classes and pseudo elements', async () => {
-    let compiled = await compile(
-      css`
-        @plugin "my-plugin";
-        @tailwind utilities;
-
-        @theme reference {
-          --breakpoint-lg: 1024px;
-        }
-      `,
-      {
-        async loadModule(id, base) {
-          return {
-            base,
-            module: ({ addUtilities }: PluginAPI) => {
-              addUtilities({
-                '.form-input, .form-input::placeholder, .form-textarea:hover:focus': {
-                  'background-color': 'red',
-                },
-              })
-            },
-          }
-        },
-      },
-    )
-
-    expect(compiled.build(['form-input', 'lg:form-textarea']).trim()).toMatchInlineSnapshot(`
-      ".form-input {
-        background-color: red;
-        &::placeholder {
-          background-color: red;
-        }
-      }
-      .lg\\:form-textarea {
-        @media (width >= 1024px) {
-          &:hover:focus {
-            background-color: red;
-          }
-        }
-      }"
-    `)
-  })
-
-  test('nests complex utility names', async () => {
-    let compiled = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        async loadModule(id, base) {
-          return {
-            base,
-            module: ({ addUtilities }: PluginAPI) => {
-              addUtilities({
-                '.a .b:hover .c': {
-                  color: 'red',
-                },
-                '.d > *': {
-                  color: 'red',
-                },
-                '.e .bar:not(.f):has(.g)': {
-                  color: 'red',
-                },
-                '.h~.i': {
-                  color: 'red',
-                },
-                '.j.j': {
-                  color: 'red',
-                },
-              })
-            },
-          }
-        },
-      },
-    )
-
     expect(
-      compiled.build(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j']).trim(),
-    ).toMatchInlineSnapshot(
-      `
-      "@layer utilities {
-        .a {
-          & .b:hover .c {
-            color: red;
-          }
-        }
-        .b {
-          .a &:hover .c {
-            color: red;
-          }
-        }
-        .c {
-          .a .b:hover & {
-            color: red;
-          }
-        }
-        .d {
-          & > * {
-            color: red;
-          }
-        }
-        .e {
-          & .bar:not(.f):has(.g) {
-            color: red;
-          }
-        }
-        .g {
-          .e .bar:not(.f):has(&) {
-            color: red;
-          }
-        }
-        .h {
-          &~.i {
-            color: red;
-          }
-        }
-        .i {
-          .h~& {
-            color: red;
-          }
-        }
-        .j {
-          &.j {
-            color: red;
-          }
-          .j& {
-            color: red;
-          }
-        }
-      }"
-    `,
-    )
-  })
-
-  test('prefixes nested class names with the configured theme prefix', async () => {
-    let compiled = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-        @theme prefix(tw) {
-        }
-      `,
-      {
-        async loadModule(id, base) {
-          return {
-            base,
-            module: ({ addUtilities }: PluginAPI) => {
-              addUtilities({
-                '.a .b:hover .c.d': {
-                  color: 'red',
-                },
-              })
-            },
-          }
-        },
-      },
-    )
-
-    expect(compiled.build(['tw:a', 'tw:b', 'tw:c', 'tw:d']).trim()).toMatchInlineSnapshot(
-      `
-      "@layer utilities {
-        .tw\\:a {
-          & .tw\\:b:hover .tw\\:c.tw\\:d {
-            color: red;
-          }
-        }
-        .tw\\:b {
-          .tw\\:a &:hover .tw\\:c.tw\\:d {
-            color: red;
-          }
-        }
-        .tw\\:c {
-          .tw\\:a .tw\\:b:hover &.tw\\:d {
-            color: red;
-          }
-        }
-        .tw\\:d {
-          .tw\\:a .tw\\:b:hover .tw\\:c& {
-            color: red;
-          }
-        }
-      }
-      :root {
-      }"
-    `,
-    )
-  })
-})
-
-describe('matchUtilities()', () => {
-  test('custom functional utility', async () => {
-    async function run(candidates: string[]) {
-      let compiled = await compile(
+      await run(
+        ['form-input', 'lg:form-textarea'],
         css`
           @plugin "my-plugin";
-
           @tailwind utilities;
 
           @theme reference {
             --breakpoint-lg: 1024px;
           }
         `,
-
         {
-          async loadModule(id, base) {
+          async loadModule(_id, base) {
             return {
+              path: '',
               base,
-              module: ({ matchUtilities }: PluginAPI) => {
-                matchUtilities(
-                  {
-                    'border-block': (value) => ({ 'border-block-width': value }),
+              module: ({ addUtilities }: PluginAPI) => {
+                addUtilities({
+                  '.form-input, .form-textarea': {
+                    appearance: 'none',
+                    'background-color': '#fff',
                   },
-                  {
-                    values: {
-                      DEFAULT: '1px',
-                      '2': '2px',
-                    },
-                  },
-                )
+                })
               },
             }
           },
         },
-      )
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .form-input {
+        appearance: none;
+        background-color: #fff;
+      }
 
-      return compiled.build(candidates)
-    }
+      @media (min-width: 1024px) {
+        .lg\\:form-textarea {
+          appearance: none;
+          background-color: #fff;
+        }
+      }
+      "
+    `)
+  })
+
+  test('supports pseudo classes and pseudo elements', async () => {
+    expect(
+      await run(
+        ['form-input', 'lg:form-textarea'],
+        css`
+          @plugin "my-plugin";
+          @tailwind utilities;
+
+          @theme reference {
+            --breakpoint-lg: 1024px;
+          }
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ addUtilities }: PluginAPI) => {
+                addUtilities({
+                  '.form-input, .form-input::placeholder, .form-textarea:hover:focus': {
+                    'background-color': 'red',
+                  },
+                })
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .form-input, .form-input::placeholder {
+        background-color: red;
+      }
+
+      @media (min-width: 1024px) {
+        .lg\\:form-textarea:hover:focus {
+          background-color: red;
+        }
+      }
+      "
+    `)
+  })
+
+  test('nests complex utility names', async () => {
+    expect(
+      await run(
+        ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ addUtilities }: PluginAPI) => {
+                addUtilities({
+                  '.a .b:hover .c': { color: 'red' },
+                  '.d > *': { color: 'red' },
+                  '.e .bar:not(.f):has(.g)': { color: 'red' },
+                  '.h~.i': { color: 'red' },
+                  '.j.j': { color: 'red' },
+                })
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        .j.j, .a .b:hover .c, .d > *, .e .bar:not(.f):has(.g), .h ~ .i {
+          color: red;
+        }
+      }
+      "
+    `)
+  })
+
+  test('does not register class names inside `:nth-child(… of …)` as utilities', async () => {
+    expect(
+      await run(
+        ['foo', 'mark'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ addUtilities }: PluginAPI) => {
+                addUtilities({
+                  '.foo:nth-child(2 of .mark)': { color: 'red' },
+                })
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        .foo:nth-child(2 of .mark) {
+          color: red;
+        }
+      }
+      "
+    `)
+  })
+
+  test('prefixes nested class names with the configured theme prefix', async () => {
+    expect(
+      await run(
+        ['tw:a', 'tw:b', 'tw:c', 'tw:d'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+          @theme prefix(tw) {
+          }
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ addUtilities }: PluginAPI) => {
+                addUtilities({ '.a .b:hover .c.d': { color: 'red' } })
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        .tw\\:a .tw\\:b:hover .tw\\:c.tw\\:d {
+          color: red;
+        }
+      }
+      "
+    `)
+  })
+
+  test('replaces the class name with variants in nested selectors', async () => {
+    expect(
+      await run(
+        ['foo', 'md:foo', 'not-hover:md:foo'],
+        css`
+          @plugin "my-plugin";
+          @theme {
+            --breakpoint-md: 768px;
+          }
+          @tailwind utilities;
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ addUtilities }: PluginAPI) => {
+                addUtilities({ '.foo': { ':where(.foo > :first-child)': { color: 'red' } } })
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .foo :where(.foo > :first-child) {
+        color: red;
+      }
+
+      @media (min-width: 768px) {
+        .md\\:foo :where(.md\\:foo > :first-child), .not-hover\\:md\\:foo:not(:hover) :where(.not-hover\\:md\\:foo > :first-child) {
+          color: red;
+        }
+      }
+
+      @media not all and (hover: hover) {
+        @media (min-width: 768px) {
+          .not-hover\\:md\\:foo :where(.not-hover\\:md\\:foo > :first-child) {
+            color: red;
+          }
+        }
+      }
+      "
+    `)
+  })
+
+  test('values that are `false`, `null`, or `undefined` are discarded from CSS object ASTs', async () => {
+    expect(
+      await run(
+        ['foo'],
+        css`
+          @plugin "my-plugin";
+          @tailwind utilities;
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ addUtilities }: PluginAPI) => {
+                addUtilities({
+                  '.foo': {
+                    a: 'red',
+                    // @ts-ignore: While this isn't valid per the types this did work in v3
+                    'z-index': 0,
+                    // @ts-ignore
+                    '.bar': false,
+                    // @ts-ignore
+                    '.baz': null,
+                    // @ts-ignore
+                    '.qux': undefined,
+                  },
+                })
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .foo {
+        a: red;
+        z-index: 0;
+      }
+      "
+    `)
+  })
+})
+
+describe('matchUtilities()', () => {
+  test('custom functional utility', async () => {
+    let input = css`
+      @plugin "my-plugin";
+
+      @tailwind utilities;
+
+      @theme reference {
+        --breakpoint-lg: 1024px;
+      }
+    `
 
     expect(
-      optimizeCss(
-        await run([
+      await run(
+        [
           'border-block',
           'border-block-2',
           'border-block-[35px]',
           'border-block-[var(--foo)]',
           'lg:border-block-2',
-        ]),
-      ).trim(),
+        ],
+        input,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ matchUtilities }: PluginAPI) => {
+                matchUtilities(
+                  { 'border-block': (value) => ({ 'border-block-width': value }) },
+                  { values: { DEFAULT: '1px', '2': '2px' } },
+                )
+              },
+            }
+          },
+        },
+      ),
     ).toMatchInlineSnapshot(`
-      ".border-block {
+      "
+      .border-block {
         border-block-width: 1px;
       }
 
@@ -3209,254 +3627,261 @@ describe('matchUtilities()', () => {
         border-block-width: var(--foo);
       }
 
-      @media (width >= 1024px) {
+      @media (min-width: 1024px) {
         .lg\\:border-block-2 {
           border-block-width: 2px;
         }
-      }"
+      }
+      "
     `)
 
     expect(
-      optimizeCss(
-        await run([
+      await run(
+        [
           '-border-block',
           '-border-block-2',
           'lg:-border-block-2',
           'border-block-unknown',
           'border-block/1',
-        ]),
-      ).trim(),
+        ],
+        input,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ matchUtilities }: PluginAPI) => {
+                matchUtilities(
+                  { 'border-block': (value) => ({ 'border-block-width': value }) },
+                  { values: { DEFAULT: '1px', '2': '2px' } },
+                )
+              },
+            }
+          },
+        },
+      ),
     ).toEqual('')
   })
 
   test('custom functional utilities can start with @', async () => {
-    async function run(candidates: string[]) {
-      let compiled = await compile(
+    expect(
+      await run(
+        ['@w-1', 'hover:@w-1'],
         css`
           @plugin "my-plugin";
           @tailwind utilities;
         `,
-
         {
-          async loadModule(id, base) {
+          async loadModule(_id, base) {
             return {
+              path: '',
+              base,
+              module: ({ matchUtilities }: PluginAPI) => {
+                matchUtilities({ '@w': (value) => ({ width: value }) }, { values: { 1: '1px' } })
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .\\@w-1 {
+        width: 1px;
+      }
+
+      @media (hover: hover) {
+        .hover\\:\\@w-1:hover {
+          width: 1px;
+        }
+      }
+      "
+    `)
+  })
+
+  test('custom functional utilities can return an array of rules', async () => {
+    expect(
+      await run(
+        ['all-but-order-bottom-left-radius'],
+        css`
+          @plugin "my-plugin";
+          @tailwind utilities;
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
               base,
               module: ({ matchUtilities }: PluginAPI) => {
                 matchUtilities(
-                  { '@w': (value) => ({ width: value }) },
                   {
-                    values: {
-                      1: '1px',
-                    },
+                    'all-but-order-bottom-left-radius': (value) =>
+                      [
+                        { 'border-top-left-radius': value },
+                        { 'border-top-right-radius': value },
+                        { 'border-bottom-right-radius': value },
+                      ] as CssInJs[],
+                  },
+                  { values: { DEFAULT: '1px' } },
+                )
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .all-but-order-bottom-left-radius {
+        border-top-left-radius: 1px;
+        border-top-right-radius: 1px;
+        border-bottom-right-radius: 1px;
+      }
+      "
+    `)
+  })
+
+  test('custom functional utility with any modifier', async () => {
+    expect(
+      await run(
+        ['border-block', 'border-block-2', 'border-block/foo', 'border-block-2/foo'],
+        css`
+          @plugin "my-plugin";
+
+          @tailwind utilities;
+
+          @theme reference {
+            --breakpoint-lg: 1024px;
+          }
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ matchUtilities }: PluginAPI) => {
+                matchUtilities(
+                  {
+                    'border-block': (value, { modifier }) => ({
+                      '--my-modifier': modifier ?? 'none',
+                      'border-block-width': value,
+                    }),
+                  },
+                  { values: { DEFAULT: '1px', '2': '2px' }, modifiers: 'any' },
+                )
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .border-block {
+        --my-modifier: none;
+        border-block-width: 1px;
+      }
+
+      .border-block-2 {
+        --my-modifier: none;
+        border-block-width: 2px;
+      }
+
+      .border-block-2\\/foo {
+        --my-modifier: foo;
+        border-block-width: 2px;
+      }
+
+      .border-block\\/foo {
+        --my-modifier: foo;
+        border-block-width: 1px;
+      }
+      "
+    `)
+  })
+
+  test('custom functional utility with known modifier', async () => {
+    let input = css`
+      @plugin "my-plugin";
+
+      @tailwind utilities;
+
+      @theme reference {
+        --breakpoint-lg: 1024px;
+      }
+    `
+
+    expect(
+      await run(
+        ['border-block', 'border-block-2', 'border-block/foo', 'border-block-2/foo'],
+        input,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ matchUtilities }: PluginAPI) => {
+                matchUtilities(
+                  {
+                    'border-block': (value, { modifier }) => ({
+                      '--my-modifier': modifier ?? 'none',
+                      'border-block-width': value,
+                    }),
+                  },
+                  {
+                    values: { DEFAULT: '1px', '2': '2px' },
+                    modifiers: { foo: 'foo' },
                   },
                 )
               },
             }
           },
         },
-      )
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .border-block {
+        --my-modifier: none;
+        border-block-width: 1px;
+      }
 
-      return compiled.build(candidates)
-    }
+      .border-block-2 {
+        --my-modifier: none;
+        border-block-width: 2px;
+      }
 
-    expect(optimizeCss(await run(['@w-1', 'hover:@w-1'])).trim()).toMatchInlineSnapshot(`
-        ".\\@w-1 {
-          width: 1px;
-        }
+      .border-block-2\\/foo {
+        --my-modifier: foo;
+        border-block-width: 2px;
+      }
 
-        @media (hover: hover) {
-          .hover\\:\\@w-1:hover {
-            width: 1px;
-          }
-        }"
-      `)
-  })
+      .border-block\\/foo {
+        --my-modifier: foo;
+        border-block-width: 1px;
+      }
+      "
+    `)
 
-  test('custom functional utilities can return an array of rules', async () => {
-    let compiled = await compile(
-      css`
-        @plugin "my-plugin";
-        @tailwind utilities;
-      `,
-      {
-        async loadModule(id, base) {
+    expect(
+      await run(['border-block/unknown', 'border-block-2/unknown'], input, {
+        async loadModule(_id, base) {
           return {
+            path: '',
             base,
             module: ({ matchUtilities }: PluginAPI) => {
               matchUtilities(
                 {
-                  'all-but-order-bottom-left-radius': (value) =>
-                    [
-                      { 'border-top-left-radius': value },
-                      { 'border-top-right-radius': value },
-                      { 'border-bottom-right-radius': value },
-                    ] as CssInJs[],
+                  'border-block': (value, { modifier }) => ({
+                    '--my-modifier': modifier ?? 'none',
+                    'border-block-width': value,
+                  }),
                 },
                 {
-                  values: {
-                    DEFAULT: '1px',
-                  },
+                  values: { DEFAULT: '1px', '2': '2px' },
+                  modifiers: { foo: 'foo' },
                 },
               )
             },
           }
         },
-      },
-    )
-
-    expect(optimizeCss(compiled.build(['all-but-order-bottom-left-radius'])).trim())
-      .toMatchInlineSnapshot(`
-        ".all-but-order-bottom-left-radius {
-          border-top-left-radius: 1px;
-          border-top-right-radius: 1px;
-          border-bottom-right-radius: 1px;
-        }"
-      `)
-  })
-
-  test('custom functional utility with any modifier', async () => {
-    async function run(candidates: string[]) {
-      let compiled = await compile(
-        css`
-          @plugin "my-plugin";
-
-          @tailwind utilities;
-
-          @theme reference {
-            --breakpoint-lg: 1024px;
-          }
-        `,
-
-        {
-          async loadModule(id, base) {
-            return {
-              base,
-              module: ({ matchUtilities }: PluginAPI) => {
-                matchUtilities(
-                  {
-                    'border-block': (value, { modifier }) => ({
-                      '--my-modifier': modifier ?? 'none',
-                      'border-block-width': value,
-                    }),
-                  },
-                  {
-                    values: {
-                      DEFAULT: '1px',
-                      '2': '2px',
-                    },
-
-                    modifiers: 'any',
-                  },
-                )
-              },
-            }
-          },
-        },
-      )
-
-      return compiled.build(candidates)
-    }
-
-    expect(
-      optimizeCss(
-        await run(['border-block', 'border-block-2', 'border-block/foo', 'border-block-2/foo']),
-      ).trim(),
-    ).toMatchInlineSnapshot(`
-      ".border-block {
-        --my-modifier: none;
-        border-block-width: 1px;
-      }
-
-      .border-block-2 {
-        --my-modifier: none;
-        border-block-width: 2px;
-      }
-
-      .border-block-2\\/foo {
-        --my-modifier: foo;
-        border-block-width: 2px;
-      }
-
-      .border-block\\/foo {
-        --my-modifier: foo;
-        border-block-width: 1px;
-      }"
-    `)
-  })
-
-  test('custom functional utility with known modifier', async () => {
-    async function run(candidates: string[]) {
-      let compiled = await compile(
-        css`
-          @plugin "my-plugin";
-
-          @tailwind utilities;
-
-          @theme reference {
-            --breakpoint-lg: 1024px;
-          }
-        `,
-
-        {
-          async loadModule(id, base) {
-            return {
-              base,
-              module: ({ matchUtilities }: PluginAPI) => {
-                matchUtilities(
-                  {
-                    'border-block': (value, { modifier }) => ({
-                      '--my-modifier': modifier ?? 'none',
-                      'border-block-width': value,
-                    }),
-                  },
-                  {
-                    values: {
-                      DEFAULT: '1px',
-                      '2': '2px',
-                    },
-
-                    modifiers: {
-                      foo: 'foo',
-                    },
-                  },
-                )
-              },
-            }
-          },
-        },
-      )
-
-      return compiled.build(candidates)
-    }
-
-    expect(
-      optimizeCss(
-        await run(['border-block', 'border-block-2', 'border-block/foo', 'border-block-2/foo']),
-      ).trim(),
-    ).toMatchInlineSnapshot(`
-      ".border-block {
-        --my-modifier: none;
-        border-block-width: 1px;
-      }
-
-      .border-block-2 {
-        --my-modifier: none;
-        border-block-width: 2px;
-      }
-
-      .border-block-2\\/foo {
-        --my-modifier: foo;
-        border-block-width: 2px;
-      }
-
-      .border-block\\/foo {
-        --my-modifier: foo;
-        border-block-width: 1px;
-      }"
-    `)
-
-    expect(
-      optimizeCss(await run(['border-block/unknown', 'border-block-2/unknown'])).trim(),
+      }),
     ).toEqual('')
   })
 
@@ -3464,190 +3889,127 @@ describe('matchUtilities()', () => {
   // future don't be afraid to change what should happen in this scenario.
   describe('plugins that handle a specific arbitrary value type prevent falling through to other plugins if the result is invalid for that plugin', () => {
     test('implicit color modifier', async () => {
-      async function run(candidates: string[]) {
-        let compiled = await compile(
-          css`
-            @tailwind utilities;
-            @plugin "my-plugin";
-          `,
+      let input = css`
+        @tailwind utilities;
+        @plugin "my-plugin";
+      `
 
-          {
-            async loadModule(id, base) {
-              return {
-                base,
-                module: ({ matchUtilities }: PluginAPI) => {
-                  matchUtilities(
-                    {
-                      scrollbar: (value) => ({ 'scrollbar-color': value }),
-                    },
-                    { type: ['color', 'any'] },
-                  )
-
-                  matchUtilities(
-                    {
-                      scrollbar: (value) => ({ 'scrollbar-width': value }),
-                    },
-                    { type: ['length'] },
-                  )
-                },
-              }
+      let options: Partial<Parameters<typeof compile>[1]> = {
+        async loadModule(_id, base) {
+          return {
+            path: '',
+            base,
+            module: ({ matchUtilities }: PluginAPI) => {
+              matchUtilities(
+                { scrollbar: (value) => ({ 'scrollbar-color': value }) },
+                { type: ['color', 'any'] },
+              )
+              matchUtilities(
+                { scrollbar: (value) => ({ 'scrollbar-width': value }) },
+                { type: ['length'] },
+              )
             },
-          },
-        )
-
-        return compiled.build(candidates)
+          }
+        },
       }
 
       expect(
-        optimizeCss(
-          await run(['scrollbar-[2px]', 'scrollbar-[#08c]', 'scrollbar-[#08c]/50']),
-        ).trim(),
+        await run(['scrollbar-[2px]', 'scrollbar-[#08c]', 'scrollbar-[#08c]/50'], input, options),
       ).toMatchInlineSnapshot(`
-        ".scrollbar-\\[\\#08c\\] {
+        "
+        .scrollbar-\\[2px\\] {
+          scrollbar-width: 2px;
+        }
+
+        .scrollbar-\\[\\#08c\\] {
           scrollbar-color: #08c;
         }
 
         .scrollbar-\\[\\#08c\\]\\/50 {
-          scrollbar-color: oklab(59.9824% -.06725 -.12414 / .5);
+          scrollbar-color: oklab(59.9824% -.067 -.124 / .5);
         }
-
-        .scrollbar-\\[2px\\] {
-          scrollbar-width: 2px;
-        }"
+        "
       `)
-      expect(optimizeCss(await run(['scrollbar-[2px]/50'])).trim()).toEqual('')
+      expect(await run(['scrollbar-[2px]/50'], input, options)).toEqual('')
     })
 
     test('no modifiers are supported by the plugins', async () => {
-      async function run(candidates: string[]) {
-        let compiled = await compile(
+      expect(
+        await run(
+          ['scrollbar-[2px]/50'],
           css`
             @tailwind utilities;
             @plugin "my-plugin";
           `,
-
           {
-            async loadModule(id, base) {
+            async loadModule(_id, base) {
               return {
+                path: '',
                 base,
                 module: ({ matchUtilities }: PluginAPI) => {
                   matchUtilities(
-                    {
-                      scrollbar: (value) => ({ '--scrollbar-angle': value }),
-                    },
+                    { scrollbar: (value) => ({ '--scrollbar-angle': value }) },
                     { type: ['angle', 'any'] },
                   )
 
                   matchUtilities(
-                    {
-                      scrollbar: (value) => ({ '--scrollbar-width': value }),
-                    },
+                    { scrollbar: (value) => ({ '--scrollbar-width': value }) },
                     { type: ['length'] },
                   )
                 },
               }
             },
           },
-        )
-
-        return compiled.build(candidates)
-      }
-
-      expect(optimizeCss(await run(['scrollbar-[2px]/50'])).trim()).toEqual('')
+        ),
+      ).toEqual('')
     })
 
     test('invalid named modifier', async () => {
-      async function run(candidates: string[]) {
-        let compiled = await compile(
+      expect(
+        await run(
+          ['scrollbar-[2px]/foo'],
           css`
             @tailwind utilities;
             @plugin "my-plugin";
           `,
-
           {
-            async loadModule(id, base) {
+            async loadModule(_id, base) {
               return {
+                path: '',
                 base,
                 module: ({ matchUtilities }: PluginAPI) => {
                   matchUtilities(
-                    {
-                      scrollbar: (value) => ({ 'scrollbar-color': value }),
-                    },
+                    { scrollbar: (value) => ({ 'scrollbar-color': value }) },
                     { type: ['color', 'any'], modifiers: { foo: 'foo' } },
                   )
 
                   matchUtilities(
-                    {
-                      scrollbar: (value) => ({ 'scrollbar-width': value }),
-                    },
+                    { scrollbar: (value) => ({ 'scrollbar-width': value }) },
                     { type: ['length'], modifiers: { bar: 'bar' } },
                   )
                 },
               }
             },
           },
-        )
-
-        return compiled.build(candidates)
-      }
-
-      expect(optimizeCss(await run(['scrollbar-[2px]/foo'])).trim()).toEqual('')
+        ),
+      ).toEqual('')
     })
   })
 
   test('custom functional utilities with different types', async () => {
-    async function run(candidates: string[]) {
-      let compiled = await compile(
-        css`
-          @plugin "my-plugin";
+    let input = css`
+      @plugin "my-plugin";
 
-          @tailwind utilities;
+      @tailwind utilities;
 
-          @theme reference {
-            --breakpoint-lg: 1024px;
-          }
-        `,
-
-        {
-          async loadModule(id, base) {
-            return {
-              base,
-              module: ({ matchUtilities }: PluginAPI) => {
-                matchUtilities(
-                  {
-                    scrollbar: (value) => ({ 'scrollbar-color': value }),
-                  },
-                  {
-                    type: ['color', 'any'],
-                    values: {
-                      black: 'black',
-                    },
-                  },
-                )
-
-                matchUtilities(
-                  {
-                    scrollbar: (value) => ({ 'scrollbar-width': value }),
-                  },
-                  {
-                    type: ['length'],
-                    values: {
-                      2: '2px',
-                    },
-                  },
-                )
-              },
-            }
-          },
-        },
-      )
-
-      return compiled.build(candidates)
-    }
+      @theme reference {
+        --breakpoint-lg: 1024px;
+      }
+    `
 
     expect(
-      optimizeCss(
-        await run([
+      await run(
+        [
           'scrollbar-black',
           'scrollbar-black/50',
           'scrollbar-2',
@@ -3659,13 +4021,38 @@ describe('matchUtilities()', () => {
           'scrollbar-[color:var(--my-color)]',
           'scrollbar-[color:var(--my-color)]/50',
           'scrollbar-[length:var(--my-width)]',
-        ]),
-      ).trim(),
+        ],
+        input,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ matchUtilities }: PluginAPI) => {
+                matchUtilities(
+                  { scrollbar: (value) => ({ 'scrollbar-color': value }) },
+                  { type: ['color', 'any'], values: { black: 'black' } },
+                )
+
+                matchUtilities(
+                  { scrollbar: (value) => ({ 'scrollbar-width': value }) },
+                  { type: ['length'], values: { 2: '2px' } },
+                )
+              },
+            }
+          },
+        },
+      ),
     ).toMatchInlineSnapshot(`
-      ".scrollbar-2 {
+      "
+      .scrollbar-2, .scrollbar-\\[2px\\] {
         scrollbar-width: 2px;
       }
 
+      .scrollbar-\\[length\\:var\\(--my-width\\)\\] {
+        scrollbar-width: var(--my-width);
+      }
+
       .scrollbar-\\[\\#fff\\] {
         scrollbar-color: #fff;
       }
@@ -3674,28 +4061,24 @@ describe('matchUtilities()', () => {
         scrollbar-color: oklab(100% 0 5.96046e-8 / .5);
       }
 
-      .scrollbar-\\[2px\\] {
-        scrollbar-width: 2px;
-      }
-
-      .scrollbar-\\[color\\:var\\(--my-color\\)\\] {
+      .scrollbar-\\[color\\:var\\(--my-color\\)\\], .scrollbar-\\[color\\:var\\(--my-color\\)\\]\\/50 {
         scrollbar-color: var(--my-color);
       }
 
-      .scrollbar-\\[color\\:var\\(--my-color\\)\\]\\/50 {
-        scrollbar-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      @supports (color: color-mix(in lab, red, red)) {
+        .scrollbar-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+          scrollbar-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        }
       }
 
-      .scrollbar-\\[length\\:var\\(--my-width\\)\\] {
-        scrollbar-width: var(--my-width);
-      }
-
-      .scrollbar-\\[var\\(--my-color\\)\\] {
+      .scrollbar-\\[var\\(--my-color\\)\\], .scrollbar-\\[var\\(--my-color\\)\\]\\/50 {
         scrollbar-color: var(--my-color);
       }
 
-      .scrollbar-\\[var\\(--my-color\\)\\]\\/50 {
-        scrollbar-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      @supports (color: color-mix(in lab, red, red)) {
+        .scrollbar-\\[var\\(--my-color\\)\\]\\/50 {
+          scrollbar-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        }
       }
 
       .scrollbar-black {
@@ -3704,23 +4087,48 @@ describe('matchUtilities()', () => {
 
       .scrollbar-black\\/50 {
         scrollbar-color: oklab(0% none none / .5);
-      }"
+      }
+      "
     `)
 
     expect(
-      optimizeCss(
-        await run([
-          'scrollbar-2/50',
-          'scrollbar-[2px]/50',
-          'scrollbar-[length:var(--my-width)]/50',
-        ]),
-      ).trim(),
+      await run(
+        ['scrollbar-2/50', 'scrollbar-[2px]/50', 'scrollbar-[length:var(--my-width)]/50'],
+        input,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ matchUtilities }: PluginAPI) => {
+                matchUtilities(
+                  { scrollbar: (value) => ({ 'scrollbar-color': value }) },
+                  { type: ['color', 'any'], values: { black: 'black' } },
+                )
+
+                matchUtilities(
+                  { scrollbar: (value) => ({ 'scrollbar-width': value }) },
+                  { type: ['length'], values: { 2: '2px' } },
+                )
+              },
+            }
+          },
+        },
+      ),
     ).toEqual('')
   })
 
   test('functional utilities with `type: color` automatically support opacity', async () => {
-    async function run(candidates: string[]) {
-      let compiled = await compile(
+    expect(
+      await run(
+        [
+          'scrollbar-current',
+          'scrollbar-current/45',
+          'scrollbar-black',
+          'scrollbar-black/33',
+          'scrollbar-black/[50%]',
+          'scrollbar-[var(--my-color)]/[25%]',
+        ],
         css`
           @plugin "my-plugin";
 
@@ -3730,46 +4138,31 @@ describe('matchUtilities()', () => {
             --breakpoint-lg: 1024px;
           }
         `,
-
         {
-          async loadModule(id, base) {
+          async loadModule(_id, base) {
             return {
+              path: '',
               base,
               module: ({ matchUtilities }: PluginAPI) => {
                 matchUtilities(
-                  {
-                    scrollbar: (value) => ({ 'scrollbar-color': value }),
-                  },
-                  {
-                    type: ['color', 'any'],
-                    values: {
-                      black: 'black',
-                    },
-                  },
+                  { scrollbar: (value) => ({ 'scrollbar-color': value }) },
+                  { type: ['color', 'any'], values: { black: 'black' } },
                 )
               },
             }
           },
         },
-      )
-
-      return compiled.build(candidates)
-    }
-
-    expect(
-      optimizeCss(
-        await run([
-          'scrollbar-current',
-          'scrollbar-current/45',
-          'scrollbar-black',
-          'scrollbar-black/33',
-          'scrollbar-black/[50%]',
-          'scrollbar-[var(--my-color)]/[25%]',
-        ]),
-      ).trim(),
+      ),
     ).toMatchInlineSnapshot(`
-      ".scrollbar-\\[var\\(--my-color\\)\\]\\/\\[25\\%\\] {
-        scrollbar-color: color-mix(in oklab, var(--my-color) 25%, transparent);
+      "
+      .scrollbar-\\[var\\(--my-color\\)\\]\\/\\[25\\%\\] {
+        scrollbar-color: var(--my-color);
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .scrollbar-\\[var\\(--my-color\\)\\]\\/\\[25\\%\\] {
+          scrollbar-color: color-mix(in oklab, var(--my-color) 25%, transparent);
+        }
       }
 
       .scrollbar-black {
@@ -3784,19 +4177,23 @@ describe('matchUtilities()', () => {
         scrollbar-color: oklab(0% none none / .5);
       }
 
-      .scrollbar-current {
-        scrollbar-color: currentColor;
+      .scrollbar-current, .scrollbar-current\\/45 {
+        scrollbar-color: currentcolor;
       }
 
-      .scrollbar-current\\/45 {
-        scrollbar-color: color-mix(in oklab, currentColor 45%, transparent);
-      }"
+      @supports (color: color-mix(in lab, red, red)) {
+        .scrollbar-current\\/45 {
+          scrollbar-color: color-mix(in oklab, currentcolor 45%, transparent);
+        }
+      }
+      "
     `)
   })
 
   test('functional utilities with explicit modifiers', async () => {
-    async function run(candidates: string[]) {
-      let compiled = await compile(
+    expect(
+      await run(
+        ['scrollbar-[12px]', 'scrollbar-[12px]/foo', 'scrollbar-[12px]/bar'],
         css`
           @plugin "my-plugin";
 
@@ -3807,10 +4204,10 @@ describe('matchUtilities()', () => {
             --opacity-my-opacity: 0.5;
           }
         `,
-
         {
-          async loadModule(id, base) {
+          async loadModule(_id, base) {
             return {
+              path: '',
               base,
               module: ({ matchUtilities }: PluginAPI) => {
                 matchUtilities(
@@ -3820,29 +4217,16 @@ describe('matchUtilities()', () => {
                       'scrollbar-width': value,
                     }),
                   },
-                  {
-                    type: ['any'],
-                    values: {},
-                    modifiers: {
-                      foo: 'foo',
-                    },
-                  },
+                  { type: ['any'], values: {}, modifiers: { foo: 'foo' } },
                 )
               },
             }
           },
         },
-      )
-
-      return compiled.build(candidates)
-    }
-
-    expect(
-      optimizeCss(
-        await run(['scrollbar-[12px]', 'scrollbar-[12px]/foo', 'scrollbar-[12px]/bar']),
-      ).trim(),
+      ),
     ).toMatchInlineSnapshot(`
-      ".scrollbar-\\[12px\\] {
+      "
+      .scrollbar-\\[12px\\] {
         --modifier: none;
         scrollbar-width: 12px;
       }
@@ -3850,50 +4234,43 @@ describe('matchUtilities()', () => {
       .scrollbar-\\[12px\\]\\/foo {
         --modifier: foo;
         scrollbar-width: 12px;
-      }"
+      }
+      "
     `)
   })
 
   test('functional utilities support `@apply`', async () => {
-    let compiled = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-
-        @theme reference {
-          --breakpoint-lg: 1024px;
-        }
-      `,
-      {
-        async loadModule(id, base) {
-          return {
-            base,
-            module: ({ matchUtilities }: PluginAPI) => {
-              matchUtilities(
-                {
-                  foo: (value) => ({
-                    '--foo': value,
-                    [`@apply flex`]: {},
-                  }),
-                },
-                {
-                  values: {
-                    bar: 'bar',
-                  },
-                },
-              )
-            },
-          }
-        },
-      },
-    )
-
     expect(
-      optimizeCss(compiled.build(['foo-bar', 'lg:foo-bar', 'foo-[12px]', 'lg:foo-[12px]'])).trim(),
+      await run(
+        ['foo-bar', 'lg:foo-bar', 'foo-[12px]', 'lg:foo-[12px]'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+
+          @theme reference {
+            --breakpoint-lg: 1024px;
+          }
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ matchUtilities }: PluginAPI) => {
+                matchUtilities(
+                  { foo: (value) => ({ '--foo': value, [`@apply flex`]: {} }) },
+                  { values: { bar: 'bar' } },
+                )
+              },
+            }
+          },
+        },
+      ),
     ).toMatchInlineSnapshot(`
-      "@layer utilities {
+      "
+      @layer utilities {
         .foo-\\[12px\\] {
           --foo: 12px;
           display: flex;
@@ -3904,7 +4281,7 @@ describe('matchUtilities()', () => {
           display: flex;
         }
 
-        @media (width >= 1024px) {
+        @media (min-width: 1024px) {
           .lg\\:foo-\\[12px\\] {
             --foo: 12px;
             display: flex;
@@ -3915,7 +4292,8 @@ describe('matchUtilities()', () => {
             display: flex;
           }
         }
-      }"
+      }
+      "
     `)
   })
 
@@ -3934,8 +4312,9 @@ describe('matchUtilities()', () => {
         `,
 
         {
-          async loadModule(id, base) {
+          async loadModule(_id, base) {
             return {
+              path: '',
               base,
               module: ({ matchUtilities }: PluginAPI) => {
                 matchUtilities({
@@ -3949,52 +4328,103 @@ describe('matchUtilities()', () => {
           },
         },
       )
-    }).rejects.toThrowError(/invalid utility name/)
+    }).rejects.toThrow(/invalid utility name/)
+  })
+
+  test('replaces the class name with variants in nested selectors', async () => {
+    expect(
+      await run(
+        ['foo-red', 'md:foo-red', 'not-hover:md:foo-red'],
+        css`
+          @plugin "my-plugin";
+          @theme {
+            --breakpoint-md: 768px;
+          }
+          @tailwind utilities;
+        `,
+        {
+          async loadModule(base) {
+            return {
+              path: '',
+              base,
+              module: ({ matchUtilities }: PluginAPI) => {
+                matchUtilities(
+                  { foo: (value) => ({ ':where(.foo > :first-child)': { color: value } }) },
+                  { values: { red: 'red' } },
+                )
+              },
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .foo-red :where(.foo-red > :first-child) {
+        color: red;
+      }
+
+      @media (min-width: 768px) {
+        .md\\:foo-red :where(.md\\:foo-red > :first-child), .not-hover\\:md\\:foo-red:not(:hover) :where(.not-hover\\:md\\:foo-red > :first-child) {
+          color: red;
+        }
+      }
+
+      @media not all and (hover: hover) {
+        @media (min-width: 768px) {
+          .not-hover\\:md\\:foo-red :where(.not-hover\\:md\\:foo-red > :first-child) {
+            color: red;
+          }
+        }
+      }
+      "
+    `)
   })
 })
 
 describe('addComponents()', () => {
   test('is an alias for addUtilities', async () => {
-    let compiled = await compile(
-      css`
-        @plugin "my-plugin";
-        @tailwind utilities;
-      `,
-      {
-        async loadModule(id, base) {
-          return {
-            base,
-            module: ({ addComponents }: PluginAPI) => {
-              addComponents({
-                '.btn': {
-                  padding: '.5rem 1rem',
-                  borderRadius: '.25rem',
-                  fontWeight: '600',
-                },
-                '.btn-blue': {
-                  backgroundColor: '#3490dc',
-                  color: '#fff',
-                  '&:hover': {
-                    backgroundColor: '#2779bd',
+    expect(
+      await run(
+        ['btn', 'btn-blue', 'btn-red'],
+        css`
+          @plugin "my-plugin";
+          @tailwind utilities;
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ addComponents }: PluginAPI) => {
+                addComponents({
+                  '.btn': {
+                    padding: '.5rem 1rem',
+                    borderRadius: '.25rem',
+                    fontWeight: '600',
                   },
-                },
-                '.btn-red': {
-                  backgroundColor: '#e3342f',
-                  color: '#fff',
-                  '&:hover': {
-                    backgroundColor: '#cc1f1a',
+                  '.btn-blue': {
+                    backgroundColor: '#3490dc',
+                    color: '#fff',
+                    '&:hover': {
+                      backgroundColor: '#2779bd',
+                    },
                   },
-                },
-              })
-            },
-          }
+                  '.btn-red': {
+                    backgroundColor: '#e3342f',
+                    color: '#fff',
+                    '&:hover': {
+                      backgroundColor: '#cc1f1a',
+                    },
+                  },
+                })
+              },
+            }
+          },
         },
-      },
-    )
-
-    expect(optimizeCss(compiled.build(['btn', 'btn-blue', 'btn-red'])).trim())
-      .toMatchInlineSnapshot(`
-      ".btn {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .btn {
         border-radius: .25rem;
         padding: .5rem 1rem;
         font-weight: 600;
@@ -4016,44 +4446,39 @@ describe('addComponents()', () => {
 
       .btn-red:hover {
         background-color: #cc1f1a;
-      }"
+      }
+      "
     `)
   })
 })
 
 describe('matchComponents()', () => {
   test('is an alias for matchUtilities', async () => {
-    let compiled = await compile(
-      css`
-        @plugin "my-plugin";
-        @tailwind utilities;
-      `,
-      {
-        async loadModule(id, base) {
-          return {
-            base,
-            module: ({ matchComponents }: PluginAPI) => {
-              matchComponents(
-                {
-                  prose: (value) => ({ '--container-size': value }),
-                },
-                {
-                  values: {
-                    DEFAULT: 'normal',
-                    sm: 'sm',
-                    lg: 'lg',
-                  },
-                },
-              )
-            },
-          }
+    expect(
+      await run(
+        ['prose', 'sm:prose-sm', 'hover:prose-lg'],
+        css`
+          @plugin "my-plugin";
+          @tailwind utilities;
+        `,
+        {
+          async loadModule(_id, base) {
+            return {
+              path: '',
+              base,
+              module: ({ matchComponents }: PluginAPI) => {
+                matchComponents(
+                  { prose: (value) => ({ '--container-size': value }) },
+                  { values: { DEFAULT: 'normal', sm: 'sm', lg: 'lg' } },
+                )
+              },
+            }
+          },
         },
-      },
-    )
-
-    expect(optimizeCss(compiled.build(['prose', 'sm:prose-sm', 'hover:prose-lg'])).trim())
-      .toMatchInlineSnapshot(`
-      ".prose {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .prose {
         --container-size: normal;
       }
 
@@ -4061,21 +4486,23 @@ describe('matchComponents()', () => {
         .hover\\:prose-lg:hover {
           --container-size: lg;
         }
-      }"
+      }
+      "
     `)
   })
 })
 
 describe('prefix()', () => {
   test('is an identity function', async () => {
-    let fn = vi.fn()
+    using fn = vi.fn()
     await compile(
       css`
         @plugin "my-plugin";
       `,
       {
-        async loadModule(id, base) {
+        async loadModule(_id, base) {
           return {
+            path: '',
             base,
             module: ({ prefix }: PluginAPI) => {
               fn(prefix('btn'))
@@ -4091,14 +4518,15 @@ describe('prefix()', () => {
 
 describe('config()', () => {
   test('can return the resolved config when passed no arguments', async () => {
-    let fn = vi.fn()
+    using fn = vi.fn()
     await compile(
       css`
         @plugin "my-plugin";
       `,
       {
-        async loadModule(id, base) {
+        async loadModule(_id, base) {
           return {
+            path: '',
             base,
             module: ({ config }: PluginAPI) => {
               fn(config())
@@ -4118,14 +4546,15 @@ describe('config()', () => {
   })
 
   test('can return part of the config', async () => {
-    let fn = vi.fn()
+    using fn = vi.fn()
     await compile(
       css`
         @plugin "my-plugin";
       `,
       {
-        async loadModule(id, base) {
+        async loadModule(_id, base) {
           return {
+            path: '',
             base,
             module: ({ config }: PluginAPI) => {
               fn(config('theme'))
@@ -4143,14 +4572,15 @@ describe('config()', () => {
   })
 
   test('falls back to default value if requested path does not exist', async () => {
-    let fn = vi.fn()
+    using fn = vi.fn()
     await compile(
       css`
         @plugin "my-plugin";
       `,
       {
-        async loadModule(id, base) {
+        async loadModule(_id, base) {
           return {
+            path: '',
             base,
             module: ({ config }: PluginAPI) => {
               fn(config('somekey', 'defaultvalue'))
@@ -4162,4 +4592,40 @@ describe('config()', () => {
 
     expect(fn).toHaveBeenCalledWith('defaultvalue')
   })
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/19721
+  test('matchUtilities does not match Object.prototype properties as values', async ({
+    expect,
+  }) => {
+    // These should not crash or produce output
+    expect(
+      await run(
+        [
+          'test-constructor',
+          'test-hasOwnProperty',
+          'test-toString',
+          'test-valueOf',
+          'test-__proto__',
+        ],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin";
+        `,
+        {
+          loadModule: async (_id, base) => {
+            return {
+              path: '',
+              base,
+              module: plugin(function ({ matchUtilities }) {
+                matchUtilities(
+                  { test: (value) => ({ '--test': value }) },
+                  { values: { foo: 'bar' } },
+                )
+              }),
+            }
+          },
+        },
+      ),
+    ).toEqual('')
+  })
 })
diff --git a/packages/tailwindcss/src/compat/plugin-api.ts b/packages/tailwindcss/src/compat/plugin-api.ts
index 95f4db9e5..11878fb30 100644
--- a/packages/tailwindcss/src/compat/plugin-api.ts
+++ b/packages/tailwindcss/src/compat/plugin-api.ts
@@ -1,19 +1,22 @@
 import type { Features } from '..'
 import { substituteAtApply } from '../apply'
-import { atRule, decl, rule, walk, type AstNode } from '../ast'
+import { atRule, cloneAstNode, context, decl, rule, type AstNode } from '../ast'
 import type { Candidate, CandidateModifier, NamedUtilityValue } from '../candidate'
 import { substituteFunctions } from '../css-functions'
 import * as CSS from '../css-parser'
 import type { DesignSystem } from '../design-system'
+import * as SelectorParser from '../selector-parser'
+import type { SourceLocation } from '../source-maps/source'
 import { withAlpha } from '../utilities'
 import { DefaultMap } from '../utils/default-map'
+import { escape } from '../utils/escape'
 import { inferDataType } from '../utils/infer-data-type'
 import { segment } from '../utils/segment'
 import { toKeyPath } from '../utils/to-key-path'
-import { compoundsForSelectors, substituteAtSlot } from '../variants'
+import { compoundsForSelectors, IS_VALID_VARIANT_NAME, substituteAtSlot } from '../variants'
+import { walk, WalkAction } from '../walk'
 import type { ResolvedConfig, UserConfig } from './config/types'
 import { createThemeFn } from './plugin-functions'
-import * as SelectorParser from './selector-parser'
 
 export type Config = UserConfig
 export type PluginFn = (api: PluginAPI) => void
@@ -23,6 +26,7 @@ export type PluginWithConfig = {
 
   /** @internal */
   reference?: boolean
+  src?: SourceLocation | undefined
 }
 export type PluginWithOptions<T> = {
   (options?: T): PluginWithConfig
@@ -86,20 +90,56 @@ export type PluginAPI = {
 
 const IS_VALID_UTILITY_NAME = /^[a-z@][a-zA-Z0-9/%._-]*$/
 
-export function buildPluginApi(
-  designSystem: DesignSystem,
-  ast: AstNode[],
-  resolvedConfig: ResolvedConfig,
-  featuresRef: { current: Features },
-): PluginAPI {
+export function buildPluginApi({
+  designSystem,
+  ast,
+  resolvedConfig,
+  featuresRef,
+  referenceMode,
+  src,
+}: {
+  designSystem: DesignSystem
+  ast: AstNode[]
+  resolvedConfig: ResolvedConfig
+  featuresRef: { current: Features }
+  referenceMode: boolean
+  src: SourceLocation | undefined
+}): PluginAPI {
   let api: PluginAPI = {
     addBase(css) {
+      if (referenceMode) return
       let baseNodes = objectToAst(css)
-      featuresRef.current |= substituteFunctions(baseNodes, api.theme)
-      ast.push(atRule('@layer', 'base', baseNodes))
+      featuresRef.current |= substituteFunctions(baseNodes, designSystem)
+      let rule = atRule('@layer', 'base', baseNodes)
+      walk([rule], (node) => {
+        node.src = src
+      })
+      ast.push(rule)
     },
 
     addVariant(name, variant) {
+      if (!IS_VALID_VARIANT_NAME.test(name)) {
+        throw new Error(
+          `\`addVariant('${name}')\` defines an invalid variant name. Variants should only contain alphanumeric, dashes, or underscore characters and start with a lowercase letter or number.`,
+        )
+      }
+
+      // Ignore variants emitting v3 `:merge(…)` rules. In v4, the `group-*` and `peer-*` variants
+      // compound automatically.
+      if (typeof variant === 'string') {
+        if (variant.includes(':merge(')) return
+      } else if (Array.isArray(variant)) {
+        if (variant.some((v) => v.includes(':merge('))) return
+      } else if (typeof variant === 'object') {
+        function keyIncludes(object: Record<string, any>, search: string): boolean {
+          return Object.entries(object).some(
+            ([key, value]) =>
+              key.includes(search) || (typeof value === 'object' && keyIncludes(value, search)),
+          )
+        }
+        if (keyIncludes(variant, ':merge(')) return
+      }
+
       // Single selector or multiple parallel selectors
       if (typeof variant === 'string' || Array.isArray(variant)) {
         designSystem.variants.static(
@@ -115,7 +155,7 @@ export function buildPluginApi(
 
       // CSS-in-JS object
       else if (typeof variant === 'object') {
-        designSystem.variants.fromAst(name, objectToAst(variant))
+        designSystem.variants.fromAst(name, objectToAst(variant), designSystem)
       }
     },
     matchVariant(name, fn, options) {
@@ -128,6 +168,17 @@ export function buildPluginApi(
         return parseVariantValue(resolved, nodes)
       }
 
+      try {
+        // Sample variant value and ignore variants emitting v3 `:merge` rules. In
+        // v4, the `group-*` and `peer-*` variants compound automatically.
+        let sample = fn('a', { modifier: null })
+        if (typeof sample === 'string' && sample.includes(':merge(')) {
+          return
+        } else if (Array.isArray(sample) && sample.some((r) => r.includes(':merge('))) {
+          return
+        }
+      } catch {}
+
       let defaultOptionKeys = Object.keys(options?.values ?? {})
       designSystem.variants.group(
         () => {
@@ -151,12 +202,17 @@ export function buildPluginApi(
                 ruleNodes.nodes,
               )
             } else if (variant.value.kind === 'named' && options?.values) {
+              if (!Object.hasOwn(options.values, variant.value.value)) {
+                return null
+              }
               let defaultValue = options.values[variant.value.value]
               if (typeof defaultValue !== 'string') {
-                return
+                return null
               }
 
               ruleNodes.nodes = resolveVariantValue(defaultValue, variant.modifier, ruleNodes.nodes)
+            } else {
+              return null
             }
           })
         },
@@ -170,8 +226,14 @@ export function buildPluginApi(
           let aValueKey = a.value ? a.value.value : 'DEFAULT'
           let zValueKey = z.value ? z.value.value : 'DEFAULT'
 
-          let aValue = options?.values?.[aValueKey] ?? aValueKey
-          let zValue = options?.values?.[zValueKey] ?? zValueKey
+          let aValue =
+            (options?.values && Object.hasOwn(options.values, aValueKey)
+              ? options.values[aValueKey]
+              : undefined) ?? aValueKey
+          let zValue =
+            (options?.values && Object.hasOwn(options.values, zValueKey)
+              ? options.values[zValueKey]
+              : undefined) ?? zValueKey
 
           if (options && typeof options.sort === 'function') {
             return options.sort(
@@ -195,6 +257,10 @@ export function buildPluginApi(
           return aValue < zValue ? -1 : 1
         },
       )
+
+      designSystem.variants.suggest(name, () =>
+        Object.keys(options?.values ?? {}).filter((v) => v !== 'DEFAULT'),
+      )
     },
 
     addUtilities(utilities) {
@@ -212,14 +278,20 @@ export function buildPluginApi(
 
       for (let [name, css] of entries) {
         if (name.startsWith('@keyframes ')) {
-          ast.push(rule(name, objectToAst(css)))
+          if (!referenceMode) {
+            let keyframes = rule(name, objectToAst(css))
+            walk([keyframes], (node) => {
+              node.src = src
+            })
+            ast.push(keyframes)
+          }
           continue
         }
 
         let selectorAst = SelectorParser.parse(name)
         let foundValidUtility = false
 
-        SelectorParser.walk(selectorAst, (node) => {
+        walk(selectorAst, (node) => {
           if (
             node.kind === 'selector' &&
             node.value[0] === '.' &&
@@ -238,8 +310,15 @@ export function buildPluginApi(
             return
           }
 
-          if (node.kind === 'function' && node.value === ':not') {
-            return SelectorParser.SelectorWalkAction.Skip
+          if (
+            node.kind === 'function' &&
+            (node.value === ':not' ||
+              // A class inside `:nth-child(… of <selector>)` is part of the
+              // condition, not a utility being defined.
+              node.value === ':nth-child' ||
+              node.value === ':nth-last-child')
+          ) {
+            return WalkAction.Skip
           }
         })
 
@@ -256,7 +335,7 @@ export function buildPluginApi(
           walk(ast, (node) => {
             if (node.kind === 'rule') {
               let selectorAst = SelectorParser.parse(node.selector)
-              SelectorParser.walk(selectorAst, (node) => {
+              walk(selectorAst, (node) => {
                 if (node.kind === 'selector' && node.value[0] === '.') {
                   node.value = `.${designSystem.theme.prefix}\\:${node.value.slice(1)}`
                 }
@@ -266,8 +345,9 @@ export function buildPluginApi(
           })
         }
 
-        designSystem.utilities.static(className, () => {
-          let clonedAst = structuredClone(ast)
+        designSystem.utilities.static(className, (candidate) => {
+          let clonedAst = ast.map(cloneAstNode)
+          replaceNestedClassNameReferences(clonedAst, className, candidate.raw)
           featuresRef.current |= substituteAtApply(clonedAst, designSystem)
           return clonedAst
         })
@@ -326,13 +406,13 @@ export function buildPluginApi(
               let values = options?.values ?? {}
 
               if (isColor) {
-                // Color utilities implicitly support `inherit`, `transparent`, and `currentColor`
+                // Color utilities implicitly support `inherit`, `transparent`, and `currentcolor`
                 // for backwards compatibility but still allow them to be overridden
                 values = Object.assign(
                   {
                     inherit: 'inherit',
                     transparent: 'transparent',
-                    current: 'currentColor',
+                    current: 'currentcolor',
                   },
                   values,
                 )
@@ -342,10 +422,13 @@ export function buildPluginApi(
                 value = values.DEFAULT ?? null
               } else if (candidate.value.kind === 'arbitrary') {
                 value = candidate.value.value
-              } else if (candidate.value.fraction && values[candidate.value.fraction]) {
+              } else if (
+                candidate.value.fraction &&
+                Object.hasOwn(values, candidate.value.fraction)
+              ) {
                 value = values[candidate.value.fraction]
                 ignoreModifier = true
-              } else if (values[candidate.value.value]) {
+              } else if (Object.hasOwn(values, candidate.value.value)) {
                 value = values[candidate.value.value]
               } else if (values.__BARE_VALUE__) {
                 value = values.__BARE_VALUE__(candidate.value) ?? null
@@ -366,7 +449,7 @@ export function buildPluginApi(
                 modifier = null
               } else if (modifiers === 'any' || candidate.modifier.kind === 'arbitrary') {
                 modifier = candidate.modifier.value
-              } else if (modifiers?.[candidate.modifier.value]) {
+              } else if (modifiers && Object.hasOwn(modifiers, candidate.modifier.value)) {
                 modifier = modifiers[candidate.modifier.value]
               } else if (isColor && !Number.isNaN(Number(candidate.modifier.value))) {
                 modifier = `${candidate.modifier.value}%`
@@ -390,6 +473,7 @@ export function buildPluginApi(
             }
 
             let ast = objectToAst(fn(value, { modifier }))
+            replaceNestedClassNameReferences(ast, name, candidate.raw)
             featuresRef.current |= substituteAtApply(ast, designSystem)
             return ast
           }
@@ -408,6 +492,10 @@ export function buildPluginApi(
           // work even with legacy configs and plugins
           valueKeys.delete('__BARE_VALUE__')
 
+          // The `__CSS_VALUES__` key is a special key used by the theme function
+          // to transport `@theme` metadata about values from CSS
+          valueKeys.delete('__CSS_VALUES__')
+
           // The `DEFAULT` key is represented as `null` in the utility API
           if (valueKeys.has('DEFAULT')) {
             valueKeys.delete('DEFAULT')
@@ -482,16 +570,26 @@ export function objectToAst(rules: CssInJs | CssInJs[]): AstNode[] {
   let entries = rules.flatMap((rule) => Object.entries(rule))
 
   for (let [name, value] of entries) {
+    if (value === null || value === undefined) continue
+
+    // @ts-expect-error
+    // We do not want `false` present in the types but still need to discard these nodes for
+    // compatibility purposes
+    if (value === false) continue
+
     if (typeof value !== 'object') {
-      if (!name.startsWith('--') && value === '@slot') {
-        ast.push(rule(name, [atRule('@slot')]))
-      } else {
+      if (!name.startsWith('--')) {
+        if (value === '@slot') {
+          ast.push(rule(name, [atRule('@slot')]))
+          continue
+        }
+
         // Convert camelCase to kebab-case:
         // https://github.com/postcss/postcss-js/blob/b3db658b932b42f6ac14ca0b1d50f50c4569805b/parser.js#L30-L35
         name = name.replace(/([A-Z])/g, '-$1').toLowerCase()
-
-        ast.push(decl(name, String(value)))
       }
+
+      ast.push(decl(name, String(value)))
     } else if (Array.isArray(value)) {
       for (let item of value) {
         if (typeof item === 'string') {
@@ -500,7 +598,7 @@ export function objectToAst(rules: CssInJs | CssInJs[]): AstNode[] {
           ast.push(rule(name, objectToAst(item)))
         }
       }
-    } else if (value !== null) {
+    } else {
       ast.push(rule(name, objectToAst(value)))
     }
   }
@@ -510,17 +608,50 @@ export function objectToAst(rules: CssInJs | CssInJs[]): AstNode[] {
 
 function parseVariantValue(resolved: string | string[], nodes: AstNode[]): AstNode[] {
   let resolvedArray = typeof resolved === 'string' ? [resolved] : resolved
-  return resolvedArray.flatMap((r) => {
+  return resolvedArray.flatMap((r): AstNode | AstNode[] => {
     if (r.trim().endsWith('}')) {
+      let usesAtScope = r.includes('@scope')
       let updatedCSS = r.replace('}', '{@slot}}')
       let ast = CSS.parse(updatedCSS)
+
+      if (usesAtScope) {
+        substituteAtSlot(ast, [context({ source: 'user' }, nodes)])
+        return context({ source: 'variant' }, ast)
+      }
+
       substituteAtSlot(ast, nodes)
       return ast
     } else {
-      return rule(r, nodes)
+      let node = rule(r, nodes)
+
+      if (node.kind === 'at-rule' && node.name === '@scope') {
+        node.nodes = [context({ source: 'user' }, nodes)]
+        return context({ source: 'variant' }, [node])
+      }
+
+      return node
     }
   })
 }
 
 type Primitive = string | number | boolean | null
 export type CssPluginOptions = Record<string, Primitive | Primitive[]>
+
+function replaceNestedClassNameReferences(
+  ast: AstNode[],
+  utilityName: string,
+  rawCandidate: string,
+) {
+  // Replace nested rules using the utility name in the selector
+  walk(ast, (node) => {
+    if (node.kind === 'rule') {
+      let selectorAst = SelectorParser.parse(node.selector)
+      walk(selectorAst, (node) => {
+        if (node.kind === 'selector' && node.value === `.${utilityName}`) {
+          node.value = `.${escape(rawCandidate)}`
+        }
+      })
+      node.selector = SelectorParser.toCss(selectorAst)
+    }
+  })
+}
diff --git a/packages/tailwindcss/src/compat/plugin-functions.ts b/packages/tailwindcss/src/compat/plugin-functions.ts
index 9e3917eaa..bbd5fac46 100644
--- a/packages/tailwindcss/src/compat/plugin-functions.ts
+++ b/packages/tailwindcss/src/compat/plugin-functions.ts
@@ -100,6 +100,28 @@ export function createThemeFn(
         return [base, extra]
       }
 
+      // If `--color-foo` and `--color-foo-bar` are both defined, `colors.foo`
+      // produces a synthetic object:
+      //
+      // ```ts
+      // { DEFAULT: 'red', bar: 'blue', __CSS_VALUES__: { DEFAULT: 0, bar: 0 } }
+      // ```
+      //
+      // Prefer `DEFAULT` instead of exposing the object to plugin code.
+      //
+      // This only applies to lookups of a specific key (e.g. `colors.foo`). A
+      // namespace root lookup (e.g. `theme('shadow')`) resolves to the whole
+      // namespace as an object, like in v3.
+      if (
+        keypath.length > 1 &&
+        cssValue !== null &&
+        typeof cssValue === 'object' &&
+        !Array.isArray(cssValue) &&
+        'DEFAULT' in cssValue
+      ) {
+        return cssValue.DEFAULT
+      }
+
       // Values from CSS take precedence over values from the config
       return cssValue ?? configValue
     })()
@@ -208,7 +230,12 @@ function readFromCss(
   // The request looked like `theme('animation.spin')` and was turned into a
   // lookup for `--animation-spin-*` which had only one entry which means it
   // should be returned directly.
-  if ('DEFAULT' in obj && Object.keys(obj).length === 1) {
+  //
+  // This only applies to lookups of a specific key (`path.length > 1`). A
+  // namespace root lookup like `theme('shadow')` resolves to the whole
+  // namespace as an object, like in v3, so it must keep the object shape (`{
+  // DEFAULT: … }`).
+  if (path.length > 1 && 'DEFAULT' in obj && Object.keys(obj).length === 1) {
     return [obj.DEFAULT as any, optionsObj.DEFAULT ?? ThemeOptions.NONE] as const
   }
 
@@ -223,8 +250,10 @@ function get(obj: any, path: string[]) {
   for (let i = 0; i < path.length; ++i) {
     let key = path[i]
 
-    // The key does not exist so concatenate it with the next key
-    if (obj[key] === undefined) {
+    // The key does not exist so concatenate it with the next key.
+    // We use Object.hasOwn to avoid matching inherited prototype properties
+    // (e.g. "constructor", "toString") when traversing config objects.
+    if (obj === null || obj === undefined || typeof obj !== 'object' || !Object.hasOwn(obj, key)) {
       if (path[i + 1] === undefined) {
         return undefined
       }
diff --git a/packages/tailwindcss/src/compat/screens-config.test.ts b/packages/tailwindcss/src/compat/screens-config.test.ts
index 983b22ea0..d81cd8de6 100644
--- a/packages/tailwindcss/src/compat/screens-config.test.ts
+++ b/packages/tailwindcss/src/compat/screens-config.test.ts
@@ -1,91 +1,89 @@
 import { describe, expect, test } from 'vitest'
-import { compile } from '..'
+import { run } from '../test-utils/run'
 
 const css = String.raw
 
 test('CSS `--breakpoint-*` merge with JS config `screens`', async () => {
-  let input = css`
-    @theme default {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
-    @theme {
-      --breakpoint-md: 50rem;
-    }
-    @config "./config.js";
-    @tailwind utilities;
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          extend: {
-            screens: {
-              sm: '44rem',
+  expect(
+    await run(
+      [
+        'sm:flex',
+        'md:flex',
+        'lg:flex',
+        'min-sm:max-md:underline',
+        'min-md:max-lg:underline',
+        'max-w-screen-sm',
+        // Ensure other core variants appear at the end
+        'print:items-end',
+      ],
+      css`
+        @theme default {
+          --breakpoint-sm: 40rem;
+          --breakpoint-md: 48rem;
+          --breakpoint-lg: 64rem;
+          --breakpoint-xl: 80rem;
+          --breakpoint-2xl: 96rem;
+        }
+        @theme {
+          --breakpoint-md: 50rem;
+        }
+        @config "./config.js";
+        @tailwind utilities;
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              extend: {
+                screens: {
+                  sm: '44rem',
+                },
+              },
             },
           },
-        },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(
-    compiler.build([
-      'sm:flex',
-      'md:flex',
-      'lg:flex',
-      'min-sm:max-md:underline',
-      'min-md:max-lg:underline',
-      'max-w-screen-sm',
-      // Ensure other core variants appear at the end
-      'print:items-end',
-    ]),
+    ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-md: 50rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
+    "
     .max-w-screen-sm {
       max-width: 44rem;
     }
-    .sm\\:flex {
-      @media (width >= 44rem) {
+
+    @media (min-width: 44rem) {
+      .sm\\:flex {
         display: flex;
       }
-    }
-    .min-sm\\:max-md\\:underline {
-      @media (width >= 44rem) {
-        @media (width < 50rem) {
+
+      @media not all and (min-width: 50rem) {
+        .min-sm\\:max-md\\:underline {
           text-decoration-line: underline;
         }
       }
     }
-    .md\\:flex {
-      @media (width >= 50rem) {
+
+    @media (min-width: 50rem) {
+      .md\\:flex {
         display: flex;
       }
-    }
-    .min-md\\:max-lg\\:underline {
-      @media (width >= 50rem) {
-        @media (width < 64rem) {
+
+      @media not all and (min-width: 64rem) {
+        .min-md\\:max-lg\\:underline {
           text-decoration-line: underline;
         }
       }
     }
-    .lg\\:flex {
-      @media (width >= 64rem) {
+
+    @media (min-width: 64rem) {
+      .lg\\:flex {
         display: flex;
       }
     }
-    .print\\:items-end {
-      @media print {
+
+    @media print {
+      .print\\:items-end {
         align-items: flex-end;
       }
     }
@@ -94,103 +92,98 @@ test('CSS `--breakpoint-*` merge with JS config `screens`', async () => {
 })
 
 test('JS config `screens` extend CSS `--breakpoint-*`', async () => {
-  let input = css`
-    @theme default {
-      --breakpoint-xs: 39rem;
-      --breakpoint-md: 49rem;
-    }
-    @theme {
-      --breakpoint-md: 50rem;
-    }
-    @config "./config.js";
-    @tailwind utilities;
-  `
+  expect(
+    await run(
+      [
+        // Order is messed up on purpose
+        'md:flex',
+        'sm:flex',
+        'lg:flex',
+        'xs:flex',
+        'min-md:max-lg:underline',
+        'min-sm:max-md:underline',
+        'min-xs:flex',
+        'min-xs:max-md:underline',
 
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          extend: {
-            screens: {
-              xs: '30rem',
-              sm: '40rem',
-              md: '48rem',
-              lg: '60rem',
+        // Ensure other core variants appear at the end
+        'print:items-end',
+      ],
+      css`
+        @theme default {
+          --breakpoint-xs: 39rem;
+          --breakpoint-md: 49rem;
+        }
+        @theme {
+          --breakpoint-md: 50rem;
+        }
+        @config "./config.js";
+        @tailwind utilities;
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              extend: {
+                screens: {
+                  xs: '30rem',
+                  sm: '40rem',
+                  md: '48rem',
+                  lg: '60rem',
+                },
+              },
             },
           },
-        },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(
-    compiler.build([
-      // Order is messed up on purpose
-      'md:flex',
-      'sm:flex',
-      'lg:flex',
-      'xs:flex',
-      'min-md:max-lg:underline',
-      'min-sm:max-md:underline',
-      'min-xs:flex',
-      'min-xs:max-md:underline',
-
-      // Ensure other core variants appear at the end
-      'print:items-end',
-    ]),
+    ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-md: 50rem;
-    }
-    .min-xs\\:flex {
-      @media (width >= 30rem) {
+    "
+    @media (min-width: 30rem) {
+      .min-xs\\:flex, .xs\\:flex {
         display: flex;
       }
-    }
-    .xs\\:flex {
-      @media (width >= 30rem) {
-        display: flex;
-      }
-    }
-    .min-xs\\:max-md\\:underline {
-      @media (width >= 30rem) {
-        @media (width < 50rem) {
+
+      @media not all and (min-width: 50rem) {
+        .min-xs\\:max-md\\:underline {
           text-decoration-line: underline;
         }
       }
     }
-    .sm\\:flex {
-      @media (width >= 40rem) {
+
+    @media (min-width: 40rem) {
+      .sm\\:flex {
         display: flex;
       }
-    }
-    .min-sm\\:max-md\\:underline {
-      @media (width >= 40rem) {
-        @media (width < 50rem) {
+
+      @media not all and (min-width: 50rem) {
+        .min-sm\\:max-md\\:underline {
           text-decoration-line: underline;
         }
       }
     }
-    .md\\:flex {
-      @media (width >= 50rem) {
+
+    @media (min-width: 50rem) {
+      .md\\:flex {
         display: flex;
       }
-    }
-    .min-md\\:max-lg\\:underline {
-      @media (width >= 50rem) {
-        @media (width < 60rem) {
+
+      @media not all and (min-width: 60rem) {
+        .min-md\\:max-lg\\:underline {
           text-decoration-line: underline;
         }
       }
     }
-    .lg\\:flex {
-      @media (width >= 60rem) {
+
+    @media (min-width: 60rem) {
+      .lg\\:flex {
         display: flex;
       }
     }
-    .print\\:items-end {
-      @media print {
+
+    @media print {
+      .print\\:items-end {
         align-items: flex-end;
       }
     }
@@ -199,70 +192,73 @@ test('JS config `screens` extend CSS `--breakpoint-*`', async () => {
 })
 
 test('JS config `screens` only setup, even if those match the default-theme export', async () => {
-  let input = css`
-    @config "./config.js";
-    @tailwind utilities;
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          screens: {
-            sm: '40rem',
-            md: '48rem',
-            lg: '64rem',
-          },
-        },
-      },
-      base: '/root',
-    }),
-  })
-
   expect(
-    compiler.build([
-      // Order is messed up on purpose
-      'md:flex',
-      'sm:flex',
-      'lg:flex',
-      'min-md:max-lg:underline',
-      'min-sm:max-md:underline',
+    await run(
+      [
+        // Order is messed up on purpose
+        'md:flex',
+        'sm:flex',
+        'lg:flex',
+        'min-md:max-lg:underline',
+        'min-sm:max-md:underline',
 
-      // Ensure other core variants appear at the end
-      'print:items-end',
-    ]),
+        // Ensure other core variants appear at the end
+        'print:items-end',
+      ],
+      css`
+        @config "./config.js";
+        @tailwind utilities;
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              screens: {
+                sm: '40rem',
+                md: '48rem',
+                lg: '64rem',
+              },
+            },
+          },
+          base: '/root',
+          path: '',
+        }),
+      },
+    ),
   ).toMatchInlineSnapshot(`
-    ".sm\\:flex {
-      @media (width >= 40rem) {
+    "
+    @media (min-width: 40rem) {
+      .sm\\:flex {
         display: flex;
       }
-    }
-    .min-sm\\:max-md\\:underline {
-      @media (width >= 40rem) {
-        @media (width < 48rem) {
+
+      @media not all and (min-width: 48rem) {
+        .min-sm\\:max-md\\:underline {
           text-decoration-line: underline;
         }
       }
     }
-    .md\\:flex {
-      @media (width >= 48rem) {
+
+    @media (min-width: 48rem) {
+      .md\\:flex {
         display: flex;
       }
-    }
-    .min-md\\:max-lg\\:underline {
-      @media (width >= 48rem) {
-        @media (width < 64rem) {
+
+      @media not all and (min-width: 64rem) {
+        .min-md\\:max-lg\\:underline {
           text-decoration-line: underline;
         }
       }
     }
-    .lg\\:flex {
-      @media (width >= 64rem) {
+
+    @media (min-width: 64rem) {
+      .lg\\:flex {
         display: flex;
       }
     }
-    .print\\:items-end {
-      @media print {
+
+    @media print {
+      .print\\:items-end {
         align-items: flex-end;
       }
     }
@@ -271,113 +267,85 @@ test('JS config `screens` only setup, even if those match the default-theme expo
 })
 
 test('JS config `screens` overwrite CSS `--breakpoint-*`', async () => {
-  let input = css`
-    @theme default {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
-    @config "./config.js";
-    @tailwind utilities;
-  `
+  expect(
+    await run(
+      [
+        'sm:flex',
+        'md:flex',
+        'mini:flex',
+        'midi:flex',
+        'maxi:flex',
+        'min-md:max-lg:underline',
+        'min-sm:max-md:underline',
+        'min-midi:max-maxi:underline',
+        'min-mini:max-midi:underline',
 
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          extend: {
-            screens: {
-              mini: '40rem',
-              midi: '48rem',
-              maxi: '64rem',
+        // Ensure other core variants appear at the end
+        'print:items-end',
+      ],
+      css`
+        @theme default {
+          --breakpoint-sm: 40rem;
+          --breakpoint-md: 48rem;
+          --breakpoint-lg: 64rem;
+          --breakpoint-xl: 80rem;
+          --breakpoint-2xl: 96rem;
+        }
+        @config "./config.js";
+        @tailwind utilities;
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              extend: {
+                screens: {
+                  mini: '40rem',
+                  midi: '48rem',
+                  maxi: '64rem',
+                },
+              },
             },
           },
-        },
+          base: '/root',
+          path: '',
+        }),
       },
-      base: '/root',
-    }),
-  })
-
-  expect(
-    compiler.build([
-      'sm:flex',
-      'md:flex',
-      'mini:flex',
-      'midi:flex',
-      'maxi:flex',
-      'min-md:max-lg:underline',
-      'min-sm:max-md:underline',
-      'min-midi:max-maxi:underline',
-      'min-mini:max-midi:underline',
-
-      // Ensure other core variants appear at the end
-      'print:items-end',
-    ]),
+    ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
-    .mini\\:flex {
-      @media (width >= 40rem) {
+    "
+    @media (min-width: 40rem) {
+      .mini\\:flex, .sm\\:flex {
         display: flex;
       }
-    }
-    .sm\\:flex {
-      @media (width >= 40rem) {
-        display: flex;
-      }
-    }
-    .min-mini\\:max-midi\\:underline {
-      @media (width >= 40rem) {
-        @media (width < 48rem) {
+
+      @media not all and (min-width: 48rem) {
+        .min-mini\\:max-midi\\:underline, .min-sm\\:max-md\\:underline {
           text-decoration-line: underline;
         }
       }
     }
-    .min-sm\\:max-md\\:underline {
-      @media (width >= 40rem) {
-        @media (width < 48rem) {
+
+    @media (min-width: 48rem) {
+      .md\\:flex, .midi\\:flex {
+        display: flex;
+      }
+
+      @media not all and (min-width: 64rem) {
+        .min-md\\:max-lg\\:underline, .min-midi\\:max-maxi\\:underline {
           text-decoration-line: underline;
         }
       }
     }
-    .md\\:flex {
-      @media (width >= 48rem) {
+
+    @media (min-width: 64rem) {
+      .maxi\\:flex {
         display: flex;
       }
     }
-    .midi\\:flex {
-      @media (width >= 48rem) {
-        display: flex;
-      }
-    }
-    .min-md\\:max-lg\\:underline {
-      @media (width >= 48rem) {
-        @media (width < 64rem) {
-          text-decoration-line: underline;
-        }
-      }
-    }
-    .min-midi\\:max-maxi\\:underline {
-      @media (width >= 48rem) {
-        @media (width < 64rem) {
-          text-decoration-line: underline;
-        }
-      }
-    }
-    .maxi\\:flex {
-      @media (width >= 64rem) {
-        display: flex;
-      }
-    }
-    .print\\:items-end {
-      @media print {
+
+    @media print {
+      .print\\:items-end {
         align-items: flex-end;
       }
     }
@@ -391,70 +359,91 @@ test('JS config with `theme: { extends }` should not include the `default-config
     @tailwind utilities;
   `
 
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          extend: {
-            screens: {
-              mini: '40rem',
-              midi: '48rem',
-              maxi: '64rem',
+  expect(
+    await run(['sm:flex', 'md:flex', 'min-md:max-lg:underline', 'min-sm:max-md:underline'], input, {
+      loadModule: async () => ({
+        module: {
+          theme: {
+            extend: {
+              screens: {
+                mini: '40rem',
+                midi: '48rem',
+                maxi: '64rem',
+              },
             },
           },
         },
-      },
-      base: '/root',
+        base: '/root',
+        path: '',
+      }),
     }),
-  })
-
-  expect(
-    compiler.build(['sm:flex', 'md:flex', 'min-md:max-lg:underline', 'min-sm:max-md:underline']),
   ).toBe('')
 
   expect(
-    compiler.build([
-      'mini:flex',
-      'midi:flex',
-      'maxi:flex',
-      'min-midi:max-maxi:underline',
-      'min-mini:max-midi:underline',
+    await run(
+      [
+        'mini:flex',
+        'midi:flex',
+        'maxi:flex',
+        'min-midi:max-maxi:underline',
+        'min-mini:max-midi:underline',
 
-      // Ensure other core variants appear at the end
-      'print:items-end',
-    ]),
+        // Ensure other core variants appear at the end
+        'print:items-end',
+      ],
+      input,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              extend: {
+                screens: {
+                  mini: '40rem',
+                  midi: '48rem',
+                  maxi: '64rem',
+                },
+              },
+            },
+          },
+          base: '/root',
+          path: '',
+        }),
+      },
+    ),
   ).toMatchInlineSnapshot(`
-    ".mini\\:flex {
-      @media (width >= 40rem) {
+    "
+    @media (min-width: 40rem) {
+      .mini\\:flex {
         display: flex;
       }
-    }
-    .min-mini\\:max-midi\\:underline {
-      @media (width >= 40rem) {
-        @media (width < 48rem) {
+
+      @media not all and (min-width: 48rem) {
+        .min-mini\\:max-midi\\:underline {
           text-decoration-line: underline;
         }
       }
     }
-    .midi\\:flex {
-      @media (width >= 48rem) {
+
+    @media (min-width: 48rem) {
+      .midi\\:flex {
         display: flex;
       }
-    }
-    .min-midi\\:max-maxi\\:underline {
-      @media (width >= 48rem) {
-        @media (width < 64rem) {
+
+      @media not all and (min-width: 64rem) {
+        .min-midi\\:max-maxi\\:underline {
           text-decoration-line: underline;
         }
       }
     }
-    .maxi\\:flex {
-      @media (width >= 64rem) {
+
+    @media (min-width: 64rem) {
+      .maxi\\:flex {
         display: flex;
       }
     }
-    .print\\:items-end {
-      @media print {
+
+    @media print {
+      .print\\:items-end {
         align-items: flex-end;
       }
     }
@@ -469,76 +458,104 @@ describe('complex screen configs', () => {
       @tailwind utilities;
     `
 
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            extend: {
-              screens: {
-                sm: { max: '639px' },
-                md: [
-                  //
-                  { min: '668px', max: '767px' },
-                  '868px',
-                ],
-                lg: { min: '868px' },
-                xl: { min: '1024px', max: '1279px' },
-                tall: { raw: '(min-height: 800px)' },
+    expect(
+      await run(['min-sm:flex', 'min-md:flex', 'min-xl:flex', 'min-tall:flex'], input, {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              extend: {
+                screens: {
+                  sm: { max: '639px' },
+                  md: [
+                    //
+                    { min: '668px', max: '767px' },
+                    '868px',
+                  ],
+                  lg: { min: '868px' },
+                  xl: { min: '1024px', max: '1279px' },
+                  tall: { raw: '(min-height: 800px)' },
+                },
               },
             },
           },
-        },
-        base: '/root',
+          base: '/root',
+          path: '',
+        }),
       }),
-    })
-
-    expect(compiler.build(['min-sm:flex', 'min-md:flex', 'min-xl:flex', 'min-tall:flex'])).toBe('')
+    ).toBe('')
 
     expect(
-      compiler.build([
-        'sm:flex',
-        'md:flex',
-        'lg:flex',
-        'min-lg:flex',
-        'xl:flex',
-        'tall:flex',
+      await run(
+        [
+          'sm:flex',
+          'md:flex',
+          'lg:flex',
+          'min-lg:flex',
+          'xl:flex',
+          'tall:flex',
 
-        // Ensure other core variants appear at the end
-        'print:items-end',
-      ]),
+          // Ensure other core variants appear at the end
+          'print:items-end',
+        ],
+        input,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                extend: {
+                  screens: {
+                    sm: { max: '639px' },
+                    md: [
+                      //
+                      { min: '668px', max: '767px' },
+                      '868px',
+                    ],
+                    lg: { min: '868px' },
+                    xl: { min: '1024px', max: '1279px' },
+                    tall: { raw: '(min-height: 800px)' },
+                  },
+                },
+              },
+            },
+            base: '/root',
+            path: '',
+          }),
+        },
+      ),
     ).toMatchInlineSnapshot(`
-      ".lg\\:flex {
-        @media (width >= 868px) {
+      "
+      @media (min-width: 868px) {
+        .lg\\:flex, .min-lg\\:flex {
           display: flex;
         }
       }
-      .min-lg\\:flex {
-        @media (width >= 868px) {
+
+      @media (max-width: 639px) {
+        .sm\\:flex {
           display: flex;
         }
       }
-      .sm\\:flex {
-        @media (639px >= width) {
+
+      @media (max-width: 767px) and (min-width: 668px), (min-width: 868px) {
+        .md\\:flex {
           display: flex;
         }
       }
-      .md\\:flex {
-        @media (767px >= width >= 668px), (width >= 868px) {
+
+      @media (max-width: 1279px) and (min-width: 1024px) {
+        .xl\\:flex {
           display: flex;
         }
       }
-      .xl\\:flex {
-        @media (1279px >= width >= 1024px) {
+
+      @media (min-height: 800px) {
+        .tall\\:flex {
           display: flex;
         }
       }
-      .tall\\:flex {
-        @media (min-height: 800px) {
-          display: flex;
-        }
-      }
-      .print\\:items-end {
-        @media print {
+
+      @media print {
+        .print\\:items-end {
           align-items: flex-end;
         }
       }
@@ -547,73 +564,65 @@ describe('complex screen configs', () => {
   })
 
   test("don't interfere with `min-*` and `max-*` variants of non-complex screen configs", async () => {
-    let input = css`
-      @theme default {
-        --breakpoint-sm: 39rem;
-        --breakpoint-md: 48rem;
-      }
-      @config "./config.js";
-      @tailwind utilities;
-    `
-
-    let compiler = await compile(input, {
-      loadModule: async () => ({
-        module: {
-          theme: {
-            extend: {
-              screens: {
-                sm: '40rem',
-                portrait: { raw: 'screen and (orientation: portrait)' },
+    expect(
+      await run(
+        [
+          'sm:flex',
+          'md:flex',
+          'portrait:flex',
+          'min-sm:flex',
+          'min-md:flex',
+          'min-portrait:flex',
+          // Ensure other core variants appear at the end
+          'print:items-end',
+        ],
+        css`
+          @theme default {
+            --breakpoint-sm: 39rem;
+            --breakpoint-md: 48rem;
+          }
+          @config "./config.js";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => ({
+            module: {
+              theme: {
+                extend: {
+                  screens: {
+                    sm: '40rem',
+                    portrait: { raw: 'screen and (orientation: portrait)' },
+                  },
+                },
               },
             },
-          },
+            base: '/root',
+            path: '',
+          }),
         },
-        base: '/root',
-      }),
-    })
-
-    expect(
-      compiler.build([
-        'sm:flex',
-        'md:flex',
-        'portrait:flex',
-        'min-sm:flex',
-        'min-md:flex',
-        'min-portrait:flex',
-        // Ensure other core variants appear at the end
-        'print:items-end',
-      ]),
+      ),
     ).toMatchInlineSnapshot(`
-      ":root {
-        --breakpoint-md: 48rem;
-      }
-      .min-sm\\:flex {
-        @media (width >= 40rem) {
+      "
+      @media (min-width: 40rem) {
+        .min-sm\\:flex, .sm\\:flex {
           display: flex;
         }
       }
-      .sm\\:flex {
-        @media (width >= 40rem) {
+
+      @media (min-width: 48rem) {
+        .md\\:flex, .min-md\\:flex {
           display: flex;
         }
       }
-      .md\\:flex {
-        @media (width >= 48rem) {
+
+      @media screen and (orientation: portrait) {
+        .portrait\\:flex {
           display: flex;
         }
       }
-      .min-md\\:flex {
-        @media (width >= 48rem) {
-          display: flex;
-        }
-      }
-      .portrait\\:flex {
-        @media screen and (orientation: portrait) {
-          display: flex;
-        }
-      }
-      .print\\:items-end {
-        @media print {
+
+      @media print {
+        .print\\:items-end {
           align-items: flex-end;
         }
       }
@@ -623,41 +632,38 @@ describe('complex screen configs', () => {
 })
 
 test('JS config `screens` can overwrite default CSS `--breakpoint-*`', async () => {
-  let input = css`
-    @theme default {
-      --breakpoint-sm: 40rem;
-      --breakpoint-md: 48rem;
-      --breakpoint-lg: 64rem;
-      --breakpoint-xl: 80rem;
-      --breakpoint-2xl: 96rem;
-    }
-    @config "./config.js";
-    @tailwind utilities;
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: {
-        theme: {
-          screens: {
-            mini: '40rem',
-            midi: '48rem',
-            maxi: '64rem',
-          },
-        },
-      },
-      base: '/root',
-    }),
-  })
-
   // Note: The `sm`, `md`, and other variants are still there because they are
   // created before the compat layer can intercept. We do not remove them
   // currently.
   expect(
-    compiler.build(['min-sm:flex', 'min-md:flex', 'min-lg:flex', 'min-xl:flex', 'min-2xl:flex']),
-  ).toMatchInlineSnapshot(`
-    ":root {
-    }
-    "
-  `)
+    await run(
+      ['min-sm:flex', 'min-md:flex', 'min-lg:flex', 'min-xl:flex', 'min-2xl:flex'],
+      css`
+        @theme default {
+          --breakpoint-sm: 40rem;
+          --breakpoint-md: 48rem;
+          --breakpoint-lg: 64rem;
+          --breakpoint-xl: 80rem;
+          --breakpoint-2xl: 96rem;
+        }
+        @config "./config.js";
+        @tailwind utilities;
+      `,
+      {
+        loadModule: async () => ({
+          module: {
+            theme: {
+              screens: {
+                mini: '40rem',
+                midi: '48rem',
+                maxi: '64rem',
+              },
+            },
+          },
+          base: '/root',
+          path: '',
+        }),
+      },
+    ),
+  ).toEqual('')
 })
diff --git a/packages/tailwindcss/src/compat/selector-parser.test.ts b/packages/tailwindcss/src/compat/selector-parser.test.ts
deleted file mode 100644
index 1c0b808b0..000000000
--- a/packages/tailwindcss/src/compat/selector-parser.test.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { parse, toCss, walk } from './selector-parser'
-
-describe('parse', () => {
-  it('should parse a simple selector', () => {
-    expect(parse('.foo')).toEqual([{ kind: 'selector', value: '.foo' }])
-  })
-
-  it('should parse a compound selector', () => {
-    expect(parse('.foo.bar:hover#id')).toEqual([
-      { kind: 'selector', value: '.foo' },
-      { kind: 'selector', value: '.bar' },
-      { kind: 'selector', value: ':hover' },
-      { kind: 'selector', value: '#id' },
-    ])
-  })
-
-  it('should parse a selector list', () => {
-    expect(parse('.foo,.bar')).toEqual([
-      { kind: 'selector', value: '.foo' },
-      { kind: 'separator', value: ',' },
-      { kind: 'selector', value: '.bar' },
-    ])
-  })
-
-  it('should combine everything within attribute selectors', () => {
-    expect(parse('.foo[bar="baz"]')).toEqual([
-      { kind: 'selector', value: '.foo' },
-      { kind: 'selector', value: '[bar="baz"]' },
-    ])
-  })
-
-  it('should parse functions', () => {
-    expect(parse('.foo:hover:not(.bar:focus)')).toEqual([
-      { kind: 'selector', value: '.foo' },
-      { kind: 'selector', value: ':hover' },
-      {
-        kind: 'function',
-        nodes: [
-          {
-            kind: 'selector',
-            value: '.bar',
-          },
-          {
-            kind: 'selector',
-            value: ':focus',
-          },
-        ],
-        value: ':not',
-      },
-    ])
-  })
-
-  it('should handle next-children combinator', () => {
-    expect(parse('.foo + p')).toEqual([
-      { kind: 'selector', value: '.foo' },
-      { kind: 'combinator', value: ' + ' },
-      { kind: 'selector', value: 'p' },
-    ])
-  })
-
-  it('should handle escaped characters', () => {
-    expect(parse('foo\\.bar')).toEqual([{ kind: 'selector', value: 'foo\\.bar' }])
-  })
-
-  it('parses :nth-child()', () => {
-    expect(parse(':nth-child(n+1)')).toEqual([
-      {
-        kind: 'function',
-        value: ':nth-child',
-        nodes: [
-          {
-            kind: 'value',
-            value: 'n+1',
-          },
-        ],
-      },
-    ])
-  })
-})
-
-describe('toCss', () => {
-  it('should print a simple selector', () => {
-    expect(toCss(parse('.foo'))).toBe('.foo')
-  })
-
-  it('should print a compound selector', () => {
-    expect(toCss(parse('.foo.bar:hover#id'))).toBe('.foo.bar:hover#id')
-  })
-
-  it('should print a selector list', () => {
-    expect(toCss(parse('.foo,.bar'))).toBe('.foo,.bar')
-  })
-
-  it('should print an attribute selectors', () => {
-    expect(toCss(parse('.foo[bar="baz"]'))).toBe('.foo[bar="baz"]')
-  })
-
-  it('should print a function', () => {
-    expect(toCss(parse('.foo:hover:not(.bar:focus)'))).toBe('.foo:hover:not(.bar:focus)')
-  })
-
-  it('should print escaped characters', () => {
-    expect(toCss(parse('foo\\.bar'))).toBe('foo\\.bar')
-  })
-
-  it('should print :nth-child()', () => {
-    expect(toCss(parse(':nth-child(n+1)'))).toBe(':nth-child(n+1)')
-  })
-})
-
-describe('walk', () => {
-  it('can be used to replace a function call', () => {
-    const ast = parse('.foo:hover:not(.bar:focus)')
-    walk(ast, (node, { replaceWith }) => {
-      if (node.kind === 'function' && node.value === ':not') {
-        replaceWith({ kind: 'selector', value: '.inverted-bar' })
-      }
-    })
-    expect(toCss(ast)).toBe('.foo:hover.inverted-bar')
-  })
-})
diff --git a/packages/tailwindcss/src/compat/selector-parser.ts b/packages/tailwindcss/src/compat/selector-parser.ts
deleted file mode 100644
index 7dc0b82f8..000000000
--- a/packages/tailwindcss/src/compat/selector-parser.ts
+++ /dev/null
@@ -1,436 +0,0 @@
-export type SelectorCombinatorNode = {
-  kind: 'combinator'
-  value: string
-}
-
-export type SelectorFunctionNode = {
-  kind: 'function'
-  value: string
-  nodes: SelectorAstNode[]
-}
-
-export type SelectorNode = {
-  kind: 'selector'
-  value: string
-}
-
-export type SelectorValueNode = {
-  kind: 'value'
-  value: string
-}
-
-export type SelectorSeparatorNode = {
-  kind: 'separator'
-  value: string
-}
-
-export type SelectorAstNode =
-  | SelectorCombinatorNode
-  | SelectorFunctionNode
-  | SelectorNode
-  | SelectorSeparatorNode
-  | SelectorValueNode
-type SelectorParentNode = SelectorFunctionNode | null
-
-function combinator(value: string): SelectorCombinatorNode {
-  return {
-    kind: 'combinator',
-    value,
-  }
-}
-
-function fun(value: string, nodes: SelectorAstNode[]): SelectorFunctionNode {
-  return {
-    kind: 'function',
-    value: value,
-    nodes,
-  }
-}
-
-function selector(value: string): SelectorNode {
-  return {
-    kind: 'selector',
-    value,
-  }
-}
-
-function separator(value: string): SelectorSeparatorNode {
-  return {
-    kind: 'separator',
-    value,
-  }
-}
-
-function value(value: string): SelectorValueNode {
-  return {
-    kind: 'value',
-    value,
-  }
-}
-
-export const enum SelectorWalkAction {
-  /** Continue walking, which is the default */
-  Continue,
-
-  /** Skip visiting the children of this node */
-  Skip,
-
-  /** Stop the walk entirely */
-  Stop,
-}
-
-export function walk(
-  ast: SelectorAstNode[],
-  visit: (
-    node: SelectorAstNode,
-    utils: {
-      parent: SelectorParentNode
-      replaceWith(newNode: SelectorAstNode | SelectorAstNode[]): void
-    },
-  ) => void | SelectorWalkAction,
-  parent: SelectorParentNode = null,
-) {
-  for (let i = 0; i < ast.length; i++) {
-    let node = ast[i]
-    let status =
-      visit(node, {
-        parent,
-        replaceWith(newNode) {
-          ast.splice(i, 1, ...(Array.isArray(newNode) ? newNode : [newNode]))
-          // We want to visit the newly replaced node(s), which start at the
-          // current index (i). By decrementing the index here, the next loop
-          // will process this position (containing the replaced node) again.
-          i--
-        },
-      }) ?? SelectorWalkAction.Continue
-
-    // Stop the walk entirely
-    if (status === SelectorWalkAction.Stop) return SelectorWalkAction.Stop
-
-    // Skip visiting the children of this node
-    if (status === SelectorWalkAction.Skip) continue
-
-    if (node.kind === 'function') {
-      if (walk(node.nodes, visit, node) === SelectorWalkAction.Stop) {
-        return SelectorWalkAction.Stop
-      }
-    }
-  }
-}
-
-export function toCss(ast: SelectorAstNode[]) {
-  let css = ''
-  for (const node of ast) {
-    switch (node.kind) {
-      case 'combinator':
-      case 'selector':
-      case 'separator':
-      case 'value': {
-        css += node.value
-        break
-      }
-      case 'function': {
-        css += node.value + '(' + toCss(node.nodes) + ')'
-      }
-    }
-  }
-  return css
-}
-
-const BACKSLASH = 0x5c
-const CLOSE_BRACKET = 0x5d
-const CLOSE_PAREN = 0x29
-const COLON = 0x3a
-const COMMA = 0x2c
-const DOUBLE_QUOTE = 0x22
-const FULL_STOP = 0x2e
-const GREATER_THAN = 0x3e
-const NEWLINE = 0x0a
-const NUMBER_SIGN = 0x23
-const OPEN_BRACKET = 0x5b
-const OPEN_PAREN = 0x28
-const PLUS = 0x2b
-const SINGLE_QUOTE = 0x27
-const SPACE = 0x20
-const TAB = 0x09
-const TILDE = 0x7e
-
-export function parse(input: string) {
-  input = input.replaceAll('\r\n', '\n')
-
-  let ast: SelectorAstNode[] = []
-
-  let stack: (SelectorFunctionNode | null)[] = []
-
-  let parent = null as SelectorFunctionNode | null
-
-  let buffer = ''
-
-  let peekChar
-
-  for (let i = 0; i < input.length; i++) {
-    let currentChar = input.charCodeAt(i)
-
-    switch (currentChar) {
-      // E.g.:
-      //
-      // ```css
-      // .foo .bar
-      //     ^
-      //
-      // .foo > .bar
-      //     ^^^
-      // ```
-      case COMMA:
-      case GREATER_THAN:
-      case NEWLINE:
-      case SPACE:
-      case PLUS:
-      case TAB:
-      case TILDE: {
-        // 1. Handle everything before the combinator as a selector
-        if (buffer.length > 0) {
-          let node = selector(buffer)
-          if (parent) {
-            parent.nodes.push(node)
-          } else {
-            ast.push(node)
-          }
-          buffer = ''
-        }
-
-        // 2. Look ahead and find the end of the combinator
-        let start = i
-        let end = i + 1
-        for (; end < input.length; end++) {
-          peekChar = input.charCodeAt(end)
-          if (
-            peekChar !== COMMA &&
-            peekChar !== GREATER_THAN &&
-            peekChar !== NEWLINE &&
-            peekChar !== SPACE &&
-            peekChar !== PLUS &&
-            peekChar !== TAB &&
-            peekChar !== TILDE
-          ) {
-            break
-          }
-        }
-        i = end - 1
-
-        let contents = input.slice(start, end)
-        let node = contents.trim() === ',' ? separator(contents) : combinator(contents)
-        if (parent) {
-          parent.nodes.push(node)
-        } else {
-          ast.push(node)
-        }
-
-        break
-      }
-
-      // Start of a function call.
-      //
-      // E.g.:
-      //
-      // ```css
-      // .foo:not(.bar)
-      //         ^
-      // ```
-      case OPEN_PAREN: {
-        let node = fun(buffer, [])
-        buffer = ''
-
-        // If the function is not one of the following, we combine all it's
-        // contents into a single value node
-        if (
-          node.value !== ':not' &&
-          node.value !== ':where' &&
-          node.value !== ':has' &&
-          node.value !== ':is'
-        ) {
-          // Find the end of the function call
-          let start = i + 1
-          let nesting = 0
-
-          // Find the closing bracket.
-          for (let j = i + 1; j < input.length; j++) {
-            peekChar = input.charCodeAt(j)
-            if (peekChar === OPEN_PAREN) {
-              nesting++
-              continue
-            }
-            if (peekChar === CLOSE_PAREN) {
-              if (nesting === 0) {
-                i = j
-                break
-              }
-              nesting--
-            }
-          }
-          let end = i
-
-          node.nodes.push(value(input.slice(start, end)))
-          buffer = ''
-          i = end
-
-          ast.push(node)
-
-          break
-        }
-
-        if (parent) {
-          parent.nodes.push(node)
-        } else {
-          ast.push(node)
-        }
-        stack.push(node)
-        parent = node
-
-        break
-      }
-
-      // End of a function call.
-      //
-      // E.g.:
-      //
-      // ```css
-      // foo(bar, baz)
-      //             ^
-      // ```
-      case CLOSE_PAREN: {
-        let tail = stack.pop()
-
-        // Handle everything before the closing paren a selector
-        if (buffer.length > 0) {
-          let node = selector(buffer)
-          tail!.nodes.push(node)
-          buffer = ''
-        }
-
-        if (stack.length > 0) {
-          parent = stack[stack.length - 1]
-        } else {
-          parent = null
-        }
-
-        break
-      }
-
-      // Split compound selectors.
-      //
-      // E.g.:
-      //
-      // ```css
-      // .foo.bar
-      //     ^
-      // ```
-      case FULL_STOP:
-      case COLON:
-      case NUMBER_SIGN: {
-        // Handle everything before the combinator as a selector and
-        // start a new selector
-        if (buffer.length > 0) {
-          let node = selector(buffer)
-          if (parent) {
-            parent.nodes.push(node)
-          } else {
-            ast.push(node)
-          }
-        }
-        buffer = String.fromCharCode(currentChar)
-        break
-      }
-
-      // Start of an attribute selector.
-      case OPEN_BRACKET: {
-        // Handle everything before the combinator as a selector
-        if (buffer.length > 0) {
-          let node = selector(buffer)
-          if (parent) {
-            parent.nodes.push(node)
-          } else {
-            ast.push(node)
-          }
-        }
-        buffer = ''
-
-        let start = i
-        let nesting = 0
-
-        // Find the closing bracket.
-        for (let j = i + 1; j < input.length; j++) {
-          peekChar = input.charCodeAt(j)
-          if (peekChar === OPEN_BRACKET) {
-            nesting++
-            continue
-          }
-          if (peekChar === CLOSE_BRACKET) {
-            if (nesting === 0) {
-              i = j
-              break
-            }
-            nesting--
-          }
-        }
-
-        // Adjust `buffer` to include the string.
-        buffer += input.slice(start, i + 1)
-        break
-      }
-
-      // Start of a string.
-      case SINGLE_QUOTE:
-      case DOUBLE_QUOTE: {
-        let start = i
-
-        // We need to ensure that the closing quote is the same as the opening
-        // quote.
-        //
-        // E.g.:
-        //
-        // ```css
-        // "This is a string with a 'quote' in it"
-        //                          ^     ^         -> These are not the end of the string.
-        // ```
-        for (let j = i + 1; j < input.length; j++) {
-          peekChar = input.charCodeAt(j)
-          // Current character is a `\` therefore the next character is escaped.
-          if (peekChar === BACKSLASH) {
-            j += 1
-          }
-
-          // End of the string.
-          else if (peekChar === currentChar) {
-            i = j
-            break
-          }
-        }
-
-        // Adjust `buffer` to include the string.
-        buffer += input.slice(start, i + 1)
-        break
-      }
-
-      // Escaped characters.
-      case BACKSLASH: {
-        let nextChar = input.charCodeAt(i + 1)
-        buffer += String.fromCharCode(currentChar) + String.fromCharCode(nextChar)
-        i += 1
-        break
-      }
-
-      // Everything else will be collected in the buffer
-      default: {
-        buffer += String.fromCharCode(currentChar)
-      }
-    }
-  }
-
-  // Collect the remainder as a word
-  if (buffer.length > 0) {
-    ast.push(selector(buffer))
-  }
-
-  return ast
-}
diff --git a/packages/tailwindcss/src/compile.ts b/packages/tailwindcss/src/compile.ts
index 81419ce77..46f562918 100644
--- a/packages/tailwindcss/src/compile.ts
+++ b/packages/tailwindcss/src/compile.ts
@@ -1,30 +1,24 @@
-import {
-  atRule,
-  decl,
-  rule,
-  walk,
-  WalkAction,
-  type AstNode,
-  type Rule,
-  type StyleRule,
-} from './ast'
+import { atRule, context, decl, rule, type AstNode, type Rule, type StyleRule } from './ast'
 import { type Candidate, type Variant } from './candidate'
-import { substituteFunctions } from './css-functions'
-import { type DesignSystem } from './design-system'
+import { CompileAstFlags, type DesignSystem } from './design-system'
 import GLOBAL_PROPERTY_ORDER from './property-order'
 import { asColor, type Utility } from './utilities'
 import { compare } from './utils/compare'
 import { escape } from './utils/escape'
 import type { Variants } from './variants'
+import { walk, WalkAction } from './walk'
 
 export function compileCandidates(
   rawCandidates: Iterable<string>,
   designSystem: DesignSystem,
-  { onInvalidCandidate }: { onInvalidCandidate?: (candidate: string) => void } = {},
+  {
+    onInvalidCandidate,
+    respectImportant,
+  }: { onInvalidCandidate?: (candidate: string) => void; respectImportant?: boolean } = {},
 ) {
   let nodeSorting = new Map<
     AstNode,
-    { properties: number[]; variants: bigint; candidate: string }
+    { properties: { order: number[]; count: number }; variants: bigint; candidate: string }
   >()
   let astNodes: AstNode[] = []
   let matches = new Map<string, Candidate[]>()
@@ -45,6 +39,12 @@ export function compileCandidates(
     matches.set(rawCandidate, candidates)
   }
 
+  let flags = CompileAstFlags.None
+
+  if (respectImportant ?? true) {
+    flags |= CompileAstFlags.RespectImportant
+  }
+
   let variantOrderMap = designSystem.getVariantOrder()
 
   // Create the AST
@@ -52,25 +52,9 @@ export function compileCandidates(
     let found = false
 
     for (let candidate of candidates) {
-      let rules = designSystem.compileAstNodes(candidate)
+      let rules = designSystem.compileAstNodes(candidate, flags)
       if (rules.length === 0) continue
 
-      // Arbitrary values (`text-[theme(--color-red-500)]`) and arbitrary
-      // properties (`[--my-var:theme(--color-red-500)]`) can contain function
-      // calls so we need evaluate any functions we find there that weren't in
-      // the source CSS.
-      try {
-        substituteFunctions(
-          rules.map(({ node }) => node),
-          designSystem.resolveThemeValue,
-        )
-      } catch (err) {
-        // If substitution fails then the candidate likely contains a call to
-        // `theme()` that is invalid which may be because of incorrect usage,
-        // invalid arguments, or a theme key that does not exist.
-        continue
-      }
-
       found = true
 
       for (let { node, propertySort } of rules) {
@@ -112,18 +96,19 @@ export function compileCandidates(
     // Find the first property that is different between the two rules
     let offset = 0
     while (
-      aSorting.properties.length < offset &&
-      zSorting.properties.length < offset &&
-      aSorting.properties[offset] === zSorting.properties[offset]
+      offset < aSorting.properties.order.length &&
+      offset < zSorting.properties.order.length &&
+      aSorting.properties.order[offset] === zSorting.properties.order[offset]
     ) {
       offset += 1
     }
 
     return (
       // Sort by lowest property index first
-      (aSorting.properties[offset] ?? Infinity) - (zSorting.properties[offset] ?? Infinity) ||
+      (aSorting.properties.order[offset] ?? Infinity) -
+        (zSorting.properties.order[offset] ?? Infinity) ||
       // Sort by most properties first, then by least properties
-      zSorting.properties.length - aSorting.properties.length ||
+      zSorting.properties.count - aSorting.properties.count ||
       // Sort alphabetically
       compare(aSorting.candidate, zSorting.candidate)
     )
@@ -135,13 +120,22 @@ export function compileCandidates(
   }
 }
 
-export function compileAstNodes(candidate: Candidate, designSystem: DesignSystem) {
+export function compileAstNodes(
+  candidate: Candidate,
+  designSystem: DesignSystem,
+  flags: CompileAstFlags,
+) {
   let asts = compileBaseUtility(candidate, designSystem)
   if (asts.length === 0) return []
 
+  let respectImportant = designSystem.important && Boolean(flags & CompileAstFlags.RespectImportant)
+
   let rules: {
     node: AstNode
-    propertySort: number[]
+    propertySort: {
+      order: number[]
+      count: number
+    }
   }[] = []
 
   let selector = `.${escape(candidate.raw)}`
@@ -149,7 +143,10 @@ export function compileAstNodes(candidate: Candidate, designSystem: DesignSystem
   for (let nodes of asts) {
     let propertySort = getPropertySort(nodes)
 
-    if (candidate.important || designSystem.important) {
+    // If the candidate itself is important then we want to always mark
+    // the utility as important. However, at a design system level we want
+    // to be able to opt-out when using things like `@apply`
+    if (candidate.important || respectImportant) {
       applyImportant(nodes)
     }
 
@@ -190,7 +187,18 @@ export function applyVariant(
     // E.g. `[>img]:flex` is not valid, but `has-[>img]:flex` is
     if (variant.relative && depth === 0) return null
 
-    node.nodes = [rule(variant.selector, node.nodes)]
+    let child: AstNode = rule(variant.selector, node.nodes)
+
+    // Wrap variant-generated `@scope` rules in a `context` marker, so they are
+    // hoisted with the variant semantics instead of their native CSS nesting
+    // semantics. The slotted content is marked as `user` content, so `@scope`
+    // rules defined there keep their native CSS nesting semantics.
+    if (child.kind === 'at-rule' && child.name === '@scope') {
+      child.nodes = [context({ source: 'user' }, node.nodes)]
+      child = context({ source: 'variant' }, [child])
+    }
+
+    node.nodes = [child]
     return
   }
 
@@ -219,6 +227,15 @@ export function applyVariant(
     let result = applyVariant(isolatedNode, variant.variant, variants, depth + 1)
     if (result === null) return null
 
+    if (variant.root === 'not' && isolatedNode.nodes.length > 1) {
+      // The `not` variant cannot negate sibling rules / at-rules because these
+      // are an OR relationship. Doing so would require transforming sibling
+      // nodes into nesting while negating them. This isn't possible with the
+      // current implementation of the `not` variant or with how variants are
+      // applied in general (on a per-node basis).
+      return null
+    }
+
     for (let child of isolatedNode.nodes) {
       // Only some variants wrap children in rules. For example, the `force`
       // variant is a noop on the AST. And the `has` variant modifies the
@@ -281,7 +298,19 @@ function compileBaseUtility(candidate: Candidate, designSystem: DesignSystem) {
 
     let compiledNodes = utility.compileFn(candidate)
     if (compiledNodes === undefined) continue
-    if (compiledNodes === null) return asts
+    if (compiledNodes === null) {
+      // `null` means that the result is invalid and that this plugin should not
+      // result in any CSS, but that doesn't mean that subsequent plugins are
+      // invalid as well.
+      //
+      // However, for backwards compatibility with `matchUtilities` this means
+      // that we do need to bail entirely: plugins that handle a specific
+      // arbitrary value type prevent falling through to other plugins if the
+      // result is invalid for that plugin
+      if (utility.options?.types?.length) return asts
+
+      continue
+    }
     asts.push(compiledNodes)
   }
 
@@ -293,7 +322,19 @@ function compileBaseUtility(candidate: Candidate, designSystem: DesignSystem) {
 
     let compiledNodes = utility.compileFn(candidate)
     if (compiledNodes === undefined) continue
-    if (compiledNodes === null) return asts
+    if (compiledNodes === null) {
+      // `null` means that the result is invalid and that this plugin should not
+      // result in any CSS, but that doesn't mean that subsequent plugins are
+      // invalid as well.
+      //
+      // However, for backwards compatibility with `matchUtilities` this means
+      // that we do need to bail entirely: plugins that handle a specific
+      // arbitrary value type prevent falling through to other plugins if the
+      // result is invalid for that plugin
+      if (utility.options?.types?.length) return asts
+
+      continue
+    }
     asts.push(compiledNodes)
   }
 
@@ -318,24 +359,35 @@ function applyImportant(ast: AstNode[]): void {
 
 function getPropertySort(nodes: AstNode[]) {
   // Determine sort order based on properties used
-  let propertySort = new Set<number>()
+  let order = new Set<number>()
+  let count = 0
   let q: AstNode[] = nodes.slice()
 
+  let seenTwSort = false
+
   while (q.length > 0) {
     // SAFETY: At this point it is safe to use TypeScript's non-null assertion
     // operator because we guarded against `q.length > 0` above.
     let node = q.shift()!
     if (node.kind === 'declaration') {
+      // Empty strings should still be counted, e.g.: `--tw-foo:;` is valid
+      if (node.value === undefined) continue
+
+      count++
+
+      if (seenTwSort) continue
+
       if (node.property === '--tw-sort') {
         let idx = GLOBAL_PROPERTY_ORDER.indexOf(node.value ?? '')
         if (idx !== -1) {
-          propertySort.add(idx)
-          break
+          order.add(idx)
+          seenTwSort = true
+          continue
         }
       }
 
       let idx = GLOBAL_PROPERTY_ORDER.indexOf(node.property)
-      if (idx !== -1) propertySort.add(idx)
+      if (idx !== -1) order.add(idx)
     } else if (node.kind === 'rule' || node.kind === 'at-rule') {
       for (let child of node.nodes) {
         q.push(child)
@@ -343,5 +395,8 @@ function getPropertySort(nodes: AstNode[]) {
     }
   }
 
-  return Array.from(propertySort).sort((a, z) => a - z)
+  return {
+    order: Array.from(order).sort((a, z) => a - z),
+    count,
+  }
 }
diff --git a/packages/tailwindcss/src/constant-fold-declaration.test.ts b/packages/tailwindcss/src/constant-fold-declaration.test.ts
new file mode 100644
index 000000000..5a0c867b6
--- /dev/null
+++ b/packages/tailwindcss/src/constant-fold-declaration.test.ts
@@ -0,0 +1,137 @@
+import { expect, it } from 'vitest'
+import { constantFoldDeclaration } from './constant-fold-declaration'
+
+it.each([
+  // Simple expression
+  ['calc(1 + 1)', '2'],
+  ['calc(3 - 2)', '1'],
+  ['calc(2 * 3)', '6'],
+  ['calc(8 / 2)', '4'],
+
+  // Nested
+  ['calc(1 + calc(1 + 1))', '3'],
+  ['calc(3 - calc(1 + 2))', '0'],
+  ['calc(2 * calc(1 + 3))', '8'],
+  ['calc(8 / calc(2 + 2))', '2'],
+  ['calc(1 + (1 + 1))', '3'],
+  ['calc(3 - (1 + 2))', '0'],
+  ['calc(2 * (1 + 3))', '8'],
+  ['calc(8 / (2 + 2))', '2'],
+
+  // With units
+  ['calc(1rem * 2)', '2rem'],
+  ['calc(2rem - 0.5rem)', '1.5rem'],
+  ['calc(3rem * 6)', '18rem'],
+  ['calc(5rem / 2)', '2.5rem'],
+
+  // Negating with units
+  ['calc(2rem * -1)', '-2rem'],
+  ['calc(-1 * 2rem)', '-2rem'],
+
+  // Nested partial evaluation
+  ['calc(calc(1 + 2) + 2rem)', 'calc(3 + 2rem)'],
+
+  // Nested multiplication with unknown values
+  ['calc(2 * calc(3 * var(--foo)))', 'calc(6 * var(--foo))'],
+  ['calc(calc(3 * var(--foo)) * 2)', 'calc(6 * var(--foo))'],
+  ['calc(2rem * calc(3 * var(--foo)))', 'calc(6rem * var(--foo))'],
+
+  // Nested addition with unknown values
+  ['calc(1rem + calc(2rem + var(--foo)))', 'calc(3rem + var(--foo))'],
+  ['calc(calc(2rem + var(--foo)) + 1rem)', 'calc(3rem + var(--foo))'],
+
+  // Nested multiplication can collapse away entirely
+  ['calc(-1 * calc(-1 * var(--foo)))', 'var(--foo)'],
+  ['calc(calc(-1 * var(--foo)) * -1)', 'var(--foo)'],
+  ['calc(-1 * calc(var(--foo) * -1))', 'var(--foo)'],
+  ['calc(-1 * (-1 * var(--foo)))', 'var(--foo)'],
+  ['calc(1 * var(--foo))', 'var(--foo)'],
+  ['calc(var(--foo) * 1)', 'var(--foo)'],
+
+  // Evaluation only handles two operands right now, this can change in the future
+  ['calc(1 + 2 + 3)', 'calc(1 + 2 + 3)'],
+])('should constant fold `%s` into `%s`', (input, expected) => {
+  expect(constantFoldDeclaration(input)).toBe(expected)
+})
+
+it.each([
+  ['calc(1rem * 2%)'],
+  ['calc(1rem * 2px)'],
+  ['calc(2rem - 6)'],
+  ['calc(3rem * 3dvw)'],
+  ['calc(3rem * 2dvh)'],
+  ['calc(5rem / 17px)'],
+  ['calc(2rem * calc(3px * var(--foo)))'],
+  ['calc(1rem + 0px + var(--foo))'],
+])('should not constant fold different units `%s`', (input) => {
+  expect(constantFoldDeclaration(input)).toBe(input)
+})
+
+it.each([
+  ['calc(0 * 100vw)'],
+  ['calc(0 * calc(1 * 2))'],
+  ['calc(0 * var(--foo))'],
+  ['calc(0 * calc(var(--spacing) * 32))'],
+
+  ['calc(100vw * 0)'],
+  ['calc(calc(1 * 2) * 0)'],
+  ['calc(var(--foo) * 0)'],
+  ['calc(calc(var(--spacing, 0.25rem) * 32) * 0)'],
+  ['calc(var(--spacing, 0.25rem) * -0)'],
+
+  // Zeroes
+  ['0px'],
+  ['0rem'],
+  ['0em'],
+  ['0dvh'],
+  ['-0'],
+  ['+0'],
+  ['-0.0rem'],
+  ['+0.00rem'],
+
+  // Expressions
+  ['calc(-0px * -1)'],
+  ['calc(-1 * -0px)'],
+])('should constant fold `%s` to `0` (%#)', (input) => {
+  expect(constantFoldDeclaration(input)).toBe('0')
+})
+
+it.each([
+  // Expressions, keep unit when they are nested
+  //
+  // TODO: We might be able to fold this further to just `1rem`, but we can't do
+  // that for any `0<unit>`. E.g.: `calc(0s + 1rem)` which is invalid, would
+  // become valid if we just use `1rem`.
+  ['calc(calc(0px * -1) + 1rem)', 'calc(0px + 1rem)'],
+  ['calc(calc(-1 * 0px) + 1rem)', 'calc(0px + 1rem)'],
+
+  // Non-foldable units
+  ['0deg', '0deg'],
+  ['0rad', '0deg'],
+  ['0%', '0%'],
+  ['0turn', '0deg'],
+  ['0fr', '0fr'],
+  ['0ms', '0s'],
+  ['0s', '0s'],
+  ['-0.0deg', '0deg'],
+  ['-0.0rad', '0deg'],
+  ['-0.0%', '0%'],
+  ['-0.0turn', '0deg'],
+  ['-0.0fr', '0fr'],
+  ['-0.0ms', '0s'],
+  ['-0.0s', '0s'],
+])('should not fold non-foldable units to `0`. Constant fold `%s` into `%s`', (input, expected) => {
+  expect(constantFoldDeclaration(input)).toBe(expected)
+})
+
+it('should not constant fold when dividing by `0`', () => {
+  expect(constantFoldDeclaration('calc(123rem / 0)')).toBe('calc(123rem / 0)')
+})
+
+it('should not constant fold when a computation has a high-precision result', () => {
+  expect(constantFoldDeclaration('calc(100% / 3.5)')).toBe('calc(100% / 3.5)')
+})
+
+it('should constant fold division results with floating-point error after scaling', () => {
+  expect(constantFoldDeclaration('calc(29% / 100)')).toBe('0.29%')
+})
diff --git a/packages/tailwindcss/src/constant-fold-declaration.ts b/packages/tailwindcss/src/constant-fold-declaration.ts
new file mode 100644
index 000000000..c15420150
--- /dev/null
+++ b/packages/tailwindcss/src/constant-fold-declaration.ts
@@ -0,0 +1,357 @@
+import { dimensions } from './utils/dimensions'
+import { isLength } from './utils/infer-data-type'
+import * as ValueParser from './value-parser'
+import { walk, WalkAction } from './walk'
+
+// Assumption: We already assume that we receive somewhat valid `calc()`
+// expressions. So we will see `calc(1 + 1)` and not `calc(1+1)`
+export function constantFoldDeclaration(
+  input: string,
+  rem: number | null = null,
+  normalizeUnit = true,
+): string {
+  let [folded, valueAst] = constantFoldDeclarationAst(ValueParser.parse(input), rem, normalizeUnit)
+
+  return folded ? ValueParser.toCss(valueAst) : input
+}
+
+export function constantFoldDeclarationAst(
+  ast: ValueParser.ValueAstNode[],
+  rem: number | null = null,
+  normalizeUnit = true,
+): [folded: boolean, ast: ValueParser.ValueAstNode[]] {
+  let folded = false
+
+  walk(ast, {
+    exit(valueNode, ctx) {
+      // Canonicalize dimensions to their simplest form. This includes:
+      // - Convert `-0`, `+0`, `0.0`, … to `0`
+      // - Convert `-0px`, `+0em`, `0.0rem`, … to `0<unit>`
+      // - Convert units to an equivalent unit
+      if (
+        valueNode.kind === 'word' &&
+        valueNode.value !== '0' // Already `0`, nothing to do
+      ) {
+        let canonical = canonicalizeDimension(valueNode.value, rem, normalizeUnit)
+        if (canonical === null) return // Couldn't be canonicalized, nothing to do
+        if (canonical === valueNode.value) return // Already in canonical form, nothing to do
+
+        // We need to be careful with `0` because `0<unit>` can only be
+        // converted to `0` if we're dealing with a `<length>` type.
+        if (canonical === '0') {
+          // When used inside of a function such as `calc(…)`, then this isn't
+          // always safe to convert to `0`.
+          //
+          // E.g.:
+          // - `calc(0px + 1rem)` → `calc(0 + 1rem)` this goes from valid to invalid
+          // - `calc(0px * 1rem)` → `calc(0 * 1rem)` this goes from invalid to valid
+          if (ctx.parent?.kind === 'function') {
+            let withUnit = canonicalizeDimension(valueNode.value, rem, false)
+            if (withUnit === null) return
+
+            folded = true
+            return WalkAction.ReplaceSkip(ValueParser.word(withUnit))
+          }
+        }
+
+        folded = true
+        return WalkAction.ReplaceSkip(ValueParser.word(canonical))
+      }
+
+      // Constant fold `calc()` expressions with two operands and one operator
+      else if (
+        valueNode.kind === 'function' &&
+        (valueNode.value === 'calc' || valueNode.value === '')
+      ) {
+        // [
+        //   { kind: 'word', value: '0.25rem' },            0
+        //   { kind: 'separator', value: ' ' },             1
+        //   { kind: 'word', value: '*' },                  2
+        //   { kind: 'separator', value: ' ' },             3
+        //   { kind: 'word', value: '256' }                 4
+        // ]
+        if (valueNode.nodes.length !== 5) return
+        if (valueNode.nodes[2].kind !== 'word') return
+
+        let lhsNode = valueNode.nodes[0]
+        let operator = valueNode.nodes[2].value
+        let rhsNode = valueNode.nodes[4]
+
+        let lhs = lhsNode.kind === 'word' ? dimensions.get(lhsNode.value) : null
+        let rhs = rhsNode.kind === 'word' ? dimensions.get(rhsNode.value) : null
+
+        // Nullify entire expression when multiplying by `0`, e.g.: `calc(0 * 100vw)` -> `0`
+        //
+        // TODO: Ensure it's safe to do so based on the data types?
+        if (
+          operator === '*' &&
+          ((lhs?.[0] === 0 && lhs?.[1] === null) || // 0 * something
+            (rhs?.[0] === 0 && rhs?.[1] === null)) // something * 0
+        ) {
+          folded = true
+          return WalkAction.ReplaceSkip(ValueParser.word('0'))
+        }
+
+        // Fold `0<unit> * something-without-unit` to just `0<unit>`, inside of a function such as `calc(…)`
+        if (operator === '*' && lhs?.[0] === 0 && lhs?.[1] !== null && rhs?.[1] === null) {
+          folded = true
+          if (ctx.parent?.kind === 'function') {
+            return WalkAction.ReplaceSkip(ValueParser.word(`0${lhs[1]}`))
+          } else {
+            return WalkAction.ReplaceSkip(ValueParser.word('0'))
+          }
+        }
+
+        // Fold `something-without-unit * 0<unit>` to just `0<unit>`, inside of a function such as `calc(…)`
+        if (operator === '*' && rhs?.[0] === 0 && rhs?.[1] !== null && lhs?.[1] === null) {
+          folded = true
+          if (ctx.parent?.kind === 'function') {
+            return WalkAction.ReplaceSkip(ValueParser.word(`0${rhs[1]}`))
+          } else {
+            return WalkAction.ReplaceSkip(ValueParser.word('0'))
+          }
+        }
+
+        if (operator === '*') {
+          // Multiplying by `1` can always unwrap the other side, even when that
+          // side is an expression like `var(--foo)` that we can't fully fold.
+          if (lhs?.[0] === 1 && lhs?.[1] === null) {
+            folded = true
+            return WalkAction.ReplaceSkip(rhsNode)
+          }
+
+          if (rhs?.[0] === 1 && rhs?.[1] === null) {
+            folded = true
+            return WalkAction.ReplaceSkip(lhsNode)
+          }
+        }
+
+        if (operator === '*' || operator === '+') {
+          // If only one side is known, and the unknown side is itself another
+          // binary expression with the same operator, try to combine the two
+          // known parts and keep the unknown part in place.
+          //
+          // E.g.:
+          //
+          // - `calc(2rem * calc(3    * var(--foo)))` → `calc(6rem * var(--foo))`
+          // - `calc(2rem + calc(3rem + var(--foo)))` → `calc(5rem + var(--foo))`
+          //
+          // At this point `lhs` and `rhs` are dimensions ([value, unit] |
+          // null). The `null` one is the unknown node.
+          let constant = lhs ?? rhs
+          let nestedNode = lhs === null ? lhsNode : rhs === null ? rhsNode : null
+
+          if (
+            constant !== null &&
+            nestedNode !== null &&
+            nestedNode.kind === 'function' &&
+            (nestedNode.value === 'calc' || nestedNode.value === '') &&
+            nestedNode.nodes.length === 5 &&
+            nestedNode.nodes[2].kind === 'word' &&
+            nestedNode.nodes[2].value === operator
+          ) {
+            let nestedLhsNode = nestedNode.nodes[0]
+            let nestedRhsNode = nestedNode.nodes[4]
+            let nestedLhs =
+              nestedLhsNode.kind === 'word' ? dimensions.get(nestedLhsNode.value) : null
+            let nestedRhs =
+              nestedRhsNode.kind === 'word' ? dimensions.get(nestedRhsNode.value) : null
+
+            let known = nestedLhs ?? nestedRhs
+            let unknown =
+              nestedLhs === null ? nestedLhsNode : nestedRhs === null ? nestedRhsNode : null
+
+            if (known !== null && unknown !== null) {
+              // `*` requires both values being unitless, or one of them. Both
+              // values having a unit is invalid.
+              //
+              // - `2    * 3`     → valid
+              // - `4rem * 5`     → valid
+              // - `6    * 7rem`  → valid
+              // - `8rem * 9rem`  → invalid
+              if (
+                operator === '*' &&
+                !(
+                  (constant[1] === null && known[1] === null) || // Both can be unitless
+                  (constant[1] === null && known[1] !== null) || // One of them can be unitless, but the other can't
+                  (constant[1] !== null && known[1] === null) // One of them can be unitless, but the other can't
+                )
+              ) {
+                return
+              }
+
+              // `+` requires that both values being unitless, or both values
+              // have a unit. Mixed units are valid, but we won't fold these.
+              //
+              // - `2    + 3`     → valid
+              // - `4rem + 5`     → invalid
+              // - `6    + 7rem`  → invalid
+              // - `8rem + 9rem`  → valid
+              if (
+                operator === '+' &&
+                !(
+                  constant[1] === known[1] // Only same unit is allowed
+                )
+              ) {
+                return
+              }
+
+              // Re-associate nested expressions so we can still fold the known
+              // part of `x op (y op z)` when `z` is unknown.
+              //
+              // Examples:
+              // - `calc(2 * calc(3 * var(--foo)))` -> `calc(6 * var(--foo))`
+              // - `calc(1rem + calc(2rem + var(--foo)))` -> `calc(3rem + var(--foo))`
+              let combined: string
+              switch (operator) {
+                case '*': {
+                  combined = `${constant[0] * known[0]}${constant[1] ?? known[1] ?? ''}`
+                  break
+                }
+                case '+': {
+                  combined = `${constant[0] + known[0]}${constant[1] ?? known[1] ?? ''}`
+                  break
+                }
+
+                default:
+                  return
+              }
+
+              folded = true
+
+              if (operator === '*' && combined === '1') {
+                return WalkAction.ReplaceSkip(unknown)
+              }
+
+              let replacement: ValueParser.ValueFunctionNode = {
+                kind: 'function',
+                value: valueNode.value,
+                nodes: [
+                  ValueParser.word(combined),
+                  valueNode.nodes[1],
+                  valueNode.nodes[2],
+                  valueNode.nodes[3],
+                  unknown,
+                ],
+              }
+
+              return WalkAction.ReplaceSkip(replacement)
+            }
+          }
+        }
+
+        // We're not dealing with dimensions, so we can't fold this
+        if (lhs === null || rhs === null) {
+          return
+        }
+
+        switch (operator) {
+          case '*': {
+            if (
+              lhs[1] === rhs[1] || // Same Units, e.g.: `1rem * 2rem`, `8 * 6`
+              (lhs[1] === null && rhs[1] !== null) || // Unitless * Unit, e.g.: `2 * 1rem`
+              (lhs[1] !== null && rhs[1] === null) // Unit * Unitless, e.g.: `1rem * 2`
+            ) {
+              folded = true
+              return WalkAction.ReplaceSkip(
+                ValueParser.word(`${lhs[0] * rhs[0]}${lhs[1] ?? rhs[1] ?? ''}`),
+              )
+            }
+            break
+          }
+
+          case '+': {
+            if (
+              lhs[1] === rhs[1] // Same unit or unitless, e.g.: `1rem + 2rem`, `8 + 6`
+            ) {
+              folded = true
+              return WalkAction.ReplaceSkip(ValueParser.word(`${lhs[0] + rhs[0]}${lhs[1] ?? ''}`))
+            }
+            break
+          }
+
+          case '-': {
+            if (
+              lhs[1] === rhs[1] // Same unit or unitless, e.g.: `2rem - 1rem`, `8 - 6`
+            ) {
+              folded = true
+              return WalkAction.ReplaceSkip(ValueParser.word(`${lhs[0] - rhs[0]}${lhs[1] ?? ''}`))
+            }
+            break
+          }
+
+          case '/': {
+            if (
+              rhs[0] !== 0 && // Don't divide by zero
+              ((lhs[1] === null && rhs[1] === null) || // Unitless / Unitless, e.g.: `8 / 2`
+                (lhs[1] !== null && rhs[1] === null)) // Unit / Unitless, e.g.: `1rem / 2`
+            ) {
+              let computed = lhs[0] / rhs[0]
+
+              // Only fold with .xx precision, anything beyond that might be a bit too much.
+              //
+              // E.g. 100% / 3.5 = 28.571428571428573%, which is correct but not
+              //      as user friendly. Especially when going from
+              //      `w-[calc(100%/3.5)]` → `w-[28.571428571428573%]`
+              if (Math.round(computed * 100) / 100 !== computed) {
+                break
+              }
+
+              folded = true
+              return WalkAction.ReplaceSkip(ValueParser.word(`${computed}${lhs[1] ?? ''}`))
+            }
+            break
+          }
+        }
+      }
+    },
+  })
+
+  return [folded, ast]
+}
+
+function canonicalizeDimension(
+  input: string,
+  rem: number | null = null,
+  normalizeUnit = true,
+): string | null {
+  let dimension = dimensions.get(input)
+  if (dimension === null) return null // This shouldn't happen
+
+  let [value, unit] = dimension
+  if (unit === null) return `${value}` // Already unitless, nothing to do
+
+  // Replace `0<length>` units with just `0`
+  if (value === 0 && isLength(input)) {
+    if (normalizeUnit) return '0'
+    else return `0${unit}` // Keep unit
+  }
+
+  // Only normalize into base units when necessary
+  if (!normalizeUnit) return `${input}`
+
+  // prettier-ignore
+  switch (unit.toLowerCase()) {
+    // <length> to px, https://developer.mozilla.org/en-US/docs/Learn_web_development/Core/Styling_basics/Values_and_units#lengths
+    case 'in':  return `${value * 96}px`                  // 1in  = 96.000px
+    case 'cm':  return `${value * 96 / 2.54}px`           // 1cm  = 37.795px
+    case 'mm':  return `${value * 96 / 2.54 / 10}px`      // 1mm  =  3.779px
+    case 'q':   return `${value * 96 / 2.54 / 10 / 4}px`  //  1q  =  0.945px
+    case 'pc':  return `${value * 96 / 6}px`              // 1pc  = 16.000px
+    case 'pt':  return `${value * 96 / 72}px`             // 1pt  =  1.333px
+    case 'rem': return rem !== null ? `${value * rem}px` : null    // 1rem = 16.000px (Assuming root font-size is 16px)
+
+    // <angle> to deg, https://developer.mozilla.org/en-US/docs/Web/CSS/angle
+    case 'grad': return `${value * 0.9}deg`               // 1grad =   0.900deg
+    case 'rad':  return `${value * 180 / Math.PI}deg`     //  1rad =  57.296deg
+    case 'turn': return `${value * 360}deg`               // 1turn = 360.000deg
+
+    // <time> to s, https://developer.mozilla.org/en-US/docs/Web/CSS/time
+    case 'ms':   return `${value / 1000}s`                // 1ms = 0.001s
+
+    // <frequency> to hz, https://developer.mozilla.org/en-US/docs/Web/CSS/frequency
+    case 'khz':  return `${value * 1000}hz`               // 1kHz = 1000Hz
+
+    default: return `${value}${unit}` // No canonicalization possible, return as-is
+  }
+}
diff --git a/packages/tailwindcss/src/css-functions.test.ts b/packages/tailwindcss/src/css-functions.test.ts
index f042b40c2..8cab2949f 100644
--- a/packages/tailwindcss/src/css-functions.test.ts
+++ b/packages/tailwindcss/src/css-functions.test.ts
@@ -3,11 +3,568 @@ import path from 'node:path'
 import { describe, expect, test } from 'vitest'
 import { compile } from '.'
 import plugin from './plugin'
-import { compileCss, optimizeCss } from './test-utils/run'
+import { compileCss, pretty, run } from './test-utils/run'
 
 const css = String.raw
 
-describe('theme function', () => {
+describe('--alpha(…)', () => {
+  test('--alpha(…)', async () => {
+    expect(
+      await compileCss(css`
+        .foo {
+          margin: --alpha(red / 50%);
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      .foo {
+        margin: oklab(62.7955% .224 .125 / .5);
+      }
+      "
+    `)
+  })
+
+  test('--alpha(…) errors when no arguments are used', async () => {
+    await expect(() =>
+      compileCss(css`
+        .foo {
+          margin: --alpha();
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: The --alpha(…) function requires a color and an alpha value, e.g.: \`--alpha(var(--my-color) / 50%)\`]`,
+    )
+  })
+
+  test('--alpha(…) errors when alpha value is missing', async () => {
+    await expect(() =>
+      compileCss(css`
+        .foo {
+          margin: --alpha(red);
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: The --alpha(…) function requires a color and an alpha value, e.g.: \`--alpha(red / 50%)\`]`,
+    )
+  })
+
+  test('--alpha(…) errors multiple arguments are used', async () => {
+    await expect(() =>
+      compileCss(css`
+        .foo {
+          margin: --alpha(red / 50%, blue);
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: The --alpha(…) function only accepts one argument, e.g.: \`--alpha(red / 50%)\`]`,
+    )
+  })
+})
+
+describe('--spacing(…)', () => {
+  test('--spacing(…)', async () => {
+    expect(
+      await compileCss(css`
+        @theme {
+          --spacing: 0.25rem;
+        }
+
+        .foo {
+          margin: --spacing(4);
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --spacing: .25rem;
+      }
+
+      .foo {
+        margin: calc(var(--spacing) * 4);
+      }
+      "
+    `)
+  })
+
+  test('--spacing(…) with inline `@theme` value', async () => {
+    expect(
+      await compileCss(css`
+        @theme inline {
+          --spacing: 0.25rem;
+        }
+
+        .foo {
+          margin: --spacing(4);
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      .foo {
+        margin: 1rem;
+      }
+      "
+    `)
+  })
+
+  describe('optimizations', () => {
+    // Use custom `compileCss` such that we can use a version without Lightning
+    // CSS. This way we test _our_ optimizations instead of Lightning's
+    // optimizations.
+    async function compileCss(css: string, options: Parameters<typeof compile>[1] = {}) {
+      let { build } = await compile(css, options)
+      return pretty(build([]))
+    }
+
+    test('--spacing(…) optimizes the output when the input is `0`', async () => {
+      expect(
+        await compileCss(css`
+          @theme {
+            --spacing: 0.25rem;
+          }
+
+          .foo {
+            margin: --spacing(0);
+            padding: --spacing(0px);
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .foo {
+          margin: 0px;
+          padding: 0px;
+        }
+        "
+      `)
+    })
+
+    test('--spacing(…) optimizes the output when the input is `0` (with an inlined theme value)', async () => {
+      expect(
+        await compileCss(css`
+          @theme inline {
+            --spacing: 0.25rem;
+          }
+
+          .foo {
+            margin: --spacing(0);
+            padding: --spacing(0px);
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .foo {
+          margin: 0px;
+          padding: 0px;
+        }
+        "
+      `)
+    })
+
+    test('--spacing(…) optimizes the output when the input is `1`', async () => {
+      expect(
+        await compileCss(css`
+          @theme {
+            --spacing: 0.25rem;
+          }
+
+          .foo {
+            margin: --spacing(1);
+            padding: --spacing(1px);
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        :root, :host {
+          --spacing: 0.25rem;
+        }
+        .foo {
+          margin: var(--spacing);
+          padding: var(--spacing);
+        }
+        "
+      `)
+    })
+
+    test('--spacing(…) optimizes the output when the input is `1` (with an inlined theme value)', async () => {
+      expect(
+        await compileCss(css`
+          @theme inline {
+            --spacing: 0.25rem;
+          }
+
+          .foo {
+            margin: --spacing(1);
+            padding: --spacing(1px);
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .foo {
+          margin: 0.25rem;
+          padding: 0.25rem;
+        }
+        "
+      `)
+    })
+  })
+
+  test('--spacing(…) relies on `--spacing` to be defined', async () => {
+    await expect(() =>
+      compileCss(css`
+        .foo {
+          margin: --spacing(4);
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: The --spacing(…) function requires that the \`--spacing\` theme variable exists, but it was not found.]`,
+    )
+  })
+
+  test('--spacing(…) requires a single value', async () => {
+    await expect(() =>
+      compileCss(css`
+        @theme {
+          --spacing: 0.25rem;
+        }
+
+        .foo {
+          margin: --spacing();
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: The --spacing(…) function requires an argument, but received none.]`,
+    )
+  })
+
+  test('--spacing(…) does not have multiple arguments', async () => {
+    await expect(() =>
+      compileCss(css`
+        .foo {
+          margin: --spacing(4, 5, 6);
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: The --spacing(…) function only accepts a single argument, but received 3.]`,
+    )
+  })
+})
+
+describe('--theme(…)', () => {
+  test('--theme(--color-red-500)', async () => {
+    expect(
+      await compileCss(css`
+        @theme {
+          --color-red-500: #f00;
+        }
+        .red {
+          color: --theme(--color-red-500);
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --color-red-500: red;
+      }
+
+      .red {
+        color: var(--color-red-500);
+      }
+      "
+    `)
+  })
+
+  test('--theme(--color-red-500 inline)', async () => {
+    expect(
+      await compileCss(css`
+        @theme {
+          --color-red-500: #f00;
+        }
+        .red {
+          color: --theme(--color-red-500 inline);
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      .red {
+        color: red;
+      }
+      "
+    `)
+  })
+
+  test('--theme(--color-red-500/50)', async () => {
+    expect(
+      await compileCss(css`
+        @theme {
+          --color-red-500: #f00;
+        }
+        .red {
+          color: --theme(--color-red-500/0.5);
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --color-red-500: red;
+      }
+
+      .red {
+        color: #ff000080;
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .red {
+          color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+        }
+      }
+      "
+    `)
+  })
+
+  test('--theme(--color-red-500/50 inline)', async () => {
+    expect(
+      await compileCss(css`
+        @theme {
+          --color-red-500: #f00;
+        }
+        .red {
+          color: --theme(--color-red-500/50 inline);
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      .red {
+        color: oklab(62.7955% .224863 .125846);
+      }
+      "
+    `)
+  })
+
+  test('--theme(…) injects the fallback when the value it refers is set to a `--theme(…)` function with the fallback `initial`', async () => {
+    expect(
+      await compileCss(css`
+        @theme prefix(tw) {
+          --default-font-family: --theme(--font-family, initial);
+        }
+        .red {
+          font-family: --theme(--default-font-family, Potato Sans, sans-serif);
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      .red {
+        font-family: var(--tw-default-font-family, Potato Sans, sans-serif);
+      }
+      "
+    `)
+  })
+
+  test('--theme(…) injects the fallback when the value it refers is set to a `--theme(…)` function with the fallback `initial` in @reference mode', async () => {
+    expect(
+      await compileCss(css`
+        @theme reference prefix(tw) {
+          --default-font-family: --theme(--font-family, initial);
+        }
+        .red {
+          font-family: --theme(--default-font-family, Potato Sans, sans-serif);
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      .red {
+        font-family: var(--tw-default-font-family, Potato Sans, sans-serif);
+      }
+      "
+    `)
+  })
+
+  test('--theme(…) resolves with the fallback when the value it refers is set to a `--theme(… inline)` function with the fallback `initial`', async () => {
+    expect(
+      await compileCss(css`
+        @theme prefix(tw) {
+          --default-font-family: --theme(--font-family inline, initial);
+        }
+        .red {
+          font-family: --theme(--default-font-family inline, Potato Sans, sans-serif);
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      .red {
+        font-family: Potato Sans, sans-serif;
+      }
+      "
+    `)
+  })
+
+  test('--theme(…) resolves with the fallback when the value it refers is set to a `--theme(… inline)` function with the fallback `initial` in @reference mode', async () => {
+    expect(
+      await compileCss(css`
+        @theme reference prefix(tw) {
+          --default-font-family: --theme(--font-family inline, initial);
+        }
+        .red {
+          font-family: --theme(--default-font-family inline, Potato Sans, sans-serif);
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      .red {
+        font-family: Potato Sans, sans-serif;
+      }
+      "
+    `)
+  })
+
+  test('--theme(…) does not inject the fallback if the fallback is `initial`', async () => {
+    expect(
+      await run(
+        ['tw:font-sans'],
+        css`
+          @theme prefix(tw) {
+            --font-sans:
+              ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+              'Segoe UI Symbol', 'Noto Color Emoji';
+            --default-font-family: --theme(--font-sans, initial);
+          }
+          @layer base {
+            html {
+              font-family: --theme(--default-font-family, sans-serif);
+            }
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --tw-font-sans: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
+                    "Segoe UI Symbol", "Noto Color Emoji";
+        --tw-default-font-family: var(--tw-font-sans);
+      }
+
+      @layer base {
+        html {
+          font-family: var(--tw-default-font-family, sans-serif);
+        }
+      }
+
+      .tw\\:font-sans {
+        font-family: var(--tw-font-sans);
+      }
+      "
+    `)
+  })
+
+  test('--theme(…) forces the value to be retrieved as inline when used inside an at-rule', async () => {
+    expect(
+      await compileCss(css`
+        @theme {
+          --breakpoint-md: 48rem;
+          --breakpoint-lg: 64rem;
+        }
+        @custom-media --md (width >= --theme(--breakpoint-md));
+        @media (--md) {
+          .blue {
+            color: blue;
+          }
+        }
+        @media (width >= --theme(--breakpoint-lg)) {
+          .red {
+            color: red;
+          }
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      @media (min-width: 48rem) {
+        .blue {
+          color: #00f;
+        }
+      }
+
+      @media (min-width: 64rem) {
+        .red {
+          color: red;
+        }
+      }
+      "
+    `)
+  })
+
+  test('--theme(…) can only be used with CSS variables from your @theme', async () => {
+    await expect(() =>
+      compileCss(css`
+        @theme {
+          --color-red-500: #f00;
+        }
+        .red {
+          color: --theme(colors.red.500);
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: The --theme(…) function can only be used with CSS variables from your theme.]`,
+    )
+
+    await expect(() =>
+      compileCss(css`
+        @theme {
+          --color-red-500: #f00;
+        }
+        .red {
+          color: --theme(--color-green-500);
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: Could not resolve value for theme function: \`theme(--color-green-500)\`. Consider checking if the variable name is correct or provide a fallback value to silence this error.]`,
+    )
+  })
+
+  test('--theme(…) function still works as expected, even when a plugin is imported', async () => {
+    expect(
+      await compileCss(
+        css`
+          @layer base {
+            html,
+            :host {
+              font-family: --theme(--default-font-family, system-ui);
+            }
+          }
+          @layer theme {
+            @theme {
+              --font-sans: sans-serif;
+              --default-font-family: --theme(--font-sans, initial);
+            }
+          }
+          @plugin "my-plugin.js";
+        `,
+        {
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: () => {},
+          }),
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer base {
+        html, :host {
+          font-family: var(--default-font-family, system-ui);
+        }
+      }
+
+      @layer theme {
+        :root, :host {
+          --font-sans: sans-serif;
+          --default-font-family: var(--font-sans);
+        }
+      }
+      "
+    `)
+  })
+})
+
+describe('theme(…)', () => {
   describe('in declaration values', () => {
     describe('without fallback values', () => {
       test('theme(colors.red.500)', async () => {
@@ -21,13 +578,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-          }
-
+          "
           .red {
             color: red;
-          }"
+          }
+          "
         `)
       })
 
@@ -42,13 +597,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-          }
-
+          "
           .red {
             color: red;
-          }"
+          }
+          "
         `)
       })
 
@@ -63,13 +616,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-          }
-
+          "
           .red {
             color: red;
-          }"
+          }
+          "
         `)
       })
 
@@ -84,13 +635,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-          }
-
+          "
           .red {
             color: red;
-          }"
+          }
+          "
         `)
       })
 
@@ -105,13 +654,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-          }
-
+          "
           .red {
             color: red;
-          }"
+          }
+          "
         `)
       })
 
@@ -126,13 +673,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-          }
-
+          "
           .red {
             color: red;
-          }"
+          }
+          "
         `)
       })
 
@@ -147,13 +692,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-          }
-
+          "
           .red {
-            color: oklab(62.7955% .22486 .12584 / .75);
-          }"
+            color: oklab(62.7955% .224 .125 / .75);
+          }
+          "
         `)
       })
 
@@ -168,13 +711,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-          }
-
+          "
           .red {
-            color: oklab(62.7955% .22486 .12584 / .75);
-          }"
+            color: oklab(62.7955% .224 .125 / .75);
+          }
+          "
         `)
       })
 
@@ -189,13 +730,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-          }
-
+          "
           .red {
-            color: oklab(62.7955% .22486 .12584 / .75);
-          }"
+            color: oklab(62.7955% .224 .125 / .75);
+          }
+          "
         `)
       })
 
@@ -210,13 +749,17 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
+          "
+          .red {
+            color: red;
           }
 
-          .red {
-            color: color-mix(in oklab, red var(--opacity), transparent);
-          }"
+          @supports (color: color-mix(in lab, red, red)) {
+            .red {
+              color: color-mix(in oklab, red var(--opacity), transparent);
+            }
+          }
+          "
         `)
       })
 
@@ -232,13 +775,17 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
+          "
+          .red {
+            color: red;
           }
 
-          .red {
-            color: color-mix(in oklab, red var(--opacity, 50%), transparent);
-          }"
+          @supports (color: color-mix(in lab, red, red)) {
+            .red {
+              color: color-mix(in oklab, red var(--opacity, 50%), transparent);
+            }
+          }
+          "
         `)
       })
 
@@ -253,13 +800,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --spacing-12: 3rem;
-          }
-
+          "
           .space-on-the-left {
             margin-left: 3rem;
-          }"
+          }
+          "
         `)
       })
 
@@ -274,13 +819,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --spacing-2_5: .625rem;
-          }
-
+          "
           .space-on-the-left {
             margin-left: .625rem;
-          }"
+          }
+          "
         `)
       })
 
@@ -295,13 +838,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --spacing-2_5: .625rem;
-          }
-
+          "
           .space-on-the-left {
             margin-left: calc(100vh - .625rem);
-          }"
+          }
+          "
         `)
       })
 
@@ -316,13 +857,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --radius-lg: .5rem;
-          }
-
+          "
           .radius {
             border-radius: .5rem;
-          }"
+          }
+          "
         `)
       })
 
@@ -338,14 +877,12 @@ describe('theme function', () => {
               }
             `),
           ).toMatchInlineSnapshot(`
-          ":root {
-            --blur: 8px;
-          }
-
-          .default-blur {
-            filter: blur(8px);
-          }"
-        `)
+            "
+            .default-blur {
+              filter: blur(8px);
+            }
+            "
+          `)
         })
 
         test('theme(fontSize.xs[1].lineHeight)', async () => {
@@ -361,15 +898,12 @@ describe('theme function', () => {
               }
             `),
           ).toMatchInlineSnapshot(`
-            ":root {
-              --text-xs: 1337.75rem;
-              --text-xs--line-height: 1337rem;
-            }
-
+            "
             .text {
               font-size: 1337.75rem;
               line-height: 1337rem;
-            }"
+            }
+            "
           `)
         })
 
@@ -377,43 +911,47 @@ describe('theme function', () => {
           expect(
             await compileCss(css`
               @theme default reference {
-                --font-family-sans: ui-sans-serif, system-ui, sans-serif, Apple Color Emoji,
-                  Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
+                --font-family-sans:
+                  -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Noto Sans,
+                  Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol,
+                  Noto Color Emoji;
               }
               .fam {
                 font-family: theme(fontFamily.sans);
               }
             `),
           ).toMatchInlineSnapshot(`
-          ".fam {
-            font-family: ui-sans-serif, system-ui, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
-          }"
-        `)
+            "
+            .fam {
+              font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Noto Sans, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
+            }
+            "
+          `)
         })
 
         test('theme(fontFamily.sans) (config)', async () => {
-          let compiled = await compile(
-            css`
-              @config "./my-config.js";
-              .fam {
-                font-family: theme(fontFamily.sans);
-              }
-            `,
-            {
-              loadModule: async () => ({ module: {}, base: '/root' }),
-            },
-          )
-
-          expect(optimizeCss(compiled.build([])).trim()).toMatchInlineSnapshot(`
-          ".fam {
-            font-family: ui-sans-serif, system-ui, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
-          }"
-        `)
+          expect(
+            await compileCss(
+              css`
+                @config "./my-config.js";
+                .fam {
+                  font-family: theme(fontFamily.sans);
+                }
+              `,
+              { loadModule: async () => ({ path: '', base: '/root', module: {} }) },
+            ),
+          ).toMatchInlineSnapshot(`
+            "
+            .fam {
+              font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Noto Sans, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
+            }
+            "
+          `)
         })
       })
 
       test('theme(colors.unknown.500)', async () =>
-        expect(() =>
+        await expect(() =>
           compileCss(css`
             .red {
               color: theme(colors.unknown.500);
@@ -433,9 +971,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ".red {
+          "
+          .red {
             color: red;
-          }"
+          }
+          "
         `)
       })
 
@@ -450,13 +990,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-          }
-
+          "
           .red {
-            color: oklab(62.7955% .22486 .12584 / .25);
-          }"
+            color: oklab(62.7955% .224 .125 / .25);
+          }
+          "
         `)
       })
 
@@ -468,9 +1006,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ".fam {
+          "
+          .fam {
             font-family: Helvetica Neue, Helvetica, sans-serif;
-          }"
+          }
+          "
         `)
       })
 
@@ -488,9 +1028,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ".fam {
+          "
+          .fam {
             font-family: Helvetica Neue, Helvetica, sans-serif;
-          }"
+          }
+          "
         `)
       })
     })
@@ -508,14 +1050,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-            --color-foo: red;
-          }
-
+          "
           .red {
             color: red;
-          }"
+          }
+          "
         `)
       })
 
@@ -531,14 +1070,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-            --color-foo: oklab(62.7955% .22486 .12584 / .5);
-          }
-
+          "
           .red {
-            color: oklab(62.7955% .22486 .12584 / .25);
-          }"
+            color: oklab(62.7955% .224 .125 / .25);
+          }
+          "
         `)
       })
     })
@@ -555,13 +1091,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-          }
-
+          "
           .red {
             color: red;
-          }"
+          }
+          "
         `)
       })
 
@@ -576,13 +1110,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-          }
-
+          "
           .red {
-            color: oklab(62.7955% .22486 .12584 / .5);
-          }"
+            color: oklab(62.7955% .224 .125 / .5);
+          }
+          "
         `)
       })
 
@@ -597,13 +1129,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --color-red-500: red;
-          }
-
+          "
           .red {
             color: red;
-          }"
+          }
+          "
         `)
       })
     })
@@ -620,13 +1150,11 @@ describe('theme function', () => {
             }
           `),
         ).toMatchInlineSnapshot(`
-          ":root {
-            --blur: 8px;
-          }
-
+          "
           .blur {
             filter: blur(8px);
-          }"
+          }
+          "
         `)
       })
     })
@@ -635,13 +1163,13 @@ describe('theme function', () => {
       test.each([
         [
           'fontFamily.sans',
-          'ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"',
+          '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"',
         ],
         ['maxWidth.xs', '20rem'],
         ['transitionTimingFunction.in-out', 'cubic-bezier(.4, 0, .2, 1)'],
         ['letterSpacing.wide', '.025em'],
         ['lineHeight.tight', '1.25'],
-        ['backgroundColor.red.500', 'oklch(.637 .237 25.331)'],
+        ['backgroundColor.red.500', 'oklch(63.7% .237 25.331)'],
       ])('theme(%s) → %s', async (value, result) => {
         let defaultTheme = await fs.readFile(path.join(__dirname, '..', 'theme.css'), 'utf8')
         let compiled = await compileCss(css`
@@ -668,7 +1196,8 @@ describe('theme function', () => {
   describe('in candidates', () => {
     test('sm:[--color:theme(colors.red[500])]', async () => {
       expect(
-        await compileCss(
+        await run(
+          ['sm:[--color:theme(colors.red[500])]'],
           css`
             @tailwind utilities;
             @theme {
@@ -676,55 +1205,47 @@ describe('theme function', () => {
               --color-red-500: #f00;
             }
           `,
-          ['sm:[--color:theme(colors.red[500])]'],
         ),
       ).toMatchInlineSnapshot(`
-        "@media (width >= 40rem) {
+        "
+        @media (min-width: 40rem) {
           .sm\\:\\[--color\\:theme\\(colors\\.red\\[500\\]\\)\\] {
             --color: red;
           }
         }
-
-        :root {
-          --breakpoint-sm: 40rem;
-          --color-red-500: red;
-        }"
+        "
       `)
     })
 
     test("values that don't exist don't produce candidates", async () => {
+      let input = css`
+        @tailwind utilities;
+        @theme reference {
+          --radius-sm: 2rem;
+        }
+      `
+
       // This guarantees that valid candidates still make it through when some are invalid
       expect(
-        await compileCss(
-          css`
-            @tailwind utilities;
-            @theme reference {
-              --radius-sm: 2rem;
-            }
-          `,
+        await run(
           [
             'rounded-[theme(--radius-sm)]',
             'rounded-[theme(i.do.not.exist)]',
             'rounded-[theme(--i-do-not-exist)]',
           ],
+          input,
         ),
       ).toMatchInlineSnapshot(`
-        ".rounded-\\[theme\\(--radius-sm\\)\\] {
+        "
+        .rounded-\\[theme\\(--radius-sm\\)\\] {
           border-radius: 2rem;
-        }"
+        }
+        "
       `)
 
       // This guarantees no output for the following candidates
       expect(
-        await compileCss(
-          css`
-            @tailwind utilities;
-            @theme reference {
-              --radius-sm: 2rem;
-            }
-          `,
-          ['rounded-[theme(i.do.not.exist)]', 'rounded-[theme(--i-do-not-exist)]'],
-        ),
+        await run(['rounded-[theme(i.do.not.exist)]', 'rounded-[theme(--i-do-not-exist)]'], input),
       ).toEqual('')
     })
   })
@@ -745,16 +1266,13 @@ describe('theme function', () => {
           }
         `),
       ).toMatchInlineSnapshot(`
-        ":root {
-          --breakpoint-md: 48rem;
-          --breakpoint-lg: 64rem;
-        }
-
-        @media (width >= 48rem) and (width <= 64rem) {
+        "
+        @media (min-width: 48rem) and (max-width: 64rem) {
           .red {
             color: red;
           }
-        }"
+        }
+        "
       `)
     })
 
@@ -772,16 +1290,13 @@ describe('theme function', () => {
           }
         `),
       ).toMatchInlineSnapshot(`
-        ":root {
-          --breakpoint-md: 48rem;
-          --breakpoint-lg: 64rem;
-        }
-
-        @media (width >= 48rem) and (width < 64rem) {
+        "
+        @media (min-width: 48rem) and (not (min-width: 64rem)) {
           .red {
             color: red;
           }
-        }"
+        }
+        "
       `)
     })
   })
@@ -800,15 +1315,13 @@ describe('theme function', () => {
         }
       `),
     ).toMatchInlineSnapshot(`
-      ":root {
-        --breakpoint-md: 48rem;
-      }
-
-      @media (width >= 48rem) {
+      "
+      @media (min-width: 48rem) {
         .red {
           color: red;
         }
-      }"
+      }
+      "
     `)
   })
 
@@ -825,15 +1338,13 @@ describe('theme function', () => {
         }
       `),
     ).toMatchInlineSnapshot(`
-      ":root {
-        --breakpoint-md: 48rem;
-      }
-
-      @container (width > 48rem) {
+      "
+      @container not (max-width: 48rem) {
         .red {
           color: red;
         }
-      }"
+      }
+      "
     `)
   })
 
@@ -850,110 +1361,47 @@ describe('theme function', () => {
         }
       `),
     ).toMatchInlineSnapshot(`
-      ":root {
-        --font-size-xs: .75rem;
-      }
-
+      "
       @supports (text-stroke: 0.75rem) {
         .red {
           color: red;
         }
-      }"
+      }
+      "
     `)
   })
 })
 
 describe('in plugins', () => {
   test('CSS theme functions in plugins are properly evaluated', async () => {
-    let compiled = await compile(
-      css`
-        @layer base, utilities;
-        @plugin "my-plugin";
-        @theme reference {
-          --color-red: oklch(62% 0.25 30);
-          --color-orange: oklch(79% 0.17 70);
-          --color-blue: oklch(45% 0.31 264);
-          --color-pink: oklch(87% 0.07 7);
-        }
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        async loadModule() {
-          return {
-            module: plugin(({ addBase, addUtilities }) => {
-              addBase({
-                '.my-base-rule': {
-                  color: 'theme(colors.red)',
-                  'outline-color': 'theme(colors.orange / 15%)',
-                  'background-color': 'theme(--color-blue)',
-                  'border-color': 'theme(--color-pink / 10%)',
-                },
-              })
-
-              addUtilities({
-                '.my-utility': {
-                  color: 'theme(colors.red)',
-                },
-              })
-            }),
-            base: '/root',
+    expect(
+      await run(
+        ['my-utility'],
+        css`
+          @layer base, utilities;
+          @plugin "my-plugin";
+          @theme reference {
+            --color-red: oklch(62% 0.25 30);
+            --color-orange: oklch(79% 0.17 70);
+            --color-blue: oklch(45% 0.31 264);
+            --color-pink: oklch(87% 0.07 7);
           }
-        },
-      },
-    )
-
-    expect(optimizeCss(compiled.build(['my-utility'])).trim()).toMatchInlineSnapshot(`
-      "@layer base {
-        .my-base-rule {
-          color: oklch(62% .25 30);
-          background-color: oklch(45% .31 264);
-          border-color: oklab(87% .06947 .00853 / .1);
-          outline-color: oklab(79% .05814 .15974 / .15);
-        }
-      }
-
-      @layer utilities {
-        .my-utility {
-          color: oklch(62% .25 30);
-        }
-      }"
-    `)
-  })
-})
-
-describe('in JS config files', () => {
-  test('CSS theme functions in config files are properly evaluated', async () => {
-    let compiled = await compile(
-      css`
-        @layer base, utilities;
-        @config "./my-config.js";
-        @theme reference {
-          --color-red: red;
-          --color-orange: orange;
-        }
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async () => ({
-          module: {
-            theme: {
-              extend: {
-                colors: {
-                  primary: 'theme(colors.red)',
-                  secondary: 'theme(--color-orange)',
-                },
-              },
-            },
-            plugins: [
-              plugin(({ addBase, addUtilities }) => {
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          async loadModule() {
+            return {
+              path: '',
+              base: '/root',
+              module: plugin(({ addBase, addUtilities }) => {
                 addBase({
                   '.my-base-rule': {
-                    background: 'theme(colors.primary)',
-                    color: 'theme(colors.secondary)',
+                    color: 'theme(colors.red)',
+                    'outline-color': 'theme(colors.orange / 15%)',
+                    'background-color': 'theme(--color-blue)',
+                    'border-color': 'theme(--color-pink / 10%)',
                   },
                 })
 
@@ -963,15 +1411,83 @@ describe('in JS config files', () => {
                   },
                 })
               }),
-            ],
+            }
           },
-          base: '/root',
-        }),
-      },
-    )
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer base {
+        .my-base-rule {
+          color: oklch(62% .25 30);
+          background-color: oklch(45% .31 264);
+          border-color: oklab(87% .069 .008 / .1);
+          outline-color: oklab(79% .058 .159 / .15);
+        }
+      }
 
-    expect(optimizeCss(compiled.build(['my-utility'])).trim()).toMatchInlineSnapshot(`
-      "@layer base {
+      @layer utilities {
+        .my-utility {
+          color: oklch(62% .25 30);
+        }
+      }
+      "
+    `)
+  })
+})
+
+describe('in JS config files', () => {
+  test('CSS theme functions in config files are properly evaluated', async () => {
+    expect(
+      await run(
+        ['my-utility'],
+        css`
+          @layer base, utilities;
+          @config "./my-config.js";
+          @theme reference {
+            --color-red: red;
+            --color-orange: orange;
+          }
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: {
+              theme: {
+                extend: {
+                  colors: {
+                    primary: 'theme(colors.red)',
+                    secondary: 'theme(--color-orange)',
+                  },
+                },
+              },
+              plugins: [
+                plugin(({ addBase, addUtilities }) => {
+                  addBase({
+                    '.my-base-rule': {
+                      background: 'theme(colors.primary)',
+                      color: 'theme(colors.secondary)',
+                    },
+                  })
+
+                  addUtilities({
+                    '.my-utility': {
+                      color: 'theme(colors.red)',
+                    },
+                  })
+                }),
+              ],
+            },
+          }),
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer base {
         .my-base-rule {
           color: orange;
           background: red;
@@ -982,7 +1498,8 @@ describe('in JS config files', () => {
         .my-utility {
           color: red;
         }
-      }"
+      }
+      "
     `)
   })
 })
@@ -996,10 +1513,10 @@ test('replaces CSS theme() function with values inside imported stylesheets', as
         }
         @import './bar.css';
       `,
-      [],
       {
         async loadStylesheet() {
           return {
+            path: '',
             base: '/bar.css',
             content: css`
               .red {
@@ -1011,54 +1528,46 @@ test('replaces CSS theme() function with values inside imported stylesheets', as
       },
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --color-red-500: red;
-    }
-
+    "
     .red {
       color: red;
-    }"
+    }
+    "
   `)
 })
 
 test('resolves paths ending with a 1', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing-1: 0.25rem;
-        }
+    await compileCss(css`
+      @theme {
+        --spacing-1: 0.25rem;
+      }
 
-        .foo {
-          margin: theme(spacing.1);
-        }
-      `,
-      [],
-    ),
+      .foo {
+        margin: theme(spacing.1);
+      }
+    `),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --spacing-1: .25rem;
-    }
-
+    "
     .foo {
       margin: .25rem;
-    }"
+    }
+    "
   `)
 })
 
-test('upgrades to a full JS compat theme lookup if a value can not be mapped to a CSS variable', async () => {
+test('upgrades to a full JS compat theme lookup if a value cannot be mapped to a CSS variable', async () => {
   expect(
-    await compileCss(
-      css`
-        .semi {
-          font-weight: theme(fontWeight.semibold);
-        }
-      `,
-      [],
-    ),
+    await compileCss(css`
+      .semi {
+        font-weight: theme(fontWeight.semibold);
+      }
+    `),
   ).toMatchInlineSnapshot(`
-    ".semi {
+    "
+    .semi {
       font-weight: 600;
-    }"
+    }
+    "
   `)
 })
diff --git a/packages/tailwindcss/src/css-functions.ts b/packages/tailwindcss/src/css-functions.ts
index fe259a0a2..32fba455f 100644
--- a/packages/tailwindcss/src/css-functions.ts
+++ b/packages/tailwindcss/src/css-functions.ts
@@ -1,19 +1,186 @@
 import { Features } from '.'
-import { walk, type AstNode } from './ast'
+import { type AstNode } from './ast'
+import type { DesignSystem } from './design-system'
+import { withAlpha } from './utilities'
+import { dimensions } from './utils/dimensions'
+import { segment } from './utils/segment'
 import * as ValueParser from './value-parser'
-import { type ValueAstNode } from './value-parser'
+import { walk, WalkAction } from './walk'
 
-export const THEME_FUNCTION_INVOCATION = 'theme('
+const CSS_FUNCTIONS: Record<
+  string,
+  (designSystem: DesignSystem, source: AstNode, ...args: string[]) => string
+> = {
+  '--alpha': alpha,
+  '--spacing': spacing,
+  '--theme': theme,
+  theme: legacyTheme,
+}
 
-type ResolveThemeValue = (path: string) => string | undefined
+function alpha(
+  _designSystem: DesignSystem,
+  _source: AstNode,
+  value: string,
+  ...rest: string[]
+): string {
+  let [color, alpha] = segment(value, '/').map((v) => v.trim())
 
-export function substituteFunctions(ast: AstNode[], resolveThemeValue: ResolveThemeValue) {
+  if (!color || !alpha) {
+    throw new Error(
+      `The --alpha(…) function requires a color and an alpha value, e.g.: \`--alpha(${color || 'var(--my-color)'} / ${alpha || '50%'})\``,
+    )
+  }
+
+  if (rest.length > 0) {
+    throw new Error(
+      `The --alpha(…) function only accepts one argument, e.g.: \`--alpha(${color || 'var(--my-color)'} / ${alpha || '50%'})\``,
+    )
+  }
+
+  return withAlpha(color, alpha)
+}
+
+function spacing(
+  designSystem: DesignSystem,
+  _source: AstNode,
+  value: string,
+  ...rest: string[]
+): string {
+  if (!value) {
+    throw new Error(`The --spacing(…) function requires an argument, but received none.`)
+  }
+
+  if (rest.length > 0) {
+    throw new Error(
+      `The --spacing(…) function only accepts a single argument, but received ${rest.length + 1}.`,
+    )
+  }
+
+  let multiplier = designSystem.theme.resolve(null, ['--spacing'])
+  if (!multiplier) {
+    throw new Error(
+      'The --spacing(…) function requires that the `--spacing` theme variable exists, but it was not found.',
+    )
+  }
+
+  // Optimization:
+  //
+  // - We know that at this point the `--spacing` value must be set.
+  // - We know that `--spacing` must be set to a `<length>` unit, such as `0.25rem`
+  // - We can assume that the `--spacing` value is not set to a `0`-like value.
+  //   Otherwise `p-<anything>` would calculate as `0` which wouldn't make sense.
+  //
+  // - That means that a value of `0` can be replaced by `0px`. It's important
+  //   to keep the unit so the value stays a `<length>`, e.g. when assigned to
+  //   a custom property and later used inside `calc(…)`.
+  // - That means that a value of `1` can be replaced by `multiplier`
+  let valueDimension = dimensions.get(value)
+  if (valueDimension) {
+    if (valueDimension[0] === 0) return '0px'
+    if (valueDimension[0] === 1) return multiplier
+  }
+
+  // No known optimizations available, use full calculation
+  return `calc(${multiplier} * ${value})`
+}
+
+function theme(
+  designSystem: DesignSystem,
+  source: AstNode,
+  path: string,
+  ...fallback: string[]
+): string {
+  if (!path.startsWith('--')) {
+    throw new Error(`The --theme(…) function can only be used with CSS variables from your theme.`)
+  }
+
+  let inline = false
+
+  // Handle `--theme(… inline)` to force inline resolution
+  if (path.endsWith(' inline')) {
+    inline = true
+    path = path.slice(0, -7)
+  }
+
+  // If the `--theme(…)` function is used within an at-rule (e.g. `@media (width >= --theme(…)))`,
+  // we have to always inline the result since CSS does not support CSS variables in these positions
+  if (source.kind === 'at-rule') {
+    inline = true
+  }
+
+  let resolvedValue = designSystem.resolveThemeValue(path, inline)
+
+  if (!resolvedValue) {
+    if (fallback.length > 0) return fallback.join(', ')
+    throw new Error(
+      `Could not resolve value for theme function: \`theme(${path})\`. Consider checking if the variable name is correct or provide a fallback value to silence this error.`,
+    )
+  }
+
+  if (fallback.length === 0) {
+    return resolvedValue
+  }
+
+  let joinedFallback = fallback.join(', ')
+  if (joinedFallback === 'initial') return resolvedValue
+
+  // When the resolved value returns `initial`, resolve with the fallback value
+  if (resolvedValue === 'initial') return joinedFallback
+
+  // Inject the fallback of a `--theme(…)` function into the fallback of a referenced `--theme(…)`
+  // function or `var(…)` declaration. If the referenced function already defines a fallback, we use
+  // a potential fallback value of `initial` in the referenced function to determine if we should
+  // inject the fallback value of the caller. If that's not the case, we keep the fallback as-is
+  // (this is needed for theme variables in reference-mode).
+  if (
+    resolvedValue.startsWith('var(') ||
+    resolvedValue.startsWith('theme(') ||
+    resolvedValue.startsWith('--theme(')
+  ) {
+    let valueAst = ValueParser.parse(resolvedValue)
+    injectFallbackForInitialFallback(valueAst, joinedFallback)
+    return ValueParser.toCss(valueAst)
+  }
+
+  return resolvedValue
+}
+
+function legacyTheme(
+  designSystem: DesignSystem,
+  _source: AstNode,
+  path: string,
+  ...fallback: string[]
+): string {
+  path = eventuallyUnquote(path)
+
+  let resolvedValue = designSystem.resolveThemeValue(path)
+
+  if (!resolvedValue && fallback.length > 0) {
+    return fallback.join(', ')
+  }
+
+  if (!resolvedValue) {
+    throw new Error(
+      `Could not resolve value for theme function: \`theme(${path})\`. Consider checking if the path is correct or provide a fallback value to silence this error.`,
+    )
+  }
+
+  return resolvedValue
+}
+
+export const THEME_FUNCTION_INVOCATION = new RegExp(
+  Object.keys(CSS_FUNCTIONS)
+    .map((x) => `${x}\\(`)
+    .join('|'),
+)
+
+export function substituteFunctions(ast: AstNode[], designSystem: DesignSystem) {
   let features = Features.None
   walk(ast, (node) => {
     // Find all declaration values
-    if (node.kind === 'declaration' && node.value?.includes(THEME_FUNCTION_INVOCATION)) {
+    if (node.kind === 'declaration' && node.value && THEME_FUNCTION_INVOCATION.test(node.value)) {
       features |= Features.ThemeFunction
-      node.value = substituteFunctionsInValue(node.value, resolveThemeValue)
+      node.value = substituteFunctionsInValue(node.value, node, designSystem)
       return
     }
 
@@ -24,10 +191,10 @@ export function substituteFunctions(ast: AstNode[], resolveThemeValue: ResolveTh
           node.name === '@custom-media' ||
           node.name === '@container' ||
           node.name === '@supports') &&
-        node.params.includes(THEME_FUNCTION_INVOCATION)
+        THEME_FUNCTION_INVOCATION.test(node.params)
       ) {
         features |= Features.ThemeFunction
-        node.params = substituteFunctionsInValue(node.params, resolveThemeValue)
+        node.params = substituteFunctionsInValue(node.params, node, designSystem)
       }
     }
   })
@@ -36,79 +203,25 @@ export function substituteFunctions(ast: AstNode[], resolveThemeValue: ResolveTh
 
 export function substituteFunctionsInValue(
   value: string,
-  resolveThemeValue: ResolveThemeValue,
+  source: AstNode,
+  designSystem: DesignSystem,
 ): string {
   let ast = ValueParser.parse(value)
-  ValueParser.walk(ast, (node, { replaceWith }) => {
-    if (node.kind === 'function' && node.value === 'theme') {
-      if (node.nodes.length < 1) {
-        throw new Error(
-          'Expected `theme()` function call to have a path. For example: `theme(--color-red-500)`.',
-        )
-      }
-
-      // Ignore whitespace before the first argument
-      if (node.nodes[0].kind === 'separator' && node.nodes[0].value.trim() === '') {
-        node.nodes.shift()
-      }
-
-      let pathNode = node.nodes[0]
-      if (pathNode.kind !== 'word') {
-        throw new Error(
-          `Expected \`theme()\` function to start with a path, but instead found ${pathNode.value}.`,
-        )
-      }
-      let path = pathNode.value
-
-      // For the theme function arguments, we require all separators to contain
-      // comma (`,`), spaces alone should be merged into the previous word to
-      // avoid splitting in this case:
-      //
-      // theme(--color-red-500 / 75%) theme(--color-red-500 / 75%, foo, bar)
-      //
-      // We only need to do this for the first node, as the fallback values are
-      // passed through as-is.
-      let skipUntilIndex = 1
-      for (let i = skipUntilIndex; i < node.nodes.length; i++) {
-        if (node.nodes[i].value.includes(',')) {
-          break
-        }
-        path += ValueParser.toCss([node.nodes[i]])
-        skipUntilIndex = i + 1
-      }
-
-      path = eventuallyUnquote(path)
-      let fallbackValues = node.nodes.slice(skipUntilIndex + 1)
-
-      replaceWith(cssThemeFn(resolveThemeValue, path, fallbackValues))
+  walk(ast, (node) => {
+    if (node.kind === 'function' && node.value in CSS_FUNCTIONS) {
+      let args = segment(ValueParser.toCss(node.nodes).trim(), ',').map((x) => x.trim())
+      let result = CSS_FUNCTIONS[node.value as keyof typeof CSS_FUNCTIONS](
+        designSystem,
+        source,
+        ...args,
+      )
+      return WalkAction.Replace(ValueParser.parse(result))
     }
   })
 
   return ValueParser.toCss(ast)
 }
 
-function cssThemeFn(
-  resolveThemeValue: ResolveThemeValue,
-  path: string,
-  fallbackValues: ValueAstNode[],
-): ValueAstNode[] {
-  let resolvedValue = resolveThemeValue(path)
-
-  if (!resolvedValue && fallbackValues.length > 0) {
-    return fallbackValues
-  }
-
-  if (!resolvedValue) {
-    throw new Error(
-      `Could not resolve value for theme function: \`theme(${path})\`. Consider checking if the path is correct or provide a fallback value to silence this error.`,
-    )
-  }
-
-  // We need to parse the values recursively since this can resolve with another
-  // `theme()` function definition.
-  return ValueParser.parse(resolvedValue)
-}
-
 function eventuallyUnquote(value: string) {
   if (value[0] !== "'" && value[0] !== '"') return value
 
@@ -128,3 +241,22 @@ function eventuallyUnquote(value: string) {
 
   return unquoted
 }
+
+function injectFallbackForInitialFallback(ast: ValueParser.ValueAstNode[], fallback: string): void {
+  walk(ast, (node) => {
+    if (node.kind !== 'function') return
+    if (node.value !== 'var' && node.value !== 'theme' && node.value !== '--theme') return
+
+    if (node.nodes.length === 1) {
+      node.nodes.push({
+        kind: 'word',
+        value: `, ${fallback}`,
+      })
+    } else {
+      let lastNode = node.nodes[node.nodes.length - 1]
+      if (lastNode.kind === 'word' && lastNode.value === 'initial') {
+        lastNode.value = fallback
+      }
+    }
+  })
+}
diff --git a/packages/tailwindcss/src/css-parser.bench.ts b/packages/tailwindcss/src/css-parser.bench.ts
index ab490e103..d48f88ab3 100644
--- a/packages/tailwindcss/src/css-parser.bench.ts
+++ b/packages/tailwindcss/src/css-parser.bench.ts
@@ -10,3 +10,7 @@ const cssFile = readFileSync(currentFolder + './preflight.css', 'utf-8')
 bench('css-parser on preflight.css', () => {
   CSS.parse(cssFile)
 })
+
+bench('CSS with sourcemaps', () => {
+  CSS.parse(cssFile, { from: 'input.css' })
+})
diff --git a/packages/tailwindcss/src/css-parser.test.ts b/packages/tailwindcss/src/css-parser.test.ts
index a4b123b28..0dcbc0a41 100644
--- a/packages/tailwindcss/src/css-parser.test.ts
+++ b/packages/tailwindcss/src/css-parser.test.ts
@@ -8,6 +8,12 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
     return CSS.parse(string.replaceAll(/\r?\n/g, lineEndings === 'Windows' ? '\r\n' : '\n'))
   }
 
+  function parseWithLoc(string: string) {
+    return CSS.parse(string.replaceAll(/\r?\n/g, lineEndings === 'Windows' ? '\r\n' : '\n'), {
+      from: 'input.css',
+    })
+  }
+
   describe('comments', () => {
     it('should parse a comment and ignore it', () => {
       expect(
@@ -25,6 +31,23 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
       ).toEqual([])
     })
 
+    it('should end a comment at `*/` even when it is preceded by a `\\`', () => {
+      expect(
+        parse(css`
+          /* C:\temp\*/
+          .foo {
+            color: red;
+          }
+        `),
+      ).toEqual([
+        {
+          kind: 'rule',
+          selector: '.foo',
+          nodes: [{ kind: 'declaration', property: 'color', value: 'red', important: false }],
+        },
+      ])
+    })
+
     it('should parse a comment inside of a selector and ignore it', () => {
       expect(
         parse(css`
@@ -86,7 +109,7 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
           kind: 'comment',
           value: `!
             * License #2
-            `,
+            `.replaceAll(/\r?\n/g, lineEndings === 'Windows' ? '\r\n' : '\n'),
         },
       ])
     })
@@ -197,7 +220,7 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
       ])
     })
 
-    it('should parse declarations with with strings and escaped string endings', () => {
+    it('should parse declarations with strings and escaped string endings', () => {
       expect(
         parse(css`
           content: 'These are not the end "\' of the string';
@@ -206,7 +229,7 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
         {
           kind: 'declaration',
           property: 'content',
-          value: `'These are not the end \"\\' of the string'`,
+          value: `'These are not the end "\\' of the string'`,
           important: false,
         },
       ])
@@ -329,6 +352,28 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
         ])
       })
 
+      it('should parse a custom property with an empty value', () => {
+        expect(parse('--foo:;')).toEqual([
+          {
+            kind: 'declaration',
+            property: '--foo',
+            value: '',
+            important: false,
+          },
+        ])
+      })
+
+      it('should parse a custom property with a space value', () => {
+        expect(parse('--foo: ;')).toEqual([
+          {
+            kind: 'declaration',
+            property: '--foo',
+            value: '',
+            important: false,
+          },
+        ])
+      })
+
       it('should parse a custom property with a block including nested "css"', () => {
         expect(
           parse(css`
@@ -346,7 +391,7 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
               background-color: red;
               /* A comment */
               content: 'Hello, world!';
-            }`,
+            }`.replaceAll(/\r?\n/g, lineEndings === 'Windows' ? '\r\n' : '\n'),
             important: false,
           },
         ])
@@ -374,7 +419,7 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
               background-color: red;
               /* A comment ; */
               content: 'Hello, world!';
-            }`,
+            }`.replaceAll(/\r?\n/g, lineEndings === 'Windows' ? '\r\n' : '\n'),
             important: false,
           },
           {
@@ -384,7 +429,7 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
               background-color: red;
               /* A comment } */
               content: 'Hello, world!';
-            }`,
+            }`.replaceAll(/\r?\n/g, lineEndings === 'Windows' ? '\r\n' : '\n'),
             important: false,
           },
         ])
@@ -420,6 +465,28 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
         ])
       })
 
+      it('should end a comment in a custom property at `*/` even when it is preceded by a `\\`', () => {
+        expect(
+          parse(css`
+            --foo: /* C:\temp\*/ bar;
+            --bar: /* baz */ qux;
+          `),
+        ).toEqual([
+          {
+            kind: 'declaration',
+            property: '--foo',
+            value: '/* C:\\temp\\*/ bar',
+            important: false,
+          },
+          {
+            kind: 'declaration',
+            property: '--bar',
+            value: '/* baz */ qux',
+            important: false,
+          },
+        ])
+      })
+
       it('should parse empty custom properties', () => {
         expect(
           parse(css`
@@ -435,6 +502,21 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
           `),
         ).toEqual([{ kind: 'declaration', property: '--foo', value: 'bar', important: true }])
       })
+
+      it('should parse custom properties with data URL value', () => {
+        expect(
+          parse(css`
+            --foo: 'data:text/plain;base64,SGVsbG8sIFdvcmxkIQ==';
+          `),
+        ).toEqual([
+          {
+            kind: 'declaration',
+            property: '--foo',
+            value: "'data:text/plain;base64,SGVsbG8sIFdvcmxkIQ=='",
+            important: false,
+          },
+        ])
+      })
     })
 
     it('should parse multiple declarations', () => {
@@ -686,6 +768,26 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
       ).toEqual([{ kind: 'at-rule', name: '@charset', params: '"UTF-8"', nodes: [] }])
     })
 
+    it.each([
+      [' '], // space
+      ['  '], // multiple spaces
+      ['\t'], // tab
+      [' \t'], // space + tab
+      ['\t '], // tab + space
+      ['\t\t'], // multiple tabs
+      ['\n'], // newline
+      [' \n'], // space + newline
+      ['\n '], // newline + space
+      ['\n\n'], // multiple newlines
+      ['\r\n'], // windows newline
+      [' \r\n'], // space + windows newline
+      ['\r\n '], // windows newline + space
+    ])('should parse an at-rule with whitespace %s in the params', (whitespace) => {
+      expect(parse(`@apply${whitespace}bg-red-500;`)).toEqual([
+        { kind: 'at-rule', name: '@apply', params: 'bg-red-500', nodes: [] },
+      ])
+    })
+
     it('should parse an at-rule without a block or semicolon', () => {
       expect(
         parse(`
@@ -1041,6 +1143,38 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
         },
       ])
     })
+
+    it('should ignore consecutive semicolons', () => {
+      expect(parse(';;;')).toEqual([])
+    })
+
+    it('should ignore semicolons after an at-rule with a body', () => {
+      expect(parse('@plugin "foo" {} ;')).toEqual([
+        {
+          kind: 'at-rule',
+          name: '@plugin',
+          params: '"foo"',
+          nodes: [],
+        },
+      ])
+    })
+
+    it('should ignore consecutive semicolons a declaration', () => {
+      expect(parse('.foo { color: red;;; }')).toEqual([
+        {
+          kind: 'rule',
+          selector: '.foo',
+          nodes: [
+            {
+              kind: 'declaration',
+              property: 'color',
+              value: 'red',
+              important: false,
+            },
+          ],
+        },
+      ])
+    })
   })
 
   describe('errors', () => {
@@ -1056,7 +1190,20 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
             color: blue;
           }
         `),
-      ).toThrowErrorMatchingInlineSnapshot(`[Error: Missing opening {]`)
+      ).toThrowErrorMatchingInlineSnapshot(`[CssSyntaxError: Missing opening {]`)
+
+      expect(() =>
+        parseWithLoc(`
+          .foo {
+            color: red;
+          }
+
+          .bar
+            /* ^ Missing opening { */
+            color: blue;
+          }
+        `),
+      ).toThrowErrorMatchingInlineSnapshot(`[CssSyntaxError: input.css:9:11: Missing opening {]`)
     })
 
     it('should error when curly brackets are unbalanced (closing)', () => {
@@ -1071,31 +1218,117 @@ describe.each(['Unix', 'Windows'])('Line endings: %s', (lineEndings) => {
 
        /* ^ Missing closing } */
         `),
-      ).toThrowErrorMatchingInlineSnapshot(`[Error: Missing closing } at .bar]`)
+      ).toThrowErrorMatchingInlineSnapshot(`[CssSyntaxError: Missing closing } at .bar]`)
+
+      expect(() =>
+        parseWithLoc(`
+          .foo {
+            color: red;
+          }
+
+          .bar {
+            color: blue;
+
+       /* ^ Missing closing } */
+        `),
+      ).toThrowErrorMatchingInlineSnapshot(
+        `[CssSyntaxError: input.css:6:11: Missing closing } at .bar]`,
+      )
     })
 
     it('should error when an unterminated string is used', () => {
-      expect(() =>
-        parse(css`
-          .foo {
-            content: "Hello world!
-            /*                    ^ missing " */
-            font-weight: bold;
-          }
-        `),
-      ).toThrowErrorMatchingInlineSnapshot(`[Error: Unterminated string: "Hello world!"]`)
+      let input = css`
+        .foo {
+          content: "Hello world!
+          /*                    ^ missing " */
+          font-weight: bold;
+        }
+      `
+
+      expect(() => parse(input)).toThrowErrorMatchingInlineSnapshot(
+        `[CssSyntaxError: Unterminated string: "Hello world!"]`,
+      )
+
+      expect(() => parseWithLoc(input)).toThrowErrorMatchingInlineSnapshot(
+        `[CssSyntaxError: input.css:3:20: Unterminated string: "Hello world!"]`,
+      )
     })
 
     it('should error when an unterminated string is used with a `;`', () => {
-      expect(() =>
-        parse(css`
-          .foo {
-            content: "Hello world!;
-            /*                    ^ missing " */
-            font-weight: bold;
-          }
-        `),
-      ).toThrowErrorMatchingInlineSnapshot(`[Error: Unterminated string: "Hello world!;"]`)
+      let input = css`
+        .foo {
+          content: "Hello world!;
+          /*                    ^ missing " */
+          font-weight: bold;
+        }
+      `
+
+      expect(() => parse(input)).toThrowErrorMatchingInlineSnapshot(
+        `[CssSyntaxError: Unterminated string: "Hello world!;"]`,
+      )
+
+      expect(() => parseWithLoc(input)).toThrowErrorMatchingInlineSnapshot(
+        `[CssSyntaxError: input.css:3:20: Unterminated string: "Hello world!;"]`,
+      )
+    })
+
+    it('should error when incomplete custom properties are used', () => {
+      expect(() => parse('--foo')).toThrowErrorMatchingInlineSnapshot(
+        `[CssSyntaxError: Invalid custom property, expected a value]`,
+      )
+
+      expect(() => parseWithLoc('--foo')).toThrowErrorMatchingInlineSnapshot(
+        `[CssSyntaxError: input.css:1:1: Invalid custom property, expected a value]`,
+      )
+    })
+
+    it('should error when incomplete custom properties are used inside rules', () => {
+      expect(() => parse('.foo { --bar }')).toThrowErrorMatchingInlineSnapshot(
+        `[CssSyntaxError: Invalid custom property, expected a value]`,
+      )
+
+      expect(() => parseWithLoc('.foo { --bar }')).toThrowErrorMatchingInlineSnapshot(
+        `[CssSyntaxError: input.css:1:8: Invalid custom property, expected a value]`,
+      )
+    })
+
+    it('should error when an unterminated string is used in a custom property', () => {
+      // prettier-ignore
+      let input = css`
+        .foo {
+          --bar: 'Hello world!
+          /*                  ^ missing ' * /;
+        }
+      `
+
+      expect(() => parse(input)).toThrowErrorMatchingInlineSnapshot(
+        `[CssSyntaxError: Unterminated string: 'Hello world!']`,
+      )
+
+      expect(() => parseWithLoc(input)).toThrowErrorMatchingInlineSnapshot(
+        `[CssSyntaxError: input.css:3:18: Unterminated string: 'Hello world!']`,
+      )
+    })
+
+    it('should error when a declaration is incomplete', () => {
+      expect(() => parse('.foo { bar }')).toThrowErrorMatchingInlineSnapshot(
+        `[CssSyntaxError: Invalid declaration: \`bar\`]`,
+      )
+
+      expect(() => parseWithLoc('.foo { bar }')).toThrowErrorMatchingInlineSnapshot(
+        `[CssSyntaxError: input.css:1:8: Invalid declaration: \`bar\`]`,
+      )
     })
   })
+
+  it('ignores BOM at the beginning of a file', () => {
+    expect(parse("\uFEFF@reference 'tailwindcss';")).toEqual([
+      {
+        kind: 'at-rule',
+        name: '@reference',
+        nodes: [],
+        params: "'tailwindcss'",
+      },
+    ])
+  })
 })
diff --git a/packages/tailwindcss/src/css-parser.ts b/packages/tailwindcss/src/css-parser.ts
index c12c63051..0896881e6 100644
--- a/packages/tailwindcss/src/css-parser.ts
+++ b/packages/tailwindcss/src/css-parser.ts
@@ -9,6 +9,8 @@ import {
   type Declaration,
   type Rule,
 } from './ast'
+import { createLineTable } from './source-maps/line-table'
+import type { Source, SourceLocation } from './source-maps/source'
 
 const BACKSLASH = 0x5c
 const SLASH = 0x2f
@@ -18,6 +20,7 @@ const SINGLE_QUOTE = 0x27
 const COLON = 0x3a
 const SEMICOLON = 0x3b
 const LINE_BREAK = 0x0a
+const CARRIAGE_RETURN = 0xd
 const SPACE = 0x20
 const TAB = 0x09
 const OPEN_CURLY = 0x7b
@@ -30,8 +33,41 @@ const DASH = 0x2d
 const AT_SIGN = 0x40
 const EXCLAMATION_MARK = 0x21
 
-export function parse(input: string) {
-  input = input.replaceAll('\r\n', '\n')
+export interface ParseOptions {
+  from?: string
+}
+
+/**
+ * CSS syntax error with source location information.
+ */
+export class CssSyntaxError extends Error {
+  loc: SourceLocation | null
+
+  constructor(message: string, loc: SourceLocation | null) {
+    if (loc) {
+      let source = loc[0]
+      let start = createLineTable(source.code).find(loc[1])
+      message = `${source.file}:${start.line}:${start.column + 1}: ${message}`
+    }
+
+    super(message)
+
+    this.name = 'CssSyntaxError'
+    this.loc = loc
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, CssSyntaxError)
+    }
+  }
+}
+
+export function parse(input: string, opts?: ParseOptions) {
+  let source: Source | null = opts?.from ? { file: opts.from, code: input } : null
+
+  // Note: it is important that any transformations of the input string
+  // *before* processing do NOT change the length of the string. This
+  // would invalidate the mechanism used to track source locations.
+  if (input[0] === '\uFEFF') input = ' ' + input.slice(1)
 
   let ast: AstNode[] = []
   let licenseComments: Comment[] = []
@@ -44,11 +80,22 @@ export function parse(input: string) {
   let buffer = ''
   let closingBracketStack = ''
 
+  // The start of the first non-whitespace character in the buffer
+  let bufferStart = 0
+
   let peekChar
 
   for (let i = 0; i < input.length; i++) {
     let currentChar = input.charCodeAt(i)
 
+    // Skip over the CR in CRLF. This allows code below to only check for a line
+    // break even if we're looking at a Windows newline. Peeking the input still
+    // has to check for CRLF but that happens less often.
+    if (currentChar === CARRIAGE_RETURN) {
+      peekChar = input.charCodeAt(i + 1)
+      if (peekChar === LINE_BREAK) continue
+    }
+
     // Current character is a `\` therefore the next character is escaped,
     // consume it together with the next character and continue.
     //
@@ -60,6 +107,7 @@ export function parse(input: string) {
     // ```
     //
     if (currentChar === BACKSLASH) {
+      if (buffer === '') bufferStart = i
       buffer += input.slice(i, i + 2)
       i += 1
     }
@@ -80,19 +128,24 @@ export function parse(input: string) {
     //         ^^^^^^^^^^^^^
     // }
     // ```
+    //
+    // The escape character `\` in comments are ignored, this means that a
+    // the end of a comment preceded by `\` does _not_ mean that the end of the
+    // comment is escaped and therefore we have to keep parsing.
+    //
+    // This is a valid comment:
+    // ```
+    // /*C:\*/
+    // ```
+    // See: https://www.w3.org/TR/css-syntax-3/#consume-comment
     else if (currentChar === SLASH && input.charCodeAt(i + 1) === ASTERISK) {
       let start = i
 
       for (let j = i + 2; j < input.length; j++) {
         peekChar = input.charCodeAt(j)
 
-        // Current character is a `\` therefore the next character is escaped.
-        if (peekChar === BACKSLASH) {
-          j += 1
-        }
-
-        // End of the comment
-        else if (peekChar === ASTERISK && input.charCodeAt(j + 1) === SLASH) {
+        // End of the comment.
+        if (peekChar === ASTERISK && input.charCodeAt(j + 1) === SLASH) {
           i = j + 1
           break
         }
@@ -103,73 +156,23 @@ export function parse(input: string) {
       // Collect all license comments so that we can hoist them to the top of
       // the AST.
       if (commentString.charCodeAt(2) === EXCLAMATION_MARK) {
-        licenseComments.push(comment(commentString.slice(2, -2)))
+        let node = comment(commentString.slice(2, -2))
+        licenseComments.push(node)
+
+        if (source) {
+          node.src = [source, start, i + 1]
+          node.dst = [source, start, i + 1]
+        }
       }
     }
 
     // Start of a string.
     else if (currentChar === SINGLE_QUOTE || currentChar === DOUBLE_QUOTE) {
-      let start = i
-
-      // We need to ensure that the closing quote is the same as the opening
-      // quote.
-      //
-      // E.g.:
-      //
-      // ```css
-      // .foo {
-      //   content: "This is a string with a 'quote' in it";
-      //                                     ^     ^         -> These are not the end of the string.
-      // }
-      // ```
-      for (let j = i + 1; j < input.length; j++) {
-        peekChar = input.charCodeAt(j)
-        // Current character is a `\` therefore the next character is escaped.
-        if (peekChar === BACKSLASH) {
-          j += 1
-        }
-
-        // End of the string.
-        else if (peekChar === currentChar) {
-          i = j
-          break
-        }
-
-        // End of the line without ending the string but with a `;` at the end.
-        //
-        // E.g.:
-        //
-        // ```css
-        // .foo {
-        //   content: "This is a string with a;
-        //                                    ^ Missing "
-        // }
-        // ```
-        else if (peekChar === SEMICOLON && input.charCodeAt(j + 1) === LINE_BREAK) {
-          throw new Error(
-            `Unterminated string: ${input.slice(start, j + 1) + String.fromCharCode(currentChar)}`,
-          )
-        }
-
-        // End of the line without ending the string.
-        //
-        // E.g.:
-        //
-        // ```css
-        // .foo {
-        //   content: "This is a string with a
-        //                                    ^ Missing "
-        // }
-        // ```
-        else if (peekChar === LINE_BREAK) {
-          throw new Error(
-            `Unterminated string: ${input.slice(start, j) + String.fromCharCode(currentChar)}`,
-          )
-        }
-      }
+      let end = parseString(input, i, currentChar, source)
 
       // Adjust `buffer` to include the string.
-      buffer += input.slice(start, i + 1)
+      buffer += input.slice(i, end + 1)
+      i = end
     }
 
     // Skip whitespace if the next character is also whitespace. This allows us
@@ -177,7 +180,12 @@ export function parse(input: string) {
     else if (
       (currentChar === SPACE || currentChar === LINE_BREAK || currentChar === TAB) &&
       (peekChar = input.charCodeAt(i + 1)) &&
-      (peekChar === SPACE || peekChar === LINE_BREAK || peekChar === TAB)
+      (peekChar === SPACE ||
+        peekChar === LINE_BREAK ||
+        peekChar === TAB ||
+        (peekChar === CARRIAGE_RETURN &&
+          (peekChar = input.charCodeAt(i + 2)) &&
+          peekChar == LINE_BREAK))
     ) {
       continue
     }
@@ -212,17 +220,18 @@ export function parse(input: string) {
           j += 1
         }
 
+        // Start of a string.
+        else if (peekChar === SINGLE_QUOTE || peekChar === DOUBLE_QUOTE) {
+          j = parseString(input, j, peekChar, source)
+        }
+
         // Start of a comment.
         else if (peekChar === SLASH && input.charCodeAt(j + 1) === ASTERISK) {
           for (let k = j + 2; k < input.length; k++) {
             peekChar = input.charCodeAt(k)
-            // Current character is a `\` therefore the next character is escaped.
-            if (peekChar === BACKSLASH) {
-              k += 1
-            }
 
-            // End of the comment
-            else if (peekChar === ASTERISK && input.charCodeAt(k + 1) === SLASH) {
+            // End of the comment.
+            if (peekChar === ASTERISK && input.charCodeAt(k + 1) === SLASH) {
               j = k + 1
               break
             }
@@ -286,6 +295,18 @@ export function parse(input: string) {
       }
 
       let declaration = parseDeclaration(buffer, colonIdx)
+      if (!declaration) {
+        throw new CssSyntaxError(
+          `Invalid custom property, expected a value`,
+          source ? [source, start, i] : null,
+        )
+      }
+
+      if (source) {
+        declaration.src = [source, start, i]
+        declaration.dst = [source, start, i]
+      }
+
       if (parent) {
         parent.nodes.push(declaration)
       } else {
@@ -306,6 +327,11 @@ export function parse(input: string) {
     else if (currentChar === SEMICOLON && buffer.charCodeAt(0) === AT_SIGN) {
       node = parseAtRule(buffer)
 
+      if (source) {
+        node.src = [source, bufferStart, i]
+        node.dst = [source, bufferStart, i]
+      }
+
       // At-rule is nested inside of a rule, attach it to the parent.
       if (parent) {
         parent.nodes.push(node)
@@ -337,6 +363,19 @@ export function parse(input: string) {
       closingBracketStack[closingBracketStack.length - 1] !== ')'
     ) {
       let declaration = parseDeclaration(buffer)
+      if (!declaration) {
+        if (buffer.length === 0) continue
+        throw new CssSyntaxError(
+          `Invalid declaration: \`${buffer.trim()}\``,
+          source ? [source, bufferStart, i] : null,
+        )
+      }
+
+      if (source) {
+        declaration.src = [source, bufferStart, i]
+        declaration.dst = [source, bufferStart, i]
+      }
+
       if (parent) {
         parent.nodes.push(declaration)
       } else {
@@ -356,6 +395,12 @@ export function parse(input: string) {
       // At this point `buffer` should resemble a selector or an at-rule.
       node = rule(buffer.trim())
 
+      // Track the source location for source maps
+      if (source) {
+        node.src = [source, bufferStart, i]
+        node.dst = [source, bufferStart, i]
+      }
+
       // Attach the rule to the parent in case it's nested.
       if (parent) {
         parent.nodes.push(node)
@@ -380,7 +425,7 @@ export function parse(input: string) {
       closingBracketStack[closingBracketStack.length - 1] !== ')'
     ) {
       if (closingBracketStack === '') {
-        throw new Error('Missing opening {')
+        throw new CssSyntaxError('Missing opening {', source ? [source, i, i] : null)
       }
 
       closingBracketStack = closingBracketStack.slice(0, -1)
@@ -402,6 +447,12 @@ export function parse(input: string) {
         if (buffer.charCodeAt(0) === AT_SIGN) {
           node = parseAtRule(buffer)
 
+          // Track the source location for source maps
+          if (source) {
+            node.src = [source, bufferStart, i]
+            node.dst = [source, bufferStart, i]
+          }
+
           // At-rule is nested inside of a rule, attach it to the parent.
           if (parent) {
             parent.nodes.push(node)
@@ -435,7 +486,20 @@ export function parse(input: string) {
 
           // Attach the declaration to the parent.
           if (parent) {
-            parent.nodes.push(parseDeclaration(buffer, colonIdx))
+            let node = parseDeclaration(buffer, colonIdx)
+            if (!node) {
+              throw new CssSyntaxError(
+                `Invalid declaration: \`${buffer.trim()}\``,
+                source ? [source, bufferStart, i] : null,
+              )
+            }
+
+            if (source) {
+              node.src = [source, bufferStart, i]
+              node.dst = [source, bufferStart, i]
+            }
+
+            parent.nodes.push(node)
           }
         }
       }
@@ -467,7 +531,7 @@ export function parse(input: string) {
     // `)`
     else if (currentChar === CLOSE_PAREN) {
       if (closingBracketStack[closingBracketStack.length - 1] !== ')') {
-        throw new Error('Missing opening (')
+        throw new CssSyntaxError('Missing opening (', source ? [source, i, i] : null)
       }
 
       closingBracketStack = closingBracketStack.slice(0, -1)
@@ -484,6 +548,8 @@ export function parse(input: string) {
         continue
       }
 
+      if (buffer === '') bufferStart = i
+
       buffer += String.fromCharCode(currentChar)
     }
   }
@@ -492,17 +558,32 @@ export function parse(input: string) {
   // means that we have an at-rule that is not terminated with a semicolon at
   // the end of the input.
   if (buffer.charCodeAt(0) === AT_SIGN) {
-    ast.push(parseAtRule(buffer))
+    let node = parseAtRule(buffer)
+
+    // Track the source location for source maps
+    if (source) {
+      node.src = [source, bufferStart, input.length]
+      node.dst = [source, bufferStart, input.length]
+    }
+
+    ast.push(node)
   }
 
   // When we are done parsing then everything should be balanced. If we still
   // have a leftover `parent`, then it means that we have an unterminated block.
   if (closingBracketStack.length > 0 && parent) {
     if (parent.kind === 'rule') {
-      throw new Error(`Missing closing } at ${parent.selector}`)
+      throw new CssSyntaxError(
+        `Missing closing } at ${parent.selector}`,
+        parent.src ? [parent.src[0], parent.src[1], parent.src[1]] : null,
+      )
     }
+
     if (parent.kind === 'at-rule') {
-      throw new Error(`Missing closing } at ${parent.name} ${parent.params}`)
+      throw new CssSyntaxError(
+        `Missing closing } at ${parent.name} ${parent.params}`,
+        parent.src ? [parent.src[0], parent.src[1], parent.src[1]] : null,
+      )
     }
   }
 
@@ -514,6 +595,9 @@ export function parse(input: string) {
 }
 
 export function parseAtRule(buffer: string, nodes: AstNode[] = []): AtRule {
+  let name = buffer
+  let params = ''
+
   // Assumption: The smallest at-rule in CSS right now is `@page`, this means
   //             that we can always skip the first 5 characters and start at the
   //             sixth (at index 5).
@@ -533,17 +617,21 @@ export function parseAtRule(buffer: string, nodes: AstNode[] = []): AtRule {
   // behavior if necessary.
   for (let i = 5 /* '@page'.length */; i < buffer.length; i++) {
     let currentChar = buffer.charCodeAt(i)
-    if (currentChar === SPACE || currentChar === OPEN_PAREN) {
-      let name = buffer.slice(0, i).trim()
-      let params = buffer.slice(i).trim()
-      return atRule(name, params, nodes)
+    if (currentChar === SPACE || currentChar === TAB || currentChar === OPEN_PAREN) {
+      name = buffer.slice(0, i)
+      params = buffer.slice(i)
+      break
     }
   }
 
-  return atRule(buffer.trim(), '', nodes)
+  return atRule(name.trim(), params.trim(), nodes)
 }
 
-function parseDeclaration(buffer: string, colonIdx: number = buffer.indexOf(':')): Declaration {
+function parseDeclaration(
+  buffer: string,
+  colonIdx: number = buffer.indexOf(':'),
+): Declaration | null {
+  if (colonIdx === -1) return null
   let importantIdx = buffer.indexOf('!important', colonIdx + 1)
   return decl(
     buffer.slice(0, colonIdx).trim(),
@@ -551,3 +639,80 @@ function parseDeclaration(buffer: string, colonIdx: number = buffer.indexOf(':')
     importantIdx !== -1,
   )
 }
+
+function parseString(
+  input: string,
+  startIdx: number,
+  quoteChar: number,
+  source: Source | null = null,
+): number {
+  let peekChar: number
+
+  // We need to ensure that the closing quote is the same as the opening
+  // quote.
+  //
+  // E.g.:
+  //
+  // ```css
+  // .foo {
+  //   content: "This is a string with a 'quote' in it";
+  //                                     ^     ^         -> These are not the end of the string.
+  // }
+  // ```
+  for (let i = startIdx + 1; i < input.length; i++) {
+    peekChar = input.charCodeAt(i)
+
+    // Current character is a `\` therefore the next character is escaped.
+    if (peekChar === BACKSLASH) {
+      i += 1
+    }
+
+    // End of the string.
+    else if (peekChar === quoteChar) {
+      return i
+    }
+
+    // End of the line without ending the string but with a `;` at the end.
+    //
+    // E.g.:
+    //
+    // ```css
+    // .foo {
+    //   content: "This is a string with a;
+    //                                    ^ Missing "
+    // }
+    // ```
+    else if (
+      peekChar === SEMICOLON &&
+      (input.charCodeAt(i + 1) === LINE_BREAK ||
+        (input.charCodeAt(i + 1) === CARRIAGE_RETURN && input.charCodeAt(i + 2) === LINE_BREAK))
+    ) {
+      throw new CssSyntaxError(
+        `Unterminated string: ${input.slice(startIdx, i + 1) + String.fromCharCode(quoteChar)}`,
+        source ? [source, startIdx, i + 1] : null,
+      )
+    }
+
+    // End of the line without ending the string.
+    //
+    // E.g.:
+    //
+    // ```css
+    // .foo {
+    //   content: "This is a string with a
+    //                                    ^ Missing "
+    // }
+    // ```
+    else if (
+      peekChar === LINE_BREAK ||
+      (peekChar === CARRIAGE_RETURN && input.charCodeAt(i + 1) === LINE_BREAK)
+    ) {
+      throw new CssSyntaxError(
+        `Unterminated string: ${input.slice(startIdx, i) + String.fromCharCode(quoteChar)}`,
+        source ? [source, startIdx, i + 1] : null,
+      )
+    }
+  }
+
+  return startIdx
+}
diff --git a/packages/tailwindcss/src/design-system.ts b/packages/tailwindcss/src/design-system.ts
index c5844b080..7786790f6 100644
--- a/packages/tailwindcss/src/design-system.ts
+++ b/packages/tailwindcss/src/design-system.ts
@@ -1,12 +1,36 @@
-import { optimizeAst, toCss } from './ast'
-import { parseCandidate, parseVariant, type Candidate, type Variant } from './candidate'
+import { Polyfills } from '.'
+import { optimizeAst, toCss, type AstNode } from './ast'
+import {
+  parseCandidate,
+  parseVariant,
+  printCandidate,
+  printVariant,
+  type Candidate,
+  type Variant,
+} from './candidate'
 import { compileAstNodes, compileCandidates } from './compile'
-import { getClassList, getVariants, type ClassEntry, type VariantEntry } from './intellisense'
+import { substituteFunctions } from './css-functions'
+import {
+  canonicalizeCandidates,
+  getClassList,
+  getVariants,
+  type CanonicalizeOptions,
+  type ClassEntry,
+  type VariantEntry,
+} from './intellisense'
 import { getClassOrder } from './sort'
-import type { Theme, ThemeKey } from './theme'
+import type { SourceLocation } from './source-maps/source'
+import { Theme, ThemeOptions, type ThemeKey } from './theme'
 import { Utilities, createUtilities, withAlpha } from './utilities'
 import { DefaultMap } from './utils/default-map'
-import { Variants, createVariants } from './variants'
+import { extractUsedVariables } from './utils/variables'
+import { Variants, createVariants, substituteAtVariant } from './variants'
+import { WalkAction, walk } from './walk'
+
+export const enum CompileAstFlags {
+  None = 0,
+  RespectImportant = 1 << 0,
+}
 
 export type DesignSystem = {
   theme: Theme
@@ -24,26 +48,108 @@ export type DesignSystem = {
 
   parseCandidate(candidate: string): Readonly<Candidate>[]
   parseVariant(variant: string): Readonly<Variant> | null
-  compileAstNodes(candidate: Candidate): ReturnType<typeof compileAstNodes>
+  compileAstNodes(candidate: Candidate, flags?: CompileAstFlags): ReturnType<typeof compileAstNodes>
+
+  printCandidate(candidate: Candidate): string
+  printVariant(variant: Variant): string
 
   getVariantOrder(): Map<Variant, number>
-  resolveThemeValue(path: string): string | undefined
+  resolveThemeValue(path: string, forceInline?: boolean): string | undefined
+
+  trackUsedVariables(raw: string): void
+  canonicalizeCandidates(candidates: string[], options?: CanonicalizeOptions): string[]
 
   // Used by IntelliSense
   candidatesToCss(classes: string[]): (string | null)[]
+  candidatesToAst(classes: string[]): AstNode[][]
+
+  // General purpose storage
+  storage: Record<symbol, unknown>
 }
 
-export function buildDesignSystem(theme: Theme): DesignSystem {
+export function buildDesignSystem(
+  theme: Theme,
+  utilitiesSrc?: SourceLocation | undefined,
+): DesignSystem {
   let utilities = createUtilities(theme)
   let variants = createVariants(theme)
 
   let parsedVariants = new DefaultMap((variant) => parseVariant(variant, designSystem))
+  let cachedVariantOrder: Map<Variant, number> | null = null
+  let cachedVariantOrderSize = -1
   let parsedCandidates = new DefaultMap((candidate) =>
     Array.from(parseCandidate(candidate, designSystem)),
   )
-  let compiledAstNodes = new DefaultMap<Candidate>((candidate) =>
-    compileAstNodes(candidate, designSystem),
-  )
+
+  let compiledAstNodes = new DefaultMap<number>((flags) => {
+    return new DefaultMap<Candidate>((candidate) => {
+      let ast = compileAstNodes(candidate, designSystem, flags)
+
+      try {
+        let nodes = ast.map((value) => value.node)
+
+        // Arbitrary values (`text-[theme(--color-red-500)]`) and arbitrary
+        // properties (`[--my-var:theme(--color-red-500)]`) can contain function
+        // calls so we need evaluate any functions we find there that weren't in
+        // the source CSS.
+        substituteFunctions(nodes, designSystem)
+
+        // JS plugins might contain an `@variant` inside a generated utility
+        substituteAtVariant(nodes, designSystem)
+      } catch (err) {
+        // If substitution fails then the candidate likely contains a call to
+        // `theme()` that is invalid which may be because of incorrect usage,
+        // invalid arguments, or a theme key that does not exist.
+        return []
+      }
+
+      return ast
+    })
+  })
+
+  let trackUsedVariables = new DefaultMap((raw) => {
+    for (let variable of extractUsedVariables(raw)) {
+      theme.markUsedVariable(variable)
+    }
+  })
+
+  function candidatesToAst(classes: string[]): AstNode[][] {
+    let result: AstNode[][] = []
+
+    for (let className of classes) {
+      let wasValid = true
+
+      let { astNodes } = compileCandidates([className], designSystem, {
+        onInvalidCandidate() {
+          wasValid = false
+        },
+      })
+
+      if (utilitiesSrc) {
+        walk(astNodes, (node) => {
+          // We do this conditionally to preserve source locations from both
+          // `@utility` and `@custom-variant`. Even though generated nodes are
+          // cached this should be fine because `utilitiesNode.src` should not
+          // change without a full rebuild which destroys the cache.
+          node.src ??= utilitiesSrc
+          return WalkAction.Continue
+        })
+      }
+
+      // Disable all polyfills to not unnecessarily pollute IntelliSense output
+      astNodes = optimizeAst(astNodes, designSystem, Polyfills.None)
+
+      result.push(wasValid ? astNodes : [])
+    }
+
+    return result
+  }
+
+  function candidatesToCss(classes: string[]): (string | null)[] {
+    return candidatesToAst(classes).map((nodes) => {
+      return nodes.length > 0 ? toCss(nodes) : null
+    })
+  }
 
   let designSystem: DesignSystem = {
     theme,
@@ -53,29 +159,8 @@ export function buildDesignSystem(theme: Theme): DesignSystem {
     invalidCandidates: new Set(),
     important: false,
 
-    candidatesToCss(classes: string[]) {
-      let result: (string | null)[] = []
-
-      for (let className of classes) {
-        let wasInvalid = false
-
-        let { astNodes } = compileCandidates([className], this, {
-          onInvalidCandidate() {
-            wasInvalid = true
-          },
-        })
-
-        astNodes = optimizeAst(astNodes)
-
-        if (astNodes.length === 0 || wasInvalid) {
-          result.push(null)
-        } else {
-          result.push(toCss(astNodes))
-        }
-      }
-
-      return result
-    },
+    candidatesToCss,
+    candidatesToAst,
 
     getClassOrder(classes) {
       return getClassOrder(this, classes)
@@ -93,10 +178,23 @@ export function buildDesignSystem(theme: Theme): DesignSystem {
     parseVariant(variant: string) {
       return parsedVariants.get(variant)
     },
-    compileAstNodes(candidate: Candidate) {
-      return compiledAstNodes.get(candidate)
+    compileAstNodes(candidate: Candidate, flags = CompileAstFlags.RespectImportant) {
+      return compiledAstNodes.get(flags).get(candidate)
     },
+
+    printCandidate(candidate: Candidate) {
+      return printCandidate(designSystem, candidate)
+    },
+    printVariant(variant: Variant) {
+      return printVariant(variant)
+    },
+
     getVariantOrder() {
+      // parsedVariants only grows, so the cache should be reset only when the size changes
+      if (cachedVariantOrder !== null && cachedVariantOrderSize === parsedVariants.size) {
+        return cachedVariantOrder
+      }
+
       let variants = Array.from(parsedVariants.values())
       variants.sort((a, z) => this.variants.compare(a, z))
 
@@ -118,10 +216,13 @@ export function buildDesignSystem(theme: Theme): DesignSystem {
         prevVariant = variant
       }
 
+      cachedVariantOrder = order
+      cachedVariantOrderSize = parsedVariants.size
+
       return order
     },
 
-    resolveThemeValue(path: `${ThemeKey}` | `${ThemeKey}${string}`) {
+    resolveThemeValue(path: `${ThemeKey}` | `${ThemeKey}${string}`, forceInline: boolean = true) {
       // Extract an eventual modifier from the path. e.g.:
       // - "--color-red-500 / 50%" -> "50%"
       let lastSlash = path.lastIndexOf('/')
@@ -131,7 +232,9 @@ export function buildDesignSystem(theme: Theme): DesignSystem {
         path = path.slice(0, lastSlash).trim() as ThemeKey
       }
 
-      let themeValue = theme.get([path]) ?? undefined
+      let themeValue =
+        theme.resolve(null, [path], forceInline ? ThemeOptions.INLINE : ThemeOptions.NONE) ??
+        undefined
 
       // Apply the opacity modifier if present
       if (modifier && themeValue) {
@@ -140,6 +243,18 @@ export function buildDesignSystem(theme: Theme): DesignSystem {
 
       return themeValue
     },
+
+    trackUsedVariables(raw: string) {
+      trackUsedVariables.get(raw)
+    },
+
+    canonicalizeCandidates(candidates: string[], options?: CanonicalizeOptions) {
+      return canonicalizeCandidates(this, candidates, options)
+    },
+
+    // General purpose storage, each key has to be a unique symbol to avoid
+    // collisions.
+    storage: {},
   }
 
   return designSystem
diff --git a/packages/tailwindcss/src/expand-declaration.test.ts b/packages/tailwindcss/src/expand-declaration.test.ts
new file mode 100644
index 000000000..eb3d5ffb2
--- /dev/null
+++ b/packages/tailwindcss/src/expand-declaration.test.ts
@@ -0,0 +1,629 @@
+import { describe, expect, test } from 'vitest'
+import { toCss } from './ast'
+import { SignatureFeatures } from './canonicalize-candidates'
+import { parse } from './css-parser'
+import { expandDeclaration } from './expand-declaration'
+import { walk, WalkAction } from './walk'
+
+const css = String.raw
+
+function expand(input: string, options: SignatureFeatures): string {
+  let ast = parse(input)
+
+  walk(ast, (node) => {
+    if (node.kind === 'declaration') {
+      let result = expandDeclaration(node, options)
+      if (result) return WalkAction.ReplaceSkip(result)
+    }
+  })
+
+  return toCss(ast)
+}
+
+describe('expand declarations', () => {
+  let options = SignatureFeatures.ExpandProperties
+
+  test('inset', () => {
+    let input = css`
+      .one {
+        inset: 10px;
+      }
+
+      .two {
+        inset: 10px 20px;
+      }
+
+      .three {
+        inset: 10px 20px 30px;
+      }
+
+      .four {
+        inset: 10px 20px 30px 40px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".one {
+        top: 10px;
+        right: 10px;
+        bottom: 10px;
+        left: 10px;
+      }
+      .two {
+        top: 10px;
+        right: 20px;
+        bottom: 10px;
+        left: 20px;
+      }
+      .three {
+        top: 10px;
+        right: 20px;
+        bottom: 30px;
+        left: 20px;
+      }
+      .four {
+        top: 10px;
+        right: 20px;
+        bottom: 30px;
+        left: 40px;
+      }
+      "
+    `)
+  })
+
+  test('gap', () => {
+    let input = css`
+      .one {
+        gap: 10px;
+      }
+
+      .two {
+        gap: 10px 20px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".one {
+        row-gap: 10px;
+        column-gap: 10px;
+      }
+      .two {
+        row-gap: 10px;
+        column-gap: 20px;
+      }
+      "
+    `)
+  })
+
+  test('border-width', () => {
+    let input = css`
+      .one {
+        border-width: 1px;
+      }
+
+      .two {
+        border-width: 1px 2px;
+      }
+
+      .three {
+        border-width: 1px 2px 3px;
+      }
+
+      .four {
+        border-width: 1px 2px 3px 4px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".one {
+        border-top-width: 1px;
+        border-right-width: 1px;
+        border-bottom-width: 1px;
+        border-left-width: 1px;
+      }
+      .two {
+        border-top-width: 1px;
+        border-right-width: 2px;
+        border-bottom-width: 1px;
+        border-left-width: 2px;
+      }
+      .three {
+        border-top-width: 1px;
+        border-right-width: 2px;
+        border-bottom-width: 3px;
+        border-left-width: 2px;
+      }
+      .four {
+        border-top-width: 1px;
+        border-right-width: 2px;
+        border-bottom-width: 3px;
+        border-left-width: 4px;
+      }
+      "
+    `)
+  })
+
+  test('border-style', () => {
+    let input = css`
+      .one {
+        border-style: solid;
+      }
+
+      .two {
+        border-style: solid dashed;
+      }
+
+      .three {
+        border-style: solid dashed dotted;
+      }
+
+      .four {
+        border-style: solid dashed dotted double;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".one {
+        border-top-style: solid;
+        border-right-style: solid;
+        border-bottom-style: solid;
+        border-left-style: solid;
+      }
+      .two {
+        border-top-style: solid;
+        border-right-style: dashed;
+        border-bottom-style: solid;
+        border-left-style: dashed;
+      }
+      .three {
+        border-top-style: solid;
+        border-right-style: dashed;
+        border-bottom-style: dotted;
+        border-left-style: dashed;
+      }
+      .four {
+        border-top-style: solid;
+        border-right-style: dashed;
+        border-bottom-style: dotted;
+        border-left-style: double;
+      }
+      "
+    `)
+  })
+
+  test('border-color', () => {
+    let input = css`
+      .one {
+        border-color: red;
+      }
+
+      .two {
+        border-color: red green;
+      }
+
+      .three {
+        border-color: red green blue;
+      }
+
+      .four {
+        border-color: red green blue black;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".one {
+        border-top-color: red;
+        border-right-color: red;
+        border-bottom-color: red;
+        border-left-color: red;
+      }
+      .two {
+        border-top-color: red;
+        border-right-color: green;
+        border-bottom-color: red;
+        border-left-color: green;
+      }
+      .three {
+        border-top-color: red;
+        border-right-color: green;
+        border-bottom-color: blue;
+        border-left-color: green;
+      }
+      .four {
+        border-top-color: red;
+        border-right-color: green;
+        border-bottom-color: blue;
+        border-left-color: black;
+      }
+      "
+    `)
+  })
+
+  test('scroll-margin', () => {
+    let input = css`
+      .one {
+        scroll-margin: 1px;
+      }
+
+      .two {
+        scroll-margin: 1px 2px;
+      }
+
+      .three {
+        scroll-margin: 1px 2px 3px;
+      }
+
+      .four {
+        scroll-margin: 1px 2px 3px 4px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".one {
+        scroll-margin-top: 1px;
+        scroll-margin-right: 1px;
+        scroll-margin-bottom: 1px;
+        scroll-margin-left: 1px;
+      }
+      .two {
+        scroll-margin-top: 1px;
+        scroll-margin-right: 2px;
+        scroll-margin-bottom: 1px;
+        scroll-margin-left: 2px;
+      }
+      .three {
+        scroll-margin-top: 1px;
+        scroll-margin-right: 2px;
+        scroll-margin-bottom: 3px;
+        scroll-margin-left: 2px;
+      }
+      .four {
+        scroll-margin-top: 1px;
+        scroll-margin-right: 2px;
+        scroll-margin-bottom: 3px;
+        scroll-margin-left: 4px;
+      }
+      "
+    `)
+  })
+
+  test('scroll-padding', () => {
+    let input = css`
+      .one {
+        scroll-padding: 1px;
+      }
+
+      .two {
+        scroll-padding: 1px 2px;
+      }
+
+      .three {
+        scroll-padding: 1px 2px 3px;
+      }
+
+      .four {
+        scroll-padding: 1px 2px 3px 4px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".one {
+        scroll-padding-top: 1px;
+        scroll-padding-right: 1px;
+        scroll-padding-bottom: 1px;
+        scroll-padding-left: 1px;
+      }
+      .two {
+        scroll-padding-top: 1px;
+        scroll-padding-right: 2px;
+        scroll-padding-bottom: 1px;
+        scroll-padding-left: 2px;
+      }
+      .three {
+        scroll-padding-top: 1px;
+        scroll-padding-right: 2px;
+        scroll-padding-bottom: 3px;
+        scroll-padding-left: 2px;
+      }
+      .four {
+        scroll-padding-top: 1px;
+        scroll-padding-right: 2px;
+        scroll-padding-bottom: 3px;
+        scroll-padding-left: 4px;
+      }
+      "
+    `)
+  })
+
+  test('overflow', () => {
+    let input = css`
+      .one {
+        overflow: clip;
+      }
+
+      .two {
+        overflow: hidden visible;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".one {
+        overflow-x: clip;
+        overflow-y: clip;
+      }
+      .two {
+        overflow-x: hidden;
+        overflow-y: visible;
+      }
+      "
+    `)
+  })
+
+  test('overscroll-behavior', () => {
+    let input = css`
+      .one {
+        overscroll-behavior: none;
+      }
+
+      .two {
+        overscroll-behavior: auto contain;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".one {
+        overscroll-behavior-x: none;
+        overscroll-behavior-y: none;
+      }
+      .two {
+        overscroll-behavior-x: auto;
+        overscroll-behavior-y: contain;
+      }
+      "
+    `)
+  })
+
+  test('expansion with `!important`', () => {
+    let input = css`
+      .one {
+        inset: 10px;
+      }
+
+      .two {
+        inset: 10px 20px;
+      }
+
+      .three {
+        inset: 10px 20px 30px !important;
+      }
+
+      .four {
+        inset: 10px 20px 30px 40px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".one {
+        top: 10px;
+        right: 10px;
+        bottom: 10px;
+        left: 10px;
+      }
+      .two {
+        top: 10px;
+        right: 20px;
+        bottom: 10px;
+        left: 20px;
+      }
+      .three {
+        top: 10px !important;
+        right: 20px !important;
+        bottom: 30px !important;
+        left: 20px !important;
+      }
+      .four {
+        top: 10px;
+        right: 20px;
+        bottom: 30px;
+        left: 40px;
+      }
+      "
+    `)
+  })
+})
+
+describe('expand logical properties', () => {
+  let options = SignatureFeatures.ExpandProperties | SignatureFeatures.LogicalToPhysical
+
+  test('margin-inline', () => {
+    let input = css`
+      .example {
+        margin-inline: 10px 20px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".example {
+        margin-left: 10px;
+        margin-right: 20px;
+      }
+      "
+    `)
+  })
+
+  test('margin-block', () => {
+    let input = css`
+      .example {
+        margin-block: 10px 20px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".example {
+        margin-top: 10px;
+        margin-bottom: 20px;
+      }
+      "
+    `)
+  })
+
+  test('padding-inline', () => {
+    let input = css`
+      .example {
+        padding-inline: 10px 20px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".example {
+        padding-left: 10px;
+        padding-right: 20px;
+      }
+      "
+    `)
+  })
+
+  test('padding-block', () => {
+    let input = css`
+      .example {
+        padding-block: 10px 20px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".example {
+        padding-top: 10px;
+        padding-bottom: 20px;
+      }
+      "
+    `)
+  })
+
+  test('scroll-margin-inline', () => {
+    let input = css`
+      .example {
+        scroll-margin-inline: 10px 20px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".example {
+        scroll-margin-left: 10px;
+        scroll-margin-right: 20px;
+      }
+      "
+    `)
+  })
+
+  test('scroll-margin-block', () => {
+    let input = css`
+      .example {
+        scroll-margin-block: 10px 20px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".example {
+        scroll-margin-top: 10px;
+        scroll-margin-bottom: 20px;
+      }
+      "
+    `)
+  })
+
+  test('scroll-padding-inline', () => {
+    let input = css`
+      .example {
+        scroll-padding-inline: 10px 20px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".example {
+        scroll-padding-left: 10px;
+        scroll-padding-right: 20px;
+      }
+      "
+    `)
+  })
+
+  test('scroll-padding-block', () => {
+    let input = css`
+      .example {
+        scroll-padding-block: 10px 20px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".example {
+        scroll-padding-top: 10px;
+        scroll-padding-bottom: 20px;
+      }
+      "
+    `)
+  })
+
+  test('border-inline-width', () => {
+    let input = css`
+      .example {
+        border-inline-width: 1px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".example {
+        border-left-width: 1px;
+        border-right-width: 1px;
+      }
+      "
+    `)
+  })
+
+  test('border-block-width', () => {
+    let input = css`
+      .example {
+        border-block-width: 1px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".example {
+        border-bottom-width: 1px;
+        border-top-width: 1px;
+      }
+      "
+    `)
+  })
+
+  test('border-inline-style', () => {
+    let input = css`
+      .example {
+        border-inline-style: 1px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".example {
+        border-left-style: 1px;
+        border-right-style: 1px;
+      }
+      "
+    `)
+  })
+
+  test('border-block-style', () => {
+    let input = css`
+      .example {
+        border-block-style: 1px;
+      }
+    `
+
+    expect(expand(input, options)).toMatchInlineSnapshot(`
+      ".example {
+        border-bottom-style: 1px;
+        border-top-style: 1px;
+      }
+      "
+    `)
+  })
+})
diff --git a/packages/tailwindcss/src/expand-declaration.ts b/packages/tailwindcss/src/expand-declaration.ts
new file mode 100644
index 000000000..7cef98952
--- /dev/null
+++ b/packages/tailwindcss/src/expand-declaration.ts
@@ -0,0 +1,122 @@
+import { decl, type AstNode } from './ast'
+import { SignatureFeatures } from './canonicalize-candidates'
+import { segment } from './utils/segment'
+
+function createPrefixedQuad(
+  prefix: string,
+  t = 'top',
+  r = 'right',
+  b = 'bottom',
+  l = 'left',
+): Record<number, [prop: string, index: number][]> {
+  return createBareQuad(`${prefix}-${t}`, `${prefix}-${r}`, `${prefix}-${b}`, `${prefix}-${l}`)
+}
+
+// prettier-ignore
+function createBareQuad(t = 'top', r = 'right', b = 'bottom', l = 'left'): Record<number, [prop: string, index: number][]> {
+  return {
+    1: [[t, 0], [r, 0], [b, 0], [l, 0]],
+    2: [[t, 0], [r, 1], [b, 0], [l, 1]],
+    3: [[t, 0], [r, 1], [b, 2], [l, 1]],
+    4: [[t, 0], [r, 1], [b, 2], [l, 3]],
+  } as const;
+}
+
+// prettier-ignore
+function createPair(lhs: string, rhs: string): Record<number, [prop: string, index: number][]> {
+  return {
+    1: [[lhs, 0], [rhs, 0]],
+    2: [[lhs, 0], [rhs, 1]],
+  } as const;
+}
+
+// Depending on the length of the value, map to different properties
+let VARIADIC_EXPANSION_MAP: Record<string, Record<number, [prop: string, index: number][]>> = {
+  inset: createBareQuad(),
+  margin: createPrefixedQuad('margin'),
+  padding: createPrefixedQuad('padding'),
+  'scroll-margin': createPrefixedQuad('scroll-margin'),
+  'scroll-padding': createPrefixedQuad('scroll-padding'),
+  'border-width': createPrefixedQuad(
+    'border',
+    'top-width',
+    'right-width',
+    'bottom-width',
+    'left-width',
+  ),
+  'border-style': createPrefixedQuad(
+    'border',
+    'top-style',
+    'right-style',
+    'bottom-style',
+    'left-style',
+  ),
+  'border-color': createPrefixedQuad(
+    'border',
+    'top-color',
+    'right-color',
+    'bottom-color',
+    'left-color',
+  ),
+  gap: createPair('row-gap', 'column-gap'),
+  overflow: createPair('overflow-x', 'overflow-y'),
+  'overscroll-behavior': createPair('overscroll-behavior-x', 'overscroll-behavior-y'),
+}
+
+// Depending on the length of the value, map to different properties
+let VARIADIC_LOGICAL_EXPANSION_MAP: Record<
+  string,
+  Record<number, [prop: string, index: number][]>
+> = {
+  'inset-block': createPair('top', 'bottom'),
+  'inset-inline': createPair('left', 'right'),
+  'margin-block': createPair('margin-top', 'margin-bottom'),
+  'margin-inline': createPair('margin-left', 'margin-right'),
+  'padding-block': createPair('padding-top', 'padding-bottom'),
+  'padding-inline': createPair('padding-left', 'padding-right'),
+  'scroll-margin-block': createPair('scroll-margin-top', 'scroll-margin-bottom'),
+  'scroll-margin-inline': createPair('scroll-margin-left', 'scroll-margin-right'),
+  'scroll-padding-block': createPair('scroll-padding-top', 'scroll-padding-bottom'),
+  'scroll-padding-inline': createPair('scroll-padding-left', 'scroll-padding-right'),
+}
+
+// The entire value is mapped to each property
+let LOGICAL_EXPANSION_MAP: Record<string, string[]> = {
+  'border-block': ['border-bottom', 'border-top'],
+  'border-block-color': ['border-bottom-color', 'border-top-color'],
+  'border-block-style': ['border-bottom-style', 'border-top-style'],
+  'border-block-width': ['border-bottom-width', 'border-top-width'],
+  'border-inline': ['border-left', 'border-right'],
+  'border-inline-color': ['border-left-color', 'border-right-color'],
+  'border-inline-style': ['border-left-style', 'border-right-style'],
+  'border-inline-width': ['border-left-width', 'border-right-width'],
+}
+
+export function expandDeclaration(
+  node: Extract<AstNode, { kind: 'declaration' }>,
+  options: SignatureFeatures,
+): AstNode[] | null {
+  if (options & SignatureFeatures.LogicalToPhysical) {
+    if (node.property in VARIADIC_LOGICAL_EXPANSION_MAP) {
+      let args = segment(node.value!, ' ')
+      return VARIADIC_LOGICAL_EXPANSION_MAP[node.property][args.length]?.map(([prop, index]) => {
+        return decl(prop, args[index], node.important)
+      })
+    }
+
+    if (node.property in LOGICAL_EXPANSION_MAP) {
+      return LOGICAL_EXPANSION_MAP[node.property]?.map((prop) => {
+        return decl(prop, node.value!, node.important)
+      })
+    }
+  }
+
+  if (node.property in VARIADIC_EXPANSION_MAP) {
+    let args = segment(node.value!, ' ')
+    return VARIADIC_EXPANSION_MAP[node.property][args.length]?.map(([prop, index]) => {
+      return decl(prop, args[index], node.important)
+    })
+  }
+
+  return null
+}
diff --git a/packages/tailwindcss/src/feature-flags.ts b/packages/tailwindcss/src/feature-flags.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/tailwindcss/src/important.test.ts b/packages/tailwindcss/src/important.test.ts
index 8867062e8..a3c9447fc 100644
--- a/packages/tailwindcss/src/important.test.ts
+++ b/packages/tailwindcss/src/important.test.ts
@@ -1,29 +1,28 @@
 import { expect, test } from 'vitest'
-import { compile } from '.'
+import { run } from './test-utils/run'
 
 const css = String.raw
 
 test('Utilities can be wrapped in a selector', async () => {
   // This is the v4 equivalent of `important: "#app"` from v3
-  let input = css`
-    #app {
-      @tailwind utilities;
-    }
-  `
-
-  let compiler = await compile(input)
-
-  expect(compiler.build(['underline', 'hover:line-through'])).toMatchInlineSnapshot(`
-    "#app {
-      .underline {
-        text-decoration-line: underline;
-      }
-      .hover\\:line-through {
-        &:hover {
-          @media (hover: hover) {
-            text-decoration-line: line-through;
-          }
+  expect(
+    await run(
+      ['underline', 'hover:line-through'],
+      css`
+        #app {
+          @tailwind utilities;
         }
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    #app .underline {
+      text-decoration-line: underline;
+    }
+
+    @media (hover: hover) {
+      #app .hover\\:line-through:hover {
+        text-decoration-line: line-through;
       }
     }
     "
@@ -32,26 +31,29 @@ test('Utilities can be wrapped in a selector', async () => {
 
 test('Utilities can be marked with important', async () => {
   // This is the v4 equivalent of `important: true` from v3
-  let input = css`
-    @import 'tailwindcss/utilities' important;
-  `
-
-  let compiler = await compile(input, {
-    loadStylesheet: async (id: string, base: string) => ({
-      base,
-      content: '@tailwind utilities;',
-    }),
-  })
-
-  expect(compiler.build(['underline', 'hover:line-through'])).toMatchInlineSnapshot(`
-    ".underline {
+  expect(
+    await run(
+      ['underline', 'hover:line-through'],
+      css`
+        @import 'tailwindcss/utilities' important;
+      `,
+      {
+        loadStylesheet: async (_id: string, base: string) => ({
+          base,
+          content: '@tailwind utilities;',
+          path: '',
+        }),
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .underline {
       text-decoration-line: underline !important;
     }
-    .hover\\:line-through {
-      &:hover {
-        @media (hover: hover) {
-          text-decoration-line: line-through !important;
-        }
+
+    @media (hover: hover) {
+      .hover\\:line-through:hover {
+        text-decoration-line: line-through !important;
       }
     }
     "
@@ -61,29 +63,70 @@ test('Utilities can be marked with important', async () => {
 test('Utilities can be wrapped with a selector and marked as important', async () => {
   // This does not have a direct equivalent in v3 but works as a consequence of
   // the new APIs
-  let input = css`
-    @media important {
-      #app {
-        @tailwind utilities;
-      }
-    }
-  `
-
-  let compiler = await compile(input)
-
-  expect(compiler.build(['underline', 'hover:line-through'])).toMatchInlineSnapshot(`
-    "#app {
-      .underline {
-        text-decoration-line: underline !important;
-      }
-      .hover\\:line-through {
-        &:hover {
-          @media (hover: hover) {
-            text-decoration-line: line-through !important;
+  expect(
+    await run(
+      ['underline', 'hover:line-through'],
+      css`
+        @media important {
+          #app {
+            @tailwind utilities;
           }
         }
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    #app .underline {
+      text-decoration-line: underline !important;
+    }
+
+    @media (hover: hover) {
+      #app .hover\\:line-through:hover {
+        text-decoration-line: line-through !important;
       }
     }
     "
   `)
 })
+
+test('variables in utilities should not be marked as important', async () => {
+  expect(
+    await run(
+      ['ease-out!', 'z-10!'],
+      css`
+        @theme {
+          --ease-out: cubic-bezier(0, 0, 0.2, 1);
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-ease: initial;
+        }
+      }
+    }
+
+    :root, :host {
+      --ease-out: cubic-bezier(0, 0, .2, 1);
+    }
+
+    .z-10\\! {
+      z-index: 10 !important;
+    }
+
+    .ease-out\\! {
+      --tw-ease: var(--ease-out) !important;
+      transition-timing-function: var(--ease-out) !important;
+    }
+
+    @property --tw-ease {
+      syntax: "*";
+      inherits: false
+    }
+    "
+  `)
+})
diff --git a/packages/tailwindcss/src/index.bench.ts b/packages/tailwindcss/src/index.bench.ts
index fb9cd0e71..0ca33fde1 100644
--- a/packages/tailwindcss/src/index.bench.ts
+++ b/packages/tailwindcss/src/index.bench.ts
@@ -7,7 +7,7 @@ const root = process.env.FOLDER || process.cwd()
 const css = String.raw
 
 bench('compile', async () => {
-  let scanner = new Scanner({ sources: [{ base: root, pattern: '**/*' }] })
+  let scanner = new Scanner({ sources: [{ base: root, pattern: '**/*', negated: true }] })
   let candidates = scanner.scan()
 
   let { build } = await compile(css`
diff --git a/packages/tailwindcss/src/index.test.ts b/packages/tailwindcss/src/index.test.ts
index de59e08be..7f4a0eef3 100644
--- a/packages/tailwindcss/src/index.test.ts
+++ b/packages/tailwindcss/src/index.test.ts
@@ -1,17 +1,19 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import { describe, expect, it, test } from 'vitest'
-import { compile } from '.'
+import { compile, Features, Polyfills } from '.'
+import { cartesian } from './cartesian'
 import type { PluginAPI } from './compat/plugin-api'
 import plugin from './plugin'
-import { compileCss, optimizeCss, run } from './test-utils/run'
+import { compileCss, run } from './test-utils/run'
 
 const css = String.raw
 
 describe('compiling CSS', () => {
   test('`@tailwind utilities` is replaced with the generated utility classes', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['flex', 'md:grid', 'hover:underline', 'dark:bg-black'],
         css`
           @theme {
             --color-black: #000;
@@ -22,12 +24,11 @@ describe('compiling CSS', () => {
             @tailwind utilities;
           }
         `,
-        ['flex', 'md:grid', 'hover:underline', 'dark:bg-black'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --color-black: #000;
-        --breakpoint-md: 768px;
       }
 
       @layer utilities {
@@ -41,7 +42,7 @@ describe('compiling CSS', () => {
           }
         }
 
-        @media (width >= 768px) {
+        @media (min-width: 768px) {
           .md\\:grid {
             display: grid;
           }
@@ -52,13 +53,15 @@ describe('compiling CSS', () => {
             background-color: var(--color-black);
           }
         }
-      }"
+      }
+      "
     `)
   })
 
   test('that only CSS variables are allowed', () => {
     return expect(
-      compileCss(
+      run(
+        ['bg-primary'],
         css`
           @theme {
             --color-primary: red;
@@ -68,7 +71,6 @@ describe('compiling CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['bg-primary'],
       ),
     ).rejects.toThrowErrorMatchingInlineSnapshot(`
       [Error: \`@theme\` blocks must only contain custom properties or \`@keyframes\`.
@@ -84,21 +86,23 @@ describe('compiling CSS', () => {
 
   test('`@tailwind utilities` is only processed once', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['flex', 'grid'],
         css`
           @tailwind utilities;
           @tailwind utilities;
         `,
-        ['flex', 'grid'],
       ),
     ).toMatchInlineSnapshot(`
-      ".flex {
+      "
+      .flex {
         display: flex;
       }
 
       .grid {
         display: grid;
-      }"
+      }
+      "
     `)
   })
 
@@ -106,19 +110,48 @@ describe('compiling CSS', () => {
     let defaultTheme = fs.readFileSync(path.resolve(__dirname, '..', 'theme.css'), 'utf-8')
 
     expect(
-      await compileCss(
+      await run(
+        ['bg-red-500', 'w-4', 'sm:flex', 'shadow-sm'],
         css`
           ${defaultTheme}
           @tailwind utilities;
         `,
-        ['bg-red-500', 'w-4', 'sm:flex', 'shadow-sm'],
+      ),
+    ).toMatchSnapshot()
+  })
+
+  test('prefix all CSS variables inside preflight', async () => {
+    expect(
+      await run(
+        ['font-mono'],
+        css`
+          @import 'tailwindcss' prefix(tw);
+          @tailwind utilities;
+        `,
+        {
+          async loadStylesheet(id) {
+            return {
+              path: '',
+              base: '',
+              content: fs.readFileSync(
+                path.resolve(__dirname, '..', id === 'tailwindcss' ? 'index.css' : id),
+                'utf-8',
+              ),
+            }
+          },
+        },
       ),
     ).toMatchSnapshot()
   })
 
   test('unescapes underscores to spaces inside arbitrary values except for `url()` and first argument of `var()` and `theme()`', async () => {
     expect(
-      await compileCss(
+      await run(
+        [
+          'bg-[no-repeat_url(./my_file.jpg)]',
+          'ml-[var(--spacing-1_5,_var(--spacing-2_5,_1rem))]',
+          'ml-[theme(--spacing-1_5,theme(--spacing-2_5,_1rem)))]',
+        ],
         css`
           @theme {
             --spacing-1_5: 1.5rem;
@@ -126,14 +159,10 @@ describe('compiling CSS', () => {
           }
           @tailwind utilities;
         `,
-        [
-          'bg-[no-repeat_url(./my_file.jpg)]',
-          'ml-[var(--spacing-1_5,_var(--spacing-2_5,_1rem))]',
-          'ml-[theme(--spacing-1_5,theme(--spacing-2_5,_1rem)))]',
-        ],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --spacing-1_5: 1.5rem;
         --spacing-2_5: 2.5rem;
       }
@@ -148,24 +177,64 @@ describe('compiling CSS', () => {
 
       .bg-\\[no-repeat_url\\(\\.\\/my_file\\.jpg\\)\\] {
         background-color: no-repeat url("./my_file.jpg");
-      }"
+      }
+      "
+    `)
+  })
+
+  test('unescapes theme variables and handles dots as underscore', async () => {
+    expect(
+      await run(
+        ['m-1.5', 'm-2.5', 'm-2_5', 'm-3.5', 'm-foo/bar'],
+        css`
+          @theme {
+            --spacing-*: initial;
+            --spacing-1\.5: 1.5px;
+            --spacing-2_5: 2.5px;
+            --spacing-3\.5: 3.5px;
+            --spacing-3_5: 3.5px;
+            --spacing-foo\/bar: 3rem;
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --spacing-1\\.5: 1.5px;
+        --spacing-2_5: 2.5px;
+        --spacing-3\\.5: 3.5px;
+        --spacing-foo\\/bar: 3rem;
+      }
+
+      .m-1\\.5 {
+        margin: var(--spacing-1\\.5);
+      }
+
+      .m-2\\.5, .m-2_5 {
+        margin: var(--spacing-2_5);
+      }
+
+      .m-3\\.5 {
+        margin: var(--spacing-3\\.5);
+      }
+
+      .m-foo\\/bar {
+        margin: var(--spacing-foo\\/bar);
+      }
+      "
     `)
   })
 
   test('adds vendor prefixes', async () => {
-    expect(
-      await compileCss(
-        css`
-          @tailwind utilities;
-        `,
-        ['[text-size-adjust:none]'],
-      ),
-    ).toMatchInlineSnapshot(`
-      ".\\[text-size-adjust\\:none\\] {
+    expect(await run(['[text-size-adjust:none]'])).toMatchInlineSnapshot(`
+      "
+      .\\[text-size-adjust\\:none\\] {
         -webkit-text-size-adjust: none;
         -moz-text-size-adjust: none;
         text-size-adjust: none;
-      }"
+      }
+      "
     `)
   })
 })
@@ -173,29 +242,41 @@ describe('compiling CSS', () => {
 describe('arbitrary properties', () => {
   it('should generate arbitrary properties', async () => {
     expect(await run(['[color:red]'])).toMatchInlineSnapshot(`
-      ".\\[color\\:red\\] {
+      "
+      .\\[color\\:red\\] {
         color: red;
-      }"
+      }
+      "
     `)
   })
 
   it('should generate arbitrary properties with modifiers', async () => {
     expect(await run(['[color:red]/50'])).toMatchInlineSnapshot(`
-      ".\\[color\\:red\\]\\/50 {
-        color: oklab(62.7955% .22486 .12584 / .5);
-      }"
+      "
+      .\\[color\\:red\\]\\/50 {
+        color: oklab(62.7955% .224 .125 / .5);
+      }
+      "
     `)
   })
 
   it('should not generate arbitrary properties with invalid modifiers', async () => {
-    expect(await run(['[color:red]/not-a-percentage'])).toMatchInlineSnapshot(`""`)
+    expect(await run(['[color:red]/not-a-percentage'])).toEqual('')
   })
 
   it('should generate arbitrary properties with variables and with modifiers', async () => {
     expect(await run(['[color:var(--my-color)]/50'])).toMatchInlineSnapshot(`
-      ".\\[color\\:var\\(--my-color\\)\\]\\/50 {
-        color: color-mix(in oklab, var(--my-color) 50%, transparent);
-      }"
+      "
+      .\\[color\\:var\\(--my-color\\)\\]\\/50 {
+        color: var(--my-color);
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .\\[color\\:var\\(--my-color\\)\\]\\/50 {
+          color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        }
+      }
+      "
     `)
   })
 })
@@ -215,6 +296,90 @@ describe('@apply', () => {
     )
   })
 
+  it('@apply referencing theme values without `@tailwind utilities` or `@reference` should error', () => {
+    return expect(() =>
+      compileCss(css`
+        .foo {
+          @apply p-2;
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: Cannot apply unknown utility class \`p-2\`. Are you using CSS modules or similar and missing \`@reference\`? https://tailwindcss.com/docs/functions-and-directives#reference-directive]`,
+    )
+  })
+
+  it('@apply referencing theme values with `@tailwind utilities` should work', async () => {
+    return expect(
+      await compileCss(
+        css`
+          @import 'tailwindcss';
+
+          .foo {
+            @apply p-2;
+          }
+        `,
+        {
+          async loadStylesheet() {
+            return {
+              path: '',
+              base: '/',
+              content: css`
+                @theme {
+                  --spacing: 0.25rem;
+                }
+                @tailwind utilities;
+              `,
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --spacing: .25rem;
+      }
+
+      .foo {
+        padding: calc(var(--spacing) * 2);
+      }
+      "
+    `)
+  })
+
+  it('@apply referencing theme values with `@reference` should work', async () => {
+    return expect(
+      await compileCss(
+        css`
+          @reference "style.css";
+
+          .foo {
+            @apply p-2;
+          }
+        `,
+        {
+          async loadStylesheet() {
+            return {
+              path: '',
+              base: '/',
+              content: css`
+                @theme {
+                  --spacing: 0.25rem;
+                }
+                @tailwind utilities;
+              `,
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .foo {
+        padding: calc(var(--spacing, .25rem) * 2);
+      }
+      "
+    `)
+  })
+
   it('should replace @apply with the correct result', async () => {
     expect(
       await compileCss(css`
@@ -245,13 +410,23 @@ describe('@apply', () => {
         }
       `),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      @layer properties {
+        @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+          *, :before, :after, ::backdrop {
+            --tw-translate-x: 0;
+            --tw-translate-y: 0;
+            --tw-translate-z: 0;
+          }
+        }
+      }
+
+      :root, :host {
         --color-red-200: #fecaca;
         --color-red-500: #ef4444;
         --color-blue-500: #3b82f6;
         --color-green-200: #bbf7d0;
         --color-green-500: #22c55e;
-        --breakpoint-md: 768px;
         --animate-spin: spin 1s linear infinite;
       }
 
@@ -269,7 +444,7 @@ describe('@apply', () => {
         }
       }
 
-      @media (width >= 768px) {
+      @media (min-width: 768px) {
         .foo {
           background-color: var(--color-green-500);
         }
@@ -279,28 +454,12 @@ describe('@apply', () => {
         background-color: var(--color-red-200);
       }
 
-      @media (width >= 768px) {
+      @media (min-width: 768px) {
         .foo:hover:focus {
           background-color: var(--color-green-200);
         }
       }
 
-      @supports (-moz-orient: inline) {
-        @layer base {
-          *, :before, :after, ::backdrop {
-            --tw-translate-x: 0;
-            --tw-translate-y: 0;
-            --tw-translate-z: 0;
-          }
-        }
-      }
-
-      @keyframes spin {
-        to {
-          transform: rotate(360deg);
-        }
-      }
-
       @property --tw-translate-x {
         syntax: "*";
         inherits: false;
@@ -317,7 +476,14 @@ describe('@apply', () => {
         syntax: "*";
         inherits: false;
         initial-value: 0;
-      }"
+      }
+
+      @keyframes spin {
+        to {
+          transform: rotate(360deg);
+        }
+      }
+      "
     `)
   })
 
@@ -328,10 +494,10 @@ describe('@apply', () => {
           @import './bar.css';
           @tailwind utilities;
         `,
-        [],
         {
           async loadStylesheet() {
             return {
+              path: '',
               base: '/bar.css',
               content: css`
                 .foo {
@@ -343,9 +509,11 @@ describe('@apply', () => {
         },
       ),
     ).toMatchInlineSnapshot(`
-      ".foo {
+      "
+      .foo {
         text-decoration-line: underline;
-      }"
+      }
+      "
     `)
   })
 
@@ -363,31 +531,78 @@ describe('@apply', () => {
         }
       `),
     ).toMatchInlineSnapshot(`
-      ".foo, .bar {
-        --tw-content: "b";
-        content: var(--tw-content);
-        content: var(--tw-content);
-      }
-
-      @supports (-moz-orient: inline) {
-        @layer base {
+      "
+      @layer properties {
+        @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
           *, :before, :after, ::backdrop {
             --tw-content: "";
           }
         }
       }
 
+      .foo, .bar {
+        --tw-content: "b";
+        content: var(--tw-content);
+      }
+
       @property --tw-content {
         syntax: "*";
         inherits: false;
         initial-value: "";
-      }"
+      }
+      "
     `)
   })
 
-  it('should error when using @apply with a utility that does not exist', () => {
-    return expect(
-      compileCss(css`
+  it('@apply does not cache important state', async () => {
+    expect(
+      await compileCss(css`
+        .c1 {
+          @apply leading-none;
+        }
+        .c2 {
+          @apply leading-none!;
+        }
+        .c3 {
+          @apply leading-none;
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer properties {
+        @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+          *, :before, :after, ::backdrop {
+            --tw-leading: initial;
+          }
+        }
+      }
+
+      .c1 {
+        --tw-leading: 1;
+        line-height: 1;
+      }
+
+      .c2 {
+        --tw-leading: 1 !important;
+        line-height: 1 !important;
+      }
+
+      .c3 {
+        --tw-leading: 1;
+        line-height: 1;
+      }
+
+      @property --tw-leading {
+        syntax: "*";
+        inherits: false
+      }
+      "
+    `)
+  })
+
+  it('should error when using @apply with a utility that does not exist', async () => {
+    await expect(
+      compile(css`
         @tailwind utilities;
 
         .foo {
@@ -395,21 +610,24 @@ describe('@apply', () => {
         }
       `),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `[Error: Cannot apply unknown utility class: bg-not-found]`,
+      `[Error: Cannot apply unknown utility class \`bg-not-found\`. Are you using CSS modules or similar and missing \`@reference\`? https://tailwindcss.com/docs/functions-and-directives#reference-directive]`,
     )
   })
 
-  it('should error when using @apply with a variant that does not exist', () => {
-    return expect(
-      compileCss(css`
+  it('should error when using @apply with a variant that does not exist', async () => {
+    await expect(
+      compile(css`
         @tailwind utilities;
+        @theme {
+          --color-red-500: red;
+        }
 
         .foo {
-          @apply hocus:bg-red-500;
+          @apply hocus:hover:pocus:bg-red-500;
         }
       `),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `[Error: Cannot apply unknown utility class: hocus:bg-red-500]`,
+      `[Error: Cannot apply utility class \`hocus:hover:pocus:bg-red-500\` because the \`hocus\` and \`pocus\` variants do not exist.]`,
     )
   })
 
@@ -423,9 +641,11 @@ describe('@apply', () => {
         }
       `),
     ).toMatchInlineSnapshot(`
-      ".foo {
+      "
+      .foo {
         display: flex;
-      }"
+      }
+      "
     `)
   })
 
@@ -452,33 +672,311 @@ describe('@apply', () => {
         @tailwind utilities;
       `),
     ).toMatchInlineSnapshot(`
-      ".foo:before {
+      "
+      .foo:before {
         content: "bar";
       }
 
       .foo:after {
         content: "baz";
-      }"
+      }
+      "
     `)
   })
+
+  it('should recursively apply with custom `@utility`, which is used before it is defined', async () => {
+    expect(
+      await run(
+        ['a', 'b', 'c', 'flex', 'my-flex'],
+        css`
+          @tailwind utilities;
+
+          @layer base {
+            body {
+              @apply a;
+            }
+          }
+
+          @utility a {
+            @apply b;
+          }
+
+          @utility b {
+            @apply focus:c;
+          }
+
+          @utility c {
+            @apply my-flex!;
+          }
+
+          @utility my-flex {
+            @apply flex;
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .a:focus, .b:focus, .c {
+        display: flex !important;
+      }
+
+      .flex, .my-flex {
+        display: flex;
+      }
+
+      @layer base {
+        body:focus {
+          display: flex !important;
+        }
+      }
+      "
+    `)
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/16935
+  it('should not swallow @utility declarations when @apply is used in nested rules', async () => {
+    expect(
+      await run(
+        ['custom-utility'],
+        css`
+          @tailwind utilities;
+
+          .ignore-me {
+            @apply underline;
+            div {
+              @apply custom-utility;
+            }
+          }
+
+          @utility custom-utility {
+            @apply flex;
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .custom-utility {
+        display: flex;
+      }
+
+      .ignore-me {
+        text-decoration-line: underline;
+      }
+
+      .ignore-me div {
+        display: flex;
+      }
+      "
+    `)
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/17924
+  it('should correctly apply nested usages of @apply when one @utility applies another', async () => {
+    expect(
+      await run(
+        ['foo', 'test', 'test2'],
+        css`
+          @theme {
+            --color-green-500: green;
+            --color-red-500: red;
+            --color-indigo-500: indigo;
+          }
+
+          @tailwind utilities;
+
+          @utility test2 {
+            @apply test;
+          }
+
+          @utility test {
+            @apply bg-green-500;
+            &:hover {
+              @apply bg-red-500;
+            }
+            &:disabled {
+              @apply bg-indigo-500;
+            }
+          }
+
+          .foo {
+            @apply test2;
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --color-green-500: green;
+        --color-red-500: red;
+        --color-indigo-500: indigo;
+      }
+
+      .test {
+        background-color: var(--color-green-500);
+      }
+
+      .test:hover {
+        background-color: var(--color-red-500);
+      }
+
+      .test:disabled {
+        background-color: var(--color-indigo-500);
+      }
+
+      .test2 {
+        background-color: var(--color-green-500);
+      }
+
+      .test2:hover {
+        background-color: var(--color-red-500);
+      }
+
+      .test2:disabled {
+        background-color: var(--color-indigo-500);
+      }
+
+      .foo {
+        background-color: var(--color-green-500);
+      }
+
+      .foo:hover {
+        background-color: var(--color-red-500);
+      }
+
+      .foo:disabled {
+        background-color: var(--color-indigo-500);
+      }
+      "
+    `)
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/18400
+  it('should ignore the design systems `important` flag when using @apply', async () => {
+    expect(
+      await run(
+        ['flex'],
+        css`
+          @import 'tailwindcss/utilities' important;
+          .flex-explicitly-important {
+            @apply flex!;
+          }
+          .flex-not-important {
+            @apply flex;
+          }
+        `,
+        {
+          async loadStylesheet(_, base) {
+            return {
+              content: '@tailwind utilities;',
+              base,
+              path: '',
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .flex, .flex-explicitly-important {
+        display: flex !important;
+      }
+
+      .flex-not-important {
+        display: flex;
+      }
+      "
+    `)
+  })
+
+  it('should be usable with CSS mixins', async () => {
+    let input = css`
+      .foo {
+        /* Utility usage */
+        @apply underline;
+
+        /* CSS mixin usage */
+        @apply --my-mixin-1;
+        @apply --my-mixin-1();
+        @apply --my-mixin-1 --my-mixin-2;
+        @apply --my-mixin-1() --my-mixin-2();
+        @apply --my-mixin-3 {
+          color: red;
+        }
+      }
+    `
+
+    expect(await compileCss(input)).toMatchInlineSnapshot(`
+      "
+      .foo {
+        text-decoration-line: underline;
+        @apply --my-mixin-1;
+        @apply --my-mixin-1();
+        @apply --my-mixin-1 --my-mixin-2;
+        @apply --my-mixin-1() --my-mixin-2();
+        @apply --my-mixin-3 {
+          color: red;
+        }
+      }
+      "
+    `)
+  })
+
+  it('should error when trying to use mixins and utilities together', async () => {
+    await expect(
+      compile(css`
+        .foo {
+          @apply underline --my-mixin-1;
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: You cannot use \`@apply\` with both mixins and utilities. Please move \`@apply --my-mixin-1\` into a separate rule.]`,
+    )
+
+    await expect(
+      compile(css`
+        .foo {
+          @apply --my-mixin-1 underline;
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: You cannot use \`@apply\` with both mixins and utilities. Please move \`@apply --my-mixin-1\` into a separate rule.]`,
+    )
+  })
+
+  it('should error when used with a body', async () => {
+    await expect(
+      compile(css`
+        .foo {
+          @apply underline {
+            color: red;
+          }
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: The rule \`@apply underline\` must not have a body.]`,
+    )
+  })
 })
 
 describe('arbitrary variants', () => {
   it('should generate arbitrary variants', async () => {
     expect(await run(['[&_p]:flex'])).toMatchInlineSnapshot(`
-      ".\\[\\&_p\\]\\:flex p {
+      "
+      .\\[\\&_p\\]\\:flex p {
         display: flex;
-      }"
+      }
+      "
     `)
   })
 
   it('should generate arbitrary at-rule variants', async () => {
     expect(await run(['[@media(width>=123px)]:flex'])).toMatchInlineSnapshot(`
-      "@media (width >= 123px) {
+      "
+      @media (min-width: 123px) {
         .\\[\\@media\\(width\\>\\=123px\\)\\]\\:flex {
           display: flex;
         }
-      }"
+      }
+      "
     `)
   })
 
@@ -490,37 +988,52 @@ describe('arbitrary variants', () => {
 describe('variant stacking', () => {
   it('should stack simple variants', async () => {
     expect(await run(['focus:hover:flex'])).toMatchInlineSnapshot(`
-      "@media (hover: hover) {
+      "
+      @media (hover: hover) {
         .focus\\:hover\\:flex:focus:hover {
           display: flex;
         }
-      }"
+      }
+      "
     `)
   })
 
   it('should stack arbitrary variants and simple variants', async () => {
     expect(await run(['[&_p]:hover:flex'])).toMatchInlineSnapshot(`
-      "@media (hover: hover) {
+      "
+      @media (hover: hover) {
         .\\[\\&_p\\]\\:hover\\:flex p:hover {
           display: flex;
         }
-      }"
+      }
+      "
     `)
   })
 
   it('should stack multiple arbitrary variants', async () => {
     expect(await run(['[&_p]:[@media(width>=123px)]:flex'])).toMatchInlineSnapshot(`
-      "@media (width >= 123px) {
+      "
+      @media (min-width: 123px) {
         .\\[\\&_p\\]\\:\\[\\@media\\(width\\>\\=123px\\)\\]\\:flex p {
           display: flex;
         }
-      }"
+      }
+      "
     `)
   })
 
   it('pseudo element variants are re-ordered', async () => {
     expect(await run(['before:hover:flex', 'hover:before:flex'])).toMatchInlineSnapshot(`
-      ".before\\:hover\\:flex:before {
+      "
+      @layer properties {
+        @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+          *, :before, :after, ::backdrop {
+            --tw-content: "";
+          }
+        }
+      }
+
+      .before\\:hover\\:flex:before {
         content: var(--tw-content);
       }
 
@@ -535,19 +1048,12 @@ describe('variant stacking', () => {
         }
       }
 
-      @supports (-moz-orient: inline) {
-        @layer base {
-          *, :before, :after, ::backdrop {
-            --tw-content: "";
-          }
-        }
-      }
-
       @property --tw-content {
         syntax: "*";
         inherits: false;
         initial-value: "";
-      }"
+      }
+      "
     `)
   })
 })
@@ -555,23 +1061,28 @@ describe('variant stacking', () => {
 describe('important', () => {
   it('should generate an important utility', async () => {
     expect(await run(['underline!'])).toMatchInlineSnapshot(`
-      ".underline\\! {
+      "
+      .underline\\! {
         text-decoration-line: underline !important;
-      }"
+      }
+      "
     `)
   })
 
   it('should generate an important utility with legacy syntax', async () => {
     expect(await run(['!underline'])).toMatchInlineSnapshot(`
-      ".\\!underline {
+      "
+      .\\!underline {
         text-decoration-line: underline !important;
-      }"
+      }
+      "
     `)
   })
 
   it('should not mark declarations inside of @keyframes as important', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['animate-spin!'],
         css`
           @theme {
             --animate-spin: spin 1s linear infinite;
@@ -584,10 +1095,10 @@ describe('important', () => {
           }
           @tailwind utilities;
         `,
-        ['animate-spin!'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --animate-spin: spin 1s linear infinite;
       }
 
@@ -599,15 +1110,18 @@ describe('important', () => {
         to {
           transform: rotate(360deg);
         }
-      }"
+      }
+      "
     `)
   })
 
   it('should generate an important arbitrary property utility', async () => {
     expect(await run(['[color:red]!'])).toMatchInlineSnapshot(`
-      ".\\[color\\:red\\]\\! {
+      "
+      .\\[color\\:red\\]\\! {
         color: red !important;
-      }"
+      }
+      "
     `)
   })
 })
@@ -615,17 +1129,18 @@ describe('important', () => {
 describe('sorting', () => {
   it('should sort utilities based on their property order', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['pointer-events-none', 'flex', 'p-1', 'px-1', 'pl-1'].sort(() => Math.random() - 0.5),
         css`
           @theme {
             --spacing-1: 0.25rem;
           }
           @tailwind utilities;
         `,
-        ['pointer-events-none', 'flex', 'p-1', 'px-1', 'pl-1'].sort(() => Math.random() - 0.5),
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --spacing-1: .25rem;
       }
 
@@ -647,13 +1162,15 @@ describe('sorting', () => {
 
       .pl-1 {
         padding-left: var(--spacing-1);
-      }"
+      }
+      "
     `)
   })
 
   it('should sort based on amount of properties', async () => {
     expect(await run(['text-clip', 'truncate', 'overflow-scroll'])).toMatchInlineSnapshot(`
-      ".truncate {
+      "
+      .truncate {
         text-overflow: ellipsis;
         white-space: nowrap;
         overflow: hidden;
@@ -665,7 +1182,8 @@ describe('sorting', () => {
 
       .text-clip {
         text-overflow: clip;
-      }"
+      }
+      "
     `)
   })
 
@@ -676,7 +1194,8 @@ describe('sorting', () => {
    */
   it('should sort utilities with a custom internal --tw-sort correctly', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['mx-0', 'gap-4', 'space-x-2'].sort(() => Math.random() - 0.5),
         css`
           @theme {
             --spacing-0: 0px;
@@ -685,10 +1204,18 @@ describe('sorting', () => {
           }
           @tailwind utilities;
         `,
-        ['mx-0', 'gap-4', 'space-x-2'].sort(() => Math.random() - 0.5),
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      @layer properties {
+        @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+          *, :before, :after, ::backdrop {
+            --tw-space-x-reverse: 0;
+          }
+        }
+      }
+
+      :root, :host {
         --spacing-0: 0px;
         --spacing-2: .5rem;
         --spacing-4: 1rem;
@@ -708,33 +1235,18 @@ describe('sorting', () => {
         margin-inline-end: calc(var(--spacing-2) * calc(1 - var(--tw-space-x-reverse)));
       }
 
-      @supports (-moz-orient: inline) {
-        @layer base {
-          *, :before, :after, ::backdrop {
-            --tw-space-x-reverse: 0;
-          }
-        }
-      }
-
       @property --tw-space-x-reverse {
         syntax: "*";
         inherits: false;
         initial-value: 0;
-      }"
+      }
+      "
     `)
   })
 
   it('should sort individual logical properties later than left/right pairs', async () => {
     expect(
-      await compileCss(
-        css`
-          @theme {
-            --spacing-1: 1px;
-            --spacing-2: 2px;
-            --spacing-3: 3px;
-          }
-          @tailwind utilities;
-        `,
+      await run(
         [
           // scroll-margin
           'scroll-ms-1',
@@ -756,9 +1268,18 @@ describe('sorting', () => {
           'pe-2',
           'px-3',
         ].sort(() => Math.random() - 0.5),
+        css`
+          @theme {
+            --spacing-1: 1px;
+            --spacing-2: 2px;
+            --spacing-3: 3px;
+          }
+          @tailwind utilities;
+        `,
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --spacing-1: 1px;
         --spacing-2: 2px;
         --spacing-3: 3px;
@@ -810,7 +1331,8 @@ describe('sorting', () => {
 
       .pe-2 {
         padding-inline-end: var(--spacing-2);
-      }"
+      }
+      "
     `)
   })
 
@@ -822,7 +1344,8 @@ describe('sorting', () => {
         ),
       ),
     ).toMatchInlineSnapshot(`
-      ".pointer-events-none {
+      "
+      .pointer-events-none {
         pointer-events: none;
       }
 
@@ -838,7 +1361,8 @@ describe('sorting', () => {
 
       .focus\\:pointer-events-none:focus {
         pointer-events: none;
-      }"
+      }
+      "
     `)
   })
 
@@ -865,7 +1389,8 @@ describe('sorting', () => {
         ),
       ),
     ).toMatchInlineSnapshot(`
-      ".flex {
+      "
+      .flex {
         display: flex;
       }
 
@@ -887,7 +1412,8 @@ describe('sorting', () => {
 
       .disabled\\:flex:disabled {
         display: flex;
-      }"
+      }
+      "
     `)
   })
 
@@ -916,43 +1442,44 @@ describe('sorting', () => {
         ].sort(() => Math.random() - 0.5),
       ),
     ).toMatchInlineSnapshot(`
-      "@media (hover: hover) {
-        .group-hover\\:flex:is(:where(.group):hover *) {
+      "
+      @media (hover: hover) {
+        :is(:where(.group):hover .group-hover\\:flex) {
           display: flex;
         }
       }
 
-      .group-focus\\:flex:is(:where(.group):focus *) {
+      :is(:where(.group):focus .group-focus\\:flex) {
         display: flex;
       }
 
       @media (hover: hover) {
-        .peer-hover\\:flex:is(:where(.peer):hover ~ *) {
+        :is(:where(.peer):hover ~ .peer-hover\\:flex) {
           display: flex;
         }
 
         @media (hover: hover) {
-          .group-hover\\:peer-hover\\:flex:is(:where(.group):hover *):is(:where(.peer):hover ~ *), .peer-hover\\:group-hover\\:flex:is(:where(.peer):hover ~ *):is(:where(.group):hover *) {
+          :is(:where(.peer):hover ~ :is(:where(.group):hover .group-hover\\:peer-hover\\:flex)), :is(:where(.group):hover :is(:where(.peer):hover ~ .peer-hover\\:group-hover\\:flex)) {
             display: flex;
           }
         }
 
-        .group-focus\\:peer-hover\\:flex:is(:where(.group):focus *):is(:where(.peer):hover ~ *), .peer-hover\\:group-focus\\:flex:is(:where(.peer):hover ~ *):is(:where(.group):focus *) {
+        :is(:where(.peer):hover ~ :is(:where(.group):focus .group-focus\\:peer-hover\\:flex)), :is(:where(.group):focus :is(:where(.peer):hover ~ .peer-hover\\:group-focus\\:flex)) {
           display: flex;
         }
       }
 
-      .peer-focus\\:flex:is(:where(.peer):focus ~ *) {
+      :is(:where(.peer):focus ~ .peer-focus\\:flex) {
         display: flex;
       }
 
       @media (hover: hover) {
-        .group-hover\\:peer-focus\\:flex:is(:where(.group):hover *):is(:where(.peer):focus ~ *), .peer-focus\\:group-hover\\:flex:is(:where(.peer):focus ~ *):is(:where(.group):hover *) {
+        :is(:where(.peer):focus ~ :is(:where(.group):hover .group-hover\\:peer-focus\\:flex)), :is(:where(.group):hover :is(:where(.peer):focus ~ .peer-focus\\:group-hover\\:flex)) {
           display: flex;
         }
       }
 
-      .group-focus\\:peer-focus\\:flex:is(:where(.group):focus *):is(:where(.peer):focus ~ *), .peer-focus\\:group-focus\\:flex:is(:where(.peer):focus ~ *):is(:where(.group):focus *) {
+      :is(:where(.peer):focus ~ :is(:where(.group):focus .group-focus\\:peer-focus\\:flex)), :is(:where(.group):focus :is(:where(.peer):focus ~ .peer-focus\\:group-focus\\:flex)) {
         display: flex;
       }
 
@@ -960,38 +1487,80 @@ describe('sorting', () => {
         .hover\\:flex:hover {
           display: flex;
         }
-      }"
+      }
+      "
+    `)
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/16973
+  it('should not take undefined values into account when sorting', async () => {
+    expect(
+      await run(
+        ['fancy-text', 'text-sm'],
+        css`
+          @theme {
+            --text-sm: 0.875rem;
+            --text-sm--line-height: calc(1.25 / 0.875);
+          }
+          @tailwind utilities;
+          @utility fancy-text {
+            font-size: var(--text-4xl);
+            line-height: var(--text-4xl--line-height);
+            font-weight: var(--font-weight-bold);
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --text-sm: .875rem;
+        --text-sm--line-height: calc(1.25 / .875);
+      }
+
+      .fancy-text {
+        font-size: var(--text-4xl);
+        line-height: var(--text-4xl--line-height);
+        font-weight: var(--font-weight-bold);
+      }
+
+      .text-sm {
+        font-size: var(--text-sm);
+        line-height: var(--tw-leading, var(--text-sm--line-height));
+      }
+      "
     `)
   })
 })
 
-// Parsing theme values from CSS
-describe('Parsing themes values from CSS', () => {
+describe('Parsing theme values from CSS', () => {
   test('Can read values from `@theme`', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['accent-red-500'],
         css`
           @theme {
             --color-red-500: #f00;
           }
           @tailwind utilities;
         `,
-        ['accent-red-500'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --color-red-500: red;
       }
 
       .accent-red-500 {
         accent-color: var(--color-red-500);
-      }"
+      }
+      "
     `)
   })
 
   test('Later values from `@theme` override earlier ones', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['accent-red-500'],
         css`
           @theme {
             --color-red-500: #f00;
@@ -999,22 +1568,24 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['accent-red-500'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --color-red-500: #f10;
       }
 
       .accent-red-500 {
         accent-color: var(--color-red-500);
-      }"
+      }
+      "
     `)
   })
 
   test('Multiple `@theme` blocks are merged', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['accent-red-500', 'accent-blue-500'],
         css`
           @theme {
             --color-red-500: #f00;
@@ -1024,10 +1595,10 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['accent-red-500', 'accent-blue-500'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --color-red-500: red;
         --color-blue-500: #00f;
       }
@@ -1038,13 +1609,15 @@ describe('Parsing themes values from CSS', () => {
 
       .accent-red-500 {
         accent-color: var(--color-red-500);
-      }"
+      }
+      "
     `)
   })
 
   test('`@theme` values with escaped forward slashes map to unescaped slashes in candidate values', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['w-1/2', 'w-75%'],
         css`
           @theme {
             /* Cursed but we want this to work */
@@ -1053,10 +1626,10 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['w-1/2', 'w-75%'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --width-1\\/2: 75%;
         --width-75\\%: 50%;
       }
@@ -1067,13 +1640,23 @@ describe('Parsing themes values from CSS', () => {
 
       .w-75\\% {
         width: var(--width-75\\%);
-      }"
+      }
+      "
     `)
   })
 
+  // https://github.com/tailwindlabs/tailwindcss/issues/19786
+  test('out-of-range escaped CSS variable candidates do not crash the build', async () => {
+    // Shouldn't crash
+    await run([
+      String.raw`--Coding-Projects-CharacterMapper-Master-Workspace\d8819554-4725-4235-9d22-2d0ed572e924`,
+    ])
+  })
+
   test('`@keyframes` in `@theme` are hoisted', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['accent-red', 'text-lg'],
         css`
           @theme {
             --color-red: red;
@@ -1089,12 +1672,11 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['accent-red', 'text-lg'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --color-red: red;
-        --animate-foo: foo 1s infinite;
         --text-lg: 20px;
       }
 
@@ -1105,18 +1687,56 @@ describe('Parsing themes values from CSS', () => {
       .accent-red {
         accent-color: var(--color-red);
       }
+      "
+    `)
+  })
 
-      @keyframes foo {
+  test('`@keyframes` in `@theme` are generated when name contains a new line', async () => {
+    expect(
+      await run(
+        ['animate-very-long-animation-name'],
+        css`
+          @theme {
+            --animate-very-long-animation-name: very-long-animation-name
+              var(
+                --very-long-animation-name-configuration,
+                2.5s ease-in-out 0s infinite normal none running
+              );
+
+            @keyframes very-long-animation-name {
+              to {
+                opacity: 1;
+              }
+            }
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --animate-very-long-animation-name: very-long-animation-name
+                    var(--very-long-animation-name-configuration, 2.5s ease-in-out 0s infinite normal none running);
+      }
+
+      .animate-very-long-animation-name {
+        animation: var(--animate-very-long-animation-name);
+      }
+
+      @keyframes very-long-animation-name {
         to {
           opacity: 1;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('`@theme` values can be unset', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['accent-red', 'accent-blue', 'accent-green', 'text-sm', 'text-md'],
         css`
           @theme {
             --color-red: #f00;
@@ -1143,10 +1763,10 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['accent-red', 'accent-blue', 'accent-green', 'text-sm', 'text-md'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --text-sm: 13px;
         --color-green: #0f0;
       }
@@ -1157,13 +1777,64 @@ describe('Parsing themes values from CSS', () => {
 
       .accent-green {
         accent-color: var(--color-green);
-      }"
+      }
+      "
+    `)
+  })
+
+  test('`@theme` values can be unset (using the escaped syntax)', async () => {
+    expect(
+      await run(
+        ['accent-red', 'accent-blue', 'accent-green', 'text-sm', 'text-md'],
+        css`
+          @theme {
+            --color-red: #f00;
+            --color-blue: #00f;
+            --text-sm: 13px;
+            --text-md: 16px;
+
+            --animate-spin: spin 1s infinite linear;
+
+            @keyframes spin {
+              to {
+                transform: rotate(360deg);
+              }
+            }
+          }
+          @theme {
+            --color-\*: initial;
+            --text-md: initial;
+            --animate-\*: initial;
+            --keyframes-\*: initial;
+          }
+          @theme {
+            --color-green: #0f0;
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --text-sm: 13px;
+        --color-green: #0f0;
+      }
+
+      .text-sm {
+        font-size: var(--text-sm);
+      }
+
+      .accent-green {
+        accent-color: var(--color-green);
+      }
+      "
     `)
   })
 
   test('all `@theme` values can be unset at once', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['accent-red', 'accent-blue', 'accent-green', 'text-sm', 'text-md'],
         css`
           @theme {
             --color-red: #f00;
@@ -1179,22 +1850,24 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['accent-red', 'accent-blue', 'accent-green', 'text-sm', 'text-md'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --color-green: #0f0;
       }
 
       .accent-green {
         accent-color: var(--color-green);
-      }"
+      }
+      "
     `)
   })
 
   test('unsetting `--font-*` does not unset `--font-weight-*`', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['font-bold', 'font-sans', 'font-serif', 'font-body'],
         css`
           @theme {
             --font-weight-bold: bold;
@@ -1207,10 +1880,18 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['font-bold', 'font-sans', 'font-serif', 'font-body'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      @layer properties {
+        @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+          *, :before, :after, ::backdrop {
+            --tw-font-weight: initial;
+          }
+        }
+      }
+
+      :root, :host {
         --font-weight-bold: bold;
         --font-body: Inter;
       }
@@ -1224,24 +1905,18 @@ describe('Parsing themes values from CSS', () => {
         font-weight: var(--font-weight-bold);
       }
 
-      @supports (-moz-orient: inline) {
-        @layer base {
-          *, :before, :after, ::backdrop {
-            --tw-font-weight: initial;
-          }
-        }
-      }
-
       @property --tw-font-weight {
         syntax: "*";
         inherits: false
-      }"
+      }
+      "
     `)
   })
 
   test('unsetting `--inset-*` does not unset `--inset-shadow-*`', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['inset-shadow-sm', 'inset-ring-thick', 'inset-lg', 'inset-sm', 'inset-md'],
         css`
           @theme {
             --inset-shadow-sm: inset 0 2px 4px rgb(0 0 0 / 0.05);
@@ -1254,30 +1929,18 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['inset-shadow-sm', 'inset-ring-thick', 'inset-lg', 'inset-sm', 'inset-md'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
-        --inset-shadow-sm: inset 0 2px 4px #0000000d;
-        --inset-md: 50px;
-      }
-
-      .inset-md {
-        inset: var(--inset-md);
-      }
-
-      .inset-shadow-sm {
-        --tw-inset-shadow: inset 0 2px 4px var(--tw-inset-shadow-color, #0000000d);
-        box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
-      }
-
-      @supports (-moz-orient: inline) {
-        @layer base {
+      "
+      @layer properties {
+        @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
           *, :before, :after, ::backdrop {
             --tw-shadow: 0 0 #0000;
             --tw-shadow-color: initial;
+            --tw-shadow-alpha: 100%;
             --tw-inset-shadow: 0 0 #0000;
             --tw-inset-shadow-color: initial;
+            --tw-inset-shadow-alpha: 100%;
             --tw-ring-color: initial;
             --tw-ring-shadow: 0 0 #0000;
             --tw-inset-ring-color: initial;
@@ -1290,6 +1953,19 @@ describe('Parsing themes values from CSS', () => {
         }
       }
 
+      :root, :host {
+        --inset-md: 50px;
+      }
+
+      .inset-md {
+        inset: var(--inset-md);
+      }
+
+      .inset-shadow-sm {
+        --tw-inset-shadow: inset 0 2px 4px var(--tw-inset-shadow-color, #0000000d);
+        box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+      }
+
       @property --tw-shadow {
         syntax: "*";
         inherits: false;
@@ -1301,6 +1977,12 @@ describe('Parsing themes values from CSS', () => {
         inherits: false
       }
 
+      @property --tw-shadow-alpha {
+        syntax: "<percentage>";
+        inherits: false;
+        initial-value: 100%;
+      }
+
       @property --tw-inset-shadow {
         syntax: "*";
         inherits: false;
@@ -1312,6 +1994,12 @@ describe('Parsing themes values from CSS', () => {
         inherits: false
       }
 
+      @property --tw-inset-shadow-alpha {
+        syntax: "<percentage>";
+        inherits: false;
+        initial-value: 100%;
+      }
+
       @property --tw-ring-color {
         syntax: "*";
         inherits: false
@@ -1355,13 +2043,22 @@ describe('Parsing themes values from CSS', () => {
         syntax: "*";
         inherits: false;
         initial-value: 0 0 #0000;
-      }"
+      }
+      "
     `)
   })
 
   test('unsetting `--text-*` does not unset `--text-color-*`, `--text-underline-offset-*`, `--text-indent-*`, `--text-decoration-thickness-*` or `--text-decoration-color-*`', async () => {
     expect(
-      await compileCss(
+      await run(
+        [
+          'text-potato',
+          'underline-offset-potato',
+          'indent-potato',
+          'decoration-potato',
+          'decoration-salad',
+          'text-lg',
+        ],
         css`
           @theme {
             --text-color-potato: brown;
@@ -1377,17 +2074,10 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        [
-          'text-potato',
-          'underline-offset-potato',
-          'indent-potato',
-          'decoration-potato',
-          'decoration-salad',
-          'text-lg',
-        ],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --text-color-potato: brown;
         --text-underline-offset-potato: 4px;
         --text-indent-potato: 6px;
@@ -1420,13 +2110,15 @@ describe('Parsing themes values from CSS', () => {
 
       .underline-offset-potato {
         text-underline-offset: var(--text-underline-offset-potato);
-      }"
+      }
+      "
     `)
   })
 
   test('unused keyframes are removed when an animation is unset', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['animate-foo', 'animate-foobar'],
         css`
           @theme {
             --animate-foo: foo 1s infinite;
@@ -1449,10 +2141,10 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['animate-foo', 'animate-foobar'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --animate-foobar: foobar 1s infinite;
       }
 
@@ -1464,13 +2156,385 @@ describe('Parsing themes values from CSS', () => {
         to {
           opacity: 0;
         }
-      }"
+      }
+      "
     `)
   })
 
-  test('theme values added as reference are not included in the output as variables', async () => {
+  test('keyframes are generated when used in an animation', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['animate-foo'],
+        css`
+          @theme {
+            --animate-foo: used 1s infinite;
+            --animate-bar: unused 1s infinite;
+
+            @keyframes used {
+              to {
+                opacity: 1;
+              }
+            }
+
+            @keyframes unused {
+              to {
+                opacity: 0;
+              }
+            }
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --animate-foo: used 1s infinite;
+      }
+
+      .animate-foo {
+        animation: var(--animate-foo);
+      }
+
+      @keyframes used {
+        to {
+          opacity: 1;
+        }
+      }
+      "
+    `)
+  })
+
+  test('keyframes are generated when used in an animation within a prefixed setup', async () => {
+    expect(
+      await run(
+        ['tw:animate-foo'],
+        css`
+          @theme prefix(tw) {
+            --animate-foo: used 1s infinite;
+            --animate-bar: unused 1s infinite;
+
+            @keyframes used {
+              to {
+                opacity: 1;
+              }
+            }
+
+            @keyframes unused {
+              to {
+                opacity: 0;
+              }
+            }
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --tw-animate-foo: used 1s infinite;
+      }
+
+      .tw\\:animate-foo {
+        animation: var(--tw-animate-foo);
+      }
+
+      @keyframes used {
+        to {
+          opacity: 1;
+        }
+      }
+      "
+    `)
+  })
+
+  test('custom properties are generated when used from a CSS var with a prefixed setup', async () => {
+    expect(
+      await compileCss(css`
+        @theme prefix(tw) {
+          --color-tomato: #e10c04;
+        }
+        @tailwind utilities;
+        .red {
+          color: var(--tw-color-tomato);
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --tw-color-tomato: #e10c04;
+      }
+
+      .red {
+        color: var(--tw-color-tomato);
+      }
+      "
+    `)
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/16374
+  test('custom properties in keyframes preserved', async () => {
+    expect(
+      await run(
+        ['animate-foo'],
+        css`
+          @theme {
+            --animate-foo: used 1s infinite;
+
+            @keyframes used {
+              to {
+                --other: var(--angle);
+                --angle: 360deg;
+              }
+            }
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --animate-foo: used 1s infinite;
+      }
+
+      .animate-foo {
+        animation: var(--animate-foo);
+      }
+
+      @keyframes used {
+        to {
+          --other: var(--angle);
+          --angle: 360deg;
+        }
+      }
+      "
+    `)
+  })
+
+  test('keyframes are generated when used in an animation using `@theme inline`', async () => {
+    expect(
+      await run(
+        ['animate-foo'],
+        css`
+          @theme inline {
+            --animate-foo: used 1s infinite;
+            --animate-bar: unused 1s infinite;
+
+            @keyframes used {
+              to {
+                opacity: 1;
+              }
+            }
+
+            @keyframes unused {
+              to {
+                opacity: 0;
+              }
+            }
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .animate-foo {
+        animation: 1s infinite used;
+      }
+
+      @keyframes used {
+        to {
+          opacity: 1;
+        }
+      }
+      "
+    `)
+  })
+
+  test('keyframes are generated when used in an animation using `@theme static`', async () => {
+    expect(
+      await run(
+        ['animate-foo'],
+        css`
+          @theme static {
+            --animate-foo: used 1s infinite;
+            --animate-bar: unused-but-kept 1s infinite;
+
+            @keyframes used {
+              to {
+                opacity: 1;
+              }
+            }
+
+            @keyframes unused-but-kept {
+              to {
+                opacity: 0;
+              }
+            }
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --animate-foo: used 1s infinite;
+        --animate-bar: unused-but-kept 1s infinite;
+      }
+
+      .animate-foo {
+        animation: var(--animate-foo);
+      }
+
+      @keyframes used {
+        to {
+          opacity: 1;
+        }
+      }
+
+      @keyframes unused-but-kept {
+        to {
+          opacity: 0;
+        }
+      }
+      "
+    `)
+  })
+
+  test('keyframes are generated when used in user CSS', async () => {
+    expect(
+      await compileCss(css`
+        @theme {
+          @keyframes used {
+            to {
+              opacity: 1;
+            }
+          }
+
+          @keyframes unused {
+            to {
+              opacity: 0;
+            }
+          }
+        }
+
+        .foo {
+          animation: used 1s infinite;
+        }
+
+        @tailwind utilities;
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      .foo {
+        animation: 1s infinite used;
+      }
+
+      @keyframes used {
+        to {
+          opacity: 1;
+        }
+      }
+      "
+    `)
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/17332
+  test('extracts keyframe names followed by comma', async () => {
+    expect(
+      await run(
+        ['animate-test'],
+        css`
+          @theme {
+            --animate-test: 500ms both fade-in, 1000ms linear 500ms spin infinite;
+
+            @keyframes fade-in {
+              from {
+                opacity: 0%;
+              }
+              to {
+                opacity: 100%;
+              }
+            }
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --animate-test: .5s both fade-in, 1s linear .5s spin infinite;
+      }
+
+      .animate-test {
+        animation: var(--animate-test);
+      }
+
+      @keyframes fade-in {
+        from {
+          opacity: 0;
+        }
+
+        to {
+          opacity: 1;
+        }
+      }
+      "
+    `)
+  })
+
+  test('keyframes outside of `@theme are always preserved', async () => {
+    expect(
+      await compileCss(css`
+        @theme {
+          @keyframes used {
+            to {
+              opacity: 1;
+            }
+          }
+        }
+
+        @keyframes unused {
+          to {
+            opacity: 0;
+          }
+        }
+
+        .foo {
+          animation: used 1s infinite;
+        }
+
+        @tailwind utilities;
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      @keyframes unused {
+        to {
+          opacity: 0;
+        }
+      }
+
+      .foo {
+        animation: 1s infinite used;
+      }
+
+      @keyframes used {
+        to {
+          opacity: 1;
+        }
+      }
+      "
+    `)
+  })
+
+  test('theme values added as reference are not included in the output as variables but emit fallback values', async () => {
+    expect(
+      await run(
+        ['bg-tomato', 'bg-potato'],
         css`
           @theme {
             --color-tomato: #e10c04;
@@ -1480,26 +2544,121 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['bg-tomato', 'bg-potato'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --color-tomato: #e10c04;
       }
 
       .bg-potato {
-        background-color: var(--color-potato);
+        background-color: var(--color-potato, #ac855b);
       }
 
       .bg-tomato {
         background-color: var(--color-tomato);
-      }"
+      }
+      "
+    `)
+  })
+
+  test('`@keyframes` added in `@theme reference` should not be emitted', async () => {
+    return expect(
+      await run(
+        ['animate-foo'],
+        css`
+          @theme reference {
+            --animate-foo: foo 1s infinite;
+
+            @keyframes foo {
+              0%,
+              100% {
+                color: red;
+              }
+              50% {
+                color: blue;
+              }
+            }
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .animate-foo {
+        animation: var(--animate-foo, foo 1s infinite);
+      }
+
+      @keyframes foo {
+        0%, 100% {
+          color: red;
+        }
+
+        50% {
+          color: #00f;
+        }
+      }
+      "
+    `)
+  })
+
+  test('`@keyframes` added in `@theme reference` should not be emitted, even if another `@theme` block exists', async () => {
+    return expect(
+      await run(
+        ['bg-pink', 'animate-foo'],
+        css`
+          @theme reference {
+            --animate-foo: foo 1s infinite;
+
+            @keyframes foo {
+              0%,
+              100% {
+                color: red;
+              }
+              50% {
+                color: blue;
+              }
+            }
+          }
+
+          @theme {
+            --color-pink: pink;
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --color-pink: pink;
+      }
+
+      .animate-foo {
+        animation: var(--animate-foo, foo 1s infinite);
+      }
+
+      .bg-pink {
+        background-color: var(--color-pink);
+      }
+
+      @keyframes foo {
+        0%, 100% {
+          color: red;
+        }
+
+        50% {
+          color: #00f;
+        }
+      }
+      "
     `)
   })
 
   test('theme values added as reference that override existing theme value suppress the output of the original theme value as a variable', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['bg-potato'],
         css`
           @theme {
             --color-potato: #ac855b;
@@ -1509,18 +2668,20 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['bg-potato'],
       ),
     ).toMatchInlineSnapshot(`
-      ".bg-potato {
-        background-color: var(--color-potato);
-      }"
+      "
+      .bg-potato {
+        background-color: var(--color-potato, #c794aa);
+      }
+      "
     `)
   })
 
   test('overriding a reference theme value with a non-reference theme value includes it in the output as a variable', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['bg-potato'],
         css`
           @theme reference {
             --color-potato: #ac855b;
@@ -1530,22 +2691,24 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['bg-potato'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --color-potato: #c794aa;
       }
 
       .bg-potato {
         background-color: var(--color-potato);
-      }"
+      }
+      "
     `)
   })
 
   test('wrapping `@theme` with `@media reference` behaves like `@theme reference` to support `@import` statements', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['bg-tomato', 'bg-potato', 'bg-avocado'],
         css`
           @theme {
             --color-tomato: #e10c04;
@@ -1560,30 +2723,72 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['bg-tomato', 'bg-potato', 'bg-avocado'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --color-tomato: #e10c04;
       }
 
       .bg-avocado {
-        background-color: var(--color-avocado);
+        background-color: var(--color-avocado, #c0cc6d);
       }
 
       .bg-potato {
-        background-color: var(--color-potato);
+        background-color: var(--color-potato, #ac855b);
       }
 
       .bg-tomato {
         background-color: var(--color-tomato);
-      }"
+      }
+      "
     `)
   })
 
-  test('`@media theme(…)` can only contain `@theme` rules', () => {
+  test('`@import "tailwindcss" theme(static)` will always generate theme values, regardless of whether they were used or not', async () => {
+    expect(
+      await run(
+        ['bg-tomato'],
+        css`
+          @import 'tailwindcss' theme(static);
+        `,
+        {
+          async loadStylesheet() {
+            return {
+              path: '',
+              base: '',
+              content: css`
+                @theme {
+                  --color-tomato: #e10c04;
+                  --color-potato: #ac855b;
+                  --color-primary: var(--primary);
+                }
+
+                @tailwind utilities;
+              `,
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --color-tomato: #e10c04;
+        --color-potato: #ac855b;
+        --color-primary: var(--primary);
+      }
+
+      .bg-tomato {
+        background-color: var(--color-tomato);
+      }
+      "
+    `)
+  })
+
+  test('`@media theme(reference)` can only contain `@theme` rules', () => {
     return expect(
-      compileCss(
+      run(
+        ['bg-tomato', 'bg-potato', 'bg-avocado'],
         css`
           @media theme(reference) {
             .not-a-theme-rule {
@@ -1592,16 +2797,19 @@ describe('Parsing themes values from CSS', () => {
           }
           @tailwind utilities;
         `,
-        ['bg-tomato', 'bg-potato', 'bg-avocado'],
       ),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `[Error: Files imported with \`@import "…" theme(…)\` must only contain \`@theme\` blocks.]`,
+      `
+      [Error: Files imported with \`@import "…" theme(reference)\` must only contain \`@theme\` blocks.
+      Use \`@reference "…";\` instead.]
+    `,
     )
   })
 
   test('theme values added as `inline` are not wrapped in `var(…)` when used as utility values', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['bg-tomato', 'bg-potato', 'bg-primary'],
         css`
           @theme inline {
             --color-tomato: #e10c04;
@@ -1611,15 +2819,9 @@ describe('Parsing themes values from CSS', () => {
 
           @tailwind utilities;
         `,
-        ['bg-tomato', 'bg-potato', 'bg-primary'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
-        --color-tomato: #e10c04;
-        --color-potato: #ac855b;
-        --color-primary: var(--primary);
-      }
-
+      "
       .bg-potato {
         background-color: #ac855b;
       }
@@ -1630,13 +2832,104 @@ describe('Parsing themes values from CSS', () => {
 
       .bg-tomato {
         background-color: #e10c04;
-      }"
+      }
+      "
+    `)
+  })
+
+  test('`@import "tailwindcss" theme(inline)` theme values added as `inline` are not wrapped in `var(…)` when used as utility values', async () => {
+    expect(
+      await run(
+        ['bg-tomato'],
+        css`
+          @import 'tailwindcss' theme(inline);
+        `,
+        {
+          async loadStylesheet() {
+            return {
+              path: '',
+              base: '',
+              content: css`
+                @theme {
+                  --color-tomato: #e10c04;
+                  --color-potato: #ac855b;
+                  --color-primary: var(--primary);
+                }
+
+                @tailwind utilities;
+              `,
+            }
+          },
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .bg-tomato {
+        background-color: #e10c04;
+      }
+      "
+    `)
+  })
+
+  test('theme values added as `static` will always be generated, regardless of whether they were used or not', async () => {
+    expect(
+      await run(
+        ['bg-tomato'],
+        css`
+          @theme static {
+            --color-tomato: #e10c04;
+            --color-potato: #ac855b;
+            --color-primary: var(--primary);
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --color-tomato: #e10c04;
+        --color-potato: #ac855b;
+        --color-primary: var(--primary);
+      }
+
+      .bg-tomato {
+        background-color: var(--color-tomato);
+      }
+      "
+    `)
+  })
+
+  test('when no theme values are emitted, empty layers can be removed', async () => {
+    expect(
+      await run(
+        ['underline'],
+        css`
+          @layer theme1 {
+            @layer theme2 {
+              @theme {
+                --color-tomato: #e10c04;
+                --color-potato: #ac855b;
+              }
+            }
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .underline {
+        text-decoration-line: underline;
+      }
+      "
     `)
   })
 
   test('wrapping `@theme` with `@media theme(inline)` behaves like `@theme inline` to support `@import` statements', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['bg-tomato', 'bg-potato', 'bg-primary'],
         css`
           @media theme(inline) {
             @theme {
@@ -1648,15 +2941,9 @@ describe('Parsing themes values from CSS', () => {
 
           @tailwind utilities;
         `,
-        ['bg-tomato', 'bg-potato', 'bg-primary'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
-        --color-tomato: #e10c04;
-        --color-potato: #ac855b;
-        --color-primary: var(--primary);
-      }
-
+      "
       .bg-potato {
         background-color: #ac855b;
       }
@@ -1667,13 +2954,15 @@ describe('Parsing themes values from CSS', () => {
 
       .bg-tomato {
         background-color: #e10c04;
-      }"
+      }
+      "
     `)
   })
 
   test('`inline` and `reference` can be used together', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['bg-tomato', 'bg-potato', 'bg-primary'],
         css`
           @theme reference inline {
             --color-tomato: #e10c04;
@@ -1683,10 +2972,10 @@ describe('Parsing themes values from CSS', () => {
 
           @tailwind utilities;
         `,
-        ['bg-tomato', 'bg-potato', 'bg-primary'],
       ),
     ).toMatchInlineSnapshot(`
-      ".bg-potato {
+      "
+      .bg-potato {
         background-color: #ac855b;
       }
 
@@ -1696,13 +2985,15 @@ describe('Parsing themes values from CSS', () => {
 
       .bg-tomato {
         background-color: #e10c04;
-      }"
+      }
+      "
     `)
   })
 
   test('`inline` and `reference` can be used together in `media(…)`', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['bg-tomato', 'bg-potato', 'bg-primary'],
         css`
           @media theme(reference inline) {
             @theme {
@@ -1714,10 +3005,10 @@ describe('Parsing themes values from CSS', () => {
 
           @tailwind utilities;
         `,
-        ['bg-tomato', 'bg-potato', 'bg-primary'],
       ),
     ).toMatchInlineSnapshot(`
-      ".bg-potato {
+      "
+      .bg-potato {
         background-color: #ac855b;
       }
 
@@ -1727,13 +3018,15 @@ describe('Parsing themes values from CSS', () => {
 
       .bg-tomato {
         background-color: #e10c04;
-      }"
+      }
+      "
     `)
   })
 
   test('`default` theme values can be overridden by regular theme values`', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['bg-potato'],
         css`
           @theme {
             --color-potato: #ac855b;
@@ -1744,22 +3037,24 @@ describe('Parsing themes values from CSS', () => {
 
           @tailwind utilities;
         `,
-        ['bg-potato'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --color-potato: #ac855b;
       }
 
       .bg-potato {
         background-color: var(--color-potato);
-      }"
+      }
+      "
     `)
   })
 
   test('`default` and `inline` can be used together', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['bg-potato'],
         css`
           @theme default inline {
             --color-potato: #efb46b;
@@ -1767,22 +3062,20 @@ describe('Parsing themes values from CSS', () => {
 
           @tailwind utilities;
         `,
-        ['bg-potato'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
-        --color-potato: #efb46b;
-      }
-
+      "
       .bg-potato {
         background-color: #efb46b;
-      }"
+      }
+      "
     `)
   })
 
   test('`default` and `reference` can be used together', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['bg-potato'],
         css`
           @theme default reference {
             --color-potato: #efb46b;
@@ -1790,18 +3083,20 @@ describe('Parsing themes values from CSS', () => {
 
           @tailwind utilities;
         `,
-        ['bg-potato'],
       ),
     ).toMatchInlineSnapshot(`
-      ".bg-potato {
-        background-color: var(--color-potato);
-      }"
+      "
+      .bg-potato {
+        background-color: var(--color-potato, #efb46b);
+      }
+      "
     `)
   })
 
   test('`default`, `inline`, and `reference` can be used together', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['bg-potato'],
         css`
           @theme default reference inline {
             --color-potato: #efb46b;
@@ -1809,18 +3104,20 @@ describe('Parsing themes values from CSS', () => {
 
           @tailwind utilities;
         `,
-        ['bg-potato'],
       ),
     ).toMatchInlineSnapshot(`
-      ".bg-potato {
+      "
+      .bg-potato {
         background-color: #efb46b;
-      }"
+      }
+      "
     `)
   })
 
   test('`default` can be used in `media(…)`', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['bg-potato', 'bg-tomato'],
         css`
           @media theme() {
             @theme {
@@ -1836,10 +3133,10 @@ describe('Parsing themes values from CSS', () => {
 
           @tailwind utilities;
         `,
-        ['bg-potato', 'bg-tomato'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --color-potato: #ac855b;
         --color-tomato: tomato;
       }
@@ -1850,43 +3147,47 @@ describe('Parsing themes values from CSS', () => {
 
       .bg-tomato {
         background-color: var(--color-tomato);
-      }"
+      }
+      "
     `)
   })
 
   test('`default` theme values can be overridden by plugin theme values', async () => {
-    let { build } = await compile(
-      css`
-        @theme default {
-          --color-red: red;
-        }
-        @theme {
-          --color-orange: orange;
-        }
-        @plugin "my-plugin";
-        @tailwind utilities;
-      `,
-      {
-        loadModule: async () => {
-          return {
-            module: plugin(({}) => {}, {
-              theme: {
-                extend: {
-                  colors: {
-                    red: 'tomato',
-                    orange: '#f28500',
+    expect(
+      await run(
+        ['text-red', 'text-orange'],
+        css`
+          @theme default {
+            --color-red: red;
+          }
+          @theme {
+            --color-orange: orange;
+          }
+          @plugin "my-plugin";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => {
+            return {
+              path: '',
+              base: '/root',
+              module: plugin(({}) => {}, {
+                theme: {
+                  extend: {
+                    colors: {
+                      red: 'tomato',
+                      orange: '#f28500',
+                    },
                   },
                 },
-              },
-            }),
-            base: '/root',
-          }
+              }),
+            }
+          },
         },
-      },
-    )
-
-    expect(optimizeCss(build(['text-red', 'text-orange'])).trim()).toMatchInlineSnapshot(`
-      ":root {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
         --color-orange: orange;
       }
 
@@ -1896,43 +3197,47 @@ describe('Parsing themes values from CSS', () => {
 
       .text-red {
         color: tomato;
-      }"
+      }
+      "
     `)
   })
 
   test('`default` theme values can be overridden by config theme values', async () => {
-    let { build } = await compile(
-      css`
-        @theme default {
-          --color-red: red;
-        }
-        @theme {
-          --color-orange: orange;
-        }
-        @config "./my-config.js";
-        @tailwind utilities;
-      `,
-      {
-        loadModule: async () => {
-          return {
-            module: {
-              theme: {
-                extend: {
-                  colors: {
-                    red: 'tomato',
-                    orange: '#f28500',
+    expect(
+      await run(
+        ['text-red', 'text-orange'],
+        css`
+          @theme default {
+            --color-red: red;
+          }
+          @theme {
+            --color-orange: orange;
+          }
+          @config "./my-config.js";
+          @tailwind utilities;
+        `,
+        {
+          loadModule: async () => {
+            return {
+              path: '',
+              base: '/root',
+              module: {
+                theme: {
+                  extend: {
+                    colors: {
+                      red: 'tomato',
+                      orange: '#f28500',
+                    },
                   },
                 },
               },
-            },
-            base: '/root',
-          }
+            }
+          },
         },
-      },
-    )
-
-    expect(optimizeCss(build(['text-red', 'text-orange'])).trim()).toMatchInlineSnapshot(`
-      ":root {
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
         --color-orange: orange;
       }
 
@@ -1942,7 +3247,58 @@ describe('Parsing themes values from CSS', () => {
 
       .text-red {
         color: tomato;
-      }"
+      }
+      "
+    `)
+  })
+
+  test('only emits theme variables that are used outside of being defined by another variable', async () => {
+    expect(
+      await run(
+        ['get-var-b', 'get-var-two'],
+        css`
+          @theme {
+            --var-a: var(--var-b);
+            --var-b: var(--var-c);
+            --var-c: var(--var-d);
+            --var-d: red;
+
+            --var-four: green;
+            --var-three: var(--var-four);
+            --var-two: var(--var-three);
+            --var-one: var(--var-two);
+
+            --var-eins: var(--var-zwei);
+            --var-zwei: var(--var-drei);
+            --var-drei: var(--var-vier);
+            --var-vier: blue;
+          }
+
+          @utility get-var-* {
+            color: --value(--var-\*);
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --var-b: var(--var-c);
+        --var-c: var(--var-d);
+        --var-d: red;
+        --var-four: green;
+        --var-three: var(--var-four);
+        --var-two: var(--var-three);
+      }
+
+      .get-var-b {
+        color: var(--var-b);
+      }
+
+      .get-var-two {
+        color: var(--var-two);
+      }
+      "
     `)
   })
 })
@@ -1956,17 +3312,18 @@ describe('plugins', () => {
         `,
         {
           loadModule: async () => ({
+            path: '',
+            base: '/root',
             module: ({ addVariant }: PluginAPI) => {
               addVariant('hocus', '&:hover, &:focus')
             },
-            base: '/root',
           }),
         },
       ),
     ).rejects.toThrowErrorMatchingInlineSnapshot(`[Error: \`@plugin\` must have a path.]`)
   })
 
-  test('@plugin can not have an empty path', () => {
+  test('@plugin cannot have an empty path', () => {
     return expect(
       compile(
         css`
@@ -1974,10 +3331,11 @@ describe('plugins', () => {
         `,
         {
           loadModule: async () => ({
+            path: '',
+            base: '/root',
             module: ({ addVariant }: PluginAPI) => {
               addVariant('hocus', '&:hover, &:focus')
             },
-            base: '/root',
           }),
         },
       ),
@@ -1994,10 +3352,11 @@ describe('plugins', () => {
         `,
         {
           loadModule: async () => ({
+            path: '',
+            base: '/root',
             module: ({ addVariant }: PluginAPI) => {
               addVariant('hocus', '&:hover, &:focus')
             },
-            base: '/root',
           }),
         },
       ),
@@ -2007,39 +3366,41 @@ describe('plugins', () => {
   test('@plugin can accept options', async () => {
     expect.hasAssertions()
 
-    let { build } = await compile(
-      css`
-        @tailwind utilities;
-        @plugin "my-plugin" {
-          color: red;
-        }
-      `,
-      {
-        loadModule: async () => ({
-          module: plugin.withOptions((options) => {
-            expect(options).toEqual({
-              color: 'red',
-            })
-
-            return ({ addUtilities }) => {
-              addUtilities({
-                '.text-primary': {
-                  color: options.color,
-                },
+    expect(
+      await run(
+        ['text-primary'],
+        css`
+          @tailwind utilities;
+          @plugin "my-plugin" {
+            color: red;
+          }
+        `,
+        {
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: plugin.withOptions((options) => {
+              expect(options).toEqual({
+                color: 'red',
               })
-            }
+
+              return ({ addUtilities }) => {
+                addUtilities({
+                  '.text-primary': {
+                    color: options.color,
+                  },
+                })
+              }
+            }),
           }),
-          base: '/root',
-        }),
-      },
-    )
-
-    let compiled = build(['text-primary'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      ".text-primary {
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .text-primary {
         color: red;
-      }"
+      }
+      "
     `)
   })
 
@@ -2068,6 +3429,8 @@ describe('plugins', () => {
       `,
       {
         loadModule: async () => ({
+          path: '',
+          base: '/root',
           module: plugin.withOptions((options) => {
             expect(options).toEqual({
               'is-null': null,
@@ -2088,7 +3451,6 @@ describe('plugins', () => {
 
             return () => {}
           }),
-          base: '/root',
         }),
       },
     )
@@ -2108,6 +3470,8 @@ describe('plugins', () => {
         `,
         {
           loadModule: async () => ({
+            path: '',
+            base: '/root',
             module: plugin.withOptions((options) => {
               return ({ addUtilities }) => {
                 addUtilities({
@@ -2117,7 +3481,6 @@ describe('plugins', () => {
                 })
               }
             }),
-            base: '/root',
           }),
         },
       ),
@@ -2146,6 +3509,8 @@ describe('plugins', () => {
         `,
         {
           loadModule: async () => ({
+            path: '',
+            base: '/root',
             module: plugin(({ addUtilities }) => {
               addUtilities({
                 '.text-primary': {
@@ -2153,7 +3518,6 @@ describe('plugins', () => {
                 },
               })
             }),
-            base: '/root',
           }),
         },
       ),
@@ -2171,7 +3535,11 @@ describe('plugins', () => {
           }
         `,
         {
-          loadModule: async () => ({ module: plugin(() => {}), base: '/root' }),
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: plugin(() => {}),
+          }),
         },
       ),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
@@ -2192,7 +3560,11 @@ describe('plugins', () => {
           }
         `,
         {
-          loadModule: async () => ({ module: plugin(() => {}), base: '/root' }),
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: plugin(() => {}),
+          }),
         },
       ),
     ).rejects.toThrowErrorMatchingInlineSnapshot(`
@@ -2207,138 +3579,148 @@ describe('plugins', () => {
   })
 
   test('addVariant with string selector', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async () => ({
-          module: ({ addVariant }: PluginAPI) => {
-            addVariant('hocus', '&:hover, &:focus')
-          },
-          base: '/root',
-        }),
-      },
-    )
-    let compiled = build(['hocus:underline', 'group-hocus:flex'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
-        .group-hocus\\:flex:is(:is(:where(.group):hover, :where(.group):focus) *) {
+    expect(
+      await run(
+        ['hocus:underline', 'group-hocus:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: ({ addVariant }: PluginAPI) => {
+              addVariant('hocus', '&:hover, &:focus')
+            },
+          }),
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        :is(:is(:where(.group):hover, :where(.group):focus) .group-hocus\\:flex) {
           display: flex;
         }
 
         .hocus\\:underline:hover, .hocus\\:underline:focus {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('addVariant with array of selectors', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async () => ({
-          module: ({ addVariant }: PluginAPI) => {
-            addVariant('hocus', ['&:hover', '&:focus'])
-          },
-          base: '/root',
-        }),
-      },
-    )
-
-    let compiled = build(['hocus:underline', 'group-hocus:flex'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
-        .group-hocus\\:flex:is(:where(.group):hover *), .group-hocus\\:flex:is(:where(.group):focus *) {
+    expect(
+      await run(
+        ['hocus:underline', 'group-hocus:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: ({ addVariant }: PluginAPI) => {
+              addVariant('hocus', ['&:hover', '&:focus'])
+            },
+          }),
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        :is(:where(.group):hover .group-hocus\\:flex), :is(:where(.group):focus .group-hocus\\:flex) {
           display: flex;
         }
 
         .hocus\\:underline:hover, .hocus\\:underline:focus {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('addVariant with object syntax and @slot', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async () => ({
-          module: ({ addVariant }: PluginAPI) => {
-            addVariant('hocus', {
-              '&:hover': '@slot',
-              '&:focus': '@slot',
-            })
-          },
-          base: '/root',
-        }),
-      },
-    )
-    let compiled = build(['hocus:underline', 'group-hocus:flex'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
-        .group-hocus\\:flex:is(:where(.group):hover *), .group-hocus\\:flex:is(:where(.group):focus *) {
+    expect(
+      await run(
+        ['hocus:underline', 'group-hocus:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: ({ addVariant }: PluginAPI) => {
+              addVariant('hocus', {
+                '&:hover': '@slot',
+                '&:focus': '@slot',
+              })
+            },
+          }),
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        :is(:where(.group):hover .group-hocus\\:flex), :is(:where(.group):focus .group-hocus\\:flex) {
           display: flex;
         }
 
         .hocus\\:underline:hover, .hocus\\:underline:focus {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('addVariant with object syntax, media, nesting and multiple @slot', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async () => ({
-          module: ({ addVariant }: PluginAPI) => {
-            addVariant('hocus', {
-              '@media (hover: hover)': {
-                '&:hover': '@slot',
-              },
-              '&:focus': '@slot',
-            })
-          },
-          base: '/root',
-        }),
-      },
-    )
-    let compiled = build(['hocus:underline', 'group-hocus:flex'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+    expect(
+      await run(
+        ['hocus:underline', 'group-hocus:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: ({ addVariant }: PluginAPI) => {
+              addVariant('hocus', {
+                '@media (hover: hover)': {
+                  '&:hover': '@slot',
+                },
+                '&:focus': '@slot',
+              })
+            },
+          }),
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         @media (hover: hover) {
-          .group-hocus\\:flex:is(:where(.group):hover *) {
+          :is(:where(.group):hover .group-hocus\\:flex) {
             display: flex;
           }
         }
 
-        .group-hocus\\:flex:is(:where(.group):focus *) {
+        :is(:where(.group):focus .group-hocus\\:flex) {
           display: flex;
         }
 
@@ -2351,37 +3733,40 @@ describe('plugins', () => {
         .hocus\\:underline:focus {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('@slot is preserved when used as a custom property value', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async () => ({
-          module: ({ addVariant }: PluginAPI) => {
-            addVariant('hocus', {
-              '&': {
-                '--custom-property': '@slot',
-                '&:hover': '@slot',
-                '&:focus': '@slot',
-              },
-            })
-          },
-          base: '/root',
-        }),
-      },
-    )
-    let compiled = build(['hocus:underline'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+    expect(
+      await run(
+        ['hocus:underline'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: ({ addVariant }: PluginAPI) => {
+              addVariant('hocus', {
+                '&': {
+                  '--custom-property': '@slot',
+                  '&:hover': '@slot',
+                  '&:focus': '@slot',
+                },
+              })
+            },
+          }),
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         .hocus\\:underline {
           --custom-property: @slot;
         }
@@ -2389,35 +3774,36 @@ describe('plugins', () => {
         .hocus\\:underline:hover, .hocus\\:underline:focus {
           text-decoration-line: underline;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('built-in variants can be overridden while keeping their order', async () => {
-    let { build } = await compile(
-      css`
-        @plugin "my-plugin";
-        @layer utilities {
-          @tailwind utilities;
-        }
-      `,
-      {
-        loadModule: async () => ({
-          module: ({ addVariant }: PluginAPI) => {
-            addVariant('dark', '&:is([data-theme=dark] *)')
-          },
-          base: '/root',
-        }),
-      },
-    )
-    let compiled = build(
-      // Make sure the order does not change by including the variants
-      // immediately before and after `dark`
-      ['rtl:flex', 'dark:flex', 'starting:flex'],
-    )
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
+    expect(
+      await run(
+        // Make sure the order does not change by including the variants
+        // immediately before and after `dark`
+        ['rtl:flex', 'dark:flex', 'starting:flex'],
+        css`
+          @plugin "my-plugin";
+          @layer utilities {
+            @tailwind utilities;
+          }
+        `,
+        {
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: ({ addVariant }: PluginAPI) => {
+              addVariant('dark', '&:is([data-theme=dark] *)')
+            },
+          }),
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
         .rtl\\:flex:where(:dir(rtl), [dir="rtl"], [dir="rtl"] *), .dark\\:flex:is([data-theme="dark"] *) {
           display: flex;
         }
@@ -2427,25 +3813,26 @@ describe('plugins', () => {
             display: flex;
           }
         }
-      }"
+      }
+      "
     `)
   })
 })
 
 describe('@source', () => {
   test('emits @source files', async () => {
-    let { globs } = await compile(
+    let { sources } = await compile(
       css`
         @source "./foo/bar/*.ts";
       `,
       { base: '/root' },
     )
 
-    expect(globs).toEqual([{ pattern: './foo/bar/*.ts', base: '/root' }])
+    expect(sources).toEqual([{ pattern: './foo/bar/*.ts', base: '/root', negated: false }])
   })
 
   test('emits multiple @source files', async () => {
-    let { globs } = await compile(
+    let { sources } = await compile(
       css`
         @source "./foo/**/*.ts";
         @source "./php/secr3t/smarty.php";
@@ -2453,95 +3840,392 @@ describe('@source', () => {
       { base: '/root' },
     )
 
-    expect(globs).toEqual([
-      { pattern: './foo/**/*.ts', base: '/root' },
-      { pattern: './php/secr3t/smarty.php', base: '/root' },
+    expect(sources).toEqual([
+      { pattern: './foo/**/*.ts', base: '/root', negated: false },
+      { pattern: './php/secr3t/smarty.php', base: '/root', negated: false },
     ])
   })
+
+  test('emits negated @source files', async () => {
+    let { sources } = await compile(
+      css`
+        @source not "./foo/**/*.ts";
+        @source not "./php/secr3t/smarty.php";
+      `,
+      { base: '/root' },
+    )
+
+    expect(sources).toEqual([
+      { pattern: './foo/**/*.ts', base: '/root', negated: true },
+      { pattern: './php/secr3t/smarty.php', base: '/root', negated: true },
+    ])
+  })
+
+  describe('@source inline(…)', () => {
+    test('always includes the candidate', async () => {
+      expect(
+        await compileCss(css`
+          @source inline("underline");
+          @tailwind utilities;
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .underline {
+          text-decoration-line: underline;
+        }
+        "
+      `)
+    })
+
+    test('applies brace expansion', async () => {
+      expect(
+        await compileCss(css`
+          @theme {
+            --color-red-50: oklch(0.971 0.013 17.38);
+            --color-red-100: oklch(0.936 0.032 17.717);
+            --color-red-200: oklch(0.885 0.062 18.334);
+            --color-red-300: oklch(0.808 0.114 19.571);
+            --color-red-400: oklch(0.704 0.191 22.216);
+            --color-red-500: oklch(0.637 0.237 25.331);
+            --color-red-600: oklch(0.577 0.245 27.325);
+            --color-red-700: oklch(0.505 0.213 27.518);
+            --color-red-800: oklch(0.444 0.177 26.899);
+            --color-red-900: oklch(0.396 0.141 25.723);
+            --color-red-950: oklch(0.258 0.092 26.042);
+          }
+          @source inline("bg-red-{50,{100..900..100},950}");
+          @tailwind utilities;
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        :root, :host {
+          --color-red-50: oklch(97.1% .013 17.38);
+          --color-red-100: oklch(93.6% .032 17.717);
+          --color-red-200: oklch(88.5% .062 18.334);
+          --color-red-300: oklch(80.8% .114 19.571);
+          --color-red-400: oklch(70.4% .191 22.216);
+          --color-red-500: oklch(63.7% .237 25.331);
+          --color-red-600: oklch(57.7% .245 27.325);
+          --color-red-700: oklch(50.5% .213 27.518);
+          --color-red-800: oklch(44.4% .177 26.899);
+          --color-red-900: oklch(39.6% .141 25.723);
+          --color-red-950: oklch(25.8% .092 26.042);
+        }
+
+        .bg-red-50 {
+          background-color: var(--color-red-50);
+        }
+
+        .bg-red-100 {
+          background-color: var(--color-red-100);
+        }
+
+        .bg-red-200 {
+          background-color: var(--color-red-200);
+        }
+
+        .bg-red-300 {
+          background-color: var(--color-red-300);
+        }
+
+        .bg-red-400 {
+          background-color: var(--color-red-400);
+        }
+
+        .bg-red-500 {
+          background-color: var(--color-red-500);
+        }
+
+        .bg-red-600 {
+          background-color: var(--color-red-600);
+        }
+
+        .bg-red-700 {
+          background-color: var(--color-red-700);
+        }
+
+        .bg-red-800 {
+          background-color: var(--color-red-800);
+        }
+
+        .bg-red-900 {
+          background-color: var(--color-red-900);
+        }
+
+        .bg-red-950 {
+          background-color: var(--color-red-950);
+        }
+        "
+      `)
+    })
+
+    test('adds multiple inline sources separated by spaces', async () => {
+      expect(
+        await compileCss(css`
+          @theme {
+            --color-red-100: oklch(0.936 0.032 17.717);
+            --color-red-200: oklch(0.885 0.062 18.334);
+          }
+          @source inline("block bg-red-{100..200..100}");
+          @tailwind utilities;
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        :root, :host {
+          --color-red-100: oklch(93.6% .032 17.717);
+          --color-red-200: oklch(88.5% .062 18.334);
+        }
+
+        .block {
+          display: block;
+        }
+
+        .bg-red-100 {
+          background-color: var(--color-red-100);
+        }
+
+        .bg-red-200 {
+          background-color: var(--color-red-200);
+        }
+        "
+      `)
+    })
+
+    test('ignores invalid inline candidates', async () => {
+      expect(
+        await compileCss(css`
+          @source inline("my-cucumber");
+          @tailwind utilities;
+        `),
+      ).toEqual('')
+    })
+
+    test('can be negated', async () => {
+      expect(
+        await run(
+          ['container'],
+          css`
+            @theme {
+              --breakpoint-sm: 40rem;
+              --breakpoint-md: 48rem;
+              --breakpoint-lg: 64rem;
+              --breakpoint-xl: 80rem;
+              --breakpoint-2xl: 96rem;
+            }
+            @source not inline("container");
+            @tailwind utilities;
+          `,
+        ),
+      ).toEqual('')
+    })
+
+    test('applies brace expansion to negated sources', async () => {
+      expect(
+        await run(
+          ['bg-red-500', 'bg-red-700'],
+          css`
+            @theme {
+              --color-red-50: oklch(0.971 0.013 17.38);
+              --color-red-100: oklch(0.936 0.032 17.717);
+              --color-red-200: oklch(0.885 0.062 18.334);
+              --color-red-300: oklch(0.808 0.114 19.571);
+              --color-red-400: oklch(0.704 0.191 22.216);
+              --color-red-500: oklch(0.637 0.237 25.331);
+              --color-red-600: oklch(0.577 0.245 27.325);
+              --color-red-700: oklch(0.505 0.213 27.518);
+              --color-red-800: oklch(0.444 0.177 26.899);
+              --color-red-900: oklch(0.396 0.141 25.723);
+              --color-red-950: oklch(0.258 0.092 26.042);
+            }
+            @source not inline("bg-red-{50,{100..900..100},950}");
+            @tailwind utilities;
+          `,
+        ),
+      ).toEqual('')
+    })
+
+    test('works with whitespace around the argument', async () => {
+      expect(
+        await compileCss(css`
+          /* prettier-ignore */
+          @source inline( "underline" );
+          @tailwind utilities;
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .underline {
+          text-decoration-line: underline;
+        }
+        "
+      `)
+    })
+
+    test('works with newlines around the argument', async () => {
+      expect(
+        await compileCss(css`
+          /* prettier-ignore */
+          @source inline(
+            "underline"
+          );
+          @tailwind utilities;
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .underline {
+          text-decoration-line: underline;
+        }
+        "
+      `)
+    })
+  })
 })
 
-describe('@variant', () => {
-  test('@variant must be top-level and cannot be nested', () => {
+describe('@custom-variant', () => {
+  test('@custom-variant must be top-level and cannot be nested', () => {
+    return expect(
+      compileCss(css`
+        @custom-variant foo:bar (&:hover, &:focus);
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: \`@custom-variant foo:bar\` defines an invalid variant name. Variants should only contain alphanumeric, dashes, or underscore characters and start with a lowercase letter or number.]`,
+    )
+  })
+
+  test.each([
+    // Cannot be a dash on its own
+    [`@custom-variant - (&);`],
+    // Cannot be multiple dashes on their own
+    [`@custom-variant --- (&);`],
+    // Cannot be an underscore on its own
+    [`@custom-variant _ (&);`],
+    // Cannot be multiple underscores on their own
+    [`@custom-variant ___ (&);`],
+
+    // Cannot start with a dash
+    [`@custom-variant -foo (&);`],
+    [`@custom-variant --foo (&);`],
+    // Cannot start with an underscore
+    [`@custom-variant _foo (&);`],
+    [`@custom-variant __foo (&);`],
+
+    // Cannot end with a dash
+    [`@custom-variant foo- (&);`],
+    [`@custom-variant foo-- (&);`],
+    // Cannot end with an underscore
+    [`@custom-variant foo_ (&);`],
+    [`@custom-variant foo__ (&);`],
+  ])('@custom-variant must have a valid name', (input) => {
+    return expect(compileCss(input)).rejects.toThrow()
+  })
+
+  test('@custom-variant must not contain special characters', () => {
     return expect(
       compileCss(css`
         .foo {
-          @variant hocus (&:hover, &:focus);
+          @custom-variant foo:bar (&:hover, &:focus);
         }
       `),
-    ).rejects.toThrowErrorMatchingInlineSnapshot(`[Error: \`@variant\` cannot be nested.]`)
+    ).rejects.toThrowErrorMatchingInlineSnapshot(`[Error: \`@custom-variant\` cannot be nested.]`)
   })
 
-  test('@variant with no body must include a selector', () => {
+  test('@custom-variant must not have an empty selector', () => {
     return expect(
       compileCss(css`
-        @variant hocus;
+        @custom-variant foo ();
       `),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
-      '[Error: `@variant hocus` has no selector or body.]',
+      `[Error: \`@custom-variant foo ()\` selector is invalid.]`,
     )
   })
 
-  test('@variant with selector must include a body', () => {
+  test('@custom-variant with multiple selectors, cannot be empty', () => {
     return expect(
       compileCss(css`
-        @variant hocus {
-        }
+        @custom-variant foo (.foo, .bar, );
       `),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
-      '[Error: `@variant hocus` has no selector or body.]',
+      `[Error: \`@custom-variant foo (.foo, .bar, )\` selector is invalid.]`,
     )
   })
 
-  test('@variant cannot have both a selector and a body', () => {
+  test('@custom-variant with no body must include a selector', () => {
     return expect(
       compileCss(css`
-        @variant hocus (&:hover, &:focus) {
+        @custom-variant hocus;
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      '[Error: `@custom-variant hocus` has no selector or body.]',
+    )
+  })
+
+  test('@custom-variant with selector must include a body', () => {
+    return expect(
+      compileCss(css`
+        @custom-variant hocus {
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      '[Error: `@custom-variant hocus` has no selector or body.]',
+    )
+  })
+
+  test('@custom-variant cannot have both a selector and a body', () => {
+    return expect(
+      compileCss(css`
+        @custom-variant hocus (&:hover, &:focus) {
           &:is(.potato) {
             @slot;
           }
         }
       `),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `[Error: \`@variant hocus\` cannot have both a selector and a body.]`,
+      `[Error: \`@custom-variant hocus\` cannot have both a selector and a body.]`,
     )
   })
 
   describe('body-less syntax', () => {
     test('selector variant', async () => {
-      let { build } = await compile(css`
-        @variant hocus (&:hover, &:focus);
+      expect(
+        await run(
+          ['hocus:underline', 'group-hocus:flex'],
+          css`
+            @custom-variant hocus (&:hover, &:focus);
 
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
         @layer utilities {
-          @tailwind utilities;
-        }
-      `)
-      let compiled = build(['hocus:underline', 'group-hocus:flex'])
-
-      expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-        "@layer utilities {
-          .group-hocus\\:flex:is(:is(:where(.group):hover, :where(.group):focus) *) {
+          :is(:is(:where(.group):hover, :where(.group):focus) .group-hocus\\:flex) {
             display: flex;
           }
 
           .hocus\\:underline:hover, .hocus\\:underline:focus {
             text-decoration-line: underline;
           }
-        }"
+        }
+        "
       `)
     })
 
     test('at-rule variant', async () => {
-      let { build } = await compile(css`
-        @variant any-hover (@media (any-hover: hover));
+      expect(
+        await run(
+          ['any-hover:hover:underline'],
+          css`
+            @custom-variant any-hover (@media (any-hover: hover));
 
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
         @layer utilities {
-          @tailwind utilities;
-        }
-      `)
-      let compiled = build(['any-hover:hover:underline'])
-
-      expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-        "@layer utilities {
           @media (any-hover: hover) {
             @media (hover: hover) {
               .any-hover\\:hover\\:underline:hover {
@@ -2549,136 +4233,156 @@ describe('@variant', () => {
               }
             }
           }
-        }"
+        }
+        "
       `)
     })
 
     test('style-rules and at-rules', async () => {
-      let { build } = await compile(css`
-        @variant cant-hover (&:not(:hover), &:not(:active), @media not (any-hover: hover), @media not (pointer: fine));
+      expect(
+        await run(
+          ['cant-hover:focus:underline'],
+          css`
+            @custom-variant cant-hover (&:not(:hover), &:not(:active), @media not (any-hover: hover), @media not (pointer: fine));
 
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
         @layer utilities {
-          @tailwind utilities;
-        }
-      `)
-      let compiled = build(['cant-hover:focus:underline'])
-
-      expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-        "@layer utilities {
           :is(.cant-hover\\:focus\\:underline:not(:hover), .cant-hover\\:focus\\:underline:not(:active)):focus {
             text-decoration-line: underline;
           }
 
-          @media not (any-hover: hover) {
+          @media not all and (any-hover: hover) {
             .cant-hover\\:focus\\:underline:focus {
               text-decoration-line: underline;
             }
           }
 
-          @media not (pointer: fine) {
+          @media not all and (pointer: fine) {
             .cant-hover\\:focus\\:underline:focus {
               text-decoration-line: underline;
             }
           }
-        }"
+        }
+        "
       `)
     })
   })
 
   describe('body with @slot syntax', () => {
     test('selector with @slot', async () => {
-      let { build } = await compile(css`
-        @variant selected {
-          &[data-selected] {
-            @slot;
-          }
-        }
+      expect(
+        await run(
+          ['selected:underline', 'group-selected:underline'],
+          css`
+            @custom-variant selected {
+              &[data-selected] {
+                @slot;
+              }
+            }
 
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
         @layer utilities {
-          @tailwind utilities;
-        }
-      `)
-      let compiled = build(['selected:underline', 'group-selected:underline'])
-
-      expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-        "@layer utilities {
-          .group-selected\\:underline:is(:where(.group)[data-selected] *), .selected\\:underline[data-selected] {
+          :is(:where(.group)[data-selected] .group-selected\\:underline), .selected\\:underline[data-selected] {
             text-decoration-line: underline;
           }
-        }"
+        }
+        "
       `)
     })
 
     test('grouped selectors with @slot', async () => {
-      let { build } = await compile(css`
-        @variant hocus {
-          &:hover,
-          &:focus {
-            @slot;
-          }
-        }
+      expect(
+        await run(
+          ['hocus:underline', 'group-hocus:underline'],
+          css`
+            @custom-variant hocus {
+              &:hover,
+              &:focus {
+                @slot;
+              }
+            }
 
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
         @layer utilities {
-          @tailwind utilities;
-        }
-      `)
-      let compiled = build(['hocus:underline', 'group-hocus:underline'])
-
-      expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-        "@layer utilities {
-          .group-hocus\\:underline:is(:is(:where(.group):hover, :where(.group):focus) *), .hocus\\:underline:hover, .hocus\\:underline:focus {
+          :is(:is(:where(.group):hover, :where(.group):focus) .group-hocus\\:underline), .hocus\\:underline:hover, .hocus\\:underline:focus {
             text-decoration-line: underline;
           }
-        }"
+        }
+        "
       `)
     })
 
     test('multiple selectors with @slot', async () => {
-      let { build } = await compile(css`
-        @variant hocus {
-          &:hover {
-            @slot;
-          }
+      expect(
+        await run(
+          ['hocus:underline', 'group-hocus:underline'],
+          css`
+            @custom-variant hocus {
+              &:hover {
+                @slot;
+              }
 
-          &:focus {
-            @slot;
-          }
-        }
+              &:focus {
+                @slot;
+              }
+            }
 
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
         @layer utilities {
-          @tailwind utilities;
-        }
-      `)
-      let compiled = build(['hocus:underline', 'group-hocus:underline'])
-
-      expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-        "@layer utilities {
-          .group-hocus\\:underline:is(:where(.group):hover *), .group-hocus\\:underline:is(:where(.group):focus *), .hocus\\:underline:hover, .hocus\\:underline:focus {
+          :is(:where(.group):hover .group-hocus\\:underline), :is(:where(.group):focus .group-hocus\\:underline), .hocus\\:underline:hover, .hocus\\:underline:focus {
             text-decoration-line: underline;
           }
-        }"
+        }
+        "
       `)
     })
 
     test('nested selector with @slot', async () => {
-      let { build } = await compile(css`
-        @variant custom-before {
-          & {
-            --has-before: 1;
-            &::before {
-              @slot;
+      expect(
+        await run(
+          ['custom-before:underline'],
+          css`
+            @custom-variant custom-before {
+              & {
+                --has-before: 1;
+                &::before {
+                  @slot;
+                }
+              }
             }
-          }
-        }
 
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
         @layer utilities {
-          @tailwind utilities;
-        }
-      `)
-      let compiled = build(['custom-before:underline'])
-
-      expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-        "@layer utilities {
           .custom-before\\:underline {
             --has-before: 1;
           }
@@ -2686,32 +4390,36 @@ describe('@variant', () => {
           .custom-before\\:underline:before {
             text-decoration-line: underline;
           }
-        }"
+        }
+        "
       `)
     })
 
     test('grouped nested selectors with @slot', async () => {
-      let { build } = await compile(css`
-        @variant custom-before {
-          & {
-            --has-before: 1;
-            &::before {
-              &:hover,
-              &:focus {
-                @slot;
+      expect(
+        await run(
+          ['custom-before:underline'],
+          css`
+            @custom-variant custom-before {
+              & {
+                --has-before: 1;
+                &::before {
+                  &:hover,
+                  &:focus {
+                    @slot;
+                  }
+                }
               }
             }
-          }
-        }
 
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
         @layer utilities {
-          @tailwind utilities;
-        }
-      `)
-      let compiled = build(['custom-before:underline'])
-
-      expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-        "@layer utilities {
           .custom-before\\:underline {
             --has-before: 1;
           }
@@ -2719,39 +4427,43 @@ describe('@variant', () => {
           .custom-before\\:underline:before:hover, .custom-before\\:underline:before:focus {
             text-decoration-line: underline;
           }
-        }"
+        }
+        "
       `)
     })
 
     test('nested multiple selectors with @slot', async () => {
-      let { build } = await compile(css`
-        @variant hocus {
-          &:hover {
-            @media (hover: hover) {
-              @slot;
+      expect(
+        await run(
+          ['hocus:underline', 'group-hocus:underline'],
+          css`
+            @custom-variant hocus {
+              &:hover {
+                @media (hover: hover) {
+                  @slot;
+                }
+              }
+
+              &:focus {
+                @slot;
+              }
             }
-          }
-
-          &:focus {
-            @slot;
-          }
-        }
 
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
         @layer utilities {
-          @tailwind utilities;
-        }
-      `)
-      let compiled = build(['hocus:underline', 'group-hocus:underline'])
-
-      expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-        "@layer utilities {
           @media (hover: hover) {
-            .group-hocus\\:underline:is(:where(.group):hover *) {
+            :is(:where(.group):hover .group-hocus\\:underline) {
               text-decoration-line: underline;
             }
           }
 
-          .group-hocus\\:underline:is(:where(.group):focus *) {
+          :is(:where(.group):focus .group-hocus\\:underline) {
             text-decoration-line: underline;
           }
 
@@ -2764,82 +4476,94 @@ describe('@variant', () => {
           .hocus\\:underline:focus {
             text-decoration-line: underline;
           }
-        }"
+        }
+        "
       `)
     })
 
     test('selector nested under at-rule with @slot', async () => {
-      let { build } = await compile(css`
-        @variant hocus {
-          @media (hover: hover) {
-            &:hover {
-              @slot;
+      expect(
+        await run(
+          ['hocus:underline', 'group-hocus:underline'],
+          css`
+            @custom-variant hocus {
+              @media (hover: hover) {
+                &:hover {
+                  @slot;
+                }
+              }
             }
-          }
-        }
 
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
         @layer utilities {
-          @tailwind utilities;
-        }
-      `)
-      let compiled = build(['hocus:underline', 'group-hocus:underline'])
-
-      expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-        "@layer utilities {
           @media (hover: hover) {
-            .group-hocus\\:underline:is(:where(.group):hover *), .hocus\\:underline:hover {
+            :is(:where(.group):hover .group-hocus\\:underline), .hocus\\:underline:hover {
               text-decoration-line: underline;
             }
           }
-        }"
+        }
+        "
       `)
     })
 
     test('at-rule with @slot', async () => {
-      let { build } = await compile(css`
-        @variant any-hover {
-          @media (any-hover: hover) {
-            @slot;
-          }
-        }
+      expect(
+        await run(
+          ['any-hover:underline'],
+          css`
+            @custom-variant any-hover {
+              @media (any-hover: hover) {
+                @slot;
+              }
+            }
 
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
         @layer utilities {
-          @tailwind utilities;
-        }
-      `)
-      let compiled = build(['any-hover:underline'])
-
-      expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-        "@layer utilities {
           @media (any-hover: hover) {
             .any-hover\\:underline {
               text-decoration-line: underline;
             }
           }
-        }"
+        }
+        "
       `)
     })
 
     test('multiple at-rules with @slot', async () => {
-      let { build } = await compile(css`
-        @variant desktop {
-          @media (any-hover: hover) {
-            @slot;
-          }
+      expect(
+        await run(
+          ['desktop:underline'],
+          css`
+            @custom-variant desktop {
+              @media (any-hover: hover) {
+                @slot;
+              }
 
-          @media (pointer: fine) {
-            @slot;
-          }
-        }
+              @media (pointer: fine) {
+                @slot;
+              }
+            }
 
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
         @layer utilities {
-          @tailwind utilities;
-        }
-      `)
-      let compiled = build(['desktop:underline'])
-
-      expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-        "@layer utilities {
           @media (any-hover: hover) {
             .desktop\\:underline {
               text-decoration-line: underline;
@@ -2851,32 +4575,36 @@ describe('@variant', () => {
               text-decoration-line: underline;
             }
           }
-        }"
+        }
+        "
       `)
     })
 
     test('nested at-rules with @slot', async () => {
-      let { build } = await compile(css`
-        @variant custom-variant {
-          @media (orientation: landscape) {
-            @media screen {
-              @slot;
+      expect(
+        await run(
+          ['custom-variant:underline'],
+          css`
+            @custom-variant custom-variant {
+              @media (orientation: landscape) {
+                @media screen {
+                  @slot;
+                }
+
+                @media print {
+                  display: none;
+                }
+              }
             }
 
-            @media print {
-              display: none;
+            @layer utilities {
+              @tailwind utilities;
             }
-          }
-        }
-
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
         @layer utilities {
-          @tailwind utilities;
-        }
-      `)
-      let compiled = build(['custom-variant:underline'])
-
-      expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-        "@layer utilities {
           @media (orientation: landscape) {
             @media screen {
               .custom-variant\\:underline {
@@ -2890,29 +4618,33 @@ describe('@variant', () => {
               }
             }
           }
-        }"
+        }
+        "
       `)
     })
 
     test('at-rule and selector with @slot', async () => {
-      let { build } = await compile(css`
-        @variant custom-dark {
-          @media (prefers-color-scheme: dark) {
-            @slot;
-          }
-          &:is(.dark *) {
-            @slot;
-          }
-        }
+      expect(
+        await run(
+          ['custom-dark:underline'],
+          css`
+            @custom-variant custom-dark {
+              @media (prefers-color-scheme: dark) {
+                @slot;
+              }
+              &:is(.dark *) {
+                @slot;
+              }
+            }
 
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
         @layer utilities {
-          @tailwind utilities;
-        }
-      `)
-      let compiled = build(['custom-dark:underline'])
-
-      expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-        "@layer utilities {
           @media (prefers-color-scheme: dark) {
             .custom-dark\\:underline {
               text-decoration-line: underline;
@@ -2922,27 +4654,341 @@ describe('@variant', () => {
           .custom-dark\\:underline:is(.dark *) {
             text-decoration-line: underline;
           }
-        }"
+        }
+        "
+      `)
+    })
+  })
+
+  describe('@scope', () => {
+    test('arbitrary variant', async () => {
+      expect(await run(['[@scope_(.from)_to_(.to)]:underline'])).toMatchInlineSnapshot(`
+        "
+        @scope (.from) to (.to) {
+          .\\[\\@scope_\\(\\.from\\)_to_\\(\\.to\\)\\]\\:underline {
+            text-decoration-line: underline;
+          }
+        }
+        "
+      `)
+    })
+
+    test('shorthand syntax', async () => {
+      expect(
+        await run(
+          ['scoped:underline'],
+          css`
+            @custom-variant scoped (@scope (.from) to (.to));
+
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
+        @layer utilities {
+          @scope (.from) to (.to) {
+            .scoped\\:underline {
+              text-decoration-line: underline;
+            }
+          }
+        }
+        "
+      `)
+    })
+
+    test('with @slot syntax', async () => {
+      expect(
+        await run(
+          ['scoped:underline'],
+          css`
+            @custom-variant scoped {
+              @scope (.from) to (.to) {
+                @slot;
+              }
+            }
+
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
+        @layer utilities {
+          @scope (.from) to (.to) {
+            .scoped\\:underline {
+              text-decoration-line: underline;
+            }
+          }
+        }
+        "
+      `)
+    })
+
+    test('@scope in a custom variant combined with user-authored `@scope` rules', async () => {
+      expect(
+        await run(
+          ['blue:bg-blue-500'],
+          css`
+            @layer utilities {
+              @tailwind utilities;
+            }
+
+            @theme inline {
+              --color-blue-500: blue;
+            }
+
+            /* In a variant */
+            @custom-variant blue {
+              @scope ([data-theme='blue']) to ([data-theme]) {
+                @slot;
+              }
+            }
+
+            /* User CSS */
+            .parent {
+              /* @scope with bare declarations */
+              @scope (.from) to (.to) {
+                --x: 1;
+              }
+
+              .child {
+                .a {
+                  /* Variant with @scope used by @apply */
+                  @apply blue:[--x:2];
+                }
+                .b {
+                  /* Variant with @scope used by @apply combined with another variant */
+                  @apply blue:hover:[--x:3];
+                }
+                .c {
+                  /* Variant with @scoped used by @variant */
+                  @variant blue {
+                    --x: 4;
+                  }
+                }
+              }
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
+        @layer utilities {
+          @scope ([data-theme="blue"]) to ([data-theme]) {
+            .blue\\:bg-blue-500 {
+              background-color: #00f;
+            }
+          }
+        }
+
+        @scope (.parent .from) to (.to) {
+          :where(:scope) {
+            --x: 1;
+          }
+        }
+
+        @scope ([data-theme="blue"]) to ([data-theme]) {
+          .parent .child .a {
+            --x: 2;
+          }
+
+          @media (hover: hover) {
+            .parent .child .b:hover {
+              --x: 3;
+            }
+          }
+
+          .parent .child .c {
+            --x: 4;
+          }
+        }
+        "
+      `)
+    })
+
+    test('`&` in the `@scope` prelude of a custom variant controls the composition', async () => {
+      expect(
+        await run(
+          ['in-blue:flex', 'blue-self:flex', 'scoped-panel:flex', 'in-blue:hover:flex'],
+          css`
+            /* Default: the utility applies to elements inside the scope */
+            @custom-variant in-blue {
+              @scope ([data-theme='blue']) to ([data-theme]) {
+                @slot;
+              }
+            }
+
+            /* Trailing &: the utility itself becomes the scoping root */
+            @custom-variant blue-self {
+              @scope ([data-theme='blue'] &) to ([data-theme]) {
+                @slot;
+              }
+            }
+
+            /* Leading &: the scoping roots are found inside the utility */
+            @custom-variant scoped-panel {
+              @scope (& .panel) {
+                @slot;
+              }
+            }
+
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
+        @layer utilities {
+          @scope ([data-theme="blue"]) to ([data-theme]) {
+            .in-blue\\:flex {
+              display: flex;
+            }
+
+            @media (hover: hover) {
+              .in-blue\\:hover\\:flex:hover {
+                display: flex;
+              }
+            }
+          }
+
+          @scope ([data-theme="blue"] .blue-self\\:flex) to ([data-theme]) {
+            :where(:scope) {
+              display: flex;
+            }
+          }
+
+          @scope (.scoped-panel\\:flex .panel) {
+            :where(:scope) {
+              display: flex;
+            }
+          }
+        }
+        "
+      `)
+    })
+
+    test('user-authored `@scope` inside `@variant` keeps its native semantics', async () => {
+      // The `hocus` variant does not use `@scope` itself, so the inner `@scope`
+      // is user CSS and compiles with the native CSS nesting semantics: the
+      // parent selector moves into the prelude, and bare declarations apply to
+      // the scoping root.
+      expect(
+        await compileCss(css`
+          @custom-variant hocus (&:hover, &:focus);
+
+          .btn {
+            @variant hocus {
+              @scope (.from) to (.to) {
+                --x: 1;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope (:is(.btn:hover, .btn:focus) .from) to (.to) {
+          :where(:scope) {
+            --x: 1;
+          }
+        }
+        "
+      `)
+    })
+
+    test('user-authored `@scope` inside a `@variant` that uses `@scope` keeps its native semantics', async () => {
+      // The `blue` variant uses `@scope` itself, so its own `@scope` takes the
+      // variant composition. But the user CSS slotted into its body is marked
+      // as `user` content, so the inner `@scope` keeps its native CSS nesting
+      // semantics: the parent selector moves into the prelude, and bare
+      // declarations apply to the scoping root.
+      expect(
+        await compileCss(css`
+          @custom-variant blue {
+            @scope ([data-theme='blue']) to ([data-theme]) {
+              @slot;
+            }
+          }
+
+          .btn {
+            @variant blue {
+              @scope (.from) to (.to) {
+                --x: 1;
+              }
+            }
+          }
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        @scope ([data-theme="blue"]) to ([data-theme]) {
+          @scope (.btn .from) to (.to) {
+            :where(:scope) {
+              --x: 1;
+            }
+          }
+        }
+        "
+      `)
+    })
+
+    test('@scope nested in a rule, nested in another @scope, with @slot', async () => {
+      // Both `@scope` rules take the variant composition: neither prelude is
+      // made relative to a parent, the outer/inner nesting order is preserved,
+      // and the rule between them composes into the body with the utility's
+      // selector.
+      expect(
+        await run(
+          ['foo:underline'],
+          css`
+            @custom-variant foo {
+              @scope (.outer) to (.outer-limit) {
+                .middle {
+                  @scope (.inner) to (.inner-limit) {
+                    @slot;
+                  }
+                }
+              }
+            }
+
+            @layer utilities {
+              @tailwind utilities;
+            }
+          `,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
+        @layer utilities {
+          @scope (.outer) to (.outer-limit) {
+            @scope (.inner) to (.inner-limit) {
+              .foo\\:underline .middle {
+                text-decoration-line: underline;
+              }
+            }
+          }
+        }
+        "
       `)
     })
   })
 
   test('built-in variants can be overridden while keeping their order', async () => {
     expect(
-      await compileCss(
+      await run(
+        // Make sure the order does not change by including the variants
+        // immediately before and after `dark`
+        ['rtl:flex', 'dark:flex', 'starting:flex'],
         css`
-          @variant dark (&:is([data-theme='dark'] *));
+          @custom-variant dark (&:is([data-theme='dark'] *));
           @layer utilities {
             @tailwind utilities;
           }
         `,
-
-        // Make sure the order does not change by including the variants
-        // immediately before and after `dark`
-        ['rtl:flex', 'dark:flex', 'starting:flex'],
       ),
     ).toMatchInlineSnapshot(`
-      "@layer utilities {
+      "
+      @layer utilities {
         .rtl\\:flex:where(:dir(rtl), [dir="rtl"], [dir="rtl"] *), .dark\\:flex:is([data-theme="dark"] *) {
           display: flex;
         }
@@ -2952,25 +4998,26 @@ describe('@variant', () => {
             display: flex;
           }
         }
-      }"
+      }
+      "
     `)
   })
 
   test('at-rule-only variants cannot be used with compound variants', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['foo:flex', 'group-foo:flex', 'peer-foo:flex', 'has-foo:flex', 'not-foo:flex'],
         css`
-          @variant foo (@media foo);
+          @custom-variant foo (@media foo);
 
           @layer utilities {
             @tailwind utilities;
           }
         `,
-
-        ['foo:flex', 'group-foo:flex', 'peer-foo:flex', 'has-foo:flex', 'not-foo:flex'],
       ),
     ).toMatchInlineSnapshot(`
-      "@layer utilities {
+      "
+      @layer utilities {
         @media not foo {
           .not-foo\\:flex {
             display: flex;
@@ -2982,7 +5029,287 @@ describe('@variant', () => {
             display: flex;
           }
         }
-      }"
+      }
+      "
+    `)
+  })
+
+  test('@custom-variant can reuse existing @variant in the definition', async () => {
+    expect(
+      await run(
+        ['hocus:flex'],
+        css`
+          @custom-variant hocus {
+            @variant hover {
+              @variant focus {
+                @slot;
+              }
+            }
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @media (hover: hover) {
+        .hocus\\:flex:hover:focus {
+          display: flex;
+        }
+      }
+      "
+    `)
+  })
+
+  test('@custom-variant can reuse @custom-variant that is defined later', async () => {
+    expect(
+      await run(
+        ['hocus:flex'],
+        css`
+          @custom-variant hocus {
+            @variant custom-hover {
+              @variant focus {
+                @slot;
+              }
+            }
+          }
+
+          @custom-variant custom-hover (&:hover);
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .hocus\\:flex:hover:focus {
+        display: flex;
+      }
+      "
+    `)
+  })
+
+  test('@custom-variant can reuse existing @variant that is overwritten later', async () => {
+    expect(
+      await run(
+        ['hocus:flex'],
+        css`
+          @custom-variant hocus {
+            @variant hover {
+              @variant focus {
+                @slot;
+              }
+            }
+          }
+
+          @custom-variant hover (&:hover);
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .hocus\\:flex:hover:focus {
+        display: flex;
+      }
+      "
+    `)
+  })
+
+  test('@custom-variant cannot use @variant that eventually results in a circular dependency', async () => {
+    return expect(() =>
+      run(
+        ['foo:flex'],
+        css`
+          @custom-variant custom-variant {
+            @variant foo {
+              @slot;
+            }
+          }
+
+          @custom-variant foo {
+            @variant hover {
+              @variant bar {
+                @slot;
+              }
+            }
+          }
+
+          @custom-variant bar {
+            @variant focus {
+              @variant baz {
+                @slot;
+              }
+            }
+          }
+
+          @custom-variant baz {
+            @variant active {
+              @variant foo {
+                @slot;
+              }
+            }
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(`
+      [Error: Circular dependency detected in custom variants:
+
+      @custom-variant custom-variant {
+        @variant foo { … }
+      }
+      @custom-variant foo { /* ← */
+        @variant bar { … }
+      }
+      @custom-variant bar {
+        @variant baz { … }
+      }
+      @custom-variant baz {
+        @variant foo { … }
+      }
+      ]
+    `)
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/19618
+  test('@custom-variant can use a @variant that eventually uses another @custom-variant', async () => {
+    expect(
+      await run(
+        ['a:flex', 'b:flex', 'a:b:flex', 'b:a:flex'],
+        css`
+          @custom-variant a {
+            @slot;
+          }
+
+          @custom-variant b {
+            @variant a {
+              @slot;
+            }
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .a\\:flex, .b\\:flex, .a\\:b\\:flex, .b\\:a\\:flex {
+        display: flex;
+      }
+      "
+    `)
+  })
+
+  test('@custom-variant can use a @variant that eventually uses another @custom-variant (2)', async () => {
+    expect(
+      await run(
+        ['a:flex', 'b:flex', 'a:b:flex', 'b:a:flex'],
+        css`
+          @custom-variant a {
+            .a {
+              @slot;
+            }
+          }
+
+          @custom-variant b {
+            .b {
+              @variant a {
+                .a-inside-b {
+                  @slot;
+                }
+              }
+            }
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .a\\:flex .a, .b\\:flex .b .a .a-inside-b, .a\\:b\\:flex .a .b .a .a-inside-b, .b\\:a\\:flex .b .a .a-inside-b .a {
+        display: flex;
+      }
+      "
+    `)
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/19618#issuecomment-3830775912
+  test('@custom-variant can use existing @slot @variants', async () => {
+    expect(
+      await run(
+        ['hocus:flex'],
+        css`
+          @custom-variant hocus {
+            @variant hover {
+              @variant focus {
+                @slot;
+              }
+            }
+          }
+
+          @custom-variant hover {
+            &:hover {
+              @slot;
+            }
+
+            &[data-hover] {
+              @slot;
+            }
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .hocus\\:flex:hover:focus, .hocus\\:flex[data-hover]:focus {
+        display: flex;
+      }
+      "
+    `)
+  })
+
+  test('@custom-variant setup that results in a circular dependency error can be solved', async () => {
+    expect(
+      await run(
+        ['baz:flex'],
+        css`
+          @custom-variant foo {
+            @variant hover {
+              @variant bar {
+                @slot;
+              }
+            }
+          }
+
+          @custom-variant bar {
+            @variant focus {
+              @variant baz {
+                @slot;
+              }
+            }
+          }
+
+          @custom-variant baz {
+            @variant active {
+              @variant foo {
+                @slot;
+              }
+            }
+          }
+
+          /* Break the circle */
+          @custom-variant foo ([data-broken-circle] &);
+
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      [data-broken-circle] .baz\\:flex:active {
+        display: flex;
+      }
+      "
     `)
   })
 })
@@ -3022,35 +5349,126 @@ describe('@utility', () => {
       `[Error: \`@utility 💨\` defines an invalid utility name. Utilities should be alphanumeric and start with a lowercase letter.]`,
     )
   })
+
+  test('@utility can handle escape sequences correctly', async () => {
+    expect(
+      await run(
+        ['push-1/2', 'push-50%'],
+        css`
+          @layer utilities {
+            @tailwind utilities;
+          }
+
+          @utility push-1\/2 {
+            right: 50%;
+          }
+
+          @utility push-50\% {
+            right: 50%;
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        .push-1\\/2, .push-50\\% {
+          right: 50%;
+        }
+      }
+      "
+    `)
+  })
+
+  test('A functional @utility must end in -*', () => {
+    return expect(
+      compileCss(css`
+        @utility foo* {
+          color: red;
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: \`@utility foo*\` defines an invalid utility name. A functional utility must end in \`-*\`.]`,
+    )
+  })
+
+  test('Only the last part of a functional @utility can be dynamic', () => {
+    return expect(
+      compileCss(css`
+        @utility my-*-utility {
+          color: red;
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: \`@utility my-*-utility\` defines an invalid utility name. The dynamic portion marked by \`-*\` must appear once at the end.]`,
+    )
+  })
+
+  // https://github.com/tailwindlabs/tailwindcss/issues/19505
+  test('@utility name cannot contain multiple `/` characters', async () => {
+    expect(
+      await run(
+        ['ui/button'],
+        css`
+          @utility ui/button {
+            display: inline-flex;
+            background: blue;
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(
+      `
+      "
+      .ui\\/button {
+        background: #00f;
+        display: inline-flex;
+      }
+      "
+    `,
+    )
+
+    await expect(
+      compileCss(css`
+        @utility ui/button/sm {
+          display: inline-flex;
+          background: blue;
+          font-size: 12px;
+        }
+      `),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: \`@utility ui/button/sm\` defines an invalid utility name. Utilities should be alphanumeric and start with a lowercase letter.]`,
+    )
+  })
 })
 
 test('addBase', async () => {
-  let { build } = await compile(
-    css`
-      @plugin "my-plugin";
-      @layer base, utilities;
-      @layer utilities {
-        @tailwind utilities;
-      }
-    `,
-    {
-      loadModule: async () => ({
-        module: ({ addBase }: PluginAPI) => {
-          addBase({
-            body: {
-              'font-feature-settings': '"tnum"',
-            },
-          })
-        },
-        base: '/root',
-      }),
-    },
-  )
-
-  let compiled = build(['underline'])
-
-  expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-    "@layer base {
+  expect(
+    await run(
+      ['underline'],
+      css`
+        @plugin "my-plugin";
+        @layer base, utilities;
+        @layer utilities {
+          @tailwind utilities;
+        }
+      `,
+      {
+        loadModule: async () => ({
+          path: '',
+          base: '/root',
+          module: ({ addBase }: PluginAPI) => {
+            addBase({
+              body: {
+                'font-feature-settings': '"tnum"',
+              },
+            })
+          },
+        }),
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer base {
       body {
         font-feature-settings: "tnum";
       }
@@ -3060,20 +5478,76 @@ test('addBase', async () => {
       .underline {
         text-decoration-line: underline;
       }
-    }"
+    }
+    "
+  `)
+})
+
+test('JS APIs support @variant', async () => {
+  expect(
+    await run(
+      ['underline', 'foo', 'bar-one'],
+      css`
+        @plugin "my-plugin";
+        @layer base, utilities;
+        @layer utilities {
+          @tailwind utilities;
+        }
+      `,
+      {
+        loadModule: async () => ({
+          path: '',
+          base: '/root',
+          module: ({ addBase, addUtilities, matchUtilities }: PluginAPI) => {
+            addBase({ body: { '@variant dark': { color: 'red' } } })
+            addUtilities({ '.foo': { '@variant dark': { '--foo': 'foo' } } })
+            matchUtilities(
+              { bar: (value) => ({ '@variant dark': { '--bar': value } }) },
+              { values: { one: '1' } },
+            )
+          },
+        }),
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer base {
+      @media (prefers-color-scheme: dark) {
+        body {
+          color: red;
+        }
+      }
+    }
+
+    @layer utilities {
+      .underline {
+        text-decoration-line: underline;
+      }
+
+      @media (prefers-color-scheme: dark) {
+        .bar-one {
+          --bar: 1;
+        }
+
+        .foo {
+          --foo: foo;
+        }
+      }
+    }
+    "
   `)
 })
 
 it("should error when `layer(…)` is used, but it's not the first param", async () => {
-  expect(async () => {
+  await expect(async () => {
     return await compileCss(
       css`
         @import './bar.css' supports(display: grid) layer(utilities);
       `,
-      [],
       {
         async loadStylesheet() {
           return {
+            path: '',
             base: '/bar.css',
             content: css`
               .foo {
@@ -3089,11 +5563,13 @@ it("should error when `layer(…)` is used, but it's not the first param", async
   )
 })
 
-describe('`@import "…" reference`', () => {
+describe('`@reference "…" imports`', () => {
   test('recursively removes styles', async () => {
-    let loadStylesheet = async (id: string, base: string) => {
+    let loadStylesheet = async (id: string, base = '/root/foo') => {
       if (id === './foo/baz.css') {
         return {
+          base,
+          path: '',
           content: css`
             .foo {
               color: red;
@@ -3104,103 +5580,1753 @@ describe('`@import "…" reference`', () => {
             @theme {
               --breakpoint-md: 768px;
             }
-            @variant hocus (&:hover, &:focus);
+            @custom-variant hocus (&:hover, &:focus);
           `,
-          base: '/root/foo',
         }
       }
       return {
+        path: '',
+        base: '/root/foo',
         content: css`
           @import './foo/baz.css';
         `,
-        base: '/root/foo',
       }
     }
 
-    await expect(
-      compileCss(
-        `
+    expect(
+      await compileCss(
+        css`
+          @reference './foo/bar.css';
+
+          .bar {
+            @apply md:hocus:foo;
+          }
+        `,
+        { loadStylesheet },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @media (min-width: 768px) {
+        .bar:hover, .bar:focus {
+          color: red;
+        }
+      }
+      "
+    `)
+  })
+
+  test('does not generate utilities', async () => {
+    expect(
+      await run(
+        ['text-underline', 'border'],
+        css`
+          @reference './foo/bar.css';
+        `,
+        {
+          loadStylesheet: async (id: string, base = '/root/foo') => {
+            if (id === './foo/baz.css') {
+              return {
+                base,
+                path: '',
+                content: css`
+                  @layer utilities {
+                    @tailwind utilities;
+                  }
+                `,
+              }
+            }
+            return {
+              path: '',
+              base: '/root/foo',
+              content: css`
+                @import './foo/baz.css';
+              `,
+            }
+          },
+        },
+      ),
+    ).toEqual('')
+  })
+
+  test('removes all @keyframes, even those contributed by JavasScript plugins', async () => {
+    expect(
+      await run(
+        ['animate-spin', 'match-utility-initial', 'match-components-initial'],
+        css`
+          @media reference {
+            @layer theme, base, components, utilities;
+            @layer theme {
+              @theme {
+                --animate-spin: spin 1s linear infinite;
+                --animate-ping: ping 1s cubic-bezier(0, 0, 0.2, 1) infinite;
+                @keyframes spin {
+                  to {
+                    transform: rotate(360deg);
+                  }
+                }
+              }
+            }
+            @layer base {
+              @keyframes ping {
+                75%,
+                100% {
+                  transform: scale(2);
+                  opacity: 0;
+                }
+              }
+            }
+            @plugin "my-plugin";
+          }
+
+          .bar {
+            @apply animate-spin;
+          }
+        `,
+        {
+          loadModule: async () => ({
+            path: '',
+            base: '/root',
+            module: ({
+              addBase,
+              addUtilities,
+              addComponents,
+              matchUtilities,
+              matchComponents,
+            }: PluginAPI) => {
+              addBase({
+                '@keyframes base': { '100%': { opacity: '0' } },
+              })
+              addUtilities({
+                '@keyframes utilities': { '100%': { opacity: '0' } },
+              })
+              addComponents({
+                '@keyframes components ': { '100%': { opacity: '0' } },
+              })
+              matchUtilities(
+                {
+                  'match-utility': (_value) => ({
+                    '@keyframes match-utilities': { '100%': { opacity: '0' } },
+                  }),
+                },
+                { values: { initial: 'initial' } },
+              )
+              matchComponents(
+                {
+                  'match-components': (_value) => ({
+                    '@keyframes match-components': { '100%': { opacity: '0' } },
+                  }),
+                },
+                { values: { initial: 'initial' } },
+              )
+            },
+          }),
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .bar {
+        animation: var(--animate-spin, spin 1s linear infinite);
+      }
+
+      @keyframes spin {
+        to {
+          transform: rotate(360deg);
+        }
+      }
+      "
+    `)
+  })
+
+  test('emits CSS variable fallback and keyframes defined inside @reference-ed files', async () => {
+    let loadStylesheet = async (id: string, base = '/root') => {
+      switch (id) {
+        case './one.css': {
+          return {
+            base,
+            path: '',
+            content: css`
+              @import './two.css' layer(two);
+            `,
+          }
+        }
+        case './two.css': {
+          return {
+            base,
+            path: '',
+            content: css`
+              @import './three.css' layer(three);
+            `,
+          }
+        }
+        case './three.css': {
+          return {
+            base,
+            path: '',
+            content: css`
+              .foo {
+                color: red;
+              }
+              @theme {
+                --color-red: red;
+                --animate-wiggle: wiggle 1s ease-in-out infinite;
+                @keyframes wiggle {
+                  0%,
+                  100% {
+                    transform: rotate(-3deg);
+                  }
+                  50% {
+                    transform: rotate(3deg);
+                  }
+                }
+              }
+            `,
+          }
+        }
+      }
+
+      throw new Error('unreachable')
+    }
+
+    expect(
+      await compileCss(
+        css`
+          @reference './one.css';
+          .bar {
+            @apply text-red animate-wiggle;
+          }
+        `,
+        { loadStylesheet },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .bar {
+        animation: var(--animate-wiggle, wiggle 1s ease-in-out infinite);
+        color: var(--color-red, red);
+      }
+
+      @keyframes wiggle {
+        0%, 100% {
+          transform: rotate(-3deg);
+        }
+
+        50% {
+          transform: rotate(3deg);
+        }
+      }
+      "
+    `)
+  })
+
+  test('supports `@import "…" reference` syntax', async () => {
+    let loadStylesheet = async () => {
+      return {
+        path: '',
+        base: '/root/foo',
+        content: css`
+          .foo {
+            color: red;
+          }
+          @utility foo {
+            color: red;
+          }
+          @theme {
+            --breakpoint-md: 768px;
+          }
+          @custom-variant hocus (&:hover, &:focus);
+        `,
+      }
+    }
+
+    expect(
+      await compileCss(
+        css`
           @import './foo/bar.css' reference;
 
           .bar {
             @apply md:hocus:foo;
           }
         `,
-        [],
         { loadStylesheet },
       ),
-    ).resolves.toMatchInlineSnapshot(`
-      "@media (width >= 768px) {
+    ).toMatchInlineSnapshot(`
+      "
+      @media (min-width: 768px) {
         .bar:hover, .bar:focus {
           color: red;
         }
-      }"
+      }
+      "
     `)
   })
 
-  test('does not generate utilities', async () => {
-    let loadStylesheet = async (id: string, base: string) => {
-      if (id === './foo/baz.css') {
-        return {
-          content: css`
-            @layer utilities {
-              @tailwind utilities;
-            }
-          `,
-          base: '/root/foo',
-        }
-      }
-      return {
-        content: css`
-          @import './foo/baz.css';
-        `,
-        base: '/root/foo',
-      }
-    }
-
-    let { build } = await compile(
-      css`
-        @import './foo/bar.css' reference;
-      `,
-      { loadStylesheet },
-    )
-
-    expect(build(['text-underline', 'border']).trim()).toMatchInlineSnapshot(`"@layer utilities;"`)
-  })
-
   test('removes styles when the import resolver was handled outside of Tailwind CSS', async () => {
-    await expect(
-      compileCss(
-        `
-          @media reference {
-            @layer theme {
-              @theme {
-                --breakpoint-md: 48rem;
-              }
-              .foo {
-                color: red;
-              }
+    expect(
+      await compileCss(css`
+        @media reference {
+          @layer theme {
+            @theme {
+              --breakpoint-md: 48rem;
             }
-            @utility foo {
+            .foo {
               color: red;
             }
-            @variant hocus (&:hover, &:focus);
           }
-
-          .bar {
-            @apply md:hocus:foo;
+          @utility foo {
+            color: red;
           }
-        `,
-        [],
-      ),
-    ).resolves.toMatchInlineSnapshot(`
-      "@layer theme;
+          @custom-variant hocus (&:hover, &:focus);
+        }
 
-      @media (width >= 48rem) {
+        .bar {
+          @apply md:hocus:foo;
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      @media (min-width: 48rem) {
         .bar:hover, .bar:focus {
           color: red;
         }
-      }"
+      }
+      "
     `)
   })
 })
+
+describe('@variant', () => {
+  it('should convert legacy body-less `@variant` as a `@custom-variant`', async () => {
+    expect(
+      await run(
+        ['hocus:underline'],
+        css`
+          @variant hocus (&:hover, &:focus);
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .hocus\\:underline:hover, .hocus\\:underline:focus {
+        text-decoration-line: underline;
+      }
+      "
+    `)
+  })
+
+  it('should convert legacy `@variant` with `@slot` as a `@custom-variant`', async () => {
+    expect(
+      await run(
+        ['hocus:underline'],
+        css`
+          @variant hocus {
+            &:hover {
+              @slot;
+            }
+
+            &:focus {
+              @slot;
+            }
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .hocus\\:underline:hover, .hocus\\:underline:focus {
+        text-decoration-line: underline;
+      }
+      "
+    `)
+  })
+
+  it('should be possible to use `@variant` in your CSS', async () => {
+    expect(
+      await compileCss(css`
+        .btn {
+          background: black;
+
+          @variant dark {
+            background: white;
+          }
+        }
+
+        @variant hover {
+          @variant landscape {
+            .btn2 {
+              color: red;
+            }
+          }
+        }
+
+        @variant hover {
+          .foo {
+            color: red;
+          }
+          @variant landscape {
+            .bar {
+              color: blue;
+            }
+          }
+          .baz {
+            @variant portrait {
+              color: green;
+            }
+          }
+        }
+
+        @media something {
+          @variant landscape {
+            @page {
+              color: red;
+            }
+          }
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      .btn {
+        background: #000;
+      }
+
+      @media (prefers-color-scheme: dark) {
+        .btn {
+          background: #fff;
+        }
+      }
+
+      @media (hover: hover) {
+        @media (orientation: landscape) {
+          :scope:hover .btn2 {
+            color: red;
+          }
+        }
+
+        :scope:hover .foo {
+          color: red;
+        }
+
+        @media (orientation: landscape) {
+          :scope:hover .bar {
+            color: #00f;
+          }
+        }
+
+        @media (orientation: portrait) {
+          :scope:hover .baz {
+            color: green;
+          }
+        }
+      }
+
+      @media something {
+        @media (orientation: landscape) {
+          @page {
+            color: red;
+          }
+        }
+      }
+      "
+    `)
+  })
+
+  it('should be possible to use `@variant` in your CSS with a `@custom-variant` that is defined later', async () => {
+    expect(
+      await compileCss(css`
+        .btn {
+          background: black;
+
+          @variant hocus {
+            background: white;
+          }
+        }
+
+        @custom-variant hocus (&:hover, &:focus);
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      .btn {
+        background: #000;
+      }
+
+      .btn:hover, .btn:focus {
+        background: #fff;
+      }
+      "
+    `)
+  })
+
+  it('should be possible to use nested `@variant` rules', async () => {
+    expect(
+      await run(
+        ['disabled:focus:underline'],
+        css`
+          .btn {
+            background: black;
+
+            @variant disabled {
+              @variant focus {
+                background: white;
+              }
+            }
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .btn {
+        background: #000;
+      }
+
+      .btn:disabled:focus {
+        background: #fff;
+      }
+
+      .disabled\\:focus\\:underline:disabled:focus {
+        text-decoration-line: underline;
+      }
+      "
+    `)
+  })
+
+  describe('comma-separated `@variant` rules', () => {
+    it('should be possible to use comma-separated `@variant` rules', async () => {
+      let input = css`
+        .btn {
+          background: black;
+
+          @variant hover, focus {
+            background: red;
+          }
+        }
+        @tailwind utilities;
+      `
+
+      expect(await compileCss(input)).toMatchInlineSnapshot(`
+        "
+        .btn {
+          background: #000;
+        }
+
+        @media (hover: hover) {
+          .btn:hover {
+            background: red;
+          }
+        }
+
+        .btn:focus {
+          background: red;
+        }
+        "
+      `)
+
+      expect(await compileCss(input)).toEqual(
+        await compileCss(css`
+          .btn {
+            background: black;
+
+            @variant hover {
+              background: red;
+            }
+            @variant focus {
+              background: red;
+            }
+          }
+          @tailwind utilities;
+        `),
+      )
+    })
+
+    it.each(
+      Array.from(
+        cartesian(
+          ['', ' ', '  ', '\t', '\t\t'], // Before
+          ['', ' ', '  ', '\t', '\t\t'], // After
+        ),
+      ),
+    )(
+      "should handle optional whitespace ('%s', '%s') between `@variant` variants",
+      async (before, after) => {
+        expect(
+          await compileCss(css`
+            .btn {
+              background: black;
+
+              @variant hover${before},${after}focus {
+                background: red;
+              }
+            }
+            @tailwind utilities;
+          `),
+        ).toMatchInlineSnapshot(`
+          "
+          .btn {
+            background: #000;
+          }
+
+          @media (hover: hover) {
+            .btn:hover {
+              background: red;
+            }
+          }
+
+          .btn:focus {
+            background: red;
+          }
+          "
+        `)
+      },
+    )
+
+    it('should handle variants containing a `,` inside', async () => {
+      expect(
+        await compileCss(css`
+          .btn {
+            background: black;
+
+            @variant [&:is(:hover,:focus)], disabled {
+              background: red;
+            }
+          }
+          @tailwind utilities;
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .btn {
+          background: #000;
+        }
+
+        .btn:is(:hover, :focus), .btn:disabled {
+          background: red;
+        }
+        "
+      `)
+    })
+
+    it('should handle nested comma-separated variants', async () => {
+      let input = css`
+        .btn {
+          background: black;
+
+          @variant hover, focus {
+            background: red;
+
+            @variant active, disabled {
+              background: blue;
+            }
+          }
+        }
+        @tailwind utilities;
+      `
+
+      expect(await compileCss(input)).toMatchInlineSnapshot(`
+        "
+        .btn {
+          background: #000;
+        }
+
+        @media (hover: hover) {
+          .btn:hover {
+            background: red;
+          }
+
+          .btn:hover:active, .btn:hover:disabled {
+            background: #00f;
+          }
+        }
+
+        .btn:focus {
+          background: red;
+        }
+
+        .btn:focus:active, .btn:focus:disabled {
+          background: #00f;
+        }
+        "
+      `)
+
+      expect(await compileCss(input)).toEqual(
+        await compileCss(css`
+          .btn {
+            background: black;
+
+            @variant hover {
+              background: red;
+
+              @variant active {
+                background: blue;
+              }
+
+              @variant disabled {
+                background: blue;
+              }
+            }
+
+            @variant focus {
+              background: red;
+
+              @variant active {
+                background: blue;
+              }
+
+              @variant disabled {
+                background: blue;
+              }
+            }
+          }
+          @tailwind utilities;
+        `),
+      )
+    })
+
+    it('should error on invalid variants (trailing comma)', async () => {
+      await expect(
+        compileCss(css`
+          .btn {
+            background: black;
+
+            @variant hover,focus, {
+              background: red;
+            }
+          }
+          @tailwind utilities;
+        `),
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `[Error: Cannot use \`@variant\` with empty variant]`,
+      )
+    })
+
+    it('should error on invalid variants (double comma)', async () => {
+      await expect(
+        compileCss(css`
+          .btn {
+            background: black;
+
+            @variant hover,,focus {
+              background: red;
+            }
+          }
+          @tailwind utilities;
+        `),
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `[Error: Cannot use \`@variant\` with empty variant]`,
+      )
+    })
+  })
+
+  describe('stacked `@variant` rules', () => {
+    it('should handle stacked variants', async () => {
+      expect(
+        await compileCss(css`
+          .btn {
+            background: black;
+
+            @variant hover:focus {
+              background: red;
+            }
+          }
+          @tailwind utilities;
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .btn {
+          background: #000;
+        }
+
+        @media (hover: hover) {
+          .btn:hover:focus {
+            background: red;
+          }
+        }
+        "
+      `)
+    })
+
+    it('should handle stacked variants & comma-separated variants', async () => {
+      expect(
+        await compileCss(css`
+          .btn {
+            background: black;
+
+            @variant hover:focus, disabled {
+              background: red;
+            }
+          }
+          @tailwind utilities;
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .btn {
+          background: #000;
+        }
+
+        @media (hover: hover) {
+          .btn:hover:focus {
+            background: red;
+          }
+        }
+
+        .btn:disabled {
+          background: red;
+        }
+        "
+      `)
+    })
+
+    it('should handle variants containing a `:` inside', async () => {
+      expect(
+        await compileCss(css`
+          .btn {
+            background: black;
+
+            @variant [&:is(:hover,:focus)]:disabled, aria-disabled:hover {
+              background: red;
+            }
+          }
+          @tailwind utilities;
+        `),
+      ).toMatchInlineSnapshot(`
+        "
+        .btn {
+          background: #000;
+        }
+
+        .btn:is(:hover, :focus):disabled {
+          background: red;
+        }
+
+        @media (hover: hover) {
+          .btn[aria-disabled="true"]:hover {
+            background: red;
+          }
+        }
+        "
+      `)
+    })
+  })
+
+  it('should be possible to use compound and stacked variants in `@variant`', async () => {
+    let input = css`
+      .btn {
+        background: black;
+
+        @variant data-a, data-b:data-c {
+          background: red;
+
+          @variant data-d, data-e:data-f {
+            background: blue;
+          }
+        }
+      }
+      @tailwind utilities;
+    `
+
+    expect(await compileCss(input)).toMatchInlineSnapshot(`
+      "
+      .btn {
+        background: #000;
+      }
+
+      .btn[data-a] {
+        background: red;
+      }
+
+      .btn[data-a][data-d], .btn[data-a][data-e][data-f] {
+        background: #00f;
+      }
+
+      .btn[data-b][data-c] {
+        background: red;
+      }
+
+      .btn[data-b][data-c][data-d], .btn[data-b][data-c][data-e][data-f] {
+        background: #00f;
+      }
+      "
+    `)
+
+    expect(await compileCss(input)).toEqual(
+      await compileCss(css`
+        .btn {
+          background: black;
+
+          @variant data-a {
+            background: red;
+
+            @variant data-d {
+              background: blue;
+            }
+
+            @variant data-e {
+              @variant data-f {
+                background: blue;
+              }
+            }
+          }
+
+          @variant data-b {
+            @variant data-c {
+              background: red;
+
+              @variant data-d {
+                background: blue;
+              }
+
+              @variant data-e {
+                @variant data-f {
+                  background: blue;
+                }
+              }
+            }
+          }
+        }
+        @tailwind utilities;
+      `),
+    )
+  })
+
+  it('should be possible to use `@variant` with a funky looking variants', async () => {
+    expect(
+      await compileCss(css`
+        @theme inline reference {
+          --container-md: 768px;
+        }
+
+        .btn {
+          background: black;
+
+          @variant @md {
+            @variant [&.foo] {
+              background: white;
+            }
+          }
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      .btn {
+        background: #000;
+      }
+
+      @container (min-width: 768px) {
+        .btn.foo {
+          background: #fff;
+        }
+      }
+      "
+    `)
+  })
+})
+
+describe('`color-mix(…)` polyfill', () => {
+  it('creates an inlined variable version of the color-mix(…) usages', async () => {
+    expect(
+      await run(
+        ['text-red-500/50'],
+        css`
+          @theme {
+            --color-red-500: oklch(63.7% 0.237 25.331);
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --color-red-500: oklch(63.7% .237 25.331);
+      }
+
+      .text-red-500\\/50 {
+        color: #fb2c3680;
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .text-red-500\\/50 {
+          color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+        }
+      }
+      "
+    `)
+  })
+
+  it('creates an inlined variable version of the color-mix(…) usages when it resolves to a var(…) containing another theme variable', async () => {
+    expect(
+      await run(
+        ['text-red/50'],
+        css`
+          @theme {
+            --color-red: var(--color-red-500);
+            --color-red-500: oklch(63.7% 0.237 25.331);
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --color-red: var(--color-red-500);
+        --color-red-500: oklch(63.7% .237 25.331);
+      }
+
+      .text-red\\/50 {
+        color: #fb2c3680;
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .text-red\\/50 {
+          color: color-mix(in oklab, var(--color-red) 50%, transparent);
+        }
+      }
+      "
+    `)
+  })
+
+  it('works for color values in the first and second position', async () => {
+    expect(
+      await compileCss(css`
+        @theme {
+          --color-red-500: oklch(63.7% 0.237 25.331);
+          --color-orange-500: oklch(70.5% 0.213 47.604);
+        }
+        @tailwind utilities;
+        .mixed {
+          color: color-mix(in lch, var(--color-red-500) 50%, var(--color-orange-500));
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --color-red-500: oklch(63.7% .237 25.331);
+        --color-orange-500: oklch(70.5% .213 47.604);
+      }
+
+      .mixed {
+        color: #fc4d1b;
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .mixed {
+          color: color-mix(in lch, var(--color-red-500) 50%, var(--color-orange-500));
+        }
+      }
+      "
+    `)
+  })
+
+  it('works for nested `color-mix(…)` calls', async () => {
+    expect(
+      await compileCss(css`
+        @theme {
+          --color-red-500: oklch(63.7% 0.237 25.331);
+        }
+        @tailwind utilities;
+        .stacked {
+          color: color-mix(
+            in lch,
+            color-mix(in lch, var(--color-red-500) 50%, transparent) 50%,
+            transparent
+          );
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --color-red-500: oklch(63.7% .237 25.331);
+      }
+
+      .stacked {
+        color: lch(55.5764% 89.7903 33.1932 / .25098);
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .stacked {
+          color: color-mix(in lch, color-mix(in lch, var(--color-red-500) 50%, transparent) 50%, transparent);
+        }
+      }
+      "
+    `)
+  })
+
+  it('works with multiple `color-mix(…)` functions in one declaration', async () => {
+    expect(
+      await compileCss(css`
+        @theme {
+          --color-red-500: oklch(63.7% 0.237 25.331);
+          --color-orange-500: oklch(70.5% 0.213 47.604);
+        }
+        @tailwind utilities;
+        .gradient {
+          background: linear-gradient(
+            90deg,
+            color-mix(in oklab, var(--color-red-500) 50%, transparent) 0%,
+            color-mix(in oklab, var(--color-orange-500) 50%, transparent) 0%,
+            100%
+          );
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --color-red-500: oklch(63.7% .237 25.331);
+        --color-orange-500: oklch(70.5% .213 47.604);
+      }
+
+      .gradient {
+        background: linear-gradient(90deg, #fb2c3680 0%, #fe6e0080 0%, 100%);
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .gradient {
+          background: linear-gradient(90deg, color-mix(in oklab, var(--color-red-500) 50%, transparent) 0%, color-mix(in oklab, var(--color-orange-500) 50%, transparent) 0%, 100%);
+        }
+      }
+      "
+    `)
+  })
+
+  it('works with no spaces after the `var(…)`', async () => {
+    expect(
+      await compileCss(
+        // prettier-ignore
+        css`
+          @theme {
+            --color-red-500: oklch(63.7% 0.237 25.331);
+          }
+          @tailwind utilities;
+          .text-red-500\/50 {
+            color: color-mix(in oklab,var(--color-red-500)50%,transparent);
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --color-red-500: oklch(63.7% .237 25.331);
+      }
+
+      .text-red-500\\/50 {
+        color: #fb2c3680;
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .text-red-500\\/50 {
+          color: color-mix(in oklab,var(--color-red-500)50%,transparent);
+        }
+      }
+      "
+    `)
+  })
+
+  it('uses the first color value as the fallback when the `color-mix(…)` function contains non-theme variables', async () => {
+    expect(
+      await run(
+        ['text-(--my-color)/50', 'text-red-500/(--my-opacity)', 'text-(--my-color)/(--my-opacity)'],
+        css`
+          @theme {
+            --color-red-500: oklch(63.7% 0.237 25.331);
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --color-red-500: oklch(63.7% .237 25.331);
+      }
+
+      .text-\\(--my-color\\)\\/\\(--my-opacity\\) {
+        color: var(--my-color);
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .text-\\(--my-color\\)\\/\\(--my-opacity\\) {
+          color: color-mix(in oklab, var(--my-color) var(--my-opacity), transparent);
+        }
+      }
+
+      .text-\\(--my-color\\)\\/50 {
+        color: var(--my-color);
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .text-\\(--my-color\\)\\/50 {
+          color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        }
+      }
+
+      .text-red-500\\/\\(--my-opacity\\) {
+        color: oklch(63.7% .237 25.331);
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .text-red-500\\/\\(--my-opacity\\) {
+          color: color-mix(in oklab, var(--color-red-500) var(--my-opacity), transparent);
+        }
+      }
+      "
+    `)
+  })
+
+  it('uses the first color value as the fallback when the `color-mix(…)` function contains currentcolor', async () => {
+    expect(await run(['text-current/50'])).toMatchInlineSnapshot(`
+      "
+      .text-current\\/50 {
+        color: currentColor;
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .text-current\\/50 {
+          color: color-mix(in oklab, currentcolor 50%, transparent);
+        }
+      }
+      "
+    `)
+  })
+
+  it('uses the first color value as the fallback when the `color-mix(…)` function contains theme variables that resolves to other variables', async () => {
+    expect(
+      await run(
+        ['text-red/50'],
+        css`
+          @tailwind utilities;
+          @theme {
+            --color-red: var(--my-red);
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .text-red\\/50 {
+        color: var(--color-red);
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .text-red\\/50 {
+          color: color-mix(in oklab, var(--color-red) 50%, transparent);
+        }
+      }
+
+      :root, :host {
+        --color-red: var(--my-red);
+      }
+      "
+    `)
+  })
+
+  it('uses the first color value of the inner most `color-mix(…)` function as the fallback when nested `color-mix(…)` function all contain non-theme variables', async () => {
+    expect(
+      await compileCss(css`
+        @tailwind utilities;
+        .stacked {
+          color: color-mix(
+            in oklab,
+            color-mix(in oklab, var(--my-color) var(--my-inner-opacity), transparent)
+              var(--my-outer-opacity),
+            transparent
+          );
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      .stacked {
+        color: var(--my-color);
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .stacked {
+          color: color-mix(in oklab, color-mix(in oklab, var(--my-color) var(--my-inner-opacity), transparent) var(--my-outer-opacity), transparent);
+        }
+      }
+      "
+    `)
+  })
+
+  it('does not create a fallback when all color values are statically analyzable (lightningcss will flatten this)', async () => {
+    expect(
+      await run(
+        ['text-red-500/50'],
+        css`
+          @theme inline {
+            --color-red-500: oklch(63.7% 0.237 25.331);
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      .text-red-500\\/50 {
+        color: oklab(63.7% .214 .101 / .5);
+      }
+      "
+    `)
+  })
+
+  it('also replaces eventual variables in opacity values', async () => {
+    expect(
+      await run(
+        ['text-red-500/(--my-half)'],
+        css`
+          @theme {
+            --my-half: 50%;
+            --color-red-500: oklch(63.7% 0.237 25.331);
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --my-half: 50%;
+        --color-red-500: oklch(63.7% .237 25.331);
+      }
+
+      .text-red-500\\/\\(--my-half\\) {
+        color: #fb2c3680;
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .text-red-500\\/\\(--my-half\\) {
+          color: color-mix(in oklab, var(--color-red-500) var(--my-half), transparent);
+        }
+      }
+      "
+    `)
+  })
+
+  it('does not delete theme variables from the output', async () => {
+    expect(
+      await run(
+        ['text-red-500', 'shadow-xl', 'opacity-disabled'],
+        css`
+          @layer theme {
+            @theme {
+              --color-red-500: red;
+              --shadow-xl: 0 6px 18px 4px color-mix(in oklab, var(--color-red-500) 25%, transparent);
+              --opacity-disabled: 50%;
+            }
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer properties {
+        @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+          *, :before, :after, ::backdrop {
+            --tw-shadow: 0 0 #0000;
+            --tw-shadow-color: initial;
+            --tw-shadow-alpha: 100%;
+            --tw-inset-shadow: 0 0 #0000;
+            --tw-inset-shadow-color: initial;
+            --tw-inset-shadow-alpha: 100%;
+            --tw-ring-color: initial;
+            --tw-ring-shadow: 0 0 #0000;
+            --tw-inset-ring-color: initial;
+            --tw-inset-ring-shadow: 0 0 #0000;
+            --tw-ring-inset: initial;
+            --tw-ring-offset-width: 0px;
+            --tw-ring-offset-color: #fff;
+            --tw-ring-offset-shadow: 0 0 #0000;
+          }
+        }
+      }
+
+      @layer theme {
+        :root, :host {
+          --color-red-500: red;
+          --opacity-disabled: 50%;
+        }
+      }
+
+      .text-red-500 {
+        color: var(--color-red-500);
+      }
+
+      .opacity-disabled {
+        opacity: var(--opacity-disabled);
+      }
+
+      .shadow-xl {
+        --tw-shadow: 0 6px 18px 4px var(--tw-shadow-color, #ff000040);
+      }
+
+      @supports (color: color-mix(in lab, red, red)) {
+        .shadow-xl {
+          --tw-shadow: 0 6px 18px 4px var(--tw-shadow-color, color-mix(in oklab, var(--color-red-500) 25%, transparent));
+        }
+      }
+
+      .shadow-xl {
+        box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+      }
+
+      @property --tw-shadow {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0 0 #0000;
+      }
+
+      @property --tw-shadow-color {
+        syntax: "*";
+        inherits: false
+      }
+
+      @property --tw-shadow-alpha {
+        syntax: "<percentage>";
+        inherits: false;
+        initial-value: 100%;
+      }
+
+      @property --tw-inset-shadow {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0 0 #0000;
+      }
+
+      @property --tw-inset-shadow-color {
+        syntax: "*";
+        inherits: false
+      }
+
+      @property --tw-inset-shadow-alpha {
+        syntax: "<percentage>";
+        inherits: false;
+        initial-value: 100%;
+      }
+
+      @property --tw-ring-color {
+        syntax: "*";
+        inherits: false
+      }
+
+      @property --tw-ring-shadow {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0 0 #0000;
+      }
+
+      @property --tw-inset-ring-color {
+        syntax: "*";
+        inherits: false
+      }
+
+      @property --tw-inset-ring-shadow {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0 0 #0000;
+      }
+
+      @property --tw-ring-inset {
+        syntax: "*";
+        inherits: false
+      }
+
+      @property --tw-ring-offset-width {
+        syntax: "<length>";
+        inherits: false;
+        initial-value: 0;
+      }
+
+      @property --tw-ring-offset-color {
+        syntax: "*";
+        inherits: false;
+        initial-value: #fff;
+      }
+
+      @property --tw-ring-offset-shadow {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0 0 #0000;
+      }
+      "
+    `)
+  })
+
+  it('does not apply optimizations when already inside a @supports (color: color-mix... block', async () => {
+    expect(
+      await run(
+        ['mixed'],
+        css`
+          @tailwind utilities;
+          @utility mixed {
+            @supports (color: color-mix(in lab, red, red)) {
+              background: color-mix(in oklab, var(--color-1), var(--color-2) 0%);
+            }
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @supports (color: color-mix(in lab, red, red)) {
+        .mixed {
+          background: color-mix(in oklab, var(--color-1), var(--color-2) 0%);
+        }
+      }
+      "
+    `)
+  })
+})
+
+describe('`@property` polyfill', async () => {
+  it('emits fallbacks', async () => {
+    expect(
+      await compileCss(css`
+        @tailwind utilities;
+
+        @property --no-inherit-no-value {
+          syntax: '*';
+          inherits: false;
+        }
+        @property --no-inherit-value {
+          syntax: '*';
+          inherits: false;
+          initial-value: red;
+        }
+        @property --inherit-no-value {
+          syntax: '*';
+          inherits: true;
+        }
+        @property --inherit-value {
+          syntax: '*';
+          inherits: true;
+          initial-value: red;
+        }
+      `),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer properties {
+        @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+          :root, :host {
+            --inherit-no-value: initial;
+            --inherit-value: red;
+          }
+
+          *, :before, :after, ::backdrop {
+            --no-inherit-no-value: initial;
+            --no-inherit-value: red;
+          }
+        }
+      }
+
+      @property --no-inherit-no-value {
+        syntax: "*";
+        inherits: false
+      }
+
+      @property --no-inherit-value {
+        syntax: "*";
+        inherits: false;
+        initial-value: red;
+      }
+
+      @property --inherit-no-value {
+        syntax: "*";
+        inherits: true
+      }
+
+      @property --inherit-value {
+        syntax: "*";
+        inherits: true;
+        initial-value: red;
+      }
+      "
+    `)
+  })
+
+  it('emitting fallbacks can be disabled (necessary for CSS modules)', async () => {
+    expect(
+      await compileCss(
+        css`
+          @tailwind utilities;
+
+          @property --no-inherit-no-value {
+            syntax: '*';
+            inherits: false;
+          }
+          @property --no-inherit-value {
+            syntax: '*';
+            inherits: false;
+            initial-value: red;
+          }
+          @property --inherit-no-value {
+            syntax: '*';
+            inherits: true;
+          }
+          @property --inherit-value {
+            syntax: '*';
+            inherits: true;
+            initial-value: red;
+          }
+        `,
+        {
+          polyfills: Polyfills.None,
+        },
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @property --no-inherit-no-value {
+        syntax: "*";
+        inherits: false
+      }
+
+      @property --no-inherit-value {
+        syntax: "*";
+        inherits: false;
+        initial-value: red;
+      }
+
+      @property --inherit-no-value {
+        syntax: "*";
+        inherits: true
+      }
+
+      @property --inherit-value {
+        syntax: "*";
+        inherits: true;
+        initial-value: red;
+      }
+      "
+    `)
+  })
+})
+
+describe('feature detection', () => {
+  test('using `@tailwind utilities`', async () => {
+    let compiler = await compile(css`
+      @tailwind utilities;
+    `)
+
+    expect(compiler.features & Features.Utilities).toBeTruthy()
+  })
+
+  test('using `@apply`', async () => {
+    let compiler = await compile(css`
+      .foo {
+        @apply underline;
+      }
+    `)
+
+    expect(compiler.features & Features.AtApply).toBeTruthy()
+  })
+
+  test('using `@import`', async () => {
+    let compiler = await compile(
+      css`
+        @import 'tailwindcss/preflight';
+      `,
+      { loadStylesheet: async (_, base) => ({ base, path: '', content: '' }) },
+    )
+
+    expect(compiler.features & Features.AtImport).toBeTruthy()
+  })
+
+  test('using `@reference`', async () => {
+    let compiler = await compile(
+      css`
+        @reference 'tailwindcss/preflight';
+      `,
+      { loadStylesheet: async (_, base) => ({ base, path: '', content: '' }) },
+    )
+
+    // There's little difference between `@reference` and `@import` on a feature
+    // level as it's just like an import but with side-effect behavior.
+    //
+    // It's really just shorthand for `@import "…" reference;`
+    expect(compiler.features & Features.AtImport).toBeTruthy()
+  })
+
+  test('using `theme(…)`', async () => {
+    let compiler = await compile(
+      css`
+        @theme {
+          --color-red: #f00;
+        }
+
+        .foo {
+          color: theme(--color-red);
+        }
+      `,
+      { loadStylesheet: async (_, base) => ({ base, path: '', content: '' }) },
+    )
+
+    expect(compiler.features & Features.ThemeFunction).toBeTruthy()
+  })
+
+  test('using `@plugin`', async () => {
+    let compiler = await compile(
+      css`
+        @plugin "./some-plugin.js";
+      `,
+      { loadModule: async (_, base) => ({ base, path: '', module: () => {} }) },
+    )
+
+    expect(compiler.features & Features.JsPluginCompat).toBeTruthy()
+  })
+
+  test('using `@config`', async () => {
+    let compiler = await compile(
+      css`
+        @config "./some-config.js";
+      `,
+      { loadModule: async (_, base) => ({ base, path: '', module: {} }) },
+    )
+
+    expect(compiler.features & Features.JsPluginCompat).toBeTruthy()
+  })
+
+  test('using `@variant`', async () => {
+    let compiler = await compile(css`
+      .foo {
+        @variant dark {
+          color: red;
+        }
+      }
+    `)
+
+    expect(compiler.features & Features.Variants).toBeTruthy()
+  })
+
+  test('legacy `@variant` syntax does not trigger the variant feature', async () => {
+    let compiler = await compile(css`
+      @variant dark (&:is(.dark, .dark *));
+    `)
+
+    expect(compiler.features & Features.Variants).toBeFalsy()
+  })
+
+  test('`@tailwind utilities` is ignored inside `@reference`', async () => {
+    let compiler = await compile(
+      css`
+        @reference "tailwindcss/utilities";
+      `,
+      {
+        async loadStylesheet(_id, base) {
+          return {
+            base,
+            path: '',
+            content: css`
+              @tailwind utilities;
+            `,
+          }
+        },
+      },
+    )
+
+    // We see @tailwind utilities but because of @reference it is ignored
+    expect(compiler.features & Features.AtImport).toBeTruthy()
+    expect(compiler.features & Features.Utilities).toBeFalsy()
+  })
+
+  test('using `@theme`', async () => {
+    let compiler = await compile(css`
+      @theme {
+        --tracking-narrower: -0.02em;
+      }
+    `)
+
+    // We see @theme
+    expect(compiler.features & Features.AtTheme).toBeTruthy()
+
+    // And this produces no output because no other CSS is present
+    expect(compiler.build([])).toEqual('')
+  })
+})
diff --git a/packages/tailwindcss/src/index.ts b/packages/tailwindcss/src/index.ts
index cbfad6b3f..bc279e624 100644
--- a/packages/tailwindcss/src/index.ts
+++ b/packages/tailwindcss/src/index.ts
@@ -4,14 +4,14 @@ import {
   atRoot,
   atRule,
   comment,
+  context,
   context as contextNode,
+  cssContext,
   decl,
   optimizeAst,
   rule,
   styleRule,
   toCss,
-  walk,
-  WalkAction,
   type AstNode,
   type AtRule,
   type Context,
@@ -25,22 +25,54 @@ import { compileCandidates } from './compile'
 import { substituteFunctions } from './css-functions'
 import * as CSS from './css-parser'
 import { buildDesignSystem, type DesignSystem } from './design-system'
+import { createSourceMap, type DecodedSourceMap } from './source-maps/source-map'
 import { Theme, ThemeOptions } from './theme'
+import { createCssUtility } from './utilities'
+import { expand } from './utils/brace-expansion'
+import { escape, unescape } from './utils/escape'
 import { segment } from './utils/segment'
-import { compoundsForSelectors } from './variants'
-export type Config = UserConfig
+import { topologicalSort } from './utils/topological-sort'
+import { compoundsForSelectors, IS_VALID_VARIANT_NAME, substituteAtVariant } from './variants'
+import { walk, WalkAction } from './walk'
+
+export interface Config extends UserConfig {}
 
 const IS_VALID_PREFIX = /^[a-z]+$/
-const IS_VALID_UTILITY_NAME = /^[a-z][a-zA-Z0-9/%._-]*$/
+
+export const enum Polyfills {
+  None = 0,
+
+  // Control if fallbacks for `@property` rules are emitted
+  AtProperty = 1 << 0,
+
+  // Control if `color-mix(…)` fallbacks are inserted
+  ColorMix = 1 << 1,
+
+  // Enable all
+  All = AtProperty | ColorMix,
+}
 
 type CompileOptions = {
   base?: string
+  from?: string
+  polyfills?: Polyfills
   loadModule?: (
     id: string,
     base: string,
     resourceHint: 'plugin' | 'config',
-  ) => Promise<{ module: Plugin | Config; base: string }>
-  loadStylesheet?: (id: string, base: string) => Promise<{ content: string; base: string }>
+  ) => Promise<{
+    path: string
+    base: string
+    module: Plugin | Config
+  }>
+  loadStylesheet?: (
+    id: string,
+    base: string,
+  ) => Promise<{
+    path: string
+    base: string
+    content: string
+  }>
 }
 
 function throwOnLoadModule(): never {
@@ -62,6 +94,8 @@ function parseThemeOptions(params: string) {
       options |= ThemeOptions.INLINE
     } else if (option === 'default') {
       options |= ThemeOptions.DEFAULT
+    } else if (option === 'static') {
+      options |= ThemeOptions.STATIC
     } else if (option.startsWith('prefix(') && option.endsWith(')')) {
       prefix = option.slice(7, -1)
     }
@@ -97,12 +131,19 @@ export const enum Features {
 
   // `@tailwind utilities` was used
   Utilities = 1 << 4,
+
+  // `@variant` was used
+  Variants = 1 << 5,
+
+  // `@theme` was used
+  AtTheme = 1 << 6,
 }
 
 async function parseCss(
   ast: AstNode[],
   {
     base = '',
+    from,
     loadModule = throwOnLoadModule,
     loadStylesheet = throwOnLoadStylesheet,
   }: CompileOptions = {},
@@ -110,20 +151,25 @@ async function parseCss(
   let features = Features.None
   ast = [contextNode({ base }, ast)] as AstNode[]
 
-  features |= await substituteAtImports(ast, base, loadStylesheet)
+  features |= await substituteAtImports(ast, base, loadStylesheet, 0, from !== undefined)
 
   let important = null as boolean | null
   let theme = new Theme()
-  let customVariants: ((designSystem: DesignSystem) => void)[] = []
+  let customVariants = new Map<string, (designSystem: DesignSystem) => void>()
+  let customVariantDependencies = new Map<string, Set<string>>()
   let customUtilities: ((designSystem: DesignSystem) => void)[] = []
   let firstThemeRule = null as StyleRule | null
   let utilitiesNode = null as AtRule | null
-  let globs: { base: string; pattern: string }[] = []
+  let variantNodes: AtRule[] = []
+  let sources: { base: string; pattern: string; negated: boolean }[] = []
+  let inlineCandidates: string[] = []
+  let ignoredCandidates: string[] = []
   let root = null as Root
 
   // Handle at-rules
-  walk(ast, (node, { parent, replaceWith, context }) => {
+  walk(ast, (node, _ctx) => {
     if (node.kind !== 'at-rule') return
+    let ctx = cssContext(_ctx)
 
     // Find `@tailwind utilities` so that we can later replace it with the
     // actual generated utility class CSS.
@@ -133,8 +179,14 @@ async function parseCss(
     ) {
       // Any additional `@tailwind utilities` nodes can be removed
       if (utilitiesNode !== null) {
-        replaceWith([])
-        return
+        return WalkAction.Replace([])
+      }
+
+      // When inside `@reference` we should treat `@tailwind utilities` as if
+      // it wasn't there in the first place. This should also let `build()`
+      // return the cached static AST.
+      if (ctx.context.reference) {
+        return WalkAction.Replace([])
       }
 
       let params = segment(node.params, ' ')
@@ -158,7 +210,7 @@ async function parseCss(
           }
 
           root = {
-            base: (context.sourceBase as string) ?? (context.base as string),
+            base: (ctx.context.sourceBase as string) ?? (ctx.context.base as string),
             pattern: path.slice(1, -1),
           }
         }
@@ -170,29 +222,36 @@ async function parseCss(
 
     // Collect custom `@utility` at-rules
     if (node.name === '@utility') {
-      if (parent !== null) {
+      if (ctx.parent !== null) {
         throw new Error('`@utility` cannot be nested.')
       }
 
-      let name = node.params
-
-      if (!IS_VALID_UTILITY_NAME.test(name)) {
-        throw new Error(
-          `\`@utility ${name}\` defines an invalid utility name. Utilities should be alphanumeric and start with a lowercase letter.`,
-        )
-      }
-
       if (node.nodes.length === 0) {
         throw new Error(
-          `\`@utility ${name}\` is empty. Utilities should include at least one property.`,
+          `\`@utility ${node.params}\` is empty. Utilities should include at least one property.`,
         )
       }
 
-      customUtilities.push((designSystem) => {
-        designSystem.utilities.static(name, () => structuredClone(node.nodes))
-      })
+      let utility = createCssUtility(node)
+      if (utility === null) {
+        if (!node.params.endsWith('-*')) {
+          if (node.params.endsWith('*')) {
+            throw new Error(
+              `\`@utility ${node.params}\` defines an invalid utility name. A functional utility must end in \`-*\`.`,
+            )
+          } else if (node.params.includes('*')) {
+            throw new Error(
+              `\`@utility ${node.params}\` defines an invalid utility name. The dynamic portion marked by \`-*\` must appear once at the end.`,
+            )
+          }
+        }
 
-      return
+        throw new Error(
+          `\`@utility ${node.params}\` defines an invalid utility name. Utilities should be alphanumeric and start with a lowercase letter.`,
+        )
+      }
+
+      customUtilities.push(utility)
     }
 
     // Collect paths from `@source` at-rules
@@ -201,11 +260,24 @@ async function parseCss(
         throw new Error('`@source` cannot have a body.')
       }
 
-      if (parent !== null) {
+      if (ctx.parent !== null) {
         throw new Error('`@source` cannot be nested.')
       }
 
+      let not = false
+      let inline = false
       let path = node.params
+
+      if (path[0] === 'n' && path.startsWith('not ')) {
+        not = true
+        path = path.slice(4)
+      }
+
+      if (path[0] === 'i' && path.startsWith('inline(')) {
+        inline = true
+        path = path.slice(7, -1).trim()
+      }
+
       if (
         (path[0] === '"' && path[path.length - 1] !== '"') ||
         (path[0] === "'" && path[path.length - 1] !== "'") ||
@@ -213,33 +285,99 @@ async function parseCss(
       ) {
         throw new Error('`@source` paths must be quoted.')
       }
-      globs.push({ base: context.base as string, pattern: path.slice(1, -1) })
-      replaceWith([])
-      return
-    }
 
-    // Register custom variants from `@variant` at-rules
-    if (node.name === '@variant') {
-      if (parent !== null) {
-        throw new Error('`@variant` cannot be nested.')
+      let source = path.slice(1, -1)
+
+      if (inline) {
+        let destination = not ? ignoredCandidates : inlineCandidates
+        let sources = segment(source, ' ')
+        for (let source of sources) {
+          for (let candidate of expand(source)) {
+            destination.push(candidate)
+          }
+        }
+      } else {
+        sources.push({
+          base: ctx.context.base as string,
+          pattern: source,
+          negated: not,
+        })
       }
 
-      // Remove `@variant` at-rule so it's not included in the compiled CSS
-      replaceWith([])
+      return WalkAction.ReplaceSkip([])
+    }
+
+    // Apply `@variant` at-rules
+    if (node.name === '@variant') {
+      // Legacy `@variant` at-rules containing `@slot` or without a body should
+      // be considered a `@custom-variant` at-rule.
+      if (ctx.parent === null) {
+        // Body-less `@variant`, e.g.: `@variant foo (…);`
+        if (node.nodes.length === 0) {
+          node.name = '@custom-variant'
+        }
+
+        // Using `@slot`:
+        //
+        // ```css
+        // @variant foo {
+        //   &:hover {
+        //     @slot;
+        //   }
+        // }
+        // ```
+        else {
+          walk(node.nodes, (child) => {
+            if (child.kind === 'at-rule' && child.name === '@slot') {
+              node.name = '@custom-variant'
+              return WalkAction.Stop
+            }
+          })
+
+          // No `@slot` found, so this is still a regular `@variant` at-rule
+          if (node.name === '@variant') {
+            variantNodes.push(node)
+          }
+        }
+      }
+
+      // Collect all the `@variant` at-rules, we will replace them later once
+      // all variants are registered in the system.
+      else {
+        variantNodes.push(node)
+      }
+    }
+
+    // Register custom variants from `@custom-variant` at-rules
+    if (node.name === '@custom-variant') {
+      if (ctx.parent !== null) {
+        throw new Error('`@custom-variant` cannot be nested.')
+      }
 
       let [name, selector] = segment(node.params, ' ')
 
-      if (node.nodes.length > 0 && selector) {
-        throw new Error(`\`@variant ${name}\` cannot have both a selector and a body.`)
+      if (!IS_VALID_VARIANT_NAME.test(name)) {
+        throw new Error(
+          `\`@custom-variant ${name}\` defines an invalid variant name. Variants should only contain alphanumeric, dashes, or underscore characters and start with a lowercase letter or number.`,
+        )
       }
 
-      // Variants with a selector, but without a body, e.g.: `@variant hocus (&:hover, &:focus);`
+      if (node.nodes.length > 0 && selector) {
+        throw new Error(`\`@custom-variant ${name}\` cannot have both a selector and a body.`)
+      }
+
+      // Variants with a selector, but without a body, e.g.: `@custom-variant hocus (&:hover, &:focus);`
       if (node.nodes.length === 0) {
         if (!selector) {
-          throw new Error(`\`@variant ${name}\` has no selector or body.`)
+          throw new Error(`\`@custom-variant ${name}\` has no selector or body.`)
         }
 
         let selectors = segment(selector.slice(1, -1), ',')
+        if (selectors.length === 0 || selectors.some((selector) => selector.trim() === '')) {
+          throw new Error(
+            `\`@custom-variant ${name} (${selectors.join(',')})\` selector is invalid.`,
+          )
+        }
 
         let atRuleParams: string[] = []
         let styleRuleSelectors: string[] = []
@@ -254,29 +392,32 @@ async function parseCss(
           }
         }
 
-        customVariants.push((designSystem) => {
+        let usesAtScope = atRuleParams.some((param) => param.startsWith('@scope'))
+
+        customVariants.set(name, (designSystem) => {
           designSystem.variants.static(
             name,
             (r) => {
+              let slot = usesAtScope ? [contextNode({ source: 'user' }, r.nodes)] : r.nodes
+
               let nodes: AstNode[] = []
 
               if (styleRuleSelectors.length > 0) {
-                nodes.push(styleRule(styleRuleSelectors.join(', '), r.nodes))
+                nodes.push(styleRule(styleRuleSelectors.join(', '), slot))
               }
 
               for (let selector of atRuleParams) {
-                nodes.push(rule(selector, r.nodes))
+                nodes.push(rule(selector, slot))
               }
 
-              r.nodes = nodes
+              r.nodes = usesAtScope ? [contextNode({ source: 'variant' }, nodes)] : nodes
             },
             {
               compounds: compoundsForSelectors([...styleRuleSelectors, ...atRuleParams]),
             },
           )
         })
-
-        return
+        customVariantDependencies.set(name, new Set<string>())
       }
 
       // Variants without a selector, but with a body:
@@ -284,7 +425,7 @@ async function parseCss(
       // E.g.:
       //
       // ```css
-      // @variant hocus {
+      // @custom-variant hocus {
       //   &:hover {
       //     @slot;
       //   }
@@ -295,12 +436,21 @@ async function parseCss(
       // }
       // ```
       else {
-        customVariants.push((designSystem) => {
-          designSystem.variants.fromAst(name, node.nodes)
+        let dependencies = new Set<string>()
+        walk(node.nodes, (child) => {
+          if (child.kind === 'at-rule' && child.name === '@variant') {
+            dependencies.add(child.params)
+          }
         })
 
-        return
+        customVariants.set(name, (designSystem) => {
+          designSystem.variants.fromAst(name, node.nodes, designSystem)
+        })
+        customVariantDependencies.set(name, dependencies)
       }
+
+      // Remove `@custom-variant` at-rule so it's not included in the compiled CSS
+      return WalkAction.ReplaceSkip([])
     }
 
     if (node.name === '@media') {
@@ -312,31 +462,39 @@ async function parseCss(
         if (param.startsWith('source(')) {
           let path = param.slice(7, -1)
 
-          walk(node.nodes, (child, { replaceWith }) => {
+          walk(node.nodes, (child) => {
             if (child.kind !== 'at-rule') return
 
             if (child.name === '@tailwind' && child.params === 'utilities') {
               child.params += ` source(${path})`
-              replaceWith([contextNode({ sourceBase: context.base }, [child])])
-              return WalkAction.Stop
+              return WalkAction.ReplaceStop([
+                contextNode({ sourceBase: ctx.context.base }, [child]),
+              ])
             }
           })
         }
 
         // Handle `@media theme(…)`
         //
-        // We support `@import "tailwindcss/theme" theme(reference)` as a way to
+        // We support `@import "tailwindcss" theme(reference)` as a way to
         // import an external theme file as a reference, which becomes `@media
         // theme(reference) { … }` when the `@import` is processed.
         else if (param.startsWith('theme(')) {
           let themeParams = param.slice(6, -1)
+          let hasReference = themeParams.includes('reference')
 
           walk(node.nodes, (child) => {
+            if (child.kind === 'context') return
             if (child.kind !== 'at-rule') {
-              throw new Error(
-                'Files imported with `@import "…" theme(…)` must only contain `@theme` blocks.',
-              )
+              if (hasReference) {
+                throw new Error(
+                  `Files imported with \`@import "…" theme(reference)\` must only contain \`@theme\` blocks.\nUse \`@reference "…";\` instead.`,
+                )
+              }
+
+              return WalkAction.Continue
             }
+
             if (child.name === '@theme') {
               child.params += ' ' + themeParams
               return WalkAction.Skip
@@ -367,42 +525,6 @@ async function parseCss(
 
         // Handle `@import "…" reference`
         else if (param === 'reference') {
-          walk(node.nodes, (child, { replaceWith }) => {
-            if (child.kind !== 'at-rule') {
-              replaceWith([])
-              return WalkAction.Skip
-            }
-            switch (child.name) {
-              case '@theme': {
-                let themeParams = segment(child.params, ' ')
-                if (!themeParams.includes('reference')) {
-                  child.params = (child.params === '' ? '' : ' ') + 'reference'
-                }
-                return WalkAction.Skip
-              }
-              case '@import':
-              case '@config':
-              case '@plugin':
-              case '@variant':
-              case '@utility': {
-                return WalkAction.Skip
-              }
-
-              case '@media':
-              case '@supports':
-              case '@layer': {
-                // These rules should be recursively traversed as these might be
-                // inserted by the `@import` resolution.
-                return
-              }
-
-              default: {
-                replaceWith([])
-                return WalkAction.Skip
-              }
-            }
-          })
-
           node.nodes = [contextNode({ reference: true }, node.nodes)]
         }
 
@@ -415,16 +537,22 @@ async function parseCss(
       if (unknownParams.length > 0) {
         node.params = unknownParams.join(' ')
       } else if (params.length > 0) {
-        replaceWith(node.nodes)
+        return WalkAction.Replace(node.nodes)
       }
 
-      return WalkAction.Skip
+      return WalkAction.Continue
     }
 
     // Handle `@theme`
     if (node.name === '@theme') {
       let [themeOptions, themePrefix] = parseThemeOptions(node.params)
 
+      features |= Features.AtTheme
+
+      if (ctx.context.reference) {
+        themeOptions |= ThemeOptions.REFERENCE
+      }
+
       if (themePrefix) {
         if (!IS_VALID_PREFIX.test(themePrefix)) {
           throw new Error(
@@ -436,18 +564,17 @@ async function parseCss(
       }
 
       // Record all custom properties in the `@theme` declaration
-      walk(node.nodes, (child, { replaceWith }) => {
+      walk(node.nodes, (child) => {
         // Collect `@keyframes` rules to re-insert with theme variables later,
         // since the `@theme` rule itself will be removed.
         if (child.kind === 'at-rule' && child.name === '@keyframes') {
           theme.addKeyframes(child)
-          replaceWith([])
           return WalkAction.Skip
         }
 
         if (child.kind === 'comment') return
         if (child.kind === 'declaration' && child.property.startsWith('--')) {
-          theme.add(child.property, child.value ?? '', themeOptions)
+          theme.add(unescape(child.property), child.value ?? '', themeOptions, child.src)
           return
         }
 
@@ -463,22 +590,28 @@ async function parseCss(
 
       // Keep a reference to the first `@theme` rule to update with the full
       // theme later, and delete any other `@theme` rules.
-      if (!firstThemeRule && !(themeOptions & ThemeOptions.REFERENCE)) {
-        firstThemeRule = styleRule(':root', node.nodes)
-        replaceWith([firstThemeRule])
+      if (!firstThemeRule) {
+        firstThemeRule = styleRule(':root, :host', [])
+        firstThemeRule.src = node.src
+        return WalkAction.ReplaceSkip(firstThemeRule)
       } else {
-        replaceWith([])
+        return WalkAction.ReplaceSkip([])
       }
-      return WalkAction.Skip
     }
   })
 
-  let designSystem = buildDesignSystem(theme)
+  let designSystem = buildDesignSystem(theme, utilitiesNode?.src)
 
   if (important) {
     designSystem.important = important
   }
 
+  if (ignoredCandidates.length > 0) {
+    for (let candidate of ignoredCandidates) {
+      designSystem.invalidCandidates.add(candidate)
+    }
+  }
+
   // Apply hooks from backwards compatibility layer. This function takes a lot
   // of random arguments because it really just needs access to "the world" to
   // do whatever ungodly things it needs to do to make things backwards
@@ -488,48 +621,63 @@ async function parseCss(
     base,
     ast,
     loadModule,
-    globs,
+    sources,
   })
 
-  for (let customVariant of customVariants) {
-    customVariant(designSystem)
+  for (let name of customVariants.keys()) {
+    // Pre-register the variant to ensure its position in the variant list is
+    // based on the order we see them in the CSS.
+    designSystem.variants.static(name, () => {})
+  }
+
+  // Register custom variants in order
+  for (let variant of topologicalSort(customVariantDependencies, {
+    onCircularDependency(path, start) {
+      let output = toCss(
+        path.map((name, idx) => {
+          return atRule('@custom-variant', name, [atRule('@variant', path[idx + 1] ?? start, [])])
+        }),
+      )
+        .replaceAll(';', ' { … }')
+        .replace(`@custom-variant ${start} {`, `@custom-variant ${start} { /* ← */`)
+
+      throw new Error(`Circular dependency detected in custom variants:\n\n${output}`)
+    },
+  })) {
+    customVariants.get(variant)?.(designSystem)
   }
 
   for (let customUtility of customUtilities) {
     customUtility(designSystem)
   }
 
-  // Output final set of theme variables at the position of the first `@theme`
-  // rule.
+  // Output final set of theme variables at the position of the first
+  // `@theme` rule.
   if (firstThemeRule) {
     let nodes = []
 
-    for (let [key, value] of theme.entries()) {
+    for (let [key, value] of designSystem.theme.entries()) {
       if (value.options & ThemeOptions.REFERENCE) continue
-      nodes.push(decl(key, value.value))
+      let node = decl(escape(key), value.value)
+      node.src = value.src
+      nodes.push(node)
     }
 
-    let keyframesRules = theme.getKeyframes()
-    if (keyframesRules.length > 0) {
-      let animationParts = [...theme.namespace('--animate').values()].flatMap((animation) =>
-        animation.split(' '),
-      )
-
-      for (let keyframesRule of keyframesRules) {
-        // Remove any keyframes that aren't used by an animation variable.
-        let keyframesName = keyframesRule.params
-        if (!animationParts.includes(keyframesName)) {
-          continue
-        }
-
-        // Wrap `@keyframes` in `AtRoot` so they are hoisted out of `:root` when
-        // printing.
-        nodes.push(atRoot([keyframesRule]))
-      }
+    let keyframesRules = designSystem.theme.getKeyframes()
+    for (let keyframes of keyframesRules) {
+      // Wrap `@keyframes` in `AtRoot` so they are hoisted out of `:root` when
+      // printing. We push it to the top-level of the AST so that an eventual
+      // `@reference` does not cut it out when printing the document.
+      ast.push(context({ theme: true }, [atRoot([keyframes])]))
     }
-    firstThemeRule.nodes = nodes
+
+    firstThemeRule.nodes = [context({ theme: true }, nodes)]
   }
 
+  features |= substituteAtVariant(ast, designSystem)
+  features |= substituteFunctions(ast, designSystem)
+  features |= substituteAtApply(ast, designSystem)
+
   // Replace the `@tailwind utilities` node with a context since it prints
   // children directly.
   if (utilitiesNode) {
@@ -538,18 +686,13 @@ async function parseCss(
     node.context = {}
   }
 
-  // Replace `@apply` rules with the actual utility classes.
-  features |= substituteAtApply(ast, designSystem)
-
-  features |= substituteFunctions(ast, designSystem.resolveThemeValue)
-
   // Remove `@utility`, we couldn't replace it before yet because we had to
   // handle the nested `@apply` at-rules first.
-  walk(ast, (node, { replaceWith }) => {
+  walk(ast, (node) => {
     if (node.kind !== 'at-rule') return
 
     if (node.name === '@utility') {
-      replaceWith([])
+      return WalkAction.Replace([])
     }
 
     // The `@utility` has to be top-level, therefore we don't have to traverse
@@ -560,10 +703,11 @@ async function parseCss(
   return {
     designSystem,
     ast,
-    globs,
+    sources,
     root,
     utilitiesNode,
     features,
+    inlineCandidates,
   }
 }
 
@@ -571,12 +715,13 @@ export async function compileAst(
   input: AstNode[],
   opts: CompileOptions = {},
 ): Promise<{
-  globs: { base: string; pattern: string }[]
+  sources: { base: string; pattern: string; negated: boolean }[]
   root: Root
   features: Features
   build(candidates: string[]): AstNode[]
 }> {
-  let { designSystem, ast, globs, root, utilitiesNode, features } = await parseCss(input, opts)
+  let { designSystem, ast, sources, root, utilitiesNode, features, inlineCandidates } =
+    await parseCss(input, opts)
 
   if (process.env.NODE_ENV !== 'test') {
     ast.unshift(comment(`! tailwindcss v${version} | MIT License | https://tailwindcss.com `))
@@ -593,9 +738,17 @@ export async function compileAst(
   let allValidCandidates = new Set<string>()
   let compiled = null as AstNode[] | null
   let previousAstNodeCount = 0
+  let defaultDidChange = false
+
+  for (let candidate of inlineCandidates) {
+    if (!designSystem.invalidCandidates.has(candidate)) {
+      allValidCandidates.add(candidate)
+      defaultDidChange = true
+    }
+  }
 
   return {
-    globs,
+    sources,
     root,
     features,
     build(newRawCandidates: string[]) {
@@ -604,25 +757,33 @@ export async function compileAst(
       }
 
       if (!utilitiesNode) {
-        compiled ??= optimizeAst(ast)
+        compiled ??= optimizeAst(ast, designSystem, opts.polyfills)
         return compiled
       }
 
-      let didChange = false
+      let didChange = defaultDidChange
+      let didAddExternalVariable = false
+      defaultDidChange = false
 
       // Add all new candidates unless we know that they are invalid.
       let prevSize = allValidCandidates.size
       for (let candidate of newRawCandidates) {
         if (!designSystem.invalidCandidates.has(candidate)) {
-          allValidCandidates.add(candidate)
-          didChange ||= allValidCandidates.size !== prevSize
+          if (candidate[0] === '-' && candidate[1] === '-') {
+            let didMarkVariableAsUsed = designSystem.theme.markUsedVariable(candidate)
+            didChange ||= didMarkVariableAsUsed
+            didAddExternalVariable ||= didMarkVariableAsUsed
+          } else {
+            allValidCandidates.add(candidate)
+            didChange ||= allValidCandidates.size !== prevSize
+          }
         }
       }
 
       // If no new candidates were added, we can return the original CSS. This
       // currently assumes that we only add new candidates and never remove any.
       if (!didChange) {
-        compiled ??= optimizeAst(ast)
+        compiled ??= optimizeAst(ast, designSystem, opts.polyfills)
         return compiled
       }
 
@@ -630,11 +791,21 @@ export async function compileAst(
         onInvalidCandidate,
       }).astNodes
 
+      if (opts.from) {
+        walk(newNodes, (node) => {
+          // We do this conditionally to preserve source locations from both
+          // `@utility` and `@custom-variant`. Even though generated nodes are
+          // cached this should be fine because `utilitiesNode.src` should not
+          // change without a full rebuild which destroys the cache.
+          node.src ??= utilitiesNode.src
+        })
+      }
+
       // If no new ast nodes were generated, then we can return the original
       // CSS. This currently assumes that we only add new ast nodes and never
       // remove any.
-      if (previousAstNodeCount === newNodes.length) {
-        compiled ??= optimizeAst(ast)
+      if (!didAddExternalVariable && previousAstNodeCount === newNodes.length) {
+        compiled ??= optimizeAst(ast, designSystem, opts.polyfills)
         return compiled
       }
 
@@ -642,22 +813,25 @@ export async function compileAst(
 
       utilitiesNode.nodes = newNodes
 
-      compiled = optimizeAst(ast)
+      compiled = optimizeAst(ast, designSystem, opts.polyfills)
       return compiled
     },
   }
 }
 
+export type { DecodedSourceMap }
+
 export async function compile(
   css: string,
   opts: CompileOptions = {},
 ): Promise<{
-  globs: { base: string; pattern: string }[]
+  sources: { base: string; pattern: string; negated: boolean }[]
   root: Root
   features: Features
   build(candidates: string[]): string
+  buildSourceMap(): DecodedSourceMap
 }> {
-  let ast = CSS.parse(css)
+  let ast = CSS.parse(css, { from: opts.from })
   let api = await compileAst(ast, opts)
   let compiledAst = ast
   let compiledCss = css
@@ -671,16 +845,22 @@ export async function compile(
         return compiledCss
       }
 
-      compiledCss = toCss(newAst)
+      compiledCss = toCss(newAst, !!opts.from)
       compiledAst = newAst
 
       return compiledCss
     },
+
+    buildSourceMap() {
+      return createSourceMap({
+        ast: compiledAst,
+      })
+    },
   }
 }
 
 export async function __unstable__loadDesignSystem(css: string, opts: CompileOptions = {}) {
-  let result = await parseCss(CSS.parse(css), opts)
+  let result = await parseCss(CSS.parse(css, { from: opts.from }), opts)
   return result.designSystem
 }
 
diff --git a/packages/tailwindcss/src/intellisense.test.ts b/packages/tailwindcss/src/intellisense.test.ts
index b32883d5c..63f9e7576 100644
--- a/packages/tailwindcss/src/intellisense.test.ts
+++ b/packages/tailwindcss/src/intellisense.test.ts
@@ -1,31 +1,37 @@
 import { expect, test } from 'vitest'
 import { __unstable__loadDesignSystem } from '.'
-import { buildDesignSystem } from './design-system'
+import { decl, rule } from './ast'
 import plugin from './plugin'
-import { Theme } from './theme'
+import { ThemeOptions } from './theme'
 
 const css = String.raw
 
 function loadDesignSystem() {
-  let theme = new Theme()
-  theme.add('--colors-red-500', 'red')
-  theme.add('--colors-blue-500', 'blue')
-  theme.add('--breakpoint-sm', '640px')
-  theme.add('--aspect-video', '16 / 9')
-  theme.add('--font-sans', 'sans-serif')
-  theme.add('--font-weight-superbold', '900')
-  theme.add('--text-xs', '0.75rem')
-  theme.add('--text-xs--line-height', '1rem')
-  theme.add('--perspective-dramatic', '100px')
-  theme.add('--perspective-normal', '500px')
-  theme.add('--opacity-background', '0.3')
-  theme.add('--drop-shadow-sm', '0 1px 1px rgb(0 0 0 / 0.05)')
-  theme.add('--inset-shadow-sm', 'inset 0 1px 1px rgb(0 0 0 / 0.05)')
-  return buildDesignSystem(theme)
+  return __unstable__loadDesignSystem(`
+    @theme {
+      --spacing: 0.25rem;
+      --colors-red-500: red;
+      --colors-blue-500: blue;
+      --breakpoint-sm: 640px;
+      --aspect-video: 16 / 9;
+      --font-sans: sans-serif;
+      --font-weight-superbold: 900;
+      --text-xs: 0.75rem;
+      --text-xs--line-height: 1rem;
+      --perspective-dramatic: 100px;
+      --perspective-normal: 500px;
+      --opacity-background: 0.3;
+      --drop-shadow-sm: 0 1px 1px rgb(0 0 0 / 0.05);
+      --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
+      --font-weight-bold: 700;
+      --container-md: 768px;
+      --container-lg: 1024px;
+    }
+  `)
 }
 
-test('getClassList', () => {
-  let design = loadDesignSystem()
+test('getClassList', async () => {
+  let design = await loadDesignSystem()
   let classList = design.getClassList()
   let classNames = classList.flatMap(([name, meta]) => [
     name,
@@ -35,22 +41,41 @@ test('getClassList', () => {
   expect(classNames).toMatchSnapshot()
 })
 
-test('Theme values with underscores are converted back to decimal points', () => {
-  let design = loadDesignSystem()
+test('Spacing utilities do not suggest bare values when not using the multiplier-based spacing scale', async () => {
+  let design = await loadDesignSystem()
+
+  // Remove spacing scale
+  design.theme.clearNamespace('--spacing', ThemeOptions.NONE)
+
+  let classList = design.getClassList()
+  let classNames = classList.flatMap(([name, meta]) => [
+    name,
+    ...meta.modifiers.map((m) => `${name}/${m}`),
+  ])
+
+  expect(classNames).not.toContain('p-0')
+  expect(classNames).not.toContain('p-1')
+  expect(classNames).not.toContain('p-2')
+  expect(classNames).not.toContain('p-3')
+  expect(classNames).not.toContain('p-4')
+})
+
+test('Theme values with underscores are converted back to decimal points', async () => {
+  let design = await loadDesignSystem()
   let classes = design.getClassList()
 
   expect(classes).toContainEqual(['inset-0.5', { modifiers: [] }])
 })
 
-test('getVariants', () => {
-  let design = loadDesignSystem()
+test('getVariants', async () => {
+  let design = await loadDesignSystem()
   let variants = design.getVariants()
 
   expect(variants).toMatchSnapshot()
 })
 
-test('getVariants compound', () => {
-  let design = loadDesignSystem()
+test('getVariants compound', async () => {
+  let design = await loadDesignSystem()
   let variants = design.getVariants()
   let group = variants.find((v) => v.name === 'group')!
 
@@ -72,9 +97,9 @@ test('getVariants compound', () => {
   ]
 
   expect(list).toEqual([
-    ['@media (hover: hover) { &:is(:where(.group):hover *) }'],
-    ['@media (hover: hover) { &:is(:where(.group\\/sidebar):hover *) }'],
-    ['@media (hover: hover) { &:is(:where(.group):is(:where(.group):hover *) *) }'],
+    ['@media (hover: hover) { :is(:where(.group):hover &) }'],
+    ['@media (hover: hover) { :is(:where(.group\\/sidebar):hover &) }'],
+    ['@media (hover: hover) { :is(:is(:where(.group):hover :where(.group)) &) }'],
     [],
     [],
   ])
@@ -82,7 +107,7 @@ test('getVariants compound', () => {
 
 test('variant selectors are in the correct order', async () => {
   let input = css`
-    @variant overactive {
+    @custom-variant overactive {
       &:hover {
         @media (hover: hover) {
           &:focus {
@@ -107,16 +132,16 @@ test('variant selectors are in the correct order', async () => {
   `)
 })
 
-test('The variant `has-force` does not crash', () => {
-  let design = loadDesignSystem()
+test('The variant `has-force` does not crash', async () => {
+  let design = await loadDesignSystem()
   let variants = design.getVariants()
   let has = variants.find((v) => v.name === 'has')!
 
   expect(has.selectors({ value: 'force' })).toMatchInlineSnapshot(`[]`)
 })
 
-test('Can produce CSS per candidate using `candidatesToCss`', () => {
-  let design = loadDesignSystem()
+test('Can produce CSS per candidate using `candidatesToCss`', async () => {
+  let design = await loadDesignSystem()
   design.invalidCandidates = new Set(['bg-[#fff]'])
 
   expect(design.candidatesToCss(['underline', 'i-dont-exist', 'bg-[#fff]', 'bg-[#000]', 'text-xs']))
@@ -141,6 +166,26 @@ test('Can produce CSS per candidate using `candidatesToCss`', () => {
     `)
 })
 
+test('Can produce AST per candidate using `candidatesToAst`', async () => {
+  let design = await loadDesignSystem()
+  design.invalidCandidates = new Set(['bg-[#fff]'])
+
+  expect(
+    design.candidatesToAst(['underline', 'i-dont-exist', 'bg-[#fff]', 'bg-[#000]', 'text-xs']),
+  ).toEqual([
+    [rule('.underline', [decl('text-decoration-line', 'underline')])],
+    [],
+    [],
+    [rule('.bg-\\[\\#000\\]', [decl('background-color', '#000')])],
+    [
+      rule('.text-xs', [
+        decl('font-size', 'var(--text-xs)'),
+        decl('line-height', 'var(--tw-leading, var(--text-xs--line-height))'),
+      ]),
+    ],
+  ])
+})
+
 test('Utilities do not show wrapping selector in intellisense', async () => {
   let input = css`
     @import 'tailwindcss/utilities';
@@ -149,10 +194,12 @@ test('Utilities do not show wrapping selector in intellisense', async () => {
 
   let design = await __unstable__loadDesignSystem(input, {
     loadStylesheet: async (_, base) => ({
+      path: '',
       base,
       content: '@tailwind utilities;',
     }),
     loadModule: async () => ({
+      path: '',
       base: '',
       module: {
         important: '#app',
@@ -166,11 +213,9 @@ test('Utilities do not show wrapping selector in intellisense', async () => {
       text-decoration-line: underline;
     }
     ",
-      ".hover\\:line-through {
-      &:hover {
-        @media (hover: hover) {
-          text-decoration-line: line-through;
-        }
+      "@media (hover: hover) {
+      .hover\\:line-through:hover {
+        text-decoration-line: line-through;
       }
     }
     ",
@@ -185,6 +230,7 @@ test('Utilities, when marked as important, show as important in intellisense', a
 
   let design = await __unstable__loadDesignSystem(input, {
     loadStylesheet: async (_, base) => ({
+      path: '',
       base,
       content: '@tailwind utilities;',
     }),
@@ -196,11 +242,9 @@ test('Utilities, when marked as important, show as important in intellisense', a
       text-decoration-line: underline !important;
     }
     ",
-      ".hover\\:line-through {
-      &:hover {
-        @media (hover: hover) {
-          text-decoration-line: line-through !important;
-        }
+      "@media (hover: hover) {
+      .hover\\:line-through:hover {
+        text-decoration-line: line-through !important;
       }
     }
     ",
@@ -211,15 +255,17 @@ test('Utilities, when marked as important, show as important in intellisense', a
 test('Static utilities from plugins are listed in hovers and completions', async () => {
   let input = css`
     @import 'tailwindcss/utilities';
-    @plugin "./plugin.js"l;
+    @plugin "./plugin.js";
   `
 
   let design = await __unstable__loadDesignSystem(input, {
     loadStylesheet: async (_, base) => ({
+      path: '',
       base,
       content: '@tailwind utilities;',
     }),
     loadModule: async () => ({
+      path: '',
       base: '',
       module: plugin(({ addUtilities }) => {
         addUtilities({
@@ -246,15 +292,17 @@ test('Static utilities from plugins are listed in hovers and completions', async
 test('Functional utilities from plugins are listed in hovers and completions', async () => {
   let input = css`
     @import 'tailwindcss/utilities';
-    @plugin "./plugin.js"l;
+    @plugin "./plugin.js";
   `
 
   let design = await __unstable__loadDesignSystem(input, {
     loadStylesheet: async (_, base) => ({
+      path: '',
       base,
       content: '@tailwind utilities;',
     }),
     loadModule: async () => ({
+      path: '',
       base: '',
       module: plugin(({ matchUtilities }) => {
         matchUtilities(
@@ -309,48 +357,48 @@ test('Functional utilities from plugins are listed in hovers and completions', a
 
   expect(design.candidatesToCss(['custom-1-red', 'custom-1-green', 'custom-1-unknown']))
     .toMatchInlineSnapshot(`
-    [
-      ".custom-1-red {
-      color: #ff0000;
-    }
-    ",
-      ".custom-1-green {
-      color: #ff0000;
-    }
-    ",
-      null,
-    ]
-  `)
+      [
+        ".custom-1-red {
+        color: #ff0000;
+      }
+      ",
+        ".custom-1-green {
+        color: #ff0000;
+      }
+      ",
+        null,
+      ]
+    `)
 
   expect(design.candidatesToCss(['custom-2-red', 'custom-2-green', 'custom-2-unknown']))
     .toMatchInlineSnapshot(`
-    [
-      ".custom-2-red {
-      color: #ff0000 / 0%;
-    }
-    ",
-      ".custom-2-green {
-      color: #ff0000 / 0%;
-    }
-    ",
-      null,
-    ]
-  `)
+      [
+        ".custom-2-red {
+        color: #ff0000 / 0%;
+      }
+      ",
+        ".custom-2-green {
+        color: #ff0000 / 0%;
+      }
+      ",
+        null,
+      ]
+    `)
 
   expect(design.candidatesToCss(['custom-2-red/50', 'custom-2-red/75', 'custom-2-red/unknown']))
     .toMatchInlineSnapshot(`
-    [
-      ".custom-2-red\\/50 {
-      color: #ff0000 / 50%;
-    }
-    ",
-      ".custom-2-red\\/75 {
-      color: #ff0000 / 75%;
-    }
-    ",
-      null,
-    ]
-  `)
+      [
+        ".custom-2-red\\/50 {
+        color: #ff0000 / 50%;
+      }
+      ",
+        ".custom-2-red\\/75 {
+        color: #ff0000 / 75%;
+      }
+      ",
+        null,
+      ]
+    `)
 
   let classMap = new Map(design.getClassList())
   let classNames = Array.from(classMap.keys())
@@ -386,8 +434,8 @@ test('Functional utilities from plugins are listed in hovers and completions', a
 test('Custom at-rule variants do not show up as a value under `group`', async () => {
   let input = css`
     @import 'tailwindcss/utilities';
-    @variant variant-1 (@media foo);
-    @variant variant-2 {
+    @custom-variant variant-1 (@media foo);
+    @custom-variant variant-2 {
       @media bar {
         @slot;
       }
@@ -397,10 +445,12 @@ test('Custom at-rule variants do not show up as a value under `group`', async ()
 
   let design = await __unstable__loadDesignSystem(input, {
     loadStylesheet: async (_, base) => ({
+      path: '',
       base,
       content: '@tailwind utilities;',
     }),
     loadModule: async () => ({
+      path: '',
       base: '',
       module: plugin(({ addVariant }) => {
         addVariant('variant-3', '@media baz')
@@ -437,3 +487,298 @@ test('Custom at-rule variants do not show up as a value under `group`', async ()
   expect(not.values).toContain('variant-3')
   expect(not.values).toContain('variant-4')
 })
+
+test('Custom functional @utility', async () => {
+  let input = css`
+    @import 'tailwindcss/utilities';
+
+    @theme reference {
+      --text-xs: 0.75rem;
+      --text-xs--line-height: calc(1 / 0.75);
+
+      --leading-foo: 1.5;
+      --leading-bar: 2;
+
+      --spacing: 0.25rem;
+      --spacing-custom: 123px;
+
+      --negative-1: 1;
+      --negative-2: 2;
+      --negative-4: 4;
+      --negative-a: 8;
+    }
+
+    @utility example-* {
+      font-size: --value(--text);
+      line-height: --value(--text-* --line-height);
+      line-height: --modifier(--leading, 'normal');
+    }
+
+    @utility with-custom-spacing-* {
+      size: --value(--spacing);
+    }
+
+    @utility with-integer-spacing-* {
+      size: --spacing(--value(integer));
+    }
+
+    @utility with-number-spacing-* {
+      size: --spacing(--value(number));
+    }
+
+    @utility -negative-* {
+      margin: --value(--negative-*);
+    }
+  `
+
+  let design = await __unstable__loadDesignSystem(input, {
+    loadStylesheet: async (_, base) => ({
+      path: '',
+      base,
+      content: '@tailwind utilities;',
+    }),
+  })
+
+  let classMap = new Map(design.getClassList())
+  let classNames = Array.from(classMap.keys())
+
+  expect(classNames).toContain('with-custom-spacing-custom')
+  expect(classNames).not.toContain('with-custom-spacing-0')
+  expect(classNames).not.toContain('with-custom-spacing-0.5')
+  expect(classNames).not.toContain('with-custom-spacing-1')
+  expect(classNames).not.toContain('with-custom-spacing-1.5')
+
+  expect(classNames).not.toContain('with-integer-spacing-custom')
+  expect(classNames).toContain('with-integer-spacing-0')
+  expect(classNames).not.toContain('with-integer-spacing-0.5')
+  expect(classNames).toContain('with-integer-spacing-1')
+  expect(classNames).not.toContain('with-integer-spacing-1.5')
+
+  expect(classNames).not.toContain('with-number-spacing-custom')
+  expect(classNames).toContain('with-number-spacing-0')
+  expect(classNames).toContain('with-number-spacing-0.5')
+  expect(classNames).toContain('with-number-spacing-1')
+  expect(classNames).toContain('with-number-spacing-1.5')
+
+  expect(classNames).toContain('-negative-1')
+  expect(classNames).toContain('-negative-2')
+  expect(classNames).toContain('-negative-4')
+  expect(classNames).toContain('-negative-a')
+
+  expect(classNames).not.toContain('--negative-1')
+  expect(classNames).not.toContain('--negative-2')
+  expect(classNames).not.toContain('--negative-4')
+  expect(classNames).not.toContain('--negative-a')
+
+  expect(classNames).toContain('example-xs')
+  expect(classMap.get('example-xs')?.modifiers).toEqual(['normal', 'foo', 'bar'])
+})
+
+test('Custom utilities sharing a root with built-in utilities should merge suggestions', async () => {
+  let input = css`
+    @import 'tailwindcss/utilities';
+    @theme {
+      --font-sans: sans-serif;
+    }
+
+    @theme {
+      --font-weight-custom: 1234;
+      --font-weight-bold: bold; /* Overlap with existing utility */
+    }
+
+    @utility font-* {
+      --my-font-weight: --value(--font-weight-*);
+    }
+  `
+
+  let design = await __unstable__loadDesignSystem(input, {
+    loadStylesheet: async (_, base) => ({
+      path: '',
+      base,
+      content: '@tailwind utilities;',
+    }),
+  })
+
+  let classMap = new Map(design.getClassList())
+  let classNames = Array.from(classMap.keys())
+
+  expect(classNames).toContain('font-sans') // Existing font-family utility
+  expect(classNames).toContain('font-bold') // Existing font-family utility & custom font-weight utility
+  expect(classNames).toContain('font-custom') // Custom font-weight utility
+})
+
+test('Theme keys with underscores are suggested with underscores', async () => {
+  let input = css`
+    @import 'tailwindcss/utilities';
+
+    @theme {
+      /* Disable the spacing scale */
+      --spacing: initial;
+
+      /* This will get suggested with a dot because its surrounded by numbers */
+      --spacing-1_5: 1.5rem;
+
+      /* This will get suggested with a dot  */
+      --spacing-2\.5: 1.5rem;
+
+      /* This will get suggested with an underscore */
+      --spacing-logo_margin: 0.875rem;
+    }
+
+    @utility ex-* {
+      width: --value(--spacing-*);
+    }
+  `
+
+  let design = await __unstable__loadDesignSystem(input, {
+    loadStylesheet: async (_, base) => ({
+      path: '',
+      base,
+      content: '@tailwind utilities;',
+    }),
+  })
+
+  let entries = design
+    .getClassList()
+    .filter(([name]) => name.startsWith('p-') || name.startsWith('ex-'))
+
+  expect(entries).toContainEqual(['p-1.5', { modifiers: [] }])
+  expect(entries).toContainEqual(['p-2.5', { modifiers: [] }])
+  expect(entries).toContainEqual(['p-logo_margin', { modifiers: [] }])
+
+  expect(entries).toContainEqual(['ex-1.5', { modifiers: [] }])
+  expect(entries).toContainEqual(['ex-2.5', { modifiers: [] }])
+  expect(entries).toContainEqual(['ex-logo_margin', { modifiers: [] }])
+
+  expect(entries).not.toContainEqual(['p-1_5', { modifiers: [] }])
+  expect(entries).not.toContainEqual(['p-2_5', { modifiers: [] }])
+  expect(entries).not.toContainEqual(['p-logo.margin', { modifiers: [] }])
+
+  expect(entries).not.toContainEqual(['ex-1_5', { modifiers: [] }])
+  expect(entries).not.toContainEqual(['ex-2_5', { modifiers: [] }])
+  expect(entries).not.toContainEqual(['ex-logo.margin', { modifiers: [] }])
+})
+
+test('shadow utility default suggestions', async () => {
+  let input = css`
+    @theme {
+      /* nothing */
+    }
+  `
+
+  let design = await __unstable__loadDesignSystem(input)
+  let classNames = design.getClassList().map(([name]) => name)
+
+  expect(classNames).not.toContain('shadow')
+  expect(classNames).not.toContain('inset-shadow')
+  expect(classNames).not.toContain('text-shadow')
+
+  input = css`
+    @theme {
+      --shadow: 0 0 0 solid black;
+      --text-shadow: 0 0 0 solid black;
+      --inset-shadow: 0 0 0 solid black;
+    }
+  `
+
+  design = await __unstable__loadDesignSystem(input)
+  classNames = design.getClassList().map(([name]) => name)
+
+  expect(classNames).toContain('shadow')
+  expect(classNames).toContain('inset-shadow')
+  expect(classNames).toContain('text-shadow')
+})
+
+test('Custom @utility and existing utility with names matching theme keys dont give duplicate results', async () => {
+  let input = css`
+    @theme reference {
+      --leading-sm: 0.25rem;
+      --text-header: 1.5rem;
+    }
+
+    @utility text-header {
+      text-transform: uppercase;
+    }
+  `
+
+  let design = await __unstable__loadDesignSystem(input)
+
+  let classList = design.getClassList()
+  let classMap = new Map(classList)
+  let matches = classList.filter(([className]) => className === 'text-header')
+
+  expect(matches).toHaveLength(1)
+  expect(classMap.get('text-header')?.modifiers).toEqual(['sm'])
+})
+
+test('matchVariant', async () => {
+  let input = css`
+    @import 'tailwindcss/utilities';
+    @plugin "./plugin.js";
+  `
+
+  let design = await __unstable__loadDesignSystem(input, {
+    loadStylesheet: async (_, base) => ({
+      path: '',
+      base,
+      content: '@tailwind utilities;',
+    }),
+    loadModule: async () => ({
+      path: '',
+      base: '',
+      module: plugin(({ matchVariant }) => {
+        matchVariant('foo', (val) => `&:is(${val})`, {
+          values: {
+            DEFAULT: '1',
+            a: 'a',
+            b: 'b',
+          },
+        })
+      }),
+    }),
+  })
+
+  let variants = design.getVariants()
+  let v1 = variants.find((v) => v.name === 'foo')!
+  expect(v1).not.toBeUndefined()
+
+  expect(v1.hasDash).toEqual(true)
+  expect(v1.isArbitrary).toEqual(true)
+  expect(v1.name).toEqual('foo')
+  expect(v1.values).toEqual(['a', 'b'])
+})
+
+test('matchUtilities discards internal only helpers from suggestions when using the theme function', async () => {
+  let input = css`
+    @import 'tailwindcss/utilities';
+    @plugin "./plugin.js";
+
+    @theme {
+      --color-red: red;
+    }
+  `
+
+  let design = await __unstable__loadDesignSystem(input, {
+    loadStylesheet: async (_, base) => ({
+      path: '',
+      base,
+      content: '@tailwind utilities;',
+    }),
+    loadModule: async () => ({
+      path: '',
+      base: '',
+      module: plugin(({ matchUtilities, theme }) => {
+        matchUtilities({ foo: (val) => ({ color: val }) }, { values: theme('colors') })
+        matchUtilities({ bar: (val) => ({ color: val }) }, { values: theme('transitionDuration') })
+      }),
+    }),
+  })
+
+  let classNames = design.getClassList().map((e) => e[0])
+
+  expect(classNames).not.toContain('foo-__BARE_VALUE__')
+  expect(classNames).not.toContain('bar-__BARE_VALUE__')
+
+  expect(classNames).not.toContain('foo-__CSS_VALUES__')
+  expect(classNames).not.toContain('bar-__CSS_VALUES__')
+})
diff --git a/packages/tailwindcss/src/intellisense.ts b/packages/tailwindcss/src/intellisense.ts
index 5713afda4..e21663fe0 100644
--- a/packages/tailwindcss/src/intellisense.ts
+++ b/packages/tailwindcss/src/intellisense.ts
@@ -1,19 +1,42 @@
-import { styleRule, walkDepth } from './ast'
+import { styleRule } from './ast'
 import { applyVariant } from './compile'
 import type { DesignSystem } from './design-system'
+import { compare } from './utils/compare'
+import { DefaultMap } from './utils/default-map'
+import { walk } from './walk'
+export { canonicalizeCandidates, type CanonicalizeOptions } from './canonicalize-candidates'
 
 interface ClassMetadata {
   modifiers: string[]
 }
 
+export type ClassItem = {
+  name: string
+  utility: string
+  fraction: boolean
+  modifiers: string[]
+}
+
 export type ClassEntry = [string, ClassMetadata]
 
+const IS_FRACTION = /^\d+\/\d+$/
+
 export function getClassList(design: DesignSystem): ClassEntry[] {
-  let list: [string, ClassMetadata][] = []
+  let items = new DefaultMap<string, ClassItem>((utility) => ({
+    name: utility,
+    utility,
+    fraction: false,
+    modifiers: [],
+  }))
 
   // Static utilities only work as-is
   for (let utility of design.utilities.keys('static')) {
-    list.push([utility, { modifiers: [] }])
+    let completions = design.utilities.getCompletions(utility)
+    if (completions.length === 0) continue
+
+    let item = items.get(utility)
+    item.fraction = false
+    item.modifiers = []
   }
 
   // Functional utilities have their own list of completions
@@ -22,20 +45,99 @@ export function getClassList(design: DesignSystem): ClassEntry[] {
 
     for (let group of completions) {
       for (let value of group.values) {
+        let fraction = value !== null && IS_FRACTION.test(value)
+
         let name = value === null ? utility : `${utility}-${value}`
 
-        list.push([name, { modifiers: group.modifiers }])
+        let item = items.get(name)
+        item.utility = utility
+        item.fraction ||= fraction
+        item.modifiers.push(...group.modifiers)
 
         if (group.supportsNegative) {
-          list.push([`-${name}`, { modifiers: group.modifiers }])
+          let item = items.get(`-${name}`)
+          item.utility = `-${utility}`
+          item.fraction ||= fraction
+          item.modifiers.push(...group.modifiers)
         }
+
+        // Deduplicate modifiers
+        item.modifiers = Array.from(new Set(item.modifiers))
       }
     }
   }
 
-  list.sort((a, b) => (a[0] === b[0] ? 0 : a[0] < b[0] ? -1 : 1))
+  if (items.size === 0) return []
 
-  return list
+  // Sort utilities by their class name
+  let list = Array.from(items.values())
+  list.sort((a, b) => compare(a.name, b.name))
+
+  let entries = sortFractionsLast(list)
+
+  return entries
+}
+
+function sortFractionsLast(list: ClassItem[]) {
+  type Bucket = {
+    utility: string
+    items: ClassItem[]
+  }
+
+  // 1. Create "buckets" for each utility group
+  let buckets: Bucket[] = []
+  let current: Bucket | null = null
+
+  // 2. Determine the last bucket for each utility group
+  let lastUtilityBucket = new Map<string, Bucket>()
+
+  // 3. Collect all fractions in a given utility group
+  let fractions = new DefaultMap<string, ClassItem[]>(() => [])
+
+  for (let item of list) {
+    let { utility, fraction } = item
+
+    if (!current) {
+      current = { utility, items: [] }
+      lastUtilityBucket.set(utility, current)
+    }
+
+    if (utility !== current.utility) {
+      buckets.push(current)
+
+      current = { utility, items: [] }
+      lastUtilityBucket.set(utility, current)
+    }
+
+    if (fraction) {
+      fractions.get(utility).push(item)
+    } else {
+      current.items.push(item)
+    }
+  }
+
+  if (current && buckets[buckets.length - 1] !== current) {
+    buckets.push(current)
+  }
+
+  // 4. Add fractions to their respective last utility buckets
+  for (let [utility, items] of fractions) {
+    let bucket = lastUtilityBucket.get(utility)
+    if (!bucket) continue
+
+    bucket.items.push(...items)
+  }
+
+  // 5. Flatten the buckets into a single list
+  let entries: ClassEntry[] = []
+
+  for (let bucket of buckets) {
+    for (let entry of bucket.items) {
+      entries.push([entry.name, { modifiers: entry.modifiers }])
+    }
+  }
+
+  return entries
 }
 
 interface SelectorOptions {
@@ -57,11 +159,12 @@ export function getVariants(design: DesignSystem) {
   for (let [root, variant] of design.variants.entries()) {
     if (variant.kind === 'arbitrary') continue
 
+    let hasDash = root !== '@'
     let values = design.variants.getCompletions(root)
 
     function selectors({ value, modifier }: SelectorOptions = {}) {
       let name = root
-      if (value) name += `-${value}`
+      if (value) name += hasDash ? `-${value}` : value
       if (modifier) name += `/${modifier}`
 
       let variant = design.parseVariant(name)
@@ -81,42 +184,47 @@ export function getVariants(design: DesignSystem) {
 
       // Produce v3-style selector strings in the face of nested rules
       // this is more visible for things like group-*, not-*, etc…
-      walkDepth(node.nodes, (node, { path }) => {
-        if (node.kind !== 'rule' && node.kind !== 'at-rule') return
-        if (node.nodes.length > 0) return
+      walk(node.nodes, {
+        exit(node, ctx) {
+          if (node.kind !== 'rule' && node.kind !== 'at-rule') return
+          if (node.nodes.length > 0) return
 
-        // Sort at-rules before style rules
-        path.sort((a, b) => {
-          let aIsAtRule = a.kind === 'at-rule'
-          let bIsAtRule = b.kind === 'at-rule'
+          let path = ctx.path()
+          path.push(node)
 
-          if (aIsAtRule && !bIsAtRule) return -1
-          if (!aIsAtRule && bIsAtRule) return 1
+          // Sort at-rules before style rules
+          path.sort((a, b) => {
+            let aIsAtRule = a.kind === 'at-rule'
+            let bIsAtRule = b.kind === 'at-rule'
 
-          return 0
-        })
+            if (aIsAtRule && !bIsAtRule) return -1
+            if (!aIsAtRule && bIsAtRule) return 1
 
-        // A list of the selectors / at rules encountered to get to this point
-        let group = path.flatMap((node) => {
-          if (node.kind === 'rule') {
-            return node.selector === '&' ? [] : [node.selector]
+            return 0
+          })
+
+          // A list of the selectors / at rules encountered to get to this point
+          let group = path.flatMap((node) => {
+            if (node.kind === 'rule') {
+              return node.selector === '&' ? [] : [node.selector]
+            }
+
+            if (node.kind === 'at-rule') {
+              return [`${node.name} ${node.params}`]
+            }
+
+            return []
+          })
+
+          // Build a v3-style nested selector
+          let selector = ''
+
+          for (let i = group.length - 1; i >= 0; i--) {
+            selector = selector === '' ? group[i] : `${group[i]} { ${selector} }`
           }
 
-          if (node.kind === 'at-rule') {
-            return [`${node.name} ${node.params}`]
-          }
-
-          return []
-        })
-
-        // Build a v3-style nested selector
-        let selector = ''
-
-        for (let i = group.length - 1; i >= 0; i--) {
-          selector = selector === '' ? group[i] : `${group[i]} { ${selector} }`
-        }
-
-        selectors.push(selector)
+          selectors.push(selector)
+        },
       })
 
       return selectors
@@ -128,7 +236,7 @@ export function getVariants(design: DesignSystem) {
           name: root,
           values,
           isArbitrary: false,
-          hasDash: true,
+          hasDash,
           selectors,
         })
         break
@@ -138,7 +246,7 @@ export function getVariants(design: DesignSystem) {
           name: root,
           values,
           isArbitrary: true,
-          hasDash: true,
+          hasDash,
           selectors,
         })
         break
@@ -148,7 +256,7 @@ export function getVariants(design: DesignSystem) {
           name: root,
           values,
           isArbitrary: true,
-          hasDash: true,
+          hasDash,
           selectors,
         })
         break
diff --git a/packages/tailwindcss/src/plugin.test.ts b/packages/tailwindcss/src/plugin.test.ts
index 9af3a55fb..a7704ae58 100644
--- a/packages/tailwindcss/src/plugin.test.ts
+++ b/packages/tailwindcss/src/plugin.test.ts
@@ -1,29 +1,32 @@
 import { expect, test } from 'vitest'
-import { compile } from '.'
 import plugin from './plugin'
+import { compileCss } from './test-utils/run'
 
 const css = String.raw
 
 test('plugin', async () => {
-  let input = css`
-    @plugin "my-plugin";
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: plugin(function ({ addBase }) {
-        addBase({
-          body: {
-            margin: '0',
-          },
-        })
-      }),
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build([])).toMatchInlineSnapshot(`
-    "@layer base {
+  expect(
+    await compileCss(
+      css`
+        @plugin "my-plugin";
+      `,
+      {
+        loadModule: async () => ({
+          module: plugin(function ({ addBase }) {
+            addBase({
+              body: {
+                margin: '0',
+              },
+            })
+          }),
+          base: '/root',
+          path: '',
+        }),
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer base {
       body {
         margin: 0;
       }
@@ -33,27 +36,30 @@ test('plugin', async () => {
 })
 
 test('plugin.withOptions', async () => {
-  let input = css`
-    @plugin "my-plugin";
-  `
-
-  let compiler = await compile(input, {
-    loadModule: async () => ({
-      module: plugin.withOptions(function (opts = { foo: '1px' }) {
-        return function ({ addBase }) {
-          addBase({
-            body: {
-              margin: opts.foo,
-            },
-          })
-        }
-      }),
-      base: '/root',
-    }),
-  })
-
-  expect(compiler.build([])).toMatchInlineSnapshot(`
-    "@layer base {
+  expect(
+    await compileCss(
+      css`
+        @plugin "my-plugin";
+      `,
+      {
+        loadModule: async () => ({
+          module: plugin.withOptions(function (opts = { foo: '1px' }) {
+            return function ({ addBase }) {
+              addBase({
+                body: {
+                  margin: opts.foo,
+                },
+              })
+            }
+          }),
+          base: '/root',
+          path: '',
+        }),
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer base {
       body {
         margin: 1px;
       }
diff --git a/packages/tailwindcss/src/plugin.ts b/packages/tailwindcss/src/plugin.ts
index c6731eb0f..8035633b0 100644
--- a/packages/tailwindcss/src/plugin.ts
+++ b/packages/tailwindcss/src/plugin.ts
@@ -1,4 +1,13 @@
-import type { Config, PluginFn, PluginWithConfig, PluginWithOptions } from './compat/plugin-api'
+import type { PluginUtils } from './compat/config/resolve-config'
+import type { ThemeConfig } from './compat/config/types'
+import type {
+  Config,
+  Plugin,
+  PluginAPI,
+  PluginFn,
+  PluginWithConfig,
+  PluginWithOptions,
+} from './compat/plugin-api'
 
 function createPlugin(handler: PluginFn, config?: Partial<Config>): PluginWithConfig {
   return {
@@ -24,3 +33,14 @@ createPlugin.withOptions = function <T>(
 }
 
 export default createPlugin
+
+// v3 compatible types previously exported via `tailwindcss/types/config`
+export type {
+  Config,
+  PluginAPI,
+  PluginFn as PluginCreator,
+  Plugin as PluginsConfig,
+  PluginUtils,
+  PluginWithConfig,
+  ThemeConfig,
+}
diff --git a/packages/tailwindcss/src/prefix.test.ts b/packages/tailwindcss/src/prefix.test.ts
index 27a71b617..ded304cad 100644
--- a/packages/tailwindcss/src/prefix.test.ts
+++ b/packages/tailwindcss/src/prefix.test.ts
@@ -1,6 +1,7 @@
 import { expect, test } from 'vitest'
 import { compile } from '.'
 import plugin from './plugin'
+import { compileCss, run } from './test-utils/run'
 
 const css = String.raw
 
@@ -14,73 +15,64 @@ test('utilities must be prefixed', async () => {
     }
   `
 
-  let compiler = await compile(input)
-
   // Prefixed utilities are generated
   expect(
-    compiler.build([
-      'tw:underline',
-      'tw:hover:line-through',
-      'tw:custom',
-      'tw:group-hover:flex',
-      'tw:peer-hover:flex',
-    ]),
+    await run(
+      [
+        'tw:underline',
+        'tw:hover:line-through',
+        'tw:custom',
+        'tw:group-hover:flex',
+        'tw:peer-hover:flex',
+      ],
+      input,
+    ),
   ).toMatchInlineSnapshot(`
-    ".tw\\:custom {
+    "
+    .tw\\:custom {
       color: red;
     }
+
     .tw\\:underline {
       text-decoration-line: underline;
     }
-    .tw\\:group-hover\\:flex {
-      &:is(:where(.tw\\:group):hover *) {
-        @media (hover: hover) {
-          display: flex;
-        }
+
+    @media (hover: hover) {
+      :is(:where(.tw\\:group):hover .tw\\:group-hover\\:flex), :is(:where(.tw\\:peer):hover ~ .tw\\:peer-hover\\:flex) {
+        display: flex;
       }
-    }
-    .tw\\:peer-hover\\:flex {
-      &:is(:where(.tw\\:peer):hover ~ *) {
-        @media (hover: hover) {
-          display: flex;
-        }
-      }
-    }
-    .tw\\:hover\\:line-through {
-      &:hover {
-        @media (hover: hover) {
-          text-decoration-line: line-through;
-        }
+
+      .tw\\:hover\\:line-through:hover {
+        text-decoration-line: line-through;
       }
     }
     "
   `)
 
   // Non-prefixed utilities are ignored
-  compiler = await compile(input)
-
-  expect(compiler.build(['underline', 'hover:line-through', 'custom'])).toEqual('')
+  expect(await run(['underline', 'hover:line-through', 'custom'], input)).toEqual('')
 })
 
 test('utilities used in @apply must be prefixed', async () => {
-  let compiler = await compile(css`
-    @theme reference prefix(tw);
-
-    .my-underline {
-      @apply tw:underline;
-    }
-  `)
-
   // Prefixed utilities are generated
-  expect(compiler.build([])).toMatchInlineSnapshot(`
-    ".my-underline {
+  expect(
+    await compileCss(css`
+      @theme reference prefix(tw);
+
+      .my-underline {
+        @apply tw:underline;
+      }
+    `),
+  ).toMatchInlineSnapshot(`
+    "
+    .my-underline {
       text-decoration-line: underline;
     }
     "
   `)
 
   // Non-prefixed utilities cause an error
-  expect(() =>
+  await expect(
     compile(css`
       @theme reference prefix(tw);
 
@@ -89,28 +81,31 @@ test('utilities used in @apply must be prefixed', async () => {
       }
     `),
   ).rejects.toThrowErrorMatchingInlineSnapshot(
-    `[Error: Cannot apply unknown utility class: underline]`,
+    `[Error: Cannot apply unprefixed utility class \`underline\`. Did you mean \`tw:underline\`?]`,
   )
 })
 
 test('CSS variables output by the theme are prefixed', async () => {
-  let compiler = await compile(css`
-    @theme prefix(tw) {
-      --color-red: #f00;
-      --color-green: #0f0;
-      --breakpoint-sm: 640px;
-    }
-
-    @tailwind utilities;
-  `)
-
   // Prefixed utilities are generated
-  expect(compiler.build(['tw:text-red'])).toMatchInlineSnapshot(`
-    ":root {
-      --tw-color-red: #f00;
-      --tw-color-green: #0f0;
-      --tw-breakpoint-sm: 640px;
+  expect(
+    await run(
+      ['tw:text-red'],
+      css`
+        @theme prefix(tw) {
+          --color-red: #f00;
+          --color-green: #0f0;
+          --breakpoint-sm: 640px;
+        }
+
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --tw-color-red: red;
     }
+
     .tw\\:text-red {
       color: var(--tw-color-red);
     }
@@ -119,87 +114,81 @@ test('CSS variables output by the theme are prefixed', async () => {
 })
 
 test('CSS theme functions do not use the prefix', async () => {
-  let compiler = await compile(css`
-    @theme prefix(tw) {
-      --color-red: #f00;
-      --color-green: #0f0;
-      --breakpoint-sm: 640px;
-    }
+  expect(
+    await run(
+      ['tw:[color:theme(--color-red)]', 'tw:text-[theme(--color-red)]'],
+      css`
+        @theme prefix(tw) {
+          --color-red: #f00;
+          --color-green: #0f0;
+          --breakpoint-sm: 640px;
+        }
 
-    @tailwind utilities;
-  `)
-
-  expect(compiler.build(['tw:[color:theme(--color-red)]', 'tw:text-[theme(--color-red)]']))
-    .toMatchInlineSnapshot(`
-    ":root {
-      --tw-color-red: #f00;
-      --tw-color-green: #0f0;
-      --tw-breakpoint-sm: 640px;
-    }
-    .tw\\:\\[color\\:theme\\(--color-red\\)\\] {
-      color: #f00;
-    }
-    .tw\\:text-\\[theme\\(--color-red\\)\\] {
-      color: #f00;
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .tw\\:\\[color\\:theme\\(--color-red\\)\\], .tw\\:text-\\[theme\\(--color-red\\)\\] {
+      color: red;
     }
     "
   `)
 
-  compiler = await compile(css`
-    @theme reference prefix(tw) {
-      --color-red: #f00;
-      --color-green: #0f0;
-      --breakpoint-sm: 640px;
-    }
-
-    @tailwind utilities;
-  `)
-
   expect(
-    compiler.build(['tw:[color:theme(--tw-color-red)]', 'tw:text-[theme(--tw-color-red)]']),
+    await run(
+      ['tw:[color:theme(--tw-color-red)]', 'tw:text-[theme(--tw-color-red)]'],
+      css`
+        @theme reference prefix(tw) {
+          --color-red: #f00;
+          --color-green: #0f0;
+          --breakpoint-sm: 640px;
+        }
+
+        @tailwind utilities;
+      `,
+    ),
   ).toEqual('')
 })
 
 test('JS theme functions do not use the prefix', async () => {
-  let compiler = await compile(
-    css`
-      @theme prefix(tw) {
-        --color-red: #f00;
-        --color-green: #0f0;
-        --breakpoint-sm: 640px;
-      }
-
-      @plugin "./plugin.js";
-
-      @tailwind utilities;
-    `,
-    {
-      async loadModule(id, base) {
-        return {
-          base,
-          module: plugin(({ addUtilities, theme }) => {
-            addUtilities({
-              '.my-custom': {
-                color: theme('--color-red'),
-              },
-            })
-
-            // The theme function does not use the prefix
-            expect(theme('--tw-color-red')).toEqual(undefined)
-          }),
+  expect(
+    await run(
+      ['tw:my-custom'],
+      css`
+        @theme prefix(tw) {
+          --color-red: #f00;
+          --color-green: #0f0;
+          --breakpoint-sm: 640px;
         }
-      },
-    },
-  )
 
-  expect(compiler.build(['tw:my-custom'])).toMatchInlineSnapshot(`
-    ":root {
-      --tw-color-red: #f00;
-      --tw-color-green: #0f0;
-      --tw-breakpoint-sm: 640px;
-    }
+        @plugin "./plugin.js";
+
+        @tailwind utilities;
+      `,
+      {
+        async loadModule(_id, base) {
+          return {
+            path: '',
+            base,
+            module: plugin(({ addUtilities, theme }) => {
+              addUtilities({
+                '.my-custom': {
+                  color: theme('--color-red'),
+                },
+              })
+
+              // The theme function does not use the prefix
+              expect(theme('--tw-color-red')).toEqual(undefined)
+            }),
+          }
+        },
+      },
+    ),
+  ).toMatchInlineSnapshot(`
+    "
     .tw\\:my-custom {
-      color: #f00;
+      color: red;
     }
     "
   `)
@@ -215,9 +204,10 @@ test('a prefix can be configured via @import theme(…)', async () => {
     }
   `
 
-  let compiler = await compile(input, {
-    async loadStylesheet(id, base) {
+  let options: Partial<Parameters<typeof compile>[1]> = {
+    async loadStylesheet(_id, base) {
       return {
+        path: '',
         base,
         content: css`
           @theme {
@@ -226,53 +216,39 @@ test('a prefix can be configured via @import theme(…)', async () => {
         `,
       }
     },
-  })
+  }
 
   // Prefixed utilities are generated
   expect(
-    compiler.build([
-      'tw:underline',
-      'tw:bg-potato',
-      'tw:hover:line-through',
-      'tw:custom',
-      'flex',
-      'text-potato',
-    ]),
+    await run(
+      ['tw:underline', 'tw:bg-potato', 'tw:hover:line-through', 'tw:custom', 'flex', 'text-potato'],
+      input,
+      options,
+    ),
   ).toMatchInlineSnapshot(`
-    ".tw\\:bg-potato {
-      background-color: var(--tw-color-potato);
+    "
+    .tw\\:bg-potato {
+      background-color: var(--tw-color-potato, #7a4724);
     }
+
     .tw\\:custom {
       color: red;
     }
+
     .tw\\:underline {
       text-decoration-line: underline;
     }
-    .tw\\:hover\\:line-through {
-      &:hover {
-        @media (hover: hover) {
-          text-decoration-line: line-through;
-        }
+
+    @media (hover: hover) {
+      .tw\\:hover\\:line-through:hover {
+        text-decoration-line: line-through;
       }
     }
     "
   `)
 
   // Non-prefixed utilities are ignored
-  compiler = await compile(input, {
-    async loadStylesheet(id, base) {
-      return {
-        base,
-        content: css`
-          @theme {
-            --color-potato: #7a4724;
-          }
-        `,
-      }
-    },
-  })
-
-  expect(compiler.build(['underline', 'hover:line-through', 'custom'])).toMatchInlineSnapshot(`""`)
+  expect(await run(['underline', 'hover:line-through', 'custom'], input, options)).toEqual('')
 })
 
 test('a prefix can be configured via @import prefix(…)', async () => {
@@ -284,9 +260,10 @@ test('a prefix can be configured via @import prefix(…)', async () => {
     }
   `
 
-  let compiler = await compile(input, {
-    async loadStylesheet(id, base) {
+  let options: Partial<Parameters<typeof compile>[1]> = {
+    async loadStylesheet(_id, base) {
       return {
+        path: '',
         base,
         content: css`
           @theme {
@@ -296,53 +273,42 @@ test('a prefix can be configured via @import prefix(…)', async () => {
         `,
       }
     },
-  })
+  }
 
-  expect(compiler.build(['tw:underline', 'tw:bg-potato', 'tw:hover:line-through', 'tw:custom']))
-    .toMatchInlineSnapshot(`
-      ":root {
-        --tw-color-potato: #7a4724;
-      }
-      .tw\\:bg-potato {
-        background-color: var(--tw-color-potato);
-      }
-      .tw\\:custom {
-        color: red;
-      }
-      .tw\\:underline {
-        text-decoration-line: underline;
-      }
-      .tw\\:hover\\:line-through {
-        &:hover {
-          @media (hover: hover) {
-            text-decoration-line: line-through;
-          }
-        }
-      }
-      "
-    `)
-
-  // Non-prefixed utilities are ignored
-  compiler = await compile(input, {
-    async loadStylesheet(id, base) {
-      return {
-        base,
-        content: css`
-          @theme {
-            --color-potato: #7a4724;
-          }
-          @tailwind utilities;
-        `,
-      }
-    },
-  })
-
-  expect(compiler.build(['underline', 'hover:line-through', 'custom'])).toMatchInlineSnapshot(`
-    ":root {
+  expect(
+    await run(
+      ['tw:underline', 'tw:bg-potato', 'tw:hover:line-through', 'tw:custom'],
+      input,
+      options,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
       --tw-color-potato: #7a4724;
     }
+
+    .tw\\:bg-potato {
+      background-color: var(--tw-color-potato);
+    }
+
+    .tw\\:custom {
+      color: red;
+    }
+
+    .tw\\:underline {
+      text-decoration-line: underline;
+    }
+
+    @media (hover: hover) {
+      .tw\\:hover\\:line-through:hover {
+        text-decoration-line: line-through;
+      }
+    }
     "
   `)
+
+  // Non-prefixed utilities are ignored
+  expect(await run(['underline', 'hover:line-through', 'custom'], input, options)).toEqual('')
 })
 
 test('a prefix must be letters only', async () => {
@@ -356,15 +322,17 @@ test('a prefix must be letters only', async () => {
 })
 
 test('a candidate matching the prefix does not crash', async () => {
-  let input = css`
-    @theme reference prefix(tomato);
-    @tailwind utilities;
-  `
-
-  let compiler = await compile(input)
-
-  expect(compiler.build(['tomato', 'tomato:flex'])).toMatchInlineSnapshot(`
-    ".tomato\\:flex {
+  expect(
+    await run(
+      ['tomato', 'tomato:flex'],
+      css`
+        @theme reference prefix(tomato);
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .tomato\\:flex {
       display: flex;
     }
     "
diff --git a/packages/tailwindcss/src/property-order.ts b/packages/tailwindcss/src/property-order.ts
index 90290d54c..bf9f0791a 100644
--- a/packages/tailwindcss/src/property-order.ts
+++ b/packages/tailwindcss/src/property-order.ts
@@ -11,6 +11,8 @@ export default [
   'inset-block',
   'inset-inline-start',
   'inset-inline-end',
+  'inset-block-start',
+  'inset-block-end',
   'top',
   'right',
   'bottom',
@@ -39,6 +41,8 @@ export default [
   'margin-block',
   'margin-inline-start',
   'margin-inline-end',
+  'margin-block-start',
+  'margin-block-end',
   'margin-top',
   'margin-right',
   'margin-bottom',
@@ -75,6 +79,7 @@ export default [
   'translate',
   '--tw-translate-x',
   '--tw-translate-y',
+  '--tw-translate-z',
   'scale',
   '--tw-scale-x',
   '--tw-scale-y',
@@ -87,6 +92,8 @@ export default [
   '--tw-skew-y',
   'transform',
 
+  'zoom',
+
   'animation',
 
   'cursor',
@@ -107,6 +114,8 @@ export default [
   'scroll-margin-block',
   'scroll-margin-inline-start',
   'scroll-margin-inline-end',
+  'scroll-margin-block-start',
+  'scroll-margin-block-end',
   'scroll-margin-top',
   'scroll-margin-right',
   'scroll-margin-bottom',
@@ -117,11 +126,17 @@ export default [
   'scroll-padding-block',
   'scroll-padding-inline-start',
   'scroll-padding-inline-end',
+  'scroll-padding-block-start',
+  'scroll-padding-block-end',
   'scroll-padding-top',
   'scroll-padding-right',
   'scroll-padding-bottom',
   'scroll-padding-left',
 
+  'scrollbar-width',
+  'scrollbar-color',
+  'scrollbar-gutter',
+
   'list-style-position',
   'list-style-type',
   'list-style-image',
@@ -195,6 +210,8 @@ export default [
   'border-block-width',
   'border-inline-start-width',
   'border-inline-end-width',
+  'border-block-start-width',
+  'border-block-end-width',
   'border-top-width',
   'border-right-width',
   'border-bottom-width',
@@ -205,6 +222,8 @@ export default [
   'border-block-style',
   'border-inline-start-style',
   'border-inline-end-style',
+  'border-block-start-style',
+  'border-block-end-style',
   'border-top-style',
   'border-right-style',
   'border-bottom-style',
@@ -215,6 +234,8 @@ export default [
   'border-block-color',
   'border-inline-start-color',
   'border-inline-end-color',
+  'border-block-start-color',
+  'border-block-end-color',
   'border-top-color',
   'border-right-color',
   'border-bottom-color',
@@ -233,6 +254,59 @@ export default [
   '--tw-gradient-to',
   '--tw-gradient-to-position',
 
+  'mask-image',
+
+  // Edge masks
+  '--tw-mask-top',
+  '--tw-mask-top-from-color',
+  '--tw-mask-top-from-position',
+  '--tw-mask-top-to-color',
+  '--tw-mask-top-to-position',
+
+  '--tw-mask-right',
+  '--tw-mask-right-from-color',
+  '--tw-mask-right-from-position',
+  '--tw-mask-right-to-color',
+  '--tw-mask-right-to-position',
+
+  '--tw-mask-bottom',
+  '--tw-mask-bottom-from-color',
+  '--tw-mask-bottom-from-position',
+  '--tw-mask-bottom-to-color',
+  '--tw-mask-bottom-to-position',
+
+  '--tw-mask-left',
+  '--tw-mask-left-from-color',
+  '--tw-mask-left-from-position',
+  '--tw-mask-left-to-color',
+  '--tw-mask-left-to-position',
+
+  // Linear masks
+  '--tw-mask-linear',
+  '--tw-mask-linear-position',
+  '--tw-mask-linear-from-color',
+  '--tw-mask-linear-from-position',
+  '--tw-mask-linear-to-color',
+  '--tw-mask-linear-to-position',
+
+  // Radial masks
+  '--tw-mask-radial',
+  '--tw-mask-radial-shape',
+  '--tw-mask-radial-size',
+  '--tw-mask-radial-position',
+  '--tw-mask-radial-from-color',
+  '--tw-mask-radial-from-position',
+  '--tw-mask-radial-to-color',
+  '--tw-mask-radial-to-position',
+
+  // Conic masks
+  '--tw-mask-conic',
+  '--tw-mask-conic-position',
+  '--tw-mask-conic-from-color',
+  '--tw-mask-conic-from-position',
+  '--tw-mask-conic-to-color',
+  '--tw-mask-conic-to-position',
+
   'box-decoration-break',
 
   'background-size',
@@ -242,6 +316,15 @@ export default [
   'background-repeat',
   'background-origin',
 
+  'mask-composite',
+  'mask-mode',
+  'mask-type',
+  'mask-size',
+  'mask-clip',
+  'mask-position',
+  'mask-repeat',
+  'mask-origin',
+
   'fill',
   'stroke',
   'stroke-width',
@@ -254,6 +337,8 @@ export default [
   'padding-block',
   'padding-inline-start',
   'padding-inline-end',
+  'padding-block-start',
+  'padding-block-end',
   'padding-top',
   'padding-right',
   'padding-bottom',
@@ -264,6 +349,7 @@ export default [
   'vertical-align',
 
   'font-family',
+  'font-feature-settings',
   'font-size',
   'line-height',
   'font-weight',
@@ -274,6 +360,7 @@ export default [
   'text-overflow',
   'hyphens',
   'white-space',
+  'tab-size',
 
   'color',
   'text-transform',
diff --git a/packages/tailwindcss/src/selector-parser.test.ts b/packages/tailwindcss/src/selector-parser.test.ts
new file mode 100644
index 000000000..fa38dc578
--- /dev/null
+++ b/packages/tailwindcss/src/selector-parser.test.ts
@@ -0,0 +1,620 @@
+import { describe, expect, it } from 'vitest'
+import { parse, toCss } from './selector-parser'
+import { walk, WalkAction } from './walk'
+
+describe('parse', () => {
+  it('should parse a simple selector', () => {
+    expect(parse('.foo')).toEqual([{ kind: 'selector', value: '.foo' }])
+  })
+
+  it('should parse a compound selector', () => {
+    expect(parse('.foo.bar:hover#id')).toEqual([
+      {
+        kind: 'compound',
+        nodes: [
+          { kind: 'selector', value: '.foo' },
+          { kind: 'selector', value: '.bar' },
+          { kind: 'selector', value: ':hover' },
+          { kind: 'selector', value: '#id' },
+        ],
+      },
+    ])
+  })
+
+  it('should parse a pseudo-element selector with double ::', () => {
+    expect(parse('.foo::before')).toEqual([
+      {
+        kind: 'compound',
+        nodes: [
+          { kind: 'selector', value: '.foo' },
+          { kind: 'selector', value: '::before' },
+        ],
+      },
+    ])
+  })
+
+  it('should parse a selector list', () => {
+    expect(parse('.foo,.bar')).toEqual([
+      {
+        kind: 'list',
+        nodes: [
+          { kind: 'selector', value: '.foo' },
+          { kind: 'selector', value: '.bar' },
+        ],
+      },
+    ])
+  })
+
+  // We've got 3 options here:
+  //
+  // 1. We could throw, but then it becomes more annoying when you don't have
+  //    control over the CSS (for example when it's coming from a package).
+  // 2. We could parse it and ignore the invalid cases as-if they weren't there.
+  //    Re-printing the AST would turn it into a valid situation.
+  // 3. We could parse the invalid case and turn it into a `compound` such that
+  //    it stays invalid. When we re-print we would re-introduce the error.
+  //
+  // Before this change, we would keep the errors, and pass it along:
+  // - In a browser environment, these would be ignored
+  // - In Lightning CSS, these are thrown out
+  //
+  // For that reason alone, let's go with option 3 for now, such that the
+  // behavior is the same as before. This does mean that we see "weird" empty
+  // compound nodes.
+  it('should safely parse an invalid selector list', () => {
+    expect(parse('.foo,')).toEqual([
+      {
+        kind: 'list',
+        nodes: [
+          { kind: 'selector', value: '.foo' },
+          { kind: 'compound', nodes: [] },
+        ],
+      },
+    ])
+    expect(parse(',.foo')).toEqual([
+      {
+        kind: 'list',
+        nodes: [
+          { kind: 'compound', nodes: [] },
+          { kind: 'selector', value: '.foo' },
+        ],
+      },
+    ])
+    expect(parse(',.foo,')).toEqual([
+      {
+        kind: 'list',
+        nodes: [
+          { kind: 'compound', nodes: [] },
+          { kind: 'selector', value: '.foo' },
+          { kind: 'compound', nodes: [] },
+        ],
+      },
+    ])
+    expect(parse('.foo,,.bar')).toEqual([
+      {
+        kind: 'list',
+        nodes: [
+          { kind: 'selector', value: '.foo' },
+          { kind: 'compound', nodes: [] },
+          { kind: 'selector', value: '.bar' },
+        ],
+      },
+    ])
+  })
+
+  it('should parse selector lists with whitespace around the comma', () => {
+    expect(parse('.foo, .bar')).toEqual([
+      {
+        kind: 'list',
+        nodes: [
+          { kind: 'selector', value: '.foo' },
+          { kind: 'selector', value: '.bar' },
+        ],
+      },
+    ])
+
+    expect(parse('.foo , .bar')).toEqual([
+      {
+        kind: 'list',
+        nodes: [
+          { kind: 'selector', value: '.foo' },
+          { kind: 'selector', value: '.bar' },
+        ],
+      },
+    ])
+
+    expect(parse('.foo ,.bar')).toEqual([
+      {
+        kind: 'list',
+        nodes: [
+          { kind: 'selector', value: '.foo' },
+          { kind: 'selector', value: '.bar' },
+        ],
+      },
+    ])
+  })
+
+  it('should parse a list of attribute selectors', () => {
+    expect(parse('[foo],[bar]')).toEqual([
+      {
+        kind: 'list',
+        nodes: [
+          { kind: 'selector', value: '[foo]' },
+          { kind: 'selector', value: '[bar]' },
+        ],
+      },
+    ])
+  })
+
+  it('should parse a list of selectors with just functions', () => {
+    expect(parse(':is(.a),:is(.b)')).toEqual([
+      {
+        kind: 'list',
+        nodes: [
+          { kind: 'function', value: ':is', nodes: [{ kind: 'selector', value: '.a' }] },
+          { kind: 'function', value: ':is', nodes: [{ kind: 'selector', value: '.b' }] },
+        ],
+      },
+    ])
+  })
+
+  it('should parse selector lists with more than two selectors', () => {
+    expect(parse('.foo,.bar,.baz')).toEqual([
+      {
+        kind: 'list',
+        nodes: [
+          { kind: 'selector', value: '.foo' },
+          { kind: 'selector', value: '.bar' },
+          { kind: 'selector', value: '.baz' },
+        ],
+      },
+    ])
+  })
+
+  it('should group selectors with combinators in a selector list', () => {
+    expect(parse('.a+.b, .c .d[attr], .e')).toEqual([
+      {
+        kind: 'list',
+        nodes: [
+          {
+            kind: 'complex',
+            nodes: [
+              { kind: 'selector', value: '.a' },
+              { kind: 'combinator', value: '+' },
+              { kind: 'selector', value: '.b' },
+            ],
+          },
+          {
+            kind: 'complex',
+            nodes: [
+              { kind: 'selector', value: '.c' },
+              { kind: 'combinator', value: ' ' },
+              {
+                kind: 'compound',
+                nodes: [
+                  { kind: 'selector', value: '.d' },
+                  { kind: 'selector', value: '[attr]' },
+                ],
+              },
+            ],
+          },
+          { kind: 'selector', value: '.e' },
+        ],
+      },
+    ])
+  })
+
+  it('should parse complex selectors in a selector list', () => {
+    expect(parse('#a.b > .c, .d')).toEqual([
+      {
+        kind: 'list',
+        nodes: [
+          {
+            kind: 'complex',
+            nodes: [
+              {
+                kind: 'compound',
+                nodes: [
+                  { kind: 'selector', value: '#a' },
+                  { kind: 'selector', value: '.b' },
+                ],
+              },
+              { kind: 'combinator', value: '>' },
+              { kind: 'selector', value: '.c' },
+            ],
+          },
+          { kind: 'selector', value: '.d' },
+        ],
+      },
+    ])
+  })
+
+  it('should combine everything within attribute selectors', () => {
+    expect(parse('.foo[bar="baz"]')).toEqual([
+      {
+        kind: 'compound',
+        nodes: [
+          { kind: 'selector', value: '.foo' },
+          { kind: 'selector', value: '[bar="baz"]' },
+        ],
+      },
+    ])
+  })
+
+  it('should parse functions', () => {
+    expect(parse('.foo:hover:not(.bar:focus)')).toEqual([
+      {
+        kind: 'compound',
+        nodes: [
+          { kind: 'selector', value: '.foo' },
+          { kind: 'selector', value: ':hover' },
+          {
+            kind: 'function',
+            value: ':not',
+            nodes: [
+              {
+                kind: 'compound',
+                nodes: [
+                  { kind: 'selector', value: '.bar' },
+                  { kind: 'selector', value: ':focus' },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ])
+  })
+
+  it('should parse selector lists in functions', () => {
+    expect(parse(':is(.foo, .bar)')).toEqual([
+      {
+        kind: 'function',
+        value: ':is',
+        nodes: [
+          {
+            kind: 'list',
+            nodes: [
+              { kind: 'selector', value: '.foo' },
+              { kind: 'selector', value: '.bar' },
+            ],
+          },
+        ],
+      },
+    ])
+  })
+
+  it('should handle next-children combinator', () => {
+    expect(parse('.foo + p')).toEqual([
+      {
+        kind: 'complex',
+        nodes: [
+          { kind: 'selector', value: '.foo' },
+          { kind: 'combinator', value: '+' },
+          { kind: 'selector', value: 'p' },
+        ],
+      },
+    ])
+  })
+
+  it('should normalize combinators', () => {
+    expect(parse('.foo + .bar')).toEqual([
+      {
+        kind: 'complex',
+        nodes: [
+          { kind: 'selector', value: '.foo' },
+          { kind: 'combinator', value: '+' },
+          { kind: 'selector', value: '.bar' },
+        ],
+      },
+    ])
+
+    expect(parse('.foo  \n\t .bar')).toEqual([
+      {
+        kind: 'complex',
+        nodes: [
+          { kind: 'selector', value: '.foo' },
+          { kind: 'combinator', value: ' ' },
+          { kind: 'selector', value: '.bar' },
+        ],
+      },
+    ])
+  })
+
+  it('should handle escaped characters', () => {
+    expect(parse('foo\\.bar')).toEqual([{ kind: 'selector', value: 'foo\\.bar' }])
+  })
+
+  it('parses :nth-child()', () => {
+    // The `An+B` part is not a selector, it stays an opaque value
+    expect(parse(':nth-child(n+1)')).toEqual([
+      {
+        kind: 'function',
+        value: ':nth-child',
+        nodes: [{ kind: 'value', value: 'n+1' }],
+      },
+    ])
+
+    // The selector list after `of` is parsed as a selector
+    expect(parse(':nth-child(2 of &)')).toEqual([
+      {
+        kind: 'function',
+        value: ':nth-child',
+        nodes: [
+          { kind: 'value', value: '2 of ' },
+          { kind: 'selector', value: '&' },
+        ],
+      },
+    ])
+
+    expect(parse(':nth-child(2n + 1 of .foo, .bar)')).toEqual([
+      {
+        kind: 'function',
+        value: ':nth-child',
+        nodes: [
+          { kind: 'value', value: '2n + 1 of ' },
+          {
+            kind: 'list',
+            nodes: [
+              { kind: 'selector', value: '.foo' },
+              { kind: 'selector', value: '.bar' },
+            ],
+          },
+        ],
+      },
+    ])
+  })
+
+  it('parses &:has(.child:nth-child(2))', () => {
+    expect(parse('&:has(.child:nth-child(2))')).toEqual([
+      {
+        kind: 'compound',
+        nodes: [
+          {
+            kind: 'selector',
+            value: '&',
+          },
+          {
+            kind: 'function',
+            value: ':has',
+            nodes: [
+              {
+                kind: 'compound',
+                nodes: [
+                  {
+                    kind: 'selector',
+                    value: '.child',
+                  },
+                  {
+                    kind: 'function',
+                    value: ':nth-child',
+                    nodes: [
+                      {
+                        kind: 'value',
+                        value: '2',
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ])
+  })
+
+  it('parses &:has(:nth-child(2))', () => {
+    expect(parse('&:has(:nth-child(2))')).toEqual([
+      {
+        kind: 'compound',
+        nodes: [
+          {
+            kind: 'selector',
+            value: '&',
+          },
+          {
+            kind: 'function',
+            value: ':has',
+            nodes: [
+              {
+                kind: 'function',
+                value: ':nth-child',
+                nodes: [
+                  {
+                    kind: 'value',
+                    value: '2',
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ])
+  })
+
+  it('parses nesting selector before attribute selector', () => {
+    expect(parse('&[data-foo]')).toEqual([
+      {
+        kind: 'compound',
+        nodes: [
+          { kind: 'selector', value: '&' },
+          { kind: 'selector', value: '[data-foo]' },
+        ],
+      },
+    ])
+  })
+
+  it('parses nesting selector after an attribute selector', () => {
+    expect(parse('[data-foo]&')).toEqual([
+      {
+        kind: 'compound',
+        nodes: [
+          { kind: 'selector', value: '[data-foo]' },
+          { kind: 'selector', value: '&' },
+        ],
+      },
+    ])
+  })
+
+  it('parses universal selector before attribute selector', () => {
+    expect(parse('*[data-foo]')).toEqual([
+      {
+        kind: 'compound',
+        nodes: [
+          { kind: 'selector', value: '*' },
+          { kind: 'selector', value: '[data-foo]' },
+        ],
+      },
+    ])
+  })
+
+  it('parses the universal selector after an attribute selector', () => {
+    expect(parse('[data-foo]*')).toEqual([
+      {
+        kind: 'compound',
+        nodes: [
+          { kind: 'selector', value: '[data-foo]' },
+          { kind: 'selector', value: '*' },
+        ],
+      },
+    ])
+  })
+
+  it('parses another attribute selector after an attribute selector', () => {
+    expect(parse('[data-foo][data-bar]')).toEqual([
+      {
+        kind: 'compound',
+        nodes: [
+          { kind: 'selector', value: '[data-foo]' },
+          { kind: 'selector', value: '[data-bar]' },
+        ],
+      },
+    ])
+  })
+
+  it('parses a type selector before an attribute selector', () => {
+    expect(parse('div[data-foo]')).toEqual([
+      {
+        kind: 'compound',
+        nodes: [
+          { kind: 'selector', value: 'div' },
+          { kind: 'selector', value: '[data-foo]' },
+        ],
+      },
+    ])
+  })
+
+  it('parses a type selector after an attribute selector', () => {
+    expect(parse('[data-foo]div')).toEqual([
+      {
+        kind: 'compound',
+        nodes: [
+          { kind: 'selector', value: '[data-foo]' },
+          { kind: 'selector', value: 'div' },
+        ],
+      },
+    ])
+  })
+
+  it('should parse selector lists as real selectors', () => {
+    expect(parse('.foo[attr], .bar#id, .baz + .qux')).toEqual([
+      {
+        kind: 'list',
+        nodes: [
+          {
+            kind: 'compound',
+            nodes: [
+              { kind: 'selector', value: '.foo' },
+              { kind: 'selector', value: '[attr]' },
+            ],
+          },
+          {
+            kind: 'compound',
+            nodes: [
+              { kind: 'selector', value: '.bar' },
+              { kind: 'selector', value: '#id' },
+            ],
+          },
+          {
+            kind: 'complex',
+            nodes: [
+              { kind: 'selector', value: '.baz' },
+              { kind: 'combinator', value: '+' },
+              { kind: 'selector', value: '.qux' },
+            ],
+          },
+        ],
+      },
+    ])
+  })
+})
+
+describe('toCss', () => {
+  it('should print a simple selector', () => {
+    expect(toCss(parse('.foo'))).toBe('.foo')
+  })
+
+  it('should print a compound selector', () => {
+    expect(toCss(parse('.foo.bar:hover#id'))).toBe('.foo.bar:hover#id')
+  })
+
+  it('should print a selector list', () => {
+    expect(toCss(parse('.foo, .bar'))).toBe('.foo, .bar')
+  })
+
+  it('should print a selector list with normalized commas', () => {
+    expect(toCss(parse('.foo,.bar'))).toBe('.foo, .bar')
+    expect(toCss(parse('.foo, .bar'))).toBe('.foo, .bar')
+    expect(toCss(parse('.foo , .bar'))).toBe('.foo, .bar')
+    expect(toCss(parse('.foo ,.bar'))).toBe('.foo, .bar')
+  })
+
+  it('should print a selector list but minimized', () => {
+    expect(toCss(parse('.foo, .bar'), true)).toBe('.foo,.bar')
+    expect(toCss(parse('.foo , .bar'), true)).toBe('.foo,.bar')
+    expect(toCss(parse('.foo ,.bar'), true)).toBe('.foo,.bar')
+  })
+
+  it('should print an attribute selectors', () => {
+    expect(toCss(parse('.foo[bar="baz"]'))).toBe('.foo[bar="baz"]')
+  })
+
+  it('should print a function', () => {
+    expect(toCss(parse('.foo:hover:not(.bar:focus)'))).toBe('.foo:hover:not(.bar:focus)')
+  })
+
+  it('should print escaped characters', () => {
+    expect(toCss(parse('foo\\.bar'))).toBe('foo\\.bar')
+  })
+
+  it('should print :nth-child()', () => {
+    // The `An+B` part is printed verbatim, whitespace in the selector list
+    // after `of` is normalized
+    expect(toCss(parse(':nth-child(n+1)'))).toBe(':nth-child(n+1)')
+    expect(toCss(parse(':nth-child(+2)'))).toBe(':nth-child(+2)')
+    expect(toCss(parse(':nth-child(2n + 1 of .foo,.bar)'))).toBe(':nth-child(2n + 1 of .foo, .bar)')
+  })
+
+  it('should pretty print a complex selector', () => {
+    expect(toCss(parse('.a+.b, .c .d[attr], .e'))).toBe('.a + .b, .c .d[attr], .e')
+  })
+
+  it('should minify a complex selector during printing', () => {
+    expect(toCss(parse('.a+.b, .c .d[attr], .e'), true)).toBe('.a+.b,.c .d[attr],.e')
+    //                                                                 ^ This space is significant to indicate a descendant combinator
+  })
+})
+
+describe('walk', () => {
+  it('can be used to replace a function call', () => {
+    const ast = parse('.foo:hover:not(.bar:focus)')
+    walk(ast, (node) => {
+      if (node.kind === 'function' && node.value === ':not') {
+        return WalkAction.Replace({ kind: 'selector', value: '.inverted-bar' } as const)
+      }
+    })
+    expect(toCss(ast)).toBe('.foo:hover.inverted-bar')
+  })
+})
diff --git a/packages/tailwindcss/src/selector-parser.ts b/packages/tailwindcss/src/selector-parser.ts
new file mode 100644
index 000000000..2a435f687
--- /dev/null
+++ b/packages/tailwindcss/src/selector-parser.ts
@@ -0,0 +1,627 @@
+type Combinator =
+  | ' ' // Descendant combinator
+  | '>' // Child combinator
+  | '+' // Next-sibling combinator
+  | '~' // Subsequent-sibling combinator
+
+export type SelectorListNode = {
+  kind: 'list'
+  nodes: SelectorAstNode[]
+}
+
+export type SelectorCombinatorNode = {
+  kind: 'combinator'
+  value: Combinator
+}
+
+export type SelectorComplexNode = {
+  kind: 'complex'
+  nodes: SelectorAstNode[]
+}
+
+export type SelectorCompoundNode = {
+  kind: 'compound'
+  nodes: SelectorAstNode[]
+}
+
+export type SelectorNode = {
+  kind: 'selector'
+  value: string
+}
+
+export type SelectorFunctionNode = {
+  kind: 'function'
+  value: string
+  nodes: SelectorAstNode[]
+}
+
+export type SelectorValueNode = {
+  kind: 'value'
+  value: string
+}
+
+export type SelectorAstNode =
+  | SelectorFunctionNode
+  | SelectorCombinatorNode
+  | SelectorComplexNode
+  | SelectorCompoundNode
+  | SelectorListNode
+  | SelectorNode
+  | SelectorValueNode
+
+function combinator(value: Combinator): SelectorCombinatorNode {
+  return {
+    kind: 'combinator',
+    value,
+  }
+}
+
+function complex(nodes: SelectorAstNode[]): SelectorComplexNode {
+  return {
+    kind: 'complex',
+    nodes,
+  }
+}
+
+function compound(nodes: SelectorAstNode[]): SelectorCompoundNode {
+  return {
+    kind: 'compound',
+    nodes,
+  }
+}
+
+export function fun(value: string, nodes: SelectorAstNode[]): SelectorFunctionNode {
+  return {
+    kind: 'function',
+    value,
+    nodes,
+  }
+}
+
+function list(nodes: SelectorAstNode[]): SelectorListNode {
+  return {
+    kind: 'list',
+    nodes,
+  }
+}
+
+export function selector(value: string): SelectorNode {
+  return {
+    kind: 'selector',
+    value,
+  }
+}
+
+function value(value: string): SelectorValueNode {
+  return {
+    kind: 'value',
+    value,
+  }
+}
+
+export function isUniversalSelector(node: SelectorAstNode): boolean {
+  return node.kind === 'selector' && node.value.charCodeAt(0) === ASTERISK
+}
+
+export function isNestingSelector(node: SelectorAstNode): boolean {
+  return node.kind === 'selector' && node.value.charCodeAt(0) === AMPERSAND
+}
+
+export function isClassSelector(node: SelectorAstNode): boolean {
+  return node.kind === 'selector' && node.value.charCodeAt(0) === DOT
+}
+
+export function isIdSelector(node: SelectorAstNode): boolean {
+  return node.kind === 'selector' && node.value.charCodeAt(0) === HASH
+}
+
+export function isPseudoSelector(node: SelectorAstNode): boolean {
+  return node.kind === 'selector' && node.value.charCodeAt(0) === COLON
+}
+
+export function isAttributeSelector(node: SelectorAstNode): boolean {
+  return node.kind === 'selector' && node.value.charCodeAt(0) === OPEN_BRACKET
+}
+
+export function isTypeSelector(node: SelectorAstNode): boolean {
+  if (node.kind !== 'selector') return false
+
+  switch (node.value.charCodeAt(0)) {
+    case ASTERISK: // Universal selector
+    case AMPERSAND: // Nesting selector
+    case DOT: // Class selector
+    case HASH: // ID selector
+    case COLON: // Pseudo selector
+    case OPEN_BRACKET: // Attribute selector
+      return false
+
+    // We don't fully verify whether this is actually a proper type selector,
+    // but we assume it is one if it's not any of the other ones.
+    default:
+      return true
+  }
+}
+
+export function cloneAstNode<T extends SelectorAstNode>(node: T): T {
+  switch (node.kind) {
+    case 'combinator':
+    case 'selector':
+    case 'value':
+      return {
+        kind: node.kind,
+        value: node.value,
+      } as T
+
+    case 'complex':
+    case 'compound':
+    case 'list':
+      return {
+        kind: node.kind,
+        nodes: node.nodes.map(cloneAstNode),
+      } as T
+
+    case 'function':
+      return {
+        kind: node.kind,
+        value: node.value,
+        nodes: node.nodes.map(cloneAstNode),
+      } satisfies SelectorFunctionNode as T
+
+    default:
+      node satisfies never
+      throw new Error(`Unknown node kind: ${(node as any).kind}`)
+  }
+}
+
+export function toCss(ast: SelectorAstNode[], minify = false) {
+  let css = ''
+  for (let node of ast) {
+    switch (node.kind) {
+      case 'selector':
+      case 'value': {
+        css += node.value
+        break
+      }
+      case 'combinator': {
+        if (minify || node.value === ' ') {
+          css += node.value
+        } else {
+          css += ` ${node.value} `
+        }
+        break
+      }
+
+      case 'function': {
+        css += `${node.value}(${toCss(node.nodes, minify)})`
+        break
+      }
+      case 'complex':
+      case 'compound': {
+        css += toCss(node.nodes, minify)
+        break
+      }
+      case 'list': {
+        css += node.nodes.map((node) => toCss([node], minify)).join(minify ? ',' : ', ')
+        break
+      }
+    }
+  }
+  return css
+}
+
+const BACKSLASH = 0x5c
+const CLOSE_BRACKET = 0x5d
+const CLOSE_PAREN = 0x29
+const COLON = 0x3a
+const COMMA = 0x2c
+const DOUBLE_QUOTE = 0x22
+const DOT = 0x2e
+const GREATER_THAN = 0x3e
+const NEWLINE = 0x0a
+const HASH = 0x23
+const OPEN_BRACKET = 0x5b
+const OPEN_PAREN = 0x28
+const PLUS = 0x2b
+const SINGLE_QUOTE = 0x27
+const SPACE = 0x20
+const TAB = 0x09
+const TILDE = 0x7e
+const AMPERSAND = 0x26
+const ASTERISK = 0x2a
+
+export function parse(input: string) {
+  input = input.replaceAll('\r\n', '\n')
+
+  let ast: SelectorAstNode[] = []
+
+  let target = ast
+
+  let containsCombinator = false
+
+  let contextStack: {
+    target: SelectorAstNode[]
+    currentList: SelectorListNode | null
+    containsCombinator: boolean
+  }[] = []
+
+  let currentList: SelectorListNode | null = null
+
+  let buffer = ''
+
+  let peekChar
+
+  function current(nodes = target): SelectorAstNode {
+    return nodes.length === 1 ? nodes[0] : containsCombinator ? complex(nodes) : compound(nodes)
+  }
+
+  function append(node: SelectorAstNode) {
+    let existing = target[target.length - 1]
+
+    if (existing?.kind === 'compound') {
+      existing.nodes.push(node)
+    } else if (existing && existing.kind !== 'list' && existing.kind !== 'combinator') {
+      target[target.length - 1] = compound([existing, node])
+    } else {
+      target.push(node)
+    }
+  }
+
+  for (let i = 0; i < input.length; i++) {
+    let currentChar = input.charCodeAt(i)
+
+    switch (currentChar) {
+      // Handle selector lists
+      //
+      // ```css
+      // .foo, .bar {}
+      //     ^
+      // ```
+      case COMMA: {
+        // Flush remaining buffer as a selector
+        if (buffer.length > 0) {
+          append(selector(buffer))
+          buffer = ''
+        }
+
+        // Skip whitespace
+        for (; i + 1 < input.length; i++) {
+          peekChar = input.charCodeAt(i + 1)
+          if (peekChar !== NEWLINE && peekChar !== SPACE && peekChar !== TAB) {
+            break
+          }
+        }
+
+        // Add nodes to the current list
+        if (currentList) {
+          currentList.nodes.push(current())
+          target = []
+          containsCombinator = false
+        }
+
+        // Start a new list
+        else {
+          let nodes = target.splice(0)
+          let item = current(nodes)
+          let node = list([item])
+          target.push(node)
+          currentList = node
+          target = []
+          containsCombinator = false
+        }
+
+        break
+      }
+
+      // Handle combinators
+      //
+      // E.g.:
+      //
+      // ```css
+      // .foo .bar
+      //     ^
+      //
+      // .foo > .bar
+      //     ^^^
+      // ```
+      case GREATER_THAN:
+      case NEWLINE:
+      case SPACE:
+      case PLUS:
+      case TAB:
+      case TILDE: {
+        // Flush remaining buffer as a selector
+        if (buffer.length > 0) {
+          append(selector(buffer))
+          buffer = ''
+        }
+
+        // Look ahead and find the end of the combinator
+        let start = i
+        let end = i + 1
+        for (; end < input.length; end++) {
+          peekChar = input.charCodeAt(end)
+          if (
+            peekChar !== GREATER_THAN &&
+            peekChar !== NEWLINE &&
+            peekChar !== SPACE &&
+            peekChar !== PLUS &&
+            peekChar !== TAB &&
+            peekChar !== TILDE
+          ) {
+            break
+          }
+        }
+        i = end - 1
+
+        let value = input.slice(start, end).trim()
+        if (
+          value === '' &&
+          (target.length === 0 || end >= input.length || input.charCodeAt(end) === COMMA)
+        ) {
+          break
+        }
+
+        target.push(combinator((value === '' ? ' ' : value) as Combinator))
+        containsCombinator = true
+
+        break
+      }
+
+      // Start of a function call
+      //
+      // E.g.:
+      //
+      // ```css
+      // .foo:not(.bar)
+      //         ^
+      // ```
+      case OPEN_PAREN: {
+        let node = fun(buffer, [])
+        buffer = ''
+
+        // If the function is not one of the following, we combine all its
+        // contents into a single value node
+        if (
+          node.value !== ':not' &&
+          node.value !== ':where' &&
+          node.value !== ':has' &&
+          node.value !== ':is'
+        ) {
+          // Find the end of the function call
+          let start = i + 1
+          let nesting = 0
+
+          // Find the closing bracket
+          for (let j = i + 1; j < input.length; j++) {
+            peekChar = input.charCodeAt(j)
+            if (peekChar === OPEN_PAREN) {
+              nesting++
+              continue
+            }
+            if (peekChar === CLOSE_PAREN) {
+              if (nesting === 0) {
+                i = j
+                break
+              }
+              nesting--
+            }
+          }
+          let end = i
+
+          let contents = input.slice(start, end)
+
+          // `:nth-child(…)` and `:nth-last-child(…)` can contain an
+          // `of <complex-selector-list>` clause. The selector list must be
+          // parsed (e.g. to be able to substitute `&`), but the `An+B` part
+          // is not a selector so it stays an opaque value node. E.g.:
+          //
+          // ```css
+          // :nth-child(2n + 1 of .foo, .bar)
+          //            ^^^^^^^^^^ value
+          //                       ^^^^^^^^^^ selector list
+          // ```
+          if (node.value === ':nth-child' || node.value === ':nth-last-child') {
+            let idx = contents.indexOf('of ')
+            if (idx !== -1) {
+              node.nodes.push(
+                value(
+                  contents.slice(0, idx + 3), // value `2n + 1 of `
+                ),
+                ...parse(
+                  contents.slice(idx + 3), // `.foo, .bar`
+                ),
+              )
+              buffer = ''
+              i = end
+
+              append(node)
+
+              break
+            }
+          }
+
+          node.nodes.push(value(contents))
+          buffer = ''
+          i = end
+
+          append(node)
+
+          break
+        }
+
+        append(node)
+        contextStack.push({ target, currentList, containsCombinator })
+        target = node.nodes
+        containsCombinator = false
+        currentList = null
+
+        break
+      }
+
+      // End of a function call
+      //
+      // E.g.:
+      //
+      // ```css
+      // foo(bar, baz)
+      //             ^
+      // ```
+      case CLOSE_PAREN: {
+        // Flush remaining buffer as a selector
+        if (buffer.length > 0) {
+          append(selector(buffer))
+          buffer = ''
+        }
+
+        if (currentList) {
+          currentList.nodes.push(current())
+        } else if (containsCombinator) {
+          target.splice(0, target.length, complex(target.splice(0)))
+        }
+
+        let context = contextStack.pop()
+        target = context?.target ?? ast
+        currentList = context?.currentList ?? null
+        containsCombinator = context?.containsCombinator ?? false
+
+        break
+      }
+
+      // Split compound selectors
+      //
+      // E.g.:
+      //
+      // ```css
+      // .foo.bar
+      //     ^
+      // ```
+      case DOT:
+      case COLON:
+      case HASH: {
+        if (currentChar === COLON && buffer === ':') {
+          buffer += input[i]
+          break
+        }
+
+        // Handle everything before the combinator as a selector and start a new
+        // selector
+        if (buffer.length > 0) {
+          append(selector(buffer))
+        }
+        buffer = input[i]
+        break
+      }
+
+      // Start of an attribute selector
+      //
+      // NOTE: Right now we don't care about the individual parts of the
+      // attribute selector, we just want to find the matching closing bracket.
+      //
+      // If we need more information from inside the attribute selector in the
+      // future, then we can use the `AttributeSelectorParser` here (and even
+      // inline it if needed)
+      case OPEN_BRACKET: {
+        // Flush remaining buffer as a selector
+        if (buffer.length > 0) {
+          append(selector(buffer))
+          buffer = ''
+        }
+
+        let start = i
+        let nesting = 0
+
+        // Find the closing bracket
+        for (let j = i + 1; j < input.length; j++) {
+          peekChar = input.charCodeAt(j)
+          if (peekChar === OPEN_BRACKET) {
+            nesting++
+            continue
+          }
+          if (peekChar === CLOSE_BRACKET) {
+            if (nesting === 0) {
+              i = j
+              break
+            }
+            nesting--
+          }
+        }
+
+        append(selector(input.slice(start, i + 1)))
+        break
+      }
+
+      // Start of a string
+      case SINGLE_QUOTE:
+      case DOUBLE_QUOTE: {
+        let start = i
+
+        // We need to ensure that the closing quote is the same as the opening
+        // quote.
+        //
+        // E.g.:
+        //
+        // ```css
+        // "This is a string with a 'quote' in it"
+        //                          ^     ^         -> These are not the end of the string
+        // ```
+        for (let j = i + 1; j < input.length; j++) {
+          peekChar = input.charCodeAt(j)
+          // Current character is a `\` therefore the next character is escaped
+          if (peekChar === BACKSLASH) {
+            j += 1
+          }
+
+          // End of the string
+          else if (peekChar === currentChar) {
+            i = j
+            break
+          }
+        }
+
+        // Adjust `buffer` to include the string
+        buffer += input.slice(start, i + 1)
+        break
+      }
+
+      // Nesting `&` is always a new selector
+      // Universal `*` is always a new selector
+      case AMPERSAND:
+      case ASTERISK: {
+        // Flush remaining buffer as a selector
+        if (buffer.length > 0) {
+          append(selector(buffer))
+          buffer = ''
+        }
+
+        // Handle the `&` or `*` as a selector on its own
+        append(selector(input[i]))
+        break
+      }
+
+      // Escaped characters
+      case BACKSLASH: {
+        buffer += input[i] + input[i + 1]
+        i += 1
+        break
+      }
+
+      // Everything else will be collected in the buffer
+      default: {
+        buffer += input[i]
+      }
+    }
+  }
+
+  // Collect the remainder as a selector
+  if (buffer.length > 0) {
+    append(selector(buffer))
+  }
+
+  if (currentList) {
+    currentList.nodes.push(current())
+  } else if (containsCombinator) {
+    target.splice(0, target.length, complex(target.splice(0)))
+  }
+
+  return ast
+}
diff --git a/packages/tailwindcss/src/source-maps/line-table.bench.ts b/packages/tailwindcss/src/source-maps/line-table.bench.ts
new file mode 100644
index 000000000..862e2d398
--- /dev/null
+++ b/packages/tailwindcss/src/source-maps/line-table.bench.ts
@@ -0,0 +1,13 @@
+import { readFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+
+import { bench } from 'vitest'
+import { createLineTable } from './line-table'
+
+const currentFolder = fileURLToPath(new URL('..', import.meta.url))
+const cssFile = readFileSync(currentFolder + '../preflight.css', 'utf-8')
+const table = createLineTable(cssFile)
+
+bench('line table lookups', () => {
+  for (let i = 0; i < cssFile.length; ++i) table.find(i)
+})
diff --git a/packages/tailwindcss/src/source-maps/line-table.test.ts b/packages/tailwindcss/src/source-maps/line-table.test.ts
new file mode 100644
index 000000000..23c46243b
--- /dev/null
+++ b/packages/tailwindcss/src/source-maps/line-table.test.ts
@@ -0,0 +1,87 @@
+import dedent from 'dedent'
+import { expect, test } from 'vitest'
+import { createLineTable } from './line-table'
+
+const css = dedent
+
+test('line tables', () => {
+  let text = css`
+    .foo {
+      color: red;
+    }
+  `
+
+  let table = createLineTable(`${text}\n`)
+
+  // Line 1: `.foo {\n`
+  expect(table.find(0)).toEqual({ line: 1, column: 0 })
+  expect(table.find(1)).toEqual({ line: 1, column: 1 })
+  expect(table.find(2)).toEqual({ line: 1, column: 2 })
+  expect(table.find(3)).toEqual({ line: 1, column: 3 })
+  expect(table.find(4)).toEqual({ line: 1, column: 4 })
+  expect(table.find(5)).toEqual({ line: 1, column: 5 })
+  expect(table.find(6)).toEqual({ line: 1, column: 6 })
+
+  // Line 2: `  color: red;\n`
+  expect(table.find(6 + 1)).toEqual({ line: 2, column: 0 })
+  expect(table.find(6 + 2)).toEqual({ line: 2, column: 1 })
+  expect(table.find(6 + 3)).toEqual({ line: 2, column: 2 })
+  expect(table.find(6 + 4)).toEqual({ line: 2, column: 3 })
+  expect(table.find(6 + 5)).toEqual({ line: 2, column: 4 })
+  expect(table.find(6 + 6)).toEqual({ line: 2, column: 5 })
+  expect(table.find(6 + 7)).toEqual({ line: 2, column: 6 })
+  expect(table.find(6 + 8)).toEqual({ line: 2, column: 7 })
+  expect(table.find(6 + 9)).toEqual({ line: 2, column: 8 })
+  expect(table.find(6 + 10)).toEqual({ line: 2, column: 9 })
+  expect(table.find(6 + 11)).toEqual({ line: 2, column: 10 })
+  expect(table.find(6 + 12)).toEqual({ line: 2, column: 11 })
+  expect(table.find(6 + 13)).toEqual({ line: 2, column: 12 })
+
+  // Line 3: `}\n`
+  expect(table.find(20 + 1)).toEqual({ line: 3, column: 0 })
+  expect(table.find(20 + 2)).toEqual({ line: 3, column: 1 })
+
+  // After the new line
+  expect(table.find(22 + 1)).toEqual({ line: 4, column: 0 })
+})
+
+test('line tables findOffset', () => {
+  let text = css`
+    .foo {
+      color: red;
+    }
+  `
+
+  let table = createLineTable(`${text}\n`)
+
+  // Line 1: `.foo {\n`
+  expect(table.findOffset({ line: 1, column: 0 })).toEqual(0)
+  expect(table.findOffset({ line: 1, column: 1 })).toEqual(1)
+  expect(table.findOffset({ line: 1, column: 2 })).toEqual(2)
+  expect(table.findOffset({ line: 1, column: 3 })).toEqual(3)
+  expect(table.findOffset({ line: 1, column: 4 })).toEqual(4)
+  expect(table.findOffset({ line: 1, column: 5 })).toEqual(5)
+  expect(table.findOffset({ line: 1, column: 6 })).toEqual(6)
+
+  // Line 2: `  color: red;\n`
+  expect(table.findOffset({ line: 2, column: 0 })).toEqual(6 + 1)
+  expect(table.findOffset({ line: 2, column: 1 })).toEqual(6 + 2)
+  expect(table.findOffset({ line: 2, column: 2 })).toEqual(6 + 3)
+  expect(table.findOffset({ line: 2, column: 3 })).toEqual(6 + 4)
+  expect(table.findOffset({ line: 2, column: 4 })).toEqual(6 + 5)
+  expect(table.findOffset({ line: 2, column: 5 })).toEqual(6 + 6)
+  expect(table.findOffset({ line: 2, column: 6 })).toEqual(6 + 7)
+  expect(table.findOffset({ line: 2, column: 7 })).toEqual(6 + 8)
+  expect(table.findOffset({ line: 2, column: 8 })).toEqual(6 + 9)
+  expect(table.findOffset({ line: 2, column: 9 })).toEqual(6 + 10)
+  expect(table.findOffset({ line: 2, column: 10 })).toEqual(6 + 11)
+  expect(table.findOffset({ line: 2, column: 11 })).toEqual(6 + 12)
+  expect(table.findOffset({ line: 2, column: 12 })).toEqual(6 + 13)
+
+  // Line 3: `}\n`
+  expect(table.findOffset({ line: 3, column: 0 })).toEqual(20 + 1)
+  expect(table.findOffset({ line: 3, column: 1 })).toEqual(20 + 2)
+
+  // After the new line
+  expect(table.findOffset({ line: 4, column: 0 })).toEqual(22 + 1)
+})
diff --git a/packages/tailwindcss/src/source-maps/line-table.ts b/packages/tailwindcss/src/source-maps/line-table.ts
new file mode 100644
index 000000000..e16051762
--- /dev/null
+++ b/packages/tailwindcss/src/source-maps/line-table.ts
@@ -0,0 +1,100 @@
+/**
+ * Line offset tables are the key to generating our source maps. They allow us
+ * to store indexes with our AST nodes and later convert them into positions as
+ * when given the source that the indexes refer to.
+ */
+
+const LINE_BREAK = 0x0a
+
+/**
+ * A position in source code
+ *
+ * https://tc39.es/ecma426/#sec-position-record-type
+ */
+export interface Position {
+  /** The line number, one-based */
+  line: number
+
+  /** The column/character number, one-based */
+  column: number
+}
+
+/**
+ * A table that lets you turn an offset into a line number and column
+ */
+export interface LineTable {
+  /**
+   * Find the line/column position in the source code for a given offset
+   *
+   * Searching for a given offset takes O(log N) time where N is the number of
+   * lines of code.
+   *
+   * @param offset The index for which to find the position
+   */
+  find(offset: number): Position
+
+  /**
+   * Find the most likely byte offset for given a position
+   *
+   * @param offset The position for which to find the byte offset
+   */
+  findOffset(pos: Position): number
+}
+
+/**
+ * Compute a lookup table to allow for efficient line/column lookups based on
+ * offsets in the source code.
+ *
+ * Creating this table is an O(N) operation where N is the length of the source
+ */
+export function createLineTable(source: string): LineTable {
+  let table: number[] = [0]
+
+  // Compute the offsets for the start of each line
+  for (let i = 0; i < source.length; i++) {
+    if (source.charCodeAt(i) === LINE_BREAK) {
+      table.push(i + 1)
+    }
+  }
+
+  function find(offset: number) {
+    // Based on esbuild's binary search for line numbers
+    let line = 0
+    let count = table.length
+    while (count > 0) {
+      // `| 0` improves performance (in V8 at least)
+      let mid = (count | 0) >> 1
+      let i = line + mid
+      if (table[i] <= offset) {
+        line = i + 1
+        count = count - mid - 1
+      } else {
+        count = mid
+      }
+    }
+
+    line -= 1
+
+    let column = offset - table[line]
+
+    return {
+      line: line + 1,
+      column: column,
+    }
+  }
+
+  function findOffset({ line, column }: Position) {
+    line -= 1
+    line = Math.min(Math.max(line, 0), table.length - 1)
+
+    let offsetA = table[line]
+    let offsetB = table[line + 1] ?? offsetA
+
+    return Math.min(Math.max(offsetA + column, 0), offsetB)
+  }
+
+  return {
+    find,
+    findOffset,
+  }
+}
diff --git a/packages/tailwindcss/src/source-maps/source-map.test.ts b/packages/tailwindcss/src/source-maps/source-map.test.ts
new file mode 100644
index 000000000..2bc7b0962
--- /dev/null
+++ b/packages/tailwindcss/src/source-maps/source-map.test.ts
@@ -0,0 +1,893 @@
+import remapping from '@jridgewell/remapping'
+import dedent from 'dedent'
+import MagicString from 'magic-string'
+import * as fs from 'node:fs/promises'
+import * as path from 'node:path'
+import { SourceMapGenerator, type RawSourceMap } from 'source-map-js'
+import { test } from 'vitest'
+import { compile } from '..'
+import createPlugin from '../plugin'
+import { DefaultMap } from '../utils/default-map'
+import type { DecodedSource, DecodedSourceMap } from './source-map'
+import { visualizeSourceMap } from './visualize-source-map'
+const css = dedent
+
+interface RunOptions {
+  input: string
+  candidates?: string[]
+  options?: Parameters<typeof compile>[1]
+}
+
+async function run({ input, candidates, options }: RunOptions) {
+  let source = new MagicString(input)
+  let root = path.resolve(__dirname, '../..')
+
+  let compiler = await compile(source.toString(), {
+    from: 'input.css',
+    async loadStylesheet(id, base) {
+      let resolvedPath = path.resolve(root, id === 'tailwindcss' ? 'index.css' : id)
+
+      return {
+        path: path.relative(root, resolvedPath),
+        base,
+        content: await fs.readFile(resolvedPath, 'utf-8'),
+      }
+    },
+    ...options,
+  })
+
+  let css = compiler.build(candidates ?? [])
+  let decoded = compiler.buildSourceMap()
+  let rawMap = toRawSourceMap(decoded)
+  let combined = remapping(rawMap, () => null)
+  let map = JSON.parse(rawMap.toString()) as RawSourceMap
+
+  let sources = combined.sources
+  let annotations = visualizeSourceMap(map, css)
+
+  return { css, map, sources, annotations }
+}
+
+function toRawSourceMap(map: DecodedSourceMap): string {
+  let generator = new SourceMapGenerator()
+
+  let id = 1
+  let sourceTable = new DefaultMap<
+    DecodedSource | null,
+    {
+      url: string
+      content: string
+    }
+  >((src) => {
+    return {
+      url: src?.url ?? `<unknown ${id++}>`,
+      content: src?.content ?? '<none>',
+    }
+  })
+
+  for (let mapping of map.mappings) {
+    let original = sourceTable.get(mapping.originalPosition?.source ?? null)
+
+    generator.addMapping({
+      generated: mapping.generatedPosition,
+      original: mapping.originalPosition,
+      source: original.url,
+      name: mapping.name ?? undefined,
+    })
+
+    generator.setSourceContent(original.url, original.content)
+  }
+
+  return generator.toString()
+}
+
+test('source maps trace back to @import location', async ({ expect }) => {
+  let { sources, annotations } = await run({
+    input: css`
+      @import 'tailwindcss';
+
+      .foo {
+        @apply underline;
+      }
+    `,
+  })
+
+  // All CSS should be mapped back to the original source file
+  expect(sources).toEqual([
+    //
+    'index.css',
+    'theme.css',
+    'preflight.css',
+    'input.css',
+  ])
+  expect(sources.length).toBe(4)
+
+  // The output CSS should include annotations linking back to:
+  // 1. The class definition `.foo`
+  // 2. The `@apply underline` line inside of it
+  expect(annotations).toMatchInlineSnapshot(`
+    "
+         output.css                                                                                      |      original
+                                                                                                         | 
+                                                                                                         |      --- index.css ---
+      1  @layer theme, base, components, utilities;                                                      |   1  @layer theme, base, components, utilities;
+         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ A @ 1:0-41                                            |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ A @ 1:0-41
+      2  @layer theme {                                                                                  |   3  @import './theme.css' layer(theme);
+         ^^^^^^^^^^^^^ B @ 2:0-13                                                                        |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ B @ 3:0-34
+                                                                                                         |      --- theme.css ---
+      3    :root, :host {                                                                                |   1  @theme default {
+           ^^^^^^^^^^^^^ C @ 3:2-15                                                                      |      ^^^^^^^^^^^^^^^ C @ 1:0-15
+      4      --font-sans: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', 'N... |   2    --font-sans:
+             ^ D @ 4:4                                                                                   |        ^ D @ 2:2
+      4      --font-sans: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', 'N... |   3      -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', 'Noto Sans', Ar...
+             ^ E @ 4:4                                                                                   |      ^ E @ 3:0
+      4      --font-sans: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', 'N... |   4      sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... F @ 4:4-5:0 |      ^ F @ 4:0
+      5      sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';   |   4      sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+                                                                                        ... G @ 5:92-6:0 |                                                                                         ... G @ 4:92
+                                                                                                         |   5    --font-serif: ui-serif, Georgia, Cambria, 'Times New Roman', Times, serif;
+      6      --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', '... |   6    --font-mono:
+             ^ H @ 6:4                                                                                   |        ^ H @ 6:2
+      6      --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', '... |   7      ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New',
+             ^ I @ 6:4                                                                                   |      ^ I @ 7:0
+      6      --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', '... |   8      monospace;
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... J @ 6:4-7:0 |      ^ J @ 8:0
+      7      monospace;                                                                                  |   8      monospace;
+                      ^ K @ 7:13-8:0                                                                     |                   ^ K @ 8:13
+      8      --default-font-family: var(--font-sans);                                                    | 494    --default-font-family: --theme(--font-sans, initial);
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ L @ 8:4-43                                          |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ L @ 494:2-54
+                                                                                                         | 495    --default-font-feature-settings: --theme(--font-sans--font-feature-settings, initial);
+                                                                                                         | 496    --default-font-variation-settings: --theme(--font-sans--font-variation-settings, initial);
+      9      --default-mono-font-family: var(--font-mono);                                               | 497    --default-mono-font-family: --theme(--font-mono, initial);
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ M @ 9:4-48                                     |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ M @ 497:2-59
+     10    }                                                                                             | 
+     11  }                                                                                               | 
+                                                                                                         |      --- index.css ---
+     12  @layer base {                                                                                   |   4  @import './preflight.css' layer(base);
+         ^^^^^^^^^^^^ N @ 12:0-12                                                                        |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ N @ 4:0-37
+                                                                                                         |      --- preflight.css ---
+     13    *, ::after, ::before, ::backdrop, ::file-selector-button {                                    |   7  *,
+           ^ O @ 13:2                                                                                    |      ^ O @ 7:0
+     13    *, ::after, ::before, ::backdrop, ::file-selector-button {                                    |   8  ::after,
+           ^ P @ 13:2                                                                                    |      ^ P @ 8:0
+     13    *, ::after, ::before, ::backdrop, ::file-selector-button {                                    |   9  ::before,
+           ^ Q @ 13:2                                                                                    |      ^ Q @ 9:0
+     13    *, ::after, ::before, ::backdrop, ::file-selector-button {                                    |  10  ::backdrop,
+           ^ R @ 13:2                                                                                    |      ^ R @ 10:0
+     13    *, ::after, ::before, ::backdrop, ::file-selector-button {                                    |  11  ::file-selector-button {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ S @ 13:2-59                         |      ^^^^^^^^^^^^^^^^^^^^^^^ S @ 11:0-23
+     14      box-sizing: border-box;                                                                     |  12    box-sizing: border-box; /* 1 */
+             ^^^^^^^^^^^^^^^^^^^^^^ T @ 14:4-26                                                          |        ^^^^^^^^^^^^^^^^^^^^^^ T @ 12:2-24
+     15      margin: 0;                                                                                  |  13    margin: 0; /* 2 */
+             ^^^^^^^^^ U @ 15:4-13                                                                       |        ^^^^^^^^^ U @ 13:2-11
+     16      padding: 0;                                                                                 |  14    padding: 0; /* 2 */
+             ^^^^^^^^^^ V @ 16:4-14                                                                      |        ^^^^^^^^^^ V @ 14:2-12
+     17      border: 0 solid;                                                                            |  15    border: 0 solid; /* 3 */
+             ^^^^^^^^^^^^^^^ W @ 17:4-19                                                                 |        ^^^^^^^^^^^^^^^ W @ 15:2-17
+                                                                                                         |  16  }
+     18    }                                                                                             | 
+     19    html, :host {                                                                                 |  28  html,
+           ^ X @ 19:2                                                                                    |      ^ X @ 28:0
+     19    html, :host {                                                                                 |  29  :host {
+           ^^^^^^^^^^^^ Y @ 19:2-14                                                                      |      ^^^^^^ Y @ 29:0-6
+     20      line-height: 1.5;                                                                           |  30    line-height: 1.5; /* 1 */
+             ^^^^^^^^^^^^^^^^ Z @ 20:4-20                                                                |        ^^^^^^^^^^^^^^^^ Z @ 30:2-18
+     21      -webkit-text-size-adjust: 100%;                                                             |  31    -webkit-text-size-adjust: 100%; /* 2 */
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AA @ 21:4-34                                                 |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AA @ 31:2-32
+     22      tab-size: 4;                                                                                |  32    tab-size: 4; /* 3 */
+             ^^^^^^^^^^^ AB @ 22:4-15                                                                    |        ^^^^^^^^^^^ AB @ 32:2-13
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  33    font-family: --theme(
+             ^ AC @ 23:4                                                                                 |        ^ AC @ 33:2
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  34      --default-font-family,
+             ^ AD @ 23:4                                                                                 |      ^ AD @ 34:0
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  35      -apple-system,
+             ^ AE @ 23:4                                                                                 |      ^ AE @ 35:0
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  36      BlinkMacSystemFont,
+             ^ AF @ 23:4                                                                                 |      ^ AF @ 36:0
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  37      'Segoe UI',
+             ^ AG @ 23:4                                                                                 |      ^ AG @ 37:0
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  38      Roboto,
+             ^ AH @ 23:4                                                                                 |      ^ AH @ 38:0
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  39      'Helvetica Neue',
+             ^ AI @ 23:4                                                                                 |      ^ AI @ 39:0
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  40      'Noto Sans',
+             ^ AJ @ 23:4                                                                                 |      ^ AJ @ 40:0
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  41      Arial,
+             ^ AK @ 23:4                                                                                 |      ^ AK @ 41:0
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  42      sans-serif,
+             ^ AL @ 23:4                                                                                 |      ^ AL @ 42:0
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  43      'Apple Color Emoji',
+             ^ AM @ 23:4                                                                                 |      ^ AM @ 43:0
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  44      'Segoe UI Emoji',
+             ^ AN @ 23:4                                                                                 |      ^ AN @ 44:0
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  45      'Segoe UI Symbol',
+             ^ AO @ 23:4                                                                                 |      ^ AO @ 45:0
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  46      'Noto Color Emoji'
+             ^ AP @ 23:4                                                                                 |      ^ AP @ 46:0
+     23      font-family: var(--default-font-family, -apple-system, BlinkMacSystemFont, 'Segoe UI', R... |  47    ); /* 4 */
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... AQ @ 23:4-226 |      ^^^ AQ @ 47:0-3
+     24      font-feature-settings: var(--default-font-feature-settings, normal);                        |  48    font-feature-settings: --theme(--default-font-feature-settings, normal); /* 5 */
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AR @ 24:4-71            |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AR @ 48:2-73
+     25      font-variation-settings: var(--default-font-variation-settings, normal);                    |  49    font-variation-settings: --theme(--default-font-variation-settings, normal); /* 6 */
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AS @ 25:4-75        |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AS @ 49:2-77
+     26      -webkit-tap-highlight-color: transparent;                                                   |  50    -webkit-tap-highlight-color: transparent; /* 7 */
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AT @ 26:4-44                                       |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AT @ 50:2-42
+                                                                                                         |  51  }
+     27    }                                                                                             | 
+     28    hr {                                                                                          |  59  hr {
+           ^^^ AU @ 28:2-5                                                                               |      ^^^ AU @ 59:0-3
+     29      height: 0;                                                                                  |  60    height: 0; /* 1 */
+             ^^^^^^^^^ AV @ 29:4-13                                                                      |        ^^^^^^^^^ AV @ 60:2-11
+     30      color: inherit;                                                                             |  61    color: inherit; /* 2 */
+             ^^^^^^^^^^^^^^ AW @ 30:4-18                                                                 |        ^^^^^^^^^^^^^^ AW @ 61:2-16
+     31      border-top-width: 1px;                                                                      |  62    border-top-width: 1px; /* 3 */
+             ^^^^^^^^^^^^^^^^^^^^^ AX @ 31:4-25                                                          |        ^^^^^^^^^^^^^^^^^^^^^ AX @ 62:2-23
+                                                                                                         |  63  }
+     32    }                                                                                             | 
+     33    abbr:where([title]) {                                                                         |  69  abbr:where([title]) {
+           ^^^^^^^^^^^^^^^^^^^^ AY @ 33:2-22                                                             |      ^^^^^^^^^^^^^^^^^^^^ AY @ 69:0-20
+     34      -webkit-text-decoration: underline dotted;                                                  |  70    -webkit-text-decoration: underline dotted;
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AZ @ 34:4-45                                      |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AZ @ 70:2-43
+     35      text-decoration: underline dotted;                                                          |  71    text-decoration: underline dotted;
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ BA @ 35:4-37                                              |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ BA @ 71:2-35
+                                                                                                         |  72  }
+     36    }                                                                                             | 
+     37    h1, h2, h3, h4, h5, h6 {                                                                      |  78  h1,
+           ^ BB @ 37:2                                                                                   |      ^ BB @ 78:0
+     37    h1, h2, h3, h4, h5, h6 {                                                                      |  79  h2,
+           ^ BC @ 37:2                                                                                   |      ^ BC @ 79:0
+     37    h1, h2, h3, h4, h5, h6 {                                                                      |  80  h3,
+           ^ BD @ 37:2                                                                                   |      ^ BD @ 80:0
+     37    h1, h2, h3, h4, h5, h6 {                                                                      |  81  h4,
+           ^ BE @ 37:2                                                                                   |      ^ BE @ 81:0
+     37    h1, h2, h3, h4, h5, h6 {                                                                      |  82  h5,
+           ^ BF @ 37:2                                                                                   |      ^ BF @ 82:0
+     37    h1, h2, h3, h4, h5, h6 {                                                                      |  83  h6 {
+           ^^^^^^^^^^^^^^^^^^^^^^^ BG @ 37:2-25                                                          |      ^^^ BG @ 83:0-3
+     38      font-size: inherit;                                                                         |  84    font-size: inherit;
+             ^^^^^^^^^^^^^^^^^^ BH @ 38:4-22                                                             |        ^^^^^^^^^^^^^^^^^^ BH @ 84:2-20
+     39      font-weight: inherit;                                                                       |  85    font-weight: inherit;
+             ^^^^^^^^^^^^^^^^^^^^ BI @ 39:4-24                                                           |        ^^^^^^^^^^^^^^^^^^^^ BI @ 85:2-22
+                                                                                                         |  86  }
+     40    }                                                                                             | 
+     41    a {                                                                                           |  92  a {
+           ^^ BJ @ 41:2-4                                                                                |      ^^ BJ @ 92:0-2
+     42      color: inherit;                                                                             |  93    color: inherit;
+             ^^^^^^^^^^^^^^ BK @ 42:4-18                                                                 |        ^^^^^^^^^^^^^^ BK @ 93:2-16
+     43      -webkit-text-decoration: inherit;                                                           |  94    -webkit-text-decoration: inherit;
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ BL @ 43:4-36                                               |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ BL @ 94:2-34
+     44      text-decoration: inherit;                                                                   |  95    text-decoration: inherit;
+             ^^^^^^^^^^^^^^^^^^^^^^^^ BM @ 44:4-28                                                       |        ^^^^^^^^^^^^^^^^^^^^^^^^ BM @ 95:2-26
+                                                                                                         |  96  }
+     45    }                                                                                             | 
+     46    b, strong {                                                                                   | 102  b,
+           ^ BN @ 46:2                                                                                   |      ^ BN @ 102:0
+     46    b, strong {                                                                                   | 103  strong {
+           ^^^^^^^^^^ BO @ 46:2-12                                                                       |      ^^^^^^^ BO @ 103:0-7
+     47      font-weight: bolder;                                                                        | 104    font-weight: bolder;
+             ^^^^^^^^^^^^^^^^^^^ BP @ 47:4-23                                                            |        ^^^^^^^^^^^^^^^^^^^ BP @ 104:2-21
+                                                                                                         | 105  }
+     48    }                                                                                             | 
+     49    code, kbd, samp, pre {                                                                        | 114  code,
+           ^ BQ @ 49:2                                                                                   |      ^ BQ @ 114:0
+     49    code, kbd, samp, pre {                                                                        | 115  kbd,
+           ^ BR @ 49:2                                                                                   |      ^ BR @ 115:0
+     49    code, kbd, samp, pre {                                                                        | 116  samp,
+           ^ BS @ 49:2                                                                                   |      ^ BS @ 116:0
+     49    code, kbd, samp, pre {                                                                        | 117  pre {
+           ^^^^^^^^^^^^^^^^^^^^^ BT @ 49:2-23                                                            |      ^^^^ BT @ 117:0-4
+     50      font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco... | 118    font-family: --theme(
+             ^ BU @ 50:4                                                                                 |        ^ BU @ 118:2
+     50      font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco... | 119      --default-mono-font-family,
+             ^ BV @ 50:4                                                                                 |      ^ BV @ 119:0
+     50      font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco... | 120      ui-monospace,
+             ^ BW @ 50:4                                                                                 |      ^ BW @ 120:0
+     50      font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco... | 121      SFMono-Regular,
+             ^ BX @ 50:4                                                                                 |      ^ BX @ 121:0
+     50      font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco... | 122      Menlo,
+             ^ BY @ 50:4                                                                                 |      ^ BY @ 122:0
+     50      font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco... | 123      Monaco,
+             ^ BZ @ 50:4                                                                                 |      ^ BZ @ 123:0
+     50      font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco... | 124      Consolas,
+             ^ CA @ 50:4                                                                                 |      ^ CA @ 124:0
+     50      font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco... | 125      'Liberation Mono',
+             ^ CB @ 50:4                                                                                 |      ^ CB @ 125:0
+     50      font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco... | 126      'Courier New',
+             ^ CC @ 50:4                                                                                 |      ^ CC @ 126:0
+     50      font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco... | 127      monospace
+             ^ CD @ 50:4                                                                                 |      ^ CD @ 127:0
+     50      font-family: var(--default-mono-font-family, ui-monospace, SFMono-Regular, Menlo, Monaco... | 128    ); /* 1 */
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... CE @ 50:4-148 |      ^^^ CE @ 128:0-3
+     51      font-feature-settings: var(--default-mono-font-feature-settings, normal);                   | 129    font-feature-settings: --theme(--default-mono-font-feature-settings, normal); /* 2 */
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ CF @ 51:4-76       |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ CF @ 129:2-78
+     52      font-variation-settings: var(--default-mono-font-variation-settings, normal);               | 130    font-variation-settings: --theme(--default-mono-font-variation-settings, normal); /* 3 */
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ CG @ 52:4-80   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... CG @ 130:2-82
+     53      font-size: 1em;                                                                             | 131    font-size: 1em; /* 4 */
+             ^^^^^^^^^^^^^^ CH @ 53:4-18                                                                 |        ^^^^^^^^^^^^^^ CH @ 131:2-16
+                                                                                                         | 132  }
+     54    }                                                                                             | 
+     55    small {                                                                                       | 138  small {
+           ^^^^^^ CI @ 55:2-8                                                                            |      ^^^^^^ CI @ 138:0-6
+     56      font-size: 80%;                                                                             | 139    font-size: 80%;
+             ^^^^^^^^^^^^^^ CJ @ 56:4-18                                                                 |        ^^^^^^^^^^^^^^ CJ @ 139:2-16
+                                                                                                         | 140  }
+     57    }                                                                                             | 
+     58    sub, sup {                                                                                    | 146  sub,
+           ^ CK @ 58:2                                                                                   |      ^ CK @ 146:0
+     58    sub, sup {                                                                                    | 147  sup {
+           ^^^^^^^^^ CL @ 58:2-11                                                                        |      ^^^^ CL @ 147:0-4
+     59      font-size: 75%;                                                                             | 148    font-size: 75%;
+             ^^^^^^^^^^^^^^ CM @ 59:4-18                                                                 |        ^^^^^^^^^^^^^^ CM @ 148:2-16
+     60      line-height: 0;                                                                             | 149    line-height: 0;
+             ^^^^^^^^^^^^^^ CN @ 60:4-18                                                                 |        ^^^^^^^^^^^^^^ CN @ 149:2-16
+     61      position: relative;                                                                         | 150    position: relative;
+             ^^^^^^^^^^^^^^^^^^ CO @ 61:4-22                                                             |        ^^^^^^^^^^^^^^^^^^ CO @ 150:2-20
+     62      vertical-align: baseline;                                                                   | 151    vertical-align: baseline;
+             ^^^^^^^^^^^^^^^^^^^^^^^^ CP @ 62:4-28                                                       |        ^^^^^^^^^^^^^^^^^^^^^^^^ CP @ 151:2-26
+                                                                                                         | 152  }
+     63    }                                                                                             | 
+     64    sub {                                                                                         | 154  sub {
+           ^^^^ CQ @ 64:2-6                                                                              |      ^^^^ CQ @ 154:0-4
+     65      bottom: -0.25em;                                                                            | 155    bottom: -0.25em;
+             ^^^^^^^^^^^^^^^ CR @ 65:4-19                                                                |        ^^^^^^^^^^^^^^^ CR @ 155:2-17
+                                                                                                         | 156  }
+     66    }                                                                                             | 
+     67    sup {                                                                                         | 158  sup {
+           ^^^^ CS @ 67:2-6                                                                              |      ^^^^ CS @ 158:0-4
+     68      top: -0.5em;                                                                                | 159    top: -0.5em;
+             ^^^^^^^^^^^ CT @ 68:4-15                                                                    |        ^^^^^^^^^^^ CT @ 159:2-13
+                                                                                                         | 160  }
+     69    }                                                                                             | 
+     70    table {                                                                                       | 168  table {
+           ^^^^^^ CU @ 70:2-8                                                                            |      ^^^^^^ CU @ 168:0-6
+     71      text-indent: 0;                                                                             | 169    text-indent: 0; /* 1 */
+             ^^^^^^^^^^^^^^ CV @ 71:4-18                                                                 |        ^^^^^^^^^^^^^^ CV @ 169:2-16
+     72      border-color: inherit;                                                                      | 170    border-color: inherit; /* 2 */
+             ^^^^^^^^^^^^^^^^^^^^^ CW @ 72:4-25                                                          |        ^^^^^^^^^^^^^^^^^^^^^ CW @ 170:2-23
+     73      border-collapse: collapse;                                                                  | 171    border-collapse: collapse; /* 3 */
+             ^^^^^^^^^^^^^^^^^^^^^^^^^ CX @ 73:4-29                                                      |        ^^^^^^^^^^^^^^^^^^^^^^^^^ CX @ 171:2-27
+                                                                                                         | 172  }
+     74    }                                                                                             | 
+     75    :-moz-focusring:where(:not(iframe)) {                                                         | 178  :-moz-focusring:where(:not(iframe)) {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ CY @ 75:2-38                                             |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ CY @ 178:0-36
+     76      outline: auto;                                                                              | 179    outline: auto;
+             ^^^^^^^^^^^^^ CZ @ 76:4-17                                                                  |        ^^^^^^^^^^^^^ CZ @ 179:2-15
+                                                                                                         | 180  }
+     77    }                                                                                             | 
+     78    progress {                                                                                    | 186  progress {
+           ^^^^^^^^^ DA @ 78:2-11                                                                        |      ^^^^^^^^^ DA @ 186:0-9
+     79      vertical-align: baseline;                                                                   | 187    vertical-align: baseline;
+             ^^^^^^^^^^^^^^^^^^^^^^^^ DB @ 79:4-28                                                       |        ^^^^^^^^^^^^^^^^^^^^^^^^ DB @ 187:2-26
+                                                                                                         | 188  }
+     80    }                                                                                             | 
+     81    summary {                                                                                     | 194  summary {
+           ^^^^^^^^ DC @ 81:2-10                                                                         |      ^^^^^^^^ DC @ 194:0-8
+     82      display: list-item;                                                                         | 195    display: list-item;
+             ^^^^^^^^^^^^^^^^^^ DD @ 82:4-22                                                             |        ^^^^^^^^^^^^^^^^^^ DD @ 195:2-20
+                                                                                                         | 196  }
+     83    }                                                                                             | 
+     84    ol, ul, menu {                                                                                | 202  ol,
+           ^ DE @ 84:2                                                                                   |      ^ DE @ 202:0
+     84    ol, ul, menu {                                                                                | 203  ul,
+           ^ DF @ 84:2                                                                                   |      ^ DF @ 203:0
+     84    ol, ul, menu {                                                                                | 204  menu {
+           ^^^^^^^^^^^^^ DG @ 84:2-15                                                                    |      ^^^^^ DG @ 204:0-5
+     85      list-style: none;                                                                           | 205    list-style: none;
+             ^^^^^^^^^^^^^^^^ DH @ 85:4-20                                                               |        ^^^^^^^^^^^^^^^^ DH @ 205:2-18
+                                                                                                         | 206  }
+     86    }                                                                                             | 
+     87    img, svg, video, canvas, audio, iframe, embed, object {                                       | 214  img,
+           ^ DI @ 87:2                                                                                   |      ^ DI @ 214:0
+     87    img, svg, video, canvas, audio, iframe, embed, object {                                       | 215  svg,
+           ^ DJ @ 87:2                                                                                   |      ^ DJ @ 215:0
+     87    img, svg, video, canvas, audio, iframe, embed, object {                                       | 216  video,
+           ^ DK @ 87:2                                                                                   |      ^ DK @ 216:0
+     87    img, svg, video, canvas, audio, iframe, embed, object {                                       | 217  canvas,
+           ^ DL @ 87:2                                                                                   |      ^ DL @ 217:0
+     87    img, svg, video, canvas, audio, iframe, embed, object {                                       | 218  audio,
+           ^ DM @ 87:2                                                                                   |      ^ DM @ 218:0
+     87    img, svg, video, canvas, audio, iframe, embed, object {                                       | 219  iframe,
+           ^ DN @ 87:2                                                                                   |      ^ DN @ 219:0
+     87    img, svg, video, canvas, audio, iframe, embed, object {                                       | 220  embed,
+           ^ DO @ 87:2                                                                                   |      ^ DO @ 220:0
+     87    img, svg, video, canvas, audio, iframe, embed, object {                                       | 221  object {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ DP @ 87:2-56                           |      ^^^^^^^ DP @ 221:0-7
+     88      display: block;                                                                             | 222    display: block; /* 1 */
+             ^^^^^^^^^^^^^^ DQ @ 88:4-18                                                                 |        ^^^^^^^^^^^^^^ DQ @ 222:2-16
+     89      vertical-align: middle;                                                                     | 223    vertical-align: middle; /* 2 */
+             ^^^^^^^^^^^^^^^^^^^^^^ DR @ 89:4-26                                                         |        ^^^^^^^^^^^^^^^^^^^^^^ DR @ 223:2-24
+                                                                                                         | 224  }
+     90    }                                                                                             | 
+     91    img, video {                                                                                  | 230  img,
+           ^ DS @ 91:2                                                                                   |      ^ DS @ 230:0
+     91    img, video {                                                                                  | 231  video {
+           ^^^^^^^^^^^ DT @ 91:2-13                                                                      |      ^^^^^^ DT @ 231:0-6
+     92      max-width: 100%;                                                                            | 232    max-width: 100%;
+             ^^^^^^^^^^^^^^^ DU @ 92:4-19                                                                |        ^^^^^^^^^^^^^^^ DU @ 232:2-17
+     93      height: auto;                                                                               | 233    height: auto;
+             ^^^^^^^^^^^^ DV @ 93:4-16                                                                   |        ^^^^^^^^^^^^ DV @ 233:2-14
+                                                                                                         | 234  }
+     94    }                                                                                             | 
+     95    button, input, select, optgroup, textarea, ::file-selector-button {                           | 243  button,
+           ^ DW @ 95:2                                                                                   |      ^ DW @ 243:0
+     95    button, input, select, optgroup, textarea, ::file-selector-button {                           | 244  input,
+           ^ DX @ 95:2                                                                                   |      ^ DX @ 244:0
+     95    button, input, select, optgroup, textarea, ::file-selector-button {                           | 245  select,
+           ^ DY @ 95:2                                                                                   |      ^ DY @ 245:0
+     95    button, input, select, optgroup, textarea, ::file-selector-button {                           | 246  optgroup,
+           ^ DZ @ 95:2                                                                                   |      ^ DZ @ 246:0
+     95    button, input, select, optgroup, textarea, ::file-selector-button {                           | 247  textarea,
+           ^ EA @ 95:2                                                                                   |      ^ EA @ 247:0
+     95    button, input, select, optgroup, textarea, ::file-selector-button {                           | 248  ::file-selector-button {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EB @ 95:2-68               |      ^^^^^^^^^^^^^^^^^^^^^^^ EB @ 248:0-23
+     96      font: inherit;                                                                              | 249    font: inherit; /* 1 */
+             ^^^^^^^^^^^^^ EC @ 96:4-17                                                                  |        ^^^^^^^^^^^^^ EC @ 249:2-15
+     97      font-feature-settings: inherit;                                                             | 250    font-feature-settings: inherit; /* 1 */
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ED @ 97:4-34                                                 |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ED @ 250:2-32
+     98      font-variation-settings: inherit;                                                           | 251    font-variation-settings: inherit; /* 1 */
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EE @ 98:4-36                                               |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EE @ 251:2-34
+     99      letter-spacing: inherit;                                                                    | 252    letter-spacing: inherit; /* 1 */
+             ^^^^^^^^^^^^^^^^^^^^^^^ EF @ 99:4-27                                                        |        ^^^^^^^^^^^^^^^^^^^^^^^ EF @ 252:2-25
+    100      color: inherit;                                                                             | 253    color: inherit; /* 1 */
+             ^^^^^^^^^^^^^^ EG @ 100:4-18                                                                |        ^^^^^^^^^^^^^^ EG @ 253:2-16
+    101      border-radius: 0;                                                                           | 254    border-radius: 0; /* 2 */
+             ^^^^^^^^^^^^^^^^ EH @ 101:4-20                                                              |        ^^^^^^^^^^^^^^^^ EH @ 254:2-18
+    102      background-color: transparent;                                                              | 255    background-color: transparent; /* 3 */
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EI @ 102:4-33                                                 |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EI @ 255:2-31
+    103      opacity: 1;                                                                                 | 256    opacity: 1; /* 4 */
+             ^^^^^^^^^^ EJ @ 103:4-14                                                                    |        ^^^^^^^^^^ EJ @ 256:2-12
+                                                                                                         | 257  }
+    104    }                                                                                             | 
+    105    :where(select:is([multiple], [size])) optgroup {                                              | 263  :where(select:is([multiple], [size])) optgroup {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EK @ 105:2-49                                 |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EK @ 263:0-47
+    106      font-weight: bolder;                                                                        | 264    font-weight: bolder;
+             ^^^^^^^^^^^^^^^^^^^ EL @ 106:4-23                                                           |        ^^^^^^^^^^^^^^^^^^^ EL @ 264:2-21
+                                                                                                         | 265  }
+    107    }                                                                                             | 
+    108    :where(select:is([multiple], [size])) optgroup option {                                       | 271  :where(select:is([multiple], [size])) optgroup option {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM @ 108:2-56                          |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EM @ 271:0-54
+    109      padding-inline-start: 20px;                                                                 | 272    padding-inline-start: 20px;
+             ^^^^^^^^^^^^^^^^^^^^^^^^^^ EN @ 109:4-30                                                    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^ EN @ 272:2-28
+                                                                                                         | 273  }
+    110    }                                                                                             | 
+    111    ::file-selector-button {                                                                      | 279  ::file-selector-button {
+           ^^^^^^^^^^^^^^^^^^^^^^^ EO @ 111:2-25                                                         |      ^^^^^^^^^^^^^^^^^^^^^^^ EO @ 279:0-23
+    112      margin-inline-end: 4px;                                                                     | 280    margin-inline-end: 4px;
+             ^^^^^^^^^^^^^^^^^^^^^^ EP @ 112:4-26                                                        |        ^^^^^^^^^^^^^^^^^^^^^^ EP @ 280:2-24
+                                                                                                         | 281  }
+    113    }                                                                                             | 
+    114    ::placeholder {                                                                               | 287  ::placeholder {
+           ^^^^^^^^^^^^^^ EQ @ 114:2-16                                                                  |      ^^^^^^^^^^^^^^ EQ @ 287:0-14
+    115      opacity: 1;                                                                                 | 288    opacity: 1;
+             ^^^^^^^^^^ ER @ 115:4-14                                                                    |        ^^^^^^^^^^ ER @ 288:2-12
+                                                                                                         | 289  }
+    116    }                                                                                             | 
+    117    @supports (not (-webkit-appearance: -apple-pay-button))  or (contain-intrinsic-size: 1px) {   | 296  @supports (not (-webkit-appearance: -apple-pay-button)) /* Not Safari */ or
+           ^ ES @ 117:2                                                                                  |      ^ ES @ 296:0
+    117    @supports (not (-webkit-appearance: -apple-pay-button))  or (contain-intrinsic-size: 1px) {   | 297    (contain-intrinsic-size: 1px) /* Safari 17+ */ {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... ET @ 117:2-92 |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ET @ 297:0-49
+    118      ::placeholder {                                                                             | 298    ::placeholder {
+             ^^^^^^^^^^^^^^ EU @ 118:4-18                                                                |        ^^^^^^^^^^^^^^ EU @ 298:2-16
+    119        color: currentcolor;                                                                      | 299      color: color-mix(in oklab, currentcolor 50%, transparent);
+               ^^^^^^^^^^^^^^^^^^^ EV @ 119:6-25                                                         |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EV @ 299:4-61
+                                                                                                         | 300    }
+                                                                                                         | 301  }
+    120        @supports (color: color-mix(in lab, red, red)) {                                          | 
+               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EV @ 120:6-53                             | 
+    121          color: color-mix(in oklab, currentcolor 50%, transparent);                              | 
+                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EV @ 121:8-65                 | 
+    122        }                                                                                         | 
+    123      }                                                                                           | 
+    124    }                                                                                             | 
+    125    textarea {                                                                                    | 307  textarea {
+           ^^^^^^^^^ EW @ 125:2-11                                                                       |      ^^^^^^^^^ EW @ 307:0-9
+    126      resize: vertical;                                                                           | 308    resize: vertical;
+             ^^^^^^^^^^^^^^^^ EX @ 126:4-20                                                              |        ^^^^^^^^^^^^^^^^ EX @ 308:2-18
+                                                                                                         | 309  }
+    127    }                                                                                             | 
+    128    ::-webkit-search-decoration {                                                                 | 315  ::-webkit-search-decoration {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EY @ 128:2-30                                                    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ EY @ 315:0-28
+    129      -webkit-appearance: none;                                                                   | 316    -webkit-appearance: none;
+             ^^^^^^^^^^^^^^^^^^^^^^^^ EZ @ 129:4-28                                                      |        ^^^^^^^^^^^^^^^^^^^^^^^^ EZ @ 316:2-26
+                                                                                                         | 317  }
+    130    }                                                                                             | 
+    131    ::-webkit-date-and-time-value {                                                               | 324  ::-webkit-date-and-time-value {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FA @ 131:2-32                                                  |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FA @ 324:0-30
+    132      min-height: 1lh;                                                                            | 325    min-height: 1lh; /* 1 */
+             ^^^^^^^^^^^^^^^ FB @ 132:4-19                                                               |        ^^^^^^^^^^^^^^^ FB @ 325:2-17
+    133      text-align: inherit;                                                                        | 326    text-align: inherit; /* 2 */
+             ^^^^^^^^^^^^^^^^^^^ FC @ 133:4-23                                                           |        ^^^^^^^^^^^^^^^^^^^ FC @ 326:2-21
+                                                                                                         | 327  }
+    134    }                                                                                             | 
+    135    ::-webkit-datetime-edit {                                                                     | 333  ::-webkit-datetime-edit {
+           ^^^^^^^^^^^^^^^^^^^^^^^^ FD @ 135:2-26                                                        |      ^^^^^^^^^^^^^^^^^^^^^^^^ FD @ 333:0-24
+    136      display: inline-flex;                                                                       | 334    display: inline-flex;
+             ^^^^^^^^^^^^^^^^^^^^ FE @ 136:4-24                                                          |        ^^^^^^^^^^^^^^^^^^^^ FE @ 334:2-22
+                                                                                                         | 335  }
+    137    }                                                                                             | 
+    138    ::-webkit-datetime-edit-fields-wrapper {                                                      | 341  ::-webkit-datetime-edit-fields-wrapper {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FF @ 138:2-41                                         |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FF @ 341:0-39
+    139      padding: 0;                                                                                 | 342    padding: 0;
+             ^^^^^^^^^^ FG @ 139:4-14                                                                    |        ^^^^^^^^^^ FG @ 342:2-12
+                                                                                                         | 343  }
+    140    }                                                                                             | 
+    141    ::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month... | 345  ::-webkit-datetime-edit,
+           ^ FH @ 141:2                                                                                  |      ^ FH @ 345:0
+    141    ::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month... | 346  ::-webkit-datetime-edit-year-field,
+           ^ FI @ 141:2                                                                                  |      ^ FI @ 346:0
+    141    ::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month... | 347  ::-webkit-datetime-edit-month-field,
+           ^ FJ @ 141:2                                                                                  |      ^ FJ @ 347:0
+    141    ::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month... | 348  ::-webkit-datetime-edit-day-field,
+           ^ FK @ 141:2                                                                                  |      ^ FK @ 348:0
+    141    ::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month... | 349  ::-webkit-datetime-edit-hour-field,
+           ^ FL @ 141:2                                                                                  |      ^ FL @ 349:0
+    141    ::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month... | 350  ::-webkit-datetime-edit-minute-field,
+           ^ FM @ 141:2                                                                                  |      ^ FM @ 350:0
+    141    ::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month... | 351  ::-webkit-datetime-edit-second-field,
+           ^ FN @ 141:2                                                                                  |      ^ FN @ 351:0
+    141    ::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month... | 352  ::-webkit-datetime-edit-millisecond-field,
+           ^ FO @ 141:2                                                                                  |      ^ FO @ 352:0
+    141    ::-webkit-datetime-edit, ::-webkit-datetime-edit-year-field, ::-webkit-datetime-edit-month... | 353  ::-webkit-datetime-edit-meridiem-field {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... FP @ 141:2-329 |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FP @ 353:0-39
+    142      padding-block: 0;                                                                           | 354    padding-block: 0;
+             ^^^^^^^^^^^^^^^^ FQ @ 142:4-20                                                              |        ^^^^^^^^^^^^^^^^ FQ @ 354:2-18
+                                                                                                         | 355  }
+    143    }                                                                                             | 
+    144    ::-webkit-calendar-picker-indicator {                                                         | 361  ::-webkit-calendar-picker-indicator {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FR @ 144:2-38                                            |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ FR @ 361:0-36
+    145      line-height: 1;                                                                             | 362    line-height: 1;
+             ^^^^^^^^^^^^^^ FS @ 145:4-18                                                                |        ^^^^^^^^^^^^^^ FS @ 362:2-16
+                                                                                                         | 363  }
+    146    }                                                                                             | 
+    147    :-moz-ui-invalid {                                                                            | 369  :-moz-ui-invalid {
+           ^^^^^^^^^^^^^^^^^ FT @ 147:2-19                                                               |      ^^^^^^^^^^^^^^^^^ FT @ 369:0-17
+    148      box-shadow: none;                                                                           | 370    box-shadow: none;
+             ^^^^^^^^^^^^^^^^ FU @ 148:4-20                                                              |        ^^^^^^^^^^^^^^^^ FU @ 370:2-18
+                                                                                                         | 371  }
+    149    }                                                                                             | 
+    150    button, input:where([type='button'], [type='reset'], [type='submit']), ::file-selector-but... | 377  button,
+           ^ FV @ 150:2                                                                                  |      ^ FV @ 377:0
+    150    button, input:where([type='button'], [type='reset'], [type='submit']), ::file-selector-but... | 378  input:where([type='button'], [type='reset'], [type='submit']),
+           ^ FW @ 150:2                                                                                  |      ^ FW @ 378:0
+    150    button, input:where([type='button'], [type='reset'], [type='submit']), ::file-selector-but... | 379  ::file-selector-button {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^... FX @ 150:2-96 |      ^^^^^^^^^^^^^^^^^^^^^^^ FX @ 379:0-23
+    151      appearance: button;                                                                         | 380    appearance: button;
+             ^^^^^^^^^^^^^^^^^^ FY @ 151:4-22                                                            |        ^^^^^^^^^^^^^^^^^^ FY @ 380:2-20
+                                                                                                         | 381  }
+    152    }                                                                                             | 
+    153    ::-webkit-inner-spin-button, ::-webkit-outer-spin-button {                                    | 387  ::-webkit-inner-spin-button,
+           ^ FZ @ 153:2                                                                                  |      ^ FZ @ 387:0
+    153    ::-webkit-inner-spin-button, ::-webkit-outer-spin-button {                                    | 388  ::-webkit-outer-spin-button {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ GA @ 153:2-59                       |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ GA @ 388:0-28
+    154      height: auto;                                                                               | 389    height: auto;
+             ^^^^^^^^^^^^ GB @ 154:4-16                                                                  |        ^^^^^^^^^^^^ GB @ 389:2-14
+                                                                                                         | 390  }
+    155    }                                                                                             | 
+    156    [hidden]:where(:not([hidden='until-found'])) {                                                | 396  [hidden]:where(:not([hidden='until-found'])) {
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ GC @ 156:2-47                                   |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ GC @ 396:0-45
+    157      display: none !important;                                                                   | 397    display: none !important;
+             ^^^^^^^^^^^^^^^^^^^^^^^^ GD @ 157:4-28                                                      |        ^^^^^^^^^^^^^^^^^^^^^^^^ GD @ 397:2-26
+                                                                                                         | 398  }
+    158    }                                                                                             | 
+    159  }                                                                                               | 
+                                                                                                         |      --- index.css ---
+    160  @layer utilities;                                                                               |   5  @import './utilities.css' layer(utilities);
+         ^^^^^^^^^^^^^^^^ GE @ 160:0-16                                                                  |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ GE @ 5:0-42
+                                                                                                         |      --- input.css ---
+    161  .foo {                                                                                          |   3  .foo {
+         ^^^^^ GF @ 161:0-5                                                                              |      ^^^^^ GF @ 3:0-5
+    162    text-decoration-line: underline;                                                              |   4    @apply underline;
+           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ GG @ 162:2-33                                                 |               ^^^^^^^^^ GG @ 4:9-18
+                                                                                                         |   5  }
+    163  }                                                                                               | 
+    164                                                                                                  | 
+    "
+  `)
+})
+
+test('source maps are generated for utilities', async ({ expect }) => {
+  let {
+    sources,
+    css: output,
+    annotations,
+  } = await run({
+    input: css`
+      @import './utilities.css';
+      @plugin "./plugin.js";
+      @utility custom {
+        color: orange;
+      }
+    `,
+    candidates: ['custom', 'custom-js', 'flex'],
+    options: {
+      loadModule: async (_, base) => ({
+        path: '',
+        base,
+        module: createPlugin(({ addUtilities }) => {
+          addUtilities({ '.custom-js': { color: 'blue' } })
+        }),
+      }),
+    },
+  })
+
+  // All CSS should be mapped back to the original source file
+  expect(sources).toEqual(['utilities.css', 'input.css'])
+  expect(sources.length).toBe(2)
+
+  // The output CSS should include annotations linking back to:
+  expect(annotations).toMatchInlineSnapshot(`
+    "
+        output.css                 |    original
+                                   | 
+                                   |    --- utilities.css ---
+     1  .flex {                    | 1  @tailwind utilities;
+        ^^^^^^ A @ 1:0-6           |    ^^^^^^^^^^^^^^^^^^^ A @ 1:0-19
+     2    display: flex;           | 
+          ^^^^^^^^^^^^^ A @ 2:2-15 | 
+     3  }                          | 
+     4  .custom {                  | 
+        ^^^^^^^^ A @ 4:0-8         | 
+                                   |    --- input.css ---
+     5    color: orange;           | 4    color: orange;
+          ^^^^^^^^^^^^^ B @ 5:2-15 |      ^^^^^^^^^^^^^ B @ 4:2-15
+                                   | 5  }
+     6  }                          | 
+     7  .custom-js {               | 
+        ^^^^^^^^^^^ A @ 7:0-11     | 
+     8    color: blue;             | 
+          ^^^^^^^^^^^ A @ 8:2-13   | 
+     9  }                          | 
+    10                             | 
+    "
+  `)
+
+  expect(output).toMatchInlineSnapshot(`
+    ".flex {
+      display: flex;
+    }
+    .custom {
+      color: orange;
+    }
+    .custom-js {
+      color: blue;
+    }
+    "
+  `)
+})
+
+test('utilities have source maps pointing to the utilities node', async ({ expect }) => {
+  let { sources, annotations } = await run({
+    input: `@tailwind utilities;`,
+    candidates: [
+      //
+      'underline',
+    ],
+  })
+
+  expect(sources).toEqual(['input.css'])
+
+  expect(annotations).toMatchInlineSnapshot(`
+    "
+       output.css                                   |    input.css
+                                                    | 
+    1  .underline {                                 | 1  @tailwind utilities;
+       ^^^^^^^^^^^ A @ 1:0-11                       |    ^^^^^^^^^^^^^^^^^^^ A @ 1:0-19
+    2    text-decoration-line: underline;           | 
+         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ A @ 2:2-33 | 
+    3  }                                            | 
+    4                                               | 
+    "
+  `)
+})
+
+test('@apply generates source maps', async ({ expect }) => {
+  let { sources, annotations } = await run({
+    input: css`
+      .foo {
+        color: blue;
+        @apply text-[#000] hover:text-[#f00];
+        @apply underline;
+        @apply --my-mixin-1 --my-mixin-2();
+        color: red;
+      }
+    `,
+  })
+
+  expect(sources).toEqual(['input.css'])
+
+  expect(annotations).toMatchInlineSnapshot(`
+    "
+        output.css                                       |    input.css
+                                                         | 
+     1  .foo {                                           | 1  .foo {
+        ^^^^^ A @ 1:0-5                                  |    ^^^^^ A @ 1:0-5
+     2    color: blue;                                   | 2    color: blue;
+          ^^^^^^^^^^^ B @ 2:2-13                         |      ^^^^^^^^^^^ B @ 2:2-13
+     3    color: #000;                                   | 3    @apply text-[#000] hover:text-[#f00];
+          ^^^^^^^^^^^ C @ 3:2-13                         |             ^^^^^^^^^^^ C @ 3:9-20
+     4    &:hover {                                      | 3    @apply text-[#000] hover:text-[#f00];
+          ^^^^^^^^ D @ 4:2-10                            |                         ^^^^^^^^^^^^^^^^^ D @ 3:21-38
+     5      @media (hover: hover) {                      | 
+            ^^^^^^^^^^^^^^^^^^^^^^ D @ 5:4-26            | 
+     6        color: #f00;                               | 
+              ^^^^^^^^^^^ D @ 6:6-17                     | 
+     7      }                                            | 
+     8    }                                              | 
+     9    text-decoration-line: underline;               | 4    @apply underline;
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ E @ 9:2-33     |             ^^^^^^^^^ E @ 4:9-18
+    10    @apply --my-mixin-1 --my-mixin-2();            | 5    @apply --my-mixin-1 --my-mixin-2();
+          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ F @ 10:2-36 |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ F @ 5:2-36
+    11    color: red;                                    | 6    color: red;
+          ^^^^^^^^^^ G @ 11:2-12                         |      ^^^^^^^^^^ G @ 6:2-12
+                                                         | 7  }
+    12  }                                                | 
+    13                                                   | 
+    "
+  `)
+})
+
+test('@variant generates source maps', async ({ expect }) => {
+  let { sources, annotations } = await run({
+    input: css`
+      .foo {
+        color: red;
+
+        @variant data-a, data-b:data-c {
+          color: green;
+
+          @variant data-d, data-e:data-f {
+            color: blue;
+          }
+        }
+      }
+    `,
+  })
+
+  expect(sources).toEqual(['input.css'])
+
+  expect(annotations).toMatchInlineSnapshot(`
+    "
+        output.css                         |     input.css
+                                           | 
+     1  .foo {                             |  1  .foo {
+        ^^^^^ A @ 1:0-5                    |     ^^^^^ A @ 1:0-5
+     2    color: red;                      |  2    color: red;
+          ^^^^^^^^^^ B @ 2:2-12            |       ^^^^^^^^^^ B @ 2:2-12
+     3    &[data-a] {                      | 
+                                           |  4    @variant data-a, data-b:data-c {
+     4      color: green;                  |  5      color: green;
+            ^^^^^^^^^^^^ C @ 4:4-16        |         ^^^^^^^^^^^^ C @ 5:4-16
+     5      &[data-d] {                    | 
+                                           |  7      @variant data-d, data-e:data-f {
+     6        color: blue;                 |  8        color: blue;
+              ^^^^^^^^^^^ D @ 6:6-17       |           ^^^^^^^^^^^ D @ 8:6-17
+                                           |  9      }
+                                           | 10    }
+                                           | 11  }
+     7      }                              | 
+     8      &[data-e] {                    | 
+     9        &[data-f] {                  | 
+    10          color: blue;               | 
+                ^^^^^^^^^^^ D @ 10:8-19    | 
+    11        }                            | 
+    12      }                              | 
+    13    }                                | 
+    14    &[data-b] {                      | 
+    15      &[data-c] {                    | 
+    16        color: green;                | 
+              ^^^^^^^^^^^^ C @ 16:6-18     | 
+    17        &[data-d] {                  | 
+    18          color: blue;               | 
+                ^^^^^^^^^^^ D @ 18:8-19    | 
+    19        }                            | 
+    20        &[data-e] {                  | 
+    21          &[data-f] {                | 
+    22            color: blue;             | 
+                  ^^^^^^^^^^^ D @ 22:10-21 | 
+    23          }                          | 
+    24        }                            | 
+    25      }                              | 
+    26    }                                | 
+    27  }                                  | 
+    28                                     | 
+    "
+  `)
+})
+
+test('license comments preserve source locations', async ({ expect }) => {
+  let { sources, annotations } = await run({
+    input: `/*! some comment */`,
+  })
+
+  expect(sources).toEqual(['input.css'])
+
+  expect(annotations).toMatchInlineSnapshot(`
+    "
+       output.css                     |    input.css
+                                      | 
+    1  /*! some comment */            | 1  /*! some comment */
+       ^^^^^^^^^^^^^^^^^^^ A @ 1:0-19 |    ^^^^^^^^^^^^^^^^^^^ A @ 1:0-19
+    "
+  `)
+})
+
+test('license comments with new lines preserve source locations', async ({ expect }) => {
+  let { sources, annotations } = await run({
+    input: `/*! some \n comment */`,
+  })
+
+  expect(sources).toEqual(['input.css'])
+
+  expect(annotations).toMatchInlineSnapshot(`
+    "
+       output.css                |    input.css
+                                 | 
+    1  /*! some                  | 1  /*! some 
+       ^ A @ 1:0                 |    ^ A @ 1:0
+    1  /*! some                  | 2   comment */
+       ^^^^^^^^^ B @ 1:0-2:0     |    ^ B @ 2:0
+    2   comment */               | 2   comment */
+                  ^ C @ 2:11-3:0 |               ^ C @ 2:11
+    "
+  `)
+})
+
+test('Source locations for `addBase` point to the `@plugin` that generated them', async ({
+  expect,
+}) => {
+  let { sources, annotations } = await run({
+    input: css`
+      @plugin "./plugin.js";
+      @config "./config.js";
+    `,
+    options: {
+      async loadModule(id, base) {
+        if (id === './plugin.js') {
+          return {
+            module: createPlugin(({ addBase }) => {
+              addBase({ body: { color: 'red' } })
+            }),
+            base,
+            path: '',
+          }
+        }
+
+        if (id === './config.js') {
+          return {
+            module: {
+              plugins: [
+                createPlugin(({ addBase }) => {
+                  addBase({ body: { color: 'green' } })
+                }),
+              ],
+            },
+            base,
+            path: '',
+          }
+        }
+
+        throw new Error(`unknown module ${id}`)
+      },
+    },
+  })
+
+  expect(sources).toEqual(['input.css'])
+
+  expect(annotations).toMatchInlineSnapshot(`
+    "
+       output.css                  |    input.css
+                                   | 
+    1  @layer base {               | 1  @plugin "./plugin.js";
+       ^^^^^^^^^^^^ A @ 1:0-12     |    ^^^^^^^^^^^^^^^^^^^^^ A @ 1:0-21
+    2    body {                    | 
+         ^^^^^ A @ 2:2-7           | 
+    3      color: red;             | 
+           ^^^^^^^^^^ A @ 3:4-14   | 
+    4      color: green;           | 2  @config "./config.js";
+           ^^^^^^^^^^^^ B @ 4:4-16 |    ^^^^^^^^^^^^^^^^^^^^^ B @ 2:0-21
+    5    }                         | 
+    6  }                           | 
+    7                              | 
+    "
+  `)
+})
diff --git a/packages/tailwindcss/src/source-maps/source-map.ts b/packages/tailwindcss/src/source-maps/source-map.ts
new file mode 100644
index 000000000..31f8a094f
--- /dev/null
+++ b/packages/tailwindcss/src/source-maps/source-map.ts
@@ -0,0 +1,198 @@
+import { type AstNode } from '../ast'
+import { DefaultMap } from '../utils/default-map'
+import { walk } from '../walk'
+import { createLineTable, type LineTable, type Position } from './line-table'
+import type { Source } from './source'
+
+// https://tc39.es/ecma426/#sec-original-position-record-type
+export interface OriginalPosition extends Position {
+  source: DecodedSource
+}
+
+/**
+ * A "decoded" sourcemap
+ *
+ * @see https://tc39.es/ecma426/#decoded-source-map-record
+ */
+export interface DecodedSourceMap {
+  file: string | null
+  sources: DecodedSource[]
+  mappings: DecodedMapping[]
+}
+
+/**
+ * A "decoded" source
+ *
+ * @see https://tc39.es/ecma426/#decoded-source-record
+ */
+export interface DecodedSource {
+  url: string | null
+  content: string | null
+  ignore: boolean
+}
+
+/**
+ * A "decoded" mapping
+ *
+ * @see https://tc39.es/ecma426/#decoded-mapping-record
+ */
+export interface DecodedMapping {
+  // https://tc39.es/ecma426/#sec-original-position-record-type
+  originalPosition: OriginalPosition | null
+
+  // https://tc39.es/ecma426/#sec-position-record-type
+  generatedPosition: Position
+
+  name: string | null
+}
+
+/**
+ * Build a source map from the given AST.
+ *
+ * Our AST is build from flat CSS strings but there are many because we handle
+ * `@import`. This means that different nodes can have a different source.
+ *
+ * Instead of taking an input source map, we take the input CSS string we were
+ * originally given, as well as the source text for any imported files, and
+ * use that to generate a source map.
+ *
+ * We then require the use of other tools that can translate one or more
+ * "input" source maps into a final output source map. For example,
+ * `@jridgewell/remapping` can be used to handle this.
+ *
+ * This also ensures that tools that expect "local" source maps are able to
+ * consume the source map we generate.
+ *
+ * The source map type we generate may be a bit different from "raw" source maps
+ * that the `source-map-js` package uses. It's a "decoded" source map that is
+ * represented by an object graph. It's identical to "decoded" source map from
+ * the ECMA-426 spec for source maps.
+ *
+ * Note that the spec itself is still evolving which means our implementation
+ * may need to evolve to match it.
+ *
+ * This can easily be converted to a "raw" source map by any tool that needs to.
+ **/
+export function createSourceMap({ ast }: { ast: AstNode[] }) {
+  // Compute line tables for both the original and generated source lazily so we
+  // don't have to do it during parsing or printing.
+  let lineTables = new DefaultMap<Source, LineTable>((src) => createLineTable(src.code))
+  let sourceTable = new DefaultMap<Source, DecodedSource>((src) => ({
+    url: src.file,
+    content: src.code,
+    ignore: false,
+  }))
+
+  // Convert each mapping to a set of positions
+  let map: DecodedSourceMap = {
+    file: null,
+    sources: [],
+    mappings: [],
+  }
+
+  // Get all the indexes from the mappings
+  walk(ast, (node) => {
+    if (!node.src || !node.dst) return
+
+    let originalSource = sourceTable.get(node.src[0])
+    if (!originalSource.content) return
+
+    let originalTable = lineTables.get(node.src[0])
+    let generatedTable = lineTables.get(node.dst[0])
+
+    let originalSlice = originalSource.content.slice(node.src[1], node.src[2])
+
+    // Source maps only encode single locations — not multi-line ranges
+    // So to properly emulate this we'll scan the original text for multiple
+    // lines and create mappings for each of those lines that point to the
+    // destination node (whether it spans multiple lines or not)
+    //
+    // This is not 100% accurate if both the source and destination preserve
+    // their newlines but this only happens in the case of custom properties
+    //
+    // This is _good enough_
+    let offset = 0
+    for (let line of originalSlice.split('\n')) {
+      if (line.trim() !== '') {
+        let originalStart = originalTable.find(node.src[1] + offset)
+        let generatedStart = generatedTable.find(node.dst[1])
+
+        map.mappings.push({
+          name: null,
+          originalPosition: {
+            source: originalSource,
+            ...originalStart,
+          },
+          generatedPosition: generatedStart,
+        })
+      }
+
+      offset += line.length
+      offset += 1
+    }
+
+    let originalEnd = originalTable.find(node.src[2])
+    let generatedEnd = generatedTable.find(node.dst[2])
+
+    map.mappings.push({
+      name: null,
+      originalPosition: {
+        source: originalSource,
+        ...originalEnd,
+      },
+      generatedPosition: generatedEnd,
+    })
+  })
+
+  // Populate
+  for (let source of lineTables.keys()) {
+    map.sources.push(sourceTable.get(source))
+  }
+
+  // Sort the mappings in ascending order
+  map.mappings.sort((a, b) => {
+    return (
+      a.generatedPosition.line - b.generatedPosition.line ||
+      a.generatedPosition.column - b.generatedPosition.column ||
+      (a.originalPosition?.line ?? 0) - (b.originalPosition?.line ?? 0) ||
+      (a.originalPosition?.column ?? 0) - (b.originalPosition?.column ?? 0)
+    )
+  })
+
+  return map
+}
+
+export function createTranslationMap({
+  original,
+  generated,
+}: {
+  original: string
+  generated: string
+}) {
+  // Compute line tables for both the original and generated source lazily so we
+  // don't have to do it during parsing or printing.
+  let originalTable = createLineTable(original)
+  let generatedTable = createLineTable(generated)
+
+  type Translation = [
+    originalStart: Position,
+    originalEnd: Position,
+    generatedStart: Position | null,
+    generatedEnd: Position | null,
+  ]
+
+  return (node: AstNode) => {
+    if (!node.src) return []
+
+    let translations: Translation[] = []
+
+    translations.push([
+      originalTable.find(node.src[1]),
+      originalTable.find(node.src[2]),
+      node.dst ? generatedTable.find(node.dst[1]) : null,
+      node.dst ? generatedTable.find(node.dst[2]) : null,
+    ])
+
+    return translations
+  }
+}
diff --git a/packages/tailwindcss/src/source-maps/source.ts b/packages/tailwindcss/src/source-maps/source.ts
new file mode 100644
index 000000000..c3a4f8988
--- /dev/null
+++ b/packages/tailwindcss/src/source-maps/source.ts
@@ -0,0 +1,27 @@
+/**
+ * The source code for one or more nodes in the AST
+ *
+ * This generally corresponds to a stylesheet
+ */
+export interface Source {
+  /**
+   * The path to the file that contains the referenced source code
+   *
+   * If this references the *output* source code, this is `null`.
+   */
+  file: string | null
+
+  /**
+   * The referenced source code
+   */
+  code: string
+}
+
+/**
+ * The file and offsets within it that this node covers
+ *
+ * This can represent either:
+ * - A location in the original CSS which caused this node to be created
+ * - A location in the output CSS where this node resides
+ */
+export type SourceLocation = [source: Source, start: number, end: number]
diff --git a/packages/tailwindcss/src/source-maps/translation-map.test.ts b/packages/tailwindcss/src/source-maps/translation-map.test.ts
new file mode 100644
index 000000000..0c367ebbd
--- /dev/null
+++ b/packages/tailwindcss/src/source-maps/translation-map.test.ts
@@ -0,0 +1,371 @@
+import dedent from 'dedent'
+import { assert, expect, test } from 'vitest'
+import { toCss, type AstNode } from '../ast'
+import * as CSS from '../css-parser'
+import { createTranslationMap } from './source-map'
+import { visualizeSourceMapRanges, type SourceMapVisualizationRange } from './visualize-source-map'
+
+async function analyze(input: string) {
+  let ast = CSS.parse(input, { from: 'input.css' })
+  let css = toCss(ast, true)
+  let translate = createTranslationMap({
+    original: input,
+    generated: css,
+  })
+
+  function format(node: AstNode) {
+    let ranges: SourceMapVisualizationRange[] = []
+
+    for (let [oStart, oEnd, gStart, gEnd] of translate(node)) {
+      ranges.push({
+        original: {
+          source: 'input.css',
+          start: [oStart.line, oStart.column],
+          end: [oEnd.line, oEnd.column],
+        },
+        generated:
+          gStart && gEnd
+            ? {
+                start: [gStart.line, gStart.column],
+                end: [gEnd.line, gEnd.column],
+              }
+            : null,
+      })
+    }
+
+    return visualizeSourceMapRanges({ 'input.css': input }, css, ranges)
+  }
+
+  return { ast, css, format }
+}
+
+test('comment, single line', async () => {
+  let { ast, css, format } = await analyze(`/*! foo */`)
+
+  assert(ast[0].kind === 'comment')
+  expect(format(ast[0])).toMatchInlineSnapshot(`
+    "
+       output.css            |    input.css
+                             | 
+    1  /*! foo */            | 1  /*! foo */
+       ^^^^^^^^^^ A @ 1:0-10 |    ^^^^^^^^^^ A @ 1:0-10
+    2                        | 
+    "
+  `)
+
+  expect(css).toMatchInlineSnapshot(`
+    "/*! foo */
+    "
+  `)
+})
+
+test('comment, multi line', async () => {
+  let { ast, css, format } = await analyze(`/*! foo \n bar */`)
+
+  assert(ast[0].kind === 'comment')
+  expect(format(ast[0])).toMatchInlineSnapshot(`
+    "
+       output.css           |    input.css
+                            | 
+    1  /*! foo              | 1  /*! foo 
+       ^^^^^^^^ A @ 1:0-2:7 |    ^^^^^^^^ A @ 1:0-2:7
+    2   bar */              | 2   bar */
+       ^^^^^^^ A            |    ^^^^^^^ A
+    3                       | 
+    "
+  `)
+
+  expect(css).toMatchInlineSnapshot(`
+    "/*! foo 
+     bar */
+    "
+  `)
+})
+
+test('declaration, normal property, single line', async () => {
+  let { ast, css, format } = await analyze(`.foo { color: red; }`)
+
+  assert(ast[0].kind === 'rule')
+  assert(ast[0].nodes[0].kind === 'declaration')
+  expect(format(ast[0].nodes[0])).toMatchInlineSnapshot(`
+    "
+       output.css              |    input.css
+                               | 
+    1  .foo {                  | 
+    2    color: red;           | 1  .foo { color: red; }
+         ^^^^^^^^^^ A @ 2:2-12 |           ^^^^^^^^^^ A @ 1:7-17
+    3  }                       | 
+    4                          | 
+    "
+  `)
+
+  expect(css).toMatchInlineSnapshot(`
+    ".foo {
+      color: red;
+    }
+    "
+  `)
+})
+
+test('declaration, normal property, multi line', async () => {
+  // Works, no changes needed
+  let { ast, css, format } = await analyze(dedent`
+    .foo {
+      grid-template-areas:
+        "a b c"
+        "d e f"
+        "g h i";
+    }
+  `)
+
+  assert(ast[0].kind === 'rule')
+  assert(ast[0].nodes[0].kind === 'declaration')
+  expect(format(ast[0].nodes[0])).toMatchInlineSnapshot(`
+    "
+       output.css                                                |    input.css
+                                                                 | 
+    1  .foo {                                                    | 
+    2    grid-template-areas: "a b c" "d e f" "g h i";           | 2    grid-template-areas:
+         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ A @ 2:2-46 |      ^^^^^^^^^^^^^^^^^^^^ A @ 2:2-5:11
+                                                                 | 3      "a b c"
+                                                                 |    ^^^^^^^^^^^ A
+                                                                 | 4      "d e f"
+                                                                 |    ^^^^^^^^^^^ A
+                                                                 | 5      "g h i";
+                                                                 |    ^^^^^^^^^^^ A
+                                                                 | 6  }
+    3  }                                                         | 
+    4                                                            | 
+    "
+  `)
+
+  expect(css).toMatchInlineSnapshot(`
+    ".foo {
+      grid-template-areas: "a b c" "d e f" "g h i";
+    }
+    "
+  `)
+})
+
+test('declaration, custom property, single line', async () => {
+  let { ast, css, format } = await analyze(`.foo { --foo: bar; }`)
+
+  assert(ast[0].kind === 'rule')
+  assert(ast[0].nodes[0].kind === 'declaration')
+  expect(format(ast[0].nodes[0])).toMatchInlineSnapshot(`
+    "
+       output.css              |    input.css
+                               | 
+    1  .foo {                  | 
+    2    --foo: bar;           | 1  .foo { --foo: bar; }
+         ^^^^^^^^^^ A @ 2:2-12 |           ^^^^^^^^^^ A @ 1:7-17
+    3  }                       | 
+    4                          | 
+    "
+  `)
+
+  expect(css).toMatchInlineSnapshot(`
+    ".foo {
+      --foo: bar;
+    }
+    "
+  `)
+})
+
+test('declaration, custom property, multi line', async () => {
+  let { ast, css, format } = await analyze(dedent`
+    .foo {
+      --foo: bar\nbaz;
+    }
+  `)
+
+  assert(ast[0].kind === 'rule')
+  assert(ast[0].nodes[0].kind === 'declaration')
+  expect(format(ast[0].nodes[0])).toMatchInlineSnapshot(`
+    "
+       output.css               |    input.css
+                                | 
+    1  .foo {                   | 
+    2    --foo: bar             | 2    --foo: bar
+         ^^^^^^^^^^ A @ 2:2-3:3 |      ^^^^^^^^^^ A @ 2:2-3:3
+    3  baz;                     | 3  baz;
+       ^^^ A                    |    ^^^ A
+                                | 4  }
+    4  }                        | 
+    5                           | 
+    "
+  `)
+
+  expect(css).toMatchInlineSnapshot(`
+    ".foo {
+      --foo: bar
+    baz;
+    }
+    "
+  `)
+})
+
+test('at rules, bodyless, single line', async () => {
+  // This intentionally has extra spaces
+  let { ast, css, format } = await analyze(`@layer foo,     bar;`)
+
+  assert(ast[0].kind === 'at-rule')
+  expect(format(ast[0])).toMatchInlineSnapshot(`
+    "
+       output.css                 |    input.css
+                                  | 
+    1  @layer foo, bar;           | 1  @layer foo,     bar;
+       ^^^^^^^^^^^^^^^ A @ 1:0-15 |    ^^^^^^^^^^^^^^^^^^^ A @ 1:0-19
+    2                             | 
+    "
+  `)
+
+  expect(css).toMatchInlineSnapshot(`
+    "@layer foo, bar;
+    "
+  `)
+})
+
+test('at rules, bodyless, multi line', async () => {
+  let { ast, css, format } = await analyze(dedent`
+    @layer
+      foo,
+      bar
+    ;
+  `)
+
+  assert(ast[0].kind === 'at-rule')
+  expect(format(ast[0])).toMatchInlineSnapshot(`
+    "
+       output.css                 |    input.css
+                                  | 
+    1  @layer foo, bar;           | 1  @layer
+       ^^^^^^^^^^^^^^^ A @ 1:0-15 |    ^^^^^^ A @ 1:0-4:0
+                                  | 2    foo,
+                                  |    ^^^^^^ A
+                                  | 3    bar
+                                  |    ^^^^^ A
+    2                             | 
+    "
+  `)
+
+  expect(css).toMatchInlineSnapshot(`
+    "@layer foo, bar;
+    "
+  `)
+})
+
+test('at rules, body, single line', async () => {
+  let { ast, css, format } = await analyze(`@layer foo { color: red; }`)
+
+  assert(ast[0].kind === 'at-rule')
+  expect(format(ast[0])).toMatchInlineSnapshot(`
+    "
+       output.css             |    input.css
+                              | 
+    1  @layer foo {           | 1  @layer foo { color: red; }
+       ^^^^^^^^^^^ A @ 1:0-11 |    ^^^^^^^^^^^ A @ 1:0-11
+    2    color: red;          | 
+    3  }                      | 
+    4                         | 
+    "
+  `)
+
+  expect(css).toMatchInlineSnapshot(`
+    "@layer foo {
+      color: red;
+    }
+    "
+  `)
+})
+
+test('at rules, body, multi line', async () => {
+  let { ast, css, format } = await analyze(dedent`
+    @layer
+      foo
+    {
+      color: baz;
+    }
+  `)
+
+  assert(ast[0].kind === 'at-rule')
+  expect(format(ast[0])).toMatchInlineSnapshot(`
+    "
+       output.css             |    input.css
+                              | 
+    1  @layer foo {           | 1  @layer
+       ^^^^^^^^^^^ A @ 1:0-11 |    ^^^^^^ A @ 1:0-3:0
+                              | 2    foo
+                              |    ^^^^^ A
+    2    color: baz;          | 
+    3  }                      | 
+    4                         | 
+    "
+  `)
+
+  expect(css).toMatchInlineSnapshot(`
+    "@layer foo {
+      color: baz;
+    }
+    "
+  `)
+})
+
+test('style rules, body, single line', async () => {
+  let { ast, css, format } = await analyze(`.foo:is(.bar) { color: red; }`)
+
+  assert(ast[0].kind === 'rule')
+  expect(format(ast[0])).toMatchInlineSnapshot(`
+    "
+       output.css                |    input.css
+                                 | 
+    1  .foo:is(.bar) {           | 1  .foo:is(.bar) { color: red; }
+       ^^^^^^^^^^^^^^ A @ 1:0-14 |    ^^^^^^^^^^^^^^ A @ 1:0-14
+    2    color: red;             | 
+    3  }                         | 
+    4                            | 
+    "
+  `)
+
+  expect(css).toMatchInlineSnapshot(`
+    ".foo:is(.bar) {
+      color: red;
+    }
+    "
+  `)
+})
+
+test('style rules, body, multi line', async () => {
+  // Works, no changes needed
+  let { ast, css, format } = await analyze(dedent`
+    .foo:is(
+      .bar
+    ) {
+      color: red;
+    }
+  `)
+
+  assert(ast[0].kind === 'rule')
+  expect(format(ast[0])).toMatchInlineSnapshot(`
+    "
+       output.css                  |    input.css
+                                   | 
+    1  .foo:is( .bar ) {           | 1  .foo:is(
+       ^^^^^^^^^^^^^^^^ A @ 1:0-16 |    ^^^^^^^^ A @ 1:0-3:2
+                                   | 2    .bar
+                                   |    ^^^^^^ A
+                                   | 3  ) {
+                                   |    ^^ A
+    2    color: red;               | 
+    3  }                           | 
+    4                              | 
+    "
+  `)
+
+  expect(css).toMatchInlineSnapshot(`
+    ".foo:is( .bar ) {
+      color: red;
+    }
+    "
+  `)
+})
diff --git a/packages/tailwindcss/src/source-maps/visualize-source-map.test.ts b/packages/tailwindcss/src/source-maps/visualize-source-map.test.ts
new file mode 100644
index 000000000..f69bfac31
--- /dev/null
+++ b/packages/tailwindcss/src/source-maps/visualize-source-map.test.ts
@@ -0,0 +1,318 @@
+import dedent from 'dedent'
+import { SourceMapGenerator, type RawSourceMap } from 'source-map-js'
+import { expect, test } from 'vitest'
+import { visualizeSourceMap, visualizeSourceMapRanges } from './visualize-source-map'
+
+const css = dedent
+
+function sourceMap({
+  sources,
+  mappings,
+}: {
+  sources: Record<string, string>
+  mappings: {
+    source: string
+    original: [line: number, column: number]
+    generated: [line: number, column: number]
+  }[]
+}) {
+  let generator = new SourceMapGenerator()
+
+  for (let mapping of mappings) {
+    generator.addMapping({
+      source: mapping.source,
+      original: {
+        line: mapping.original[0],
+        column: mapping.original[1],
+      },
+      generated: {
+        line: mapping.generated[0],
+        column: mapping.generated[1],
+      },
+    })
+  }
+
+  for (let [source, content] of Object.entries(sources)) {
+    generator.setSourceContent(source, content)
+  }
+
+  return JSON.parse(generator.toString()) as RawSourceMap
+}
+
+test('visualizes single-line ranges', () => {
+  expect(
+    visualizeSourceMapRanges(
+      {
+        // prettier-ignore
+        'input.css': css`.foo { color: red; }`,
+      },
+      css`
+        .foo {
+          color: red;
+        }
+      `,
+      [
+        {
+          original: {
+            source: 'input.css',
+            start: [1, 7],
+            end: [1, 17],
+          },
+          generated: {
+            start: [2, 2],
+            end: [2, 12],
+          },
+        },
+      ],
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+       output.css              |    input.css
+                               | 
+    1  .foo {                  | 
+    2    color: red;           | 1  .foo { color: red; }
+         ^^^^^^^^^^ A @ 2:2-12 |           ^^^^^^^^^^ A @ 1:7-17
+    3  }                       | 
+    "
+  `)
+})
+
+test('visualizes multi-line ranges', () => {
+  expect(
+    visualizeSourceMapRanges(
+      {
+        'input.css': css`
+          /*! foo
+           bar */
+        `,
+      },
+      css`
+        /*! foo
+         bar */
+      `,
+      [
+        {
+          original: {
+            source: 'input.css',
+            start: [1, 0],
+            end: [2, 7],
+          },
+          generated: {
+            start: [1, 0],
+            end: [2, 7],
+          },
+        },
+      ],
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+       output.css          |    input.css
+                           | 
+    1  /*! foo             | 1  /*! foo
+       ^^^^^^^ A @ 1:0-2:7 |    ^^^^^^^ A @ 1:0-2:7
+    2   bar */             | 2   bar */
+       ^^^^^^^ A           |    ^^^^^^^ A
+    "
+  `)
+})
+
+test('visualizes multiple sources', () => {
+  expect(
+    visualizeSourceMapRanges(
+      {
+        'utilities.css': css`
+          @tailwind utilities;
+        `,
+        'input.css': css`
+          @utility custom {
+            color: red;
+          }
+        `,
+      },
+      css`
+        .flex {
+          display: flex;
+        }
+        .custom {
+          color: red;
+        }
+      `,
+      [
+        {
+          original: {
+            source: 'utilities.css',
+            start: [1, 0],
+            end: [1, 19],
+          },
+          generated: {
+            start: [1, 0],
+            end: [1, 6],
+          },
+        },
+        {
+          original: {
+            source: 'utilities.css',
+            start: [1, 0],
+            end: [1, 19],
+          },
+          generated: {
+            start: [2, 2],
+            end: [2, 15],
+          },
+        },
+        {
+          original: {
+            source: 'input.css',
+            start: [2, 2],
+            end: [2, 12],
+          },
+          generated: {
+            start: [5, 2],
+            end: [5, 12],
+          },
+        },
+      ],
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+       output.css                 |    original
+                                  | 
+                                  |    --- utilities.css ---
+    1  .flex {                    | 1  @tailwind utilities;
+       ^^^^^^ A @ 1:0-6           |    ^^^^^^^^^^^^^^^^^^^ A @ 1:0-19
+    2    display: flex;           | 
+         ^^^^^^^^^^^^^ A @ 2:2-15 | 
+    3  }                          | 
+    4  .custom {                  | 
+                                  |    --- input.css ---
+    5    color: red;              | 2    color: red;
+         ^^^^^^^^^^ B @ 5:2-12    |      ^^^^^^^^^^ B @ 2:2-12
+                                  | 3  }
+    6  }                          | 
+    "
+  `)
+})
+
+test('visualizes unmapped source ranges', () => {
+  expect(
+    visualizeSourceMapRanges(
+      {
+        // prettier-ignore
+        'input.css': css`.foo { color: red; }`,
+      },
+      css`
+        .foo {
+          color: red;
+        }
+      `,
+      [
+        {
+          original: {
+            source: 'input.css',
+            start: [1, 7],
+            end: [1, 17],
+          },
+          generated: null,
+        },
+      ],
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+       output.css |    input.css
+                  | 
+       unmapped A | 1  .foo { color: red; }
+                  |           ^^^^^^^^^^ A @ 1:7-17
+    1  .foo {     | 
+    2    color... | 
+    3  }          | 
+    "
+  `)
+})
+
+test('visualizes source-map points as generated segments', () => {
+  let generated = css`
+    /*! foo
+     bar */
+  `
+
+  expect(
+    visualizeSourceMap(
+      sourceMap({
+        sources: {
+          'input.css': css`
+            /*! foo
+             bar */
+          `,
+        },
+        mappings: [
+          { source: 'input.css', original: [1, 0], generated: [1, 0] },
+          { source: 'input.css', original: [2, 0], generated: [2, 0] },
+          { source: 'input.css', original: [2, 7], generated: [2, 7] },
+        ],
+      }),
+      generated,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+       output.css          |    input.css
+                           | 
+    1  /*! foo             | 1  /*! foo
+       ^^^^^^^ A @ 1:0-2:0 |    ^^^^^^^ A @ 1:0-2:0
+    2   bar */             | 2   bar */
+       ^^^^^^^ B @ 2:0-7   |    ^^^^^^^ B @ 2:0-7
+    "
+  `)
+})
+
+test('visualizes final source-map point through end of line', () => {
+  expect(
+    visualizeSourceMap(
+      sourceMap({
+        sources: {
+          'input.css': css`aaaa`,
+        },
+        mappings: [{ source: 'input.css', original: [1, 0], generated: [1, 0] }],
+      }),
+      css`aaaa`,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+       output.css       |    input.css
+                        | 
+    1  aaaa             | 1  aaaa
+       ^^^^ A @ 1:0-2:0 |    ^ A @ 1:0
+    "
+  `)
+})
+
+test('visualizes duplicate source-map points without hiding them', () => {
+  expect(
+    visualizeSourceMap(
+      sourceMap({
+        sources: {
+          'input.css': css`
+            aaaa
+            bbbb
+          `,
+        },
+        mappings: [
+          { source: 'input.css', original: [1, 0], generated: [1, 0] },
+          { source: 'input.css', original: [2, 0], generated: [1, 0] },
+          { source: 'input.css', original: [2, 4], generated: [1, 4] },
+        ],
+      }),
+      css`
+        bbbb
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+       output.css     |    input.css
+                      | 
+    1  bbbb           | 1  aaaa
+       ^ A @ 1:0      |    ^ A @ 1:0
+    1  bbbb           | 2  bbbb
+       ^^^^ B @ 1:0-4 |    ^^^^ B @ 2:0-4
+    "
+  `)
+})
diff --git a/packages/tailwindcss/src/source-maps/visualize-source-map.ts b/packages/tailwindcss/src/source-maps/visualize-source-map.ts
new file mode 100644
index 000000000..d0da423be
--- /dev/null
+++ b/packages/tailwindcss/src/source-maps/visualize-source-map.ts
@@ -0,0 +1,538 @@
+import { SourceMapConsumer, type RawSourceMap } from 'source-map-js'
+
+import { DefaultMap } from '../utils/default-map'
+
+const COLUMN_WIDTH = 100
+const CONTEXT_LINES = 3
+
+type Range = { start: [number, number]; end: [number, number] }
+
+interface Annotation {
+  original: Range
+  generated: Range | null
+  source: string
+}
+
+interface MappedAnnotation extends Annotation {
+  generated: Range
+}
+
+interface SourceMapPoint {
+  original: [number, number]
+  generated: [number, number]
+  source: string
+}
+
+interface SourceVisualization {
+  before: string[]
+  line: string
+  marker: string
+  after: string[]
+}
+
+export interface SourceMapVisualizationRange {
+  original: Range & { source: string }
+  generated: Range | null
+}
+
+/**
+ * Render source map mappings as a side-by-side view of generated and original code.
+ *
+ * For raw source maps this renders the generated segments implied by mapping points,
+ * so duplicate points and unmapped generated lines are visible in snapshots.
+ */
+export function visualizeSourceMap(map: RawSourceMap, css: string) {
+  let smc = new SourceMapConsumer(map)
+  let sourceContents = buildSourceContents(map.sources, map.sourcesContent ?? [])
+  let points: SourceMapPoint[] = []
+
+  smc.eachMapping((mapping) => {
+    if (
+      mapping.source === null ||
+      mapping.originalLine === null ||
+      mapping.originalColumn === null
+    ) {
+      return
+    }
+
+    points.push({
+      original: [mapping.originalLine, mapping.originalColumn],
+      generated: [mapping.generatedLine, mapping.generatedColumn],
+      source: mapping.source,
+    })
+  })
+
+  return renderVisualization(sourceContents, buildAnnotationsFromSourceMapPoints(points), css)
+}
+
+export function visualizeSourceMapRanges(
+  sources: Record<string, string>,
+  generated: string,
+  ranges: SourceMapVisualizationRange[],
+) {
+  let sourceContents = buildSourceContents(Object.keys(sources), Object.values(sources))
+  let annotations: Annotation[] = []
+
+  for (let range of ranges) {
+    annotations.push({
+      generated: range.generated,
+      original: range.original,
+      source: range.original.source,
+    })
+  }
+
+  return renderVisualization(sourceContents, annotations, generated)
+}
+
+function buildSourceContents(sources: string[], contents: (string | null)[]) {
+  let result = new Map<string, string[]>()
+
+  for (let i = 0; i < sources.length; i++) {
+    let content = contents[i]
+
+    if (content === undefined || content === null) continue
+
+    result.set(sources[i], content.split('\n'))
+  }
+
+  return result
+}
+
+function buildAnnotationsFromSourceMapPoints(points: SourceMapPoint[]) {
+  let annotations: Annotation[] = []
+  let current: MappedAnnotation | null = null
+
+  function finish(next: SourceMapPoint | null) {
+    if (current === null) return
+
+    if (samePosition(current.generated.start, current.generated.end)) {
+      if (next === null) {
+        current.generated.end = [current.generated.start[0] + 1, 0]
+      } else if (next.generated[0] > current.generated.start[0]) {
+        current.generated.end = [current.generated.start[0] + 1, 0]
+
+        if (
+          next.source === current.source &&
+          next.generated[0] === current.generated.start[0] + 1 &&
+          next.generated[1] === 0 &&
+          next.original[0] === current.original.start[0] + 1 &&
+          next.original[1] === 0
+        ) {
+          current.original.end = next.original
+        }
+      }
+    }
+
+    annotations.push(current)
+    current = null
+  }
+
+  for (let point of points) {
+    if (
+      current !== null &&
+      current.source === point.source &&
+      current.generated.start[0] === point.generated[0] &&
+      point.generated[1] > current.generated.end[1] &&
+      comparePosition(current.original.start, point.original) <= 0
+    ) {
+      current.generated.end = point.generated
+      current.original.end = point.original
+      continue
+    }
+
+    finish(point)
+
+    current = {
+      original: {
+        start: point.original,
+        end: point.original,
+      },
+      generated: {
+        start: point.generated,
+        end: point.generated,
+      },
+      source: point.source,
+    }
+  }
+
+  finish(null)
+
+  return annotations
+}
+
+function renderVisualization(
+  sourceContents: Map<string, string[]>,
+  annotationsList: Annotation[],
+  generated: string,
+) {
+  let generatedLines = generated.split('\n')
+  let nextLabelIdx = 0
+  let labelsBySource = new DefaultMap<string, string>(() => annotationLabel(nextLabelIdx++))
+  let labels = annotationsList.map((annotation) => {
+    return labelsBySource.get(sourceKey(annotation.source, annotation.original))
+  })
+  let generatedLineWidth = String(generatedLines.length).length
+  let sourceLineWidth = Math.max(
+    1,
+    ...Array.from(sourceContents.values(), (lines) => String(lines.length).length),
+  )
+  let leftWidth = Math.min(
+    100,
+    Math.max(
+      withLineNumber(generatedLineWidth, 'output.css').length,
+      ...annotationsList.map((annotation, idx) => {
+        let label = labels[idx]
+
+        if (annotation.generated === null) {
+          return withoutLineNumber(generatedLineWidth, `unmapped ${label}`).length
+        }
+
+        let line = withLineNumber(
+          generatedLineWidth,
+          generatedLines[annotation.generated.start[0] - 1] ?? '',
+          annotation.generated.start[0],
+        )
+        let marker = withoutLineNumber(
+          generatedLineWidth,
+          visualizeRange(
+            annotation.generated,
+            label,
+            generatedLines[annotation.generated.start[0] - 1] ?? '',
+          ),
+        )
+        let after = visualizeGeneratedRangeContinuation(
+          generatedLines,
+          generatedLineWidth,
+          annotation.generated,
+          label,
+        )
+
+        return Math.max(line.length, marker.length, ...after.map((line) => line.length))
+      }),
+    ),
+  )
+  let sources = new Set(annotationsList.map((annotation) => annotation.source))
+  let sourceHeader = sources.size === 1 ? (annotationsList[0]?.source ?? 'original') : 'original'
+  let result: string[] = []
+
+  function add(left: string, right: string) {
+    result.push(sideBySide(left, right, leftWidth))
+  }
+
+  add(
+    withLineNumber(generatedLineWidth, 'output.css'),
+    withLineNumber(sourceLineWidth, sourceHeader),
+  )
+  add(withoutLineNumber(generatedLineWidth, ''), withoutLineNumber(sourceLineWidth, ''))
+
+  let lastLine = 0
+  let lastSourceLine = new Map<string, number>()
+  let lastSource: string | null = null
+  let renderedSources = new Set<string>()
+
+  for (let idx = 0; idx < annotationsList.length; idx++) {
+    let annotation = annotationsList[idx]
+    let label = labels[idx]
+
+    if (annotation.generated === null) {
+      let source = visualizeSource(
+        sourceContents,
+        lastSourceLine,
+        renderedSources,
+        sourceLineWidth,
+        annotation.source,
+        annotation.original,
+        label,
+      )
+
+      if (sources.size > 1 && source.line !== '' && annotation.source !== lastSource) {
+        add(
+          withoutLineNumber(generatedLineWidth, ''),
+          withoutLineNumber(sourceLineWidth, `--- ${annotation.source} ---`),
+        )
+        lastSource = annotation.source
+      }
+
+      for (let line of source.before) {
+        add(withoutLineNumber(generatedLineWidth, ''), line)
+      }
+
+      add(withoutLineNumber(generatedLineWidth, `unmapped ${label}`), source.line)
+      add(withoutLineNumber(generatedLineWidth, ''), source.marker)
+
+      for (let line of source.after) {
+        add(withoutLineNumber(generatedLineWidth, ''), line)
+      }
+
+      continue
+    }
+
+    let lineNumber = annotation.generated.start[0]
+
+    for (let i = lastLine + 1; i < lineNumber; i++) {
+      add(
+        withLineNumber(generatedLineWidth, generatedLines[i - 1] ?? '', i),
+        withoutLineNumber(sourceLineWidth, ''),
+      )
+    }
+
+    let endLine = coveredEndLine(annotation.generated)
+    let generatedAfter = visualizeGeneratedRangeContinuation(
+      generatedLines,
+      generatedLineWidth,
+      annotation.generated,
+      label,
+    )
+    let source = visualizeSource(
+      sourceContents,
+      lastSourceLine,
+      renderedSources,
+      sourceLineWidth,
+      annotation.source,
+      annotation.original,
+      label,
+    )
+
+    if (sources.size > 1 && source.line !== '' && annotation.source !== lastSource) {
+      add(
+        withoutLineNumber(generatedLineWidth, ''),
+        withoutLineNumber(sourceLineWidth, `--- ${annotation.source} ---`),
+      )
+      lastSource = annotation.source
+    }
+
+    for (let line of source.before) {
+      add(withoutLineNumber(generatedLineWidth, ''), line)
+    }
+
+    add(
+      withLineNumber(generatedLineWidth, generatedLines[lineNumber - 1] ?? '', lineNumber),
+      source.line,
+    )
+    add(
+      withoutLineNumber(
+        generatedLineWidth,
+        visualizeRange(annotation.generated, label, generatedLines[lineNumber - 1] ?? ''),
+      ),
+      source.marker,
+    )
+
+    for (let i = 0; i < Math.max(generatedAfter.length, source.after.length); i++) {
+      add(generatedAfter[i] ?? withoutLineNumber(generatedLineWidth, ''), source.after[i] ?? '')
+    }
+
+    lastLine = endLine
+  }
+
+  for (let i = lastLine + 1; i <= generatedLines.length; i++) {
+    add(
+      withLineNumber(generatedLineWidth, generatedLines[i - 1] ?? '', i),
+      withoutLineNumber(sourceLineWidth, ''),
+    )
+  }
+
+  return `\n${result.join('\n')}\n`
+}
+
+function sideBySide(left: string, right: string, leftWidth: number) {
+  return `${fitColumn(left, leftWidth)} | ${fitColumn(right, COLUMN_WIDTH, false)}`
+}
+
+function withLineNumber(width: number, value: string, line?: number) {
+  return `${line === undefined ? ' '.repeat(width) : String(line).padStart(width)}  ${value}`
+}
+
+function withoutLineNumber(width: number, value: string) {
+  if (value === '') return ''
+
+  return `${' '.repeat(width)}  ${value}`
+}
+
+function fitColumn(value: string, width: number, pad = true) {
+  if (value.length <= width) {
+    return pad ? value.padEnd(width) : value
+  }
+
+  let markerIdx = value.indexOf(' @ ')
+
+  if (markerIdx !== -1) {
+    let labelIdx = value.lastIndexOf(' ', markerIdx - 1) + 1
+    let suffix = value.slice(labelIdx)
+    let prefixWidth = width - suffix.length - 4
+
+    if (prefixWidth > 0) {
+      let result = `${value.slice(0, prefixWidth)}... ${suffix}`
+
+      return pad ? result.padEnd(width) : result
+    }
+  }
+
+  return `${value.slice(0, width - 3)}...`
+}
+
+function annotationLabel(idx: number) {
+  let label = ''
+
+  for (let current = idx; current >= 0; current = Math.floor(current / 26) - 1) {
+    label = String.fromCharCode(65 + (current % 26)) + label
+  }
+
+  return label
+}
+
+function visualizeRange(range: Range, label: string, line?: string) {
+  let start = range.start[1]
+  let width = (() => {
+    if (line !== undefined && range.start[0] !== range.end[0]) {
+      return Math.max(1, line.length - start)
+    }
+
+    return Math.max(1, range.end[1] - start)
+  })()
+  return `${' '.repeat(start)}${'^'.repeat(width)} ${label} @ ${formatRange(range)}`
+}
+
+function visualizeSource(
+  sourceContents: Map<string, string[]>,
+  lastSourceLine: Map<string, number>,
+  renderedSources: Set<string>,
+  sourceLineWidth: number,
+  source: string,
+  range: Range,
+  label: string,
+): SourceVisualization {
+  let lines = sourceContents.get(source)
+
+  if (lines === undefined) return { before: [], line: '', marker: '', after: [] }
+
+  let startLine = range.start[0]
+  let line = lines[startLine - 1]
+
+  if (line === undefined) return { before: [], line: '', marker: '', after: [] }
+
+  let before: string[] = []
+  let lastLine = lastSourceLine.get(source) ?? 0
+
+  if (lastLine > 0 && startLine > lastLine && startLine - lastLine <= CONTEXT_LINES + 1) {
+    for (let i = lastLine + 1; i < startLine; i++) {
+      let line = lines[i - 1] ?? ''
+
+      if (line.trim() === '') continue
+
+      before.push(withLineNumber(sourceLineWidth, line, i))
+    }
+  }
+
+  let key = sourceKey(source, range)
+
+  if (renderedSources.has(key)) {
+    lastSourceLine.set(source, Math.max(lastLine, startLine))
+
+    return { before: [], line: '', marker: '', after: [] }
+  }
+
+  renderedSources.add(key)
+
+  let endLine = coveredEndLine(range)
+  let after = visualizeSourceRangeContinuation(lines, sourceLineWidth, range, label)
+
+  if (startLine > lastLine) {
+    for (let i = endLine + 1; i <= Math.min(endLine + CONTEXT_LINES, lines.length); i++) {
+      let line = lines[i - 1]
+
+      if (line?.trim() !== '}') break
+
+      after.push(withLineNumber(sourceLineWidth, line, i))
+      endLine = i
+    }
+  }
+
+  lastSourceLine.set(source, Math.max(lastLine, endLine))
+
+  return {
+    before,
+    line: withLineNumber(sourceLineWidth, line, startLine),
+    marker: withoutLineNumber(sourceLineWidth, visualizeRange(range, label, line)),
+    after,
+  }
+}
+
+function visualizeSourceRangeContinuation(
+  lines: string[],
+  sourceLineWidth: number,
+  range: Range,
+  label: string,
+) {
+  let result: string[] = []
+
+  for (let i = range.start[0] + 1; i <= coveredEndLine(range); i++) {
+    let line = lines[i - 1] ?? ''
+
+    result.push(withLineNumber(sourceLineWidth, line, i))
+    result.push(
+      withoutLineNumber(sourceLineWidth, visualizeContinuationRange(range, label, line, i)),
+    )
+  }
+
+  return result
+}
+
+function visualizeGeneratedRangeContinuation(
+  lines: string[],
+  generatedLineWidth: number,
+  range: Range,
+  label: string,
+) {
+  let result: string[] = []
+
+  for (let i = range.start[0] + 1; i <= coveredEndLine(range); i++) {
+    let line = lines[i - 1] ?? ''
+
+    result.push(withLineNumber(generatedLineWidth, line, i))
+    result.push(
+      withoutLineNumber(generatedLineWidth, visualizeContinuationRange(range, label, line, i)),
+    )
+  }
+
+  return result
+}
+
+function coveredEndLine(range: Range) {
+  if (range.start[0] !== range.end[0] && range.end[1] === 0) {
+    return range.end[0] - 1
+  }
+
+  return range.end[0]
+}
+
+function visualizeContinuationRange(range: Range, label: string, line: string, lineNumber: number) {
+  let start = lineNumber === range.start[0] ? range.start[1] : 0
+  let end = lineNumber === range.end[0] ? range.end[1] : line.length
+  let width = Math.max(1, end - start)
+
+  return `${' '.repeat(start)}${'^'.repeat(width)} ${label}`
+}
+
+function sourceKey(source: string, range: Range) {
+  return `${source}:${range.start[0]}:${range.start[1]}:${range.end[0]}:${range.end[1]}`
+}
+
+function samePosition(a: [number, number], b: [number, number]) {
+  return a[0] === b[0] && a[1] === b[1]
+}
+
+function comparePosition(a: [number, number], b: [number, number]) {
+  return a[0] - b[0] || a[1] - b[1]
+}
+
+function formatRange(range: Range): string {
+  if (range.start[0] === range.end[0]) {
+    if (range.start[1] === range.end[1]) {
+      return `${range.start[0]}:${range.start[1]}`
+    }
+
+    return `${range.start[0]}:${range.start[1]}-${range.end[1]}`
+  }
+
+  return `${range.start[0]}:${range.start[1]}-${range.end[0]}:${range.end[1]}`
+}
diff --git a/packages/tailwindcss/src/test-utils/custom-serializer.ts b/packages/tailwindcss/src/test-utils/custom-serializer.ts
index ff2b0a3f0..1704340e7 100644
--- a/packages/tailwindcss/src/test-utils/custom-serializer.ts
+++ b/packages/tailwindcss/src/test-utils/custom-serializer.ts
@@ -3,19 +3,20 @@ import type { SnapshotSerializer } from 'vitest'
 // We're reducing the precision of parameters to the `oklab()` function from
 // our snapshots as we've observed lightningcss generating different decimal
 // places in the last position when run on different operating systems.
-const HIGH_PRECISION_OKLAB = /oklab\(\d{1,2}\.?\d{0,4}% -?\.(\d{6,8}) -?\.(\d{6,8}) \/ \.\d{1,2}\)/g
+const HIGH_PRECISION_COLOR_FUNCTION =
+  /(oklab\(|oklch\(|lab\(|lch\()\d{1,2}\.?\d{0,4}% -?\d{0,2}\.(\d{4,8}) -?\d{0,2}.(\d{4,8}) \/ \.\d{1,2}\)/g
 
 export default {
   test(val) {
-    return typeof val === 'string' && val.match(HIGH_PRECISION_OKLAB) !== null
+    return typeof val === 'string' && val.match(HIGH_PRECISION_COLOR_FUNCTION) !== null
   },
   serialize(val, config, indentation, depth, refs, printer) {
     if (typeof val !== 'string') {
       throw new Error('This was already tested in the test() callback')
     }
 
-    let replaced = val.replaceAll(HIGH_PRECISION_OKLAB, (match, first, second) => {
-      return match.replaceAll(first, first.slice(0, 5)).replaceAll(second, second.slice(0, 5))
+    let replaced = val.replaceAll(HIGH_PRECISION_COLOR_FUNCTION, (match, _, first, second) => {
+      return match.replaceAll(first, first.slice(0, 3)).replaceAll(second, second.slice(0, 3))
     })
     return printer(replaced, config, indentation, depth, refs)
   },
diff --git a/packages/tailwindcss/src/test-utils/run.ts b/packages/tailwindcss/src/test-utils/run.ts
index 3dde1d282..7667ca66f 100644
--- a/packages/tailwindcss/src/test-utils/run.ts
+++ b/packages/tailwindcss/src/test-utils/run.ts
@@ -1,45 +1,25 @@
-import { Features, transform } from 'lightningcss'
 import { compile } from '..'
+import { optimize } from '../../../@tailwindcss-node/src/optimize'
 
-export async function compileCss(css: string, candidates: string[] = [], options = {}) {
-  let { build } = await compile(css, options)
-  return optimizeCss(build(candidates)).trim()
-}
+const css = String.raw
 
-export async function run(candidates: string[]) {
-  let { build } = await compile('@tailwind utilities;')
-  return optimizeCss(build(candidates)).trim()
-}
-
-export function optimizeCss(
-  input: string,
-  { file = 'input.css', minify = false }: { file?: string; minify?: boolean } = {},
+export async function run(
+  candidates: string[],
+  input = css`
+    @tailwind utilities;
+  `,
+  options: Parameters<typeof compile>[1] = {},
 ) {
-  function optimize(code: Buffer | Uint8Array) {
-    return transform({
-      filename: file,
-      code,
-      minify,
-      sourceMap: false,
-      drafts: {
-        customMedia: true,
-      },
-      nonStandard: {
-        deepSelectorCombinator: true,
-      },
-      include: Features.Nesting,
-      exclude: Features.LogicalProperties | Features.DirSelector,
-      targets: {
-        safari: (16 << 16) | (4 << 8),
-        ios_saf: (16 << 16) | (4 << 8),
-        firefox: 128 << 16,
-        chrome: 111 << 16,
-      },
-      errorRecovery: true,
-    }).code
-  }
-
-  // Running Lightning CSS twice to ensure that adjacent rules are merged after
-  // nesting is applied. This creates a more optimized output.
-  return optimize(optimize(Buffer.from(input))).toString()
+  let { build } = await compile(input, options)
+  return pretty(optimize(build(candidates)).code)
+}
+
+export async function compileCss(css: string, options: Parameters<typeof compile>[1] = {}) {
+  return run([], css, options)
+}
+
+export function pretty(input: string) {
+  input = input.trim()
+  if (input === '') return ''
+  return `\n${input}\n`
 }
diff --git a/packages/tailwindcss/src/theme.ts b/packages/tailwindcss/src/theme.ts
index 389b46994..073fb242f 100644
--- a/packages/tailwindcss/src/theme.ts
+++ b/packages/tailwindcss/src/theme.ts
@@ -1,11 +1,14 @@
-import type { AtRule } from './ast'
-import { escape } from './utils/escape'
+import { type AtRule, type Declaration } from './ast'
+import { escape, unescape } from './utils/escape'
 
 export const enum ThemeOptions {
   NONE = 0,
   INLINE = 1 << 0,
   REFERENCE = 1 << 1,
   DEFAULT = 1 << 2,
+
+  STATIC = 1 << 3,
+  USED = 1 << 4,
 }
 
 // In the future we may want to replace this with just a `Set` of known theme
@@ -18,12 +21,15 @@ const ignoredThemeKeyMap = new Map([
     '--text',
     [
       '--text-color',
-      '--text-underline-offset',
-      '--text-indent',
-      '--text-decoration-thickness',
       '--text-decoration-color',
+      '--text-decoration-thickness',
+      '--text-indent',
+      '--text-shadow',
+      '--text-underline-offset',
     ],
   ],
+  ['--grid-column', ['--grid-column-start', '--grid-column-end']],
+  ['--grid-row', ['--grid-row-start', '--grid-row-end']],
 ])
 
 function isIgnoredThemeKey(themeKey: ThemeKey, namespace: ThemeKey) {
@@ -36,11 +42,22 @@ export class Theme {
   public prefix: string | null = null
 
   constructor(
-    private values = new Map<string, { value: string; options: ThemeOptions }>(),
+    private values = new Map<
+      string,
+      {
+        value: string
+        options: ThemeOptions
+        src: Declaration['src']
+      }
+    >(),
     private keyframes = new Set<AtRule>([]),
   ) {}
 
-  add(key: string, value: string, options = ThemeOptions.NONE): void {
+  get size() {
+    return this.values.size
+  }
+
+  add(key: string, value: string, options = ThemeOptions.NONE, src?: Declaration['src']): void {
     if (key.endsWith('-*')) {
       if (value !== 'initial') {
         throw new Error(`Invalid theme value \`${value}\` for namespace \`${key}\``)
@@ -64,11 +81,11 @@ export class Theme {
     if (value === 'initial') {
       this.values.delete(key)
     } else {
-      this.values.set(key, { value, options })
+      this.values.set(key, { value, options, src })
     }
   }
 
-  keysInNamespaces(themeKeys: ThemeKey[]): string[] {
+  keysInNamespaces(themeKeys: Iterable<ThemeKey>): string[] {
     let keys: string[] = []
 
     for (let namespace of themeKeys) {
@@ -106,6 +123,7 @@ export class Theme {
   }
 
   getOptions(key: string) {
+    key = unescape(this.#unprefixKey(key))
     return this.values.get(key)?.options ?? ThemeOptions.NONE
   }
 
@@ -113,16 +131,21 @@ export class Theme {
     if (!this.prefix) return this.values.entries()
 
     return Array.from(this.values, (entry) => {
-      entry[0] = this.#prefixKey(entry[0])
+      entry[0] = this.prefixKey(entry[0])
       return entry
     })
   }
 
-  #prefixKey(key: string) {
+  prefixKey(key: string) {
     if (!this.prefix) return key
     return `--${this.prefix}-${key.slice(2)}`
   }
 
+  #unprefixKey(key: string) {
+    if (!this.prefix) return key
+    return `--${key.slice(3 + this.prefix.length)}`
+  }
+
   clearNamespace(namespace: string, clearOptions: ThemeOptions) {
     let ignored = ignoredThemeKeyMap.get(namespace) ?? []
 
@@ -145,11 +168,20 @@ export class Theme {
   #resolveKey(candidateValue: string | null, themeKeys: ThemeKey[]): string | null {
     for (let namespace of themeKeys) {
       let themeKey =
-        candidateValue !== null
-          ? (escape(`${namespace}-${candidateValue.replaceAll('.', '_')}`) as ThemeKey)
-          : namespace
+        candidateValue !== null ? (`${namespace}-${candidateValue}` as ThemeKey) : namespace
+
+      if (!this.values.has(themeKey)) {
+        // If the exact theme key is not found, we might be trying to resolve a key containing a dot
+        // that was registered with an underscore instead:
+        if (candidateValue !== null && candidateValue.includes('.')) {
+          themeKey = `${namespace}-${candidateValue.replaceAll('.', '_')}` as ThemeKey
+
+          if (!this.values.has(themeKey)) continue
+        } else {
+          continue
+        }
+      }
 
-      if (!this.values.has(themeKey)) continue
       if (isIgnoredThemeKey(themeKey, namespace)) continue
 
       return themeKey
@@ -159,21 +191,43 @@ export class Theme {
   }
 
   #var(themeKey: string) {
-    if (!this.values.has(themeKey)) {
+    let value = this.values.get(themeKey)
+    if (!value) {
       return null
     }
 
-    return `var(${this.#prefixKey(themeKey)})`
+    // Since @theme blocks in reference mode do not emit the CSS variables, we can not assume that
+    // the values will eventually be set up in the browser (e.g. when using `@apply` inside roots
+    // that use `@reference`). Ensure we set up a fallback in these cases.
+    let fallback = null
+    if (value.options & ThemeOptions.REFERENCE) {
+      fallback = value.value
+    }
+
+    return `var(${escape(this.prefixKey(themeKey))}${fallback ? `, ${fallback}` : ''})`
   }
 
-  resolve(candidateValue: string | null, themeKeys: ThemeKey[]): string | null {
+  markUsedVariable(themeKey: string): boolean {
+    let key = unescape(this.#unprefixKey(themeKey))
+    let value = this.values.get(key)
+    if (!value) return false
+    let isUsed = value.options & ThemeOptions.USED
+    value.options |= ThemeOptions.USED
+    return !isUsed
+  }
+
+  resolve(
+    candidateValue: string | null,
+    themeKeys: ThemeKey[],
+    options: ThemeOptions = ThemeOptions.NONE,
+  ): string | null {
     let themeKey = this.#resolveKey(candidateValue, themeKeys)
 
     if (!themeKey) return null
 
     let value = this.values.get(themeKey)!
 
-    if (value.options & ThemeOptions.INLINE) {
+    if ((options | value.options) & ThemeOptions.INLINE) {
       return value.value
     }
 
diff --git a/packages/tailwindcss/src/types.ts b/packages/tailwindcss/src/types.ts
new file mode 100644
index 000000000..f0fca5cf7
--- /dev/null
+++ b/packages/tailwindcss/src/types.ts
@@ -0,0 +1 @@
+export type Writable<T> = T extends Readonly<infer U> ? U : T
diff --git a/packages/tailwindcss/src/utilities.test.ts b/packages/tailwindcss/src/utilities.test.ts
index aaf1986cb..66b051d57 100644
--- a/packages/tailwindcss/src/utilities.test.ts
+++ b/packages/tailwindcss/src/utilities.test.ts
@@ -1,13 +1,15 @@
-import { describe, expect, test } from 'vitest'
+import { describe, expect, test, vi } from 'vitest'
 import { compile } from '.'
-import { compileCss, optimizeCss, run } from './test-utils/run'
+import { compileCss, run } from './test-utils/run'
+import { isValidFunctionalUtilityName, isValidStaticUtilityName } from './utilities'
 
 const css = String.raw
 
 test('sr-only', async () => {
   expect(await run(['sr-only'])).toMatchInlineSnapshot(`
-    ".sr-only {
-      clip: rect(0, 0, 0, 0);
+    "
+    .sr-only {
+      clip-path: inset(50%);
       white-space: nowrap;
       border-width: 0;
       width: 1px;
@@ -16,15 +18,17 @@ test('sr-only', async () => {
       padding: 0;
       position: absolute;
       overflow: hidden;
-    }"
+    }
+    "
   `)
   expect(await run(['-sr-only', 'sr-only-[var(--value)]', 'sr-only/foo'])).toEqual('')
 })
 
 test('not-sr-only', async () => {
   expect(await run(['not-sr-only'])).toMatchInlineSnapshot(`
-    ".not-sr-only {
-      clip: auto;
+    "
+    .not-sr-only {
+      clip-path: none;
       white-space: normal;
       width: auto;
       height: auto;
@@ -32,20 +36,23 @@ test('not-sr-only', async () => {
       padding: 0;
       position: static;
       overflow: visible;
-    }"
+    }
+    "
   `)
   expect(await run(['-not-sr-only', 'not-sr-only-[var(--value)]', 'not-sr-only/foo'])).toEqual('')
 })
 
 test('pointer-events', async () => {
   expect(await run(['pointer-events-none', 'pointer-events-auto'])).toMatchInlineSnapshot(`
-    ".pointer-events-auto {
+    "
+    .pointer-events-auto {
       pointer-events: auto;
     }
 
     .pointer-events-none {
       pointer-events: none;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -59,7 +66,8 @@ test('pointer-events', async () => {
 
 test('visibility', async () => {
   expect(await run(['visible', 'invisible', 'collapse'])).toMatchInlineSnapshot(`
-    ".collapse {
+    "
+    .collapse {
       visibility: collapse;
     }
 
@@ -69,7 +77,8 @@ test('visibility', async () => {
 
     .visible {
       visibility: visible;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -85,7 +94,8 @@ test('visibility', async () => {
 
 test('position', async () => {
   expect(await run(['static', 'fixed', 'absolute', 'relative', 'sticky'])).toMatchInlineSnapshot(`
-    ".absolute {
+    "
+    .absolute {
       position: absolute;
     }
 
@@ -103,7 +113,8 @@ test('position', async () => {
 
     .sticky {
       position: sticky;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -123,15 +134,7 @@ test('position', async () => {
 
 test('inset', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing-4: 1rem;
-          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
-          --inset-shadowned: 1940px;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'inset-auto',
         'inset-shadow-sm',
@@ -143,11 +146,40 @@ test('inset', async () => {
         '-inset-4',
         'inset-[4px]',
       ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
+          --inset-shadowned: 1940px;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-shadow: 0 0 #0000;
+          --tw-shadow-color: initial;
+          --tw-shadow-alpha: 100%;
+          --tw-inset-shadow: 0 0 #0000;
+          --tw-inset-shadow-color: initial;
+          --tw-inset-shadow-alpha: 100%;
+          --tw-ring-color: initial;
+          --tw-ring-shadow: 0 0 #0000;
+          --tw-inset-ring-color: initial;
+          --tw-inset-ring-shadow: 0 0 #0000;
+          --tw-ring-inset: initial;
+          --tw-ring-offset-width: 0px;
+          --tw-ring-offset-color: #fff;
+          --tw-ring-offset-shadow: 0 0 #0000;
+        }
+      }
+    }
+
+    :root, :host {
       --spacing-4: 1rem;
-      --inset-shadow-sm: inset 0 1px 1px #0000000d;
       --inset-shadowned: 1940px;
     }
 
@@ -188,25 +220,6 @@ test('inset', async () => {
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-shadow: 0 0 #0000;
-          --tw-shadow-color: initial;
-          --tw-inset-shadow: 0 0 #0000;
-          --tw-inset-shadow-color: initial;
-          --tw-ring-color: initial;
-          --tw-ring-shadow: 0 0 #0000;
-          --tw-inset-ring-color: initial;
-          --tw-inset-ring-shadow: 0 0 #0000;
-          --tw-ring-inset: initial;
-          --tw-ring-offset-width: 0px;
-          --tw-ring-offset-color: #fff;
-          --tw-ring-offset-shadow: 0 0 #0000;
-        }
-      }
-    }
-
     @property --tw-shadow {
       syntax: "*";
       inherits: false;
@@ -218,6 +231,12 @@ test('inset', async () => {
       inherits: false
     }
 
+    @property --tw-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+
     @property --tw-inset-shadow {
       syntax: "*";
       inherits: false;
@@ -229,6 +248,12 @@ test('inset', async () => {
       inherits: false
     }
 
+    @property --tw-inset-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+
     @property --tw-ring-color {
       syntax: "*";
       inherits: false
@@ -272,7 +297,8 @@ test('inset', async () => {
       syntax: "*";
       inherits: false;
       initial-value: 0 0 #0000;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -294,14 +320,7 @@ test('inset', async () => {
 
 test('inset-x', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing-4: 1rem;
-          --inset-shadowned: 1940px;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'inset-x-shadowned',
         'inset-x-auto',
@@ -312,9 +331,17 @@ test('inset-x', async () => {
         '-inset-x-4',
         'inset-x-[4px]',
       ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+          --inset-shadowned: 1940px;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
       --inset-shadowned: 1940px;
     }
@@ -349,17 +376,11 @@ test('inset-x', async () => {
 
     .inset-x-shadowned {
       inset-inline: var(--inset-shadowned);
-    }"
+    }
+    "
   `)
   expect(
-    await compileCss(
-      css`
-        @theme reference {
-          --spacing-4: 1rem;
-          --inset-shadow-sm: inset 0 1px 1px #0000000d;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'inset-x-shadow-sm',
         'inset-x',
@@ -375,20 +396,20 @@ test('inset-x', async () => {
         '-inset-x-4/foo',
         'inset-x-[4px]/foo',
       ],
+      css`
+        @theme reference {
+          --spacing-4: 1rem;
+          --inset-shadow-sm: inset 0 1px 1px #0000000d;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toEqual('')
 })
 
 test('inset-y', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing-4: 1rem;
-          --inset-shadowned: 1940px;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'inset-y-shadowned',
         'inset-y-auto',
@@ -399,9 +420,17 @@ test('inset-y', async () => {
         '-inset-y-4',
         'inset-y-[4px]',
       ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+          --inset-shadowned: 1940px;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
       --inset-shadowned: 1940px;
     }
@@ -436,17 +465,11 @@ test('inset-y', async () => {
 
     .inset-y-shadowned {
       inset-block: var(--inset-shadowned);
-    }"
+    }
+    "
   `)
   expect(
-    await compileCss(
-      css`
-        @theme reference {
-          --spacing-4: 1rem;
-          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'inset-y-shadow-sm',
         'inset-y',
@@ -462,13 +485,30 @@ test('inset-y', async () => {
         '-inset-y-4/foo',
         'inset-y-[4px]/foo',
       ],
+      css`
+        @theme reference {
+          --spacing-4: 1rem;
+          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toEqual('')
 })
 
-test('start', async () => {
+test('inset-s', async () => {
   expect(
-    await compileCss(
+    await run(
+      [
+        'inset-s-shadowned',
+        'inset-s-auto',
+        '-inset-s-full',
+        'inset-s-full',
+        'inset-s-3/4',
+        'inset-s-4',
+        '-inset-s-4',
+        'inset-s-[4px]',
+      ],
       css`
         @theme {
           --spacing-4: 1rem;
@@ -476,57 +516,64 @@ test('start', async () => {
         }
         @tailwind utilities;
       `,
-      [
-        'start-shadowned',
-        'start-auto',
-        '-start-full',
-        'start-full',
-        'start-3/4',
-        'start-4',
-        '-start-4',
-        'start-[4px]',
-      ],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
       --inset-shadowned: 1940px;
     }
 
-    .-start-4 {
+    .-inset-s-4 {
       inset-inline-start: calc(var(--spacing-4) * -1);
     }
 
-    .-start-full {
+    .-inset-s-full {
       inset-inline-start: -100%;
     }
 
-    .start-3\\/4 {
+    .inset-s-3\\/4 {
       inset-inline-start: 75%;
     }
 
-    .start-4 {
+    .inset-s-4 {
       inset-inline-start: var(--spacing-4);
     }
 
-    .start-\\[4px\\] {
+    .inset-s-\\[4px\\] {
       inset-inline-start: 4px;
     }
 
-    .start-auto {
+    .inset-s-auto {
       inset-inline-start: auto;
     }
 
-    .start-full {
+    .inset-s-full {
       inset-inline-start: 100%;
     }
 
-    .start-shadowned {
+    .inset-s-shadowned {
       inset-inline-start: var(--inset-shadowned);
-    }"
+    }
+    "
   `)
   expect(
-    await compileCss(
+    await run(
+      [
+        'inset-s-shadow-sm',
+        'inset-s',
+        'inset-s--1',
+        'inset-s--1/2',
+        'inset-s--1/-2',
+        'inset-s-1/-2',
+        'inset-s-auto/foo',
+        '-inset-s-full/foo',
+        'inset-s-full/foo',
+        'inset-s-3/4/foo',
+        'inset-s-4/foo',
+        '-inset-s-4/foo',
+        'inset-s-[4px]/foo',
+      ],
       css`
         @theme reference {
           --spacing-4: 1rem;
@@ -534,28 +581,23 @@ test('start', async () => {
         }
         @tailwind utilities;
       `,
-      [
-        'start-shadow-sm',
-        'start',
-        'start--1',
-        'start--1/2',
-        'start--1/-2',
-        'start-1/-2',
-        'start-auto/foo',
-        '-start-full/foo',
-        'start-full/foo',
-        'start-3/4/foo',
-        'start-4/foo',
-        '-start-4/foo',
-        'start-[4px]/foo',
-      ],
     ),
   ).toEqual('')
 })
 
-test('end', async () => {
+test('inset-e', async () => {
   expect(
-    await compileCss(
+    await run(
+      [
+        'inset-e-shadowned',
+        'inset-e-auto',
+        '-inset-e-full',
+        'inset-e-full',
+        'inset-e-3/4',
+        'inset-e-4',
+        '-inset-e-4',
+        'inset-e-[4px]',
+      ],
       css`
         @theme {
           --spacing-4: 1rem;
@@ -563,57 +605,64 @@ test('end', async () => {
         }
         @tailwind utilities;
       `,
-      [
-        'end-shadowned',
-        'end-auto',
-        '-end-full',
-        'end-full',
-        'end-3/4',
-        'end-4',
-        '-end-4',
-        'end-[4px]',
-      ],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
       --inset-shadowned: 1940px;
     }
 
-    .-end-4 {
+    .-inset-e-4 {
       inset-inline-end: calc(var(--spacing-4) * -1);
     }
 
-    .-end-full {
+    .-inset-e-full {
       inset-inline-end: -100%;
     }
 
-    .end-3\\/4 {
+    .inset-e-3\\/4 {
       inset-inline-end: 75%;
     }
 
-    .end-4 {
+    .inset-e-4 {
       inset-inline-end: var(--spacing-4);
     }
 
-    .end-\\[4px\\] {
+    .inset-e-\\[4px\\] {
       inset-inline-end: 4px;
     }
 
-    .end-auto {
+    .inset-e-auto {
       inset-inline-end: auto;
     }
 
-    .end-full {
+    .inset-e-full {
       inset-inline-end: 100%;
     }
 
-    .end-shadowned {
+    .inset-e-shadowned {
       inset-inline-end: var(--inset-shadowned);
-    }"
+    }
+    "
   `)
   expect(
-    await compileCss(
+    await run(
+      [
+        'inset-e-shadow-sm',
+        'inset-e',
+        'inset-e--1',
+        'inset-e--1/2',
+        'inset-e--1/-2',
+        'inset-e-1/-2',
+        'inset-e-auto/foo',
+        '-inset-e-full/foo',
+        'inset-e-full/foo',
+        'inset-e-3/4/foo',
+        'inset-e-4/foo',
+        '-inset-e-4/foo',
+        'inset-e-[4px]/foo',
+      ],
       css`
         @theme reference {
           --spacing-4: 1rem;
@@ -621,36 +670,191 @@ test('end', async () => {
         }
         @tailwind utilities;
       `,
+    ),
+  ).toEqual('')
+})
+
+test('inset-bs', async () => {
+  expect(
+    await run(
       [
-        'end-shadow-sm',
-        'end',
-        'end--1',
-        'end--1/2',
-        'end--1/-2',
-        'end-1/-2',
-        'end-auto/foo',
-        '-end-full/foo',
-        'end-full/foo',
-        'end-3/4/foo',
-        'end-4/foo',
-        '-end-4/foo',
-        'end-[4px]/foo',
+        'inset-bs-shadowned',
+        'inset-bs-auto',
+        '-inset-bs-full',
+        'inset-bs-full',
+        'inset-bs-3/4',
+        'inset-bs-4',
+        '-inset-bs-4',
+        'inset-bs-[4px]',
       ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+          --inset-shadowned: 1940px;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing-4: 1rem;
+      --inset-shadowned: 1940px;
+    }
+
+    .-inset-bs-4 {
+      inset-block-start: calc(var(--spacing-4) * -1);
+    }
+
+    .-inset-bs-full {
+      inset-block-start: -100%;
+    }
+
+    .inset-bs-3\\/4 {
+      inset-block-start: 75%;
+    }
+
+    .inset-bs-4 {
+      inset-block-start: var(--spacing-4);
+    }
+
+    .inset-bs-\\[4px\\] {
+      inset-block-start: 4px;
+    }
+
+    .inset-bs-auto {
+      inset-block-start: auto;
+    }
+
+    .inset-bs-full {
+      inset-block-start: 100%;
+    }
+
+    .inset-bs-shadowned {
+      inset-block-start: var(--inset-shadowned);
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'inset-bs-shadow-sm',
+        'inset-bs',
+        'inset-bs--1',
+        'inset-bs--1/2',
+        'inset-bs--1/-2',
+        'inset-bs-1/-2',
+        'inset-bs-auto/foo',
+        '-inset-bs-full/foo',
+        'inset-bs-full/foo',
+        'inset-bs-3/4/foo',
+        'inset-bs-4/foo',
+        '-inset-bs-4/foo',
+        'inset-bs-[4px]/foo',
+      ],
+      css`
+        @theme reference {
+          --spacing-4: 1rem;
+          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toEqual('')
+})
+
+test('inset-be', async () => {
+  expect(
+    await run(
+      [
+        'inset-be-shadowned',
+        'inset-be-auto',
+        '-inset-be-full',
+        'inset-be-full',
+        'inset-be-3/4',
+        'inset-be-4',
+        '-inset-be-4',
+        'inset-be-[4px]',
+      ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+          --inset-shadowned: 1940px;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing-4: 1rem;
+      --inset-shadowned: 1940px;
+    }
+
+    .-inset-be-4 {
+      inset-block-end: calc(var(--spacing-4) * -1);
+    }
+
+    .-inset-be-full {
+      inset-block-end: -100%;
+    }
+
+    .inset-be-3\\/4 {
+      inset-block-end: 75%;
+    }
+
+    .inset-be-4 {
+      inset-block-end: var(--spacing-4);
+    }
+
+    .inset-be-\\[4px\\] {
+      inset-block-end: 4px;
+    }
+
+    .inset-be-auto {
+      inset-block-end: auto;
+    }
+
+    .inset-be-full {
+      inset-block-end: 100%;
+    }
+
+    .inset-be-shadowned {
+      inset-block-end: var(--inset-shadowned);
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'inset-be-shadow-sm',
+        'inset-be',
+        'inset-be--1',
+        'inset-be--1/2',
+        'inset-be--1/-2',
+        'inset-be-1/-2',
+        'inset-be-auto/foo',
+        '-inset-be-full/foo',
+        'inset-be-full/foo',
+        'inset-be-3/4/foo',
+        'inset-be-4/foo',
+        '-inset-be-4/foo',
+        'inset-be-[4px]/foo',
+      ],
+      css`
+        @theme reference {
+          --spacing-4: 1rem;
+          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toEqual('')
 })
 
 test('top', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing-4: 1rem;
-          --inset-shadowned: 1940px;
-        }
-        @tailwind utilities;
-      `,
-
+    await run(
       [
         'top-shadowned',
         'top-auto',
@@ -661,9 +865,17 @@ test('top', async () => {
         '-top-4',
         'top-[4px]',
       ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+          --inset-shadowned: 1940px;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
       --inset-shadowned: 1940px;
     }
@@ -698,17 +910,11 @@ test('top', async () => {
 
     .top-shadowned {
       top: var(--inset-shadowned);
-    }"
+    }
+    "
   `)
   expect(
-    await compileCss(
-      css`
-        @theme reference {
-          --spacing-4: 1rem;
-          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'top-shadow-sm',
         'top',
@@ -724,20 +930,20 @@ test('top', async () => {
         '-top-4/foo',
         'top-[4px]/foo',
       ],
+      css`
+        @theme reference {
+          --spacing-4: 1rem;
+          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toEqual('')
 })
 
 test('right', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing-4: 1rem;
-          --inset-shadowned: 1940px;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'right-shadowned',
         'right-auto',
@@ -748,9 +954,17 @@ test('right', async () => {
         '-right-4',
         'right-[4px]',
       ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+          --inset-shadowned: 1940px;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
       --inset-shadowned: 1940px;
     }
@@ -785,17 +999,11 @@ test('right', async () => {
 
     .right-shadowned {
       right: var(--inset-shadowned);
-    }"
+    }
+    "
   `)
   expect(
-    await compileCss(
-      css`
-        @theme reference {
-          --spacing-4: 1rem;
-          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'right-shadow-sm',
         'right',
@@ -811,20 +1019,20 @@ test('right', async () => {
         '-right-4/foo',
         'right-[4px]/foo',
       ],
+      css`
+        @theme reference {
+          --spacing-4: 1rem;
+          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toEqual('')
 })
 
 test('bottom', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing-4: 1rem;
-          --inset-shadowned: 1940px;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'bottom-shadowned',
         'bottom-auto',
@@ -835,9 +1043,17 @@ test('bottom', async () => {
         '-bottom-4',
         'bottom-[4px]',
       ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+          --inset-shadowned: 1940px;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
       --inset-shadowned: 1940px;
     }
@@ -872,17 +1088,11 @@ test('bottom', async () => {
 
     .bottom-shadowned {
       bottom: var(--inset-shadowned);
-    }"
+    }
+    "
   `)
   expect(
-    await compileCss(
-      css`
-        @theme reference {
-          --spacing-4: 1rem;
-          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'bottom-shadow-sm',
         'bottom',
@@ -898,20 +1108,20 @@ test('bottom', async () => {
         '-bottom-4/foo',
         'bottom-[4px]/foo',
       ],
+      css`
+        @theme reference {
+          --spacing-4: 1rem;
+          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toEqual('')
 })
 
 test('left', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing-4: 1rem;
-          --inset-shadowned: 1940px;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'left-shadowned',
         'left-auto',
@@ -921,10 +1131,21 @@ test('left', async () => {
         'left-4',
         '-left-4',
         'left-[4px]',
+
+        // https://github.com/tailwindlabs/tailwindcss/issues/20010
+        '-left-[(var(--my-var1)+var(--my-var2))]',
       ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+          --inset-shadowned: 1940px;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
       --inset-shadowned: 1940px;
     }
@@ -933,6 +1154,10 @@ test('left', async () => {
       left: calc(var(--spacing-4) * -1);
     }
 
+    .-left-\\[\\(var\\(--my-var1\\)\\+var\\(--my-var2\\)\\)\\] {
+      left: calc((var(--my-var1) + var(--my-var2)) * -1);
+    }
+
     .-left-full {
       left: -100%;
     }
@@ -959,17 +1184,11 @@ test('left', async () => {
 
     .left-shadowned {
       left: var(--inset-shadowned);
-    }"
+    }
+    "
   `)
   expect(
-    await compileCss(
-      css`
-        @theme reference {
-          --spacing-4: 1rem;
-          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'left-shadow-sm',
         'left',
@@ -985,19 +1204,28 @@ test('left', async () => {
         '-left-4/foo',
         'left-[4px]/foo',
       ],
+      css`
+        @theme reference {
+          --spacing-4: 1rem;
+          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toEqual('')
 })
 
 test('isolation', async () => {
   expect(await run(['isolate', 'isolation-auto'])).toMatchInlineSnapshot(`
-    ".isolate {
+    "
+    .isolate {
       isolation: isolate;
     }
 
     .isolation-auto {
       isolation: auto;
-    }"
+    }
+    "
   `)
   expect(await run(['-isolate', '-isolation-auto', 'isolate/foo', 'isolation-auto/foo'])).toEqual(
     '',
@@ -1007,7 +1235,8 @@ test('isolation', async () => {
 test('z-index', async () => {
   expect(await run(['z-auto', 'z-10', '-z-10', 'z-[123]', '-z-[var(--value)]']))
     .toMatchInlineSnapshot(`
-      ".-z-10 {
+      "
+      .-z-10 {
         z-index: calc(10 * -1);
       }
 
@@ -1025,7 +1254,8 @@ test('z-index', async () => {
 
       .z-auto {
         z-index: auto;
-      }"
+      }
+      "
     `)
   expect(
     await run([
@@ -1041,6 +1271,28 @@ test('z-index', async () => {
       '-z-[var(--value)]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['z-auto'],
+      css`
+        @theme {
+          --z-index-auto: 42;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --z-index-auto: 42;
+    }
+
+    .z-auto {
+      z-index: var(--z-index-auto);
+    }
+    "
+  `)
 })
 
 test('order', async () => {
@@ -1055,7 +1307,8 @@ test('order', async () => {
       'order-none',
     ]),
   ).toMatchInlineSnapshot(`
-    ".-order-4 {
+    "
+    .-order-4 {
       order: calc(4 * -1);
     }
 
@@ -1072,16 +1325,17 @@ test('order', async () => {
     }
 
     .order-first {
-      order: calc(-infinity);
+      order: -9999;
     }
 
     .order-last {
-      order: calc(infinity);
+      order: 9999;
     }
 
     .order-none {
       order: 0;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -1101,11 +1355,57 @@ test('order', async () => {
       'order-none/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['order-first'],
+      css`
+        @theme {
+          --order-first: 1;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --order-first: 1;
+    }
+
+    .order-first {
+      order: var(--order-first);
+    }
+    "
+  `)
+
+  expect(
+    await run(
+      ['order-last'],
+      css`
+        @theme {
+          --order-last: -1;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --order-last: -1;
+    }
+
+    .order-last {
+      order: var(--order-last);
+    }
+    "
+  `)
 })
 
 test('col', async () => {
   expect(
     await run([
+      'col-11',
+      '-col-12',
       'col-auto',
       'col-span-4',
       'col-span-17',
@@ -1114,7 +1414,16 @@ test('col', async () => {
       'col-span-[var(--my-variable)]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".col-\\[span_123\\/span_123\\] {
+    "
+    .-col-12 {
+      grid-column: calc(12 * -1);
+    }
+
+    .col-11 {
+      grid-column: 11;
+    }
+
+    .col-\\[span_123\\/span_123\\] {
       grid-column: span 123 / span 123;
     }
 
@@ -1136,7 +1445,8 @@ test('col', async () => {
 
     .col-span-full {
       grid-column: 1 / -1;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -1153,13 +1463,55 @@ test('col', async () => {
       'col-span-[var(--my-variable)]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['col-auto'],
+      css`
+        @theme {
+          --grid-column-auto: 5;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --grid-column-auto: 5;
+    }
+
+    .col-auto {
+      grid-column: var(--grid-column-auto);
+    }
+    "
+  `)
 })
 
 test('col-start', async () => {
   expect(
-    await run(['col-start-auto', 'col-start-4', 'col-start-99', 'col-start-[123]', '-col-start-4']),
+    await run(
+      [
+        'col-start-auto',
+        'col-start-4',
+        'col-start-99',
+        'col-start-[123]',
+        '-col-start-4',
+        'col-start-custom',
+      ],
+      css`
+        @theme {
+          --grid-column-start-custom: 1 column-start;
+        }
+        @tailwind utilities;
+      `,
+    ),
   ).toMatchInlineSnapshot(`
-    ".-col-start-4 {
+    "
+    :root, :host {
+      --grid-column-start-custom: 1 column-start;
+    }
+
+    .-col-start-4 {
       grid-column-start: calc(4 * -1);
     }
 
@@ -1177,7 +1529,12 @@ test('col-start', async () => {
 
     .col-start-auto {
       grid-column-start: auto;
-    }"
+    }
+
+    .col-start-custom {
+      grid-column-start: var(--grid-column-start-custom);
+    }
+    "
   `)
   expect(
     await run([
@@ -1191,31 +1548,72 @@ test('col-start', async () => {
       '-col-start-4/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['col-start-auto'],
+      css`
+        @theme {
+          --grid-column-start-auto: 7;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --grid-column-start-auto: 7;
+    }
+
+    .col-start-auto {
+      grid-column-start: var(--grid-column-start-auto);
+    }
+    "
+  `)
 })
 
 test('col-end', async () => {
-  expect(await run(['col-end-auto', 'col-end-4', 'col-end-99', 'col-end-[123]', '-col-end-4']))
-    .toMatchInlineSnapshot(`
-      ".-col-end-4 {
-        grid-column-end: calc(4 * -1);
-      }
+  expect(
+    await run(
+      ['col-end-auto', 'col-end-4', 'col-end-99', 'col-end-[123]', '-col-end-4', 'col-end-custom'],
+      css`
+        @theme {
+          --grid-column-end-custom: 1 column-end;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --grid-column-end-custom: 1 column-end;
+    }
 
-      .col-end-4 {
-        grid-column-end: 4;
-      }
+    .-col-end-4 {
+      grid-column-end: calc(4 * -1);
+    }
 
-      .col-end-99 {
-        grid-column-end: 99;
-      }
+    .col-end-4 {
+      grid-column-end: 4;
+    }
 
-      .col-end-\\[123\\] {
-        grid-column-end: 123;
-      }
+    .col-end-99 {
+      grid-column-end: 99;
+    }
 
-      .col-end-auto {
-        grid-column-end: auto;
-      }"
-    `)
+    .col-end-\\[123\\] {
+      grid-column-end: 123;
+    }
+
+    .col-end-auto {
+      grid-column-end: auto;
+    }
+
+    .col-end-custom {
+      grid-column-end: var(--grid-column-end-custom);
+    }
+    "
+  `)
   expect(
     await run([
       'col-end',
@@ -1228,11 +1626,35 @@ test('col-end', async () => {
       '-col-end-4/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['col-end-auto'],
+      css`
+        @theme {
+          --grid-column-end-auto: 3;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --grid-column-end-auto: 3;
+    }
+
+    .col-end-auto {
+      grid-column-end: var(--grid-column-end-auto);
+    }
+    "
+  `)
 })
 
 test('row', async () => {
   expect(
     await run([
+      'row-11',
+      '-row-12',
       'row-auto',
       'row-span-4',
       'row-span-17',
@@ -1241,7 +1663,16 @@ test('row', async () => {
       'row-span-[var(--my-variable)]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".row-\\[span_123\\/span_123\\] {
+    "
+    .-row-12 {
+      grid-row: calc(12 * -1);
+    }
+
+    .row-11 {
+      grid-row: 11;
+    }
+
+    .row-\\[span_123\\/span_123\\] {
       grid-row: span 123 / span 123;
     }
 
@@ -1263,7 +1694,8 @@ test('row', async () => {
 
     .row-span-full {
       grid-row: 1 / -1;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -1278,34 +1710,88 @@ test('row', async () => {
       'row-span-full/foo',
       'row-[span_123/span_123]/foo',
       'row-span-[var(--my-variable)]/foo',
+
+      // Candidates matching Object.prototype properties should not crash or
+      // produce output (see: https://github.com/tailwindlabs/tailwindcss/issues/19721)
+      'row-constructor',
+      'row-hasOwnProperty',
+      'row-toString',
+      'row-valueOf',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['row-auto'],
+      css`
+        @theme {
+          --grid-row-auto: 9;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --grid-row-auto: 9;
+    }
+
+    .row-auto {
+      grid-row: var(--grid-row-auto);
+    }
+    "
+  `)
 })
 
 test('row-start', async () => {
   expect(
-    await run(['row-start-auto', 'row-start-4', 'row-start-99', 'row-start-[123]', '-row-start-4']),
+    await run(
+      [
+        'row-start-auto',
+        'row-start-4',
+        'row-start-99',
+        'row-start-[123]',
+        '-row-start-4',
+        'row-start-custom',
+      ],
+      css`
+        @theme {
+          --grid-row-start-custom: 1 row-start;
+        }
+        @tailwind utilities;
+      `,
+    ),
   ).toMatchInlineSnapshot(`
-      ".-row-start-4 {
-        grid-row-start: calc(4 * -1);
-      }
+    "
+    :root, :host {
+      --grid-row-start-custom: 1 row-start;
+    }
 
-      .row-start-4 {
-        grid-row-start: 4;
-      }
+    .-row-start-4 {
+      grid-row-start: calc(4 * -1);
+    }
 
-      .row-start-99 {
-        grid-row-start: 99;
-      }
+    .row-start-4 {
+      grid-row-start: 4;
+    }
 
-      .row-start-\\[123\\] {
-        grid-row-start: 123;
-      }
+    .row-start-99 {
+      grid-row-start: 99;
+    }
 
-      .row-start-auto {
-        grid-row-start: auto;
-      }"
-    `)
+    .row-start-\\[123\\] {
+      grid-row-start: 123;
+    }
+
+    .row-start-auto {
+      grid-row-start: auto;
+    }
+
+    .row-start-custom {
+      grid-row-start: var(--grid-row-start-custom);
+    }
+    "
+  `)
   expect(
     await run([
       'row-start',
@@ -1318,31 +1804,72 @@ test('row-start', async () => {
       '-row-start-4/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['row-start-auto'],
+      css`
+        @theme {
+          --grid-row-start-auto: 11;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --grid-row-start-auto: 11;
+    }
+
+    .row-start-auto {
+      grid-row-start: var(--grid-row-start-auto);
+    }
+    "
+  `)
 })
 
 test('row-end', async () => {
-  expect(await run(['row-end-auto', 'row-end-4', 'row-end-99', 'row-end-[123]', '-row-end-4']))
-    .toMatchInlineSnapshot(`
-      ".-row-end-4 {
-        grid-row-end: calc(4 * -1);
-      }
+  expect(
+    await run(
+      ['row-end-auto', 'row-end-4', 'row-end-99', 'row-end-[123]', '-row-end-4', 'row-end-custom'],
+      css`
+        @theme {
+          --grid-row-end-custom: 1 row-end;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --grid-row-end-custom: 1 row-end;
+    }
 
-      .row-end-4 {
-        grid-row-end: 4;
-      }
+    .-row-end-4 {
+      grid-row-end: calc(4 * -1);
+    }
 
-      .row-end-99 {
-        grid-row-end: 99;
-      }
+    .row-end-4 {
+      grid-row-end: 4;
+    }
 
-      .row-end-\\[123\\] {
-        grid-row-end: 123;
-      }
+    .row-end-99 {
+      grid-row-end: 99;
+    }
 
-      .row-end-auto {
-        grid-row-end: auto;
-      }"
-    `)
+    .row-end-\\[123\\] {
+      grid-row-end: 123;
+    }
+
+    .row-end-auto {
+      grid-row-end: auto;
+    }
+
+    .row-end-custom {
+      grid-row-end: var(--grid-row-end-custom);
+    }
+    "
+  `)
   expect(
     await run([
       'row-end',
@@ -1355,12 +1882,35 @@ test('row-end', async () => {
       '-row-end-4/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['row-end-auto'],
+      css`
+        @theme {
+          --grid-row-end-auto: 13;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --grid-row-end-auto: 13;
+    }
+
+    .row-end-auto {
+      grid-row-end: var(--grid-row-end-auto);
+    }
+    "
+  `)
 })
 
 test('float', async () => {
   expect(await run(['float-start', 'float-end', 'float-right', 'float-left', 'float-none']))
     .toMatchInlineSnapshot(`
-      ".float-end {
+      "
+      .float-end {
         float: inline-end;
       }
 
@@ -1378,7 +1928,8 @@ test('float', async () => {
 
       .float-start {
         float: inline-start;
-      }"
+      }
+      "
     `)
   expect(
     await run([
@@ -1408,7 +1959,8 @@ test('clear', async () => {
       'clear-none',
     ]),
   ).toMatchInlineSnapshot(`
-    ".clear-both {
+    "
+    .clear-both {
       clear: both;
     }
 
@@ -1430,7 +1982,8 @@ test('clear', async () => {
 
     .clear-start {
       clear: inline-start;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -1453,17 +2006,18 @@ test('clear', async () => {
 
 test('margin', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['m-auto', 'm-4', 'm-[4px]', '-m-4', '-m-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['m-auto', 'm-4', 'm-[4px]', '-m-4', '-m-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -1485,7 +2039,8 @@ test('margin', async () => {
 
     .m-auto {
       margin: auto;
-    }"
+    }
+    "
   `)
   expect(
     await run(['m', 'm-auto/foo', 'm-4/foo', 'm-[4px]/foo', '-m-4/foo', '-m-[var(--value)]/foo']),
@@ -1494,14 +2049,7 @@ test('margin', async () => {
 
 test('mx', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing: 0.25rem;
-          --spacing-big: 100rem;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'mx-auto',
         'mx-1',
@@ -1515,9 +2063,17 @@ test('mx', async () => {
         'mx-[var(--my-var)]',
         '-mx-[var(--my-var)]',
       ],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --spacing-big: 100rem;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
@@ -1539,7 +2095,7 @@ test('mx', async () => {
     }
 
     .mx-1 {
-      margin-inline: calc(var(--spacing) * 1);
+      margin-inline: var(--spacing);
     }
 
     .mx-4 {
@@ -1564,7 +2120,8 @@ test('mx', async () => {
 
     .mx-big {
       margin-inline: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -1580,14 +2137,7 @@ test('mx', async () => {
 
 test('my', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing: 0.25rem;
-          --spacing-big: 100rem;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'my-1',
         'my-99',
@@ -1601,9 +2151,17 @@ test('my', async () => {
         'my-[var(--my-var)]',
         '-my-[var(--my-var)]',
       ],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --spacing-big: 100rem;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
@@ -1629,7 +2187,7 @@ test('my', async () => {
     }
 
     .my-1 {
-      margin-block: calc(var(--spacing) * 1);
+      margin-block: var(--spacing);
     }
 
     .my-2\\.5 {
@@ -1650,7 +2208,8 @@ test('my', async () => {
 
     .my-big {
       margin-block: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -1666,14 +2225,7 @@ test('my', async () => {
 
 test('mt', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing: 0.25rem;
-          --spacing-big: 100rem;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'mt-1',
         'mt-99',
@@ -1687,9 +2239,17 @@ test('mt', async () => {
         'mt-[var(--my-var)]',
         '-mt-[var(--my-var)]',
       ],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --spacing-big: 100rem;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
@@ -1715,7 +2275,7 @@ test('mt', async () => {
     }
 
     .mt-1 {
-      margin-top: calc(var(--spacing) * 1);
+      margin-top: var(--spacing);
     }
 
     .mt-2\\.5 {
@@ -1736,7 +2296,8 @@ test('mt', async () => {
 
     .mt-big {
       margin-top: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -1752,14 +2313,7 @@ test('mt', async () => {
 
 test('ms', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing: 0.25rem;
-          --spacing-big: 100rem;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'ms-1',
         'ms-99',
@@ -1773,9 +2327,17 @@ test('ms', async () => {
         'ms-[var(--my-var)]',
         '-ms-[var(--my-var)]',
       ],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --spacing-big: 100rem;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
@@ -1801,7 +2363,7 @@ test('ms', async () => {
     }
 
     .ms-1 {
-      margin-inline-start: calc(var(--spacing) * 1);
+      margin-inline-start: var(--spacing);
     }
 
     .ms-2\\.5 {
@@ -1822,7 +2384,8 @@ test('ms', async () => {
 
     .ms-big {
       margin-inline-start: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -1838,14 +2401,7 @@ test('ms', async () => {
 
 test('me', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing: 0.25rem;
-          --spacing-big: 100rem;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'me-1',
         'me-99',
@@ -1859,9 +2415,17 @@ test('me', async () => {
         'me-[var(--my-var)]',
         '-me-[var(--my-var)]',
       ],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --spacing-big: 100rem;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
@@ -1887,7 +2451,7 @@ test('me', async () => {
     }
 
     .me-1 {
-      margin-inline-end: calc(var(--spacing) * 1);
+      margin-inline-end: var(--spacing);
     }
 
     .me-2\\.5 {
@@ -1908,7 +2472,8 @@ test('me', async () => {
 
     .me-big {
       margin-inline-end: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -1922,9 +2487,22 @@ test('me', async () => {
   ).toEqual('')
 })
 
-test('mr', async () => {
+test('mbs', async () => {
   expect(
-    await compileCss(
+    await run(
+      [
+        'mbs-1',
+        'mbs-99',
+        'mbs-2.5',
+        'mbs-big',
+        'mbs-[4px]',
+        '-mbs-4',
+        '-mbs-2.5',
+        '-mbs-big',
+        '-mbs-[4px]',
+        'mbs-[var(--my-var)]',
+        '-mbs-[var(--my-var)]',
+      ],
       css`
         @theme {
           --spacing: 0.25rem;
@@ -1932,6 +2510,162 @@ test('mr', async () => {
         }
         @tailwind utilities;
       `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing: .25rem;
+      --spacing-big: 100rem;
+    }
+
+    .-mbs-2\\.5 {
+      margin-block-start: calc(var(--spacing) * -2.5);
+    }
+
+    .-mbs-4 {
+      margin-block-start: calc(var(--spacing) * -4);
+    }
+
+    .-mbs-\\[4px\\] {
+      margin-block-start: -4px;
+    }
+
+    .-mbs-\\[var\\(--my-var\\)\\] {
+      margin-block-start: calc(var(--my-var) * -1);
+    }
+
+    .-mbs-big {
+      margin-block-start: calc(var(--spacing-big) * -1);
+    }
+
+    .mbs-1 {
+      margin-block-start: var(--spacing);
+    }
+
+    .mbs-2\\.5 {
+      margin-block-start: calc(var(--spacing) * 2.5);
+    }
+
+    .mbs-99 {
+      margin-block-start: calc(var(--spacing) * 99);
+    }
+
+    .mbs-\\[4px\\] {
+      margin-block-start: 4px;
+    }
+
+    .mbs-\\[var\\(--my-var\\)\\] {
+      margin-block-start: var(--my-var);
+    }
+
+    .mbs-big {
+      margin-block-start: var(--spacing-big);
+    }
+    "
+  `)
+  expect(
+    await run([
+      'mbs',
+      'mbs-auto/foo',
+      'mbs-4/foo',
+      'mbs-[4px]/foo',
+      '-mbs-4/foo',
+      '-mbs-[var(--value)]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('mbe', async () => {
+  expect(
+    await run(
+      [
+        'mbe-1',
+        'mbe-99',
+        'mbe-2.5',
+        'mbe-big',
+        'mbe-[4px]',
+        '-mbe-4',
+        '-mbe-2.5',
+        '-mbe-big',
+        '-mbe-[4px]',
+        'mbe-[var(--my-var)]',
+        '-mbe-[var(--my-var)]',
+      ],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --spacing-big: 100rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing: .25rem;
+      --spacing-big: 100rem;
+    }
+
+    .-mbe-2\\.5 {
+      margin-block-end: calc(var(--spacing) * -2.5);
+    }
+
+    .-mbe-4 {
+      margin-block-end: calc(var(--spacing) * -4);
+    }
+
+    .-mbe-\\[4px\\] {
+      margin-block-end: -4px;
+    }
+
+    .-mbe-\\[var\\(--my-var\\)\\] {
+      margin-block-end: calc(var(--my-var) * -1);
+    }
+
+    .-mbe-big {
+      margin-block-end: calc(var(--spacing-big) * -1);
+    }
+
+    .mbe-1 {
+      margin-block-end: var(--spacing);
+    }
+
+    .mbe-2\\.5 {
+      margin-block-end: calc(var(--spacing) * 2.5);
+    }
+
+    .mbe-99 {
+      margin-block-end: calc(var(--spacing) * 99);
+    }
+
+    .mbe-\\[4px\\] {
+      margin-block-end: 4px;
+    }
+
+    .mbe-\\[var\\(--my-var\\)\\] {
+      margin-block-end: var(--my-var);
+    }
+
+    .mbe-big {
+      margin-block-end: var(--spacing-big);
+    }
+    "
+  `)
+  expect(
+    await run([
+      'mbe',
+      'mbe-auto/foo',
+      'mbe-4/foo',
+      'mbe-[4px]/foo',
+      '-mbe-4/foo',
+      '-mbe-[var(--value)]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('mr', async () => {
+  expect(
+    await run(
       [
         'mr-1',
         'mr-99',
@@ -1945,9 +2679,17 @@ test('mr', async () => {
         'mr-[var(--my-var)]',
         '-mr-[var(--my-var)]',
       ],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --spacing-big: 100rem;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
@@ -1973,7 +2715,7 @@ test('mr', async () => {
     }
 
     .mr-1 {
-      margin-right: calc(var(--spacing) * 1);
+      margin-right: var(--spacing);
     }
 
     .mr-2\\.5 {
@@ -1994,7 +2736,8 @@ test('mr', async () => {
 
     .mr-big {
       margin-right: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -2010,14 +2753,7 @@ test('mr', async () => {
 
 test('mb', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing: 0.25rem;
-          --spacing-big: 100rem;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'mb-1',
         'mb-99',
@@ -2031,9 +2767,17 @@ test('mb', async () => {
         'mb-[var(--my-var)]',
         '-mb-[var(--my-var)]',
       ],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --spacing-big: 100rem;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
@@ -2059,7 +2803,7 @@ test('mb', async () => {
     }
 
     .mb-1 {
-      margin-bottom: calc(var(--spacing) * 1);
+      margin-bottom: var(--spacing);
     }
 
     .mb-2\\.5 {
@@ -2080,7 +2824,8 @@ test('mb', async () => {
 
     .mb-big {
       margin-bottom: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -2096,14 +2841,7 @@ test('mb', async () => {
 
 test('ml', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing: 0.25rem;
-          --spacing-big: 100rem;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'ml-1',
         'ml-99',
@@ -2117,9 +2855,17 @@ test('ml', async () => {
         'ml-[var(--my-var)]',
         '-ml-[var(--my-var)]',
       ],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --spacing-big: 100rem;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
@@ -2145,7 +2891,7 @@ test('ml', async () => {
     }
 
     .ml-1 {
-      margin-left: calc(var(--spacing) * 1);
+      margin-left: var(--spacing);
     }
 
     .ml-2\\.5 {
@@ -2166,7 +2912,8 @@ test('ml', async () => {
 
     .ml-big {
       margin-left: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -2182,17 +2929,18 @@ test('ml', async () => {
 
 test('margin sort order', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['mb-4', 'me-4', 'mx-4', 'ml-4', 'ms-4', 'm-4', 'mr-4', 'mt-4', 'my-4'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['mb-4', 'me-4', 'mx-4', 'ml-4', 'ms-4', 'm-4', 'mr-4', 'mt-4', 'my-4'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -2230,7 +2978,8 @@ test('margin sort order', async () => {
 
     .ml-4 {
       margin-left: var(--spacing-4);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -2250,13 +2999,15 @@ test('margin sort order', async () => {
 
 test('box-sizing', async () => {
   expect(await run(['box-border', 'box-content'])).toMatchInlineSnapshot(`
-    ".box-border {
+    "
+    .box-border {
       box-sizing: border-box;
     }
 
     .box-content {
       box-sizing: content-box;
-    }"
+    }
+    "
   `)
   expect(
     await run(['box', '-box-border', '-box-content', 'box-border/foo', 'box-content/foo']),
@@ -2266,7 +3017,8 @@ test('box-sizing', async () => {
 test('line-clamp', async () => {
   expect(await run(['line-clamp-4', 'line-clamp-99', 'line-clamp-[123]', 'line-clamp-none']))
     .toMatchInlineSnapshot(`
-      ".line-clamp-4 {
+      "
+      .line-clamp-4 {
         -webkit-line-clamp: 4;
         -webkit-box-orient: vertical;
         display: -webkit-box;
@@ -2292,7 +3044,8 @@ test('line-clamp', async () => {
         -webkit-box-orient: horizontal;
         display: block;
         overflow: visible;
-      }"
+      }
+      "
     `)
   expect(
     await run([
@@ -2309,6 +3062,31 @@ test('line-clamp', async () => {
       'line-clamp-none/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['line-clamp-none'],
+      css`
+        @theme {
+          --line-clamp-none: 0;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --line-clamp-none: 0;
+    }
+
+    .line-clamp-none {
+      -webkit-line-clamp: var(--line-clamp-none);
+      -webkit-box-orient: vertical;
+      display: -webkit-box;
+      overflow: hidden;
+    }
+    "
+  `)
 })
 
 test('display', async () => {
@@ -2337,7 +3115,8 @@ test('display', async () => {
       'hidden',
     ]),
   ).toMatchInlineSnapshot(`
-    ".block {
+    "
+    .block {
       display: block;
     }
 
@@ -2419,7 +3198,8 @@ test('display', async () => {
 
     .table-row-group {
       display: table-row-group;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -2471,13 +3251,15 @@ test('display', async () => {
 
 test('field-sizing', async () => {
   expect(await run(['field-sizing-content', 'field-sizing-fixed'])).toMatchInlineSnapshot(`
-    ".field-sizing-content {
+    "
+    .field-sizing-content {
       field-sizing: content;
     }
 
     .field-sizing-fixed {
       field-sizing: fixed;
-    }"
+    }
+    "
   `)
   expect(
     await run(['field-sizing-[other]', '-field-sizing-content', '-field-sizing-fixed']),
@@ -2486,17 +3268,18 @@ test('field-sizing', async () => {
 
 test('aspect-ratio', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['aspect-video', 'aspect-[10/9]', 'aspect-4/3', 'aspect-8.5/11'],
       css`
         @theme {
           --aspect-video: 16 / 9;
         }
         @tailwind utilities;
       `,
-      ['aspect-video', 'aspect-[10/9]', 'aspect-4/3'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --aspect-video: 16 / 9;
     }
 
@@ -2504,13 +3287,18 @@ test('aspect-ratio', async () => {
       aspect-ratio: 4 / 3;
     }
 
+    .aspect-8\\.5\\/11 {
+      aspect-ratio: 8.5 / 11;
+    }
+
     .aspect-\\[10\\/9\\] {
       aspect-ratio: 10 / 9;
     }
 
     .aspect-video {
       aspect-ratio: var(--aspect-video);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -2525,19 +3313,14 @@ test('aspect-ratio', async () => {
       'aspect--4/3',
       'aspect--4/-3',
       'aspect-4/-3',
+      'aspect-1.23/4.56',
     ]),
   ).toEqual('')
 })
 
 test('size', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing-4: 1rem;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'size-auto',
         'size-full',
@@ -2548,9 +3331,16 @@ test('size', async () => {
         'size-1/2',
         'size-[4px]',
       ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -2592,7 +3382,8 @@ test('size', async () => {
     .size-min {
       width: min-content;
       height: min-content;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -2618,14 +3409,7 @@ test('size', async () => {
 
 test('width', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing-4: 1rem;
-          --width-xl: 36rem;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'w-full',
         'w-auto',
@@ -2641,9 +3425,17 @@ test('width', async () => {
         'w-1/2',
         'w-[4px]',
       ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+          --width-xl: 36rem;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
       --width-xl: 36rem;
     }
@@ -2698,7 +3490,8 @@ test('width', async () => {
 
     .w-xl {
       width: var(--width-xl);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -2729,17 +3522,10 @@ test('width', async () => {
 
 test('min-width', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing-4: 1rem;
-          --container-xl: 36rem;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
-        'min-w-auto',
         'min-w-full',
+        'min-w-auto',
         'min-w-min',
         'min-w-max',
         'min-w-fit',
@@ -2747,9 +3533,17 @@ test('min-width', async () => {
         'min-w-xl',
         'min-w-[4px]',
       ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+          --container-xl: 36rem;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
       --container-xl: 36rem;
     }
@@ -2784,7 +3578,8 @@ test('min-width', async () => {
 
     .min-w-xl {
       min-width: var(--container-xl);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -2805,7 +3600,8 @@ test('min-width', async () => {
 
 test('max-width', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['max-w-none', 'max-w-full', 'max-w-max', 'max-w-fit', 'max-w-4', 'max-w-xl', 'max-w-[4px]'],
       css`
         @theme {
           --spacing-4: 1rem;
@@ -2813,19 +3609,10 @@ test('max-width', async () => {
         }
         @tailwind utilities;
       `,
-      [
-        'max-w-none',
-        'max-w-full',
-        'max-w-max',
-        'max-w-max',
-        'max-w-fit',
-        'max-w-4',
-        'max-w-xl',
-        'max-w-[4px]',
-      ],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
       --container-xl: 36rem;
     }
@@ -2856,11 +3643,13 @@ test('max-width', async () => {
 
     .max-w-xl {
       max-width: var(--container-xl);
-    }"
+    }
+    "
   `)
   expect(
     await run([
       'max-w',
+      'max-w-auto',
       '-max-w-4',
       '-max-w-[4px]',
       'max-w-none/foo',
@@ -2877,13 +3666,7 @@ test('max-width', async () => {
 
 test('height', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing-4: 1rem;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'h-full',
         'h-auto',
@@ -2892,15 +3675,23 @@ test('height', async () => {
         'h-lvh',
         'h-dvh',
         'h-min',
+        'h-lh',
         'h-max',
         'h-fit',
         'h-4',
         'h-1/2',
         'h-[4px]',
       ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -2932,6 +3723,10 @@ test('height', async () => {
       height: 100%;
     }
 
+    .h-lh {
+      height: 1lh;
+    }
+
     .h-lvh {
       height: 100lvh;
     }
@@ -2950,7 +3745,8 @@ test('height', async () => {
 
     .h-svh {
       height: 100svh;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -2968,6 +3764,7 @@ test('height', async () => {
       'h-svh/foo',
       'h-lvh/foo',
       'h-dvh/foo',
+      'h-lh/foo',
       'h-min/foo',
       'h-max/foo',
       'h-fit/foo',
@@ -2980,29 +3777,31 @@ test('height', async () => {
 
 test('min-height', async () => {
   expect(
-    await compileCss(
+    await run(
+      [
+        'min-h-full',
+        'min-h-auto',
+        'min-h-screen',
+        'min-h-svh',
+        'min-h-lvh',
+        'min-h-dvh',
+        'min-h-min',
+        'min-h-lh',
+        'min-h-max',
+        'min-h-fit',
+        'min-h-4',
+        'min-h-[4px]',
+      ],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      [
-        'min-h-auto',
-        'min-h-full',
-        'min-h-screen',
-        'min-h-svh',
-        'min-h-lvh',
-        'min-h-dvh',
-        'min-h-min',
-        'min-h-max',
-        'min-h-fit',
-        'min-h-4',
-        'min-h-[4px]',
-      ],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -3030,6 +3829,10 @@ test('min-height', async () => {
       min-height: 100%;
     }
 
+    .min-h-lh {
+      min-height: 1lh;
+    }
+
     .min-h-lvh {
       min-height: 100lvh;
     }
@@ -3048,7 +3851,8 @@ test('min-height', async () => {
 
     .min-h-svh {
       min-height: 100svh;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -3061,6 +3865,7 @@ test('min-height', async () => {
       'min-h-svh/foo',
       'min-h-lvh/foo',
       'min-h-dvh/foo',
+      'min-h-lh/foo',
       'min-h-min/foo',
       'min-h-max/foo',
       'min-h-fit/foo',
@@ -3072,13 +3877,7 @@ test('min-height', async () => {
 
 test('max-height', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing-4: 1rem;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'max-h-none',
         'max-h-full',
@@ -3086,15 +3885,23 @@ test('max-height', async () => {
         'max-h-svh',
         'max-h-lvh',
         'max-h-dvh',
+        'max-h-lh',
         'max-h-min',
         'max-h-max',
         'max-h-fit',
         'max-h-4',
         'max-h-[4px]',
       ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -3118,6 +3925,10 @@ test('max-height', async () => {
       max-height: 100%;
     }
 
+    .max-h-lh {
+      max-height: 1lh;
+    }
+
     .max-h-lvh {
       max-height: 100lvh;
     }
@@ -3140,11 +3951,13 @@ test('max-height', async () => {
 
     .max-h-svh {
       max-height: 100svh;
-    }"
+    }
+    "
   `)
   expect(
     await run([
       'max-h',
+      'max-h-auto',
       '-max-h-4',
       '-max-h-[4px]',
       'max-h-none/foo',
@@ -3153,6 +3966,7 @@ test('max-height', async () => {
       'max-h-svh/foo',
       'max-h-lvh/foo',
       'max-h-dvh/foo',
+      'max-h-lh/foo',
       'max-h-min/foo',
       'max-h-max/foo',
       'max-h-fit/foo',
@@ -3162,10 +3976,586 @@ test('max-height', async () => {
   ).toEqual('')
 })
 
+test('inline-size', async () => {
+  expect(
+    await run(
+      [
+        'inline-full',
+        'inline-auto',
+        'inline-screen',
+        'inline-svw',
+        'inline-lvw',
+        'inline-dvw',
+        'inline-min',
+        'inline-max',
+        'inline-fit',
+        'inline-4',
+        'inline-xl',
+        'inline-1/2',
+        'inline-[4px]',
+      ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+          --container-xl: 36rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing-4: 1rem;
+      --container-xl: 36rem;
+    }
+
+    .inline-1\\/2 {
+      inline-size: 50%;
+    }
+
+    .inline-4 {
+      inline-size: var(--spacing-4);
+    }
+
+    .inline-\\[4px\\] {
+      inline-size: 4px;
+    }
+
+    .inline-auto {
+      inline-size: auto;
+    }
+
+    .inline-dvw {
+      inline-size: 100dvw;
+    }
+
+    .inline-fit {
+      inline-size: fit-content;
+    }
+
+    .inline-full {
+      inline-size: 100%;
+    }
+
+    .inline-lvw {
+      inline-size: 100lvw;
+    }
+
+    .inline-max {
+      inline-size: max-content;
+    }
+
+    .inline-min {
+      inline-size: min-content;
+    }
+
+    .inline-screen {
+      inline-size: 100vw;
+    }
+
+    .inline-svw {
+      inline-size: 100svw;
+    }
+
+    .inline-xl {
+      inline-size: var(--container-xl);
+    }
+    "
+  `)
+  expect(
+    await run([
+      'inline--1',
+      'inline--1/2',
+      'inline--1/-2',
+      'inline-1/-2',
+      '-inline-4',
+      '-inline-1/2',
+      '-inline-[4px]',
+      'inline-full/foo',
+      'inline-auto/foo',
+      'inline-screen/foo',
+      'inline-svw/foo',
+      'inline-lvw/foo',
+      'inline-dvw/foo',
+      'inline-min/foo',
+      'inline-max/foo',
+      'inline-fit/foo',
+      'inline-4/foo',
+      'inline-xl/foo',
+      'inline-1/2/foo',
+      'inline-[4px]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('min-inline-size', async () => {
+  expect(
+    await run(
+      [
+        'min-inline-full',
+        'min-inline-auto',
+        'min-inline-min',
+        'min-inline-max',
+        'min-inline-fit',
+        'min-inline-4',
+        'min-inline-xl',
+        'min-inline-[4px]',
+      ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+          --container-xl: 36rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing-4: 1rem;
+      --container-xl: 36rem;
+    }
+
+    .min-inline-4 {
+      min-inline-size: var(--spacing-4);
+    }
+
+    .min-inline-\\[4px\\] {
+      min-inline-size: 4px;
+    }
+
+    .min-inline-auto {
+      min-inline-size: auto;
+    }
+
+    .min-inline-fit {
+      min-inline-size: fit-content;
+    }
+
+    .min-inline-full {
+      min-inline-size: 100%;
+    }
+
+    .min-inline-max {
+      min-inline-size: max-content;
+    }
+
+    .min-inline-min {
+      min-inline-size: min-content;
+    }
+
+    .min-inline-xl {
+      min-inline-size: var(--container-xl);
+    }
+    "
+  `)
+  expect(
+    await run([
+      'min-inline',
+      '-min-inline-4',
+      '-min-inline-[4px]',
+      'min-inline-auto/foo',
+      'min-inline-full/foo',
+      'min-inline-min/foo',
+      'min-inline-max/foo',
+      'min-inline-fit/foo',
+      'min-inline-4/foo',
+      'min-inline-xl/foo',
+      'min-inline-[4px]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('max-inline-size', async () => {
+  expect(
+    await run(
+      [
+        'max-inline-none',
+        'max-inline-full',
+        'max-inline-max',
+        'max-inline-fit',
+        'max-inline-4',
+        'max-inline-xl',
+        'max-inline-[4px]',
+      ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+          --container-xl: 36rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing-4: 1rem;
+      --container-xl: 36rem;
+    }
+
+    .max-inline-4 {
+      max-inline-size: var(--spacing-4);
+    }
+
+    .max-inline-\\[4px\\] {
+      max-inline-size: 4px;
+    }
+
+    .max-inline-fit {
+      max-inline-size: fit-content;
+    }
+
+    .max-inline-full {
+      max-inline-size: 100%;
+    }
+
+    .max-inline-max {
+      max-inline-size: max-content;
+    }
+
+    .max-inline-none {
+      max-inline-size: none;
+    }
+
+    .max-inline-xl {
+      max-inline-size: var(--container-xl);
+    }
+    "
+  `)
+  expect(
+    await run([
+      'max-inline',
+      'max-inline-auto',
+      '-max-inline-4',
+      '-max-inline-[4px]',
+      'max-inline-none/foo',
+      'max-inline-full/foo',
+      'max-inline-max/foo',
+      'max-inline-max/foo',
+      'max-inline-fit/foo',
+      'max-inline-4/foo',
+      'max-inline-xl/foo',
+      'max-inline-[4px]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('block-size', async () => {
+  expect(
+    await run(
+      [
+        'block-full',
+        'block-auto',
+        'block-screen',
+        'block-svh',
+        'block-lvh',
+        'block-dvh',
+        'block-min',
+        'block-lh',
+        'block-max',
+        'block-fit',
+        'block-4',
+        'block-1/2',
+        'block-[4px]',
+      ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing-4: 1rem;
+    }
+
+    .block-1\\/2 {
+      block-size: 50%;
+    }
+
+    .block-4 {
+      block-size: var(--spacing-4);
+    }
+
+    .block-\\[4px\\] {
+      block-size: 4px;
+    }
+
+    .block-auto {
+      block-size: auto;
+    }
+
+    .block-dvh {
+      block-size: 100dvh;
+    }
+
+    .block-fit {
+      block-size: fit-content;
+    }
+
+    .block-full {
+      block-size: 100%;
+    }
+
+    .block-lh {
+      block-size: 1lh;
+    }
+
+    .block-lvh {
+      block-size: 100lvh;
+    }
+
+    .block-max {
+      block-size: max-content;
+    }
+
+    .block-min {
+      block-size: min-content;
+    }
+
+    .block-screen {
+      block-size: 100vh;
+    }
+
+    .block-svh {
+      block-size: 100svh;
+    }
+    "
+  `)
+  expect(
+    await run([
+      '-block-4',
+      'block--1',
+      'block--1/2',
+      'block--1/-2',
+      'block-1/-2',
+      '-block-1/2',
+      '-block-[4px]',
+      'block-full/foo',
+      'block-auto/foo',
+      'block-screen/foo',
+      'block-svh/foo',
+      'block-lvh/foo',
+      'block-dvh/foo',
+      'block-lh/foo',
+      'block-min/foo',
+      'block-max/foo',
+      'block-fit/foo',
+      'block-4/foo',
+      'block-1/2/foo',
+      'block-[4px]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('min-block-size', async () => {
+  expect(
+    await run(
+      [
+        'min-block-full',
+        'min-block-auto',
+        'min-block-screen',
+        'min-block-svh',
+        'min-block-lvh',
+        'min-block-dvh',
+        'min-block-min',
+        'min-block-lh',
+        'min-block-max',
+        'min-block-fit',
+        'min-block-4',
+        'min-block-[4px]',
+      ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing-4: 1rem;
+    }
+
+    .min-block-4 {
+      min-block-size: var(--spacing-4);
+    }
+
+    .min-block-\\[4px\\] {
+      min-block-size: 4px;
+    }
+
+    .min-block-auto {
+      min-block-size: auto;
+    }
+
+    .min-block-dvh {
+      min-block-size: 100dvh;
+    }
+
+    .min-block-fit {
+      min-block-size: fit-content;
+    }
+
+    .min-block-full {
+      min-block-size: 100%;
+    }
+
+    .min-block-lh {
+      min-block-size: 1lh;
+    }
+
+    .min-block-lvh {
+      min-block-size: 100lvh;
+    }
+
+    .min-block-max {
+      min-block-size: max-content;
+    }
+
+    .min-block-min {
+      min-block-size: min-content;
+    }
+
+    .min-block-screen {
+      min-block-size: 100vh;
+    }
+
+    .min-block-svh {
+      min-block-size: 100svh;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'min-block',
+      '-min-block-4',
+      '-min-block-[4px]',
+      'min-block-auto/foo',
+      'min-block-full/foo',
+      'min-block-screen/foo',
+      'min-block-svh/foo',
+      'min-block-lvh/foo',
+      'min-block-dvh/foo',
+      'min-block-lh/foo',
+      'min-block-min/foo',
+      'min-block-max/foo',
+      'min-block-fit/foo',
+      'min-block-4/foo',
+      'min-block-[4px]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('max-block-size', async () => {
+  expect(
+    await run(
+      [
+        'max-block-none',
+        'max-block-full',
+        'max-block-screen',
+        'max-block-svh',
+        'max-block-lvh',
+        'max-block-dvh',
+        'max-block-lh',
+        'max-block-min',
+        'max-block-max',
+        'max-block-fit',
+        'max-block-4',
+        'max-block-[4px]',
+      ],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing-4: 1rem;
+    }
+
+    .max-block-4 {
+      max-block-size: var(--spacing-4);
+    }
+
+    .max-block-\\[4px\\] {
+      max-block-size: 4px;
+    }
+
+    .max-block-dvh {
+      max-block-size: 100dvh;
+    }
+
+    .max-block-fit {
+      max-block-size: fit-content;
+    }
+
+    .max-block-full {
+      max-block-size: 100%;
+    }
+
+    .max-block-lh {
+      max-block-size: 1lh;
+    }
+
+    .max-block-lvh {
+      max-block-size: 100lvh;
+    }
+
+    .max-block-max {
+      max-block-size: max-content;
+    }
+
+    .max-block-min {
+      max-block-size: min-content;
+    }
+
+    .max-block-none {
+      max-block-size: none;
+    }
+
+    .max-block-screen {
+      max-block-size: 100vh;
+    }
+
+    .max-block-svh {
+      max-block-size: 100svh;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'max-block',
+      'max-block-auto',
+      '-max-block-4',
+      '-max-block-[4px]',
+      'max-block-none/foo',
+      'max-block-full/foo',
+      'max-block-screen/foo',
+      'max-block-svh/foo',
+      'max-block-lvh/foo',
+      'max-block-dvh/foo',
+      'max-block-lh/foo',
+      'max-block-min/foo',
+      'max-block-max/foo',
+      'max-block-fit/foo',
+      'max-block-4/foo',
+      'max-block-[4px]/foo',
+    ]),
+  ).toEqual('')
+})
+
 describe('container', () => {
   test('creates the right media queries and sorts it before width', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['w-1/2', 'container', 'max-w-[var(--breakpoint-sm)]'],
         css`
           @theme {
             --breakpoint-sm: 40rem;
@@ -3176,46 +4566,42 @@ describe('container', () => {
           }
           @tailwind utilities;
         `,
-        ['w-1/2', 'container', 'max-w-[var(--breakpoint-sm)]'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --breakpoint-sm: 40rem;
-        --breakpoint-md: 48rem;
-        --breakpoint-lg: 64rem;
-        --breakpoint-xl: 80rem;
-        --breakpoint-2xl: 96rem;
       }
 
       .container {
         width: 100%;
       }
 
-      @media (width >= 40rem) {
+      @media (min-width: 40rem) {
         .container {
           max-width: 40rem;
         }
       }
 
-      @media (width >= 48rem) {
+      @media (min-width: 48rem) {
         .container {
           max-width: 48rem;
         }
       }
 
-      @media (width >= 64rem) {
+      @media (min-width: 64rem) {
         .container {
           max-width: 64rem;
         }
       }
 
-      @media (width >= 80rem) {
+      @media (min-width: 80rem) {
         .container {
           max-width: 80rem;
         }
       }
 
-      @media (width >= 96rem) {
+      @media (min-width: 96rem) {
         .container {
           max-width: 96rem;
         }
@@ -3227,13 +4613,15 @@ describe('container', () => {
 
       .max-w-\\[var\\(--breakpoint-sm\\)\\] {
         max-width: var(--breakpoint-sm);
-      }"
+      }
+      "
     `)
   })
 
   test('sorts breakpoints based on unit and then in ascending aOrder', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['container'],
         css`
           @theme reference {
             --breakpoint-lg: 64rem;
@@ -3246,60 +4634,62 @@ describe('container', () => {
           }
           @tailwind utilities;
         `,
-        ['container'],
       ),
     ).toMatchInlineSnapshot(`
-      ".container {
+      "
+      .container {
         width: 100%;
       }
 
-      @media (width >= 40em) {
+      @media (min-width: 40em) {
         .container {
           max-width: 40em;
         }
       }
 
-      @media (width >= 48em) {
+      @media (min-width: 48em) {
         .container {
           max-width: 48em;
         }
       }
 
-      @media (width >= 30px) {
+      @media (min-width: 30px) {
         .container {
           max-width: 30px;
         }
       }
 
-      @media (width >= 1600px) {
+      @media (min-width: 1600px) {
         .container {
           max-width: 1600px;
         }
       }
 
-      @media (width >= 64rem) {
+      @media (min-width: 64rem) {
         .container {
           max-width: 64rem;
         }
       }
 
-      @media (width >= 80rem) {
+      @media (min-width: 80rem) {
         .container {
           max-width: 80rem;
         }
       }
 
-      @media (width >= 96rem) {
+      @media (min-width: 96rem) {
         .container {
           max-width: 96rem;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('custom `@utility container` always follow the core utility ', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['w-1/2', 'container', 'max-w-[var(--breakpoint-sm)]'],
         css`
           @theme {
             --breakpoint-sm: 40rem;
@@ -3319,46 +4709,42 @@ describe('container', () => {
             }
           }
         `,
-        ['w-1/2', 'container', 'max-w-[var(--breakpoint-sm)]'],
       ),
     ).toMatchInlineSnapshot(`
-      ":root {
+      "
+      :root, :host {
         --breakpoint-sm: 40rem;
-        --breakpoint-md: 48rem;
-        --breakpoint-lg: 64rem;
-        --breakpoint-xl: 80rem;
-        --breakpoint-2xl: 96rem;
       }
 
       .container {
         width: 100%;
       }
 
-      @media (width >= 40rem) {
+      @media (min-width: 40rem) {
         .container {
           max-width: 40rem;
         }
       }
 
-      @media (width >= 48rem) {
+      @media (min-width: 48rem) {
         .container {
           max-width: 48rem;
         }
       }
 
-      @media (width >= 64rem) {
+      @media (min-width: 64rem) {
         .container {
           max-width: 64rem;
         }
       }
 
-      @media (width >= 80rem) {
+      @media (min-width: 80rem) {
         .container {
           max-width: 80rem;
         }
       }
 
-      @media (width >= 96rem) {
+      @media (min-width: 96rem) {
         .container {
           max-width: 96rem;
         }
@@ -3369,7 +4755,7 @@ describe('container', () => {
         padding-inline: 1rem;
       }
 
-      @media (width >= 40rem) {
+      @media (min-width: 40rem) {
         .container {
           padding-inline: 2rem;
         }
@@ -3381,7 +4767,8 @@ describe('container', () => {
 
       .max-w-\\[var\\(--breakpoint-sm\\)\\] {
         max-width: var(--breakpoint-sm);
-      }"
+      }
+      "
     `)
   })
 })
@@ -3398,7 +4785,8 @@ test('flex', async () => {
       'flex-[123]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".flex-1 {
+    "
+    .flex-1 {
       flex: 1;
     }
 
@@ -3424,7 +4812,8 @@ test('flex', async () => {
 
     .flex-none {
       flex: none;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -3451,7 +4840,8 @@ test('flex', async () => {
 
 test('flex-shrink', async () => {
   expect(await run(['shrink', 'shrink-0', 'shrink-[123]'])).toMatchInlineSnapshot(`
-    ".shrink {
+    "
+    .shrink {
       flex-shrink: 1;
     }
 
@@ -3461,7 +4851,8 @@ test('flex-shrink', async () => {
 
     .shrink-\\[123\\] {
       flex-shrink: 123;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -3480,7 +4871,8 @@ test('flex-shrink', async () => {
 
 test('flex-grow', async () => {
   expect(await run(['grow', 'grow-0', 'grow-[123]'])).toMatchInlineSnapshot(`
-    ".grow {
+    "
+    .grow {
       flex-grow: 1;
     }
 
@@ -3490,7 +4882,8 @@ test('flex-grow', async () => {
 
     .grow-\\[123\\] {
       flex-grow: 123;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -3509,17 +4902,18 @@ test('flex-grow', async () => {
 
 test('flex-basis', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['basis-auto', 'basis-full', 'basis-xl', 'basis-11/12', 'basis-[123px]'],
       css`
         @theme {
           --container-xl: 36rem;
         }
         @tailwind utilities;
       `,
-      ['basis-auto', 'basis-full', 'basis-xl', 'basis-11/12', 'basis-[123px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --container-xl: 36rem;
     }
 
@@ -3541,7 +4935,8 @@ test('flex-basis', async () => {
 
     .basis-xl {
       flex-basis: var(--container-xl);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -3563,13 +4958,15 @@ test('flex-basis', async () => {
 
 test('table-layout', async () => {
   expect(await run(['table-auto', 'table-fixed'])).toMatchInlineSnapshot(`
-    ".table-auto {
+    "
+    .table-auto {
       table-layout: auto;
     }
 
     .table-fixed {
       table-layout: fixed;
-    }"
+    }
+    "
   `)
   expect(await run(['-table-auto', '-table-fixed', 'table-auto/foo', 'table-fixed/foo'])).toEqual(
     '',
@@ -3578,13 +4975,15 @@ test('table-layout', async () => {
 
 test('caption-side', async () => {
   expect(await run(['caption-top', 'caption-bottom'])).toMatchInlineSnapshot(`
-    ".caption-bottom {
+    "
+    .caption-bottom {
       caption-side: bottom;
     }
 
     .caption-top {
       caption-side: top;
-    }"
+    }
+    "
   `)
   expect(
     await run(['-caption-top', '-caption-bottom', 'caption-top/foo', 'caption-bottom/foo']),
@@ -3593,13 +4992,15 @@ test('caption-side', async () => {
 
 test('border-collapse', async () => {
   expect(await run(['border-collapse', 'border-separate'])).toMatchInlineSnapshot(`
-    ".border-collapse {
+    "
+    .border-collapse {
       border-collapse: collapse;
     }
 
     .border-separate {
       border-collapse: separate;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -3613,17 +5014,27 @@ test('border-collapse', async () => {
 
 test('border-spacing', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['border-spacing-1', 'border-spacing-[123px]'],
       css`
         @theme {
           --spacing-1: 0.25rem;
         }
         @tailwind utilities;
       `,
-      ['border-spacing-1', 'border-spacing-[123px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-border-spacing-x: 0;
+          --tw-border-spacing-y: 0;
+        }
+      }
+    }
+
+    :root, :host {
       --spacing-1: .25rem;
     }
 
@@ -3639,15 +5050,6 @@ test('border-spacing', async () => {
       border-spacing: var(--tw-border-spacing-x) var(--tw-border-spacing-y);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-border-spacing-x: 0;
-          --tw-border-spacing-y: 0;
-        }
-      }
-    }
-
     @property --tw-border-spacing-x {
       syntax: "<length>";
       inherits: false;
@@ -3658,7 +5060,8 @@ test('border-spacing', async () => {
       syntax: "<length>";
       inherits: false;
       initial-value: 0;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -3673,17 +5076,27 @@ test('border-spacing', async () => {
 
 test('border-spacing-x', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['border-spacing-x-1', 'border-spacing-x-[123px]'],
       css`
         @theme {
           --spacing-1: 0.25rem;
         }
         @tailwind utilities;
       `,
-      ['border-spacing-x-1', 'border-spacing-x-[123px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-border-spacing-x: 0;
+          --tw-border-spacing-y: 0;
+        }
+      }
+    }
+
+    :root, :host {
       --spacing-1: .25rem;
     }
 
@@ -3697,15 +5110,6 @@ test('border-spacing-x', async () => {
       border-spacing: var(--tw-border-spacing-x) var(--tw-border-spacing-y);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-border-spacing-x: 0;
-          --tw-border-spacing-y: 0;
-        }
-      }
-    }
-
     @property --tw-border-spacing-x {
       syntax: "<length>";
       inherits: false;
@@ -3716,7 +5120,8 @@ test('border-spacing-x', async () => {
       syntax: "<length>";
       inherits: false;
       initial-value: 0;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -3731,17 +5136,27 @@ test('border-spacing-x', async () => {
 
 test('border-spacing-y', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['border-spacing-y-1', 'border-spacing-y-[123px]'],
       css`
         @theme {
           --spacing-1: 0.25rem;
         }
         @tailwind utilities;
       `,
-      ['border-spacing-y-1', 'border-spacing-y-[123px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-border-spacing-x: 0;
+          --tw-border-spacing-y: 0;
+        }
+      }
+    }
+
+    :root, :host {
       --spacing-1: .25rem;
     }
 
@@ -3755,15 +5170,6 @@ test('border-spacing-y', async () => {
       border-spacing: var(--tw-border-spacing-x) var(--tw-border-spacing-y);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-border-spacing-x: 0;
-          --tw-border-spacing-y: 0;
-        }
-      }
-    }
-
     @property --tw-border-spacing-x {
       syntax: "<length>";
       inherits: false;
@@ -3774,7 +5180,8 @@ test('border-spacing-y', async () => {
       syntax: "<length>";
       inherits: false;
       initial-value: 0;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -3803,7 +5210,8 @@ test('origin', async () => {
       'origin-[var(--value)]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".origin-\\[50px_100px\\] {
+    "
+    .origin-\\[50px_100px\\] {
       transform-origin: 50px 100px;
     }
 
@@ -3845,7 +5253,8 @@ test('origin', async () => {
 
     .origin-top-right {
       transform-origin: 100% 0;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -3864,6 +5273,28 @@ test('origin', async () => {
       'origin-[var(--value)]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['origin-top'],
+      css`
+        @theme {
+          --transform-origin-top: 10px 20px;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --transform-origin-top: 10px 20px;
+    }
+
+    .origin-top {
+      transform-origin: var(--transform-origin-top);
+    }
+    "
+  `)
 })
 
 test('perspective-origin', async () => {
@@ -3882,7 +5313,8 @@ test('perspective-origin', async () => {
       'perspective-origin-[var(--value)]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".perspective-origin-\\[50px_100px\\] {
+    "
+    .perspective-origin-\\[50px_100px\\] {
       perspective-origin: 50px 100px;
     }
 
@@ -3924,7 +5356,8 @@ test('perspective-origin', async () => {
 
     .perspective-origin-top-right {
       perspective-origin: 100% 0;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -3943,6 +5376,29 @@ test('perspective-origin', async () => {
       'perspective-origin-[var(--value)]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['perspective-origin-top'],
+      css`
+        @theme {
+          --perspective-origin-top: 10px 20px;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --perspective-origin-top: 10px 20px;
+    }
+
+    .perspective-origin-top {
+      perspective-origin: var(--perspective-origin-top);
+      perspective: var(--perspective-origin-top);
+    }
+    "
+  `)
 })
 
 test('translate', async () => {
@@ -3955,7 +5411,18 @@ test('translate', async () => {
       '-translate-[var(--value)]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".-translate-\\[var\\(--value\\)\\] {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-translate-x: 0;
+          --tw-translate-y: 0;
+          --tw-translate-z: 0;
+        }
+      }
+    }
+
+    .-translate-\\[var\\(--value\\)\\] {
       --tw-translate-x: calc(var(--value) * -1);
       --tw-translate-y: calc(var(--value) * -1);
       translate: var(--tw-translate-x) var(--tw-translate-y);
@@ -3985,16 +5452,6 @@ test('translate', async () => {
       translate: var(--tw-translate-x) var(--tw-translate-y);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-translate-x: 0;
-          --tw-translate-y: 0;
-          --tw-translate-z: 0;
-        }
-      }
-    }
-
     @property --tw-translate-x {
       syntax: "*";
       inherits: false;
@@ -4011,7 +5468,8 @@ test('translate', async () => {
       syntax: "*";
       inherits: false;
       initial-value: 0;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -4038,28 +5496,9 @@ test('translate-x', async () => {
       '-translate-x-[var(--value)]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".-translate-x-\\[var\\(--value\\)\\] {
-      --tw-translate-x: calc(var(--value) * -1);
-      translate: var(--tw-translate-x) var(--tw-translate-y);
-    }
-
-    .-translate-x-full {
-      --tw-translate-x: -100%;
-      translate: var(--tw-translate-x) var(--tw-translate-y);
-    }
-
-    .translate-x-full {
-      --tw-translate-x: 100%;
-      translate: var(--tw-translate-x) var(--tw-translate-y);
-    }
-
-    .translate-x-px {
-      --tw-translate-x: 1px;
-      translate: var(--tw-translate-x) var(--tw-translate-y);
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-translate-x: 0;
           --tw-translate-y: 0;
@@ -4068,53 +5507,6 @@ test('translate-x', async () => {
       }
     }
 
-    @property --tw-translate-x {
-      syntax: "*";
-      inherits: false;
-      initial-value: 0;
-    }
-
-    @property --tw-translate-y {
-      syntax: "*";
-      inherits: false;
-      initial-value: 0;
-    }
-
-    @property --tw-translate-z {
-      syntax: "*";
-      inherits: false;
-      initial-value: 0;
-    }"
-  `)
-  expect(
-    await run([
-      'translate-x',
-      'translate-x--1',
-      'translate-x--1/2',
-      'translate-x--1/-2',
-      'translate-x-1/-2',
-      'translate-x-full/foo',
-      '-translate-x-full/foo',
-      'translate-x-px/foo',
-      '-translate-x-[var(--value)]/foo',
-    ]),
-  ).toEqual('')
-
-  expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing: 0.25rem;
-        }
-        @tailwind utilities;
-      `,
-      ['translate-x-full', '-translate-x-full', 'translate-x-px', '-translate-x-[var(--value)]'],
-    ),
-  ).toMatchInlineSnapshot(`
-    ":root {
-      --spacing: .25rem;
-    }
-
     .-translate-x-\\[var\\(--value\\)\\] {
       --tw-translate-x: calc(var(--value) * -1);
       translate: var(--tw-translate-x) var(--tw-translate-y);
@@ -4135,8 +5527,53 @@ test('translate-x', async () => {
       translate: var(--tw-translate-x) var(--tw-translate-y);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
+    @property --tw-translate-x {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0;
+    }
+
+    @property --tw-translate-y {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0;
+    }
+
+    @property --tw-translate-z {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'translate-x',
+      'translate-x--1',
+      'translate-x--1/2',
+      'translate-x--1/-2',
+      'translate-x-1/-2',
+      'translate-x-full/foo',
+      '-translate-x-full/foo',
+      'translate-x-px/foo',
+      '-translate-x-[var(--value)]/foo',
+    ]),
+  ).toEqual('')
+
+  expect(
+    await run(
+      ['translate-x-full', '-translate-x-full', 'translate-x-px', '-translate-x-[var(--value)]'],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-translate-x: 0;
           --tw-translate-y: 0;
@@ -4145,6 +5582,26 @@ test('translate-x', async () => {
       }
     }
 
+    .-translate-x-\\[var\\(--value\\)\\] {
+      --tw-translate-x: calc(var(--value) * -1);
+      translate: var(--tw-translate-x) var(--tw-translate-y);
+    }
+
+    .-translate-x-full {
+      --tw-translate-x: -100%;
+      translate: var(--tw-translate-x) var(--tw-translate-y);
+    }
+
+    .translate-x-full {
+      --tw-translate-x: 100%;
+      translate: var(--tw-translate-x) var(--tw-translate-y);
+    }
+
+    .translate-x-px {
+      --tw-translate-x: 1px;
+      translate: var(--tw-translate-x) var(--tw-translate-y);
+    }
+
     @property --tw-translate-x {
       syntax: "*";
       inherits: false;
@@ -4161,7 +5618,8 @@ test('translate-x', async () => {
       syntax: "*";
       inherits: false;
       initial-value: 0;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -4186,28 +5644,9 @@ test('translate-y', async () => {
       '-translate-y-[var(--value)]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".-translate-y-\\[var\\(--value\\)\\] {
-      --tw-translate-y: calc(var(--value) * -1);
-      translate: var(--tw-translate-x) var(--tw-translate-y);
-    }
-
-    .-translate-y-full {
-      --tw-translate-y: -100%;
-      translate: var(--tw-translate-x) var(--tw-translate-y);
-    }
-
-    .translate-y-full {
-      --tw-translate-y: 100%;
-      translate: var(--tw-translate-x) var(--tw-translate-y);
-    }
-
-    .translate-y-px {
-      --tw-translate-y: 1px;
-      translate: var(--tw-translate-x) var(--tw-translate-y);
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-translate-x: 0;
           --tw-translate-y: 0;
@@ -4216,53 +5655,6 @@ test('translate-y', async () => {
       }
     }
 
-    @property --tw-translate-x {
-      syntax: "*";
-      inherits: false;
-      initial-value: 0;
-    }
-
-    @property --tw-translate-y {
-      syntax: "*";
-      inherits: false;
-      initial-value: 0;
-    }
-
-    @property --tw-translate-z {
-      syntax: "*";
-      inherits: false;
-      initial-value: 0;
-    }"
-  `)
-  expect(
-    await run([
-      'translate-y',
-      'translate-y--1',
-      'translate-y--1/2',
-      'translate-y--1/-2',
-      'translate-y-1/-2',
-      'translate-y-full/foo',
-      '-translate-y-full/foo',
-      'translate-y-px/foo',
-      '-translate-y-[var(--value)]/foo',
-    ]),
-  ).toEqual('')
-
-  expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing: 0.25rem;
-        }
-        @tailwind utilities;
-      `,
-      ['translate-y-full', '-translate-y-full', 'translate-y-px', '-translate-y-[var(--value)]'],
-    ),
-  ).toMatchInlineSnapshot(`
-    ":root {
-      --spacing: .25rem;
-    }
-
     .-translate-y-\\[var\\(--value\\)\\] {
       --tw-translate-y: calc(var(--value) * -1);
       translate: var(--tw-translate-x) var(--tw-translate-y);
@@ -4283,8 +5675,53 @@ test('translate-y', async () => {
       translate: var(--tw-translate-x) var(--tw-translate-y);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
+    @property --tw-translate-x {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0;
+    }
+
+    @property --tw-translate-y {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0;
+    }
+
+    @property --tw-translate-z {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'translate-y',
+      'translate-y--1',
+      'translate-y--1/2',
+      'translate-y--1/-2',
+      'translate-y-1/-2',
+      'translate-y-full/foo',
+      '-translate-y-full/foo',
+      'translate-y-px/foo',
+      '-translate-y-[var(--value)]/foo',
+    ]),
+  ).toEqual('')
+
+  expect(
+    await run(
+      ['translate-y-full', '-translate-y-full', 'translate-y-px', '-translate-y-[var(--value)]'],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-translate-x: 0;
           --tw-translate-y: 0;
@@ -4293,6 +5730,26 @@ test('translate-y', async () => {
       }
     }
 
+    .-translate-y-\\[var\\(--value\\)\\] {
+      --tw-translate-y: calc(var(--value) * -1);
+      translate: var(--tw-translate-x) var(--tw-translate-y);
+    }
+
+    .-translate-y-full {
+      --tw-translate-y: -100%;
+      translate: var(--tw-translate-x) var(--tw-translate-y);
+    }
+
+    .translate-y-full {
+      --tw-translate-y: 100%;
+      translate: var(--tw-translate-x) var(--tw-translate-y);
+    }
+
+    .translate-y-px {
+      --tw-translate-y: 1px;
+      translate: var(--tw-translate-x) var(--tw-translate-y);
+    }
+
     @property --tw-translate-x {
       syntax: "*";
       inherits: false;
@@ -4309,7 +5766,8 @@ test('translate-y', async () => {
       syntax: "*";
       inherits: false;
       initial-value: 0;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -4326,45 +5784,53 @@ test('translate-y', async () => {
 })
 
 test('translate-z', async () => {
-  expect(await run(['translate-y-px', '-translate-z-[var(--value)]'])).toMatchInlineSnapshot(`
-    ".translate-y-px {
-      --tw-translate-y: 1px;
-      translate: var(--tw-translate-x) var(--tw-translate-y);
-    }
-
-    .-translate-z-\\[var\\(--value\\)\\] {
-      --tw-translate-z: calc(var(--value) * -1);
-      translate: var(--tw-translate-x) var(--tw-translate-y) var(--tw-translate-z);
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-translate-x: 0;
-          --tw-translate-y: 0;
-          --tw-translate-z: 0;
+  expect(await run(['-translate-z-px', 'translate-z-px', '-translate-z-[var(--value)]']))
+    .toMatchInlineSnapshot(`
+      "
+      @layer properties {
+        @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+          *, :before, :after, ::backdrop {
+            --tw-translate-x: 0;
+            --tw-translate-y: 0;
+            --tw-translate-z: 0;
+          }
         }
       }
-    }
 
-    @property --tw-translate-x {
-      syntax: "*";
-      inherits: false;
-      initial-value: 0;
-    }
+      .-translate-z-\\[var\\(--value\\)\\] {
+        --tw-translate-z: calc(var(--value) * -1);
+        translate: var(--tw-translate-x) var(--tw-translate-y) var(--tw-translate-z);
+      }
 
-    @property --tw-translate-y {
-      syntax: "*";
-      inherits: false;
-      initial-value: 0;
-    }
+      .-translate-z-px {
+        --tw-translate-z: -1px;
+        translate: var(--tw-translate-x) var(--tw-translate-y) var(--tw-translate-z);
+      }
 
-    @property --tw-translate-z {
-      syntax: "*";
-      inherits: false;
-      initial-value: 0;
-    }"
-  `)
+      .translate-z-px {
+        --tw-translate-z: 1px;
+        translate: var(--tw-translate-x) var(--tw-translate-y) var(--tw-translate-z);
+      }
+
+      @property --tw-translate-x {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0;
+      }
+
+      @property --tw-translate-y {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0;
+      }
+
+      @property --tw-translate-z {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0;
+      }
+      "
+    `)
   expect(
     await run([
       'translate-z',
@@ -4383,12 +5849,9 @@ test('translate-z', async () => {
 
 test('translate-3d', async () => {
   expect(await run(['translate-3d'])).toMatchInlineSnapshot(`
-    ".translate-3d {
-      translate: var(--tw-translate-x) var(--tw-translate-y) var(--tw-translate-z);
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-translate-x: 0;
           --tw-translate-y: 0;
@@ -4397,6 +5860,10 @@ test('translate-3d', async () => {
       }
     }
 
+    .translate-3d {
+      translate: var(--tw-translate-x) var(--tw-translate-y) var(--tw-translate-z);
+    }
+
     @property --tw-translate-x {
       syntax: "*";
       inherits: false;
@@ -4413,18 +5880,41 @@ test('translate-3d', async () => {
       syntax: "*";
       inherits: false;
       initial-value: 0;
-    }"
+    }
+    "
   `)
   expect(await run(['-translate-3d', 'translate-3d/foo'])).toEqual('')
 })
 
 test('rotate', async () => {
-  expect(await run(['rotate-45', '-rotate-45', 'rotate-[123deg]', 'rotate-[0.3_0.7_1_45deg]']))
-    .toMatchInlineSnapshot(`
-    ".-rotate-45 {
+  expect(
+    await run([
+      'rotate-45',
+      '-rotate-45',
+      'rotate-[123deg]',
+      'rotate-[0.3_0.7_1_45deg]',
+      'rotate-(--var)',
+      '-rotate-[123deg]',
+      '-rotate-(--var)',
+    ]),
+  ).toMatchInlineSnapshot(`
+    "
+    .-rotate-\\(--var\\) {
+      rotate: calc(var(--var) * -1);
+    }
+
+    .-rotate-45 {
       rotate: -45deg;
     }
 
+    .-rotate-\\[123deg\\] {
+      rotate: -123deg;
+    }
+
+    .rotate-\\(--var\\) {
+      rotate: var(--var);
+    }
+
     .rotate-45 {
       rotate: 45deg;
     }
@@ -4435,7 +5925,8 @@ test('rotate', async () => {
 
     .rotate-\\[123deg\\] {
       rotate: 123deg;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -4452,63 +5943,78 @@ test('rotate', async () => {
 })
 
 test('rotate-x', async () => {
-  expect(await run(['rotate-x-45', '-rotate-x-45', 'rotate-x-[123deg]'])).toMatchInlineSnapshot(`
-    ".-rotate-x-45 {
-      --tw-rotate-x: rotateX(calc(45deg * -1));
-      transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-    }
-
-    .rotate-x-45 {
-      --tw-rotate-x: rotateX(45deg);
-      transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-    }
-
-    .rotate-x-\\[123deg\\] {
-      --tw-rotate-x: rotateX(123deg);
-      transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
+  expect(
+    await run([
+      'rotate-x-45',
+      '-rotate-x-45',
+      'rotate-x-[123deg]',
+      'rotate-x-(--var)',
+      '-rotate-x-(--var)',
+    ]),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
-          --tw-rotate-x: rotateX(0);
-          --tw-rotate-y: rotateY(0);
-          --tw-rotate-z: rotateZ(0);
-          --tw-skew-x: skewX(0);
-          --tw-skew-y: skewY(0);
+          --tw-rotate-x: initial;
+          --tw-rotate-y: initial;
+          --tw-rotate-z: initial;
+          --tw-skew-x: initial;
+          --tw-skew-y: initial;
         }
       }
     }
 
+    .-rotate-x-\\(--var\\) {
+      --tw-rotate-x: rotateX(calc(var(--var) * -1));
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
+    .-rotate-x-45 {
+      --tw-rotate-x: rotateX(calc(45deg * -1));
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
+    .rotate-x-\\(--var\\) {
+      --tw-rotate-x: rotateX(var(--var));
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
+    .rotate-x-45 {
+      --tw-rotate-x: rotateX(45deg);
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
+    .rotate-x-\\[123deg\\] {
+      --tw-rotate-x: rotateX(123deg);
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
     @property --tw-rotate-x {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateX(0);
+      inherits: false
     }
 
     @property --tw-rotate-y {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateY(0);
+      inherits: false
     }
 
     @property --tw-rotate-z {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateZ(0);
+      inherits: false
     }
 
     @property --tw-skew-x {
       syntax: "*";
-      inherits: false;
-      initial-value: skewX(0);
+      inherits: false
     }
 
     @property --tw-skew-y {
       syntax: "*";
-      inherits: false;
-      initial-value: skewY(0);
-    }"
+      inherits: false
+    }
+    "
   `)
   expect(
     await run([
@@ -4524,70 +6030,85 @@ test('rotate-x', async () => {
 })
 
 test('rotate-y', async () => {
-  expect(await run(['rotate-y-45', '-rotate-y-45', 'rotate-y-[123deg]', '-rotate-y-[123deg]']))
-    .toMatchInlineSnapshot(`
-      ".-rotate-y-45 {
-        --tw-rotate-y: rotateY(calc(45deg * -1));
-        transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-      }
-
-      .-rotate-y-\\[123deg\\] {
-        --tw-rotate-y: rotateY(calc(123deg * -1));
-        transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-      }
-
-      .rotate-y-45 {
-        --tw-rotate-y: rotateY(45deg);
-        transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-      }
-
-      .rotate-y-\\[123deg\\] {
-        --tw-rotate-y: rotateY(123deg);
-        transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-      }
-
-      @supports (-moz-orient: inline) {
-        @layer base {
-          *, :before, :after, ::backdrop {
-            --tw-rotate-x: rotateX(0);
-            --tw-rotate-y: rotateY(0);
-            --tw-rotate-z: rotateZ(0);
-            --tw-skew-x: skewX(0);
-            --tw-skew-y: skewY(0);
-          }
+  expect(
+    await run([
+      'rotate-y-45',
+      'rotate-y-[123deg]',
+      'rotate-y-(--var)',
+      '-rotate-y-45',
+      '-rotate-y-[123deg]',
+      '-rotate-y-(--var)',
+    ]),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-rotate-x: initial;
+          --tw-rotate-y: initial;
+          --tw-rotate-z: initial;
+          --tw-skew-x: initial;
+          --tw-skew-y: initial;
         }
       }
+    }
 
-      @property --tw-rotate-x {
-        syntax: "*";
-        inherits: false;
-        initial-value: rotateX(0);
-      }
+    .-rotate-y-\\(--var\\) {
+      --tw-rotate-y: rotateY(calc(var(--var) * -1));
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
 
-      @property --tw-rotate-y {
-        syntax: "*";
-        inherits: false;
-        initial-value: rotateY(0);
-      }
+    .-rotate-y-45 {
+      --tw-rotate-y: rotateY(calc(45deg * -1));
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
 
-      @property --tw-rotate-z {
-        syntax: "*";
-        inherits: false;
-        initial-value: rotateZ(0);
-      }
+    .-rotate-y-\\[123deg\\] {
+      --tw-rotate-y: rotateY(calc(123deg * -1));
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
 
-      @property --tw-skew-x {
-        syntax: "*";
-        inherits: false;
-        initial-value: skewX(0);
-      }
+    .rotate-y-\\(--var\\) {
+      --tw-rotate-y: rotateY(var(--var));
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
 
-      @property --tw-skew-y {
-        syntax: "*";
-        inherits: false;
-        initial-value: skewY(0);
-      }"
-    `)
+    .rotate-y-45 {
+      --tw-rotate-y: rotateY(45deg);
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
+    .rotate-y-\\[123deg\\] {
+      --tw-rotate-y: rotateY(123deg);
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
+    @property --tw-rotate-x {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-rotate-y {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-rotate-z {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-skew-x {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-skew-y {
+      syntax: "*";
+      inherits: false
+    }
+    "
+  `)
   expect(
     await run([
       'rotate-y',
@@ -4602,70 +6123,85 @@ test('rotate-y', async () => {
 })
 
 test('rotate-z', async () => {
-  expect(await run(['rotate-z-45', '-rotate-z-45', 'rotate-z-[123deg]', '-rotate-z-[123deg]']))
-    .toMatchInlineSnapshot(`
-      ".-rotate-z-45 {
-        --tw-rotate-z: rotateZ(calc(45deg * -1));
-        transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-      }
-
-      .-rotate-z-\\[123deg\\] {
-        --tw-rotate-z: rotateZ(calc(123deg * -1));
-        transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-      }
-
-      .rotate-z-45 {
-        --tw-rotate-z: rotateZ(45deg);
-        transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-      }
-
-      .rotate-z-\\[123deg\\] {
-        --tw-rotate-z: rotateZ(123deg);
-        transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-      }
-
-      @supports (-moz-orient: inline) {
-        @layer base {
-          *, :before, :after, ::backdrop {
-            --tw-rotate-x: rotateX(0);
-            --tw-rotate-y: rotateY(0);
-            --tw-rotate-z: rotateZ(0);
-            --tw-skew-x: skewX(0);
-            --tw-skew-y: skewY(0);
-          }
+  expect(
+    await run([
+      'rotate-z-45',
+      'rotate-z-[123deg]',
+      'rotate-z-(--var)',
+      '-rotate-z-45',
+      '-rotate-z-[123deg]',
+      '-rotate-z-(--var)',
+    ]),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-rotate-x: initial;
+          --tw-rotate-y: initial;
+          --tw-rotate-z: initial;
+          --tw-skew-x: initial;
+          --tw-skew-y: initial;
         }
       }
+    }
 
-      @property --tw-rotate-x {
-        syntax: "*";
-        inherits: false;
-        initial-value: rotateX(0);
-      }
+    .-rotate-z-\\(--var\\) {
+      --tw-rotate-z: rotateZ(calc(var(--var) * -1));
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
 
-      @property --tw-rotate-y {
-        syntax: "*";
-        inherits: false;
-        initial-value: rotateY(0);
-      }
+    .-rotate-z-45 {
+      --tw-rotate-z: rotateZ(calc(45deg * -1));
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
 
-      @property --tw-rotate-z {
-        syntax: "*";
-        inherits: false;
-        initial-value: rotateZ(0);
-      }
+    .-rotate-z-\\[123deg\\] {
+      --tw-rotate-z: rotateZ(calc(123deg * -1));
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
 
-      @property --tw-skew-x {
-        syntax: "*";
-        inherits: false;
-        initial-value: skewX(0);
-      }
+    .rotate-z-\\(--var\\) {
+      --tw-rotate-z: rotateZ(var(--var));
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
 
-      @property --tw-skew-y {
-        syntax: "*";
-        inherits: false;
-        initial-value: skewY(0);
-      }"
-    `)
+    .rotate-z-45 {
+      --tw-rotate-z: rotateZ(45deg);
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
+    .rotate-z-\\[123deg\\] {
+      --tw-rotate-z: rotateZ(123deg);
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
+    @property --tw-rotate-x {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-rotate-y {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-rotate-z {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-skew-x {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-skew-y {
+      syntax: "*";
+      inherits: false
+    }
+    "
+  `)
   expect(
     await run([
       'rotate-z',
@@ -4681,65 +6217,62 @@ test('rotate-z', async () => {
 
 test('skew', async () => {
   expect(await run(['skew-6', '-skew-6', 'skew-[123deg]'])).toMatchInlineSnapshot(`
-    ".-skew-6 {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-rotate-x: initial;
+          --tw-rotate-y: initial;
+          --tw-rotate-z: initial;
+          --tw-skew-x: initial;
+          --tw-skew-y: initial;
+        }
+      }
+    }
+
+    .-skew-6 {
       --tw-skew-x: skewX(calc(6deg * -1));
       --tw-skew-y: skewY(calc(6deg * -1));
-      transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
     }
 
     .skew-6 {
       --tw-skew-x: skewX(6deg);
       --tw-skew-y: skewY(6deg);
-      transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
     }
 
     .skew-\\[123deg\\] {
       --tw-skew-x: skewX(123deg);
       --tw-skew-y: skewY(123deg);
-      transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-rotate-x: rotateX(0);
-          --tw-rotate-y: rotateY(0);
-          --tw-rotate-z: rotateZ(0);
-          --tw-skew-x: skewX(0);
-          --tw-skew-y: skewY(0);
-        }
-      }
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
     }
 
     @property --tw-rotate-x {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateX(0);
+      inherits: false
     }
 
     @property --tw-rotate-y {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateY(0);
+      inherits: false
     }
 
     @property --tw-rotate-z {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateZ(0);
+      inherits: false
     }
 
     @property --tw-skew-x {
       syntax: "*";
-      inherits: false;
-      initial-value: skewX(0);
+      inherits: false
     }
 
     @property --tw-skew-y {
       syntax: "*";
-      inherits: false;
-      initial-value: skewY(0);
-    }"
+      inherits: false
+    }
+    "
   `)
   expect(
     await run([
@@ -4755,62 +6288,59 @@ test('skew', async () => {
 
 test('skew-x', async () => {
   expect(await run(['skew-x-6', '-skew-x-6', 'skew-x-[123deg]'])).toMatchInlineSnapshot(`
-    ".-skew-x-6 {
-      --tw-skew-x: skewX(calc(6deg * -1));
-      transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-    }
-
-    .skew-x-6 {
-      --tw-skew-x: skewX(6deg);
-      transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-    }
-
-    .skew-x-\\[123deg\\] {
-      --tw-skew-x: skewX(123deg);
-      transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
-          --tw-rotate-x: rotateX(0);
-          --tw-rotate-y: rotateY(0);
-          --tw-rotate-z: rotateZ(0);
-          --tw-skew-x: skewX(0);
-          --tw-skew-y: skewY(0);
+          --tw-rotate-x: initial;
+          --tw-rotate-y: initial;
+          --tw-rotate-z: initial;
+          --tw-skew-x: initial;
+          --tw-skew-y: initial;
         }
       }
     }
 
+    .-skew-x-6 {
+      --tw-skew-x: skewX(calc(6deg * -1));
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
+    .skew-x-6 {
+      --tw-skew-x: skewX(6deg);
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
+    .skew-x-\\[123deg\\] {
+      --tw-skew-x: skewX(123deg);
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
     @property --tw-rotate-x {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateX(0);
+      inherits: false
     }
 
     @property --tw-rotate-y {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateY(0);
+      inherits: false
     }
 
     @property --tw-rotate-z {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateZ(0);
+      inherits: false
     }
 
     @property --tw-skew-x {
       syntax: "*";
-      inherits: false;
-      initial-value: skewX(0);
+      inherits: false
     }
 
     @property --tw-skew-y {
       syntax: "*";
-      inherits: false;
-      initial-value: skewY(0);
-    }"
+      inherits: false
+    }
+    "
   `)
   expect(
     await run([
@@ -4826,62 +6356,59 @@ test('skew-x', async () => {
 
 test('skew-y', async () => {
   expect(await run(['skew-y-6', '-skew-y-6', 'skew-y-[123deg]'])).toMatchInlineSnapshot(`
-    ".-skew-y-6 {
-      --tw-skew-y: skewY(calc(6deg * -1));
-      transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-    }
-
-    .skew-y-6 {
-      --tw-skew-y: skewY(6deg);
-      transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-    }
-
-    .skew-y-\\[123deg\\] {
-      --tw-skew-y: skewY(123deg);
-      transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
-          --tw-rotate-x: rotateX(0);
-          --tw-rotate-y: rotateY(0);
-          --tw-rotate-z: rotateZ(0);
-          --tw-skew-x: skewX(0);
-          --tw-skew-y: skewY(0);
+          --tw-rotate-x: initial;
+          --tw-rotate-y: initial;
+          --tw-rotate-z: initial;
+          --tw-skew-x: initial;
+          --tw-skew-y: initial;
         }
       }
     }
 
+    .-skew-y-6 {
+      --tw-skew-y: skewY(calc(6deg * -1));
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
+    .skew-y-6 {
+      --tw-skew-y: skewY(6deg);
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
+    .skew-y-\\[123deg\\] {
+      --tw-skew-y: skewY(123deg);
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
+    }
+
     @property --tw-rotate-x {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateX(0);
+      inherits: false
     }
 
     @property --tw-rotate-y {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateY(0);
+      inherits: false
     }
 
     @property --tw-rotate-z {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateZ(0);
+      inherits: false
     }
 
     @property --tw-skew-x {
       syntax: "*";
-      inherits: false;
-      initial-value: skewX(0);
+      inherits: false
     }
 
     @property --tw-skew-y {
       syntax: "*";
-      inherits: false;
-      initial-value: skewY(0);
-    }"
+      inherits: false
+    }
+    "
   `)
   expect(
     await run([
@@ -4898,7 +6425,18 @@ test('skew-y', async () => {
 test('scale', async () => {
   expect(await run(['scale-50', '-scale-50', 'scale-[2]', 'scale-[2_1.5_3]']))
     .toMatchInlineSnapshot(`
-      ".-scale-50 {
+      "
+      @layer properties {
+        @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+          *, :before, :after, ::backdrop {
+            --tw-scale-x: 1;
+            --tw-scale-y: 1;
+            --tw-scale-z: 1;
+          }
+        }
+      }
+
+      .-scale-50 {
         --tw-scale-x: calc(50% * -1);
         --tw-scale-y: calc(50% * -1);
         --tw-scale-z: calc(50% * -1);
@@ -4920,16 +6458,6 @@ test('scale', async () => {
         scale: 2 1.5 3;
       }
 
-      @supports (-moz-orient: inline) {
-        @layer base {
-          *, :before, :after, ::backdrop {
-            --tw-scale-x: 1;
-            --tw-scale-y: 1;
-            --tw-scale-z: 1;
-          }
-        }
-      }
-
       @property --tw-scale-x {
         syntax: "*";
         inherits: false;
@@ -4946,7 +6474,8 @@ test('scale', async () => {
         syntax: "*";
         inherits: false;
         initial-value: 1;
-      }"
+      }
+      "
     `)
   expect(
     await run([
@@ -4964,12 +6493,9 @@ test('scale', async () => {
 
 test('scale-3d', async () => {
   expect(await run(['scale-3d'])).toMatchInlineSnapshot(`
-    ".scale-3d {
-      scale: var(--tw-scale-x) var(--tw-scale-y) var(--tw-scale-z);
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-scale-x: 1;
           --tw-scale-y: 1;
@@ -4978,6 +6504,10 @@ test('scale-3d', async () => {
       }
     }
 
+    .scale-3d {
+      scale: var(--tw-scale-x) var(--tw-scale-y) var(--tw-scale-z);
+    }
+
     @property --tw-scale-x {
       syntax: "*";
       inherits: false;
@@ -4994,14 +6524,26 @@ test('scale-3d', async () => {
       syntax: "*";
       inherits: false;
       initial-value: 1;
-    }"
+    }
+    "
   `)
   expect(await run(['-scale-3d', 'scale-3d/foo'])).toEqual('')
 })
 
 test('scale-x', async () => {
   expect(await run(['scale-x-50', '-scale-x-50', 'scale-x-[2]'])).toMatchInlineSnapshot(`
-    ".-scale-x-50 {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-scale-x: 1;
+          --tw-scale-y: 1;
+          --tw-scale-z: 1;
+        }
+      }
+    }
+
+    .-scale-x-50 {
       --tw-scale-x: calc(50% * -1);
       scale: var(--tw-scale-x) var(--tw-scale-y);
     }
@@ -5016,16 +6558,6 @@ test('scale-x', async () => {
       scale: var(--tw-scale-x) var(--tw-scale-y);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-scale-x: 1;
-          --tw-scale-y: 1;
-          --tw-scale-z: 1;
-        }
-      }
-    }
-
     @property --tw-scale-x {
       syntax: "*";
       inherits: false;
@@ -5042,10 +6574,22 @@ test('scale-x', async () => {
       syntax: "*";
       inherits: false;
       initial-value: 1;
-    }"
+    }
+    "
   `)
   expect(await run(['scale-200', 'scale-x-400'])).toMatchInlineSnapshot(`
-    ".scale-200 {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-scale-x: 1;
+          --tw-scale-y: 1;
+          --tw-scale-z: 1;
+        }
+      }
+    }
+
+    .scale-200 {
       --tw-scale-x: 200%;
       --tw-scale-y: 200%;
       --tw-scale-z: 200%;
@@ -5057,16 +6601,6 @@ test('scale-x', async () => {
       scale: var(--tw-scale-x) var(--tw-scale-y);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-scale-x: 1;
-          --tw-scale-y: 1;
-          --tw-scale-z: 1;
-        }
-      }
-    }
-
     @property --tw-scale-x {
       syntax: "*";
       inherits: false;
@@ -5083,7 +6617,8 @@ test('scale-x', async () => {
       syntax: "*";
       inherits: false;
       initial-value: 1;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -5102,7 +6637,18 @@ test('scale-x', async () => {
 
 test('scale-y', async () => {
   expect(await run(['scale-y-50', '-scale-y-50', 'scale-y-[2]'])).toMatchInlineSnapshot(`
-    ".-scale-y-50 {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-scale-x: 1;
+          --tw-scale-y: 1;
+          --tw-scale-z: 1;
+        }
+      }
+    }
+
+    .-scale-y-50 {
       --tw-scale-y: calc(50% * -1);
       scale: var(--tw-scale-x) var(--tw-scale-y);
     }
@@ -5117,16 +6663,6 @@ test('scale-y', async () => {
       scale: var(--tw-scale-x) var(--tw-scale-y);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-scale-x: 1;
-          --tw-scale-y: 1;
-          --tw-scale-z: 1;
-        }
-      }
-    }
-
     @property --tw-scale-x {
       syntax: "*";
       inherits: false;
@@ -5143,7 +6679,8 @@ test('scale-y', async () => {
       syntax: "*";
       inherits: false;
       initial-value: 1;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -5160,7 +6697,18 @@ test('scale-y', async () => {
 
 test('scale-z', async () => {
   expect(await run(['scale-z-50', '-scale-z-50', 'scale-z-[123deg]'])).toMatchInlineSnapshot(`
-    ".-scale-z-50 {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-scale-x: 1;
+          --tw-scale-y: 1;
+          --tw-scale-z: 1;
+        }
+      }
+    }
+
+    .-scale-z-50 {
       --tw-scale-z: calc(50% * -1);
       scale: var(--tw-scale-x) var(--tw-scale-y) var(--tw-scale-z);
     }
@@ -5175,16 +6723,6 @@ test('scale-z', async () => {
       scale: var(--tw-scale-x) var(--tw-scale-y) var(--tw-scale-z);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-scale-x: 1;
-          --tw-scale-y: 1;
-          --tw-scale-z: 1;
-        }
-      }
-    }
-
     @property --tw-scale-x {
       syntax: "*";
       inherits: false;
@@ -5201,7 +6739,8 @@ test('scale-z', async () => {
       syntax: "*";
       inherits: false;
       initial-value: 1;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -5225,67 +6764,64 @@ test('transform', async () => {
       'transform-[scaleZ(2)_rotateY(45deg)]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".transform {
-      transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-rotate-x: initial;
+          --tw-rotate-y: initial;
+          --tw-rotate-z: initial;
+          --tw-skew-x: initial;
+          --tw-skew-y: initial;
+        }
+      }
+    }
+
+    .transform {
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
     }
 
     .transform-\\[scaleZ\\(2\\)_rotateY\\(45deg\\)\\] {
-      transform: scaleZ(2)rotateY(45deg);
+      transform: scaleZ(2) rotateY(45deg);
     }
 
     .transform-cpu {
-      transform: var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
+      transform: var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
     }
 
     .transform-gpu {
-      transform: translateZ(0) var(--tw-rotate-x) var(--tw-rotate-y) var(--tw-rotate-z) var(--tw-skew-x) var(--tw-skew-y);
+      transform: translateZ(0) var(--tw-rotate-x, ) var(--tw-rotate-y, ) var(--tw-rotate-z, ) var(--tw-skew-x, ) var(--tw-skew-y, );
     }
 
     .transform-none {
       transform: none;
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-rotate-x: rotateX(0);
-          --tw-rotate-y: rotateY(0);
-          --tw-rotate-z: rotateZ(0);
-          --tw-skew-x: skewX(0);
-          --tw-skew-y: skewY(0);
-        }
-      }
-    }
-
     @property --tw-rotate-x {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateX(0);
+      inherits: false
     }
 
     @property --tw-rotate-y {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateY(0);
+      inherits: false
     }
 
     @property --tw-rotate-z {
       syntax: "*";
-      inherits: false;
-      initial-value: rotateZ(0);
+      inherits: false
     }
 
     @property --tw-skew-x {
       syntax: "*";
-      inherits: false;
-      initial-value: skewX(0);
+      inherits: false
     }
 
     @property --tw-skew-y {
       syntax: "*";
-      inherits: false;
-      initial-value: skewY(0);
-    }"
+      inherits: false
+    }
+    "
   `)
   expect(
     await run([
@@ -5300,42 +6836,44 @@ test('transform', async () => {
       'backface-hidden',
     ]),
   ).toMatchInlineSnapshot(`
-      ".backface-hidden {
-        backface-visibility: hidden;
-      }
+    "
+    .backface-hidden {
+      backface-visibility: hidden;
+    }
 
-      .backface-visible {
-        backface-visibility: visible;
-      }
+    .backface-visible {
+      backface-visibility: visible;
+    }
 
-      .transform-3d {
-        transform-style: preserve-3d;
-      }
+    .transform-3d {
+      transform-style: preserve-3d;
+    }
 
-      .transform-border {
-        transform-box: border-box;
-      }
+    .transform-border {
+      transform-box: border-box;
+    }
 
-      .transform-content {
-        transform-box: content-box;
-      }
+    .transform-content {
+      transform-box: content-box;
+    }
 
-      .transform-fill {
-        transform-box: fill-box;
-      }
+    .transform-fill {
+      transform-box: fill-box;
+    }
 
-      .transform-flat {
-        transform-style: flat;
-      }
+    .transform-flat {
+      transform-style: flat;
+    }
 
-      .transform-stroke {
-        transform-box: stroke-box;
-      }
+    .transform-stroke {
+      transform-box: stroke-box;
+    }
 
-      .transform-view {
-        transform-box: view-box;
-      }"
-    `)
+    .transform-view {
+      transform-box: view-box;
+    }
+    "
+  `)
   expect(
     await run([
       '-transform',
@@ -5360,9 +6898,31 @@ test('transform', async () => {
   ).toEqual('')
 })
 
+test('zoom', async () => {
+  expect(await run(['zoom-50', 'zoom-100', 'zoom-[var(--zoom)]'])).toMatchInlineSnapshot(`
+    "
+    .zoom-50 {
+      zoom: 50%;
+    }
+
+    .zoom-100 {
+      zoom: 100%;
+    }
+
+    .zoom-\\[var\\(--zoom\\)\\] {
+      zoom: var(--zoom);
+    }
+    "
+  `)
+  expect(
+    await run(['zoom', '-zoom-50', 'zoom--50', 'zoom-1.5', 'zoom-unknown', 'zoom-50/foo']),
+  ).toEqual('')
+})
+
 test('perspective', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['perspective-normal', 'perspective-dramatic', 'perspective-none', 'perspective-[456px]'],
       css`
         @theme {
           --perspective-dramatic: 100px;
@@ -5370,10 +6930,10 @@ test('perspective', async () => {
         }
         @tailwind utilities;
       `,
-      ['perspective-normal', 'perspective-dramatic', 'perspective-none', 'perspective-[456px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --perspective-dramatic: 100px;
       --perspective-normal: 500px;
     }
@@ -5392,7 +6952,8 @@ test('perspective', async () => {
 
     .perspective-normal {
       perspective: var(--perspective-normal);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -5406,17 +6967,33 @@ test('perspective', async () => {
       'perspective-[456px]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['perspective-none'],
+      css`
+        @theme {
+          --perspective-none: 400px;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --perspective-none: 400px;
+    }
+
+    .perspective-none {
+      perspective: var(--perspective-none);
+    }
+    "
+  `)
 })
 
 test('cursor', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --cursor-custom: url(/my-cursor.png);
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'cursor-auto',
         'cursor-default',
@@ -5457,9 +7034,16 @@ test('cursor', async () => {
         'cursor-[var(--value)]',
         'cursor-custom',
       ],
+      css`
+        @theme {
+          --cursor-custom: url(/my-cursor.png);
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --cursor-custom: url("/my-cursor.png");
     }
 
@@ -5613,7 +7197,8 @@ test('cursor', async () => {
 
     .cursor-zoom-out {
       cursor: zoom-out;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -5700,7 +7285,8 @@ test('cursor', async () => {
 
 test('touch-action', async () => {
   expect(await run(['touch-auto', 'touch-none', 'touch-manipulation'])).toMatchInlineSnapshot(`
-    ".touch-auto {
+    "
+    .touch-auto {
       touch-action: auto;
     }
 
@@ -5710,7 +7296,8 @@ test('touch-action', async () => {
 
     .touch-none {
       touch-action: none;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -5735,9 +7322,15 @@ test('touch-pan', async () => {
       'touch-pan-down',
     ]),
   ).toMatchInlineSnapshot(`
-    ".touch-pan-down {
-      --tw-pan-y: pan-down;
-      touch-action: var(--tw-pan-x, ) var(--tw-pan-y, ) var(--tw-pinch-zoom, );
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-pan-x: initial;
+          --tw-pan-y: initial;
+          --tw-pinch-zoom: initial;
+        }
+      }
     }
 
     .touch-pan-left {
@@ -5750,13 +7343,18 @@ test('touch-pan', async () => {
       touch-action: var(--tw-pan-x, ) var(--tw-pan-y, ) var(--tw-pinch-zoom, );
     }
 
-    .touch-pan-up {
-      --tw-pan-y: pan-up;
+    .touch-pan-x {
+      --tw-pan-x: pan-x;
       touch-action: var(--tw-pan-x, ) var(--tw-pan-y, ) var(--tw-pinch-zoom, );
     }
 
-    .touch-pan-x {
-      --tw-pan-x: pan-x;
+    .touch-pan-down {
+      --tw-pan-y: pan-down;
+      touch-action: var(--tw-pan-x, ) var(--tw-pan-y, ) var(--tw-pinch-zoom, );
+    }
+
+    .touch-pan-up {
+      --tw-pan-y: pan-up;
       touch-action: var(--tw-pan-x, ) var(--tw-pan-y, ) var(--tw-pinch-zoom, );
     }
 
@@ -5765,16 +7363,6 @@ test('touch-pan', async () => {
       touch-action: var(--tw-pan-x, ) var(--tw-pan-y, ) var(--tw-pinch-zoom, );
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-pan-x: initial;
-          --tw-pan-y: initial;
-          --tw-pinch-zoom: initial;
-        }
-      }
-    }
-
     @property --tw-pan-x {
       syntax: "*";
       inherits: false
@@ -5788,7 +7376,8 @@ test('touch-pan', async () => {
     @property --tw-pinch-zoom {
       syntax: "*";
       inherits: false
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -5810,13 +7399,9 @@ test('touch-pan', async () => {
 
 test('touch-pinch-zoom', async () => {
   expect(await run(['touch-pinch-zoom'])).toMatchInlineSnapshot(`
-    ".touch-pinch-zoom {
-      --tw-pinch-zoom: pinch-zoom;
-      touch-action: var(--tw-pan-x, ) var(--tw-pan-y, ) var(--tw-pinch-zoom, );
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-pan-x: initial;
           --tw-pan-y: initial;
@@ -5825,6 +7410,11 @@ test('touch-pinch-zoom', async () => {
       }
     }
 
+    .touch-pinch-zoom {
+      --tw-pinch-zoom: pinch-zoom;
+      touch-action: var(--tw-pan-x, ) var(--tw-pan-y, ) var(--tw-pinch-zoom, );
+    }
+
     @property --tw-pan-x {
       syntax: "*";
       inherits: false
@@ -5838,7 +7428,8 @@ test('touch-pinch-zoom', async () => {
     @property --tw-pinch-zoom {
       syntax: "*";
       inherits: false
-    }"
+    }
+    "
   `)
   expect(await run(['-touch-pinch-zoom', 'touch-pinch-zoom/foo'])).toEqual('')
 })
@@ -5846,26 +7437,28 @@ test('touch-pinch-zoom', async () => {
 test('select', async () => {
   expect(await run(['select-none', 'select-text', 'select-all', 'select-auto']))
     .toMatchInlineSnapshot(`
-    ".select-all {
-      -webkit-user-select: all;
-      user-select: all;
-    }
+      "
+      .select-all {
+        -webkit-user-select: all;
+        user-select: all;
+      }
 
-    .select-auto {
-      -webkit-user-select: auto;
-      user-select: auto;
-    }
+      .select-auto {
+        -webkit-user-select: auto;
+        user-select: auto;
+      }
 
-    .select-none {
-      -webkit-user-select: none;
-      user-select: none;
-    }
+      .select-none {
+        -webkit-user-select: none;
+        user-select: none;
+      }
 
-    .select-text {
-      -webkit-user-select: text;
-      user-select: text;
-    }"
-  `)
+      .select-text {
+        -webkit-user-select: text;
+        user-select: text;
+      }
+      "
+    `)
   expect(
     await run([
       '-select-none',
@@ -5882,7 +7475,8 @@ test('select', async () => {
 
 test('resize', async () => {
   expect(await run(['resize-none', 'resize', 'resize-x', 'resize-y'])).toMatchInlineSnapshot(`
-    ".resize {
+    "
+    .resize {
       resize: both;
     }
 
@@ -5896,7 +7490,8 @@ test('resize', async () => {
 
     .resize-y {
       resize: vertical;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -5914,7 +7509,16 @@ test('resize', async () => {
 
 test('scroll-snap-type', async () => {
   expect(await run(['snap-none', 'snap-x', 'snap-y', 'snap-both'])).toMatchInlineSnapshot(`
-    ".snap-both {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-scroll-snap-strictness: proximity;
+        }
+      }
+    }
+
+    .snap-both {
       scroll-snap-type: both var(--tw-scroll-snap-strictness);
     }
 
@@ -5930,19 +7534,12 @@ test('scroll-snap-type', async () => {
       scroll-snap-type: y var(--tw-scroll-snap-strictness);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-scroll-snap-strictness: proximity;
-        }
-      }
-    }
-
     @property --tw-scroll-snap-strictness {
       syntax: "*";
       inherits: false;
       initial-value: proximity;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -5960,7 +7557,16 @@ test('scroll-snap-type', async () => {
 
 test('--tw-scroll-snap-strictness', async () => {
   expect(await run(['snap-mandatory', 'snap-proximity'])).toMatchInlineSnapshot(`
-    ".snap-mandatory {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-scroll-snap-strictness: proximity;
+        }
+      }
+    }
+
+    .snap-mandatory {
       --tw-scroll-snap-strictness: mandatory;
     }
 
@@ -5968,19 +7574,12 @@ test('--tw-scroll-snap-strictness', async () => {
       --tw-scroll-snap-strictness: proximity;
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-scroll-snap-strictness: proximity;
-        }
-      }
-    }
-
     @property --tw-scroll-snap-strictness {
       syntax: "*";
       inherits: false;
       initial-value: proximity;
-    }"
+    }
+    "
   `)
   expect(
     await run(['-snap-mandatory', '-snap-proximity', 'snap-mandatory/foo', 'snap-proximity/foo']),
@@ -5990,22 +7589,24 @@ test('--tw-scroll-snap-strictness', async () => {
 test('scroll-snap-align', async () => {
   expect(await run(['snap-align-none', 'snap-start', 'snap-end', 'snap-center']))
     .toMatchInlineSnapshot(`
-    ".snap-align-none {
-      scroll-snap-align: none;
-    }
+      "
+      .snap-align-none {
+        scroll-snap-align: none;
+      }
 
-    .snap-center {
-      scroll-snap-align: center;
-    }
+      .snap-center {
+        scroll-snap-align: center;
+      }
 
-    .snap-end {
-      scroll-snap-align: end;
-    }
+      .snap-end {
+        scroll-snap-align: end;
+      }
 
-    .snap-start {
-      scroll-snap-align: start;
-    }"
-  `)
+      .snap-start {
+        scroll-snap-align: start;
+      }
+      "
+    `)
   expect(
     await run([
       '-snap-align-none',
@@ -6022,13 +7623,15 @@ test('scroll-snap-align', async () => {
 
 test('scroll-snap-stop', async () => {
   expect(await run(['snap-normal', 'snap-always'])).toMatchInlineSnapshot(`
-    ".snap-always {
+    "
+    .snap-always {
       scroll-snap-stop: always;
     }
 
     .snap-normal {
       scroll-snap-stop: normal;
-    }"
+    }
+    "
   `)
   expect(await run(['-snap-normal', '-snap-always', 'snap-normal/foo', 'snap-always/foo'])).toEqual(
     '',
@@ -6037,17 +7640,18 @@ test('scroll-snap-stop', async () => {
 
 test('scroll-m', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-m-4', 'scroll-m-[4px]', '-scroll-m-4', '-scroll-m-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-m-4', 'scroll-m-[4px]', '-scroll-m-4', '-scroll-m-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6065,7 +7669,8 @@ test('scroll-m', async () => {
 
     .scroll-m-\\[4px\\] {
       scroll-margin: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6080,17 +7685,18 @@ test('scroll-m', async () => {
 
 test('scroll-mx', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-mx-4', 'scroll-mx-[4px]', '-scroll-mx-4', '-scroll-mx-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-mx-4', 'scroll-mx-[4px]', '-scroll-mx-4', '-scroll-mx-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6108,7 +7714,8 @@ test('scroll-mx', async () => {
 
     .scroll-mx-\\[4px\\] {
       scroll-margin-inline: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6123,17 +7730,18 @@ test('scroll-mx', async () => {
 
 test('scroll-my', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-my-4', 'scroll-my-[4px]', '-scroll-my-4', '-scroll-my-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-my-4', 'scroll-my-[4px]', '-scroll-my-4', '-scroll-my-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6151,7 +7759,8 @@ test('scroll-my', async () => {
 
     .scroll-my-\\[4px\\] {
       scroll-margin-block: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6166,17 +7775,18 @@ test('scroll-my', async () => {
 
 test('scroll-ms', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-ms-4', 'scroll-ms-[4px]', '-scroll-ms-4', '-scroll-ms-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-ms-4', 'scroll-ms-[4px]', '-scroll-ms-4', '-scroll-ms-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6194,7 +7804,8 @@ test('scroll-ms', async () => {
 
     .scroll-ms-\\[4px\\] {
       scroll-margin-inline-start: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6209,17 +7820,18 @@ test('scroll-ms', async () => {
 
 test('scroll-me', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-me-4', 'scroll-me-[4px]', '-scroll-me-4', '-scroll-me-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-me-4', 'scroll-me-[4px]', '-scroll-me-4', '-scroll-me-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6237,7 +7849,8 @@ test('scroll-me', async () => {
 
     .scroll-me-\\[4px\\] {
       scroll-margin-inline-end: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6250,19 +7863,110 @@ test('scroll-me', async () => {
   ).toEqual('')
 })
 
-test('scroll-mt', async () => {
+test('scroll-mbs', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-mbs-4', 'scroll-mbs-[4px]', '-scroll-mbs-4', '-scroll-mbs-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-mt-4', 'scroll-mt-[4px]', '-scroll-mt-4', '-scroll-mt-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
+      --spacing-4: 1rem;
+    }
+
+    .-scroll-mbs-4 {
+      scroll-margin-block-start: calc(var(--spacing-4) * -1);
+    }
+
+    .-scroll-mbs-\\[var\\(--value\\)\\] {
+      scroll-margin-block-start: calc(var(--value) * -1);
+    }
+
+    .scroll-mbs-4 {
+      scroll-margin-block-start: var(--spacing-4);
+    }
+
+    .scroll-mbs-\\[4px\\] {
+      scroll-margin-block-start: 4px;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'scroll-mbs',
+      'scroll-mbs-4/foo',
+      'scroll-mbs-[4px]/foo',
+      '-scroll-mbs-4/foo',
+      '-scroll-mbs-[var(--value)]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('scroll-mbe', async () => {
+  expect(
+    await run(
+      ['scroll-mbe-4', 'scroll-mbe-[4px]', '-scroll-mbe-4', '-scroll-mbe-[var(--value)]'],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing-4: 1rem;
+    }
+
+    .-scroll-mbe-4 {
+      scroll-margin-block-end: calc(var(--spacing-4) * -1);
+    }
+
+    .-scroll-mbe-\\[var\\(--value\\)\\] {
+      scroll-margin-block-end: calc(var(--value) * -1);
+    }
+
+    .scroll-mbe-4 {
+      scroll-margin-block-end: var(--spacing-4);
+    }
+
+    .scroll-mbe-\\[4px\\] {
+      scroll-margin-block-end: 4px;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'scroll-mbe',
+      'scroll-mbe-4/foo',
+      'scroll-mbe-[4px]/foo',
+      '-scroll-mbe-4/foo',
+      '-scroll-mbe-[var(--value)]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('scroll-mt', async () => {
+  expect(
+    await run(
+      ['scroll-mt-4', 'scroll-mt-[4px]', '-scroll-mt-4', '-scroll-mt-[var(--value)]'],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6280,7 +7984,8 @@ test('scroll-mt', async () => {
 
     .scroll-mt-\\[4px\\] {
       scroll-margin-top: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6295,17 +8000,18 @@ test('scroll-mt', async () => {
 
 test('scroll-mr', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-mr-4', 'scroll-mr-[4px]', '-scroll-mr-4', '-scroll-mr-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-mr-4', 'scroll-mr-[4px]', '-scroll-mr-4', '-scroll-mr-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6323,7 +8029,8 @@ test('scroll-mr', async () => {
 
     .scroll-mr-\\[4px\\] {
       scroll-margin-right: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6338,17 +8045,18 @@ test('scroll-mr', async () => {
 
 test('scroll-mb', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-mb-4', 'scroll-mb-[4px]', '-scroll-mb-4', '-scroll-mb-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-mb-4', 'scroll-mb-[4px]', '-scroll-mb-4', '-scroll-mb-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6366,7 +8074,8 @@ test('scroll-mb', async () => {
 
     .scroll-mb-\\[4px\\] {
       scroll-margin-bottom: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6381,17 +8090,18 @@ test('scroll-mb', async () => {
 
 test('scroll-ml', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-ml-4', 'scroll-ml-[4px]', '-scroll-ml-4', '-scroll-ml-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-ml-4', 'scroll-ml-[4px]', '-scroll-ml-4', '-scroll-ml-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6409,7 +8119,8 @@ test('scroll-ml', async () => {
 
     .scroll-ml-\\[4px\\] {
       scroll-margin-left: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6424,17 +8135,18 @@ test('scroll-ml', async () => {
 
 test('scroll-p', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-p-4', 'scroll-p-[4px]', '-scroll-p-4', '-scroll-p-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-p-4', 'scroll-p-[4px]', '-scroll-p-4', '-scroll-p-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6444,7 +8156,8 @@ test('scroll-p', async () => {
 
     .scroll-p-\\[4px\\] {
       scroll-padding: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6459,17 +8172,18 @@ test('scroll-p', async () => {
 
 test('scroll-px', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-px-4', 'scroll-px-[4px]', '-scroll-px-4', '-scroll-px-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-px-4', 'scroll-px-[4px]', '-scroll-px-4', '-scroll-px-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6479,7 +8193,8 @@ test('scroll-px', async () => {
 
     .scroll-px-\\[4px\\] {
       scroll-padding-inline: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6494,17 +8209,18 @@ test('scroll-px', async () => {
 
 test('scroll-py', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-py-4', 'scroll-py-[4px]', '-scroll-py-4', '-scroll-py-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-py-4', 'scroll-py-[4px]', '-scroll-py-4', '-scroll-py-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6514,7 +8230,8 @@ test('scroll-py', async () => {
 
     .scroll-py-\\[4px\\] {
       scroll-padding-block: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6529,17 +8246,18 @@ test('scroll-py', async () => {
 
 test('scroll-ps', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-ps-4', 'scroll-ps-[4px]', '-scroll-ps-4', '-scroll-ps-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-ps-4', 'scroll-ps-[4px]', '-scroll-ps-4', '-scroll-ps-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6549,7 +8267,8 @@ test('scroll-ps', async () => {
 
     .scroll-ps-\\[4px\\] {
       scroll-padding-inline-start: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6564,17 +8283,18 @@ test('scroll-ps', async () => {
 
 test('scroll-pe', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-pe-4', 'scroll-pe-[4px]', '-scroll-pe-4', '-scroll-pe-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-pe-4', 'scroll-pe-[4px]', '-scroll-pe-4', '-scroll-pe-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6584,7 +8304,8 @@ test('scroll-pe', async () => {
 
     .scroll-pe-\\[4px\\] {
       scroll-padding-inline-end: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6597,19 +8318,94 @@ test('scroll-pe', async () => {
   ).toEqual('')
 })
 
-test('scroll-pt', async () => {
+test('scroll-pbs', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-pbs-4', 'scroll-pbs-[4px]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-pt-4', 'scroll-pt-[4px]', '-scroll-pt-4', '-scroll-pt-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
+      --spacing-4: 1rem;
+    }
+
+    .scroll-pbs-4 {
+      scroll-padding-block-start: var(--spacing-4);
+    }
+
+    .scroll-pbs-\\[4px\\] {
+      scroll-padding-block-start: 4px;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'scroll-pbs',
+      'scroll-pbs-4/foo',
+      'scroll-pbs-[4px]/foo',
+      '-scroll-pbs-4',
+      '-scroll-pbs-[var(--value)]',
+    ]),
+  ).toEqual('')
+})
+
+test('scroll-pbe', async () => {
+  expect(
+    await run(
+      ['scroll-pbe-4', 'scroll-pbe-[4px]'],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing-4: 1rem;
+    }
+
+    .scroll-pbe-4 {
+      scroll-padding-block-end: var(--spacing-4);
+    }
+
+    .scroll-pbe-\\[4px\\] {
+      scroll-padding-block-end: 4px;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'scroll-pbe',
+      'scroll-pbe-4/foo',
+      'scroll-pbe-[4px]/foo',
+      '-scroll-pbe-4',
+      '-scroll-pbe-[var(--value)]',
+    ]),
+  ).toEqual('')
+})
+
+test('scroll-pt', async () => {
+  expect(
+    await run(
+      ['scroll-pt-4', 'scroll-pt-[4px]', '-scroll-pt-4', '-scroll-pt-[var(--value)]'],
+      css`
+        @theme {
+          --spacing-4: 1rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6619,7 +8415,8 @@ test('scroll-pt', async () => {
 
     .scroll-pt-\\[4px\\] {
       scroll-padding-top: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6634,17 +8431,18 @@ test('scroll-pt', async () => {
 
 test('scroll-pr', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-pr-4', 'scroll-pr-[4px]', '-scroll-pr-4', '-scroll-pr-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-pr-4', 'scroll-pr-[4px]', '-scroll-pr-4', '-scroll-pr-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6654,7 +8452,8 @@ test('scroll-pr', async () => {
 
     .scroll-pr-\\[4px\\] {
       scroll-padding-right: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6669,17 +8468,18 @@ test('scroll-pr', async () => {
 
 test('scroll-pb', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-pb-4', 'scroll-pb-[4px]', '-scroll-pb-4', '-scroll-pb-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-pb-4', 'scroll-pb-[4px]', '-scroll-pb-4', '-scroll-pb-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6689,7 +8489,8 @@ test('scroll-pb', async () => {
 
     .scroll-pb-\\[4px\\] {
       scroll-padding-bottom: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6704,17 +8505,18 @@ test('scroll-pb', async () => {
 
 test('scroll-pl', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['scroll-pl-4', 'scroll-pl-[4px]', '-scroll-pl-4', '-scroll-pl-[var(--value)]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['scroll-pl-4', 'scroll-pl-[4px]', '-scroll-pl-4', '-scroll-pl-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -6724,7 +8526,8 @@ test('scroll-pl', async () => {
 
     .scroll-pl-\\[4px\\] {
       scroll-padding-left: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6739,13 +8542,15 @@ test('scroll-pl', async () => {
 
 test('list-style-position', async () => {
   expect(await run(['list-inside', 'list-outside'])).toMatchInlineSnapshot(`
-    ".list-inside {
+    "
+    .list-inside {
       list-style-position: inside;
     }
 
     .list-outside {
       list-style-position: outside;
-    }"
+    }
+    "
   `)
   expect(
     await run(['-list-inside', '-list-outside', 'list-inside/foo', 'list-outside/foo']),
@@ -6755,7 +8560,8 @@ test('list-style-position', async () => {
 test('list', async () => {
   expect(await run(['list-none', 'list-disc', 'list-decimal', 'list-[var(--value)]']))
     .toMatchInlineSnapshot(`
-      ".list-\\[var\\(--value\\)\\] {
+      "
+      .list-\\[var\\(--value\\)\\] {
         list-style-type: var(--value);
       }
 
@@ -6769,7 +8575,8 @@ test('list', async () => {
 
       .list-none {
         list-style-type: none;
-      }"
+      }
+      "
     `)
   expect(
     await run([
@@ -6783,17 +8590,41 @@ test('list', async () => {
       'list-[var(--value)]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['list-none'],
+      css`
+        @theme {
+          --list-style-type-none: disc;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --list-style-type-none: disc;
+    }
+
+    .list-none {
+      list-style-type: var(--list-style-type-none);
+    }
+    "
+  `)
 })
 
 test('list-image', async () => {
   expect(await run(['list-image-none', 'list-image-[var(--value)]'])).toMatchInlineSnapshot(`
-    ".list-image-\\[var\\(--value\\)\\] {
+    "
+    .list-image-\\[var\\(--value\\)\\] {
       list-style-image: var(--value);
     }
 
     .list-image-none {
       list-style-image: none;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6804,17 +8635,41 @@ test('list-image', async () => {
       'list-image-[var(--value)]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['list-image-none'],
+      css`
+        @theme {
+          --list-style-image-none: url(../foo.png);
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --list-style-image-none: url("../foo.png");
+    }
+
+    .list-image-none {
+      list-style-image: var(--list-style-image-none);
+    }
+    "
+  `)
 })
 
 test('appearance', async () => {
   expect(await run(['appearance-none', 'appearance-auto'])).toMatchInlineSnapshot(`
-    ".appearance-auto {
+    "
+    .appearance-auto {
       appearance: auto;
     }
 
     .appearance-none {
       appearance: none;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6838,56 +8693,31 @@ test('color-scheme', async () => {
       'scheme-only-light',
     ]),
   ).toMatchInlineSnapshot(`
-    ".scheme-dark {
-      --lightningcss-light: ;
-      --lightningcss-dark: initial;
-      --lightningcss-light: ;
-      --lightningcss-dark: initial;
+    "
+    .scheme-dark {
       color-scheme: dark;
     }
 
     .scheme-light {
-      --lightningcss-light: initial;
-      --lightningcss-dark: ;
-      --lightningcss-light: initial;
-      --lightningcss-dark: ;
       color-scheme: light;
     }
 
     .scheme-light-dark {
-      --lightningcss-light: initial;
-      --lightningcss-dark: ;
-      --lightningcss-light: initial;
-      --lightningcss-dark: ;
       color-scheme: light dark;
     }
 
-    @media (prefers-color-scheme: dark) {
-      .scheme-light-dark {
-        --lightningcss-light: ;
-        --lightningcss-dark: initial;
-      }
-    }
-
     .scheme-normal {
       color-scheme: normal;
     }
 
     .scheme-only-dark {
-      --lightningcss-light: ;
-      --lightningcss-dark: initial;
-      --lightningcss-light: ;
-      --lightningcss-dark: initial;
       color-scheme: dark only;
     }
 
     .scheme-only-light {
-      --lightningcss-light: initial;
-      --lightningcss-dark: ;
-      --lightningcss-light: initial;
-      --lightningcss-dark: ;
       color-scheme: light only;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6903,14 +8733,7 @@ test('color-scheme', async () => {
 
 test('columns', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --container-3xs: 16rem;
-          --container-7xl: 80rem;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'columns-auto',
         'columns-3xs',
@@ -6920,9 +8743,17 @@ test('columns', async () => {
         'columns-[123]',
         'columns-[var(--value)]',
       ],
+      css`
+        @theme {
+          --container-3xs: 16rem;
+          --container-7xl: 80rem;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --container-3xs: 16rem;
       --container-7xl: 80rem;
     }
@@ -6953,7 +8784,8 @@ test('columns', async () => {
 
     .columns-auto {
       columns: auto;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -6972,6 +8804,28 @@ test('columns', async () => {
       'columns-[var(--value)]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['columns-auto'],
+      css`
+        @theme {
+          --columns-auto: 3;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --columns-auto: 3;
+    }
+
+    .columns-auto {
+      columns: var(--columns-auto);
+    }
+    "
+  `)
 })
 
 test('break-before', async () => {
@@ -6987,7 +8841,8 @@ test('break-before', async () => {
       'break-before-column',
     ]),
   ).toMatchInlineSnapshot(`
-    ".break-before-all {
+    "
+    .break-before-all {
       break-before: all;
     }
 
@@ -7017,7 +8872,8 @@ test('break-before', async () => {
 
     .break-before-right {
       break-before: right;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -7051,7 +8907,8 @@ test('break-inside', async () => {
       'break-inside-avoid-column',
     ]),
   ).toMatchInlineSnapshot(`
-    ".break-inside-auto {
+    "
+    .break-inside-auto {
       break-inside: auto;
     }
 
@@ -7065,7 +8922,8 @@ test('break-inside', async () => {
 
     .break-inside-avoid-page {
       break-inside: avoid-page;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -7095,7 +8953,8 @@ test('break-after', async () => {
       'break-after-column',
     ]),
   ).toMatchInlineSnapshot(`
-    ".break-after-all {
+    "
+    .break-after-all {
       break-after: all;
     }
 
@@ -7125,7 +8984,8 @@ test('break-after', async () => {
 
     .break-after-right {
       break-after: right;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -7152,15 +9012,29 @@ test('break-after', async () => {
 
 test('auto-cols', async () => {
   expect(
-    await run([
-      'auto-cols-auto',
-      'auto-cols-min',
-      'auto-cols-max',
-      'auto-cols-fr',
-      'auto-cols-[2fr]',
-    ]),
+    await run(
+      [
+        'auto-cols-auto',
+        'auto-cols-min',
+        'auto-cols-max',
+        'auto-cols-fr',
+        'auto-cols-[2fr]',
+        'auto-cols-12',
+      ],
+      css`
+        @tailwind utilities;
+        @theme {
+          --spacing: 0.25rem;
+        }
+      `,
+    ),
   ).toMatchInlineSnapshot(`
-    ".auto-cols-\\[2fr\\] {
+    "
+    .auto-cols-12 {
+      grid-auto-columns: calc(var(--spacing) * 12);
+    }
+
+    .auto-cols-\\[2fr\\] {
       grid-auto-columns: 2fr;
     }
 
@@ -7178,7 +9052,12 @@ test('auto-cols', async () => {
 
     .auto-cols-min {
       grid-auto-columns: min-content;
-    }"
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+    "
   `)
   expect(
     await run([
@@ -7192,6 +9071,28 @@ test('auto-cols', async () => {
       'auto-cols-[2fr]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['auto-cols-auto'],
+      css`
+        @theme {
+          --grid-auto-columns-auto: 2fr;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --grid-auto-columns-auto: 2fr;
+    }
+
+    .auto-cols-auto {
+      grid-auto-columns: var(--grid-auto-columns-auto);
+    }
+    "
+  `)
 })
 
 test('grid-flow', async () => {
@@ -7204,7 +9105,8 @@ test('grid-flow', async () => {
       'grid-flow-col-dense',
     ]),
   ).toMatchInlineSnapshot(`
-    ".grid-flow-col {
+    "
+    .grid-flow-col {
       grid-auto-flow: column;
     }
 
@@ -7222,7 +9124,8 @@ test('grid-flow', async () => {
 
     .grid-flow-row-dense {
       grid-auto-flow: row dense;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -7243,15 +9146,29 @@ test('grid-flow', async () => {
 
 test('auto-rows', async () => {
   expect(
-    await run([
-      'auto-rows-auto',
-      'auto-rows-min',
-      'auto-rows-max',
-      'auto-rows-fr',
-      'auto-rows-[2fr]',
-    ]),
+    await run(
+      [
+        'auto-rows-auto',
+        'auto-rows-min',
+        'auto-rows-max',
+        'auto-rows-fr',
+        'auto-rows-[2fr]',
+        'auto-rows-12',
+      ],
+      css`
+        @tailwind utilities;
+        @theme {
+          --spacing: 0.25rem;
+        }
+      `,
+    ),
   ).toMatchInlineSnapshot(`
-    ".auto-rows-\\[2fr\\] {
+    "
+    .auto-rows-12 {
+      grid-auto-rows: calc(var(--spacing) * 12);
+    }
+
+    .auto-rows-\\[2fr\\] {
       grid-auto-rows: 2fr;
     }
 
@@ -7269,7 +9186,12 @@ test('auto-rows', async () => {
 
     .auto-rows-min {
       grid-auto-rows: min-content;
-    }"
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+    "
   `)
   expect(
     await run([
@@ -7283,6 +9205,28 @@ test('auto-rows', async () => {
       'auto-rows-[2fr]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['auto-rows-auto'],
+      css`
+        @theme {
+          --grid-auto-rows-auto: 2fr;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --grid-auto-rows-auto: 2fr;
+    }
+
+    .auto-rows-auto {
+      grid-auto-rows: var(--grid-auto-rows-auto);
+    }
+    "
+  `)
 })
 
 test('grid-cols', async () => {
@@ -7295,7 +9239,8 @@ test('grid-cols', async () => {
       'grid-cols-[123]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".grid-cols-12 {
+    "
+    .grid-cols-12 {
       grid-template-columns: repeat(12, minmax(0, 1fr));
     }
 
@@ -7313,11 +9258,13 @@ test('grid-cols', async () => {
 
     .grid-cols-subgrid {
       grid-template-columns: subgrid;
-    }"
+    }
+    "
   `)
   expect(
     await run([
       'grid-cols',
+      'grid-cols-0',
       '-grid-cols-none',
       '-grid-cols-subgrid',
       'grid-cols--12',
@@ -7331,6 +9278,28 @@ test('grid-cols', async () => {
       'grid-cols-[123]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['grid-cols-none'],
+      css`
+        @theme {
+          --grid-template-columns-none: 200px 1fr;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --grid-template-columns-none: 200px 1fr;
+    }
+
+    .grid-cols-none {
+      grid-template-columns: var(--grid-template-columns-none);
+    }
+    "
+  `)
 })
 
 test('grid-rows', async () => {
@@ -7343,7 +9312,8 @@ test('grid-rows', async () => {
       'grid-rows-[123]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".grid-rows-12 {
+    "
+    .grid-rows-12 {
       grid-template-rows: repeat(12, minmax(0, 1fr));
     }
 
@@ -7361,11 +9331,13 @@ test('grid-rows', async () => {
 
     .grid-rows-subgrid {
       grid-template-rows: subgrid;
-    }"
+    }
+    "
   `)
   expect(
     await run([
       'grid-rows',
+      'grid-rows-0',
       '-grid-rows-none',
       '-grid-rows-subgrid',
       'grid-rows--12',
@@ -7379,27 +9351,51 @@ test('grid-rows', async () => {
       'grid-rows-[123]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['grid-rows-none'],
+      css`
+        @theme {
+          --grid-template-rows-none: 200px 1fr;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --grid-template-rows-none: 200px 1fr;
+    }
+
+    .grid-rows-none {
+      grid-template-rows: var(--grid-template-rows-none);
+    }
+    "
+  `)
 })
 
 test('flex-direction', async () => {
   expect(await run(['flex-row', 'flex-row-reverse', 'flex-col', 'flex-col-reverse']))
     .toMatchInlineSnapshot(`
-    ".flex-col {
-      flex-direction: column;
-    }
+      "
+      .flex-col {
+        flex-direction: column;
+      }
 
-    .flex-col-reverse {
-      flex-direction: column-reverse;
-    }
+      .flex-col-reverse {
+        flex-direction: column-reverse;
+      }
 
-    .flex-row {
-      flex-direction: row;
-    }
+      .flex-row {
+        flex-direction: row;
+      }
 
-    .flex-row-reverse {
-      flex-direction: row-reverse;
-    }"
-  `)
+      .flex-row-reverse {
+        flex-direction: row-reverse;
+      }
+      "
+    `)
   expect(
     await run([
       '-flex-row',
@@ -7416,7 +9412,8 @@ test('flex-direction', async () => {
 
 test('flex-wrap', async () => {
   expect(await run(['flex-wrap', 'flex-wrap-reverse', 'flex-nowrap'])).toMatchInlineSnapshot(`
-    ".flex-nowrap {
+    "
+    .flex-nowrap {
       flex-wrap: nowrap;
     }
 
@@ -7426,7 +9423,8 @@ test('flex-wrap', async () => {
 
     .flex-wrap-reverse {
       flex-wrap: wrap-reverse;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -7444,8 +9442,10 @@ test('place-content', async () => {
   expect(
     await run([
       'place-content-center',
+      'place-content-center-safe',
       'place-content-start',
       'place-content-end',
+      'place-content-end-safe',
       'place-content-between',
       'place-content-around',
       'place-content-evenly',
@@ -7453,8 +9453,9 @@ test('place-content', async () => {
       'place-content-stretch',
     ]),
   ).toMatchInlineSnapshot(`
-    ".place-content-around {
-      place-content: around;
+    "
+    .place-content-around {
+      place-content: space-around;
     }
 
     .place-content-baseline {
@@ -7462,19 +9463,27 @@ test('place-content', async () => {
     }
 
     .place-content-between {
-      place-content: between;
+      place-content: space-between;
     }
 
     .place-content-center {
       place-content: center;
     }
 
+    .place-content-center-safe {
+      place-content: safe center;
+    }
+
     .place-content-end {
       place-content: end;
     }
 
+    .place-content-end-safe {
+      place-content: safe end;
+    }
+
     .place-content-evenly {
-      place-content: evenly;
+      place-content: space-evenly;
     }
 
     .place-content-start {
@@ -7483,7 +9492,8 @@ test('place-content', async () => {
 
     .place-content-stretch {
       place-content: stretch;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -7513,12 +9523,15 @@ test('place-items', async () => {
     await run([
       'place-items-start',
       'place-items-end',
+      'place-items-end-safe',
       'place-items-center',
+      'place-items-center-safe',
       'place-items-baseline',
       'place-items-stretch',
     ]),
   ).toMatchInlineSnapshot(`
-    ".place-items-baseline {
+    "
+    .place-items-baseline {
       place-items: baseline;
     }
 
@@ -7526,17 +9539,26 @@ test('place-items', async () => {
       place-items: center;
     }
 
+    .place-items-center-safe {
+      place-items: safe center;
+    }
+
     .place-items-end {
       place-items: end;
     }
 
+    .place-items-end-safe {
+      place-items: safe end;
+    }
+
     .place-items-start {
       place-items: start;
     }
 
     .place-items-stretch {
       place-items: stretch stretch;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -7560,8 +9582,10 @@ test('align-content', async () => {
     await run([
       'content-normal',
       'content-center',
+      'content-center-safe',
       'content-start',
       'content-end',
+      'content-end-safe',
       'content-between',
       'content-around',
       'content-evenly',
@@ -7569,7 +9593,8 @@ test('align-content', async () => {
       'content-stretch',
     ]),
   ).toMatchInlineSnapshot(`
-    ".content-around {
+    "
+    .content-around {
       align-content: space-around;
     }
 
@@ -7585,10 +9610,18 @@ test('align-content', async () => {
       align-content: center;
     }
 
+    .content-center-safe {
+      align-content: safe center;
+    }
+
     .content-end {
       align-content: flex-end;
     }
 
+    .content-end-safe {
+      align-content: safe flex-end;
+    }
+
     .content-evenly {
       align-content: space-evenly;
     }
@@ -7603,7 +9636,8 @@ test('align-content', async () => {
 
     .content-stretch {
       align-content: stretch;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -7631,27 +9665,51 @@ test('align-content', async () => {
 })
 
 test('items', async () => {
-  expect(await run(['items-start', 'items-end', 'items-center', 'items-baseline', 'items-stretch']))
-    .toMatchInlineSnapshot(`
-    ".items-baseline {
+  expect(
+    await run([
+      'items-start',
+      'items-end',
+      'items-end-safe',
+      'items-center',
+      'items-center-safe',
+      'items-baseline',
+      'items-baseline-last',
+      'items-stretch',
+    ]),
+  ).toMatchInlineSnapshot(`
+    "
+    .items-baseline {
       align-items: baseline;
     }
 
+    .items-baseline-last {
+      align-items: last baseline;
+    }
+
     .items-center {
       align-items: center;
     }
 
+    .items-center-safe {
+      align-items: safe center;
+    }
+
     .items-end {
       align-items: flex-end;
     }
 
+    .items-end-safe {
+      align-items: safe flex-end;
+    }
+
     .items-start {
       align-items: flex-start;
     }
 
     .items-stretch {
       align-items: stretch;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -7660,6 +9718,8 @@ test('items', async () => {
       '-items-end',
       '-items-center',
       '-items-baseline',
+      '-items-first-baseline',
+      '-items-last-baseline',
       '-items-stretch',
       'items-start/foo',
       'items-end/foo',
@@ -7676,14 +9736,17 @@ test('justify', async () => {
       'justify-normal',
       'justify-start',
       'justify-end',
+      'justify-end-safe',
       'justify-center',
+      'justify-center-safe',
       'justify-between',
       'justify-around',
       'justify-evenly',
       'justify-stretch',
     ]),
   ).toMatchInlineSnapshot(`
-    ".justify-around {
+    "
+    .justify-around {
       justify-content: space-around;
     }
 
@@ -7695,10 +9758,18 @@ test('justify', async () => {
       justify-content: center;
     }
 
+    .justify-center-safe {
+      justify-content: safe center;
+    }
+
     .justify-end {
       justify-content: flex-end;
     }
 
+    .justify-end-safe {
+      justify-content: safe flex-end;
+    }
+
     .justify-evenly {
       justify-content: space-evenly;
     }
@@ -7713,7 +9784,8 @@ test('justify', async () => {
 
     .justify-stretch {
       justify-content: stretch;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -7743,25 +9815,37 @@ test('justify-items', async () => {
     await run([
       'justify-items-start',
       'justify-items-end',
+      'justify-items-end-safe',
       'justify-items-center',
+      'justify-items-center-safe',
       'justify-items-stretch',
     ]),
   ).toMatchInlineSnapshot(`
-    ".justify-items-center {
+    "
+    .justify-items-center {
       justify-items: center;
     }
 
+    .justify-items-center-safe {
+      justify-items: safe center;
+    }
+
     .justify-items-end {
       justify-items: end;
     }
 
+    .justify-items-end-safe {
+      justify-items: safe end;
+    }
+
     .justify-items-start {
       justify-items: start;
     }
 
     .justify-items-stretch {
       justify-items: stretch;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -7780,17 +9864,18 @@ test('justify-items', async () => {
 
 test('gap', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['gap-4', 'gap-[4px]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['gap-4', 'gap-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -7800,24 +9885,26 @@ test('gap', async () => {
 
     .gap-\\[4px\\] {
       gap: 4px;
-    }"
+    }
+    "
   `)
   expect(await run(['gap', '-gap-4', '-gap-[4px]', 'gap-4/foo', 'gap-[4px]/foo'])).toEqual('')
 })
 
 test('gap-x', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['gap-x-4', 'gap-x-[4px]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['gap-x-4', 'gap-x-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -7827,7 +9914,8 @@ test('gap-x', async () => {
 
     .gap-x-\\[4px\\] {
       column-gap: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run(['gap-x', '-gap-x-4', '-gap-x-[4px]', 'gap-x-4/foo', 'gap-x-[4px]/foo']),
@@ -7836,17 +9924,18 @@ test('gap-x', async () => {
 
 test('gap-y', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['gap-y-4', 'gap-y-[4px]'],
       css`
         @theme {
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['gap-y-4', 'gap-y-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing-4: 1rem;
     }
 
@@ -7856,7 +9945,8 @@ test('gap-y', async () => {
 
     .gap-y-\\[4px\\] {
       row-gap: 4px;
-    }"
+    }
+    "
   `)
   expect(
     await run(['gap-y', '-gap-y-4', '-gap-y-[4px]', 'gap-y-4/foo', 'gap-y-[4px]/foo']),
@@ -7865,210 +9955,303 @@ test('gap-y', async () => {
 
 test('space-x', async () => {
   expect(
-    await compileCss(
+    await run(
+      [
+        'space-x-0',
+        'space-x-[0]',
+        'space-x-[0px]',
+        '-space-x-0',
+        'space-x-[-0]',
+        'space-x-[-0px]',
+        'space-x-1',
+        '-space-x-1',
+        'space-x-4',
+        'space-x-[4px]',
+        '-space-x-4',
+      ],
       css`
         @theme {
+          --spacing: 0.25rem;
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['space-x-4', 'space-x-[4px]', '-space-x-4'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-space-x-reverse: 0;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
       --spacing-4: 1rem;
     }
 
+    :where(.-space-x-0 > :not(:last-child)) {
+      --tw-space-x-reverse: 0;
+      margin-inline: 0;
+    }
+
+    :where(.-space-x-1 > :not(:last-child)) {
+      --tw-space-x-reverse: 0;
+      margin-inline-start: calc(calc(var(--spacing) * -1) * var(--tw-space-x-reverse));
+      margin-inline-end: calc(calc(var(--spacing) * -1) * calc(1 - var(--tw-space-x-reverse)));
+    }
+
     :where(.-space-x-4 > :not(:last-child)) {
       --tw-space-x-reverse: 0;
       margin-inline-start: calc(calc(var(--spacing-4) * -1) * var(--tw-space-x-reverse));
       margin-inline-end: calc(calc(var(--spacing-4) * -1) * calc(1 - var(--tw-space-x-reverse)));
     }
 
+    :where(.space-x-0 > :not(:last-child)) {
+      --tw-space-x-reverse: 0;
+      margin-inline: 0;
+    }
+
+    :where(.space-x-1 > :not(:last-child)) {
+      --tw-space-x-reverse: 0;
+      margin-inline-start: calc(var(--spacing) * var(--tw-space-x-reverse));
+      margin-inline-end: calc(var(--spacing) * calc(1 - var(--tw-space-x-reverse)));
+    }
+
     :where(.space-x-4 > :not(:last-child)) {
       --tw-space-x-reverse: 0;
       margin-inline-start: calc(var(--spacing-4) * var(--tw-space-x-reverse));
       margin-inline-end: calc(var(--spacing-4) * calc(1 - var(--tw-space-x-reverse)));
     }
 
+    :where(.space-x-\\[-0\\] > :not(:last-child)), :where(.space-x-\\[-0px\\] > :not(:last-child)), :where(.space-x-\\[0\\] > :not(:last-child)), :where(.space-x-\\[0px\\] > :not(:last-child)) {
+      --tw-space-x-reverse: 0;
+      margin-inline: 0;
+    }
+
     :where(.space-x-\\[4px\\] > :not(:last-child)) {
       --tw-space-x-reverse: 0;
       margin-inline-start: calc(4px * var(--tw-space-x-reverse));
       margin-inline-end: calc(4px * calc(1 - var(--tw-space-x-reverse)));
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-space-x-reverse: 0;
-        }
-      }
-    }
-
     @property --tw-space-x-reverse {
       syntax: "*";
       inherits: false;
       initial-value: 0;
-    }"
+    }
+    "
   `)
   expect(await run(['space-x', 'space-x-4/foo', 'space-x-[4px]/foo', '-space-x-4/foo'])).toEqual('')
 })
 
 test('space-y', async () => {
   expect(
-    await compileCss(
+    await run(
+      [
+        'space-y-0',
+        'space-y-[0]',
+        'space-y-[0px]',
+        '-space-y-0',
+        'space-y-[-0]',
+        'space-y-[-0px]',
+        'space-y-1',
+        '-space-y-1',
+        'space-y-4',
+        'space-y-[4px]',
+        '-space-y-4',
+      ],
       css`
         @theme {
+          --spacing: 0.25rem;
           --spacing-4: 1rem;
         }
         @tailwind utilities;
       `,
-      ['space-y-4', 'space-y-[4px]', '-space-y-4'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-space-y-reverse: 0;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
       --spacing-4: 1rem;
     }
 
+    :where(.-space-y-0 > :not(:last-child)) {
+      --tw-space-y-reverse: 0;
+      margin-block: 0;
+    }
+
+    :where(.-space-y-1 > :not(:last-child)) {
+      --tw-space-y-reverse: 0;
+      margin-block-start: calc(calc(var(--spacing) * -1) * var(--tw-space-y-reverse));
+      margin-block-end: calc(calc(var(--spacing) * -1) * calc(1 - var(--tw-space-y-reverse)));
+    }
+
     :where(.-space-y-4 > :not(:last-child)) {
       --tw-space-y-reverse: 0;
       margin-block-start: calc(calc(var(--spacing-4) * -1) * var(--tw-space-y-reverse));
       margin-block-end: calc(calc(var(--spacing-4) * -1) * calc(1 - var(--tw-space-y-reverse)));
     }
 
+    :where(.space-y-0 > :not(:last-child)) {
+      --tw-space-y-reverse: 0;
+      margin-block: 0;
+    }
+
+    :where(.space-y-1 > :not(:last-child)) {
+      --tw-space-y-reverse: 0;
+      margin-block-start: calc(var(--spacing) * var(--tw-space-y-reverse));
+      margin-block-end: calc(var(--spacing) * calc(1 - var(--tw-space-y-reverse)));
+    }
+
     :where(.space-y-4 > :not(:last-child)) {
       --tw-space-y-reverse: 0;
       margin-block-start: calc(var(--spacing-4) * var(--tw-space-y-reverse));
       margin-block-end: calc(var(--spacing-4) * calc(1 - var(--tw-space-y-reverse)));
     }
 
+    :where(.space-y-\\[-0\\] > :not(:last-child)), :where(.space-y-\\[-0px\\] > :not(:last-child)), :where(.space-y-\\[0\\] > :not(:last-child)), :where(.space-y-\\[0px\\] > :not(:last-child)) {
+      --tw-space-y-reverse: 0;
+      margin-block: 0;
+    }
+
     :where(.space-y-\\[4px\\] > :not(:last-child)) {
       --tw-space-y-reverse: 0;
       margin-block-start: calc(4px * var(--tw-space-y-reverse));
       margin-block-end: calc(4px * calc(1 - var(--tw-space-y-reverse)));
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-space-y-reverse: 0;
-        }
-      }
-    }
-
     @property --tw-space-y-reverse {
       syntax: "*";
       inherits: false;
       initial-value: 0;
-    }"
+    }
+    "
   `)
   expect(await run(['space-y', 'space-y-4/foo', 'space-y-[4px]/foo', '-space-y-4/foo'])).toEqual('')
 })
 
 test('space-x-reverse', async () => {
   expect(await run(['space-x-reverse'])).toMatchInlineSnapshot(`
-    ":where(.space-x-reverse > :not(:last-child)) {
-      --tw-space-x-reverse: 1;
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-space-x-reverse: 0;
         }
       }
     }
 
+    :where(.space-x-reverse > :not(:last-child)) {
+      --tw-space-x-reverse: 1;
+    }
+
     @property --tw-space-x-reverse {
       syntax: "*";
       inherits: false;
       initial-value: 0;
-    }"
+    }
+    "
   `)
   expect(await run(['-space-x-reverse', 'space-x-reverse/foo'])).toEqual('')
 })
 
 test('space-y-reverse', async () => {
   expect(await run(['space-y-reverse'])).toMatchInlineSnapshot(`
-    ":where(.space-y-reverse > :not(:last-child)) {
-      --tw-space-y-reverse: 1;
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-space-y-reverse: 0;
         }
       }
     }
 
+    :where(.space-y-reverse > :not(:last-child)) {
+      --tw-space-y-reverse: 1;
+    }
+
     @property --tw-space-y-reverse {
       syntax: "*";
       inherits: false;
       initial-value: 0;
-    }"
+    }
+    "
   `)
   expect(await run(['-space-y-reverse', 'space-y-reverse/foo'])).toEqual('')
 })
 
 test('divide-x', async () => {
-  expect(
-    await compileCss(
-      css`
-        @tailwind utilities;
-      `,
-      ['divide-x', 'divide-x-4', 'divide-x-123', 'divide-x-[4px]'],
-    ),
-  ).toMatchInlineSnapshot(`
-    ":where(.divide-x > :not(:last-child)) {
-      --tw-divide-x-reverse: 0;
-      border-inline-style: var(--tw-border-style);
-      border-inline-start-width: calc(1px * var(--tw-divide-x-reverse));
-      border-inline-end-width: calc(1px * calc(1 - var(--tw-divide-x-reverse)));
-    }
-
-    :where(.divide-x-4 > :not(:last-child)) {
-      --tw-divide-x-reverse: 0;
-      border-inline-style: var(--tw-border-style);
-      border-inline-start-width: calc(4px * var(--tw-divide-x-reverse));
-      border-inline-end-width: calc(4px * calc(1 - var(--tw-divide-x-reverse)));
-    }
-
-    :where(.divide-x-123 > :not(:last-child)) {
-      --tw-divide-x-reverse: 0;
-      border-inline-style: var(--tw-border-style);
-      border-inline-start-width: calc(123px * var(--tw-divide-x-reverse));
-      border-inline-end-width: calc(123px * calc(1 - var(--tw-divide-x-reverse)));
-    }
-
-    :where(.divide-x-\\[4px\\] > :not(:last-child)) {
-      --tw-divide-x-reverse: 0;
-      border-inline-style: var(--tw-border-style);
-      border-inline-start-width: calc(4px * var(--tw-divide-x-reverse));
-      border-inline-end-width: calc(4px * calc(1 - var(--tw-divide-x-reverse)));
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-divide-x-reverse: 0;
-          --tw-border-style: solid;
+  expect(await run(['divide-x', 'divide-x-0', 'divide-x-4', 'divide-x-123', 'divide-x-[4px]']))
+    .toMatchInlineSnapshot(`
+      "
+      @layer properties {
+        @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+          *, :before, :after, ::backdrop {
+            --tw-divide-x-reverse: 0;
+            --tw-border-style: solid;
+          }
         }
       }
-    }
 
-    @property --tw-divide-x-reverse {
-      syntax: "*";
-      inherits: false;
-      initial-value: 0;
-    }
+      :where(.divide-x > :not(:last-child)) {
+        --tw-divide-x-reverse: 0;
+        border-inline-style: var(--tw-border-style);
+        border-inline-start-width: calc(1px * var(--tw-divide-x-reverse));
+        border-inline-end-width: calc(1px * calc(1 - var(--tw-divide-x-reverse)));
+      }
 
-    @property --tw-border-style {
-      syntax: "*";
-      inherits: false;
-      initial-value: solid;
-    }"
-  `)
+      :where(.divide-x-0 > :not(:last-child)) {
+        --tw-divide-x-reverse: 0;
+        border-inline-style: var(--tw-border-style);
+        border-inline-start-width: calc(0px * var(--tw-divide-x-reverse));
+        border-inline-end-width: calc(0px * calc(1 - var(--tw-divide-x-reverse)));
+      }
+
+      :where(.divide-x-4 > :not(:last-child)) {
+        --tw-divide-x-reverse: 0;
+        border-inline-style: var(--tw-border-style);
+        border-inline-start-width: calc(4px * var(--tw-divide-x-reverse));
+        border-inline-end-width: calc(4px * calc(1 - var(--tw-divide-x-reverse)));
+      }
+
+      :where(.divide-x-123 > :not(:last-child)) {
+        --tw-divide-x-reverse: 0;
+        border-inline-style: var(--tw-border-style);
+        border-inline-start-width: calc(123px * var(--tw-divide-x-reverse));
+        border-inline-end-width: calc(123px * calc(1 - var(--tw-divide-x-reverse)));
+      }
+
+      :where(.divide-x-\\[4px\\] > :not(:last-child)) {
+        --tw-divide-x-reverse: 0;
+        border-inline-style: var(--tw-border-style);
+        border-inline-start-width: calc(4px * var(--tw-divide-x-reverse));
+        border-inline-end-width: calc(4px * calc(1 - var(--tw-divide-x-reverse)));
+      }
+
+      @property --tw-divide-x-reverse {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0;
+      }
+
+      @property --tw-border-style {
+        syntax: "*";
+        inherits: false;
+        initial-value: solid;
+      }
+      "
+    `)
   expect(
     await run([
       '-divide-x',
@@ -8086,18 +10269,24 @@ test('divide-x', async () => {
 
 test('divide-x with custom default border width', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['divide-x'],
       css`
         @theme {
           --default-border-width: 2px;
         }
         @tailwind utilities;
       `,
-      ['divide-x'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --default-border-width: 2px;
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-divide-x-reverse: 0;
+          --tw-border-style: solid;
+        }
+      }
     }
 
     :where(.divide-x > :not(:last-child)) {
@@ -8107,15 +10296,6 @@ test('divide-x with custom default border width', async () => {
       border-inline-end-width: calc(2px * calc(1 - var(--tw-divide-x-reverse)));
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-divide-x-reverse: 0;
-          --tw-border-style: solid;
-        }
-      }
-    }
-
     @property --tw-divide-x-reverse {
       syntax: "*";
       inherits: false;
@@ -8126,73 +10306,78 @@ test('divide-x with custom default border width', async () => {
       syntax: "*";
       inherits: false;
       initial-value: solid;
-    }"
+    }
+    "
   `)
   expect(await run(['divide-x/foo'])).toEqual('')
 })
 
 test('divide-y', async () => {
-  expect(
-    await compileCss(
-      css`
-        @tailwind utilities;
-      `,
-      ['divide-y', 'divide-y-4', 'divide-y-123', 'divide-y-[4px]'],
-    ),
-  ).toMatchInlineSnapshot(`
-    ":where(.divide-y > :not(:last-child)) {
-      --tw-divide-y-reverse: 0;
-      border-bottom-style: var(--tw-border-style);
-      border-top-style: var(--tw-border-style);
-      border-top-width: calc(1px * var(--tw-divide-y-reverse));
-      border-bottom-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
-    }
-
-    :where(.divide-y-4 > :not(:last-child)) {
-      --tw-divide-y-reverse: 0;
-      border-bottom-style: var(--tw-border-style);
-      border-top-style: var(--tw-border-style);
-      border-top-width: calc(4px * var(--tw-divide-y-reverse));
-      border-bottom-width: calc(4px * calc(1 - var(--tw-divide-y-reverse)));
-    }
-
-    :where(.divide-y-123 > :not(:last-child)) {
-      --tw-divide-y-reverse: 0;
-      border-bottom-style: var(--tw-border-style);
-      border-top-style: var(--tw-border-style);
-      border-top-width: calc(123px * var(--tw-divide-y-reverse));
-      border-bottom-width: calc(123px * calc(1 - var(--tw-divide-y-reverse)));
-    }
-
-    :where(.divide-y-\\[4px\\] > :not(:last-child)) {
-      --tw-divide-y-reverse: 0;
-      border-bottom-style: var(--tw-border-style);
-      border-top-style: var(--tw-border-style);
-      border-top-width: calc(4px * var(--tw-divide-y-reverse));
-      border-bottom-width: calc(4px * calc(1 - var(--tw-divide-y-reverse)));
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-divide-y-reverse: 0;
-          --tw-border-style: solid;
+  expect(await run(['divide-y', 'divide-y-0', 'divide-y-4', 'divide-y-123', 'divide-y-[4px]']))
+    .toMatchInlineSnapshot(`
+      "
+      @layer properties {
+        @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+          *, :before, :after, ::backdrop {
+            --tw-divide-y-reverse: 0;
+            --tw-border-style: solid;
+          }
         }
       }
-    }
 
-    @property --tw-divide-y-reverse {
-      syntax: "*";
-      inherits: false;
-      initial-value: 0;
-    }
+      :where(.divide-y > :not(:last-child)) {
+        --tw-divide-y-reverse: 0;
+        border-bottom-style: var(--tw-border-style);
+        border-top-style: var(--tw-border-style);
+        border-top-width: calc(1px * var(--tw-divide-y-reverse));
+        border-bottom-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
+      }
 
-    @property --tw-border-style {
-      syntax: "*";
-      inherits: false;
-      initial-value: solid;
-    }"
-  `)
+      :where(.divide-y-0 > :not(:last-child)) {
+        --tw-divide-y-reverse: 0;
+        border-bottom-style: var(--tw-border-style);
+        border-top-style: var(--tw-border-style);
+        border-top-width: calc(0px * var(--tw-divide-y-reverse));
+        border-bottom-width: calc(0px * calc(1 - var(--tw-divide-y-reverse)));
+      }
+
+      :where(.divide-y-4 > :not(:last-child)) {
+        --tw-divide-y-reverse: 0;
+        border-bottom-style: var(--tw-border-style);
+        border-top-style: var(--tw-border-style);
+        border-top-width: calc(4px * var(--tw-divide-y-reverse));
+        border-bottom-width: calc(4px * calc(1 - var(--tw-divide-y-reverse)));
+      }
+
+      :where(.divide-y-123 > :not(:last-child)) {
+        --tw-divide-y-reverse: 0;
+        border-bottom-style: var(--tw-border-style);
+        border-top-style: var(--tw-border-style);
+        border-top-width: calc(123px * var(--tw-divide-y-reverse));
+        border-bottom-width: calc(123px * calc(1 - var(--tw-divide-y-reverse)));
+      }
+
+      :where(.divide-y-\\[4px\\] > :not(:last-child)) {
+        --tw-divide-y-reverse: 0;
+        border-bottom-style: var(--tw-border-style);
+        border-top-style: var(--tw-border-style);
+        border-top-width: calc(4px * var(--tw-divide-y-reverse));
+        border-bottom-width: calc(4px * calc(1 - var(--tw-divide-y-reverse)));
+      }
+
+      @property --tw-divide-y-reverse {
+        syntax: "*";
+        inherits: false;
+        initial-value: 0;
+      }
+
+      @property --tw-border-style {
+        syntax: "*";
+        inherits: false;
+        initial-value: solid;
+      }
+      "
+    `)
   expect(
     await run([
       '-divide-y',
@@ -8210,18 +10395,24 @@ test('divide-y', async () => {
 
 test('divide-y with custom default border width', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['divide-y'],
       css`
         @theme {
           --default-border-width: 2px;
         }
         @tailwind utilities;
       `,
-      ['divide-y'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --default-border-width: 2px;
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-divide-y-reverse: 0;
+          --tw-border-style: solid;
+        }
+      }
     }
 
     :where(.divide-y > :not(:last-child)) {
@@ -8232,15 +10423,6 @@ test('divide-y with custom default border width', async () => {
       border-bottom-width: calc(2px * calc(1 - var(--tw-divide-y-reverse)));
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-divide-y-reverse: 0;
-          --tw-border-style: solid;
-        }
-      }
-    }
-
     @property --tw-divide-y-reverse {
       syntax: "*";
       inherits: false;
@@ -8251,53 +10433,58 @@ test('divide-y with custom default border width', async () => {
       syntax: "*";
       inherits: false;
       initial-value: solid;
-    }"
+    }
+    "
   `)
   expect(await run(['divide-y/foo'])).toEqual('')
 })
 
 test('divide-x-reverse', async () => {
   expect(await run(['divide-x-reverse'])).toMatchInlineSnapshot(`
-    ":where(.divide-x-reverse > :not(:last-child)) {
-      --tw-divide-x-reverse: 1;
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-divide-x-reverse: 0;
         }
       }
     }
 
+    :where(.divide-x-reverse > :not(:last-child)) {
+      --tw-divide-x-reverse: 1;
+    }
+
     @property --tw-divide-x-reverse {
       syntax: "*";
       inherits: false;
       initial-value: 0;
-    }"
+    }
+    "
   `)
   expect(await run(['-divide-x-reverse', 'divide-x-reverse/foo'])).toEqual('')
 })
 
 test('divide-y-reverse', async () => {
   expect(await run(['divide-y-reverse'])).toMatchInlineSnapshot(`
-    ":where(.divide-y-reverse > :not(:last-child)) {
-      --tw-divide-y-reverse: 1;
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-divide-y-reverse: 0;
         }
       }
     }
 
+    :where(.divide-y-reverse > :not(:last-child)) {
+      --tw-divide-y-reverse: 1;
+    }
+
     @property --tw-divide-y-reverse {
       syntax: "*";
       inherits: false;
       initial-value: 0;
-    }"
+    }
+    "
   `)
   expect(await run(['-divide-y-reverse', 'divide-y-reverse/foo'])).toEqual('')
 })
@@ -8306,31 +10493,33 @@ test('divide-style', async () => {
   expect(
     await run(['divide-solid', 'divide-dashed', 'divide-dotted', 'divide-double', 'divide-none']),
   ).toMatchInlineSnapshot(`
-      ":where(.divide-dashed > :not(:last-child)) {
-        --tw-border-style: dashed;
-        border-style: dashed;
-      }
+    "
+    :where(.divide-dashed > :not(:last-child)) {
+      --tw-border-style: dashed;
+      border-style: dashed;
+    }
 
-      :where(.divide-dotted > :not(:last-child)) {
-        --tw-border-style: dotted;
-        border-style: dotted;
-      }
+    :where(.divide-dotted > :not(:last-child)) {
+      --tw-border-style: dotted;
+      border-style: dotted;
+    }
 
-      :where(.divide-double > :not(:last-child)) {
-        --tw-border-style: double;
-        border-style: double;
-      }
+    :where(.divide-double > :not(:last-child)) {
+      --tw-border-style: double;
+      border-style: double;
+    }
 
-      :where(.divide-none > :not(:last-child)) {
-        --tw-border-style: none;
-        border-style: none;
-      }
+    :where(.divide-none > :not(:last-child)) {
+      --tw-border-style: none;
+      border-style: none;
+    }
 
-      :where(.divide-solid > :not(:last-child)) {
-        --tw-border-style: solid;
-        border-style: solid;
-      }"
-    `)
+    :where(.divide-solid > :not(:last-child)) {
+      --tw-border-style: solid;
+      border-style: solid;
+    }
+    "
+  `)
   expect(
     await run([
       'divide',
@@ -8350,13 +10539,7 @@ test('divide-style', async () => {
 
 test('accent', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'accent-red-500',
         'accent-red-500/50',
@@ -8365,6 +10548,7 @@ test('accent', async () => {
         'accent-red-500/2.75',
         'accent-red-500/[0.5]',
         'accent-red-500/[50%]',
+        'accent-blue-500',
         'accent-current',
         'accent-current/50',
         'accent-current/[0.5]',
@@ -8376,10 +10560,19 @@ test('accent', async () => {
         'accent-[#0088cc]/[0.5]',
         'accent-[#0088cc]/[50%]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+          --accent-color-blue-500: #3b82f6;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --color-red-500: #ef4444;
+      --accent-color-blue-500: #3b82f6;
     }
 
     .accent-\\[\\#0088cc\\] {
@@ -8387,15 +10580,41 @@ test('accent', async () => {
     }
 
     .accent-\\[\\#0088cc\\]\\/50, .accent-\\[\\#0088cc\\]\\/\\[0\\.5\\], .accent-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      accent-color: oklab(59.9824% -.06725 -.12414 / .5);
+      accent-color: oklab(59.9824% -.067 -.124 / .5);
     }
 
-    .accent-current {
+    .accent-blue-500 {
+      accent-color: var(--accent-color-blue-500);
+    }
+
+    .accent-current, .accent-current\\/50 {
       accent-color: currentColor;
     }
 
-    .accent-current\\/50, .accent-current\\/\\[0\\.5\\], .accent-current\\/\\[50\\%\\] {
-      accent-color: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .accent-current\\/50 {
+        accent-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .accent-current\\/\\[0\\.5\\] {
+      accent-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .accent-current\\/\\[0\\.5\\] {
+        accent-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .accent-current\\/\\[50\\%\\] {
+      accent-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .accent-current\\/\\[50\\%\\] {
+        accent-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
     }
 
     .accent-inherit {
@@ -8407,24 +10626,69 @@ test('accent', async () => {
     }
 
     .accent-red-500\\/2\\.5 {
-      accent-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      accent-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .accent-red-500\\/2\\.5 {
+        accent-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      }
     }
 
     .accent-red-500\\/2\\.25 {
-      accent-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      accent-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .accent-red-500\\/2\\.25 {
+        accent-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      }
     }
 
     .accent-red-500\\/2\\.75 {
-      accent-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      accent-color: #ef444407;
     }
 
-    .accent-red-500\\/50, .accent-red-500\\/\\[0\\.5\\], .accent-red-500\\/\\[50\\%\\] {
-      accent-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .accent-red-500\\/2\\.75 {
+        accent-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      }
+    }
+
+    .accent-red-500\\/50 {
+      accent-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .accent-red-500\\/50 {
+        accent-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .accent-red-500\\/\\[0\\.5\\] {
+      accent-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .accent-red-500\\/\\[0\\.5\\] {
+        accent-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .accent-red-500\\/\\[50\\%\\] {
+      accent-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .accent-red-500\\/\\[50\\%\\] {
+        accent-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
     }
 
     .accent-transparent {
       accent-color: #0000;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -8465,13 +10729,7 @@ test('accent', async () => {
 
 test('caret', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'caret-red-500',
         'caret-red-500/50',
@@ -8480,6 +10738,7 @@ test('caret', async () => {
         'caret-red-500/2.75',
         'caret-red-500/[0.5]',
         'caret-red-500/[50%]',
+        'caret-blue-500',
         'caret-current',
         'caret-current/50',
         'caret-current/[0.5]',
@@ -8491,10 +10750,19 @@ test('caret', async () => {
         'caret-[#0088cc]/[0.5]',
         'caret-[#0088cc]/[50%]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+          --caret-color-blue-500: #3b82f6;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --color-red-500: #ef4444;
+      --caret-color-blue-500: #3b82f6;
     }
 
     .caret-\\[\\#0088cc\\] {
@@ -8502,15 +10770,41 @@ test('caret', async () => {
     }
 
     .caret-\\[\\#0088cc\\]\\/50, .caret-\\[\\#0088cc\\]\\/\\[0\\.5\\], .caret-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      caret-color: oklab(59.9824% -.06725 -.12414 / .5);
+      caret-color: oklab(59.9824% -.067 -.124 / .5);
     }
 
-    .caret-current {
+    .caret-blue-500 {
+      caret-color: var(--caret-color-blue-500);
+    }
+
+    .caret-current, .caret-current\\/50 {
       caret-color: currentColor;
     }
 
-    .caret-current\\/50, .caret-current\\/\\[0\\.5\\], .caret-current\\/\\[50\\%\\] {
-      caret-color: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .caret-current\\/50 {
+        caret-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .caret-current\\/\\[0\\.5\\] {
+      caret-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .caret-current\\/\\[0\\.5\\] {
+        caret-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .caret-current\\/\\[50\\%\\] {
+      caret-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .caret-current\\/\\[50\\%\\] {
+        caret-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
     }
 
     .caret-inherit {
@@ -8522,24 +10816,69 @@ test('caret', async () => {
     }
 
     .caret-red-500\\/2\\.5 {
-      caret-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      caret-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .caret-red-500\\/2\\.5 {
+        caret-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      }
     }
 
     .caret-red-500\\/2\\.25 {
-      caret-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      caret-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .caret-red-500\\/2\\.25 {
+        caret-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      }
     }
 
     .caret-red-500\\/2\\.75 {
-      caret-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      caret-color: #ef444407;
     }
 
-    .caret-red-500\\/50, .caret-red-500\\/\\[0\\.5\\], .caret-red-500\\/\\[50\\%\\] {
-      caret-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .caret-red-500\\/2\\.75 {
+        caret-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      }
+    }
+
+    .caret-red-500\\/50 {
+      caret-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .caret-red-500\\/50 {
+        caret-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .caret-red-500\\/\\[0\\.5\\] {
+      caret-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .caret-red-500\\/\\[0\\.5\\] {
+        caret-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .caret-red-500\\/\\[50\\%\\] {
+      caret-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .caret-red-500\\/\\[50\\%\\] {
+        caret-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
     }
 
     .caret-transparent {
       caret-color: #0000;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -8578,13 +10917,7 @@ test('caret', async () => {
 
 test('divide-color', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'divide-red-500',
         'divide-red-500/50',
@@ -8593,6 +10926,7 @@ test('divide-color', async () => {
         'divide-red-500/2.75',
         'divide-red-500/[0.5]',
         'divide-red-500/[50%]',
+        'divide-best-blue',
         'divide-current',
         'divide-current/50',
         'divide-current/[0.5]',
@@ -8604,10 +10938,19 @@ test('divide-color', async () => {
         'divide-[#0088cc]/[0.5]',
         'divide-[#0088cc]/[50%]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+          --border-color-best-blue: #6495ed;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --color-red-500: #ef4444;
+      --border-color-best-blue: #6495ed;
     }
 
     :where(.divide-\\[\\#0088cc\\] > :not(:last-child)) {
@@ -8615,15 +10958,41 @@ test('divide-color', async () => {
     }
 
     :where(.divide-\\[\\#0088cc\\]\\/50 > :not(:last-child)), :where(.divide-\\[\\#0088cc\\]\\/\\[0\\.5\\] > :not(:last-child)), :where(.divide-\\[\\#0088cc\\]\\/\\[50\\%\\] > :not(:last-child)) {
-      border-color: oklab(59.9824% -.06725 -.12414 / .5);
+      border-color: oklab(59.9824% -.067 -.124 / .5);
     }
 
-    :where(.divide-current > :not(:last-child)) {
+    :where(.divide-best-blue > :not(:last-child)) {
+      border-color: var(--border-color-best-blue);
+    }
+
+    :where(.divide-current > :not(:last-child)), :where(.divide-current\\/50 > :not(:last-child)) {
       border-color: currentColor;
     }
 
-    :where(.divide-current\\/50 > :not(:last-child)), :where(.divide-current\\/\\[0\\.5\\] > :not(:last-child)), :where(.divide-current\\/\\[50\\%\\] > :not(:last-child)) {
-      border-color: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      :where(.divide-current\\/50 > :not(:last-child)) {
+        border-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    :where(.divide-current\\/\\[0\\.5\\] > :not(:last-child)) {
+      border-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      :where(.divide-current\\/\\[0\\.5\\] > :not(:last-child)) {
+        border-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    :where(.divide-current\\/\\[50\\%\\] > :not(:last-child)) {
+      border-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      :where(.divide-current\\/\\[50\\%\\] > :not(:last-child)) {
+        border-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
     }
 
     :where(.divide-inherit > :not(:last-child)) {
@@ -8635,24 +11004,69 @@ test('divide-color', async () => {
     }
 
     :where(.divide-red-500\\/2\\.5 > :not(:last-child)) {
-      border-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      border-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      :where(.divide-red-500\\/2\\.5 > :not(:last-child)) {
+        border-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      }
     }
 
     :where(.divide-red-500\\/2\\.25 > :not(:last-child)) {
-      border-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      border-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      :where(.divide-red-500\\/2\\.25 > :not(:last-child)) {
+        border-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      }
     }
 
     :where(.divide-red-500\\/2\\.75 > :not(:last-child)) {
-      border-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      border-color: #ef444407;
     }
 
-    :where(.divide-red-500\\/50 > :not(:last-child)), :where(.divide-red-500\\/\\[0\\.5\\] > :not(:last-child)), :where(.divide-red-500\\/\\[50\\%\\] > :not(:last-child)) {
-      border-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      :where(.divide-red-500\\/2\\.75 > :not(:last-child)) {
+        border-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      }
+    }
+
+    :where(.divide-red-500\\/50 > :not(:last-child)) {
+      border-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      :where(.divide-red-500\\/50 > :not(:last-child)) {
+        border-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    :where(.divide-red-500\\/\\[0\\.5\\] > :not(:last-child)) {
+      border-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      :where(.divide-red-500\\/\\[0\\.5\\] > :not(:last-child)) {
+        border-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    :where(.divide-red-500\\/\\[50\\%\\] > :not(:last-child)) {
+      border-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      :where(.divide-red-500\\/\\[50\\%\\] > :not(:last-child)) {
+        border-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
     }
 
     :where(.divide-transparent > :not(:last-child)) {
       border-color: #0000;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -8695,11 +11109,14 @@ test('place-self', async () => {
       'place-self-auto',
       'place-self-start',
       'place-self-end',
+      'place-self-end-safe',
       'place-self-center',
+      'place-self-center-safe',
       'place-self-stretch',
     ]),
   ).toMatchInlineSnapshot(`
-    ".place-self-auto {
+    "
+    .place-self-auto {
       place-self: auto;
     }
 
@@ -8707,17 +11124,26 @@ test('place-self', async () => {
       place-self: center;
     }
 
+    .place-self-center-safe {
+      place-self: safe center;
+    }
+
     .place-self-end {
       place-self: end;
     }
 
+    .place-self-end-safe {
+      place-self: safe end;
+    }
+
     .place-self-start {
       place-self: start;
     }
 
     .place-self-stretch {
       place-self: stretch stretch;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -8742,12 +11168,16 @@ test('self', async () => {
       'self-auto',
       'self-start',
       'self-end',
+      'self-end-safe',
       'self-center',
+      'self-center-safe',
       'self-stretch',
       'self-baseline',
+      'self-baseline-last',
     ]),
   ).toMatchInlineSnapshot(`
-    ".self-auto {
+    "
+    .self-auto {
       align-self: auto;
     }
 
@@ -8755,21 +11185,34 @@ test('self', async () => {
       align-self: baseline;
     }
 
+    .self-baseline-last {
+      align-self: last baseline;
+    }
+
     .self-center {
       align-self: center;
     }
 
+    .self-center-safe {
+      align-self: safe center;
+    }
+
     .self-end {
       align-self: flex-end;
     }
 
+    .self-end-safe {
+      align-self: safe flex-end;
+    }
+
     .self-start {
       align-self: flex-start;
     }
 
     .self-stretch {
       align-self: stretch;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -8796,12 +11239,15 @@ test('justify-self', async () => {
       'justify-self-auto',
       'justify-self-start',
       'justify-self-end',
+      'justify-self-end-safe',
       'justify-self-center',
+      'justify-self-center-safe',
       'justify-self-stretch',
       'justify-self-baseline',
     ]),
   ).toMatchInlineSnapshot(`
-    ".justify-self-auto {
+    "
+    .justify-self-auto {
       justify-self: auto;
     }
 
@@ -8809,17 +11255,26 @@ test('justify-self', async () => {
       justify-self: center;
     }
 
+    .justify-self-center-safe {
+      justify-self: safe center;
+    }
+
     .justify-self-end {
       justify-self: flex-end;
     }
 
+    .justify-self-end-safe {
+      justify-self: safe flex-end;
+    }
+
     .justify-self-start {
       justify-self: flex-start;
     }
 
     .justify-self-stretch {
       justify-self: stretch;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -8850,7 +11305,8 @@ test('overflow', async () => {
       'overflow-scroll',
     ]),
   ).toMatchInlineSnapshot(`
-    ".overflow-auto {
+    "
+    .overflow-auto {
       overflow: auto;
     }
 
@@ -8868,7 +11324,8 @@ test('overflow', async () => {
 
     .overflow-visible {
       overflow: visible;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -8897,7 +11354,8 @@ test('overflow-x', async () => {
       'overflow-x-scroll',
     ]),
   ).toMatchInlineSnapshot(`
-    ".overflow-x-auto {
+    "
+    .overflow-x-auto {
       overflow-x: auto;
     }
 
@@ -8915,7 +11373,8 @@ test('overflow-x', async () => {
 
     .overflow-x-visible {
       overflow-x: visible;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -8944,7 +11403,8 @@ test('overflow-y', async () => {
       'overflow-y-scroll',
     ]),
   ).toMatchInlineSnapshot(`
-    ".overflow-y-auto {
+    "
+    .overflow-y-auto {
       overflow-y: auto;
     }
 
@@ -8962,7 +11422,8 @@ test('overflow-y', async () => {
 
     .overflow-y-visible {
       overflow-y: visible;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -8984,18 +11445,20 @@ test('overflow-y', async () => {
 test('overscroll', async () => {
   expect(await run(['overscroll-auto', 'overscroll-contain', 'overscroll-none']))
     .toMatchInlineSnapshot(`
-    ".overscroll-auto {
-      overscroll-behavior: auto;
-    }
+      "
+      .overscroll-auto {
+        overscroll-behavior: auto;
+      }
 
-    .overscroll-contain {
-      overscroll-behavior: contain;
-    }
+      .overscroll-contain {
+        overscroll-behavior: contain;
+      }
 
-    .overscroll-none {
-      overscroll-behavior: none;
-    }"
-  `)
+      .overscroll-none {
+        overscroll-behavior: none;
+      }
+      "
+    `)
   expect(
     await run([
       'overscroll',
@@ -9012,18 +11475,20 @@ test('overscroll', async () => {
 test('overscroll-x', async () => {
   expect(await run(['overscroll-x-auto', 'overscroll-x-contain', 'overscroll-x-none']))
     .toMatchInlineSnapshot(`
-    ".overscroll-x-auto {
-      overscroll-behavior-x: auto;
-    }
+      "
+      .overscroll-x-auto {
+        overscroll-behavior-x: auto;
+      }
 
-    .overscroll-x-contain {
-      overscroll-behavior-x: contain;
-    }
+      .overscroll-x-contain {
+        overscroll-behavior-x: contain;
+      }
 
-    .overscroll-x-none {
-      overscroll-behavior-x: none;
-    }"
-  `)
+      .overscroll-x-none {
+        overscroll-behavior-x: none;
+      }
+      "
+    `)
   expect(
     await run([
       'overscroll-x',
@@ -9040,18 +11505,20 @@ test('overscroll-x', async () => {
 test('overscroll-y', async () => {
   expect(await run(['overscroll-y-auto', 'overscroll-y-contain', 'overscroll-y-none']))
     .toMatchInlineSnapshot(`
-    ".overscroll-y-auto {
-      overscroll-behavior-y: auto;
-    }
+      "
+      .overscroll-y-auto {
+        overscroll-behavior-y: auto;
+      }
 
-    .overscroll-y-contain {
-      overscroll-behavior-y: contain;
-    }
+      .overscroll-y-contain {
+        overscroll-behavior-y: contain;
+      }
 
-    .overscroll-y-none {
-      overscroll-behavior-y: none;
-    }"
-  `)
+      .overscroll-y-none {
+        overscroll-behavior-y: none;
+      }
+      "
+    `)
   expect(
     await run([
       'overscroll-y',
@@ -9067,39 +11534,338 @@ test('overscroll-y', async () => {
 
 test('scroll-behavior', async () => {
   expect(await run(['scroll-auto', 'scroll-smooth'])).toMatchInlineSnapshot(`
-    ".scroll-auto {
+    "
+    .scroll-auto {
       scroll-behavior: auto;
     }
 
     .scroll-smooth {
       scroll-behavior: smooth;
-    }"
+    }
+    "
   `)
   expect(
     await run(['scroll', '-scroll-auto', '-scroll-smooth', 'scroll-auto/foo', 'scroll-smooth/foo']),
   ).toEqual('')
 })
 
+test('scrollbar-width', async () => {
+  expect(await run(['scrollbar-auto', 'scrollbar-thin', 'scrollbar-none'])).toMatchInlineSnapshot(`
+    "
+    .scrollbar-auto {
+      scrollbar-width: auto;
+    }
+
+    .scrollbar-none {
+      scrollbar-width: none;
+    }
+
+    .scrollbar-thin {
+      scrollbar-width: thin;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'scrollbar',
+      '-scrollbar-auto',
+      '-scrollbar-thin',
+      '-scrollbar-none',
+      'scrollbar-auto/foo',
+      'scrollbar-thin/foo',
+      'scrollbar-none/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('scrollbar-gutter', async () => {
+  expect(await run(['scrollbar-gutter-auto', 'scrollbar-gutter-stable', 'scrollbar-gutter-both']))
+    .toMatchInlineSnapshot(`
+      "
+      .scrollbar-gutter-auto {
+        scrollbar-gutter: auto;
+      }
+
+      .scrollbar-gutter-both {
+        scrollbar-gutter: stable both-edges;
+      }
+
+      .scrollbar-gutter-stable {
+        scrollbar-gutter: stable;
+      }
+      "
+    `)
+  expect(
+    await run([
+      'scrollbar-gutter',
+      '-scrollbar-gutter-auto',
+      '-scrollbar-gutter-stable',
+      '-scrollbar-gutter-both',
+      'scrollbar-gutter-auto/foo',
+      'scrollbar-gutter-stable/foo',
+      'scrollbar-gutter-both/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('scrollbar-thumb', async () => {
+  expect(
+    await run(
+      [
+        'scrollbar-thumb-red-500',
+        'scrollbar-thumb-red-500/50',
+        'scrollbar-thumb-red-500/[0.5]',
+        'scrollbar-thumb-current',
+        'scrollbar-thumb-inherit',
+        'scrollbar-thumb-transparent',
+        'scrollbar-thumb-[#0088cc]',
+        'scrollbar-thumb-[#0088cc]/50',
+      ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-scrollbar-thumb: #0000;
+          --tw-scrollbar-track: #0000;
+        }
+      }
+    }
+
+    :root, :host {
+      --color-red-500: #ef4444;
+    }
+
+    .scrollbar-thumb-\\[\\#0088cc\\] {
+      --tw-scrollbar-thumb: #08c;
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    .scrollbar-thumb-\\[\\#0088cc\\]\\/50 {
+      --tw-scrollbar-thumb: oklab(59.9824% -.067 -.124 / .5);
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    .scrollbar-thumb-current {
+      --tw-scrollbar-thumb: currentcolor;
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    .scrollbar-thumb-inherit {
+      --tw-scrollbar-thumb: inherit;
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    .scrollbar-thumb-red-500 {
+      --tw-scrollbar-thumb: var(--color-red-500);
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    .scrollbar-thumb-red-500\\/50 {
+      --tw-scrollbar-thumb: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .scrollbar-thumb-red-500\\/50 {
+        --tw-scrollbar-thumb: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .scrollbar-thumb-red-500\\/50 {
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    .scrollbar-thumb-red-500\\/\\[0\\.5\\] {
+      --tw-scrollbar-thumb: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .scrollbar-thumb-red-500\\/\\[0\\.5\\] {
+        --tw-scrollbar-thumb: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .scrollbar-thumb-red-500\\/\\[0\\.5\\] {
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    .scrollbar-thumb-transparent {
+      --tw-scrollbar-thumb: transparent;
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    @property --tw-scrollbar-thumb {
+      syntax: "<color>";
+      inherits: false;
+      initial-value: #0000;
+    }
+
+    @property --tw-scrollbar-track {
+      syntax: "<color>";
+      inherits: false;
+      initial-value: #0000;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'scrollbar-thumb',
+      '-scrollbar-thumb-red-500',
+      '-scrollbar-thumb-red-500/50',
+      'scrollbar-thumb-red-500/foo',
+      'scrollbar-thumb-[#0088cc]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('scrollbar-track', async () => {
+  expect(
+    await run(
+      [
+        'scrollbar-track-red-500',
+        'scrollbar-track-red-500/50',
+        'scrollbar-track-red-500/[0.5]',
+        'scrollbar-track-current',
+        'scrollbar-track-inherit',
+        'scrollbar-track-transparent',
+        'scrollbar-track-[#0088cc]',
+        'scrollbar-track-[#0088cc]/50',
+      ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-scrollbar-thumb: #0000;
+          --tw-scrollbar-track: #0000;
+        }
+      }
+    }
+
+    :root, :host {
+      --color-red-500: #ef4444;
+    }
+
+    .scrollbar-track-\\[\\#0088cc\\] {
+      --tw-scrollbar-track: #08c;
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    .scrollbar-track-\\[\\#0088cc\\]\\/50 {
+      --tw-scrollbar-track: oklab(59.9824% -.067 -.124 / .5);
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    .scrollbar-track-current {
+      --tw-scrollbar-track: currentcolor;
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    .scrollbar-track-inherit {
+      --tw-scrollbar-track: inherit;
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    .scrollbar-track-red-500 {
+      --tw-scrollbar-track: var(--color-red-500);
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    .scrollbar-track-red-500\\/50 {
+      --tw-scrollbar-track: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .scrollbar-track-red-500\\/50 {
+        --tw-scrollbar-track: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .scrollbar-track-red-500\\/50 {
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    .scrollbar-track-red-500\\/\\[0\\.5\\] {
+      --tw-scrollbar-track: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .scrollbar-track-red-500\\/\\[0\\.5\\] {
+        --tw-scrollbar-track: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .scrollbar-track-red-500\\/\\[0\\.5\\] {
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    .scrollbar-track-transparent {
+      --tw-scrollbar-track: transparent;
+      scrollbar-color: var(--tw-scrollbar-thumb) var(--tw-scrollbar-track);
+    }
+
+    @property --tw-scrollbar-thumb {
+      syntax: "<color>";
+      inherits: false;
+      initial-value: #0000;
+    }
+
+    @property --tw-scrollbar-track {
+      syntax: "<color>";
+      inherits: false;
+      initial-value: #0000;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'scrollbar-track',
+      '-scrollbar-track-red-500',
+      '-scrollbar-track-red-500/50',
+      'scrollbar-track-red-500/foo',
+      'scrollbar-track-[#0088cc]/foo',
+    ]),
+  ).toEqual('')
+})
+
 test('truncate', async () => {
   expect(await run(['truncate'])).toMatchInlineSnapshot(`
-    ".truncate {
+    "
+    .truncate {
       text-overflow: ellipsis;
       white-space: nowrap;
       overflow: hidden;
-    }"
+    }
+    "
   `)
   expect(await run(['-truncate', 'truncate/foo'])).toEqual('')
 })
 
 test('text-overflow', async () => {
   expect(await run(['text-ellipsis', 'text-clip'])).toMatchInlineSnapshot(`
-    ".text-clip {
+    "
+    .text-clip {
       text-overflow: clip;
     }
 
     .text-ellipsis {
       text-overflow: ellipsis;
-    }"
+    }
+    "
   `)
   expect(await run(['-text-ellipsis', '-text-clip', 'text-ellipsis/foo', 'text-clip/foo'])).toEqual(
     '',
@@ -9108,7 +11874,8 @@ test('text-overflow', async () => {
 
 test('hyphens', async () => {
   expect(await run(['hyphens-none', 'hyphens-manual', 'hyphens-auto'])).toMatchInlineSnapshot(`
-    ".hyphens-auto {
+    "
+    .hyphens-auto {
       -webkit-hyphens: auto;
       hyphens: auto;
     }
@@ -9121,7 +11888,8 @@ test('hyphens', async () => {
     .hyphens-none {
       -webkit-hyphens: none;
       hyphens: none;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -9147,7 +11915,8 @@ test('whitespace', async () => {
       'whitespace-break-spaces',
     ]),
   ).toMatchInlineSnapshot(`
-    ".whitespace-break-spaces {
+    "
+    .whitespace-break-spaces {
       white-space: break-spaces;
     }
 
@@ -9169,7 +11938,8 @@ test('whitespace', async () => {
 
     .whitespace-pre-wrap {
       white-space: pre-wrap;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -9190,25 +11960,60 @@ test('whitespace', async () => {
   ).toEqual('')
 })
 
+test('tab', async () => {
+  expect(await run(['tab-2', 'tab-8', 'tab-[12px]', 'tab-[3]'])).toMatchInlineSnapshot(`
+    "
+    .tab-2 {
+      tab-size: 2;
+    }
+
+    .tab-8 {
+      tab-size: 8;
+    }
+
+    .tab-\\[3\\] {
+      tab-size: 3;
+    }
+
+    .tab-\\[12px\\] {
+      tab-size: 12px;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'tab',
+      '-tab-2',
+      'tab-2.5',
+      'tab-1/2',
+      'tab-unknown',
+      'tab-2/foo',
+      'tab-[12px]/foo',
+    ]),
+  ).toEqual('')
+})
+
 test('text-wrap', async () => {
   expect(await run(['text-wrap', 'text-nowrap', 'text-balance', 'text-pretty']))
     .toMatchInlineSnapshot(`
-    ".text-balance {
-      text-wrap: balance;
-    }
+      "
+      .text-balance {
+        text-wrap: balance;
+      }
 
-    .text-nowrap {
-      text-wrap: nowrap;
-    }
+      .text-nowrap {
+        text-wrap: nowrap;
+      }
 
-    .text-pretty {
-      text-wrap: pretty;
-    }
+      .text-pretty {
+        text-wrap: pretty;
+      }
 
-    .text-wrap {
-      text-wrap: wrap;
-    }"
-  `)
+      .text-wrap {
+        text-wrap: wrap;
+      }
+      "
+    `)
   expect(
     await run([
       '-text-wrap',
@@ -9223,10 +12028,11 @@ test('text-wrap', async () => {
   ).toEqual('')
 })
 
-test('overflow-wrap', async () => {
+test('word-break', async () => {
   expect(await run(['break-normal', 'break-words', 'break-all', 'break-keep']))
     .toMatchInlineSnapshot(`
-      ".break-normal {
+      "
+      .break-normal {
         overflow-wrap: normal;
         word-break: normal;
       }
@@ -9241,7 +12047,8 @@ test('overflow-wrap', async () => {
 
       .break-keep {
         word-break: keep-all;
-      }"
+      }
+      "
     `)
   expect(
     await run([
@@ -9257,9 +12064,38 @@ test('overflow-wrap', async () => {
   ).toEqual('')
 })
 
+test('overflow-wrap', async () => {
+  expect(await run(['wrap-anywhere', 'wrap-break-word', 'wrap-normal'])).toMatchInlineSnapshot(`
+    "
+    .wrap-anywhere {
+      overflow-wrap: anywhere;
+    }
+
+    .wrap-break-word {
+      overflow-wrap: break-word;
+    }
+
+    .wrap-normal {
+      overflow-wrap: normal;
+    }
+    "
+  `)
+  expect(
+    await run([
+      '-wrap-anywhere',
+      '-wrap-break-word',
+      '-wrap-normal',
+      'wrap-anywhere/foo',
+      'wrap-break-word/foo',
+      'wrap-normal/foo',
+    ]),
+  ).toEqual('')
+})
+
 test('rounded', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded', 'rounded-full', 'rounded-none', 'rounded-sm', 'rounded-[4px]'],
       css`
         @theme {
           --radius-sm: 0.125rem;
@@ -9267,10 +12103,10 @@ test('rounded', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded', 'rounded-full', 'rounded-none', 'rounded-sm', 'rounded-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-sm: .125rem;
       --radius: .25rem;
     }
@@ -9284,7 +12120,7 @@ test('rounded', async () => {
     }
 
     .rounded-full {
-      border-radius: 3.40282e38px;
+      border-radius: 2147483647px;
     }
 
     .rounded-none {
@@ -9293,27 +12129,60 @@ test('rounded', async () => {
 
     .rounded-sm {
       border-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
-    await run([
-      '-rounded',
-      '-rounded-full',
-      '-rounded-none',
-      '-rounded-sm',
-      '-rounded-[4px]',
-      'rounded/foo',
-      'rounded-full/foo',
-      'rounded-none/foo',
-      'rounded-sm/foo',
-      'rounded-[4px]/foo',
-    ]),
+    await run(
+      ['rounded-full'],
+      css`
+        @theme {
+          --radius-full: 99999px;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --radius-full: 99999px;
+    }
+
+    .rounded-full {
+      border-radius: var(--radius-full);
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        '-rounded',
+        '-rounded-full',
+        '-rounded-none',
+        '-rounded-sm',
+        '-rounded-[4px]',
+        'rounded/foo',
+        'rounded-full/foo',
+        'rounded-none/foo',
+        'rounded-sm/foo',
+        'rounded-[4px]/foo',
+        'rounded-sm/[5]',
+        'rounded-sm/(--foo)',
+      ],
+      css`
+        @theme {
+          --radius-sm: 0.125rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
   ).toEqual('')
 })
 
 test('rounded-s', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded-s', 'rounded-s-full', 'rounded-s-none', 'rounded-s-sm', 'rounded-s-[4px]'],
       css`
         @theme {
           --radius-none: 0px;
@@ -9323,10 +12192,10 @@ test('rounded-s', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded-s', 'rounded-s-full', 'rounded-s-none', 'rounded-s-sm', 'rounded-s-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-none: 0px;
       --radius-full: 9999px;
       --radius-sm: .125rem;
@@ -9356,7 +12225,8 @@ test('rounded-s', async () => {
     .rounded-s-sm {
       border-start-start-radius: var(--radius-sm);
       border-end-start-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -9376,7 +12246,8 @@ test('rounded-s', async () => {
 
 test('rounded-e', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded-e', 'rounded-e-full', 'rounded-e-none', 'rounded-e-sm', 'rounded-e-[4px]'],
       css`
         @theme {
           --radius-none: 0px;
@@ -9386,10 +12257,10 @@ test('rounded-e', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded-e', 'rounded-e-full', 'rounded-e-none', 'rounded-e-sm', 'rounded-e-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-none: 0px;
       --radius-full: 9999px;
       --radius-sm: .125rem;
@@ -9419,7 +12290,8 @@ test('rounded-e', async () => {
     .rounded-e-sm {
       border-start-end-radius: var(--radius-sm);
       border-end-end-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -9439,7 +12311,8 @@ test('rounded-e', async () => {
 
 test('rounded-t', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded-t', 'rounded-t-full', 'rounded-t-none', 'rounded-t-sm', 'rounded-t-[4px]'],
       css`
         @theme {
           --radius-none: 0px;
@@ -9449,10 +12322,10 @@ test('rounded-t', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded-t', 'rounded-t-full', 'rounded-t-none', 'rounded-t-sm', 'rounded-t-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-none: 0px;
       --radius-full: 9999px;
       --radius-sm: .125rem;
@@ -9470,15 +12343,11 @@ test('rounded-t', async () => {
     }
 
     .rounded-t-full {
-      border-top-left-radius: 3.40282e38px;
-      border-top-right-radius: 3.40282e38px;
       border-top-left-radius: var(--radius-full);
       border-top-right-radius: var(--radius-full);
     }
 
     .rounded-t-none {
-      border-top-left-radius: 0;
-      border-top-right-radius: 0;
       border-top-left-radius: var(--radius-none);
       border-top-right-radius: var(--radius-none);
     }
@@ -9486,7 +12355,8 @@ test('rounded-t', async () => {
     .rounded-t-sm {
       border-top-left-radius: var(--radius-sm);
       border-top-right-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -9506,7 +12376,8 @@ test('rounded-t', async () => {
 
 test('rounded-r', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded-r', 'rounded-r-full', 'rounded-r-none', 'rounded-r-sm', 'rounded-r-[4px]'],
       css`
         @theme {
           --radius-none: 0px;
@@ -9516,10 +12387,10 @@ test('rounded-r', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded-r', 'rounded-r-full', 'rounded-r-none', 'rounded-r-sm', 'rounded-r-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-none: 0px;
       --radius-full: 9999px;
       --radius-sm: .125rem;
@@ -9537,15 +12408,11 @@ test('rounded-r', async () => {
     }
 
     .rounded-r-full {
-      border-top-right-radius: 3.40282e38px;
-      border-bottom-right-radius: 3.40282e38px;
       border-top-right-radius: var(--radius-full);
       border-bottom-right-radius: var(--radius-full);
     }
 
     .rounded-r-none {
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
       border-top-right-radius: var(--radius-none);
       border-bottom-right-radius: var(--radius-none);
     }
@@ -9553,7 +12420,8 @@ test('rounded-r', async () => {
     .rounded-r-sm {
       border-top-right-radius: var(--radius-sm);
       border-bottom-right-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -9573,7 +12441,8 @@ test('rounded-r', async () => {
 
 test('rounded-b', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded-b', 'rounded-b-full', 'rounded-b-none', 'rounded-b-sm', 'rounded-b-[4px]'],
       css`
         @theme {
           --radius-none: 0px;
@@ -9583,10 +12452,10 @@ test('rounded-b', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded-b', 'rounded-b-full', 'rounded-b-none', 'rounded-b-sm', 'rounded-b-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-none: 0px;
       --radius-full: 9999px;
       --radius-sm: .125rem;
@@ -9604,15 +12473,11 @@ test('rounded-b', async () => {
     }
 
     .rounded-b-full {
-      border-bottom-right-radius: 3.40282e38px;
-      border-bottom-left-radius: 3.40282e38px;
       border-bottom-right-radius: var(--radius-full);
       border-bottom-left-radius: var(--radius-full);
     }
 
     .rounded-b-none {
-      border-bottom-right-radius: 0;
-      border-bottom-left-radius: 0;
       border-bottom-right-radius: var(--radius-none);
       border-bottom-left-radius: var(--radius-none);
     }
@@ -9620,7 +12485,8 @@ test('rounded-b', async () => {
     .rounded-b-sm {
       border-bottom-right-radius: var(--radius-sm);
       border-bottom-left-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -9640,7 +12506,8 @@ test('rounded-b', async () => {
 
 test('rounded-l', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded-l', 'rounded-l-full', 'rounded-l-none', 'rounded-l-sm', 'rounded-l-[4px]'],
       css`
         @theme {
           --radius-none: 0px;
@@ -9650,10 +12517,10 @@ test('rounded-l', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded-l', 'rounded-l-full', 'rounded-l-none', 'rounded-l-sm', 'rounded-l-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-none: 0px;
       --radius-full: 9999px;
       --radius-sm: .125rem;
@@ -9671,15 +12538,11 @@ test('rounded-l', async () => {
     }
 
     .rounded-l-full {
-      border-top-left-radius: 3.40282e38px;
-      border-bottom-left-radius: 3.40282e38px;
       border-top-left-radius: var(--radius-full);
       border-bottom-left-radius: var(--radius-full);
     }
 
     .rounded-l-none {
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
       border-top-left-radius: var(--radius-none);
       border-bottom-left-radius: var(--radius-none);
     }
@@ -9687,7 +12550,8 @@ test('rounded-l', async () => {
     .rounded-l-sm {
       border-top-left-radius: var(--radius-sm);
       border-bottom-left-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -9707,7 +12571,8 @@ test('rounded-l', async () => {
 
 test('rounded-ss', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded-ss', 'rounded-ss-full', 'rounded-ss-none', 'rounded-ss-sm', 'rounded-ss-[4px]'],
       css`
         @theme {
           --radius-none: 0px;
@@ -9717,10 +12582,10 @@ test('rounded-ss', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded-ss', 'rounded-ss-full', 'rounded-ss-none', 'rounded-ss-sm', 'rounded-ss-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-none: 0px;
       --radius-full: 9999px;
       --radius-sm: .125rem;
@@ -9745,7 +12610,8 @@ test('rounded-ss', async () => {
 
     .rounded-ss-sm {
       border-start-start-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -9765,7 +12631,8 @@ test('rounded-ss', async () => {
 
 test('rounded-se', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded-se', 'rounded-se-full', 'rounded-se-none', 'rounded-se-sm', 'rounded-se-[4px]'],
       css`
         @theme {
           --radius-none: 0px;
@@ -9775,10 +12642,10 @@ test('rounded-se', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded-se', 'rounded-se-full', 'rounded-se-none', 'rounded-se-sm', 'rounded-se-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-none: 0px;
       --radius-full: 9999px;
       --radius-sm: .125rem;
@@ -9803,7 +12670,8 @@ test('rounded-se', async () => {
 
     .rounded-se-sm {
       border-start-end-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -9823,7 +12691,8 @@ test('rounded-se', async () => {
 
 test('rounded-ee', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded-ee', 'rounded-ee-full', 'rounded-ee-none', 'rounded-ee-sm', 'rounded-ee-[4px]'],
       css`
         @theme {
           --radius-none: 0px;
@@ -9833,10 +12702,10 @@ test('rounded-ee', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded-ee', 'rounded-ee-full', 'rounded-ee-none', 'rounded-ee-sm', 'rounded-ee-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-none: 0px;
       --radius-full: 9999px;
       --radius-sm: .125rem;
@@ -9861,7 +12730,8 @@ test('rounded-ee', async () => {
 
     .rounded-ee-sm {
       border-end-end-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -9881,7 +12751,8 @@ test('rounded-ee', async () => {
 
 test('rounded-es', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded-es', 'rounded-es-full', 'rounded-es-none', 'rounded-es-sm', 'rounded-es-[4px]'],
       css`
         @theme {
           --radius-none: 0px;
@@ -9891,10 +12762,10 @@ test('rounded-es', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded-es', 'rounded-es-full', 'rounded-es-none', 'rounded-es-sm', 'rounded-es-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-none: 0px;
       --radius-full: 9999px;
       --radius-sm: .125rem;
@@ -9919,7 +12790,8 @@ test('rounded-es', async () => {
 
     .rounded-es-sm {
       border-end-start-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -9939,7 +12811,8 @@ test('rounded-es', async () => {
 
 test('rounded-tl', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded-tl', 'rounded-tl-full', 'rounded-tl-none', 'rounded-tl-sm', 'rounded-tl-[4px]'],
       css`
         @theme {
           --radius-none: 0px;
@@ -9949,10 +12822,10 @@ test('rounded-tl', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded-tl', 'rounded-tl-full', 'rounded-tl-none', 'rounded-tl-sm', 'rounded-tl-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-none: 0px;
       --radius-full: 9999px;
       --radius-sm: .125rem;
@@ -9968,18 +12841,17 @@ test('rounded-tl', async () => {
     }
 
     .rounded-tl-full {
-      border-top-left-radius: 3.40282e38px;
       border-top-left-radius: var(--radius-full);
     }
 
     .rounded-tl-none {
-      border-top-left-radius: 0;
       border-top-left-radius: var(--radius-none);
     }
 
     .rounded-tl-sm {
       border-top-left-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -9999,7 +12871,8 @@ test('rounded-tl', async () => {
 
 test('rounded-tr', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded-tr', 'rounded-tr-full', 'rounded-tr-none', 'rounded-tr-sm', 'rounded-tr-[4px]'],
       css`
         @theme {
           --radius-none: 0px;
@@ -10009,10 +12882,10 @@ test('rounded-tr', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded-tr', 'rounded-tr-full', 'rounded-tr-none', 'rounded-tr-sm', 'rounded-tr-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-none: 0px;
       --radius-full: 9999px;
       --radius-sm: .125rem;
@@ -10028,18 +12901,17 @@ test('rounded-tr', async () => {
     }
 
     .rounded-tr-full {
-      border-top-right-radius: 3.40282e38px;
       border-top-right-radius: var(--radius-full);
     }
 
     .rounded-tr-none {
-      border-top-right-radius: 0;
       border-top-right-radius: var(--radius-none);
     }
 
     .rounded-tr-sm {
       border-top-right-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -10059,7 +12931,8 @@ test('rounded-tr', async () => {
 
 test('rounded-br', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded-br', 'rounded-br-full', 'rounded-br-none', 'rounded-br-sm', 'rounded-br-[4px]'],
       css`
         @theme {
           --radius-none: 0px;
@@ -10069,10 +12942,10 @@ test('rounded-br', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded-br', 'rounded-br-full', 'rounded-br-none', 'rounded-br-sm', 'rounded-br-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-none: 0px;
       --radius-full: 9999px;
       --radius-sm: .125rem;
@@ -10088,18 +12961,17 @@ test('rounded-br', async () => {
     }
 
     .rounded-br-full {
-      border-bottom-right-radius: 3.40282e38px;
       border-bottom-right-radius: var(--radius-full);
     }
 
     .rounded-br-none {
-      border-bottom-right-radius: 0;
       border-bottom-right-radius: var(--radius-none);
     }
 
     .rounded-br-sm {
       border-bottom-right-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -10119,7 +12991,8 @@ test('rounded-br', async () => {
 
 test('rounded-bl', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['rounded-bl', 'rounded-bl-full', 'rounded-bl-none', 'rounded-bl-sm', 'rounded-bl-[4px]'],
       css`
         @theme {
           --radius-none: 0px;
@@ -10129,10 +13002,10 @@ test('rounded-bl', async () => {
         }
         @tailwind utilities;
       `,
-      ['rounded-bl', 'rounded-bl-full', 'rounded-bl-none', 'rounded-bl-sm', 'rounded-bl-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --radius-none: 0px;
       --radius-full: 9999px;
       --radius-sm: .125rem;
@@ -10148,18 +13021,17 @@ test('rounded-bl', async () => {
     }
 
     .rounded-bl-full {
-      border-bottom-left-radius: 3.40282e38px;
       border-bottom-left-radius: var(--radius-full);
     }
 
     .rounded-bl-none {
-      border-bottom-left-radius: 0;
       border-bottom-left-radius: var(--radius-none);
     }
 
     .rounded-bl-sm {
       border-bottom-left-radius: var(--radius-sm);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -10188,7 +13060,8 @@ test('border-style', async () => {
       'border-none',
     ]),
   ).toMatchInlineSnapshot(`
-    ".border-dashed {
+    "
+    .border-dashed {
       --tw-border-style: dashed;
       border-style: dashed;
     }
@@ -10216,7 +13089,8 @@ test('border-style', async () => {
     .border-solid {
       --tw-border-style: solid;
       border-style: solid;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -10244,6 +13118,8 @@ const prefixes = [
   'border-y',
   'border-s',
   'border-e',
+  'border-bs',
+  'border-be',
   'border-t',
   'border-r',
   'border-b',
@@ -10266,6 +13142,10 @@ for (let prefix of prefixes) {
     classes.push(`${prefix}-[medium]`)
     classes.push(`${prefix}-[thick]`)
     classes.push(`${prefix}-[12px]`)
+    classes.push(`${prefix}-[12px_8px]`)
+    classes.push(`${prefix}-[0_2px_0_2px]`)
+    classes.push(`${prefix}-[0_1]`)
+    classes.push(`${prefix}-[thin_2px]`)
     classes.push(`${prefix}-[length:var(--my-width)]`)
     classes.push(`${prefix}-[line-width:var(--my-width)]`)
 
@@ -10275,6 +13155,7 @@ for (let prefix of prefixes) {
     classes.push(`${prefix}-red-500/2.25`)
     classes.push(`${prefix}-red-500/2.5`)
     classes.push(`${prefix}-red-500/2.75`)
+    classes.push(`${prefix}-blue-500`)
     classes.push(`${prefix}-[#0088cc]`)
     classes.push(`${prefix}-[#0088cc]/50`)
     classes.push(`${prefix}-current`)
@@ -10289,17 +13170,18 @@ for (let prefix of prefixes) {
     classes.push(`${prefix}-[color:var(--my-color)]/50`)
 
     expect(
-      await compileCss(
+      await run(
+        classes,
         css`
           @theme {
             --radius-none: 0px;
             --radius-full: 9999px;
             --radius-sm: 0.125rem;
             --color-red-500: #ef4444;
+            --border-color-blue-500: #3b82f6;
           }
           @tailwind utilities;
         `,
-        classes,
       ),
     ).toMatchSnapshot()
 
@@ -10325,18 +13207,23 @@ for (let prefix of prefixes) {
 
 test('border with custom default border width', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['border'],
       css`
         @theme {
           --default-border-width: 2px;
         }
         @tailwind utilities;
       `,
-      ['border'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --default-border-width: 2px;
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-border-style: solid;
+        }
+      }
     }
 
     .border {
@@ -10344,32 +13231,19 @@ test('border with custom default border width', async () => {
       border-width: 2px;
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-border-style: solid;
-        }
-      }
-    }
-
     @property --tw-border-style {
       syntax: "*";
       inherits: false;
       initial-value: solid;
-    }"
+    }
+    "
   `)
   expect(await run(['-border', 'border/foo'])).toEqual('')
 })
 
 test('bg', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         // background-color
         'bg-red-500',
@@ -10379,6 +13253,9 @@ test('bg', async () => {
         'bg-red-500/2.75',
         'bg-red-500/[0.5]',
         'bg-red-500/[50%]',
+        'bg-red-500/100',
+        'bg-red-500/[100%]',
+        'bg-blue-500',
         'bg-current',
         'bg-current/50',
         'bg-current/[0.5]',
@@ -10479,33 +13356,48 @@ test('bg', async () => {
         'bg-scroll',
 
         // background-position
-        'bg-center',
         'bg-top',
-        'bg-right-top',
-        'bg-right-bottom',
+        'bg-top-left',
+        'bg-top-right',
         'bg-bottom',
-        'bg-left-bottom',
+        'bg-bottom-left',
+        'bg-bottom-right',
         'bg-left',
-        'bg-left-top',
+        'bg-right',
+        'bg-center',
         'bg-[50%]',
         'bg-[120px]',
         'bg-[120px_120px]',
         'bg-[length:120px_120px]',
         'bg-[position:120px_120px]',
         'bg-[size:120px_120px]',
+        // Legacy versions in v4.0 and earlier
+        'bg-right-top',
+        'bg-right-bottom',
+        'bg-left-bottom',
+        'bg-left-top',
 
         // background-repeat
         'bg-repeat',
         'bg-no-repeat',
         'bg-repeat-x',
         'bg-repeat-y',
-        'bg-round',
-        'bg-space',
+        'bg-repeat-round',
+        'bg-repeat-space',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+          --background-color-blue-500: #3b82f6;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --color-red-500: #ef4444;
+      --background-color-blue-500: #3b82f6;
     }
 
     .bg-\\[\\#0088cc\\] {
@@ -10513,35 +13405,111 @@ test('bg', async () => {
     }
 
     .bg-\\[\\#0088cc\\]\\/50, .bg-\\[\\#0088cc\\]\\/\\[0\\.5\\], .bg-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      background-color: oklab(59.9824% -.06725 -.12414 / .5);
+      background-color: oklab(59.9824% -.067 -.124 / .5);
     }
 
-    .bg-\\[color\\:var\\(--some-var\\)\\] {
+    .bg-\\[color\\:var\\(--some-var\\)\\], .bg-\\[color\\:var\\(--some-var\\)\\]\\/50 {
       background-color: var(--some-var);
     }
 
-    .bg-\\[color\\:var\\(--some-var\\)\\]\\/50, .bg-\\[color\\:var\\(--some-var\\)\\]\\/\\[0\\.5\\], .bg-\\[color\\:var\\(--some-var\\)\\]\\/\\[50\\%\\] {
-      background-color: color-mix(in oklab, var(--some-var) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-\\[color\\:var\\(--some-var\\)\\]\\/50 {
+        background-color: color-mix(in oklab, var(--some-var) 50%, transparent);
+      }
     }
 
-    .bg-\\[var\\(--some-var\\)\\] {
+    .bg-\\[color\\:var\\(--some-var\\)\\]\\/\\[0\\.5\\] {
       background-color: var(--some-var);
     }
 
-    .bg-\\[var\\(--some-var\\)\\]\\/50, .bg-\\[var\\(--some-var\\)\\]\\/\\[0\\.5\\], .bg-\\[var\\(--some-var\\)\\]\\/\\[50\\%\\] {
-      background-color: color-mix(in oklab, var(--some-var) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-\\[color\\:var\\(--some-var\\)\\]\\/\\[0\\.5\\] {
+        background-color: color-mix(in oklab, var(--some-var) 50%, transparent);
+      }
     }
 
-    .bg-current {
+    .bg-\\[color\\:var\\(--some-var\\)\\]\\/\\[50\\%\\] {
+      background-color: var(--some-var);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-\\[color\\:var\\(--some-var\\)\\]\\/\\[50\\%\\] {
+        background-color: color-mix(in oklab, var(--some-var) 50%, transparent);
+      }
+    }
+
+    .bg-\\[var\\(--some-var\\)\\], .bg-\\[var\\(--some-var\\)\\]\\/50 {
+      background-color: var(--some-var);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-\\[var\\(--some-var\\)\\]\\/50 {
+        background-color: color-mix(in oklab, var(--some-var) 50%, transparent);
+      }
+    }
+
+    .bg-\\[var\\(--some-var\\)\\]\\/\\[0\\.5\\] {
+      background-color: var(--some-var);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-\\[var\\(--some-var\\)\\]\\/\\[0\\.5\\] {
+        background-color: color-mix(in oklab, var(--some-var) 50%, transparent);
+      }
+    }
+
+    .bg-\\[var\\(--some-var\\)\\]\\/\\[50\\%\\] {
+      background-color: var(--some-var);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-\\[var\\(--some-var\\)\\]\\/\\[50\\%\\] {
+        background-color: color-mix(in oklab, var(--some-var) 50%, transparent);
+      }
+    }
+
+    .bg-blue-500 {
+      background-color: var(--background-color-blue-500);
+    }
+
+    .bg-current, .bg-current\\/50 {
       background-color: currentColor;
     }
 
-    .bg-current\\/50, .bg-current\\/\\[0\\.5\\], .bg-current\\/\\[50\\%\\] {
-      background-color: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-current\\/50 {
+        background-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .bg-current\\/\\[0\\.5\\] {
+      background-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-current\\/\\[0\\.5\\] {
+        background-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .bg-current\\/\\[50\\%\\] {
+      background-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-current\\/\\[50\\%\\] {
+        background-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
     }
 
     .bg-current\\/\\[var\\(--bg-opacity\\)\\] {
-      background-color: color-mix(in oklab, currentColor var(--bg-opacity), transparent);
+      background-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-current\\/\\[var\\(--bg-opacity\\)\\] {
+        background-color: color-mix(in oklab, currentcolor var(--bg-opacity), transparent);
+      }
     }
 
     .bg-inherit {
@@ -10553,277 +13521,550 @@ test('bg', async () => {
     }
 
     .bg-red-500\\/2\\.5 {
-      background-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      background-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-red-500\\/2\\.5 {
+        background-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      }
     }
 
     .bg-red-500\\/2\\.25 {
-      background-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      background-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-red-500\\/2\\.25 {
+        background-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      }
     }
 
     .bg-red-500\\/2\\.75 {
-      background-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      background-color: #ef444407;
     }
 
-    .bg-red-500\\/50, .bg-red-500\\/\\[0\\.5\\], .bg-red-500\\/\\[50\\%\\] {
-      background-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-red-500\\/2\\.75 {
+        background-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      }
+    }
+
+    .bg-red-500\\/50 {
+      background-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-red-500\\/50 {
+        background-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .bg-red-500\\/100 {
+      background-color: var(--color-red-500);
+    }
+
+    .bg-red-500\\/\\[0\\.5\\] {
+      background-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-red-500\\/\\[0\\.5\\] {
+        background-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .bg-red-500\\/\\[50\\%\\] {
+      background-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-red-500\\/\\[50\\%\\] {
+        background-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .bg-red-500\\/\\[100\\%\\] {
+      background-color: var(--color-red-500);
     }
 
     .bg-transparent {
       background-color: #0000;
     }
 
-    .-bg-conic-45\\/oklab {
-      --tw-gradient-position: from calc(45 * -1) in oklab, ;
-      background-image: conic-gradient(var(--tw-gradient-stops));
+    .-bg-linear-45 {
+      --tw-gradient-position: calc(45deg * -1);
     }
 
-    .-bg-linear-45, .-bg-linear-45\\/oklab {
-      --tw-gradient-position: calc(45deg * -1) in oklab, ;
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .-bg-linear-45 {
+        --tw-gradient-position: calc(45deg * -1) in oklab;
+      }
+    }
+
+    .-bg-linear-45 {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
-    .-bg-linear-\\[1\\.3rad\\] {
-      --tw-gradient-position: calc(74.4845deg * -1), ;
-      background-image: linear-gradient(var(--tw-gradient-stops, calc(74.4845deg * -1)));
+    .-bg-linear-45\\/oklab {
+      --tw-gradient-position: calc(45deg * -1);
     }
 
-    .-bg-linear-\\[125deg\\] {
-      --tw-gradient-position: calc(125deg * -1), ;
-      background-image: linear-gradient(var(--tw-gradient-stops, calc(125deg * -1)));
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .-bg-linear-45\\/oklab {
+        --tw-gradient-position: calc(45deg * -1) in oklab;
+      }
     }
 
-    .bg-conic-45\\/\\[in_hsl_longer_hue\\] {
-      --tw-gradient-position: from 45deg in hsl longer hue, ;
-      background-image: conic-gradient(var(--tw-gradient-stops));
-    }
-
-    .bg-conic-45\\/oklab {
-      --tw-gradient-position: from 45deg in oklab, ;
-      background-image: conic-gradient(var(--tw-gradient-stops));
-    }
-
-    .bg-conic-45\\/shorter {
-      --tw-gradient-position: from 45deg in oklch shorter hue, ;
-      background-image: conic-gradient(var(--tw-gradient-stops));
-    }
-
-    .bg-conic\\/\\[in_hsl_longer_hue\\] {
-      --tw-gradient-position: in hsl longer hue, ;
-      background-image: conic-gradient(var(--tw-gradient-stops));
-    }
-
-    .bg-conic\\/decreasing {
-      --tw-gradient-position: in oklch decreasing hue, ;
-      background-image: conic-gradient(var(--tw-gradient-stops));
-    }
-
-    .bg-conic\\/hsl {
-      --tw-gradient-position: in hsl, ;
-      background-image: conic-gradient(var(--tw-gradient-stops));
-    }
-
-    .bg-conic\\/increasing {
-      --tw-gradient-position: in oklch increasing hue, ;
-      background-image: conic-gradient(var(--tw-gradient-stops));
-    }
-
-    .bg-conic\\/longer {
-      --tw-gradient-position: in oklch longer hue, ;
-      background-image: conic-gradient(var(--tw-gradient-stops));
-    }
-
-    .bg-conic\\/oklab {
-      --tw-gradient-position: in oklab, ;
-      background-image: conic-gradient(var(--tw-gradient-stops));
-    }
-
-    .bg-conic\\/oklch {
-      --tw-gradient-position: in oklch, ;
-      background-image: conic-gradient(var(--tw-gradient-stops));
-    }
-
-    .bg-conic\\/shorter {
-      --tw-gradient-position: in oklch shorter hue, ;
-      background-image: conic-gradient(var(--tw-gradient-stops));
-    }
-
-    .bg-conic\\/srgb {
-      --tw-gradient-position: in srgb, ;
-      background-image: conic-gradient(var(--tw-gradient-stops));
+    .-bg-linear-45\\/oklab {
+      background-image: linear-gradient(var(--tw-gradient-stops));
+    }
+
+    .bg-linear-45 {
+      --tw-gradient-position: 45deg;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-45 {
+        --tw-gradient-position: 45deg in oklab;
+      }
     }
 
     .bg-linear-45 {
-      --tw-gradient-position: 45deg in oklab, ;
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-45\\/\\[in_hsl_longer_hue\\] {
-      --tw-gradient-position: 45deg in hsl longer hue, ;
+      --tw-gradient-position: 45deg;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-45\\/\\[in_hsl_longer_hue\\] {
+        --tw-gradient-position: 45deg in hsl longer hue;
+      }
+    }
+
+    .bg-linear-45\\/\\[in_hsl_longer_hue\\] {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-45\\/oklab {
-      --tw-gradient-position: 45deg in oklab, ;
+      --tw-gradient-position: 45deg;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-45\\/oklab {
+        --tw-gradient-position: 45deg in oklab;
+      }
+    }
+
+    .bg-linear-45\\/oklab {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-45\\/shorter {
-      --tw-gradient-position: 45deg in oklch shorter hue, ;
+      --tw-gradient-position: 45deg;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-45\\/shorter {
+        --tw-gradient-position: 45deg in oklch shorter hue;
+      }
+    }
+
+    .bg-linear-45\\/shorter {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
-    .bg-linear-\\[1\\.3rad\\] {
-      --tw-gradient-position: 74.4845deg, ;
-      background-image: linear-gradient(var(--tw-gradient-stops, 74.4845deg));
+    .bg-linear-to-b {
+      --tw-gradient-position: to bottom;
     }
 
-    .bg-linear-\\[125deg\\] {
-      --tw-gradient-position: 125deg, ;
-      background-image: linear-gradient(var(--tw-gradient-stops, 125deg));
-    }
-
-    .bg-linear-\\[to_bottom\\] {
-      --tw-gradient-position: to bottom, ;
-      background-image: linear-gradient(var(--tw-gradient-stops, to bottom));
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-b {
+        --tw-gradient-position: to bottom in oklab;
+      }
     }
 
     .bg-linear-to-b {
-      --tw-gradient-position: to bottom in oklab, ;
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-bl {
-      --tw-gradient-position: to bottom left in oklab, ;
+      --tw-gradient-position: to bottom left;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-bl {
+        --tw-gradient-position: to bottom left in oklab;
+      }
+    }
+
+    .bg-linear-to-bl {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-br {
-      --tw-gradient-position: to bottom right in oklab, ;
+      --tw-gradient-position: to bottom right;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-br {
+        --tw-gradient-position: to bottom right in oklab;
+      }
+    }
+
+    .bg-linear-to-br {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-l {
-      --tw-gradient-position: to left in oklab, ;
+      --tw-gradient-position: to left;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-l {
+        --tw-gradient-position: to left in oklab;
+      }
+    }
+
+    .bg-linear-to-l {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-r {
-      --tw-gradient-position: to right in oklab, ;
+      --tw-gradient-position: to right;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-r {
+        --tw-gradient-position: to right in oklab;
+      }
+    }
+
+    .bg-linear-to-r {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-r\\/\\[in_hsl_longer_hue\\] {
-      --tw-gradient-position: to right in hsl longer hue, ;
+      --tw-gradient-position: to right;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-r\\/\\[in_hsl_longer_hue\\] {
+        --tw-gradient-position: to right in hsl longer hue;
+      }
+    }
+
+    .bg-linear-to-r\\/\\[in_hsl_longer_hue\\] {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-r\\/\\[longer\\] {
-      --tw-gradient-position: to right longer, ;
+      --tw-gradient-position: to right;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-r\\/\\[longer\\] {
+        --tw-gradient-position: to right longer;
+      }
+    }
+
+    .bg-linear-to-r\\/\\[longer\\] {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-r\\/decreasing {
-      --tw-gradient-position: to right in oklch decreasing hue, ;
+      --tw-gradient-position: to right;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-r\\/decreasing {
+        --tw-gradient-position: to right in oklch decreasing hue;
+      }
+    }
+
+    .bg-linear-to-r\\/decreasing {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-r\\/hsl {
-      --tw-gradient-position: to right in hsl, ;
+      --tw-gradient-position: to right;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-r\\/hsl {
+        --tw-gradient-position: to right in hsl;
+      }
+    }
+
+    .bg-linear-to-r\\/hsl {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-r\\/increasing {
-      --tw-gradient-position: to right in oklch increasing hue, ;
+      --tw-gradient-position: to right;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-r\\/increasing {
+        --tw-gradient-position: to right in oklch increasing hue;
+      }
+    }
+
+    .bg-linear-to-r\\/increasing {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-r\\/longer {
-      --tw-gradient-position: to right in oklch longer hue, ;
+      --tw-gradient-position: to right;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-r\\/longer {
+        --tw-gradient-position: to right in oklch longer hue;
+      }
+    }
+
+    .bg-linear-to-r\\/longer {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-r\\/oklab {
-      --tw-gradient-position: to right in oklab, ;
+      --tw-gradient-position: to right;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-r\\/oklab {
+        --tw-gradient-position: to right in oklab;
+      }
+    }
+
+    .bg-linear-to-r\\/oklab {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-r\\/oklch {
-      --tw-gradient-position: to right in oklch, ;
+      --tw-gradient-position: to right;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-r\\/oklch {
+        --tw-gradient-position: to right in oklch;
+      }
+    }
+
+    .bg-linear-to-r\\/oklch {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-r\\/shorter {
-      --tw-gradient-position: to right in oklch shorter hue, ;
+      --tw-gradient-position: to right;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-r\\/shorter {
+        --tw-gradient-position: to right in oklch shorter hue;
+      }
+    }
+
+    .bg-linear-to-r\\/shorter {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-r\\/srgb {
-      --tw-gradient-position: to right in srgb, ;
+      --tw-gradient-position: to right;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-r\\/srgb {
+        --tw-gradient-position: to right in srgb;
+      }
+    }
+
+    .bg-linear-to-r\\/srgb {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-t {
-      --tw-gradient-position: to top in oklab, ;
+      --tw-gradient-position: to top;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-t {
+        --tw-gradient-position: to top in oklab;
+      }
+    }
+
+    .bg-linear-to-t {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-tl {
-      --tw-gradient-position: to top left in oklab, ;
+      --tw-gradient-position: to top left;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-tl {
+        --tw-gradient-position: to top left in oklab;
+      }
+    }
+
+    .bg-linear-to-tl {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
     .bg-linear-to-tr {
-      --tw-gradient-position: to top right in oklab, ;
+      --tw-gradient-position: to top right;
+    }
+
+    @supports (background-image: linear-gradient(in lab, red, red)) {
+      .bg-linear-to-tr {
+        --tw-gradient-position: to top right in oklab;
+      }
+    }
+
+    .bg-linear-to-tr {
       background-image: linear-gradient(var(--tw-gradient-stops));
     }
 
+    .-bg-conic-45\\/oklab {
+      --tw-gradient-position: from calc(45deg * -1) in oklab;
+      background-image: conic-gradient(var(--tw-gradient-stops));
+    }
+
+    .-bg-linear-\\[1\\.3rad\\] {
+      --tw-gradient-position: calc(74.4845deg * -1);
+      background-image: linear-gradient(var(--tw-gradient-stops, calc(74.4845deg * -1)));
+    }
+
+    .-bg-linear-\\[125deg\\] {
+      --tw-gradient-position: calc(125deg * -1);
+      background-image: linear-gradient(var(--tw-gradient-stops, calc(125deg * -1)));
+    }
+
+    .bg-conic-45\\/\\[in_hsl_longer_hue\\] {
+      --tw-gradient-position: from 45deg in hsl longer hue;
+      background-image: conic-gradient(var(--tw-gradient-stops));
+    }
+
+    .bg-conic-45\\/oklab {
+      --tw-gradient-position: from 45deg in oklab;
+      background-image: conic-gradient(var(--tw-gradient-stops));
+    }
+
+    .bg-conic-45\\/shorter {
+      --tw-gradient-position: from 45deg in oklch shorter hue;
+      background-image: conic-gradient(var(--tw-gradient-stops));
+    }
+
+    .bg-conic\\/\\[in_hsl_longer_hue\\] {
+      --tw-gradient-position: in hsl longer hue;
+      background-image: conic-gradient(var(--tw-gradient-stops));
+    }
+
+    .bg-conic\\/decreasing {
+      --tw-gradient-position: in oklch decreasing hue;
+      background-image: conic-gradient(var(--tw-gradient-stops));
+    }
+
+    .bg-conic\\/hsl {
+      --tw-gradient-position: in hsl;
+      background-image: conic-gradient(var(--tw-gradient-stops));
+    }
+
+    .bg-conic\\/increasing {
+      --tw-gradient-position: in oklch increasing hue;
+      background-image: conic-gradient(var(--tw-gradient-stops));
+    }
+
+    .bg-conic\\/longer {
+      --tw-gradient-position: in oklch longer hue;
+      background-image: conic-gradient(var(--tw-gradient-stops));
+    }
+
+    .bg-conic\\/oklab {
+      --tw-gradient-position: in oklab;
+      background-image: conic-gradient(var(--tw-gradient-stops));
+    }
+
+    .bg-conic\\/oklch {
+      --tw-gradient-position: in oklch;
+      background-image: conic-gradient(var(--tw-gradient-stops));
+    }
+
+    .bg-conic\\/shorter {
+      --tw-gradient-position: in oklch shorter hue;
+      background-image: conic-gradient(var(--tw-gradient-stops));
+    }
+
+    .bg-conic\\/srgb {
+      --tw-gradient-position: in srgb;
+      background-image: conic-gradient(var(--tw-gradient-stops));
+    }
+
+    .bg-linear-\\[1\\.3rad\\] {
+      --tw-gradient-position: 74.4845deg;
+      background-image: linear-gradient(var(--tw-gradient-stops, 74.4845deg));
+    }
+
+    .bg-linear-\\[125deg\\] {
+      --tw-gradient-position: 125deg;
+      background-image: linear-gradient(var(--tw-gradient-stops, 125deg));
+    }
+
+    .bg-linear-\\[to_bottom\\] {
+      --tw-gradient-position: to bottom;
+      background-image: linear-gradient(var(--tw-gradient-stops, to bottom));
+    }
+
     .bg-radial-\\[circle_at_center\\] {
-      --tw-gradient-position: circle at center, ;
+      --tw-gradient-position: circle at center;
       background-image: radial-gradient(var(--tw-gradient-stops, circle at center));
     }
 
     .bg-radial\\/\\[in_hsl_longer_hue\\] {
-      --tw-gradient-position: in hsl longer hue, ;
+      --tw-gradient-position: in hsl longer hue;
       background-image: radial-gradient(var(--tw-gradient-stops));
     }
 
     .bg-radial\\/decreasing {
-      --tw-gradient-position: in oklch decreasing hue, ;
+      --tw-gradient-position: in oklch decreasing hue;
       background-image: radial-gradient(var(--tw-gradient-stops));
     }
 
     .bg-radial\\/hsl {
-      --tw-gradient-position: in hsl, ;
+      --tw-gradient-position: in hsl;
       background-image: radial-gradient(var(--tw-gradient-stops));
     }
 
     .bg-radial\\/increasing {
-      --tw-gradient-position: in oklch increasing hue, ;
+      --tw-gradient-position: in oklch increasing hue;
       background-image: radial-gradient(var(--tw-gradient-stops));
     }
 
     .bg-radial\\/longer {
-      --tw-gradient-position: in oklch longer hue, ;
+      --tw-gradient-position: in oklch longer hue;
       background-image: radial-gradient(var(--tw-gradient-stops));
     }
 
     .bg-radial\\/oklab {
-      --tw-gradient-position: in oklab, ;
+      --tw-gradient-position: in oklab;
       background-image: radial-gradient(var(--tw-gradient-stops));
     }
 
     .bg-radial\\/oklch {
-      --tw-gradient-position: in oklch, ;
+      --tw-gradient-position: in oklch;
       background-image: radial-gradient(var(--tw-gradient-stops));
     }
 
     .bg-radial\\/shorter {
-      --tw-gradient-position: in oklch shorter hue, ;
+      --tw-gradient-position: in oklch shorter hue;
       background-image: radial-gradient(var(--tw-gradient-stops));
     }
 
     .bg-radial\\/srgb {
-      --tw-gradient-position: in srgb, ;
+      --tw-gradient-position: in srgb;
       background-image: radial-gradient(var(--tw-gradient-stops));
     }
 
@@ -10899,6 +14140,14 @@ test('bg', async () => {
       background-position: bottom;
     }
 
+    .bg-bottom-left {
+      background-position: 0 100%;
+    }
+
+    .bg-bottom-right {
+      background-position: 100% 100%;
+    }
+
     .bg-center {
       background-position: center;
     }
@@ -10915,6 +14164,10 @@ test('bg', async () => {
       background-position: 0 0;
     }
 
+    .bg-right {
+      background-position: 100%;
+    }
+
     .bg-right-bottom {
       background-position: 100% 100%;
     }
@@ -10927,6 +14180,14 @@ test('bg', async () => {
       background-position: top;
     }
 
+    .bg-top-left {
+      background-position: 0 0;
+    }
+
+    .bg-top-right {
+      background-position: 100% 0;
+    }
+
     .bg-no-repeat {
       background-repeat: no-repeat;
     }
@@ -10935,6 +14196,14 @@ test('bg', async () => {
       background-repeat: repeat;
     }
 
+    .bg-repeat-round {
+      background-repeat: round;
+    }
+
+    .bg-repeat-space {
+      background-repeat: space;
+    }
+
     .bg-repeat-x {
       background-repeat: repeat-x;
     }
@@ -10942,14 +14211,7 @@ test('bg', async () => {
     .bg-repeat-y {
       background-repeat: repeat-y;
     }
-
-    .bg-round {
-      background-repeat: round;
-    }
-
-    .bg-space {
-      background-repeat: space;
-    }"
+    "
   `)
   expect(
     await run([
@@ -11047,7 +14309,8 @@ test('bg', async () => {
   ).toEqual('')
 
   expect(
-    await compileCss(
+    await run(
+      ['bg-current/half', 'bg-current/custom', '[color:red]/half'],
       css`
         @theme reference {
           --opacity-half: 0.5;
@@ -11055,32 +14318,127 @@ test('bg', async () => {
         }
         @tailwind utilities;
       `,
-      ['bg-current/half', 'bg-current/custom', '[color:red]/half'],
     ),
   ).toMatchInlineSnapshot(`
-    ".bg-current\\/custom {
-      background-color: color-mix(in oklab, currentColor var(--opacity-custom), transparent);
+    "
+    .bg-current\\/custom {
+      background-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-current\\/custom {
+        background-color: color-mix(in oklab, currentcolor var(--opacity-custom, var(--custom-opacity)), transparent);
+      }
     }
 
     .bg-current\\/half {
-      background-color: color-mix(in oklab, currentColor var(--opacity-half), transparent);
+      background-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .bg-current\\/half {
+        background-color: color-mix(in oklab, currentcolor var(--opacity-half, .5), transparent);
+      }
     }
 
     .\\[color\\:red\\]\\/half {
-      color: color-mix(in oklab, red var(--opacity-half), transparent);
-    }"
+      color: color-mix(in srgb, red .5, transparent);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .\\[color\\:red\\]\\/half {
+        color: color-mix(in oklab, red var(--opacity-half, .5), transparent);
+      }
+    }
+    "
   `)
 })
 
-test('from', async () => {
+test('bg-position', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['bg-position-[120px]', 'bg-position-[120px_120px]', 'bg-position-[var(--some-var)]'],
       css`
         @theme {
           --color-red-500: #ef4444;
         }
         @tailwind utilities;
       `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .bg-position-\\[120px\\] {
+      background-position: 120px;
+    }
+
+    .bg-position-\\[120px_120px\\] {
+      background-position: 120px 120px;
+    }
+
+    .bg-position-\\[var\\(--some-var\\)\\] {
+      background-position: var(--some-var);
+    }
+    "
+  `)
+  expect(
+    await run([
+      'bg-position',
+      'bg-position/foo',
+      '-bg-position',
+      '-bg-position/foo',
+
+      'bg-position-[120px_120px]/foo',
+
+      '-bg-position-[120px_120px]',
+      '-bg-position-[120px_120px]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('bg-size', async () => {
+  expect(
+    await run(
+      ['bg-size-[120px]', 'bg-size-[120px_120px]', 'bg-size-[var(--some-var)]'],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .bg-size-\\[120px\\] {
+      background-size: 120px;
+    }
+
+    .bg-size-\\[120px_120px\\] {
+      background-size: 120px 120px;
+    }
+
+    .bg-size-\\[var\\(--some-var\\)\\] {
+      background-size: var(--some-var);
+    }
+    "
+  `)
+  expect(
+    await run([
+      'bg-size',
+      'bg-size/foo',
+      '-bg-size',
+      '-bg-size/foo',
+
+      'bg-size-[120px_120px]/foo',
+
+      '-bg-size-[120px_120px]',
+      '-bg-size-[120px_120px]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('from', async () => {
+  expect(
+    await run(
       [
         // --tw-gradient-from
         'from-red-500',
@@ -11115,70 +14473,241 @@ test('from', async () => {
         'from-[length:var(--my-position)]',
         'from-[percentage:var(--my-position)]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-gradient-position: initial;
+          --tw-gradient-from: #0000;
+          --tw-gradient-via: #0000;
+          --tw-gradient-to: #0000;
+          --tw-gradient-stops: initial;
+          --tw-gradient-via-stops: initial;
+          --tw-gradient-from-position: 0%;
+          --tw-gradient-via-position: 50%;
+          --tw-gradient-to-position: 100%;
+        }
+      }
+    }
+
+    :root, :host {
       --color-red-500: #ef4444;
     }
 
     .from-\\[\\#0088cc\\] {
       --tw-gradient-from: #08c;
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .from-\\[\\#0088cc\\]\\/50, .from-\\[\\#0088cc\\]\\/\\[0\\.5\\], .from-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      --tw-gradient-from: oklab(59.9824% -.06725 -.12414 / .5);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-from: oklab(59.9824% -.067 -.124 / .5);
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .from-\\[color\\:var\\(--my-color\\)\\] {
       --tw-gradient-from: var(--my-color);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
-    .from-\\[color\\:var\\(--my-color\\)\\]\\/50, .from-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\], .from-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      --tw-gradient-from: color-mix(in oklab, var(--my-color) 50%, transparent);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    .from-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+      --tw-gradient-from: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .from-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+        --tw-gradient-from: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .from-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .from-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-gradient-from: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .from-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        --tw-gradient-from: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .from-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .from-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-gradient-from: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .from-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        --tw-gradient-from: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .from-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .from-\\[var\\(--my-color\\)\\] {
       --tw-gradient-from: var(--my-color);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
-    .from-\\[var\\(--my-color\\)\\]\\/50, .from-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\], .from-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      --tw-gradient-from: color-mix(in oklab, var(--my-color) 50%, transparent);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    .from-\\[var\\(--my-color\\)\\]\\/50 {
+      --tw-gradient-from: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .from-\\[var\\(--my-color\\)\\]\\/50 {
+        --tw-gradient-from: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .from-\\[var\\(--my-color\\)\\]\\/50 {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .from-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-gradient-from: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .from-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        --tw-gradient-from: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .from-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .from-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-gradient-from: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .from-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        --tw-gradient-from: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .from-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .from-current {
-      --tw-gradient-from: currentColor;
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-from: currentcolor;
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
-    .from-current\\/50, .from-current\\/\\[0\\.5\\], .from-current\\/\\[50\\%\\] {
-      --tw-gradient-from: color-mix(in oklab, currentColor 50%, transparent);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    .from-current\\/50 {
+      --tw-gradient-from: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .from-current\\/50 {
+        --tw-gradient-from: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .from-current\\/50 {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .from-current\\/\\[0\\.5\\] {
+      --tw-gradient-from: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .from-current\\/\\[0\\.5\\] {
+        --tw-gradient-from: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .from-current\\/\\[0\\.5\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .from-current\\/\\[50\\%\\] {
+      --tw-gradient-from: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .from-current\\/\\[50\\%\\] {
+        --tw-gradient-from: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .from-current\\/\\[50\\%\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .from-inherit {
       --tw-gradient-from: inherit;
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .from-red-500 {
       --tw-gradient-from: var(--color-red-500);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
-    .from-red-500\\/50, .from-red-500\\/\\[0\\.5\\], .from-red-500\\/\\[50\\%\\] {
-      --tw-gradient-from: color-mix(in oklab, var(--color-red-500) 50%, transparent);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    .from-red-500\\/50 {
+      --tw-gradient-from: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .from-red-500\\/50 {
+        --tw-gradient-from: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .from-red-500\\/50 {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .from-red-500\\/\\[0\\.5\\] {
+      --tw-gradient-from: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .from-red-500\\/\\[0\\.5\\] {
+        --tw-gradient-from: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .from-red-500\\/\\[0\\.5\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .from-red-500\\/\\[50\\%\\] {
+      --tw-gradient-from: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .from-red-500\\/\\[50\\%\\] {
+        --tw-gradient-from: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .from-red-500\\/\\[50\\%\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .from-transparent {
       --tw-gradient-from: transparent;
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .from-0\\% {
@@ -11205,22 +14734,6 @@ test('from', async () => {
       --tw-gradient-from-position: var(--my-position);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-gradient-position: initial;
-          --tw-gradient-from: #0000;
-          --tw-gradient-via: #0000;
-          --tw-gradient-to: #0000;
-          --tw-gradient-stops: initial;
-          --tw-gradient-via-stops: initial;
-          --tw-gradient-from-position: 0%;
-          --tw-gradient-via-position: 50%;
-          --tw-gradient-to-position: 100%;
-        }
-      }
-    }
-
     @property --tw-gradient-position {
       syntax: "*";
       inherits: false
@@ -11270,7 +14783,8 @@ test('from', async () => {
       syntax: "<length-percentage>";
       inherits: false;
       initial-value: 100%;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -11309,13 +14823,7 @@ test('from', async () => {
 
 test('via', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         // --tw-gradient-stops
         'via-red-500',
@@ -11350,81 +14858,260 @@ test('via', async () => {
         'via-[length:var(--my-position)]',
         'via-[percentage:var(--my-position)]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-gradient-position: initial;
+          --tw-gradient-from: #0000;
+          --tw-gradient-via: #0000;
+          --tw-gradient-to: #0000;
+          --tw-gradient-stops: initial;
+          --tw-gradient-via-stops: initial;
+          --tw-gradient-from-position: 0%;
+          --tw-gradient-via-position: 50%;
+          --tw-gradient-to-position: 100%;
+        }
+      }
+    }
+
+    :root, :host {
       --color-red-500: #ef4444;
     }
 
     .via-\\[\\#0088cc\\] {
       --tw-gradient-via: #08c;
-      --tw-gradient-via-stops: var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
       --tw-gradient-stops: var(--tw-gradient-via-stops);
     }
 
     .via-\\[\\#0088cc\\]\\/50, .via-\\[\\#0088cc\\]\\/\\[0\\.5\\], .via-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      --tw-gradient-via: oklab(59.9824% -.06725 -.12414 / .5);
-      --tw-gradient-via-stops: var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-via: oklab(59.9824% -.067 -.124 / .5);
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
       --tw-gradient-stops: var(--tw-gradient-via-stops);
     }
 
     .via-\\[color\\:var\\(--my-color\\)\\] {
       --tw-gradient-via: var(--my-color);
-      --tw-gradient-via-stops: var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
       --tw-gradient-stops: var(--tw-gradient-via-stops);
     }
 
-    .via-\\[color\\:var\\(--my-color\\)\\]\\/50, .via-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\], .via-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      --tw-gradient-via: color-mix(in oklab, var(--my-color) 50%, transparent);
-      --tw-gradient-via-stops: var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+    .via-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+      --tw-gradient-via: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .via-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+        --tw-gradient-via: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .via-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-stops: var(--tw-gradient-via-stops);
+    }
+
+    .via-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-gradient-via: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .via-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        --tw-gradient-via: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .via-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-stops: var(--tw-gradient-via-stops);
+    }
+
+    .via-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-gradient-via: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .via-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        --tw-gradient-via: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .via-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
       --tw-gradient-stops: var(--tw-gradient-via-stops);
     }
 
     .via-\\[var\\(--my-color\\)\\] {
       --tw-gradient-via: var(--my-color);
-      --tw-gradient-via-stops: var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
       --tw-gradient-stops: var(--tw-gradient-via-stops);
     }
 
-    .via-\\[var\\(--my-color\\)\\]\\/50, .via-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\], .via-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      --tw-gradient-via: color-mix(in oklab, var(--my-color) 50%, transparent);
-      --tw-gradient-via-stops: var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+    .via-\\[var\\(--my-color\\)\\]\\/50 {
+      --tw-gradient-via: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .via-\\[var\\(--my-color\\)\\]\\/50 {
+        --tw-gradient-via: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .via-\\[var\\(--my-color\\)\\]\\/50 {
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-stops: var(--tw-gradient-via-stops);
+    }
+
+    .via-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-gradient-via: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .via-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        --tw-gradient-via: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .via-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-stops: var(--tw-gradient-via-stops);
+    }
+
+    .via-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-gradient-via: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .via-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        --tw-gradient-via: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .via-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
       --tw-gradient-stops: var(--tw-gradient-via-stops);
     }
 
     .via-current {
-      --tw-gradient-via: currentColor;
-      --tw-gradient-via-stops: var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-via: currentcolor;
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
       --tw-gradient-stops: var(--tw-gradient-via-stops);
     }
 
-    .via-current\\/50, .via-current\\/\\[0\\.5\\], .via-current\\/\\[50\\%\\] {
-      --tw-gradient-via: color-mix(in oklab, currentColor 50%, transparent);
-      --tw-gradient-via-stops: var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+    .via-current\\/50 {
+      --tw-gradient-via: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .via-current\\/50 {
+        --tw-gradient-via: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .via-current\\/50 {
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-stops: var(--tw-gradient-via-stops);
+    }
+
+    .via-current\\/\\[0\\.5\\] {
+      --tw-gradient-via: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .via-current\\/\\[0\\.5\\] {
+        --tw-gradient-via: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .via-current\\/\\[0\\.5\\] {
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-stops: var(--tw-gradient-via-stops);
+    }
+
+    .via-current\\/\\[50\\%\\] {
+      --tw-gradient-via: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .via-current\\/\\[50\\%\\] {
+        --tw-gradient-via: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .via-current\\/\\[50\\%\\] {
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
       --tw-gradient-stops: var(--tw-gradient-via-stops);
     }
 
     .via-inherit {
       --tw-gradient-via: inherit;
-      --tw-gradient-via-stops: var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
       --tw-gradient-stops: var(--tw-gradient-via-stops);
     }
 
     .via-red-500 {
       --tw-gradient-via: var(--color-red-500);
-      --tw-gradient-via-stops: var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
       --tw-gradient-stops: var(--tw-gradient-via-stops);
     }
 
-    .via-red-500\\/50, .via-red-500\\/\\[0\\.5\\], .via-red-500\\/\\[50\\%\\] {
-      --tw-gradient-via: color-mix(in oklab, var(--color-red-500) 50%, transparent);
-      --tw-gradient-via-stops: var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+    .via-red-500\\/50 {
+      --tw-gradient-via: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .via-red-500\\/50 {
+        --tw-gradient-via: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .via-red-500\\/50 {
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-stops: var(--tw-gradient-via-stops);
+    }
+
+    .via-red-500\\/\\[0\\.5\\] {
+      --tw-gradient-via: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .via-red-500\\/\\[0\\.5\\] {
+        --tw-gradient-via: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .via-red-500\\/\\[0\\.5\\] {
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-stops: var(--tw-gradient-via-stops);
+    }
+
+    .via-red-500\\/\\[50\\%\\] {
+      --tw-gradient-via: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .via-red-500\\/\\[50\\%\\] {
+        --tw-gradient-via: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .via-red-500\\/\\[50\\%\\] {
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
       --tw-gradient-stops: var(--tw-gradient-via-stops);
     }
 
     .via-transparent {
       --tw-gradient-via: transparent;
-      --tw-gradient-via-stops: var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
+      --tw-gradient-via-stops: var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position);
       --tw-gradient-stops: var(--tw-gradient-via-stops);
     }
 
@@ -11452,22 +15139,6 @@ test('via', async () => {
       --tw-gradient-via-position: var(--my-position);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-gradient-position: initial;
-          --tw-gradient-from: #0000;
-          --tw-gradient-via: #0000;
-          --tw-gradient-to: #0000;
-          --tw-gradient-stops: initial;
-          --tw-gradient-via-stops: initial;
-          --tw-gradient-from-position: 0%;
-          --tw-gradient-via-position: 50%;
-          --tw-gradient-to-position: 100%;
-        }
-      }
-    }
-
     @property --tw-gradient-position {
       syntax: "*";
       inherits: false
@@ -11517,7 +15188,8 @@ test('via', async () => {
       syntax: "<length-percentage>";
       inherits: false;
       initial-value: 100%;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -11554,13 +15226,7 @@ test('via', async () => {
 
 test('to', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         // --tw-gradient-to
         'to-red-500',
@@ -11595,70 +15261,241 @@ test('to', async () => {
         'to-[length:var(--my-position)]',
         'to-[percentage:var(--my-position)]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-gradient-position: initial;
+          --tw-gradient-from: #0000;
+          --tw-gradient-via: #0000;
+          --tw-gradient-to: #0000;
+          --tw-gradient-stops: initial;
+          --tw-gradient-via-stops: initial;
+          --tw-gradient-from-position: 0%;
+          --tw-gradient-via-position: 50%;
+          --tw-gradient-to-position: 100%;
+        }
+      }
+    }
+
+    :root, :host {
       --color-red-500: #ef4444;
     }
 
     .to-\\[\\#0088cc\\] {
       --tw-gradient-to: #08c;
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .to-\\[\\#0088cc\\]\\/50, .to-\\[\\#0088cc\\]\\/\\[0\\.5\\], .to-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      --tw-gradient-to: oklab(59.9824% -.06725 -.12414 / .5);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-to: oklab(59.9824% -.067 -.124 / .5);
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .to-\\[color\\:var\\(--my-color\\)\\] {
       --tw-gradient-to: var(--my-color);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
-    .to-\\[color\\:var\\(--my-color\\)\\]\\/50, .to-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\], .to-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      --tw-gradient-to: color-mix(in oklab, var(--my-color) 50%, transparent);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    .to-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+      --tw-gradient-to: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .to-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+        --tw-gradient-to: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .to-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .to-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-gradient-to: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .to-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        --tw-gradient-to: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .to-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .to-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-gradient-to: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .to-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        --tw-gradient-to: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .to-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .to-\\[var\\(--my-color\\)\\] {
       --tw-gradient-to: var(--my-color);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
-    .to-\\[var\\(--my-color\\)\\]\\/50, .to-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\], .to-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      --tw-gradient-to: color-mix(in oklab, var(--my-color) 50%, transparent);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    .to-\\[var\\(--my-color\\)\\]\\/50 {
+      --tw-gradient-to: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .to-\\[var\\(--my-color\\)\\]\\/50 {
+        --tw-gradient-to: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .to-\\[var\\(--my-color\\)\\]\\/50 {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .to-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-gradient-to: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .to-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        --tw-gradient-to: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .to-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .to-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-gradient-to: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .to-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        --tw-gradient-to: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .to-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .to-current {
-      --tw-gradient-to: currentColor;
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-to: currentcolor;
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
-    .to-current\\/50, .to-current\\/\\[0\\.5\\], .to-current\\/\\[50\\%\\] {
-      --tw-gradient-to: color-mix(in oklab, currentColor 50%, transparent);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    .to-current\\/50 {
+      --tw-gradient-to: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .to-current\\/50 {
+        --tw-gradient-to: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .to-current\\/50 {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .to-current\\/\\[0\\.5\\] {
+      --tw-gradient-to: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .to-current\\/\\[0\\.5\\] {
+        --tw-gradient-to: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .to-current\\/\\[0\\.5\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .to-current\\/\\[50\\%\\] {
+      --tw-gradient-to: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .to-current\\/\\[50\\%\\] {
+        --tw-gradient-to: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .to-current\\/\\[50\\%\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .to-inherit {
       --tw-gradient-to: inherit;
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .to-red-500 {
       --tw-gradient-to: var(--color-red-500);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
-    .to-red-500\\/50, .to-red-500\\/\\[0\\.5\\], .to-red-500\\/\\[50\\%\\] {
-      --tw-gradient-to: color-mix(in oklab, var(--color-red-500) 50%, transparent);
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    .to-red-500\\/50 {
+      --tw-gradient-to: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .to-red-500\\/50 {
+        --tw-gradient-to: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .to-red-500\\/50 {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .to-red-500\\/\\[0\\.5\\] {
+      --tw-gradient-to: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .to-red-500\\/\\[0\\.5\\] {
+        --tw-gradient-to: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .to-red-500\\/\\[0\\.5\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+    }
+
+    .to-red-500\\/\\[50\\%\\] {
+      --tw-gradient-to: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .to-red-500\\/\\[50\\%\\] {
+        --tw-gradient-to: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .to-red-500\\/\\[50\\%\\] {
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .to-transparent {
       --tw-gradient-to: transparent;
-      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position, ) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
+      --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
     }
 
     .to-0\\% {
@@ -11685,22 +15522,6 @@ test('to', async () => {
       --tw-gradient-to-position: var(--my-position);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-gradient-position: initial;
-          --tw-gradient-from: #0000;
-          --tw-gradient-via: #0000;
-          --tw-gradient-to: #0000;
-          --tw-gradient-stops: initial;
-          --tw-gradient-via-stops: initial;
-          --tw-gradient-from-position: 0%;
-          --tw-gradient-via-position: 50%;
-          --tw-gradient-to-position: 100%;
-        }
-      }
-    }
-
     @property --tw-gradient-position {
       syntax: "*";
       inherits: false
@@ -11750,7 +15571,8 @@ test('to', async () => {
       syntax: "<length-percentage>";
       inherits: false;
       initial-value: 100%;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -11785,9 +15607,5831 @@ test('to', async () => {
   ).toEqual('')
 })
 
+test('mask', async () => {
+  expect(
+    await run(
+      [
+        // mask-image
+        'mask-none',
+        'mask-[linear-gradient(#ffff,#0000)]',
+        'mask-[url(http://example.com)]',
+        'mask-[var(--some-var)]',
+        'mask-[image:var(--some-var)]',
+        'mask-[url:var(--some-var)]',
+
+        // mask-composite
+        'mask-add',
+        'mask-subtract',
+        'mask-intersect',
+        'mask-exclude',
+
+        // mask-mode
+        'mask-alpha',
+        'mask-luminance',
+        'mask-match',
+
+        // mask-type
+        'mask-type-alpha',
+        'mask-type-luminance',
+
+        // mask-size
+        'mask-auto',
+        'mask-cover',
+        'mask-contain',
+        'mask-[cover]',
+        'mask-[contain]',
+        'mask-[size:120px_120px]',
+
+        // mask-position
+        'mask-center',
+        'mask-top',
+        'mask-top-right',
+        'mask-top-left',
+        'mask-bottom',
+        'mask-bottom-right',
+        'mask-bottom-left',
+        'mask-left',
+        'mask-right',
+        'mask-center',
+        'mask-[50%]',
+        'mask-[120px]',
+        'mask-[120px_120px]',
+        'mask-[length:120px_120px]',
+        'mask-[position:120px_120px]',
+
+        // mask-repeat
+        'mask-repeat',
+        'mask-no-repeat',
+        'mask-repeat-x',
+        'mask-repeat-y',
+        'mask-repeat-round',
+        'mask-repeat-space',
+      ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .mask-\\[image\\:var\\(--some-var\\)\\] {
+      -webkit-mask-image: var(--some-var);
+      -webkit-mask-image: var(--some-var);
+      mask-image: var(--some-var);
+    }
+
+    .mask-\\[linear-gradient\\(\\#ffff\\,\\#0000\\)\\] {
+      -webkit-mask-image: linear-gradient(#fff, #0000);
+      mask-image: linear-gradient(#fff, #0000);
+    }
+
+    .mask-\\[url\\(http\\:\\/\\/example\\.com\\)\\] {
+      -webkit-mask-image: url("http://example.com");
+      mask-image: url("http://example.com");
+    }
+
+    .mask-\\[url\\:var\\(--some-var\\)\\], .mask-\\[var\\(--some-var\\)\\] {
+      -webkit-mask-image: var(--some-var);
+      -webkit-mask-image: var(--some-var);
+      mask-image: var(--some-var);
+    }
+
+    .mask-none {
+      -webkit-mask-image: none;
+      mask-image: none;
+    }
+
+    .mask-add {
+      -webkit-mask-composite: source-over;
+      -webkit-mask-composite: source-over;
+      mask-composite: add;
+    }
+
+    .mask-exclude {
+      -webkit-mask-composite: xor;
+      -webkit-mask-composite: xor;
+      mask-composite: exclude;
+    }
+
+    .mask-intersect {
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-subtract {
+      -webkit-mask-composite: source-out;
+      -webkit-mask-composite: source-out;
+      mask-composite: subtract;
+    }
+
+    .mask-alpha {
+      -webkit-mask-source-type: alpha;
+      -webkit-mask-source-type: alpha;
+      mask-mode: alpha;
+    }
+
+    .mask-luminance {
+      -webkit-mask-source-type: luminance;
+      -webkit-mask-source-type: luminance;
+      mask-mode: luminance;
+    }
+
+    .mask-match {
+      -webkit-mask-source-type: auto;
+      -webkit-mask-source-type: auto;
+      mask-mode: match-source;
+    }
+
+    .mask-type-alpha {
+      mask-type: alpha;
+    }
+
+    .mask-type-luminance {
+      mask-type: luminance;
+    }
+
+    .mask-\\[contain\\] {
+      -webkit-mask-size: contain;
+      mask-size: contain;
+    }
+
+    .mask-\\[cover\\] {
+      -webkit-mask-size: cover;
+      mask-size: cover;
+    }
+
+    .mask-\\[length\\:120px_120px\\], .mask-\\[size\\:120px_120px\\] {
+      -webkit-mask-size: 120px 120px;
+      mask-size: 120px 120px;
+    }
+
+    .mask-auto {
+      -webkit-mask-size: auto;
+      mask-size: auto;
+    }
+
+    .mask-contain {
+      -webkit-mask-size: contain;
+      mask-size: contain;
+    }
+
+    .mask-cover {
+      -webkit-mask-size: cover;
+      mask-size: cover;
+    }
+
+    .mask-\\[50\\%\\] {
+      -webkit-mask-position: 50%;
+      mask-position: 50%;
+    }
+
+    .mask-\\[120px\\] {
+      -webkit-mask-position: 120px;
+      mask-position: 120px;
+    }
+
+    .mask-\\[120px_120px\\], .mask-\\[position\\:120px_120px\\] {
+      -webkit-mask-position: 120px 120px;
+      mask-position: 120px 120px;
+    }
+
+    .mask-bottom {
+      -webkit-mask-position: bottom;
+      mask-position: bottom;
+    }
+
+    .mask-bottom-left {
+      -webkit-mask-position: 0 100%;
+      mask-position: 0 100%;
+    }
+
+    .mask-bottom-right {
+      -webkit-mask-position: 100% 100%;
+      mask-position: 100% 100%;
+    }
+
+    .mask-center {
+      -webkit-mask-position: center;
+      mask-position: center;
+    }
+
+    .mask-left {
+      -webkit-mask-position: 0;
+      mask-position: 0;
+    }
+
+    .mask-right {
+      -webkit-mask-position: 100%;
+      mask-position: 100%;
+    }
+
+    .mask-top {
+      -webkit-mask-position: top;
+      mask-position: top;
+    }
+
+    .mask-top-left {
+      -webkit-mask-position: 0 0;
+      mask-position: 0 0;
+    }
+
+    .mask-top-right {
+      -webkit-mask-position: 100% 0;
+      mask-position: 100% 0;
+    }
+
+    .mask-no-repeat {
+      -webkit-mask-repeat: no-repeat;
+      mask-repeat: no-repeat;
+    }
+
+    .mask-repeat {
+      -webkit-mask-repeat: repeat;
+      mask-repeat: repeat;
+    }
+
+    .mask-repeat-round {
+      -webkit-mask-repeat: round;
+      mask-repeat: round;
+    }
+
+    .mask-repeat-space {
+      -webkit-mask-repeat: space;
+      mask-repeat: space;
+    }
+
+    .mask-repeat-x {
+      -webkit-mask-repeat: repeat-x;
+      mask-repeat: repeat-x;
+    }
+
+    .mask-repeat-y {
+      -webkit-mask-repeat: repeat-y;
+      mask-repeat: repeat-y;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'mask',
+      'mask-unknown',
+
+      // mask-image
+      '-mask-none',
+      'mask-none/foo',
+      '-mask-[var(--some-var)]',
+      'mask-[var(--some-var)]/foo',
+      '-mask-[image:var(--some-var)]',
+      'mask-[image:var(--some-var)]/foo',
+      '-mask-[url:var(--some-var)]',
+      'mask-[url:var(--some-var)]/foo',
+
+      // mask-composite
+      '-mask-add',
+      '-mask-subtract',
+      '-mask-intersect',
+      '-mask-exclude',
+      'mask-add/foo',
+      'mask-subtract/foo',
+      'mask-intersect/foo',
+      'mask-exclude/foo',
+
+      // mask-mode
+      '-mask-alpha',
+      '-mask-luminance',
+      '-mask-match',
+      'mask-alpha/foo',
+      'mask-luminance/foo',
+      'mask-match/foo',
+
+      // mask-type
+      '-mask-type-alpha',
+      '-mask-type-luminance',
+      'mask-type-alpha/foo',
+      'mask-type-luminance/foo',
+
+      // mask-size
+      '-mask-auto',
+      '-mask-cover',
+      '-mask-contain',
+      '-mask-auto/foo',
+      '-mask-cover/foo',
+      '-mask-contain/foo',
+
+      // mask-position
+      '-mask-center',
+      '-mask-top',
+      '-mask-right-top',
+      '-mask-right-bottom',
+      '-mask-bottom',
+      '-mask-left-bottom',
+      '-mask-left',
+      '-mask-left-top',
+      '-mask-center/foo',
+      '-mask-top/foo',
+      '-mask-right-top/foo',
+      '-mask-right-bottom/foo',
+      '-mask-bottom/foo',
+      '-mask-left-bottom/foo',
+      '-mask-left/foo',
+      '-mask-left-top/foo',
+
+      // mask-repeat
+      'mask-repeat/foo',
+      'mask-no-repeat/foo',
+      'mask-repeat-x/foo',
+      'mask-repeat-y/foo',
+      'mask-round/foo',
+      'mask-space/foo',
+      '-mask-repeat',
+      '-mask-no-repeat',
+      '-mask-repeat-x',
+      '-mask-repeat-y',
+      '-mask-round',
+      '-mask-space',
+      '-mask-repeat/foo',
+      '-mask-no-repeat/foo',
+      '-mask-repeat-x/foo',
+      '-mask-repeat-y/foo',
+      '-mask-round/foo',
+      '-mask-space/foo',
+    ]),
+  ).toEqual('')
+
+  expect(
+    await run(
+      ['mask-current/half', 'mask-current/custom', '[color:red]/half'],
+      css`
+        @theme reference {
+          --opacity-half: 0.5;
+          --opacity-custom: var(--custom-opacity);
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .\\[color\\:red\\]\\/half {
+      color: color-mix(in srgb, red .5, transparent);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .\\[color\\:red\\]\\/half {
+        color: color-mix(in oklab, red var(--opacity-half, .5), transparent);
+      }
+    }
+    "
+  `)
+})
+
+test('mask-position', async () => {
+  expect(
+    await run(
+      ['mask-position-[120px]', 'mask-position-[120px_120px]', 'mask-position-[var(--some-var)]'],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .mask-position-\\[120px\\] {
+      -webkit-mask-position: 120px;
+      mask-position: 120px;
+    }
+
+    .mask-position-\\[120px_120px\\] {
+      -webkit-mask-position: 120px 120px;
+      mask-position: 120px 120px;
+    }
+
+    .mask-position-\\[var\\(--some-var\\)\\] {
+      -webkit-mask-position: var(--some-var);
+      -webkit-mask-position: var(--some-var);
+      mask-position: var(--some-var);
+    }
+    "
+  `)
+  expect(
+    await run([
+      'mask-position',
+      'mask-position/foo',
+      '-mask-position',
+      '-mask-position/foo',
+
+      'mask-position-[120px_120px]/foo',
+
+      '-mask-position-[120px_120px]',
+      '-mask-position-[120px_120px]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('mask-size', async () => {
+  expect(
+    await run(
+      ['mask-size-[120px]', 'mask-size-[120px_120px]', 'mask-size-[var(--some-var)]'],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .mask-size-\\[120px\\] {
+      -webkit-mask-size: 120px;
+      mask-size: 120px;
+    }
+
+    .mask-size-\\[120px_120px\\] {
+      -webkit-mask-size: 120px 120px;
+      mask-size: 120px 120px;
+    }
+
+    .mask-size-\\[var\\(--some-var\\)\\] {
+      -webkit-mask-size: var(--some-var);
+      -webkit-mask-size: var(--some-var);
+      mask-size: var(--some-var);
+    }
+    "
+  `)
+  expect(
+    await run([
+      'mask-size',
+      'mask-size/foo',
+      '-mask-size',
+      '-mask-size/foo',
+
+      'mask-size-[120px_120px]/foo',
+
+      '-mask-size-[120px_120px]',
+      '-mask-size-[120px_120px]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('mask-t-from', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-t-from-0',
+        'mask-t-from-1.5',
+        'mask-t-from-2',
+        'mask-t-from-0%',
+        'mask-t-from-2%',
+        'mask-t-from-[0px]',
+        'mask-t-from-[0%]',
+        'mask-t-from-(--my-var)',
+        'mask-t-from-(color:--my-var)',
+        'mask-t-from-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-left: linear-gradient(#fff, #fff);
+          --tw-mask-right: linear-gradient(#fff, #fff);
+          --tw-mask-bottom: linear-gradient(#fff, #fff);
+          --tw-mask-top: linear-gradient(#fff, #fff);
+          --tw-mask-top-from-position: 0%;
+          --tw-mask-top-to-position: 100%;
+          --tw-mask-top-from-color: black;
+          --tw-mask-top-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-t-from-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-from-\\(--my-var\\), .mask-t-from-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-from-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-from-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-from-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-from-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-from-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-from-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-from-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-left {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-bottom {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-top-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-top-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-top-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-t-from',
+        'mask-t-from-2.8175',
+        'mask-t-from--1.5',
+        'mask-t-from--2',
+
+        'mask-t-from-2.5%',
+        'mask-t-from--5%',
+        'mask-t-from-unknown',
+        'mask-t-from-unknown%',
+
+        '-mask-t-from-0',
+        '-mask-t-from-1.5',
+        '-mask-t-from-2',
+        '-mask-t-from-0%',
+        '-mask-t-from-2%',
+        '-mask-t-from-[0px]',
+        '-mask-t-from-[0%]',
+
+        '-mask-t-from-(--my-var)',
+        '-mask-t-from-(color:--my-var)',
+        '-mask-t-from-(length:--my-var)',
+
+        'mask-l-from-[-25%]',
+        'mask-l-from-[25%]/foo',
+        'mask-l-from-[-25%]/foo',
+        '-mask-l-from-[-25%]',
+        '-mask-l-from-[25%]/foo',
+        '-mask-l-from-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-t-to', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-t-to-0',
+        'mask-t-to-1.5',
+        'mask-t-to-2',
+        'mask-t-to-0%',
+        'mask-t-to-2%',
+        'mask-t-to-[0px]',
+        'mask-t-to-[0%]',
+        'mask-t-to-(--my-var)',
+        'mask-t-to-(color:--my-var)',
+        'mask-t-to-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-left: linear-gradient(#fff, #fff);
+          --tw-mask-right: linear-gradient(#fff, #fff);
+          --tw-mask-bottom: linear-gradient(#fff, #fff);
+          --tw-mask-top: linear-gradient(#fff, #fff);
+          --tw-mask-top-from-position: 0%;
+          --tw-mask-top-to-position: 100%;
+          --tw-mask-top-from-color: black;
+          --tw-mask-top-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-t-to-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-to-\\(--my-var\\), .mask-t-to-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-to-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-to-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-to-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-to-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-to-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-to-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-t-to-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-left {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-bottom {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-top-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-top-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-top-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-t-to',
+        'mask-t-to-2.8175',
+        'mask-t-to--1.5',
+        'mask-t-to--2',
+
+        'mask-t-to-2.5%',
+        'mask-t-to--5%',
+        'mask-t-to-unknown',
+        'mask-t-to-unknown%',
+
+        '-mask-t-to-0',
+        '-mask-t-to-1.5',
+        '-mask-t-to-2',
+        '-mask-t-to-0%',
+        '-mask-t-to-2%',
+        '-mask-t-to-[0px]',
+        '-mask-t-to-[0%]',
+
+        '-mask-t-to-(--my-var)',
+        '-mask-t-to-(color:--my-var)',
+        '-mask-t-to-(length:--my-var)',
+
+        'mask-l-from-[-25%]',
+        'mask-l-from-[25%]/foo',
+        'mask-l-from-[-25%]/foo',
+        '-mask-l-from-[-25%]',
+        '-mask-l-from-[25%]/foo',
+        '-mask-l-from-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-r-from', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-r-from-0',
+        'mask-r-from-1.5',
+        'mask-r-from-2',
+        'mask-r-from-0%',
+        'mask-r-from-2%',
+        'mask-r-from-[0px]',
+        'mask-r-from-[0%]',
+
+        'mask-r-from-(--my-var)',
+        'mask-r-from-(color:--my-var)',
+        'mask-r-from-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-left: linear-gradient(#fff, #fff);
+          --tw-mask-right: linear-gradient(#fff, #fff);
+          --tw-mask-bottom: linear-gradient(#fff, #fff);
+          --tw-mask-top: linear-gradient(#fff, #fff);
+          --tw-mask-right-from-position: 0%;
+          --tw-mask-right-to-position: 100%;
+          --tw-mask-right-from-color: black;
+          --tw-mask-right-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-r-from-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-from-\\(--my-var\\), .mask-r-from-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-from-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-from-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-from-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-from-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-from-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-from-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-from-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-left {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-bottom {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-right-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-right-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-right-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-r-from',
+        'mask-r-from-2.8175',
+        'mask-r-from--1.5',
+        'mask-r-from--2',
+
+        'mask-r-from-2.5%',
+        'mask-r-from--5%',
+        'mask-r-from-unknown',
+        'mask-r-from-unknown%',
+
+        '-mask-r-from-0',
+        '-mask-r-from-1.5',
+        '-mask-r-from-2',
+        '-mask-r-from-0%',
+        '-mask-r-from-2%',
+        '-mask-r-from-[0px]',
+        '-mask-r-from-[0%]',
+
+        '-mask-r-from-(--my-var)',
+        '-mask-r-from-(color:--my-var)',
+        '-mask-r-from-(length:--my-var)',
+
+        'mask-r-from-[-25%]',
+        'mask-r-from-[25%]/foo',
+        'mask-r-from-[-25%]/foo',
+        '-mask-r-from-[-25%]',
+        '-mask-r-from-[25%]/foo',
+        '-mask-r-from-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-r-to', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-r-to-0',
+        'mask-r-to-1.5',
+        'mask-r-to-2',
+        'mask-r-to-0%',
+        'mask-r-to-2%',
+        'mask-r-to-[0px]',
+        'mask-r-to-[0%]',
+
+        'mask-r-to-(--my-var)',
+        'mask-r-to-(color:--my-var)',
+        'mask-r-to-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-left: linear-gradient(#fff, #fff);
+          --tw-mask-right: linear-gradient(#fff, #fff);
+          --tw-mask-bottom: linear-gradient(#fff, #fff);
+          --tw-mask-top: linear-gradient(#fff, #fff);
+          --tw-mask-right-from-position: 0%;
+          --tw-mask-right-to-position: 100%;
+          --tw-mask-right-from-color: black;
+          --tw-mask-right-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-r-to-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-to-\\(--my-var\\), .mask-r-to-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-to-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-to-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-to-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-to-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-to-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-to-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-r-to-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-left {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-bottom {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-right-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-right-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-right-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-r-to',
+        'mask-r-to-2.8175',
+        'mask-r-to--1.5',
+        'mask-r-to--2',
+
+        'mask-r-to-2.5%',
+        'mask-r-to--5%',
+        'mask-r-to-unknown',
+        'mask-r-to-unknown%',
+
+        '-mask-r-to-0',
+        '-mask-r-to-1.5',
+        '-mask-r-to-2',
+        '-mask-r-to-0%',
+        '-mask-r-to-2%',
+        '-mask-r-to-[0px]',
+        '-mask-r-to-[0%]',
+
+        '-mask-r-to-(--my-var)',
+        '-mask-r-to-(color:--my-var)',
+        '-mask-r-to-(length:--my-var)',
+
+        'mask-r-to-[-25%]',
+        'mask-r-to-[25%]/foo',
+        'mask-r-to-[-25%]/foo',
+        '-mask-r-to-[-25%]',
+        '-mask-r-to-[25%]/foo',
+        '-mask-r-to-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-b-from', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-b-from-0',
+        'mask-b-from-1.5',
+        'mask-b-from-2',
+        'mask-b-from-0%',
+        'mask-b-from-2%',
+        'mask-b-from-[0px]',
+        'mask-b-from-[0%]',
+
+        'mask-b-from-(--my-var)',
+        'mask-b-from-(color:--my-var)',
+        'mask-b-from-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-left: linear-gradient(#fff, #fff);
+          --tw-mask-right: linear-gradient(#fff, #fff);
+          --tw-mask-bottom: linear-gradient(#fff, #fff);
+          --tw-mask-top: linear-gradient(#fff, #fff);
+          --tw-mask-bottom-from-position: 0%;
+          --tw-mask-bottom-to-position: 100%;
+          --tw-mask-bottom-from-color: black;
+          --tw-mask-bottom-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-b-from-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-from-\\(--my-var\\), .mask-b-from-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-from-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-from-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-from-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-from-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-from-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-from-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-from-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-left {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-bottom {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-bottom-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-bottom-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-bottom-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-bottom-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-b-from',
+        'mask-b-from-2.8175',
+        'mask-b-from--1.5',
+        'mask-b-from--2',
+
+        'mask-b-from-2.5%',
+        'mask-b-from--5%',
+        'mask-b-from-unknown',
+        'mask-b-from-unknown%',
+
+        '-mask-b-from-0',
+        '-mask-b-from-1.5',
+        '-mask-b-from-2',
+        '-mask-b-from-0%',
+        '-mask-b-from-2%',
+        '-mask-b-from-[0px]',
+        '-mask-b-from-[0%]',
+
+        '-mask-b-from-(--my-var)',
+        '-mask-b-from-(color:--my-var)',
+        '-mask-b-from-(length:--my-var)',
+
+        'mask-b-from-[-25%]',
+        'mask-b-from-[25%]/foo',
+        'mask-b-from-[-25%]/foo',
+        '-mask-b-from-[-25%]',
+        '-mask-b-from-[25%]/foo',
+        '-mask-b-from-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-b-to', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-b-to-0',
+        'mask-b-to-1.5',
+        'mask-b-to-2',
+        'mask-b-to-0%',
+        'mask-b-to-2%',
+        'mask-b-to-[0px]',
+        'mask-b-to-[0%]',
+
+        'mask-b-to-(--my-var)',
+        'mask-b-to-(color:--my-var)',
+        'mask-b-to-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-left: linear-gradient(#fff, #fff);
+          --tw-mask-right: linear-gradient(#fff, #fff);
+          --tw-mask-bottom: linear-gradient(#fff, #fff);
+          --tw-mask-top: linear-gradient(#fff, #fff);
+          --tw-mask-bottom-from-position: 0%;
+          --tw-mask-bottom-to-position: 100%;
+          --tw-mask-bottom-from-color: black;
+          --tw-mask-bottom-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-b-to-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-to-\\(--my-var\\), .mask-b-to-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-to-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-to-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-to-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-to-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-to-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-to-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-b-to-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-left {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-bottom {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-bottom-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-bottom-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-bottom-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-bottom-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-b-to',
+        'mask-b-to-2.8175',
+        'mask-b-to--1.5',
+        'mask-b-to--2',
+
+        'mask-b-to-2.5%',
+        'mask-b-to--5%',
+        'mask-b-to-unknown',
+        'mask-b-to-unknown%',
+
+        '-mask-b-to-0',
+        '-mask-b-to-1.5',
+        '-mask-b-to-2',
+        '-mask-b-to-0%',
+        '-mask-b-to-2%',
+        '-mask-b-to-[0px]',
+        '-mask-b-to-[0%]',
+
+        '-mask-b-to-(--my-var)',
+        '-mask-b-to-(color:--my-var)',
+        '-mask-b-to-(length:--my-var)',
+
+        'mask-b-to-[-25%]',
+        'mask-b-to-[25%]/foo',
+        'mask-b-to-[-25%]/foo',
+        '-mask-b-to-[-25%]',
+        '-mask-b-to-[25%]/foo',
+        '-mask-b-to-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-l-from', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-l-from-0',
+        'mask-l-from-1.5',
+        'mask-l-from-2',
+        'mask-l-from-0%',
+        'mask-l-from-2%',
+        'mask-l-from-[0px]',
+        'mask-l-from-[0%]',
+
+        'mask-l-from-(--my-var)',
+        'mask-l-from-(color:--my-var)',
+        'mask-l-from-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-left: linear-gradient(#fff, #fff);
+          --tw-mask-right: linear-gradient(#fff, #fff);
+          --tw-mask-bottom: linear-gradient(#fff, #fff);
+          --tw-mask-top: linear-gradient(#fff, #fff);
+          --tw-mask-left-from-position: 0%;
+          --tw-mask-left-to-position: 100%;
+          --tw-mask-left-from-color: black;
+          --tw-mask-left-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-l-from-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-from-\\(--my-var\\), .mask-l-from-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-from-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-from-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-from-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-from-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-from-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-from-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-from-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-left {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-bottom {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-left-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-left-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-left-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-left-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-l-from',
+        'mask-l-from-2.8175',
+        'mask-l-from--1.5',
+        'mask-l-from--2',
+
+        'mask-l-from-2.5%',
+        'mask-l-from--5%',
+        'mask-l-from-unknown',
+        'mask-l-from-unknown%',
+
+        '-mask-l-from-0',
+        '-mask-l-from-1.5',
+        '-mask-l-from-2',
+        '-mask-l-from-0%',
+        '-mask-l-from-2%',
+        '-mask-l-from-[0px]',
+        '-mask-l-from-[0%]',
+
+        '-mask-l-from-(--my-var)',
+        '-mask-l-from-(color:--my-var)',
+        '-mask-l-from-(length:--my-var)',
+
+        'mask-l-from-[-25%]',
+        'mask-l-from-[25%]/foo',
+        'mask-l-from-[-25%]/foo',
+        '-mask-l-from-[-25%]',
+        '-mask-l-from-[25%]/foo',
+        '-mask-l-from-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-l-to', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-l-to-0',
+        'mask-l-to-1.5',
+        'mask-l-to-2',
+        'mask-l-to-0%',
+        'mask-l-to-2%',
+        'mask-l-to-[0px]',
+        'mask-l-to-[0%]',
+
+        'mask-l-to-(--my-var)',
+        'mask-l-to-(color:--my-var)',
+        'mask-l-to-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-left: linear-gradient(#fff, #fff);
+          --tw-mask-right: linear-gradient(#fff, #fff);
+          --tw-mask-bottom: linear-gradient(#fff, #fff);
+          --tw-mask-top: linear-gradient(#fff, #fff);
+          --tw-mask-left-from-position: 0%;
+          --tw-mask-left-to-position: 100%;
+          --tw-mask-left-from-color: black;
+          --tw-mask-left-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-l-to-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-to-\\(--my-var\\), .mask-l-to-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-to-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-to-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-to-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-to-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-to-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-to-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-l-to-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-left {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-bottom {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-left-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-left-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-left-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-left-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-l-to',
+        'mask-l-to-2.8175',
+        'mask-l-to--1.5',
+        'mask-l-to--2',
+
+        'mask-l-to-2.5%',
+        'mask-l-to--5%',
+        'mask-l-to-unknown',
+        'mask-l-to-unknown%',
+
+        '-mask-l-to-0',
+        '-mask-l-to-1.5',
+        '-mask-l-to-2',
+        '-mask-l-to-0%',
+        '-mask-l-to-2%',
+        '-mask-l-to-[0px]',
+        '-mask-l-to-[0%]',
+
+        '-mask-l-to-(--my-var)',
+        '-mask-l-to-(color:--my-var)',
+        '-mask-l-to-(length:--my-var)',
+
+        'mask-l-to-[-25%]',
+        'mask-l-to-[25%]/foo',
+        'mask-l-to-[-25%]/foo',
+        '-mask-l-to-[-25%]',
+        '-mask-l-to-[25%]/foo',
+        '-mask-l-to-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-x-from', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-x-from-0',
+        'mask-x-from-1.5',
+        'mask-x-from-2',
+        'mask-x-from-0%',
+        'mask-x-from-2%',
+        'mask-x-from-[0px]',
+        'mask-x-from-[0%]',
+
+        'mask-x-from-(--my-var)',
+        'mask-x-from-(color:--my-var)',
+        'mask-x-from-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-left: linear-gradient(#fff, #fff);
+          --tw-mask-right: linear-gradient(#fff, #fff);
+          --tw-mask-bottom: linear-gradient(#fff, #fff);
+          --tw-mask-top: linear-gradient(#fff, #fff);
+          --tw-mask-right-from-position: 0%;
+          --tw-mask-right-to-position: 100%;
+          --tw-mask-right-from-color: black;
+          --tw-mask-right-to-color: transparent;
+          --tw-mask-left-from-position: 0%;
+          --tw-mask-left-to-position: 100%;
+          --tw-mask-left-from-color: black;
+          --tw-mask-left-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-x-from-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-color: var(--my-var);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-from-\\(--my-var\\), .mask-x-from-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: var(--my-var);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-from-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: 0px;
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-from-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: 0%;
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-from-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: calc(var(--spacing) * 1.5);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-from-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: calc(var(--spacing) * 2);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-from-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: 2%;
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-from-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: 0%;
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-from-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-from-position: 0px;
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-left {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-bottom {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-right-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-right-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-right-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+
+    @property --tw-mask-left-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-left-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-left-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-left-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-x-from',
+        'mask-x-from-2.8175',
+        'mask-x-from--1.5',
+        'mask-x-from--2',
+
+        'mask-x-from-2.5%',
+        'mask-x-from--5%',
+        'mask-x-from-unknown',
+        'mask-x-from-unknown%',
+
+        '-mask-x-from-0',
+        '-mask-x-from-1.5',
+        '-mask-x-from-2',
+        '-mask-x-from-0%',
+        '-mask-x-from-2%',
+        '-mask-x-from-[0px]',
+        '-mask-x-from-[0%]',
+
+        '-mask-x-from-(--my-var)',
+        '-mask-x-from-(color:--my-var)',
+        '-mask-x-from-(length:--my-var)',
+
+        'mask-x-from-[-25%]',
+        'mask-x-from-[25%]/foo',
+        'mask-x-from-[-25%]/foo',
+        '-mask-x-from-[-25%]',
+        '-mask-x-from-[25%]/foo',
+        '-mask-x-from-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-x-to', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-x-to-0',
+        'mask-x-to-1.5',
+        'mask-x-to-2',
+        'mask-x-to-0%',
+        'mask-x-to-2%',
+        'mask-x-to-[0px]',
+        'mask-x-to-[0%]',
+
+        'mask-x-to-(--my-var)',
+        'mask-x-to-(color:--my-var)',
+        'mask-x-to-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-left: linear-gradient(#fff, #fff);
+          --tw-mask-right: linear-gradient(#fff, #fff);
+          --tw-mask-bottom: linear-gradient(#fff, #fff);
+          --tw-mask-top: linear-gradient(#fff, #fff);
+          --tw-mask-right-from-position: 0%;
+          --tw-mask-right-to-position: 100%;
+          --tw-mask-right-from-color: black;
+          --tw-mask-right-to-color: transparent;
+          --tw-mask-left-from-position: 0%;
+          --tw-mask-left-to-position: 100%;
+          --tw-mask-left-from-color: black;
+          --tw-mask-left-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-x-to-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-color: var(--my-var);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-to-\\(--my-var\\), .mask-x-to-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: var(--my-var);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-to-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: 0px;
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-to-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: 0%;
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-to-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: calc(var(--spacing) * 1.5);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-to-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: calc(var(--spacing) * 2);
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-to-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: 2%;
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-to-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: 0%;
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-x-to-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-right: linear-gradient(to right, var(--tw-mask-right-from-color) var(--tw-mask-right-from-position), var(--tw-mask-right-to-color) var(--tw-mask-right-to-position));
+      --tw-mask-right-to-position: 0px;
+      --tw-mask-left: linear-gradient(to left, var(--tw-mask-left-from-color) var(--tw-mask-left-from-position), var(--tw-mask-left-to-color) var(--tw-mask-left-to-position));
+      --tw-mask-left-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-left {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-bottom {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-right-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-right-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-right-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+
+    @property --tw-mask-left-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-left-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-left-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-left-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-x-to',
+        'mask-x-to-2.8175',
+        'mask-x-to--1.5',
+        'mask-x-to--2',
+
+        'mask-x-to-2.5%',
+        'mask-x-to--5%',
+        'mask-x-to-unknown',
+        'mask-x-to-unknown%',
+
+        '-mask-x-to-0',
+        '-mask-x-to-1.5',
+        '-mask-x-to-2',
+        '-mask-x-to-0%',
+        '-mask-x-to-2%',
+        '-mask-x-to-[0px]',
+        '-mask-x-to-[0%]',
+
+        '-mask-x-to-(--my-var)',
+        '-mask-x-to-(color:--my-var)',
+        '-mask-x-to-(length:--my-var)',
+
+        'mask-x-to-[-25%]',
+        'mask-x-to-[25%]/foo',
+        'mask-x-to-[-25%]/foo',
+        '-mask-x-to-[-25%]',
+        '-mask-x-to-[25%]/foo',
+        '-mask-x-to-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-y-from', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-y-from-0',
+        'mask-y-from-1.5',
+        'mask-y-from-2',
+        'mask-y-from-0%',
+        'mask-y-from-2%',
+        'mask-y-from-[0px]',
+        'mask-y-from-[0%]',
+
+        'mask-y-from-(--my-var)',
+        'mask-y-from-(color:--my-var)',
+        'mask-y-from-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-left: linear-gradient(#fff, #fff);
+          --tw-mask-right: linear-gradient(#fff, #fff);
+          --tw-mask-bottom: linear-gradient(#fff, #fff);
+          --tw-mask-top: linear-gradient(#fff, #fff);
+          --tw-mask-top-from-position: 0%;
+          --tw-mask-top-to-position: 100%;
+          --tw-mask-top-from-color: black;
+          --tw-mask-top-to-color: transparent;
+          --tw-mask-bottom-from-position: 0%;
+          --tw-mask-bottom-to-position: 100%;
+          --tw-mask-bottom-from-color: black;
+          --tw-mask-bottom-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-y-from-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-color: var(--my-var);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-from-\\(--my-var\\), .mask-y-from-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: var(--my-var);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-from-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: 0px;
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-from-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: 0%;
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-from-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: calc(var(--spacing) * 1.5);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-from-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: calc(var(--spacing) * 2);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-from-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: 2%;
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-from-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: 0%;
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-from-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-from-position: 0px;
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-left {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-bottom {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-top-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-top-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-top-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+
+    @property --tw-mask-bottom-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-bottom-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-bottom-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-bottom-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-y-from',
+        'mask-y-from-2.8175',
+        'mask-y-from--1.5',
+        'mask-y-from--2',
+
+        'mask-y-from-2.5%',
+        'mask-y-from--5%',
+        'mask-y-from-unknown',
+        'mask-y-from-unknown%',
+
+        '-mask-y-from-0',
+        '-mask-y-from-1.5',
+        '-mask-y-from-2',
+        '-mask-y-from-0%',
+        '-mask-y-from-2%',
+        '-mask-y-from-[0px]',
+        '-mask-y-from-[0%]',
+
+        '-mask-y-from-(--my-var)',
+        '-mask-y-from-(color:--my-var)',
+        '-mask-y-from-(length:--my-var)',
+
+        'mask-y-from-[-25%]',
+        'mask-y-from-[25%]/foo',
+        'mask-y-from-[-25%]/foo',
+        '-mask-y-from-[-25%]',
+        '-mask-y-from-[25%]/foo',
+        '-mask-y-from-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-y-to', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-y-to-0',
+        'mask-y-to-1.5',
+        'mask-y-to-2',
+        'mask-y-to-0%',
+        'mask-y-to-2%',
+        'mask-y-to-[0px]',
+        'mask-y-to-[0%]',
+
+        'mask-y-to-(--my-var)',
+        'mask-y-to-(color:--my-var)',
+        'mask-y-to-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-left: linear-gradient(#fff, #fff);
+          --tw-mask-right: linear-gradient(#fff, #fff);
+          --tw-mask-bottom: linear-gradient(#fff, #fff);
+          --tw-mask-top: linear-gradient(#fff, #fff);
+          --tw-mask-top-from-position: 0%;
+          --tw-mask-top-to-position: 100%;
+          --tw-mask-top-from-color: black;
+          --tw-mask-top-to-color: transparent;
+          --tw-mask-bottom-from-position: 0%;
+          --tw-mask-bottom-to-position: 100%;
+          --tw-mask-bottom-from-color: black;
+          --tw-mask-bottom-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-y-to-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-color: var(--my-var);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-to-\\(--my-var\\), .mask-y-to-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: var(--my-var);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-to-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: 0px;
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-to-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: 0%;
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-to-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: calc(var(--spacing) * 1.5);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-to-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: calc(var(--spacing) * 2);
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-to-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: 2%;
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-to-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: 0%;
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-y-to-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top);
+      --tw-mask-top: linear-gradient(to top, var(--tw-mask-top-from-color) var(--tw-mask-top-from-position), var(--tw-mask-top-to-color) var(--tw-mask-top-to-position));
+      --tw-mask-top-to-position: 0px;
+      --tw-mask-bottom: linear-gradient(to bottom, var(--tw-mask-bottom-from-color) var(--tw-mask-bottom-from-position), var(--tw-mask-bottom-to-color) var(--tw-mask-bottom-to-position));
+      --tw-mask-bottom-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-left {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-right {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-bottom {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-top-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-top-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-top-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-top-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+
+    @property --tw-mask-bottom-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-bottom-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-bottom-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-bottom-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-y-to',
+        'mask-y-to-2.8175',
+        'mask-y-to--1.5',
+        'mask-y-to--2',
+
+        'mask-y-to-2.5%',
+        'mask-y-to--5%',
+        'mask-y-to-unknown',
+        'mask-y-to-unknown%',
+
+        '-mask-y-to-0',
+        '-mask-y-to-1.5',
+        '-mask-y-to-2',
+        '-mask-y-to-0%',
+        '-mask-y-to-2%',
+        '-mask-y-to-[0px]',
+        '-mask-y-to-[0%]',
+
+        '-mask-y-to-(--my-var)',
+        '-mask-y-to-(color:--my-var)',
+        '-mask-y-to-(length:--my-var)',
+
+        'mask-y-to-[-25%]',
+        'mask-y-to-[25%]/foo',
+        'mask-y-to-[-25%]/foo',
+        '-mask-y-to-[-25%]',
+        '-mask-y-to-[25%]/foo',
+        '-mask-y-to-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-linear', async () => {
+  expect(
+    await run([
+      'mask-linear-0',
+      'mask-linear-1',
+      '-mask-linear-1',
+      'mask-linear-45',
+      'mask-linear-[3rad]',
+      '-mask-linear-45',
+    ]),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-linear-position: 0deg;
+          --tw-mask-linear-from-position: 0%;
+          --tw-mask-linear-to-position: 100%;
+          --tw-mask-linear-from-color: black;
+          --tw-mask-linear-to-color: transparent;
+        }
+      }
+    }
+
+    .-mask-linear-1 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops, var(--tw-mask-linear-position)));
+      --tw-mask-linear-position: -1deg;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .-mask-linear-45 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops, var(--tw-mask-linear-position)));
+      --tw-mask-linear-position: calc(1deg * -45);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops, var(--tw-mask-linear-position)));
+      --tw-mask-linear-position: 0deg;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-1 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops, var(--tw-mask-linear-position)));
+      --tw-mask-linear-position: 1deg;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-45 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops, var(--tw-mask-linear-position)));
+      --tw-mask-linear-position: calc(1deg * 45);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-\\[3rad\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops, var(--tw-mask-linear-position)));
+      --tw-mask-linear-position: 171.887deg;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-linear-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0deg;
+    }
+
+    @property --tw-mask-linear-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-linear-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-linear-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-linear-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'mask-linear',
+      '-mask-linear',
+
+      'mask-linear--75',
+      'mask-linear-unknown',
+      'mask-linear--75/foo',
+      'mask-linear-unknown/foo',
+
+      'mask-linear-45/foo',
+      '-mask-linear-45/foo',
+
+      'mask-linear-[3rad]/foo',
+      '-mask-linear-[3rad]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('mask-linear-from', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-linear-from-0',
+        'mask-linear-from-1.5',
+        'mask-linear-from-2',
+        'mask-linear-from-0%',
+        'mask-linear-from-2%',
+        'mask-linear-from-[0px]',
+        'mask-linear-from-[0%]',
+
+        'mask-linear-from-(--my-var)',
+        'mask-linear-from-(color:--my-var)',
+        'mask-linear-from-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-linear-position: 0deg;
+          --tw-mask-linear-from-position: 0%;
+          --tw-mask-linear-to-position: 100%;
+          --tw-mask-linear-from-color: black;
+          --tw-mask-linear-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-linear-from-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-from-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-from-\\(--my-var\\), .mask-linear-from-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-from-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-from-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-from-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-from-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-from-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-from-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-from-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-from-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-from-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-from-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-from-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-linear-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0deg;
+    }
+
+    @property --tw-mask-linear-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-linear-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-linear-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-linear-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-linear-from',
+        'mask-linear-from-2.8175',
+        'mask-linear-from--1.5',
+        'mask-linear-from--2',
+
+        'mask-linear-from-2.5%',
+        'mask-linear-from--5%',
+        'mask-linear-from-unknown',
+        'mask-linear-from-unknown%',
+
+        '-mask-linear-from-0',
+        '-mask-linear-from-1.5',
+        '-mask-linear-from-2',
+        '-mask-linear-from-0%',
+        '-mask-linear-from-2%',
+        '-mask-linear-from-[0px]',
+        '-mask-linear-from-[0%]',
+
+        '-mask-linear-from-(--my-var)',
+        '-mask-linear-from-(color:--my-var)',
+        '-mask-linear-from-(length:--my-var)',
+
+        'mask-linear-from-[-25%]',
+        'mask-linear-from-[25%]/foo',
+        'mask-linear-from-[-25%]/foo',
+        '-mask-linear-from-[-25%]',
+        '-mask-linear-from-[25%]/foo',
+        '-mask-linear-from-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-linear-to', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-linear-to-0',
+        'mask-linear-to-1.5',
+        'mask-linear-to-2',
+        'mask-linear-to-0%',
+        'mask-linear-to-2%',
+        'mask-linear-to-[0px]',
+        'mask-linear-to-[0%]',
+
+        'mask-linear-to-(--my-var)',
+        'mask-linear-to-(color:--my-var)',
+        'mask-linear-to-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-linear-position: 0deg;
+          --tw-mask-linear-from-position: 0%;
+          --tw-mask-linear-to-position: 100%;
+          --tw-mask-linear-from-color: black;
+          --tw-mask-linear-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-linear-to-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-to-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-to-\\(--my-var\\), .mask-linear-to-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-to-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-to-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-to-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-to-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-to-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-to-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-to-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-to-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-to-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-to-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-linear-to-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-linear-stops: var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position);
+      --tw-mask-linear: linear-gradient(var(--tw-mask-linear-stops));
+      --tw-mask-linear-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-linear-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0deg;
+    }
+
+    @property --tw-mask-linear-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-linear-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-linear-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-linear-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-linear-to',
+        'mask-linear-to-2.8175',
+        'mask-linear-to--1.5',
+        'mask-linear-to--2',
+
+        'mask-linear-to-2.5%',
+        'mask-linear-to--5%',
+        'mask-linear-to-unknown',
+        'mask-linear-to-unknown%',
+
+        '-mask-linear-to-0',
+        '-mask-linear-to-1.5',
+        '-mask-linear-to-2',
+        '-mask-linear-to-0%',
+        '-mask-linear-to-2%',
+        '-mask-linear-to-[0px]',
+        '-mask-linear-to-[0%]',
+
+        '-mask-linear-to-(--my-var)',
+        '-mask-linear-to-(color:--my-var)',
+        '-mask-linear-to-(length:--my-var)',
+
+        'mask-linear-to-[-25%]',
+        'mask-linear-to-[25%]/foo',
+        'mask-linear-to-[-25%]/foo',
+        '-mask-linear-to-[-25%]',
+        '-mask-linear-to-[25%]/foo',
+        '-mask-linear-to-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-radial', async () => {
+  expect(
+    await run([
+      'mask-circle',
+      'mask-ellipse',
+      'mask-radial-closest-side',
+      'mask-radial-farthest-side',
+      'mask-radial-closest-corner',
+      'mask-radial-farthest-corner',
+      'mask-radial-[25%_25%]',
+    ]),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-radial-from-position: 0%;
+          --tw-mask-radial-to-position: 100%;
+          --tw-mask-radial-from-color: black;
+          --tw-mask-radial-to-color: transparent;
+          --tw-mask-radial-shape: ellipse;
+          --tw-mask-radial-size: farthest-corner;
+          --tw-mask-radial-position: center;
+        }
+      }
+    }
+
+    .mask-radial-\\[25\\%_25\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops, var(--tw-mask-radial-size)));
+      --tw-mask-radial-size: 25% 25%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-circle {
+      --tw-mask-radial-shape: circle;
+    }
+
+    .mask-ellipse {
+      --tw-mask-radial-shape: ellipse;
+    }
+
+    .mask-radial-closest-corner {
+      --tw-mask-radial-size: closest-corner;
+    }
+
+    .mask-radial-closest-side {
+      --tw-mask-radial-size: closest-side;
+    }
+
+    .mask-radial-farthest-corner {
+      --tw-mask-radial-size: farthest-corner;
+    }
+
+    .mask-radial-farthest-side {
+      --tw-mask-radial-size: farthest-side;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-radial-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-radial-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-radial-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+
+    @property --tw-mask-radial-shape {
+      syntax: "*";
+      inherits: false;
+      initial-value: ellipse;
+    }
+
+    @property --tw-mask-radial-size {
+      syntax: "*";
+      inherits: false;
+      initial-value: farthest-corner;
+    }
+
+    @property --tw-mask-radial-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: center;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'mask-radial',
+      'mask-radial-[25%_25%]/foo',
+      'mask-radial/foo',
+      '-mask-radial',
+      '-mask-radial-[25%_25%]',
+      '-mask-radial/foo',
+      '-mask-radial-[25%_25%]/foo',
+
+      'mask-radial-from-[-25%]',
+      'mask-radial-from-[25%]/foo',
+      'mask-radial-from-[-25%]/foo',
+      '-mask-radial-from-[-25%]',
+      '-mask-radial-from-[25%]/foo',
+      '-mask-radial-from-[-25%]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('mask-radial-at', async () => {
+  expect(
+    await run(
+      [
+        'mask-radial-at-top',
+        'mask-radial-at-top-left',
+        'mask-radial-at-top-right',
+        'mask-radial-at-bottom',
+        'mask-radial-at-bottom-left',
+        'mask-radial-at-bottom-right',
+        'mask-radial-at-left',
+        'mask-radial-at-right',
+        'mask-radial-at-[25%]',
+      ],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    .mask-radial-at-\\[25\\%\\] {
+      --tw-mask-radial-position: 25%;
+    }
+
+    .mask-radial-at-bottom {
+      --tw-mask-radial-position: bottom;
+    }
+
+    .mask-radial-at-bottom-left {
+      --tw-mask-radial-position: bottom left;
+    }
+
+    .mask-radial-at-bottom-right {
+      --tw-mask-radial-position: bottom right;
+    }
+
+    .mask-radial-at-left {
+      --tw-mask-radial-position: left;
+    }
+
+    .mask-radial-at-right {
+      --tw-mask-radial-position: right;
+    }
+
+    .mask-radial-at-top {
+      --tw-mask-radial-position: top;
+    }
+
+    .mask-radial-at-top-left {
+      --tw-mask-radial-position: top left;
+    }
+
+    .mask-radial-at-top-right {
+      --tw-mask-radial-position: top right;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'mask-radial-at',
+      'mask-radial-at/foo',
+      'mask-radial-at-25',
+      'mask-radial-at-unknown',
+      'mask-radial-at-[25%]/foo',
+      'mask-radial-at-top/foo',
+      'mask-radial-at-top-left/foo',
+      'mask-radial-at-top-right/foo',
+      'mask-radial-at-bottom/foo',
+      'mask-radial-at-bottom-left/foo',
+      'mask-radial-at-bottom-right/foo',
+      'mask-radial-at-left/foo',
+      'mask-radial-at-right/foo',
+
+      '-mask-radial-at',
+      '-mask-radial-at/foo',
+      '-mask-radial-at-25',
+      '-mask-radial-at-unknown',
+      '-mask-radial-at-[25%]',
+      '-mask-radial-at-[25%]/foo',
+
+      '-mask-radial-at-top',
+      '-mask-radial-at-top-left',
+      '-mask-radial-at-top-right',
+      '-mask-radial-at-bottom',
+      '-mask-radial-at-bottom-left',
+      '-mask-radial-at-bottom-right',
+      '-mask-radial-at-left',
+      '-mask-radial-at-right',
+
+      'mask-radial-at-[25%]/foo',
+      'mask-radial-at-[-25%]/foo',
+      '-mask-radial-at-[-25%]',
+      '-mask-radial-at-[25%]/foo',
+      '-mask-radial-at-[-25%]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('mask-radial-from', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-radial-from-0',
+        'mask-radial-from-1.5',
+        'mask-radial-from-2',
+        'mask-radial-from-0%',
+        'mask-radial-from-2%',
+        'mask-radial-from-[0px]',
+        'mask-radial-from-[0%]',
+
+        'mask-radial-from-(--my-var)',
+        'mask-radial-from-(color:--my-var)',
+        'mask-radial-from-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-radial-from-position: 0%;
+          --tw-mask-radial-to-position: 100%;
+          --tw-mask-radial-from-color: black;
+          --tw-mask-radial-to-color: transparent;
+          --tw-mask-radial-shape: ellipse;
+          --tw-mask-radial-size: farthest-corner;
+          --tw-mask-radial-position: center;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-radial-from-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-from-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-from-\\(--my-var\\), .mask-radial-from-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-from-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-from-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-from-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-from-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-from-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-from-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-from-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-from-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-from-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-from-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-from-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-radial-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-radial-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-radial-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+
+    @property --tw-mask-radial-shape {
+      syntax: "*";
+      inherits: false;
+      initial-value: ellipse;
+    }
+
+    @property --tw-mask-radial-size {
+      syntax: "*";
+      inherits: false;
+      initial-value: farthest-corner;
+    }
+
+    @property --tw-mask-radial-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: center;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-radial-from',
+        'mask-radial-from-2.8175',
+        'mask-radial-from--1.5',
+        'mask-radial-from--2',
+
+        'mask-radial-from-2.5%',
+        'mask-radial-from--5%',
+        'mask-radial-from-unknown',
+        'mask-radial-from-unknown%',
+
+        '-mask-radial-from-0',
+        '-mask-radial-from-1.5',
+        '-mask-radial-from-2',
+        '-mask-radial-from-0%',
+        '-mask-radial-from-2%',
+        '-mask-radial-from-[0px]',
+        '-mask-radial-from-[0%]',
+
+        '-mask-radial-from-(--my-var)',
+        '-mask-radial-from-(color:--my-var)',
+        '-mask-radial-from-(length:--my-var)',
+
+        'mask-radial-from-[-25%]',
+        'mask-radial-from-[25%]/foo',
+        'mask-radial-from-[-25%]/foo',
+        '-mask-radial-from-[-25%]',
+        '-mask-radial-from-[25%]/foo',
+        '-mask-radial-from-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-radial-to', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-radial-to-0',
+        'mask-radial-to-1.5',
+        'mask-radial-to-2',
+        'mask-radial-to-0%',
+        'mask-radial-to-2%',
+        'mask-radial-to-[0px]',
+        'mask-radial-to-[0%]',
+
+        'mask-radial-to-(--my-var)',
+        'mask-radial-to-(color:--my-var)',
+        'mask-radial-to-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-radial-from-position: 0%;
+          --tw-mask-radial-to-position: 100%;
+          --tw-mask-radial-from-color: black;
+          --tw-mask-radial-to-color: transparent;
+          --tw-mask-radial-shape: ellipse;
+          --tw-mask-radial-size: farthest-corner;
+          --tw-mask-radial-position: center;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-radial-to-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-to-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-to-\\(--my-var\\), .mask-radial-to-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-to-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-to-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-to-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-to-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-to-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-to-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-to-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-to-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-to-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-to-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-radial-to-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-radial-stops: var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position);
+      --tw-mask-radial: radial-gradient(var(--tw-mask-radial-stops));
+      --tw-mask-radial-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-radial-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-radial-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-radial-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+
+    @property --tw-mask-radial-shape {
+      syntax: "*";
+      inherits: false;
+      initial-value: ellipse;
+    }
+
+    @property --tw-mask-radial-size {
+      syntax: "*";
+      inherits: false;
+      initial-value: farthest-corner;
+    }
+
+    @property --tw-mask-radial-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: center;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-radial-to',
+        'mask-radial-to-2.8175',
+        'mask-radial-to--1.5',
+        'mask-radial-to--2',
+
+        'mask-radial-to-2.5%',
+        'mask-radial-to--5%',
+        'mask-radial-to-unknown',
+        'mask-radial-to-unknown%',
+
+        '-mask-radial-to-0',
+        '-mask-radial-to-1.5',
+        '-mask-radial-to-2',
+        '-mask-radial-to-0%',
+        '-mask-radial-to-2%',
+        '-mask-radial-to-[0px]',
+        '-mask-radial-to-[0%]',
+
+        '-mask-radial-to-(--my-var)',
+        '-mask-radial-to-(color:--my-var)',
+        '-mask-radial-to-(length:--my-var)',
+
+        'mask-radial-to-[-25%]',
+        'mask-radial-to-[25%]/foo',
+        'mask-radial-to-[-25%]/foo',
+        '-mask-radial-to-[-25%]',
+        '-mask-radial-to-[25%]/foo',
+        '-mask-radial-to-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-conic', async () => {
+  expect(
+    await run([
+      'mask-conic-0',
+      'mask-conic-1',
+      '-mask-conic-1',
+      'mask-conic-45',
+      'mask-conic-[3rad]',
+      '-mask-conic-45',
+    ]),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-conic-position: 0deg;
+          --tw-mask-conic-from-position: 0%;
+          --tw-mask-conic-to-position: 100%;
+          --tw-mask-conic-from-color: black;
+          --tw-mask-conic-to-color: transparent;
+        }
+      }
+    }
+
+    .-mask-conic-1 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops, var(--tw-mask-conic-position)));
+      --tw-mask-conic-position: -1deg;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .-mask-conic-45 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops, var(--tw-mask-conic-position)));
+      --tw-mask-conic-position: calc(1deg * -45);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops, var(--tw-mask-conic-position)));
+      --tw-mask-conic-position: 0deg;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-1 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops, var(--tw-mask-conic-position)));
+      --tw-mask-conic-position: 1deg;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-45 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops, var(--tw-mask-conic-position)));
+      --tw-mask-conic-position: calc(1deg * 45);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-\\[3rad\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops, var(--tw-mask-conic-position)));
+      --tw-mask-conic-position: 171.887deg;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0deg;
+    }
+
+    @property --tw-mask-conic-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-conic-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-conic-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-conic-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'mask-conic',
+      '-mask-conic',
+
+      'mask-conic--75',
+      'mask-conic-unknown',
+      'mask-conic--75/foo',
+      'mask-conic-unknown/foo',
+
+      'mask-conic-45/foo',
+      '-mask-conic-45/foo',
+
+      'mask-conic-[3rad]/foo',
+      '-mask-conic-[3rad]/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('mask-conic-from', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-conic-from-0',
+        'mask-conic-from-1.5',
+        'mask-conic-from-2',
+        'mask-conic-from-0%',
+        'mask-conic-from-2%',
+        'mask-conic-from-[0px]',
+        'mask-conic-from-[0%]',
+
+        'mask-conic-from-(--my-var)',
+        'mask-conic-from-(color:--my-var)',
+        'mask-conic-from-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-conic-position: 0deg;
+          --tw-mask-conic-from-position: 0%;
+          --tw-mask-conic-to-position: 100%;
+          --tw-mask-conic-from-color: black;
+          --tw-mask-conic-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-conic-from-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-from-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-from-\\(--my-var\\), .mask-conic-from-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-from-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-from-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-from-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-from-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-from-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-from-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-from-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-from-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-from-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-from-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-from-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-from-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-from-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0deg;
+    }
+
+    @property --tw-mask-conic-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-conic-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-conic-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-conic-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-conic-from',
+        'mask-conic-from-2.8175',
+        'mask-conic-from--1.5',
+        'mask-conic-from--2',
+
+        'mask-conic-from-2.5%',
+        'mask-conic-from--5%',
+        'mask-conic-from-unknown',
+        'mask-conic-from-unknown%',
+
+        '-mask-conic-from-0',
+        '-mask-conic-from-1.5',
+        '-mask-conic-from-2',
+        '-mask-conic-from-0%',
+        '-mask-conic-from-2%',
+        '-mask-conic-from-[0px]',
+        '-mask-conic-from-[0%]',
+
+        '-mask-conic-from-(--my-var)',
+        '-mask-conic-from-(color:--my-var)',
+        '-mask-conic-from-(length:--my-var)',
+
+        'mask-conic-from-[-25%]',
+        'mask-conic-from-[25%]/foo',
+        'mask-conic-from-[-25%]/foo',
+        '-mask-conic-from-[-25%]',
+        '-mask-conic-from-[25%]/foo',
+        '-mask-conic-from-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
+test('mask-conic-to', async () => {
+  let input = css`
+    @theme {
+      --spacing: 0.25rem;
+    }
+    @tailwind utilities;
+  `
+
+  expect(
+    await run(
+      [
+        'mask-conic-to-0',
+        'mask-conic-to-1.5',
+        'mask-conic-to-2',
+        'mask-conic-to-0%',
+        'mask-conic-to-2%',
+        'mask-conic-to-[0px]',
+        'mask-conic-to-[0%]',
+
+        'mask-conic-to-(--my-var)',
+        'mask-conic-to-(color:--my-var)',
+        'mask-conic-to-(length:--my-var)',
+      ],
+      input,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-mask-linear: linear-gradient(#fff, #fff);
+          --tw-mask-radial: linear-gradient(#fff, #fff);
+          --tw-mask-conic: linear-gradient(#fff, #fff);
+          --tw-mask-conic-position: 0deg;
+          --tw-mask-conic-from-position: 0%;
+          --tw-mask-conic-to-position: 100%;
+          --tw-mask-conic-from-color: black;
+          --tw-mask-conic-to-color: transparent;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
+    }
+
+    .mask-conic-to-\\(color\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-to-color: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-to-\\(--my-var\\), .mask-conic-to-\\(length\\:--my-var\\) {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-to-position: var(--my-var);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-to-0 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-to-0\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-to-1\\.5 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-to-position: calc(var(--spacing) * 1.5);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-to-2 {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-to-position: calc(var(--spacing) * 2);
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-to-2\\% {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-to-position: 2%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-to-\\[0\\%\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-to-position: 0%;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    .mask-conic-to-\\[0px\\] {
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      -webkit-mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      mask-image: var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic);
+      --tw-mask-conic-stops: from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position);
+      --tw-mask-conic: conic-gradient(var(--tw-mask-conic-stops));
+      --tw-mask-conic-to-position: 0px;
+      -webkit-mask-composite: source-in;
+      -webkit-mask-composite: source-in;
+      mask-composite: intersect;
+    }
+
+    @property --tw-mask-linear {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-radial {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic {
+      syntax: "*";
+      inherits: false;
+      initial-value: linear-gradient(#fff, #fff);
+    }
+
+    @property --tw-mask-conic-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0deg;
+    }
+
+    @property --tw-mask-conic-from-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0%;
+    }
+
+    @property --tw-mask-conic-to-position {
+      syntax: "*";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-mask-conic-from-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: black;
+    }
+
+    @property --tw-mask-conic-to-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: transparent;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        'mask-conic-to',
+        'mask-conic-to-2.8175',
+        'mask-conic-to--1.5',
+        'mask-conic-to--2',
+
+        'mask-conic-to-2.5%',
+        'mask-conic-to--5%',
+        'mask-conic-to-unknown',
+        'mask-conic-to-unknown%',
+
+        '-mask-conic-to-0',
+        '-mask-conic-to-1.5',
+        '-mask-conic-to-2',
+        '-mask-conic-to-0%',
+        '-mask-conic-to-2%',
+        '-mask-conic-to-[0px]',
+        '-mask-conic-to-[0%]',
+
+        '-mask-conic-to-(--my-var)',
+        '-mask-conic-to-(color:--my-var)',
+        '-mask-conic-to-(length:--my-var)',
+
+        'mask-conic-to-[-25%]',
+        'mask-conic-to-[25%]/foo',
+        'mask-conic-to-[-25%]/foo',
+        '-mask-conic-to-[-25%]',
+        '-mask-conic-to-[25%]/foo',
+        '-mask-conic-to-[-25%]/foo',
+      ],
+      input,
+    ),
+  ).toEqual('')
+})
+
 test('box-decoration', async () => {
   expect(await run(['box-decoration-slice', 'box-decoration-clone'])).toMatchInlineSnapshot(`
-    ".box-decoration-clone {
+    "
+    .box-decoration-clone {
       -webkit-box-decoration-break: clone;
       box-decoration-break: clone;
     }
@@ -11795,7 +21439,8 @@ test('box-decoration', async () => {
     .box-decoration-slice {
       -webkit-box-decoration-break: slice;
       box-decoration-break: slice;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -11812,7 +21457,8 @@ test('box-decoration', async () => {
 test('bg-clip', async () => {
   expect(await run(['bg-clip-border', 'bg-clip-padding', 'bg-clip-content', 'bg-clip-text']))
     .toMatchInlineSnapshot(`
-      ".bg-clip-border {
+      "
+      .bg-clip-border {
         background-clip: border-box;
       }
 
@@ -11827,7 +21473,8 @@ test('bg-clip', async () => {
       .bg-clip-text {
         -webkit-background-clip: text;
         background-clip: text;
-      }"
+      }
+      "
     `)
   expect(
     await run([
@@ -11847,18 +21494,20 @@ test('bg-clip', async () => {
 test('bg-origin', async () => {
   expect(await run(['bg-origin-border', 'bg-origin-padding', 'bg-origin-content']))
     .toMatchInlineSnapshot(`
-    ".bg-origin-border {
-      background-origin: border-box;
-    }
+      "
+      .bg-origin-border {
+        background-origin: border-box;
+      }
 
-    .bg-origin-content {
-      background-origin: content-box;
-    }
+      .bg-origin-content {
+        background-origin: content-box;
+      }
 
-    .bg-origin-padding {
-      background-origin: padding-box;
-    }"
-  `)
+      .bg-origin-padding {
+        background-origin: padding-box;
+      }
+      "
+    `)
   expect(
     await run([
       'bg-origin',
@@ -11872,6 +21521,138 @@ test('bg-origin', async () => {
   ).toEqual('')
 })
 
+test('mask-clip', async () => {
+  expect(
+    await run([
+      'mask-clip-border',
+      'mask-clip-padding',
+      'mask-clip-content',
+      'mask-clip-fill',
+      'mask-clip-stroke',
+      'mask-clip-view',
+      'mask-no-clip',
+    ]),
+  ).toMatchInlineSnapshot(`
+    "
+    .mask-clip-border {
+      -webkit-mask-clip: border-box;
+      mask-clip: border-box;
+    }
+
+    .mask-clip-content {
+      -webkit-mask-clip: content-box;
+      mask-clip: content-box;
+    }
+
+    .mask-clip-fill {
+      -webkit-mask-clip: fill-box;
+      mask-clip: fill-box;
+    }
+
+    .mask-clip-padding {
+      -webkit-mask-clip: padding-box;
+      mask-clip: padding-box;
+    }
+
+    .mask-clip-stroke {
+      -webkit-mask-clip: stroke-box;
+      mask-clip: stroke-box;
+    }
+
+    .mask-clip-view {
+      -webkit-mask-clip: view-box;
+      mask-clip: view-box;
+    }
+
+    .mask-no-clip {
+      -webkit-mask-clip: no-clip;
+      mask-clip: no-clip;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'mask-clip',
+      '-mask-clip-border',
+      '-mask-clip-padding',
+      '-mask-clip-content',
+      '-mask-clip-fill',
+      '-mask-clip-stroke',
+      '-mask-clip-view',
+      '-mask-no-clip',
+      'mask-clip-border/foo',
+      'mask-clip-padding/foo',
+      'mask-clip-content/foo',
+      'mask-clip-fill/foo',
+      'mask-clip-stroke/foo',
+      'mask-clip-view/foo',
+      'mask-no-clip/foo',
+    ]),
+  ).toEqual('')
+})
+
+test('mask-origin', async () => {
+  expect(
+    await run([
+      'mask-origin-border',
+      'mask-origin-padding',
+      'mask-origin-content',
+      'mask-origin-fill',
+      'mask-origin-stroke',
+      'mask-origin-view',
+    ]),
+  ).toMatchInlineSnapshot(`
+    "
+    .mask-origin-border {
+      -webkit-mask-origin: border-box;
+      mask-origin: border-box;
+    }
+
+    .mask-origin-content {
+      -webkit-mask-origin: content-box;
+      mask-origin: content-box;
+    }
+
+    .mask-origin-fill {
+      -webkit-mask-origin: fill-box;
+      mask-origin: fill-box;
+    }
+
+    .mask-origin-padding {
+      -webkit-mask-origin: padding-box;
+      mask-origin: padding-box;
+    }
+
+    .mask-origin-stroke {
+      -webkit-mask-origin: stroke-box;
+      mask-origin: stroke-box;
+    }
+
+    .mask-origin-view {
+      -webkit-mask-origin: view-box;
+      mask-origin: view-box;
+    }
+    "
+  `)
+  expect(
+    await run([
+      'mask-origin',
+      '-mask-origin-border',
+      '-mask-origin-padding',
+      '-mask-origin-content',
+      '-mask-origin-fill',
+      '-mask-origin-stroke',
+      '-mask-origin-view',
+      'mask-origin-border/foo',
+      'mask-origin-padding/foo',
+      'mask-origin-content/foo',
+      'mask-origin-fill/foo',
+      'mask-origin-stroke/foo',
+      'mask-origin-view/foo',
+    ]),
+  ).toEqual('')
+})
+
 test('bg-blend', async () => {
   expect(
     await run([
@@ -11893,7 +21674,8 @@ test('bg-blend', async () => {
       'bg-blend-luminosity',
     ]),
   ).toMatchInlineSnapshot(`
-    ".bg-blend-color {
+    "
+    .bg-blend-color {
       background-blend-mode: color;
     }
 
@@ -11955,7 +21737,8 @@ test('bg-blend', async () => {
 
     .bg-blend-soft-light {
       background-blend-mode: soft-light;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -12019,7 +21802,8 @@ test('mix-blend', async () => {
       'mix-blend-plus-lighter',
     ]),
   ).toMatchInlineSnapshot(`
-    ".mix-blend-color {
+    "
+    .mix-blend-color {
       mix-blend-mode: color;
     }
 
@@ -12089,7 +21873,8 @@ test('mix-blend', async () => {
 
     .mix-blend-soft-light {
       mix-blend-mode: soft-light;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -12135,13 +21920,7 @@ test('mix-blend', async () => {
 
 test('fill', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'fill-red-500',
         'fill-red-500/50',
@@ -12150,6 +21929,7 @@ test('fill', async () => {
         'fill-red-500/2.75',
         'fill-red-500/[0.5]',
         'fill-red-500/[50%]',
+        'fill-blue-500',
         'fill-current',
         'fill-current/50',
         'fill-current/[0.5]',
@@ -12161,10 +21941,19 @@ test('fill', async () => {
         'fill-[#0088cc]/[0.5]',
         'fill-[#0088cc]/[50%]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+          --fill-blue-500: #3b82f6;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --color-red-500: #ef4444;
+      --fill-blue-500: #3b82f6;
     }
 
     .fill-\\[\\#0088cc\\] {
@@ -12172,15 +21961,41 @@ test('fill', async () => {
     }
 
     .fill-\\[\\#0088cc\\]\\/50, .fill-\\[\\#0088cc\\]\\/\\[0\\.5\\], .fill-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      fill: oklab(59.9824% -.06725 -.12414 / .5);
+      fill: oklab(59.9824% -.067 -.124 / .5);
     }
 
-    .fill-current {
+    .fill-blue-500 {
+      fill: var(--fill-blue-500);
+    }
+
+    .fill-current, .fill-current\\/50 {
       fill: currentColor;
     }
 
-    .fill-current\\/50, .fill-current\\/\\[0\\.5\\], .fill-current\\/\\[50\\%\\] {
-      fill: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .fill-current\\/50 {
+        fill: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .fill-current\\/\\[0\\.5\\] {
+      fill: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .fill-current\\/\\[0\\.5\\] {
+        fill: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .fill-current\\/\\[50\\%\\] {
+      fill: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .fill-current\\/\\[50\\%\\] {
+        fill: color-mix(in oklab, currentcolor 50%, transparent);
+      }
     }
 
     .fill-inherit {
@@ -12192,24 +22007,69 @@ test('fill', async () => {
     }
 
     .fill-red-500\\/2\\.5 {
-      fill: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      fill: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .fill-red-500\\/2\\.5 {
+        fill: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      }
     }
 
     .fill-red-500\\/2\\.25 {
-      fill: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      fill: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .fill-red-500\\/2\\.25 {
+        fill: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      }
     }
 
     .fill-red-500\\/2\\.75 {
-      fill: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      fill: #ef444407;
     }
 
-    .fill-red-500\\/50, .fill-red-500\\/\\[0\\.5\\], .fill-red-500\\/\\[50\\%\\] {
-      fill: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .fill-red-500\\/2\\.75 {
+        fill: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      }
+    }
+
+    .fill-red-500\\/50 {
+      fill: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .fill-red-500\\/50 {
+        fill: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .fill-red-500\\/\\[0\\.5\\] {
+      fill: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .fill-red-500\\/\\[0\\.5\\] {
+        fill: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .fill-red-500\\/\\[50\\%\\] {
+      fill: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .fill-red-500\\/\\[50\\%\\] {
+        fill: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
     }
 
     .fill-transparent {
       fill: #0000;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -12235,13 +22095,7 @@ test('fill', async () => {
 
 test('stroke', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         // Color
         'stroke-red-500',
@@ -12251,6 +22105,7 @@ test('stroke', async () => {
         'stroke-red-500/2.75',
         'stroke-red-500/[0.5]',
         'stroke-red-500/[50%]',
+        'stroke-blue-500',
         'stroke-current',
         'stroke-current/50',
         'stroke-current/[0.5]',
@@ -12282,10 +22137,19 @@ test('stroke', async () => {
         'stroke-[length:var(--my-width)]',
         'stroke-[percentage:var(--my-width)]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+          --stroke-blue-500: #3b82f6;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --color-red-500: #ef4444;
+      --stroke-blue-500: #3b82f6;
     }
 
     .stroke-\\[\\#0088cc\\] {
@@ -12293,31 +22157,101 @@ test('stroke', async () => {
     }
 
     .stroke-\\[\\#0088cc\\]\\/50, .stroke-\\[\\#0088cc\\]\\/\\[0\\.5\\], .stroke-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      stroke: oklab(59.9824% -.06725 -.12414 / .5);
+      stroke: oklab(59.9824% -.067 -.124 / .5);
     }
 
-    .stroke-\\[color\\:var\\(--my-color\\)\\] {
+    .stroke-\\[color\\:var\\(--my-color\\)\\], .stroke-\\[color\\:var\\(--my-color\\)\\]\\/50 {
       stroke: var(--my-color);
     }
 
-    .stroke-\\[color\\:var\\(--my-color\\)\\]\\/50, .stroke-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\], .stroke-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      stroke: color-mix(in oklab, var(--my-color) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+        stroke: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
     }
 
-    .stroke-\\[var\\(--my-color\\)\\] {
+    .stroke-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
       stroke: var(--my-color);
     }
 
-    .stroke-\\[var\\(--my-color\\)\\]\\/50, .stroke-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\], .stroke-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      stroke: color-mix(in oklab, var(--my-color) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        stroke: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
     }
 
-    .stroke-current {
+    .stroke-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      stroke: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        stroke: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .stroke-\\[var\\(--my-color\\)\\], .stroke-\\[var\\(--my-color\\)\\]\\/50 {
+      stroke: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-\\[var\\(--my-color\\)\\]\\/50 {
+        stroke: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .stroke-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      stroke: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        stroke: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .stroke-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      stroke: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        stroke: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .stroke-blue-500 {
+      stroke: var(--stroke-blue-500);
+    }
+
+    .stroke-current, .stroke-current\\/50 {
       stroke: currentColor;
     }
 
-    .stroke-current\\/50, .stroke-current\\/\\[0\\.5\\], .stroke-current\\/\\[50\\%\\] {
-      stroke: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-current\\/50 {
+        stroke: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .stroke-current\\/\\[0\\.5\\] {
+      stroke: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-current\\/\\[0\\.5\\] {
+        stroke: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .stroke-current\\/\\[50\\%\\] {
+      stroke: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-current\\/\\[50\\%\\] {
+        stroke: color-mix(in oklab, currentcolor 50%, transparent);
+      }
     }
 
     .stroke-inherit {
@@ -12333,19 +22267,63 @@ test('stroke', async () => {
     }
 
     .stroke-red-500\\/2\\.5 {
-      stroke: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      stroke: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-red-500\\/2\\.5 {
+        stroke: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      }
     }
 
     .stroke-red-500\\/2\\.25 {
-      stroke: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      stroke: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-red-500\\/2\\.25 {
+        stroke: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      }
     }
 
     .stroke-red-500\\/2\\.75 {
-      stroke: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      stroke: #ef444407;
     }
 
-    .stroke-red-500\\/50, .stroke-red-500\\/\\[0\\.5\\], .stroke-red-500\\/\\[50\\%\\] {
-      stroke: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-red-500\\/2\\.75 {
+        stroke: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      }
+    }
+
+    .stroke-red-500\\/50 {
+      stroke: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-red-500\\/50 {
+        stroke: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .stroke-red-500\\/\\[0\\.5\\] {
+      stroke: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-red-500\\/\\[0\\.5\\] {
+        stroke: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .stroke-red-500\\/\\[50\\%\\] {
+      stroke: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .stroke-red-500\\/\\[50\\%\\] {
+        stroke: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
     }
 
     .stroke-transparent {
@@ -12378,7 +22356,8 @@ test('stroke', async () => {
 
     .stroke-\\[length\\:var\\(--my-width\\)\\], .stroke-\\[number\\:var\\(--my-width\\)\\], .stroke-\\[percentage\\:var\\(--my-width\\)\\] {
       stroke-width: var(--my-width);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -12404,6 +22383,11 @@ test('stroke', async () => {
       // Width
       '-stroke-0',
       'stroke--1',
+      'stroke-0/foo',
+      'stroke-1/50',
+      'stroke-2/[0.5]',
+      'stroke-2/(--my-opacity)',
+      'stroke-[12px]/foo',
     ]),
   ).toEqual('')
 })
@@ -12420,18 +22404,25 @@ test('object', async () => {
 
       // object-position
       'object-[var(--value)]',
+      'object-top',
+      'object-top-left',
+      'object-top-right',
       'object-bottom',
-      'object-center',
+      'object-bottom-left',
+      'object-bottom-right',
       'object-left',
+      'object-right',
+      'object-center',
+
+      // Legacy versions in v4.0 and earlier
       'object-left-bottom',
       'object-left-top',
-      'object-right',
       'object-right-bottom',
       'object-right-top',
-      'object-top',
     ]),
   ).toMatchInlineSnapshot(`
-    ".object-contain {
+    "
+    .object-contain {
       object-fit: contain;
     }
 
@@ -12459,6 +22450,14 @@ test('object', async () => {
       object-position: bottom;
     }
 
+    .object-bottom-left {
+      object-position: left bottom;
+    }
+
+    .object-bottom-right {
+      object-position: right bottom;
+    }
+
     .object-center {
       object-position: center;
     }
@@ -12489,7 +22488,16 @@ test('object', async () => {
 
     .object-top {
       object-position: top;
-    }"
+    }
+
+    .object-top-left {
+      object-position: left top;
+    }
+
+    .object-top-right {
+      object-position: right top;
+    }
+    "
   `)
   expect(
     await run([
@@ -12522,11 +22530,34 @@ test('object', async () => {
       'object-top/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['object-center'],
+      css`
+        @theme {
+          --object-position-center: top left;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --object-position-center: top left;
+    }
+
+    .object-center {
+      object-position: var(--object-position-center);
+    }
+    "
+  `)
 })
 
 test('p', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['p-1', 'p-4', 'p-99', 'p-big', 'p-[4px]'],
       css`
         @theme {
           --spacing: 0.25rem;
@@ -12534,16 +22565,16 @@ test('p', async () => {
         }
         @tailwind utilities;
       `,
-      ['p-1', 'p-4', 'p-99', 'p-big', 'p-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
 
     .p-1 {
-      padding: calc(var(--spacing) * 1);
+      padding: var(--spacing);
     }
 
     .p-4 {
@@ -12560,14 +22591,16 @@ test('p', async () => {
 
     .p-big {
       padding: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(await run(['p', '-p-4', '-p-[4px]', 'p-4/foo', 'p-[4px]/foo'])).toEqual('')
 })
 
 test('px', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['px-1', 'px-99', 'px-2.5', 'px-big', 'px-[4px]'],
       css`
         @theme {
           --spacing: 0.25rem;
@@ -12575,16 +22608,16 @@ test('px', async () => {
         }
         @tailwind utilities;
       `,
-      ['px-1', 'px-99', 'px-2.5', 'px-big', 'px-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
 
     .px-1 {
-      padding-inline: calc(var(--spacing) * 1);
+      padding-inline: var(--spacing);
     }
 
     .px-2\\.5 {
@@ -12601,14 +22634,16 @@ test('px', async () => {
 
     .px-big {
       padding-inline: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(await run(['px', '-px-4', '-px-[4px]', 'px-4/foo', 'px-[4px]/foo'])).toEqual('')
 })
 
 test('py', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['py-1', 'py-4', 'py-99', 'py-big', 'py-[4px]'],
       css`
         @theme {
           --spacing: 0.25rem;
@@ -12616,16 +22651,16 @@ test('py', async () => {
         }
         @tailwind utilities;
       `,
-      ['py-1', 'py-4', 'py-99', 'py-big', 'py-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
 
     .py-1 {
-      padding-block: calc(var(--spacing) * 1);
+      padding-block: var(--spacing);
     }
 
     .py-4 {
@@ -12642,14 +22677,16 @@ test('py', async () => {
 
     .py-big {
       padding-block: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(await run(['py', '-py-4', '-py-[4px]', 'py-4/foo', 'py-[4px]/foo'])).toEqual('')
 })
 
 test('pt', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['pt-1', 'pt-4', 'pt-99', 'pt-big', 'pt-[4px]'],
       css`
         @theme {
           --spacing: 0.25rem;
@@ -12657,16 +22694,16 @@ test('pt', async () => {
         }
         @tailwind utilities;
       `,
-      ['pt-1', 'pt-4', 'pt-99', 'pt-big', 'pt-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
 
     .pt-1 {
-      padding-top: calc(var(--spacing) * 1);
+      padding-top: var(--spacing);
     }
 
     .pt-4 {
@@ -12683,14 +22720,16 @@ test('pt', async () => {
 
     .pt-big {
       padding-top: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(await run(['pt', '-pt-4', '-pt-[4px]', 'pt-4/foo', 'pt-[4px]/foo'])).toEqual('')
 })
 
 test('ps', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['ps-1', 'ps-4', 'ps-99', 'ps-big', 'ps-[4px]'],
       css`
         @theme {
           --spacing: 0.25rem;
@@ -12698,16 +22737,16 @@ test('ps', async () => {
         }
         @tailwind utilities;
       `,
-      ['ps-1', 'ps-4', 'ps-99', 'ps-big', 'ps-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
 
     .ps-1 {
-      padding-inline-start: calc(var(--spacing) * 1);
+      padding-inline-start: var(--spacing);
     }
 
     .ps-4 {
@@ -12724,14 +22763,16 @@ test('ps', async () => {
 
     .ps-big {
       padding-inline-start: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(await run(['ps', '-ps-4', '-ps-[4px]', 'ps-4/foo', 'ps-[4px]/foo'])).toEqual('')
 })
 
 test('pe', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['pe-1', 'pe-4', 'pe-99', 'pe-big', 'pe-[4px]'],
       css`
         @theme {
           --spacing: 0.25rem;
@@ -12739,16 +22780,16 @@ test('pe', async () => {
         }
         @tailwind utilities;
       `,
-      ['pe-1', 'pe-4', 'pe-99', 'pe-big', 'pe-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
 
     .pe-1 {
-      padding-inline-end: calc(var(--spacing) * 1);
+      padding-inline-end: var(--spacing);
     }
 
     .pe-4 {
@@ -12765,14 +22806,16 @@ test('pe', async () => {
 
     .pe-big {
       padding-inline-end: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(await run(['pe', '-pe-4', '-pe-[4px]', 'pe-4/foo', 'pe-[4px]/foo'])).toEqual('')
 })
 
-test('pr', async () => {
+test('pbs', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['pbs-1', 'pbs-4', 'pbs-99', 'pbs-big', 'pbs-[4px]'],
       css`
         @theme {
           --spacing: 0.25rem;
@@ -12780,16 +22823,102 @@ test('pr', async () => {
         }
         @tailwind utilities;
       `,
-      ['pr-1', 'pr-4', 'pr-99', 'pr-big', 'pr-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
+      --spacing: .25rem;
+      --spacing-big: 100rem;
+    }
+
+    .pbs-1 {
+      padding-block-start: var(--spacing);
+    }
+
+    .pbs-4 {
+      padding-block-start: calc(var(--spacing) * 4);
+    }
+
+    .pbs-99 {
+      padding-block-start: calc(var(--spacing) * 99);
+    }
+
+    .pbs-\\[4px\\] {
+      padding-block-start: 4px;
+    }
+
+    .pbs-big {
+      padding-block-start: var(--spacing-big);
+    }
+    "
+  `)
+  expect(await run(['pbs', '-pbs-4', '-pbs-[4px]', 'pbs-4/foo', 'pbs-[4px]/foo'])).toEqual('')
+})
+
+test('pbe', async () => {
+  expect(
+    await run(
+      ['pbe-1', 'pbe-4', 'pbe-99', 'pbe-big', 'pbe-[4px]'],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --spacing-big: 100rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --spacing: .25rem;
+      --spacing-big: 100rem;
+    }
+
+    .pbe-1 {
+      padding-block-end: var(--spacing);
+    }
+
+    .pbe-4 {
+      padding-block-end: calc(var(--spacing) * 4);
+    }
+
+    .pbe-99 {
+      padding-block-end: calc(var(--spacing) * 99);
+    }
+
+    .pbe-\\[4px\\] {
+      padding-block-end: 4px;
+    }
+
+    .pbe-big {
+      padding-block-end: var(--spacing-big);
+    }
+    "
+  `)
+  expect(await run(['pbe', '-pbe-4', '-pbe-[4px]', 'pbe-4/foo', 'pbe-[4px]/foo'])).toEqual('')
+})
+
+test('pr', async () => {
+  expect(
+    await run(
+      ['pr-1', 'pr-4', 'pr-99', 'pr-big', 'pr-[4px]'],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --spacing-big: 100rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
 
     .pr-1 {
-      padding-right: calc(var(--spacing) * 1);
+      padding-right: var(--spacing);
     }
 
     .pr-4 {
@@ -12806,14 +22935,16 @@ test('pr', async () => {
 
     .pr-big {
       padding-right: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(await run(['pr', '-pr-4', '-pr-[4px]', 'pr-4/foo', 'pr-[4px]/foo'])).toEqual('')
 })
 
 test('pb', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['pb-1', 'pb-4', 'pb-99', 'pb-big', 'pb-[4px]'],
       css`
         @theme {
           --spacing: 0.25rem;
@@ -12821,16 +22952,16 @@ test('pb', async () => {
         }
         @tailwind utilities;
       `,
-      ['pb-1', 'pb-4', 'pb-99', 'pb-big', 'pb-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
 
     .pb-1 {
-      padding-bottom: calc(var(--spacing) * 1);
+      padding-bottom: var(--spacing);
     }
 
     .pb-4 {
@@ -12847,14 +22978,16 @@ test('pb', async () => {
 
     .pb-big {
       padding-bottom: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(await run(['pb', '-pb-4', '-pb-[4px]', 'pb-4/foo', 'pb-[4px]/foo'])).toEqual('')
 })
 
 test('pl', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['pl-1', 'pl-4', 'pl-99', 'pl-big', 'pl-[4px]'],
       css`
         @theme {
           --spacing: 0.25rem;
@@ -12862,16 +22995,16 @@ test('pl', async () => {
         }
         @tailwind utilities;
       `,
-      ['pl-1', 'pl-4', 'pl-99', 'pl-big', 'pl-[4px]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --spacing-big: 100rem;
     }
 
     .pl-1 {
-      padding-left: calc(var(--spacing) * 1);
+      padding-left: var(--spacing);
     }
 
     .pl-4 {
@@ -12888,7 +23021,8 @@ test('pl', async () => {
 
     .pl-big {
       padding-left: var(--spacing-big);
-    }"
+    }
+    "
   `)
   expect(await run(['pl', '-pl-4', '-pl-[4px]', 'pl-4/foo', 'pl-[4px]/foo'])).toEqual('')
 })
@@ -12897,7 +23031,8 @@ test('text-align', async () => {
   expect(
     await run(['text-left', 'text-center', 'text-right', 'text-justify', 'text-start', 'text-end']),
   ).toMatchInlineSnapshot(`
-    ".text-center {
+    "
+    .text-center {
       text-align: center;
     }
 
@@ -12919,7 +23054,8 @@ test('text-align', async () => {
 
     .text-start {
       text-align: start;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -12941,13 +23077,15 @@ test('text-align', async () => {
 
 test('indent', async () => {
   expect(await run(['indent-[4px]', '-indent-[4px]'])).toMatchInlineSnapshot(`
-    ".-indent-\\[4px\\] {
+    "
+    .-indent-\\[4px\\] {
       text-indent: -4px;
     }
 
     .indent-\\[4px\\] {
       text-indent: 4px;
-    }"
+    }
+    "
   `)
   expect(await run(['indent', 'indent-[4px]/foo', '-indent-[4px]/foo'])).toEqual('')
 })
@@ -12967,7 +23105,8 @@ test('align', async () => {
       'align-[var(--value)]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".align-\\[var\\(--value\\)\\] {
+    "
+    .align-\\[var\\(--value\\)\\] {
       vertical-align: var(--value);
     }
 
@@ -13001,7 +23140,8 @@ test('align', async () => {
 
     .align-top {
       vertical-align: top;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -13032,15 +23172,7 @@ test('align', async () => {
 
 test('font', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --font-sans: ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
-            'Segoe UI Symbol', 'Noto Color Emoji';
-          --font-weight-bold: 650;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         // font-family
         'font-sans',
@@ -13055,10 +23187,29 @@ test('font', async () => {
         'font-[100]',
         'font-[number:var(--my-weight)]',
       ],
+      css`
+        @theme {
+          --font-sans:
+            ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+            'Segoe UI Symbol', 'Noto Color Emoji';
+          --font-weight-bold: 650;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --font-sans: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-font-weight: initial;
+        }
+      }
+    }
+
+    :root, :host {
+      --font-sans: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
+                "Segoe UI Symbol", "Noto Color Emoji";
       --font-weight-bold: 650;
     }
 
@@ -13098,29 +23249,14 @@ test('font', async () => {
       font-weight: var(--font-weight-bold);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-font-weight: initial;
-        }
-      }
-    }
-
     @property --tw-font-weight {
       syntax: "*";
       inherits: false
-    }"
+    }
+    "
   `)
   expect(
-    await compileCss(
-      css`
-        @theme reference {
-          --font-sans: ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
-            'Segoe UI Symbol', 'Noto Color Emoji';
-          --font-weight-bold: 650;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'font',
         // font-family
@@ -13140,13 +23276,60 @@ test('font', async () => {
         'font-[100]/foo',
         'font-[number:var(--my-weight)]/foo',
       ],
+      css`
+        @theme reference {
+          --font-sans:
+            ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+            'Segoe UI Symbol', 'Noto Color Emoji';
+          --font-weight-bold: 650;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toEqual('')
 })
 
+test('font-features', async () => {
+  expect(
+    await run([
+      'font-features-["smcp"]',
+      'font-features-["c2sc","smcp"]',
+      'font-features-[var(--my-features)]',
+      'font-features-(--my-features)',
+    ]),
+  ).toMatchInlineSnapshot(`
+    "
+    .font-features-\\(--my-features\\) {
+      font-feature-settings: var(--my-features);
+    }
+
+    .font-features-\\[\\"c2sc\\"\\,\\"smcp\\"\\] {
+      font-feature-settings: "c2sc","smcp";
+    }
+
+    .font-features-\\[\\"smcp\\"\\] {
+      font-feature-settings: "smcp";
+    }
+
+    .font-features-\\[var\\(--my-features\\)\\] {
+      font-feature-settings: var(--my-features);
+    }
+    "
+  `)
+  expect(
+    await run([
+      'font-features',
+      '-font-features-["smcp"]',
+      'font-features-smcp',
+      'font-features-["smcp"]/foo',
+    ]),
+  ).toEqual('')
+})
+
 test('text-transform', async () => {
   expect(await run(['uppercase', 'lowercase', 'capitalize', 'normal-case'])).toMatchInlineSnapshot(`
-    ".capitalize {
+    "
+    .capitalize {
       text-transform: capitalize;
     }
 
@@ -13160,7 +23343,8 @@ test('text-transform', async () => {
 
     .uppercase {
       text-transform: uppercase;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -13178,13 +23362,15 @@ test('text-transform', async () => {
 
 test('font-style', async () => {
   expect(await run(['italic', 'not-italic'])).toMatchInlineSnapshot(`
-    ".italic {
+    "
+    .italic {
       font-style: italic;
     }
 
     .not-italic {
       font-style: normal;
-    }"
+    }
+    "
   `)
   expect(await run(['-italic', '-not-italic', 'italic/foo', 'not-italic/foo'])).toEqual('')
 })
@@ -13192,7 +23378,8 @@ test('font-style', async () => {
 test('font-stretch', async () => {
   expect(await run(['font-stretch-ultra-expanded', 'font-stretch-50%', 'font-stretch-200%']))
     .toMatchInlineSnapshot(`
-      ".font-stretch-50\\% {
+      "
+      .font-stretch-50\\% {
         font-stretch: 50%;
       }
 
@@ -13202,7 +23389,8 @@ test('font-stretch', async () => {
 
       .font-stretch-ultra-expanded {
         font-stretch: ultra-expanded;
-      }"
+      }
+      "
     `)
   expect(
     await run([
@@ -13222,22 +23410,24 @@ test('font-stretch', async () => {
 test('text-decoration-line', async () => {
   expect(await run(['underline', 'overline', 'line-through', 'no-underline']))
     .toMatchInlineSnapshot(`
-    ".line-through {
-      text-decoration-line: line-through;
-    }
+      "
+      .line-through {
+        text-decoration-line: line-through;
+      }
 
-    .no-underline {
-      text-decoration-line: none;
-    }
+      .no-underline {
+        text-decoration-line: none;
+      }
 
-    .overline {
-      text-decoration-line: overline;
-    }
+      .overline {
+        text-decoration-line: overline;
+      }
 
-    .underline {
-      text-decoration-line: underline;
-    }"
-  `)
+      .underline {
+        text-decoration-line: underline;
+      }
+      "
+    `)
   expect(
     await run([
       '-underline',
@@ -13254,13 +23444,7 @@ test('text-decoration-line', async () => {
 
 test('placeholder', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'placeholder-red-500',
         'placeholder-red-500/50',
@@ -13280,9 +23464,16 @@ test('placeholder', async () => {
         'placeholder-[#0088cc]/[0.5]',
         'placeholder-[#0088cc]/[50%]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --color-red-500: #ef4444;
     }
 
@@ -13291,15 +23482,37 @@ test('placeholder', async () => {
     }
 
     .placeholder-\\[\\#0088cc\\]\\/50::placeholder, .placeholder-\\[\\#0088cc\\]\\/\\[0\\.5\\]::placeholder, .placeholder-\\[\\#0088cc\\]\\/\\[50\\%\\]::placeholder {
-      color: oklab(59.9824% -.06725 -.12414 / .5);
+      color: oklab(59.9824% -.067 -.124 / .5);
     }
 
-    .placeholder-current::placeholder {
+    .placeholder-current::placeholder, .placeholder-current\\/50::placeholder {
       color: currentColor;
     }
 
-    .placeholder-current\\/50::placeholder, .placeholder-current\\/\\[0\\.5\\]::placeholder, .placeholder-current\\/\\[50\\%\\]::placeholder {
-      color: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .placeholder-current\\/50::placeholder {
+        color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .placeholder-current\\/\\[0\\.5\\]::placeholder {
+      color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .placeholder-current\\/\\[0\\.5\\]::placeholder {
+        color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .placeholder-current\\/\\[50\\%\\]::placeholder {
+      color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .placeholder-current\\/\\[50\\%\\]::placeholder {
+        color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
     }
 
     .placeholder-inherit::placeholder {
@@ -13311,24 +23524,69 @@ test('placeholder', async () => {
     }
 
     .placeholder-red-500\\/2\\.5::placeholder {
-      color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .placeholder-red-500\\/2\\.5::placeholder {
+        color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      }
     }
 
     .placeholder-red-500\\/2\\.25::placeholder {
-      color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .placeholder-red-500\\/2\\.25::placeholder {
+        color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      }
     }
 
     .placeholder-red-500\\/2\\.75::placeholder {
-      color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      color: #ef444407;
     }
 
-    .placeholder-red-500\\/50::placeholder, .placeholder-red-500\\/\\[0\\.5\\]::placeholder, .placeholder-red-500\\/\\[50\\%\\]::placeholder {
-      color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .placeholder-red-500\\/2\\.75::placeholder {
+        color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      }
+    }
+
+    .placeholder-red-500\\/50::placeholder {
+      color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .placeholder-red-500\\/50::placeholder {
+        color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .placeholder-red-500\\/\\[0\\.5\\]::placeholder {
+      color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .placeholder-red-500\\/\\[0\\.5\\]::placeholder {
+        color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .placeholder-red-500\\/\\[50\\%\\]::placeholder {
+      color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .placeholder-red-500\\/\\[50\\%\\]::placeholder {
+        color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
     }
 
     .placeholder-transparent::placeholder {
       color: #0000;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -13353,19 +23611,14 @@ test('placeholder', async () => {
 
 test('decoration', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         // text-decoration-color
         'decoration-red-500',
         'decoration-red-500/50',
         'decoration-red-500/[0.5]',
         'decoration-red-500/[50%]',
+        'decoration-blue-500',
         'decoration-current',
         'decoration-current/50',
         'decoration-current/[0.5]',
@@ -13405,10 +23658,19 @@ test('decoration', async () => {
         'decoration-[length:var(--my-thickness)]',
         'decoration-[percentage:var(--my-thickness)]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+          --text-decoration-color-blue-500: #3b82f6;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --color-red-500: #ef4444;
+      --text-decoration-color-blue-500: #3b82f6;
     }
 
     .decoration-\\[\\#0088cc\\] {
@@ -13416,41 +23678,133 @@ test('decoration', async () => {
     }
 
     .decoration-\\[\\#0088cc\\]\\/50, .decoration-\\[\\#0088cc\\]\\/\\[0\\.5\\], .decoration-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      text-decoration-color: oklab(59.9824% -.06725 -.12414 / .5);
+      text-decoration-color: oklab(59.9824% -.067 -.124 / .5);
     }
 
-    .decoration-\\[color\\:var\\(--my-color\\)\\] {
+    .decoration-\\[color\\:var\\(--my-color\\)\\], .decoration-\\[color\\:var\\(--my-color\\)\\]\\/50 {
       -webkit-text-decoration-color: var(--my-color);
       -webkit-text-decoration-color: var(--my-color);
       text-decoration-color: var(--my-color);
     }
 
-    .decoration-\\[color\\:var\\(--my-color\\)\\]\\/50, .decoration-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\], .decoration-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
-      -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
-      text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .decoration-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+        -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
     }
 
-    .decoration-\\[var\\(--my-color\\)\\] {
+    .decoration-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
       -webkit-text-decoration-color: var(--my-color);
       -webkit-text-decoration-color: var(--my-color);
       text-decoration-color: var(--my-color);
     }
 
-    .decoration-\\[var\\(--my-color\\)\\]\\/50, .decoration-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\], .decoration-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
-      -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
-      text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .decoration-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
     }
 
-    .decoration-current {
+    .decoration-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      -webkit-text-decoration-color: var(--my-color);
+      -webkit-text-decoration-color: var(--my-color);
+      text-decoration-color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .decoration-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .decoration-\\[var\\(--my-color\\)\\], .decoration-\\[var\\(--my-color\\)\\]\\/50 {
+      -webkit-text-decoration-color: var(--my-color);
+      -webkit-text-decoration-color: var(--my-color);
+      text-decoration-color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .decoration-\\[var\\(--my-color\\)\\]\\/50 {
+        -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .decoration-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      -webkit-text-decoration-color: var(--my-color);
+      -webkit-text-decoration-color: var(--my-color);
+      text-decoration-color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .decoration-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .decoration-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      -webkit-text-decoration-color: var(--my-color);
+      -webkit-text-decoration-color: var(--my-color);
+      text-decoration-color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .decoration-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        -webkit-text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+        text-decoration-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .decoration-blue-500 {
+      -webkit-text-decoration-color: var(--text-decoration-color-blue-500);
+      -webkit-text-decoration-color: var(--text-decoration-color-blue-500);
+      text-decoration-color: var(--text-decoration-color-blue-500);
+    }
+
+    .decoration-current, .decoration-current\\/50 {
       text-decoration-color: currentColor;
     }
 
-    .decoration-current\\/50, .decoration-current\\/\\[0\\.5\\], .decoration-current\\/\\[50\\%\\] {
-      -webkit-text-decoration-color: color-mix(in oklab, currentColor 50%, transparent);
-      -webkit-text-decoration-color: color-mix(in oklab, currentColor 50%, transparent);
-      text-decoration-color: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .decoration-current\\/50 {
+        -webkit-text-decoration-color: color-mix(in oklab, currentcolor 50%, transparent);
+        -webkit-text-decoration-color: color-mix(in oklab, currentcolor 50%, transparent);
+        text-decoration-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .decoration-current\\/\\[0\\.5\\] {
+      text-decoration-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .decoration-current\\/\\[0\\.5\\] {
+        -webkit-text-decoration-color: color-mix(in oklab, currentcolor 50%, transparent);
+        -webkit-text-decoration-color: color-mix(in oklab, currentcolor 50%, transparent);
+        text-decoration-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .decoration-current\\/\\[50\\%\\] {
+      text-decoration-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .decoration-current\\/\\[50\\%\\] {
+        -webkit-text-decoration-color: color-mix(in oklab, currentcolor 50%, transparent);
+        -webkit-text-decoration-color: color-mix(in oklab, currentcolor 50%, transparent);
+        text-decoration-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
     }
 
     .decoration-inherit {
@@ -13465,10 +23819,40 @@ test('decoration', async () => {
       text-decoration-color: var(--color-red-500);
     }
 
-    .decoration-red-500\\/50, .decoration-red-500\\/\\[0\\.5\\], .decoration-red-500\\/\\[50\\%\\] {
-      -webkit-text-decoration-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
-      -webkit-text-decoration-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
-      text-decoration-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    .decoration-red-500\\/50 {
+      text-decoration-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .decoration-red-500\\/50 {
+        -webkit-text-decoration-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+        -webkit-text-decoration-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+        text-decoration-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .decoration-red-500\\/\\[0\\.5\\] {
+      text-decoration-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .decoration-red-500\\/\\[0\\.5\\] {
+        -webkit-text-decoration-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+        -webkit-text-decoration-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+        text-decoration-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .decoration-red-500\\/\\[50\\%\\] {
+      text-decoration-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .decoration-red-500\\/\\[50\\%\\] {
+        -webkit-text-decoration-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+        -webkit-text-decoration-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+        text-decoration-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
     }
 
     .decoration-transparent {
@@ -13533,7 +23917,8 @@ test('decoration', async () => {
 
     .decoration-from-font {
       text-decoration-thickness: from-font;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -13592,17 +23977,18 @@ test('decoration', async () => {
 
 test('animate', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['animate-spin', 'animate-none', 'animate-[bounce_1s_infinite]', 'animate-not-found'],
       css`
         @theme {
           --animate-spin: spin 1s linear infinite;
         }
         @tailwind utilities;
       `,
-      ['animate-spin', 'animate-none', 'animate-[bounce_1s_infinite]', 'animate-not-found'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --animate-spin: spin 1s linear infinite;
     }
 
@@ -13616,7 +24002,8 @@ test('animate', async () => {
 
     .animate-spin {
       animation: var(--animate-spin);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -13631,19 +24018,33 @@ test('animate', async () => {
       'animate-not-found/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['animate-none'],
+      css`
+        @theme {
+          --animate-none: bounce 1s infinite;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --animate-none: bounce 1s infinite;
+    }
+
+    .animate-none {
+      animation: var(--animate-none);
+    }
+    "
+  `)
 })
 
 test('filter', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --blur-xl: 24px;
-          --drop-shadow: 0 1px 1px rgb(0 0 0 / 0.05);
-          --drop-shadow-xl: 0 9px 7px rgb(0 0 0 / 0.1);
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'filter',
         'filter-none',
@@ -13666,8 +24067,16 @@ test('filter', async () => {
         'invert-0',
         'invert-[var(--value)]',
         'drop-shadow',
+        'drop-shadow/25',
+        'drop-shadow/12.5',
         'drop-shadow-xl',
+        'drop-shadow-multi',
         'drop-shadow-[0_0_red]',
+        'drop-shadow-red-500',
+        'drop-shadow-red-500/50',
+        'drop-shadow-none',
+        'drop-shadow-inherit',
+        'drop-shadow-calc',
         'saturate-0',
         'saturate-[1.75]',
         'saturate-[var(--value)]',
@@ -13676,12 +24085,50 @@ test('filter', async () => {
         'sepia-[50%]',
         'sepia-[var(--value)]',
       ],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --blur-xl: 24px;
+          --color-red-500: #ef4444;
+          --drop-shadow: 0 1px 1px rgb(0 0 0 / 0.05);
+          --drop-shadow-xl: 0 9px 7px rgb(0 0 0 / 0.1);
+          --drop-shadow-calc: 0 0 calc(1 * var(--spacing)) black;
+        }
+        @theme inline {
+          --drop-shadow-multi: 0 1px 1px rgb(0 0 0 / 0.05), 0 9px 7px rgb(0 0 0 / 0.1);
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-blur: initial;
+          --tw-brightness: initial;
+          --tw-contrast: initial;
+          --tw-grayscale: initial;
+          --tw-hue-rotate: initial;
+          --tw-invert: initial;
+          --tw-opacity: initial;
+          --tw-saturate: initial;
+          --tw-sepia: initial;
+          --tw-drop-shadow: initial;
+          --tw-drop-shadow-color: initial;
+          --tw-drop-shadow-alpha: 100%;
+          --tw-drop-shadow-size: initial;
+        }
+      }
+    }
+
+    :root, :host {
+      --spacing: .25rem;
       --blur-xl: 24px;
+      --color-red-500: #ef4444;
       --drop-shadow: 0 1px 1px #0000000d;
       --drop-shadow-xl: 0 9px 7px #0000001a;
+      --drop-shadow-calc: 0 0 calc(1 * var(--spacing)) black;
     }
 
     .blur-\\[4px\\] {
@@ -13690,7 +24137,7 @@ test('filter', async () => {
     }
 
     .blur-none {
-      --tw-blur: ;
+      --tw-blur:  ;
       filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
     }
 
@@ -13719,21 +24166,88 @@ test('filter', async () => {
       filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
     }
 
+    .drop-shadow\\/12\\.5 {
+      --tw-drop-shadow-alpha: 12.5%;
+      --tw-drop-shadow-size: drop-shadow(0 1px 1px var(--tw-drop-shadow-color, oklab(0% 0 0 / .125)));
+      --tw-drop-shadow: drop-shadow(var(--drop-shadow));
+      filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
+    }
+
+    .drop-shadow\\/25 {
+      --tw-drop-shadow-alpha: 25%;
+      --tw-drop-shadow-size: drop-shadow(0 1px 1px var(--tw-drop-shadow-color, oklab(0% 0 0 / .25)));
+      --tw-drop-shadow: drop-shadow(var(--drop-shadow));
+      filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
+    }
+
     .drop-shadow {
+      --tw-drop-shadow-size: drop-shadow(0 1px 1px var(--tw-drop-shadow-color, #0000000d));
       --tw-drop-shadow: drop-shadow(var(--drop-shadow));
       filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
     }
 
     .drop-shadow-\\[0_0_red\\] {
-      --tw-drop-shadow: drop-shadow(0 0 red);
+      --tw-drop-shadow-size: drop-shadow(0 0 var(--tw-drop-shadow-color, red));
+      --tw-drop-shadow: var(--tw-drop-shadow-size);
+      filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
+    }
+
+    .drop-shadow-calc {
+      --tw-drop-shadow-size: drop-shadow(0 0 calc(1 * var(--spacing)) var(--tw-drop-shadow-color, black));
+      --tw-drop-shadow: drop-shadow(var(--drop-shadow-calc));
+      filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
+    }
+
+    .drop-shadow-multi {
+      --tw-drop-shadow-size: drop-shadow(0 1px 1px var(--tw-drop-shadow-color, #0000000d)) drop-shadow(0 9px 7px var(--tw-drop-shadow-color, #0000001a));
+      --tw-drop-shadow: drop-shadow(0 1px 1px #0000000d) drop-shadow(0 9px 7px #0000001a);
       filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
     }
 
     .drop-shadow-xl {
+      --tw-drop-shadow-size: drop-shadow(0 9px 7px var(--tw-drop-shadow-color, #0000001a));
       --tw-drop-shadow: drop-shadow(var(--drop-shadow-xl));
       filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
     }
 
+    .drop-shadow-none {
+      --tw-drop-shadow:  ;
+      filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
+    }
+
+    .drop-shadow-inherit {
+      --tw-drop-shadow-color: inherit;
+      --tw-drop-shadow: var(--tw-drop-shadow-size);
+    }
+
+    .drop-shadow-red-500 {
+      --tw-drop-shadow-color: #ef4444;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .drop-shadow-red-500 {
+        --tw-drop-shadow-color: color-mix(in oklab, var(--color-red-500) var(--tw-drop-shadow-alpha), transparent);
+      }
+    }
+
+    .drop-shadow-red-500 {
+      --tw-drop-shadow: var(--tw-drop-shadow-size);
+    }
+
+    .drop-shadow-red-500\\/50 {
+      --tw-drop-shadow-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .drop-shadow-red-500\\/50 {
+        --tw-drop-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 50%, transparent) var(--tw-drop-shadow-alpha), transparent);
+      }
+    }
+
+    .drop-shadow-red-500\\/50 {
+      --tw-drop-shadow: var(--tw-drop-shadow-size);
+    }
+
     .grayscale {
       --tw-grayscale: grayscale(100%);
       filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
@@ -13831,8 +24345,174 @@ test('filter', async () => {
       filter: none;
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
+    @property --tw-blur {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-brightness {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-contrast {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-grayscale {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-hue-rotate {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-invert {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-opacity {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-saturate {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-sepia {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-drop-shadow {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-drop-shadow-color {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-drop-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-drop-shadow-size {
+      syntax: "*";
+      inherits: false
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        '-filter',
+        '-filter-none',
+        '-filter-[var(--value)]',
+        '-blur-xl',
+        '-blur-[4px]',
+        'brightness--50',
+        '-brightness-50',
+        '-brightness-[1.23]',
+        'brightness-unknown',
+        'contrast--50',
+        '-contrast-50',
+        '-contrast-[1.23]',
+        'contrast-unknown',
+        '-grayscale',
+        '-grayscale-0',
+        'grayscale--1',
+        '-grayscale-[var(--value)]',
+        'grayscale-unknown',
+        'hue-rotate--5',
+        'hue-rotate-unknown',
+        '-invert',
+        'invert--5',
+        '-invert-0',
+        '-invert-[var(--value)]',
+        'invert-unknown',
+        '-drop-shadow-xl',
+        '-drop-shadow-[0_0_red]',
+
+        'drop-shadow/foo',
+        '-drop-shadow/foo',
+        '-drop-shadow/25',
+        '-drop-shadow-red-500',
+        'drop-shadow-red-500/foo',
+        '-drop-shadow-red-500/foo',
+        '-drop-shadow-red-500/50',
+
+        '-saturate-0',
+        'saturate--5',
+        '-saturate-[1.75]',
+        '-saturate-[var(--value)]',
+        'saturate-saturate',
+        '-sepia',
+        'sepia--50',
+        '-sepia-0',
+        '-sepia-[50%]',
+        '-sepia-[var(--value)]',
+        'sepia-unknown',
+        'filter/foo',
+        'filter-none/foo',
+        'filter-[var(--value)]/foo',
+        'blur-xl/foo',
+        'blur-none/foo',
+        'blur-[4px]/foo',
+        'brightness-50/foo',
+        'brightness-[1.23]/foo',
+        'contrast-50/foo',
+        'contrast-[1.23]/foo',
+        'grayscale/foo',
+        'grayscale-0/foo',
+        'grayscale-[var(--value)]/foo',
+        'hue-rotate-15/foo',
+        'hue-rotate-[45deg]/foo',
+        'invert/foo',
+        'invert-0/foo',
+        'invert-[var(--value)]/foo',
+        'drop-shadow-xl/foo',
+        'drop-shadow-[0_0_red]/foo',
+        'saturate-0/foo',
+        'saturate-[1.75]/foo',
+        'saturate-[var(--value)]/foo',
+        'sepia/foo',
+        'sepia-0/foo',
+        'sepia-[50%]/foo',
+        'sepia-[var(--value)]/foo',
+      ],
+      css`
+        @theme {
+          --drop-shadow: 0 1px 1px rgb(0 0 0 / 0.05);
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toEqual('')
+
+  expect(
+    await run(
+      ['blur-none'],
+      css`
+        @theme {
+          --blur-none: 2px;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-blur: initial;
           --tw-brightness: initial;
@@ -13843,10 +24523,23 @@ test('filter', async () => {
           --tw-opacity: initial;
           --tw-saturate: initial;
           --tw-sepia: initial;
+          --tw-drop-shadow: initial;
+          --tw-drop-shadow-color: initial;
+          --tw-drop-shadow-alpha: 100%;
+          --tw-drop-shadow-size: initial;
         }
       }
     }
 
+    :root, :host {
+      --blur-none: 2px;
+    }
+
+    .blur-none {
+      --tw-blur: blur(var(--blur-none));
+      filter: var(--tw-blur, ) var(--tw-brightness, ) var(--tw-contrast, ) var(--tw-grayscale, ) var(--tw-hue-rotate, ) var(--tw-invert, ) var(--tw-saturate, ) var(--tw-sepia, ) var(--tw-drop-shadow, );
+    }
+
     @property --tw-blur {
       syntax: "*";
       inherits: false
@@ -13890,88 +24583,35 @@ test('filter', async () => {
     @property --tw-sepia {
       syntax: "*";
       inherits: false
-    }"
+    }
+
+    @property --tw-drop-shadow {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-drop-shadow-color {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-drop-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-drop-shadow-size {
+      syntax: "*";
+      inherits: false
+    }
+    "
   `)
-  expect(
-    await run([
-      '-filter',
-      '-filter-none',
-      '-filter-[var(--value)]',
-      '-blur-xl',
-      '-blur-[4px]',
-      'brightness--50',
-      '-brightness-50',
-      '-brightness-[1.23]',
-      'brightness-unknown',
-      'contrast--50',
-      '-contrast-50',
-      '-contrast-[1.23]',
-      'contrast-unknown',
-      '-grayscale',
-      '-grayscale-0',
-      'grayscale--1',
-      '-grayscale-[var(--value)]',
-      'grayscale-unknown',
-      'hue-rotate--5',
-      'hue-rotate-unknown',
-      '-invert',
-      'invert--5',
-      '-invert-0',
-      '-invert-[var(--value)]',
-      'invert-unknown',
-      '-drop-shadow-xl',
-      '-drop-shadow-[0_0_red]',
-      '-saturate-0',
-      'saturate--5',
-      '-saturate-[1.75]',
-      '-saturate-[var(--value)]',
-      'saturate-saturate',
-      '-sepia',
-      'sepia--50',
-      '-sepia-0',
-      '-sepia-[50%]',
-      '-sepia-[var(--value)]',
-      'sepia-unknown',
-      'filter/foo',
-      'filter-none/foo',
-      'filter-[var(--value)]/foo',
-      'blur-xl/foo',
-      'blur-none/foo',
-      'blur-[4px]/foo',
-      'brightness-50/foo',
-      'brightness-[1.23]/foo',
-      'contrast-50/foo',
-      'contrast-[1.23]/foo',
-      'grayscale/foo',
-      'grayscale-0/foo',
-      'grayscale-[var(--value)]/foo',
-      'hue-rotate-15/foo',
-      'hue-rotate-[45deg]/foo',
-      'invert/foo',
-      'invert-0/foo',
-      'invert-[var(--value)]/foo',
-      'drop-shadow-xl/foo',
-      'drop-shadow-[0_0_red]/foo',
-      'saturate-0/foo',
-      'saturate-[1.75]/foo',
-      'saturate-[var(--value)]/foo',
-      'sepia/foo',
-      'sepia-0/foo',
-      'sepia-[50%]/foo',
-      'sepia-[var(--value)]/foo',
-    ]),
-  ).toEqual('')
 })
 
 test('backdrop-filter', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --blur-xl: 24px;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'backdrop-filter',
         'backdrop-filter-none',
@@ -14007,9 +24647,32 @@ test('backdrop-filter', async () => {
         'backdrop-sepia-[50%]',
         'backdrop-sepia-[var(--value)]',
       ],
+      css`
+        @theme {
+          --blur-xl: 24px;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-backdrop-blur: initial;
+          --tw-backdrop-brightness: initial;
+          --tw-backdrop-contrast: initial;
+          --tw-backdrop-grayscale: initial;
+          --tw-backdrop-hue-rotate: initial;
+          --tw-backdrop-invert: initial;
+          --tw-backdrop-opacity: initial;
+          --tw-backdrop-saturate: initial;
+          --tw-backdrop-sepia: initial;
+        }
+      }
+    }
+
+    :root, :host {
       --blur-xl: 24px;
     }
 
@@ -14020,7 +24683,7 @@ test('backdrop-filter', async () => {
     }
 
     .backdrop-blur-none {
-      --tw-backdrop-blur: ;
+      --tw-backdrop-blur:  ;
       -webkit-backdrop-filter: var(--tw-backdrop-blur, ) var(--tw-backdrop-brightness, ) var(--tw-backdrop-contrast, ) var(--tw-backdrop-grayscale, ) var(--tw-backdrop-hue-rotate, ) var(--tw-backdrop-invert, ) var(--tw-backdrop-opacity, ) var(--tw-backdrop-saturate, ) var(--tw-backdrop-sepia, );
       backdrop-filter: var(--tw-backdrop-blur, ) var(--tw-backdrop-brightness, ) var(--tw-backdrop-contrast, ) var(--tw-backdrop-grayscale, ) var(--tw-backdrop-hue-rotate, ) var(--tw-backdrop-invert, ) var(--tw-backdrop-opacity, ) var(--tw-backdrop-saturate, ) var(--tw-backdrop-sepia, );
     }
@@ -14208,22 +24871,6 @@ test('backdrop-filter', async () => {
       backdrop-filter: none;
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-backdrop-blur: initial;
-          --tw-backdrop-brightness: initial;
-          --tw-backdrop-contrast: initial;
-          --tw-backdrop-grayscale: initial;
-          --tw-backdrop-hue-rotate: initial;
-          --tw-backdrop-invert: initial;
-          --tw-backdrop-opacity: initial;
-          --tw-backdrop-saturate: initial;
-          --tw-backdrop-sepia: initial;
-        }
-      }
-    }
-
     @property --tw-backdrop-blur {
       syntax: "*";
       inherits: false
@@ -14267,7 +24914,8 @@ test('backdrop-filter', async () => {
     @property --tw-backdrop-sepia {
       syntax: "*";
       inherits: false
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -14341,21 +24989,96 @@ test('backdrop-filter', async () => {
       'backdrop-sepia-[var(--value)]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['backdrop-blur-none'],
+      css`
+        @theme {
+          --backdrop-blur-none: 2px;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-backdrop-blur: initial;
+          --tw-backdrop-brightness: initial;
+          --tw-backdrop-contrast: initial;
+          --tw-backdrop-grayscale: initial;
+          --tw-backdrop-hue-rotate: initial;
+          --tw-backdrop-invert: initial;
+          --tw-backdrop-opacity: initial;
+          --tw-backdrop-saturate: initial;
+          --tw-backdrop-sepia: initial;
+        }
+      }
+    }
+
+    :root, :host {
+      --backdrop-blur-none: 2px;
+    }
+
+    .backdrop-blur-none {
+      --tw-backdrop-blur: blur(var(--backdrop-blur-none));
+      -webkit-backdrop-filter: var(--tw-backdrop-blur, ) var(--tw-backdrop-brightness, ) var(--tw-backdrop-contrast, ) var(--tw-backdrop-grayscale, ) var(--tw-backdrop-hue-rotate, ) var(--tw-backdrop-invert, ) var(--tw-backdrop-opacity, ) var(--tw-backdrop-saturate, ) var(--tw-backdrop-sepia, );
+      backdrop-filter: var(--tw-backdrop-blur, ) var(--tw-backdrop-brightness, ) var(--tw-backdrop-contrast, ) var(--tw-backdrop-grayscale, ) var(--tw-backdrop-hue-rotate, ) var(--tw-backdrop-invert, ) var(--tw-backdrop-opacity, ) var(--tw-backdrop-saturate, ) var(--tw-backdrop-sepia, );
+    }
+
+    @property --tw-backdrop-blur {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-backdrop-brightness {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-backdrop-contrast {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-backdrop-grayscale {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-backdrop-hue-rotate {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-backdrop-invert {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-backdrop-opacity {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-backdrop-saturate {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-backdrop-sepia {
+      syntax: "*";
+      inherits: false
+    }
+    "
+  `)
 })
 
 test('transition', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --default-transition-timing-function: ease;
-          --default-transition-duration: 100ms;
-          --transition-property: color, background-color, border-color, text-decoration-color, fill,
-            stroke, opacity, box-shadow, transform, filter, backdrop-filter;
-          --transition-property-opacity: opacity;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'transition',
         'transition-none',
@@ -14366,17 +25089,28 @@ test('transition', async () => {
         'transition-opacity',
         'transition-[var(--value)]',
       ],
+      css`
+        @theme {
+          --default-transition-timing-function: ease;
+          --default-transition-duration: 100ms;
+          --transition-property:
+            color, background-color, border-color, text-decoration-color, fill, stroke, opacity,
+            box-shadow, transform, filter, backdrop-filter;
+          --transition-property-opacity: opacity;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --default-transition-timing-function: ease;
       --default-transition-duration: .1s;
-      --transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
       --transition-property-opacity: opacity;
     }
 
     .transition {
-      transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, -webkit-backdrop-filter, -webkit-backdrop-filter, backdrop-filter;
+      transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter, display, content-visibility, overlay, pointer-events;
       transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
       transition-duration: var(--tw-duration, var(--default-transition-duration));
     }
@@ -14394,15 +25128,12 @@ test('transition', async () => {
     }
 
     .transition-colors {
-      transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to;
+      transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to;
       transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
       transition-duration: var(--tw-duration, var(--default-transition-duration));
     }
 
     .transition-opacity {
-      transition-property: opacity;
-      transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
-      transition-duration: var(--tw-duration, var(--default-transition-duration));
       transition-property: var(--transition-property-opacity);
       transition-timing-function: var(--tw-ease, var(--default-transition-timing-function));
       transition-duration: var(--tw-duration, var(--default-transition-duration));
@@ -14422,11 +25153,13 @@ test('transition', async () => {
 
     .transition-none {
       transition-property: none;
-    }"
+    }
+    "
   `)
 
   expect(
-    await compileCss(
+    await run(
+      ['transition', 'transition-all', 'transition-colors'],
       css`
         @theme inline {
           --default-transition-timing-function: ease;
@@ -14434,16 +25167,11 @@ test('transition', async () => {
         }
         @tailwind utilities;
       `,
-      ['transition', 'transition-all', 'transition-colors'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --default-transition-timing-function: ease;
-      --default-transition-duration: .1s;
-    }
-
+    "
     .transition {
-      transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, -webkit-backdrop-filter, -webkit-backdrop-filter, backdrop-filter;
+      transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter, display, content-visibility, overlay, pointer-events;
       transition-timing-function: var(--tw-ease, ease);
       transition-duration: var(--tw-duration, .1s);
     }
@@ -14455,25 +25183,21 @@ test('transition', async () => {
     }
 
     .transition-colors {
-      transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to;
+      transition-property: color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to;
       transition-timing-function: var(--tw-ease, ease);
       transition-duration: var(--tw-duration, .1s);
-    }"
+    }
+    "
   `)
 
-  expect(
-    await compileCss(
-      css`
-        @tailwind utilities;
-      `,
-      ['transition-all'],
-    ),
-  ).toMatchInlineSnapshot(`
-    ".transition-all {
+  expect(await run(['transition-all'])).toMatchInlineSnapshot(`
+    "
+    .transition-all {
       transition-property: all;
       transition-timing-function: var(--tw-ease, ease);
       transition-duration: var(--tw-duration, 0s);
-    }"
+    }
+    "
   `)
 
   expect(
@@ -14493,17 +25217,43 @@ test('transition', async () => {
       'transition-[var(--value)]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['transition-colors'],
+      css`
+        @theme {
+          --transition-property-colors: transform;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --transition-property-colors: transform;
+    }
+
+    .transition-colors {
+      transition-property: var(--transition-property-colors);
+      transition-timing-function: var(--tw-ease, ease);
+      transition-duration: var(--tw-duration, 0s);
+    }
+    "
+  `)
 })
 
 test('transition-behavior', async () => {
   expect(await run(['transition-discrete', 'transition-normal'])).toMatchInlineSnapshot(`
-    ".transition-discrete {
+    "
+    .transition-discrete {
       transition-behavior: allow-discrete;
     }
 
     .transition-normal {
       transition-behavior: normal;
-    }"
+    }
+    "
   `)
 
   expect(await run(['-transition-discrete', '-transition-normal'])).toEqual('')
@@ -14511,7 +25261,8 @@ test('transition-behavior', async () => {
 
 test('delay', async () => {
   expect(await run(['delay-123', 'delay-200', 'delay-[300ms]'])).toMatchInlineSnapshot(`
-    ".delay-123 {
+    "
+    .delay-123 {
       transition-delay: .123s;
     }
 
@@ -14521,7 +25272,8 @@ test('delay', async () => {
 
     .delay-\\[300ms\\] {
       transition-delay: .3s;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -14539,7 +25291,16 @@ test('delay', async () => {
 
 test('duration', async () => {
   expect(await run(['duration-123', 'duration-200', 'duration-[300ms]'])).toMatchInlineSnapshot(`
-    ".duration-123 {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-duration: initial;
+        }
+      }
+    }
+
+    .duration-123 {
       --tw-duration: .123s;
       transition-duration: .123s;
     }
@@ -14554,18 +25315,11 @@ test('duration', async () => {
       transition-duration: .3s;
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-duration: initial;
-        }
-      }
-    }
-
     @property --tw-duration {
       syntax: "*";
       inherits: false
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -14582,7 +25336,8 @@ test('duration', async () => {
 
 test('ease', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['ease-in', 'ease-out', 'ease-[var(--value)]'],
       css`
         @theme {
           --ease-in: cubic-bezier(0.4, 0, 1, 1);
@@ -14590,10 +25345,18 @@ test('ease', async () => {
         }
         @tailwind utilities;
       `,
-      ['ease-in', 'ease-out', 'ease-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-ease: initial;
+        }
+      }
+    }
+
+    :root, :host {
       --ease-in: cubic-bezier(.4, 0, 1, 1);
       --ease-out: cubic-bezier(0, 0, .2, 1);
     }
@@ -14613,18 +25376,11 @@ test('ease', async () => {
       transition-timing-function: var(--ease-out);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-ease: initial;
-        }
-      }
-    }
-
     @property --tw-ease {
       syntax: "*";
       inherits: false
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -14636,6 +25392,42 @@ test('ease', async () => {
       'ease-[var(--value)]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['ease-linear'],
+      css`
+        @theme {
+          --ease-linear: steps(4);
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-ease: initial;
+        }
+      }
+    }
+
+    :root, :host {
+      --ease-linear: steps(4);
+    }
+
+    .ease-linear {
+      --tw-ease: var(--ease-linear);
+      transition-timing-function: var(--ease-linear);
+    }
+
+    @property --tw-ease {
+      syntax: "*";
+      inherits: false
+    }
+    "
+  `)
 })
 
 test('will-change', async () => {
@@ -14648,7 +25440,8 @@ test('will-change', async () => {
       'will-change-[var(--value)]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".will-change-\\[var\\(--value\\)\\] {
+    "
+    .will-change-\\[var\\(--value\\)\\] {
       will-change: var(--value);
     }
 
@@ -14666,7 +25459,8 @@ test('will-change', async () => {
 
     .will-change-transform {
       will-change: transform;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -14699,12 +25493,16 @@ test('contain', async () => {
       'contain-[unset]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".contain-\\[unset\\] {
-      contain: unset;
-    }
-
-    .contain-content {
-      contain: content;
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-contain-size: initial;
+          --tw-contain-layout: initial;
+          --tw-contain-paint: initial;
+          --tw-contain-style: initial;
+        }
+      }
     }
 
     .contain-inline-size {
@@ -14717,10 +25515,6 @@ test('contain', async () => {
       contain: var(--tw-contain-size, ) var(--tw-contain-layout, ) var(--tw-contain-paint, ) var(--tw-contain-style, );
     }
 
-    .contain-none {
-      contain: none;
-    }
-
     .contain-paint {
       --tw-contain-paint: paint;
       contain: var(--tw-contain-size, ) var(--tw-contain-layout, ) var(--tw-contain-paint, ) var(--tw-contain-style, );
@@ -14731,24 +25525,25 @@ test('contain', async () => {
       contain: var(--tw-contain-size, ) var(--tw-contain-layout, ) var(--tw-contain-paint, ) var(--tw-contain-style, );
     }
 
-    .contain-strict {
-      contain: strict;
-    }
-
     .contain-style {
       --tw-contain-style: style;
       contain: var(--tw-contain-size, ) var(--tw-contain-layout, ) var(--tw-contain-paint, ) var(--tw-contain-style, );
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-contain-size: initial;
-          --tw-contain-layout: initial;
-          --tw-contain-paint: initial;
-          --tw-contain-style: initial;
-        }
-      }
+    .contain-\\[unset\\] {
+      contain: unset;
+    }
+
+    .contain-content {
+      contain: content;
+    }
+
+    .contain-none {
+      contain: none;
+    }
+
+    .contain-strict {
+      contain: strict;
     }
 
     @property --tw-contain-size {
@@ -14769,7 +25564,8 @@ test('contain', async () => {
     @property --tw-contain-style {
       syntax: "*";
       inherits: false
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -14787,25 +25583,46 @@ test('contain', async () => {
 })
 
 test('content', async () => {
-  expect(await run(['content-["hello_world"]'])).toMatchInlineSnapshot(`
-    ".content-\\[\\"hello_world\\"\\] {
-      --tw-content: "hello world";
-      content: var(--tw-content);
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
+  expect(
+    await run(
+      ['content-slash', 'content-["hello_world"]'],
+      css`
+        @theme {
+          --content-slash: '/';
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-content: "";
         }
       }
     }
 
+    :root, :host {
+      --content-slash: "/";
+    }
+
+    .content-\\[\\"hello_world\\"\\] {
+      --tw-content: "hello world";
+      content: var(--tw-content);
+    }
+
+    .content-slash {
+      --tw-content: var(--content-slash);
+      content: var(--tw-content);
+    }
+
     @property --tw-content {
       syntax: "*";
       inherits: false;
       initial-value: "";
-    }"
+    }
+    "
   `)
   expect(await run(['content', '-content-["hello_world"]', 'content-["hello_world"]/foo'])).toEqual(
     '',
@@ -14815,14 +25632,16 @@ test('content', async () => {
 test('forced-color-adjust', async () => {
   expect(await run(['forced-color-adjust-none', 'forced-color-adjust-auto']))
     .toMatchInlineSnapshot(`
-    ".forced-color-adjust-auto {
-      forced-color-adjust: auto;
-    }
+      "
+      .forced-color-adjust-auto {
+        forced-color-adjust: auto;
+      }
 
-    .forced-color-adjust-none {
-      forced-color-adjust: none;
-    }"
-  `)
+      .forced-color-adjust-none {
+        forced-color-adjust: none;
+      }
+      "
+    `)
   expect(
     await run([
       'forced',
@@ -14838,7 +25657,8 @@ test('forced-color-adjust', async () => {
 
 test('leading', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['leading-tight', 'leading-6', 'leading-[var(--value)]'],
       css`
         @theme {
           --leading-tight: 1.25;
@@ -14846,10 +25666,18 @@ test('leading', async () => {
         }
         @tailwind utilities;
       `,
-      ['leading-tight', 'leading-6', 'leading-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-leading: initial;
+        }
+      }
+    }
+
+    :root, :host {
       --leading-tight: 1.25;
       --leading-6: 1.5rem;
     }
@@ -14869,18 +25697,11 @@ test('leading', async () => {
       line-height: var(--leading-tight);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-leading: initial;
-        }
-      }
-    }
-
     @property --tw-leading {
       syntax: "*";
       inherits: false
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -14893,11 +25714,48 @@ test('leading', async () => {
       'leading-[var(--value)]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['leading-none'],
+      css`
+        @theme {
+          --leading-none: 2;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-leading: initial;
+        }
+      }
+    }
+
+    :root, :host {
+      --leading-none: 2;
+    }
+
+    .leading-none {
+      --tw-leading: var(--leading-none);
+      line-height: var(--leading-none);
+    }
+
+    @property --tw-leading {
+      syntax: "*";
+      inherits: false
+    }
+    "
+  `)
 })
 
 test('tracking', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['tracking-normal', 'tracking-wide', 'tracking-[var(--value)]', '-tracking-[var(--value)]'],
       css`
         @theme {
           --tracking-normal: 0em;
@@ -14905,10 +25763,18 @@ test('tracking', async () => {
         }
         @tailwind utilities;
       `,
-      ['tracking-normal', 'tracking-wide', 'tracking-[var(--value)]', '-tracking-[var(--value)]'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-tracking: initial;
+        }
+      }
+    }
+
+    :root, :host {
       --tracking-normal: 0em;
       --tracking-wide: .025em;
     }
@@ -14933,18 +25799,11 @@ test('tracking', async () => {
       letter-spacing: var(--tracking-wide);
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-tracking: initial;
-        }
-      }
-    }
-
     @property --tw-tracking {
       syntax: "*";
       inherits: false
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -14959,7 +25818,8 @@ test('tracking', async () => {
 
 test('font-smoothing', async () => {
   expect(await run(['antialiased', 'subpixel-antialiased'])).toMatchInlineSnapshot(`
-    ".antialiased {
+    "
+    .antialiased {
       -webkit-font-smoothing: antialiased;
       -moz-osx-font-smoothing: grayscale;
     }
@@ -14967,7 +25827,8 @@ test('font-smoothing', async () => {
     .subpixel-antialiased {
       -webkit-font-smoothing: auto;
       -moz-osx-font-smoothing: auto;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -14993,7 +25854,20 @@ test('font-variant-numeric', async () => {
       'stacked-fractions',
     ]),
   ).toMatchInlineSnapshot(`
-    ".diagonal-fractions {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-ordinal: initial;
+          --tw-slashed-zero: initial;
+          --tw-numeric-figure: initial;
+          --tw-numeric-spacing: initial;
+          --tw-numeric-fraction: initial;
+        }
+      }
+    }
+
+    .diagonal-fractions {
       --tw-numeric-fraction: diagonal-fractions;
       font-variant-numeric: var(--tw-ordinal, ) var(--tw-slashed-zero, ) var(--tw-numeric-figure, ) var(--tw-numeric-spacing, ) var(--tw-numeric-fraction, );
     }
@@ -15003,10 +25877,6 @@ test('font-variant-numeric', async () => {
       font-variant-numeric: var(--tw-ordinal, ) var(--tw-slashed-zero, ) var(--tw-numeric-figure, ) var(--tw-numeric-spacing, ) var(--tw-numeric-fraction, );
     }
 
-    .normal-nums {
-      font-variant-numeric: normal;
-    }
-
     .oldstyle-nums {
       --tw-numeric-figure: oldstyle-nums;
       font-variant-numeric: var(--tw-ordinal, ) var(--tw-slashed-zero, ) var(--tw-numeric-figure, ) var(--tw-numeric-spacing, ) var(--tw-numeric-fraction, );
@@ -15037,16 +25907,8 @@ test('font-variant-numeric', async () => {
       font-variant-numeric: var(--tw-ordinal, ) var(--tw-slashed-zero, ) var(--tw-numeric-figure, ) var(--tw-numeric-spacing, ) var(--tw-numeric-fraction, );
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-ordinal: initial;
-          --tw-slashed-zero: initial;
-          --tw-numeric-figure: initial;
-          --tw-numeric-spacing: initial;
-          --tw-numeric-fraction: initial;
-        }
-      }
+    .normal-nums {
+      font-variant-numeric: normal;
     }
 
     @property --tw-ordinal {
@@ -15072,7 +25934,8 @@ test('font-variant-numeric', async () => {
     @property --tw-numeric-fraction {
       syntax: "*";
       inherits: false
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -15100,15 +25963,10 @@ test('font-variant-numeric', async () => {
 
 test('outline', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'outline',
+        'outline-hidden',
 
         // outline-style
         'outline-none',
@@ -15122,6 +25980,7 @@ test('outline', async () => {
         'outline-red-500/50',
         'outline-red-500/[0.5]',
         'outline-red-500/[50%]',
+        'outline-blue-500',
         'outline-current',
         'outline-current/50',
         'outline-current/[0.5]',
@@ -15154,10 +26013,39 @@ test('outline', async () => {
         'outline-[length:var(--my-width)]',
         'outline-[percentage:var(--my-width)]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+          --outline-color-blue-500: #3b82f6;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-outline-style: solid;
+        }
+      }
+    }
+
+    :root, :host {
       --color-red-500: #ef4444;
+      --outline-color-blue-500: #3b82f6;
+    }
+
+    .outline-hidden {
+      --tw-outline-style: none;
+      outline-style: none;
+    }
+
+    @media (forced-colors: active) {
+      .outline-hidden {
+        outline-offset: 2px;
+        outline: 2px solid #0000;
+      }
     }
 
     .outline {
@@ -15195,7 +26083,7 @@ test('outline', async () => {
     }
 
     .outline-\\[\\#0088cc\\]\\/50, .outline-\\[\\#0088cc\\]\\/\\[0\\.5\\], .outline-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      outline-color: oklab(59.9824% -.06725 -.12414 / .5);
+      outline-color: oklab(59.9824% -.067 -.124 / .5);
     }
 
     .outline-\\[black\\] {
@@ -15214,28 +26102,98 @@ test('outline', async () => {
       outline-color: oklab(0% none none / .5);
     }
 
-    .outline-\\[color\\:var\\(--value\\)\\] {
+    .outline-\\[color\\:var\\(--value\\)\\], .outline-\\[color\\:var\\(--value\\)\\]\\/50 {
       outline-color: var(--value);
     }
 
-    .outline-\\[color\\:var\\(--value\\)\\]\\/50, .outline-\\[color\\:var\\(--value\\)\\]\\/\\[0\\.5\\], .outline-\\[color\\:var\\(--value\\)\\]\\/\\[50\\%\\] {
-      outline-color: color-mix(in oklab, var(--value) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .outline-\\[color\\:var\\(--value\\)\\]\\/50 {
+        outline-color: color-mix(in oklab, var(--value) 50%, transparent);
+      }
     }
 
-    .outline-\\[var\\(--value\\)\\] {
+    .outline-\\[color\\:var\\(--value\\)\\]\\/\\[0\\.5\\] {
       outline-color: var(--value);
     }
 
-    .outline-\\[var\\(--value\\)\\]\\/50, .outline-\\[var\\(--value\\)\\]\\/\\[0\\.5\\], .outline-\\[var\\(--value\\)\\]\\/\\[50\\%\\] {
-      outline-color: color-mix(in oklab, var(--value) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .outline-\\[color\\:var\\(--value\\)\\]\\/\\[0\\.5\\] {
+        outline-color: color-mix(in oklab, var(--value) 50%, transparent);
+      }
     }
 
-    .outline-current {
+    .outline-\\[color\\:var\\(--value\\)\\]\\/\\[50\\%\\] {
+      outline-color: var(--value);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .outline-\\[color\\:var\\(--value\\)\\]\\/\\[50\\%\\] {
+        outline-color: color-mix(in oklab, var(--value) 50%, transparent);
+      }
+    }
+
+    .outline-\\[var\\(--value\\)\\], .outline-\\[var\\(--value\\)\\]\\/50 {
+      outline-color: var(--value);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .outline-\\[var\\(--value\\)\\]\\/50 {
+        outline-color: color-mix(in oklab, var(--value) 50%, transparent);
+      }
+    }
+
+    .outline-\\[var\\(--value\\)\\]\\/\\[0\\.5\\] {
+      outline-color: var(--value);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .outline-\\[var\\(--value\\)\\]\\/\\[0\\.5\\] {
+        outline-color: color-mix(in oklab, var(--value) 50%, transparent);
+      }
+    }
+
+    .outline-\\[var\\(--value\\)\\]\\/\\[50\\%\\] {
+      outline-color: var(--value);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .outline-\\[var\\(--value\\)\\]\\/\\[50\\%\\] {
+        outline-color: color-mix(in oklab, var(--value) 50%, transparent);
+      }
+    }
+
+    .outline-blue-500 {
+      outline-color: var(--outline-color-blue-500);
+    }
+
+    .outline-current, .outline-current\\/50 {
       outline-color: currentColor;
     }
 
-    .outline-current\\/50, .outline-current\\/\\[0\\.5\\], .outline-current\\/\\[50\\%\\] {
-      outline-color: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .outline-current\\/50 {
+        outline-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .outline-current\\/\\[0\\.5\\] {
+      outline-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .outline-current\\/\\[0\\.5\\] {
+        outline-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .outline-current\\/\\[50\\%\\] {
+      outline-color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .outline-current\\/\\[50\\%\\] {
+        outline-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
     }
 
     .outline-inherit {
@@ -15246,8 +26204,34 @@ test('outline', async () => {
       outline-color: var(--color-red-500);
     }
 
-    .outline-red-500\\/50, .outline-red-500\\/\\[0\\.5\\], .outline-red-500\\/\\[50\\%\\] {
-      outline-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    .outline-red-500\\/50 {
+      outline-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .outline-red-500\\/50 {
+        outline-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .outline-red-500\\/\\[0\\.5\\] {
+      outline-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .outline-red-500\\/\\[0\\.5\\] {
+        outline-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .outline-red-500\\/\\[50\\%\\] {
+      outline-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .outline-red-500\\/\\[50\\%\\] {
+        outline-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
     }
 
     .outline-transparent {
@@ -15279,19 +26263,44 @@ test('outline', async () => {
       outline-style: solid;
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
+    @property --tw-outline-style {
+      syntax: "*";
+      inherits: false;
+      initial-value: solid;
+    }
+    "
+  `)
+  expect(
+    await run(
+      ['outline'],
+      css`
+        @theme {
+          --default-outline-width: 2px;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-outline-style: solid;
         }
       }
     }
 
+    .outline {
+      outline-style: var(--tw-outline-style);
+      outline-width: 2px;
+    }
+
     @property --tw-outline-style {
       syntax: "*";
       inherits: false;
       initial-value: solid;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -15343,7 +26352,8 @@ test('outline-offset', async () => {
       '-outline-offset-[var(--value)]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".-outline-offset-4 {
+    "
+    .-outline-offset-4 {
       outline-offset: calc(4px * -1);
     }
 
@@ -15357,7 +26367,8 @@ test('outline-offset', async () => {
 
     .outline-offset-\\[var\\(--value\\)\\] {
       outline-offset: var(--value);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -15382,7 +26393,8 @@ test('opacity', async () => {
       'opacity-[var(--value)]',
     ]),
   ).toMatchInlineSnapshot(`
-    ".opacity-2\\.5 {
+    "
+    .opacity-2\\.5 {
       opacity: .025;
     }
 
@@ -15400,7 +26412,8 @@ test('opacity', async () => {
 
     .opacity-\\[var\\(--value\\)\\] {
       opacity: var(--value);
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -15418,12 +26431,7 @@ test('opacity', async () => {
 
 test('underline-offset', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'underline-offset-auto',
         'underline-offset-4',
@@ -15433,9 +26441,15 @@ test('underline-offset', async () => {
         'underline-offset-[var(--value)]',
         '-underline-offset-[var(--value)]',
       ],
+      css`
+        @theme {
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ".-underline-offset-4 {
+    "
+    .-underline-offset-4 {
       text-underline-offset: calc(4px * -1);
     }
 
@@ -15461,7 +26475,8 @@ test('underline-offset', async () => {
 
     .underline-offset-auto {
       text-underline-offset: auto;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -15478,20 +26493,33 @@ test('underline-offset', async () => {
       '-underline-offset-[var(--value)]/foo',
     ]),
   ).toEqual('')
+
+  expect(
+    await run(
+      ['underline-offset-auto'],
+      css`
+        @theme {
+          --text-underline-offset-auto: 4px;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    :root, :host {
+      --text-underline-offset-auto: 4px;
+    }
+
+    .underline-offset-auto {
+      text-underline-offset: var(--text-underline-offset-auto);
+    }
+    "
+  `)
 })
 
 test('text', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --spacing: 0.25rem;
-          --color-red-500: #ef4444;
-          --text-sm: 0.875rem;
-          --text-sm--line-height: 1.25rem;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         // color
         'text-red-500',
@@ -15501,6 +26529,7 @@ test('text', async () => {
         'text-red-500/2.75',
         'text-red-500/[0.5]',
         'text-red-500/[50%]',
+        'text-blue-500',
         'text-current',
         'text-current/50',
         'text-current/[0.5]',
@@ -15520,12 +26549,18 @@ test('text', async () => {
         'text-[color:var(--my-color)]/50',
         'text-[color:var(--my-color)]/[0.5]',
         'text-[color:var(--my-color)]/[50%]',
+        'text-[--alpha(red/20%)]',
 
         // font-size / line-height / letter-spacing / font-weight
         'text-sm',
+        'text-sm/0',
         'text-sm/6',
+        'text-sm/none',
+        'text-[10px]/none',
+        'text-sm/snug',
         'text-sm/[4px]',
         'text-[12px]',
+        'text-[12px]/0',
         'text-[12px]/6',
         'text-[50%]',
         'text-[50%]/6',
@@ -15540,19 +26575,39 @@ test('text', async () => {
         'text-[clamp(1rem,2rem,3rem)]',
         'text-[clamp(1rem,var(--size),3rem)]',
         'text-[clamp(1rem,var(--size),3rem)]/9',
+        'text-[--spacing(2)]',
       ],
+      css`
+        @theme {
+          --spacing: 0.25rem;
+          --color-red-500: #ef4444;
+          --text-color-blue-500: #3b82f6;
+          --text-sm: 0.875rem;
+          --text-sm--line-height: 1.25rem;
+          --leading-snug: 1.375;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --spacing: .25rem;
       --color-red-500: #ef4444;
+      --text-color-blue-500: #3b82f6;
       --text-sm: .875rem;
       --text-sm--line-height: 1.25rem;
+      --leading-snug: 1.375;
     }
 
-    .text-sm {
-      font-size: var(--text-sm);
-      line-height: var(--tw-leading, var(--text-sm--line-height));
+    .text-\\[10px\\]\\/none {
+      font-size: 10px;
+      line-height: 1;
+    }
+
+    .text-\\[12px\\]\\/0 {
+      font-size: 12px;
+      line-height: 0;
     }
 
     .text-\\[12px\\]\\/6 {
@@ -15580,6 +26635,16 @@ test('text', async () => {
       line-height: calc(var(--spacing) * 6);
     }
 
+    .text-sm {
+      font-size: var(--text-sm);
+      line-height: var(--tw-leading, var(--text-sm--line-height));
+    }
+
+    .text-sm\\/0 {
+      font-size: var(--text-sm);
+      line-height: 0;
+    }
+
     .text-sm\\/6 {
       font-size: var(--text-sm);
       line-height: calc(var(--spacing) * 6);
@@ -15590,6 +26655,20 @@ test('text', async () => {
       line-height: 4px;
     }
 
+    .text-sm\\/none {
+      font-size: var(--text-sm);
+      line-height: 1;
+    }
+
+    .text-sm\\/snug {
+      font-size: var(--text-sm);
+      line-height: var(--leading-snug);
+    }
+
+    .text-\\[--spacing\\(2\\)\\] {
+      font-size: calc(var(--spacing) * 2);
+    }
+
     .text-\\[12px\\] {
       font-size: 12px;
     }
@@ -15627,31 +26706,105 @@ test('text', async () => {
     }
 
     .text-\\[\\#0088cc\\]\\/50, .text-\\[\\#0088cc\\]\\/\\[0\\.5\\], .text-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      color: oklab(59.9824% -.06725 -.12414 / .5);
+      color: oklab(59.9824% -.067 -.124 / .5);
     }
 
-    .text-\\[color\\:var\\(--my-color\\)\\] {
+    .text-\\[--alpha\\(red\\/20\\%\\)\\] {
+      color: oklab(62.7955% .224 .125 / .2);
+    }
+
+    .text-\\[color\\:var\\(--my-color\\)\\], .text-\\[color\\:var\\(--my-color\\)\\]\\/50 {
       color: var(--my-color);
     }
 
-    .text-\\[color\\:var\\(--my-color\\)\\]\\/50, .text-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\], .text-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      color: color-mix(in oklab, var(--my-color) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+        color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
     }
 
-    .text-\\[var\\(--my-color\\)\\] {
+    .text-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
       color: var(--my-color);
     }
 
-    .text-\\[var\\(--my-color\\)\\]\\/50, .text-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\], .text-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      color: color-mix(in oklab, var(--my-color) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
     }
 
-    .text-current {
+    .text-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .text-\\[var\\(--my-color\\)\\], .text-\\[var\\(--my-color\\)\\]\\/50 {
+      color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-\\[var\\(--my-color\\)\\]\\/50 {
+        color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .text-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .text-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .text-blue-500 {
+      color: var(--text-color-blue-500);
+    }
+
+    .text-current, .text-current\\/50 {
       color: currentColor;
     }
 
-    .text-current\\/50, .text-current\\/\\[0\\.5\\], .text-current\\/\\[50\\%\\] {
-      color: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-current\\/50 {
+        color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .text-current\\/\\[0\\.5\\] {
+      color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-current\\/\\[0\\.5\\] {
+        color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .text-current\\/\\[50\\%\\] {
+      color: currentColor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-current\\/\\[50\\%\\] {
+        color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
     }
 
     .text-inherit {
@@ -15663,73 +26816,509 @@ test('text', async () => {
     }
 
     .text-red-500\\/2\\.5 {
-      color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-red-500\\/2\\.5 {
+        color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      }
     }
 
     .text-red-500\\/2\\.25 {
-      color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-red-500\\/2\\.25 {
+        color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      }
     }
 
     .text-red-500\\/2\\.75 {
-      color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      color: #ef444407;
     }
 
-    .text-red-500\\/50, .text-red-500\\/\\[0\\.5\\], .text-red-500\\/\\[50\\%\\] {
-      color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-red-500\\/2\\.75 {
+        color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      }
+    }
+
+    .text-red-500\\/50 {
+      color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-red-500\\/50 {
+        color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .text-red-500\\/\\[0\\.5\\] {
+      color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-red-500\\/\\[0\\.5\\] {
+        color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .text-red-500\\/\\[50\\%\\] {
+      color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-red-500\\/\\[50\\%\\] {
+        color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
     }
 
     .text-transparent {
       color: #0000;
-    }"
+    }
+    "
   `)
   expect(
-    await run([
-      'text',
-      // color
-      '-text-red-500',
-      '-text-red-500/50',
-      '-text-red-500/[0.5]',
-      '-text-red-500/[50%]',
-      '-text-current',
-      '-text-current/50',
-      '-text-current/[0.5]',
-      '-text-current/[50%]',
-      '-text-inherit',
-      '-text-transparent',
-      '-text-[#0088cc]',
-      '-text-[#0088cc]/50',
-      '-text-[#0088cc]/[0.5]',
-      '-text-[#0088cc]/[50%]',
+    await run(
+      [
+        'text',
+        // color
+        '-text-red-500',
+        '-text-red-500/50',
+        '-text-red-500/[0.5]',
+        '-text-red-500/[50%]',
+        '-text-current',
+        '-text-current/50',
+        '-text-current/[0.5]',
+        '-text-current/[50%]',
+        '-text-inherit',
+        '-text-transparent',
+        '-text-[#0088cc]',
+        '-text-[#0088cc]/50',
+        '-text-[#0088cc]/[0.5]',
+        '-text-[#0088cc]/[50%]',
 
-      // font-size / line-height / letter-spacing / font-weight
-      '-text-sm',
-      '-text-sm/6',
-      '-text-sm/[4px]',
-    ]),
+        // font-size / line-height / letter-spacing / font-weight
+        '-text-sm',
+        '-text-sm/6',
+        'text-sm/foo',
+        '-text-sm/[4px]',
+        'text-[10px]/foo',
+      ],
+      css`
+        @theme inline reference {
+          --text-sm: 0.875rem;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toEqual('')
+})
+
+test('text-shadow', async () => {
+  expect(
+    await run(
+      [
+        // Shadows
+        'text-shadow-2xs',
+        'text-shadow-sm',
+        'text-shadow-none',
+        'text-shadow-[12px_12px_#0088cc]',
+        'text-shadow-[12px_12px_var(--value)]',
+        'text-shadow-[10px_10px]',
+        'text-shadow-[var(--value)]',
+        'text-shadow-[shadow:var(--value)]',
+
+        'text-shadow-sm/25',
+        'text-shadow-sm/12.5',
+        'text-shadow-[12px_12px_#0088cc]/25',
+        'text-shadow-[12px_12px_var(--value)]/25',
+        'text-shadow-[10px_10px]/25',
+
+        // Colors
+        'text-shadow-red-500',
+        'text-shadow-red-500/50',
+        'text-shadow-red-500/2.25',
+        'text-shadow-red-500/2.5',
+        'text-shadow-red-500/2.75',
+        'text-shadow-red-500/[0.5]',
+        'text-shadow-red-500/[50%]',
+        'text-shadow-current',
+        'text-shadow-current/50',
+        'text-shadow-current/[0.5]',
+        'text-shadow-current/[50%]',
+        'text-shadow-inherit',
+        'text-shadow-transparent',
+        'text-shadow-[#0088cc]',
+        'text-shadow-[#0088cc]/50',
+        'text-shadow-[#0088cc]/[0.5]',
+        'text-shadow-[#0088cc]/[50%]',
+        'text-shadow-[color:var(--value)]',
+        'text-shadow-[color:var(--value)]/50',
+        'text-shadow-[color:var(--value)]/[0.5]',
+        'text-shadow-[color:var(--value)]/[50%]',
+      ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+          --text-shadow-2xs: 0px 1px 0px rgb(0 0 0 / 0.1);
+          --text-shadow-sm: 0px 1px 2px rgb(0 0 0 / 0.06), 0px 2px 2px rgb(0 0 0 / 0.06);
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-text-shadow-color: initial;
+          --tw-text-shadow-alpha: 100%;
+        }
+      }
+    }
+
+    :root, :host {
+      --color-red-500: #ef4444;
+    }
+
+    .text-shadow-\\[12px_12px_var\\(--value\\)\\]\\/25 {
+      --tw-text-shadow-alpha: 25%;
+      text-shadow: 12px 12px var(--tw-text-shadow-color, var(--value));
+    }
+
+    @supports (color: lab(from red l a b)) {
+      .text-shadow-\\[12px_12px_var\\(--value\\)\\]\\/25 {
+        text-shadow: 12px 12px var(--tw-text-shadow-color, oklab(from var(--value) l a b / 25%));
+      }
+    }
+
+    .text-shadow-\\[10px_10px\\]\\/25 {
+      --tw-text-shadow-alpha: 25%;
+      text-shadow: 10px 10px var(--tw-text-shadow-color, currentcolor);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-\\[10px_10px\\]\\/25 {
+        text-shadow: 10px 10px var(--tw-text-shadow-color, color-mix(in oklab, currentcolor 25%, transparent));
+      }
+    }
+
+    .text-shadow-\\[12px_12px_\\#0088cc\\]\\/25 {
+      --tw-text-shadow-alpha: 25%;
+      text-shadow: 12px 12px var(--tw-text-shadow-color, oklab(59.9824% -.067 -.124 / .25));
+    }
+
+    .text-shadow-sm\\/12\\.5 {
+      --tw-text-shadow-alpha: 12.5%;
+      text-shadow: 0px 1px 2px var(--tw-text-shadow-color, oklab(0% 0 0 / .125)), 0px 2px 2px var(--tw-text-shadow-color, oklab(0% 0 0 / .125));
+    }
+
+    .text-shadow-sm\\/25 {
+      --tw-text-shadow-alpha: 25%;
+      text-shadow: 0px 1px 2px var(--tw-text-shadow-color, oklab(0% 0 0 / .25)), 0px 2px 2px var(--tw-text-shadow-color, oklab(0% 0 0 / .25));
+    }
+
+    .text-shadow-2xs {
+      text-shadow: 0px 1px 0px var(--tw-text-shadow-color, #0000001a);
+    }
+
+    .text-shadow-\\[\\#0088cc\\] {
+      --tw-text-shadow-color: #08c;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-\\[\\#0088cc\\] {
+        --tw-text-shadow-color: color-mix(in oklab, #08c var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-\\[\\#0088cc\\]\\/50 {
+      --tw-text-shadow-color: #0088cc80;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-\\[\\#0088cc\\]\\/50 {
+        --tw-text-shadow-color: color-mix(in oklab, oklab(59.9824% -.067 -.124 / .5) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-\\[\\#0088cc\\]\\/\\[0\\.5\\] {
+      --tw-text-shadow-color: #0088cc80;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-\\[\\#0088cc\\]\\/\\[0\\.5\\] {
+        --tw-text-shadow-color: color-mix(in oklab, oklab(59.9824% -.067 -.124 / .5) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-\\[\\#0088cc\\]\\/\\[50\\%\\] {
+      --tw-text-shadow-color: #0088cc80;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-\\[\\#0088cc\\]\\/\\[50\\%\\] {
+        --tw-text-shadow-color: color-mix(in oklab, oklab(59.9824% -.067 -.124 / .5) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-\\[10px_10px\\] {
+      text-shadow: 10px 10px var(--tw-text-shadow-color, currentcolor);
+    }
+
+    .text-shadow-\\[12px_12px_\\#0088cc\\] {
+      text-shadow: 12px 12px var(--tw-text-shadow-color, #08c);
+    }
+
+    .text-shadow-\\[12px_12px_var\\(--value\\)\\] {
+      text-shadow: 12px 12px var(--tw-text-shadow-color, var(--value));
+    }
+
+    .text-shadow-\\[color\\:var\\(--value\\)\\] {
+      --tw-text-shadow-color: var(--value);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-\\[color\\:var\\(--value\\)\\] {
+        --tw-text-shadow-color: color-mix(in oklab, var(--value) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-\\[color\\:var\\(--value\\)\\]\\/50 {
+      --tw-text-shadow-color: var(--value);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-\\[color\\:var\\(--value\\)\\]\\/50 {
+        --tw-text-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--value) 50%, transparent) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-\\[color\\:var\\(--value\\)\\]\\/\\[0\\.5\\] {
+      --tw-text-shadow-color: var(--value);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-\\[color\\:var\\(--value\\)\\]\\/\\[0\\.5\\] {
+        --tw-text-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--value) 50%, transparent) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-\\[color\\:var\\(--value\\)\\]\\/\\[50\\%\\] {
+      --tw-text-shadow-color: var(--value);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-\\[color\\:var\\(--value\\)\\]\\/\\[50\\%\\] {
+        --tw-text-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--value) 50%, transparent) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-\\[shadow\\:var\\(--value\\)\\], .text-shadow-\\[var\\(--value\\)\\] {
+      text-shadow: var(--value);
+    }
+
+    .text-shadow-current {
+      --tw-text-shadow-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-current {
+        --tw-text-shadow-color: color-mix(in oklab, currentcolor var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-current\\/50 {
+      --tw-text-shadow-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-current\\/50 {
+        --tw-text-shadow-color: color-mix(in oklab, color-mix(in oklab, currentcolor 50%, transparent) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-current\\/\\[0\\.5\\] {
+      --tw-text-shadow-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-current\\/\\[0\\.5\\] {
+        --tw-text-shadow-color: color-mix(in oklab, color-mix(in oklab, currentcolor 50%, transparent) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-current\\/\\[50\\%\\] {
+      --tw-text-shadow-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-current\\/\\[50\\%\\] {
+        --tw-text-shadow-color: color-mix(in oklab, color-mix(in oklab, currentcolor 50%, transparent) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-inherit {
+      --tw-text-shadow-color: inherit;
+    }
+
+    .text-shadow-none {
+      text-shadow: none;
+    }
+
+    .text-shadow-red-500 {
+      --tw-text-shadow-color: #ef4444;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-red-500 {
+        --tw-text-shadow-color: color-mix(in oklab, var(--color-red-500) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-red-500\\/2\\.5 {
+      --tw-text-shadow-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-red-500\\/2\\.5 {
+        --tw-text-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 2.5%, transparent) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-red-500\\/2\\.25 {
+      --tw-text-shadow-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-red-500\\/2\\.25 {
+        --tw-text-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 2.25%, transparent) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-red-500\\/2\\.75 {
+      --tw-text-shadow-color: #ef444407;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-red-500\\/2\\.75 {
+        --tw-text-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 2.75%, transparent) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-red-500\\/50 {
+      --tw-text-shadow-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-red-500\\/50 {
+        --tw-text-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 50%, transparent) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-red-500\\/\\[0\\.5\\] {
+      --tw-text-shadow-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-red-500\\/\\[0\\.5\\] {
+        --tw-text-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 50%, transparent) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-red-500\\/\\[50\\%\\] {
+      --tw-text-shadow-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-red-500\\/\\[50\\%\\] {
+        --tw-text-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 50%, transparent) var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    .text-shadow-sm {
+      text-shadow: 0px 1px 2px var(--tw-text-shadow-color, #0000000f), 0px 2px 2px var(--tw-text-shadow-color, #0000000f);
+    }
+
+    .text-shadow-transparent {
+      --tw-text-shadow-color: transparent;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .text-shadow-transparent {
+        --tw-text-shadow-color: color-mix(in oklab, transparent var(--tw-text-shadow-alpha), transparent);
+      }
+    }
+
+    @property --tw-text-shadow-color {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-text-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+    "
+  `)
+  expect(
+    await run(
+      [
+        '-text-shadow-sm',
+        '-text-shadow-none',
+        '-text-shadow-red-500',
+        '-text-shadow-red-500/50',
+        '-text-shadow-red-500/[0.5]',
+        '-text-shadow-red-500/[50%]',
+        '-text-shadow-current',
+        '-text-shadow-current/50',
+        '-text-shadow-current/[0.5]',
+        '-text-shadow-current/[50%]',
+        '-text-shadow-inherit',
+        '-text-shadow-transparent',
+        '-text-shadow-[#0088cc]',
+        '-text-shadow-[#0088cc]/50',
+        '-text-shadow-[#0088cc]/[0.5]',
+        '-text-shadow-[#0088cc]/[50%]',
+        '-text-shadow-[var(--value)]',
+        'text-shadow/foo',
+        'text-shadow-sm/foo',
+      ],
+      css`
+        @theme {
+          --text-shadow: 0 1px 1px rgb(0 0 0 / 0.05);
+          --text-shadow-sm: 0 1px 2px rgb(0 0 0 / 0.06);
+        }
+        @tailwind utilities;
+      `,
+    ),
   ).toEqual('')
 })
 
 test('shadow', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-          --shadow-sm: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
-          --shadow-xl: 0 20px 25px -5px rgb(0 0 0 / 0.1), 0 8px 10px -6px rgb(0 0 0 / 0.1);
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         // Shadows
         'shadow-sm',
         'shadow-xl',
         'shadow-none',
         'shadow-[12px_12px_#0088cc]',
+        'shadow-[12px_12px_var(--value)]',
         'shadow-[10px_10px]',
         'shadow-[var(--value)]',
         'shadow-[shadow:var(--value)]',
 
+        'shadow-sm/25',
+        'shadow-sm/12.5',
+        'shadow-[12px_12px_#0088cc]/25',
+        'shadow-[12px_12px_var(--value)]/25',
+        'shadow-[10px_10px]/25',
+
         // Colors
         'shadow-red-500',
         'shadow-red-500/50',
@@ -15738,6 +27327,7 @@ test('shadow', async () => {
         'shadow-red-500/2.75',
         'shadow-red-500/[0.5]',
         'shadow-red-500/[50%]',
+        'shadow-blue-500',
         'shadow-current',
         'shadow-current/50',
         'shadow-current/[0.5]',
@@ -15753,12 +27343,90 @@ test('shadow', async () => {
         'shadow-[color:var(--value)]/[0.5]',
         'shadow-[color:var(--value)]/[50%]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+          --box-shadow-color-blue-500: #3b82f6;
+          --shadow-sm: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
+          --shadow-xl: 0 20px 25px -5px rgb(0 0 0 / 0.1), 0 8px 10px -6px rgb(0 0 0 / 0.1);
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-shadow: 0 0 #0000;
+          --tw-shadow-color: initial;
+          --tw-shadow-alpha: 100%;
+          --tw-inset-shadow: 0 0 #0000;
+          --tw-inset-shadow-color: initial;
+          --tw-inset-shadow-alpha: 100%;
+          --tw-ring-color: initial;
+          --tw-ring-shadow: 0 0 #0000;
+          --tw-inset-ring-color: initial;
+          --tw-inset-ring-shadow: 0 0 #0000;
+          --tw-ring-inset: initial;
+          --tw-ring-offset-width: 0px;
+          --tw-ring-offset-color: #fff;
+          --tw-ring-offset-shadow: 0 0 #0000;
+        }
+      }
+    }
+
+    :root, :host {
       --color-red-500: #ef4444;
-      --shadow-sm: 0 1px 3px 0 #0000001a, 0 1px 2px -1px #0000001a;
-      --shadow-xl: 0 20px 25px -5px #0000001a, 0 8px 10px -6px #0000001a;
+      --box-shadow-color-blue-500: #3b82f6;
+    }
+
+    .shadow-\\[12px_12px_var\\(--value\\)\\]\\/25 {
+      --tw-shadow-alpha: 25%;
+      --tw-shadow: 12px 12px var(--tw-shadow-color, var(--value));
+    }
+
+    @supports (color: lab(from red l a b)) {
+      .shadow-\\[12px_12px_var\\(--value\\)\\]\\/25 {
+        --tw-shadow: 12px 12px var(--tw-shadow-color, oklab(from var(--value) l a b / 25%));
+      }
+    }
+
+    .shadow-\\[12px_12px_var\\(--value\\)\\]\\/25 {
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+
+    .shadow-\\[10px_10px\\]\\/25 {
+      --tw-shadow-alpha: 25%;
+      --tw-shadow: 10px 10px var(--tw-shadow-color, currentcolor);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-\\[10px_10px\\]\\/25 {
+        --tw-shadow: 10px 10px var(--tw-shadow-color, color-mix(in oklab, currentcolor 25%, transparent));
+      }
+    }
+
+    .shadow-\\[10px_10px\\]\\/25 {
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+
+    .shadow-\\[12px_12px_\\#0088cc\\]\\/25 {
+      --tw-shadow-alpha: 25%;
+      --tw-shadow: 12px 12px var(--tw-shadow-color, oklab(59.9824% -.067 -.124 / .25));
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+
+    .shadow-sm\\/12\\.5 {
+      --tw-shadow-alpha: 12.5%;
+      --tw-shadow: 0 1px 3px 0 var(--tw-shadow-color, oklab(0% 0 0 / .125)), 0 1px 2px -1px var(--tw-shadow-color, oklab(0% 0 0 / .125));
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+
+    .shadow-sm\\/25 {
+      --tw-shadow-alpha: 25%;
+      --tw-shadow: 0 1px 3px 0 var(--tw-shadow-color, oklab(0% 0 0 / .25)), 0 1px 2px -1px var(--tw-shadow-color, oklab(0% 0 0 / .25));
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .shadow-\\[10px_10px\\] {
@@ -15771,6 +27439,11 @@ test('shadow', async () => {
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
+    .shadow-\\[12px_12px_var\\(--value\\)\\] {
+      --tw-shadow: 12px 12px var(--tw-shadow-color, var(--value));
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+
     .shadow-\\[shadow\\:var\\(--value\\)\\], .shadow-\\[var\\(--value\\)\\] {
       --tw-shadow: var(--value);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
@@ -15795,24 +27468,130 @@ test('shadow', async () => {
       --tw-shadow-color: #08c;
     }
 
-    .shadow-\\[\\#0088cc\\]\\/50, .shadow-\\[\\#0088cc\\]\\/\\[0\\.5\\], .shadow-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      --tw-shadow-color: oklab(59.9824% -.06725 -.12414 / .5);
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-\\[\\#0088cc\\] {
+        --tw-shadow-color: color-mix(in oklab, #08c var(--tw-shadow-alpha), transparent);
+      }
+    }
+
+    .shadow-\\[\\#0088cc\\]\\/50 {
+      --tw-shadow-color: #0088cc80;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-\\[\\#0088cc\\]\\/50 {
+        --tw-shadow-color: color-mix(in oklab, oklab(59.9824% -.067 -.124 / .5) var(--tw-shadow-alpha), transparent);
+      }
+    }
+
+    .shadow-\\[\\#0088cc\\]\\/\\[0\\.5\\] {
+      --tw-shadow-color: #0088cc80;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-\\[\\#0088cc\\]\\/\\[0\\.5\\] {
+        --tw-shadow-color: color-mix(in oklab, oklab(59.9824% -.067 -.124 / .5) var(--tw-shadow-alpha), transparent);
+      }
+    }
+
+    .shadow-\\[\\#0088cc\\]\\/\\[50\\%\\] {
+      --tw-shadow-color: #0088cc80;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-\\[\\#0088cc\\]\\/\\[50\\%\\] {
+        --tw-shadow-color: color-mix(in oklab, oklab(59.9824% -.067 -.124 / .5) var(--tw-shadow-alpha), transparent);
+      }
     }
 
     .shadow-\\[color\\:var\\(--value\\)\\] {
       --tw-shadow-color: var(--value);
     }
 
-    .shadow-\\[color\\:var\\(--value\\)\\]\\/50, .shadow-\\[color\\:var\\(--value\\)\\]\\/\\[0\\.5\\], .shadow-\\[color\\:var\\(--value\\)\\]\\/\\[50\\%\\] {
-      --tw-shadow-color: color-mix(in oklab, var(--value) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-\\[color\\:var\\(--value\\)\\] {
+        --tw-shadow-color: color-mix(in oklab, var(--value) var(--tw-shadow-alpha), transparent);
+      }
+    }
+
+    .shadow-\\[color\\:var\\(--value\\)\\]\\/50 {
+      --tw-shadow-color: var(--value);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-\\[color\\:var\\(--value\\)\\]\\/50 {
+        --tw-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--value) 50%, transparent) var(--tw-shadow-alpha), transparent);
+      }
+    }
+
+    .shadow-\\[color\\:var\\(--value\\)\\]\\/\\[0\\.5\\] {
+      --tw-shadow-color: var(--value);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-\\[color\\:var\\(--value\\)\\]\\/\\[0\\.5\\] {
+        --tw-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--value) 50%, transparent) var(--tw-shadow-alpha), transparent);
+      }
+    }
+
+    .shadow-\\[color\\:var\\(--value\\)\\]\\/\\[50\\%\\] {
+      --tw-shadow-color: var(--value);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-\\[color\\:var\\(--value\\)\\]\\/\\[50\\%\\] {
+        --tw-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--value) 50%, transparent) var(--tw-shadow-alpha), transparent);
+      }
+    }
+
+    .shadow-blue-500 {
+      --tw-shadow-color: #3b82f6;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-blue-500 {
+        --tw-shadow-color: color-mix(in oklab, var(--box-shadow-color-blue-500) var(--tw-shadow-alpha), transparent);
+      }
     }
 
     .shadow-current {
-      --tw-shadow-color: currentColor;
+      --tw-shadow-color: currentcolor;
     }
 
-    .shadow-current\\/50, .shadow-current\\/\\[0\\.5\\], .shadow-current\\/\\[50\\%\\] {
-      --tw-shadow-color: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-current {
+        --tw-shadow-color: color-mix(in oklab, currentcolor var(--tw-shadow-alpha), transparent);
+      }
+    }
+
+    .shadow-current\\/50 {
+      --tw-shadow-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-current\\/50 {
+        --tw-shadow-color: color-mix(in oklab, color-mix(in oklab, currentcolor 50%, transparent) var(--tw-shadow-alpha), transparent);
+      }
+    }
+
+    .shadow-current\\/\\[0\\.5\\] {
+      --tw-shadow-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-current\\/\\[0\\.5\\] {
+        --tw-shadow-color: color-mix(in oklab, color-mix(in oklab, currentcolor 50%, transparent) var(--tw-shadow-alpha), transparent);
+      }
+    }
+
+    .shadow-current\\/\\[50\\%\\] {
+      --tw-shadow-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-current\\/\\[50\\%\\] {
+        --tw-shadow-color: color-mix(in oklab, color-mix(in oklab, currentcolor 50%, transparent) var(--tw-shadow-alpha), transparent);
+      }
     }
 
     .shadow-inherit {
@@ -15820,45 +27599,82 @@ test('shadow', async () => {
     }
 
     .shadow-red-500 {
-      --tw-shadow-color: var(--color-red-500);
+      --tw-shadow-color: #ef4444;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-red-500 {
+        --tw-shadow-color: color-mix(in oklab, var(--color-red-500) var(--tw-shadow-alpha), transparent);
+      }
     }
 
     .shadow-red-500\\/2\\.5 {
-      --tw-shadow-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      --tw-shadow-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-red-500\\/2\\.5 {
+        --tw-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 2.5%, transparent) var(--tw-shadow-alpha), transparent);
+      }
     }
 
     .shadow-red-500\\/2\\.25 {
-      --tw-shadow-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      --tw-shadow-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-red-500\\/2\\.25 {
+        --tw-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 2.25%, transparent) var(--tw-shadow-alpha), transparent);
+      }
     }
 
     .shadow-red-500\\/2\\.75 {
-      --tw-shadow-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      --tw-shadow-color: #ef444407;
     }
 
-    .shadow-red-500\\/50, .shadow-red-500\\/\\[0\\.5\\], .shadow-red-500\\/\\[50\\%\\] {
-      --tw-shadow-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-red-500\\/2\\.75 {
+        --tw-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 2.75%, transparent) var(--tw-shadow-alpha), transparent);
+      }
+    }
+
+    .shadow-red-500\\/50 {
+      --tw-shadow-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-red-500\\/50 {
+        --tw-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 50%, transparent) var(--tw-shadow-alpha), transparent);
+      }
+    }
+
+    .shadow-red-500\\/\\[0\\.5\\] {
+      --tw-shadow-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-red-500\\/\\[0\\.5\\] {
+        --tw-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 50%, transparent) var(--tw-shadow-alpha), transparent);
+      }
+    }
+
+    .shadow-red-500\\/\\[50\\%\\] {
+      --tw-shadow-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-red-500\\/\\[50\\%\\] {
+        --tw-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 50%, transparent) var(--tw-shadow-alpha), transparent);
+      }
     }
 
     .shadow-transparent {
       --tw-shadow-color: transparent;
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-shadow: 0 0 #0000;
-          --tw-shadow-color: initial;
-          --tw-inset-shadow: 0 0 #0000;
-          --tw-inset-shadow-color: initial;
-          --tw-ring-color: initial;
-          --tw-ring-shadow: 0 0 #0000;
-          --tw-inset-ring-color: initial;
-          --tw-inset-ring-shadow: 0 0 #0000;
-          --tw-ring-inset: initial;
-          --tw-ring-offset-width: 0px;
-          --tw-ring-offset-color: #fff;
-          --tw-ring-offset-shadow: 0 0 #0000;
-        }
+    @supports (color: color-mix(in lab, red, red)) {
+      .shadow-transparent {
+        --tw-shadow-color: color-mix(in oklab, transparent var(--tw-shadow-alpha), transparent);
       }
     }
 
@@ -15873,6 +27689,12 @@ test('shadow', async () => {
       inherits: false
     }
 
+    @property --tw-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+
     @property --tw-inset-shadow {
       syntax: "*";
       inherits: false;
@@ -15884,6 +27706,12 @@ test('shadow', async () => {
       inherits: false
     }
 
+    @property --tw-inset-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+
     @property --tw-ring-color {
       syntax: "*";
       inherits: false
@@ -15927,51 +27755,66 @@ test('shadow', async () => {
       syntax: "*";
       inherits: false;
       initial-value: 0 0 #0000;
-    }"
+    }
+    "
   `)
   expect(
-    await run([
-      '-shadow-xl',
-      '-shadow-none',
-      '-shadow-red-500',
-      '-shadow-red-500/50',
-      '-shadow-red-500/[0.5]',
-      '-shadow-red-500/[50%]',
-      '-shadow-current',
-      '-shadow-current/50',
-      '-shadow-current/[0.5]',
-      '-shadow-current/[50%]',
-      '-shadow-inherit',
-      '-shadow-transparent',
-      '-shadow-[#0088cc]',
-      '-shadow-[#0088cc]/50',
-      '-shadow-[#0088cc]/[0.5]',
-      '-shadow-[#0088cc]/[50%]',
-      '-shadow-[var(--value)]',
-    ]),
+    await run(
+      [
+        '-shadow-sm',
+        '-shadow-none',
+        '-shadow-red-500',
+        '-shadow-red-500/50',
+        '-shadow-red-500/[0.5]',
+        '-shadow-red-500/[50%]',
+        '-shadow-current',
+        '-shadow-current/50',
+        '-shadow-current/[0.5]',
+        '-shadow-current/[50%]',
+        '-shadow-inherit',
+        '-shadow-transparent',
+        '-shadow-[#0088cc]',
+        '-shadow-[#0088cc]/50',
+        '-shadow-[#0088cc]/[0.5]',
+        '-shadow-[#0088cc]/[50%]',
+        '-shadow-[var(--value)]',
+        'shadow/foo',
+        'shadow-sm/foo',
+        'shadow-[10px_10px]/foo',
+        'shadow-[#0088cc]/foo',
+      ],
+      css`
+        @theme {
+          --shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1);
+          --shadow-sm: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);
+        }
+        @tailwind utilities;
+      `,
+    ),
   ).toEqual('')
 })
 
 test('inset-shadow', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-          --inset-shadow: inset 0 2px 4px rgb(0 0 0 / 0.05);
-          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         // Shadows
         'inset-shadow',
         'inset-shadow-sm',
         'inset-shadow-none',
         'inset-shadow-[12px_12px_#0088cc]',
+        'inset-shadow-[12px_12px_var(--value)]',
         'inset-shadow-[10px_10px]',
         'inset-shadow-[var(--value)]',
         'inset-shadow-[shadow:var(--value)]',
+        'inset-shadow-[12px_12px_#0088cc,12px_12px_var(--value,#0088cc)]',
+
+        'inset-shadow-sm/25',
+        'inset-shadow-sm/12.5',
+        'inset-shadow-[12px_12px_#0088cc]/25',
+        'inset-shadow-[12px_12px_var(--value)]/25',
+        'inset-shadow-[10px_10px]/25',
+        'inset-shadow-[12px_12px_#0088cc,12px_12px_var(--value,#0088cc)]/25',
 
         // Colors
         'inset-shadow-red-500',
@@ -15996,12 +27839,103 @@ test('inset-shadow', async () => {
         'inset-shadow-[color:var(--value)]/[0.5]',
         'inset-shadow-[color:var(--value)]/[50%]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+          --inset-shadow: inset 0 2px 4px rgb(0 0 0 / 0.05);
+          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-shadow: 0 0 #0000;
+          --tw-shadow-color: initial;
+          --tw-shadow-alpha: 100%;
+          --tw-inset-shadow: 0 0 #0000;
+          --tw-inset-shadow-color: initial;
+          --tw-inset-shadow-alpha: 100%;
+          --tw-ring-color: initial;
+          --tw-ring-shadow: 0 0 #0000;
+          --tw-inset-ring-color: initial;
+          --tw-inset-ring-shadow: 0 0 #0000;
+          --tw-ring-inset: initial;
+          --tw-ring-offset-width: 0px;
+          --tw-ring-offset-color: #fff;
+          --tw-ring-offset-shadow: 0 0 #0000;
+        }
+      }
+    }
+
+    :root, :host {
       --color-red-500: #ef4444;
-      --inset-shadow: inset 0 2px 4px #0000000d;
-      --inset-shadow-sm: inset 0 1px 1px #0000000d;
+    }
+
+    .inset-shadow-\\[12px_12px_\\#0088cc\\,12px_12px_var\\(--value\\,\\#0088cc\\)\\]\\/25 {
+      --tw-inset-shadow-alpha: 25%;
+      --tw-inset-shadow: inset 12px 12px var(--tw-inset-shadow-color, #08c), inset 12px 12px var(--tw-inset-shadow-color, var(--value, #08c));
+    }
+
+    @supports (color: lab(from red l a b)) {
+      .inset-shadow-\\[12px_12px_\\#0088cc\\,12px_12px_var\\(--value\\,\\#0088cc\\)\\]\\/25 {
+        --tw-inset-shadow: inset 12px 12px var(--tw-inset-shadow-color, oklab(59.9824% -.067 -.124 / .25)), inset 12px 12px var(--tw-inset-shadow-color, oklab(from var(--value, #08c) l a b / 25%));
+      }
+    }
+
+    .inset-shadow-\\[12px_12px_\\#0088cc\\,12px_12px_var\\(--value\\,\\#0088cc\\)\\]\\/25 {
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+
+    .inset-shadow-\\[12px_12px_var\\(--value\\)\\]\\/25 {
+      --tw-inset-shadow-alpha: 25%;
+      --tw-inset-shadow: inset 12px 12px var(--tw-inset-shadow-color, var(--value));
+    }
+
+    @supports (color: lab(from red l a b)) {
+      .inset-shadow-\\[12px_12px_var\\(--value\\)\\]\\/25 {
+        --tw-inset-shadow: inset 12px 12px var(--tw-inset-shadow-color, oklab(from var(--value) l a b / 25%));
+      }
+    }
+
+    .inset-shadow-\\[12px_12px_var\\(--value\\)\\]\\/25 {
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+
+    .inset-shadow-\\[10px_10px\\]\\/25 {
+      --tw-inset-shadow-alpha: 25%;
+      --tw-inset-shadow: inset 10px 10px var(--tw-inset-shadow-color, currentcolor);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-\\[10px_10px\\]\\/25 {
+        --tw-inset-shadow: inset 10px 10px var(--tw-inset-shadow-color, color-mix(in oklab, currentcolor 25%, transparent));
+      }
+    }
+
+    .inset-shadow-\\[10px_10px\\]\\/25 {
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+
+    .inset-shadow-\\[12px_12px_\\#0088cc\\]\\/25 {
+      --tw-inset-shadow-alpha: 25%;
+      --tw-inset-shadow: inset 12px 12px var(--tw-inset-shadow-color, oklab(59.9824% -.067 -.124 / .25));
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+
+    .inset-shadow-sm\\/12\\.5 {
+      --tw-inset-shadow-alpha: 12.5%;
+      --tw-inset-shadow: inset 0 1px 1px var(--tw-inset-shadow-color, oklab(0% 0 0 / .125));
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+
+    .inset-shadow-sm\\/25 {
+      --tw-inset-shadow-alpha: 25%;
+      --tw-inset-shadow: inset 0 1px 1px var(--tw-inset-shadow-color, oklab(0% 0 0 / .25));
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .inset-shadow {
@@ -16014,18 +27948,28 @@ test('inset-shadow', async () => {
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
+    .inset-shadow-\\[12px_12px_\\#0088cc\\,12px_12px_var\\(--value\\,\\#0088cc\\)\\] {
+      --tw-inset-shadow: inset 12px 12px var(--tw-inset-shadow-color, #08c), inset 12px 12px var(--tw-inset-shadow-color, var(--value, #08c));
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+
     .inset-shadow-\\[12px_12px_\\#0088cc\\] {
       --tw-inset-shadow: inset 12px 12px var(--tw-inset-shadow-color, #08c);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
+    .inset-shadow-\\[12px_12px_var\\(--value\\)\\] {
+      --tw-inset-shadow: inset 12px 12px var(--tw-inset-shadow-color, var(--value));
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+
     .inset-shadow-\\[shadow\\:var\\(--value\\)\\], .inset-shadow-\\[var\\(--value\\)\\] {
       --tw-inset-shadow: inset var(--value);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .inset-shadow-none {
-      --tw-inset-shadow: 0 0 #0000;
+      --tw-inset-shadow: inset 0 0 #0000;
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
@@ -16038,24 +27982,120 @@ test('inset-shadow', async () => {
       --tw-inset-shadow-color: #08c;
     }
 
-    .inset-shadow-\\[\\#0088cc\\]\\/50, .inset-shadow-\\[\\#0088cc\\]\\/\\[0\\.5\\], .inset-shadow-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      --tw-inset-shadow-color: oklab(59.9824% -.06725 -.12414 / .5);
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-\\[\\#0088cc\\] {
+        --tw-inset-shadow-color: color-mix(in oklab, #08c var(--tw-inset-shadow-alpha), transparent);
+      }
+    }
+
+    .inset-shadow-\\[\\#0088cc\\]\\/50 {
+      --tw-inset-shadow-color: #0088cc80;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-\\[\\#0088cc\\]\\/50 {
+        --tw-inset-shadow-color: color-mix(in oklab, oklab(59.9824% -.067 -.124 / .5) var(--tw-inset-shadow-alpha), transparent);
+      }
+    }
+
+    .inset-shadow-\\[\\#0088cc\\]\\/\\[0\\.5\\] {
+      --tw-inset-shadow-color: #0088cc80;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-\\[\\#0088cc\\]\\/\\[0\\.5\\] {
+        --tw-inset-shadow-color: color-mix(in oklab, oklab(59.9824% -.067 -.124 / .5) var(--tw-inset-shadow-alpha), transparent);
+      }
+    }
+
+    .inset-shadow-\\[\\#0088cc\\]\\/\\[50\\%\\] {
+      --tw-inset-shadow-color: #0088cc80;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-\\[\\#0088cc\\]\\/\\[50\\%\\] {
+        --tw-inset-shadow-color: color-mix(in oklab, oklab(59.9824% -.067 -.124 / .5) var(--tw-inset-shadow-alpha), transparent);
+      }
     }
 
     .inset-shadow-\\[color\\:var\\(--value\\)\\] {
       --tw-inset-shadow-color: var(--value);
     }
 
-    .inset-shadow-\\[color\\:var\\(--value\\)\\]\\/50, .inset-shadow-\\[color\\:var\\(--value\\)\\]\\/\\[0\\.5\\], .inset-shadow-\\[color\\:var\\(--value\\)\\]\\/\\[50\\%\\] {
-      --tw-inset-shadow-color: color-mix(in oklab, var(--value) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-\\[color\\:var\\(--value\\)\\] {
+        --tw-inset-shadow-color: color-mix(in oklab, var(--value) var(--tw-inset-shadow-alpha), transparent);
+      }
+    }
+
+    .inset-shadow-\\[color\\:var\\(--value\\)\\]\\/50 {
+      --tw-inset-shadow-color: var(--value);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-\\[color\\:var\\(--value\\)\\]\\/50 {
+        --tw-inset-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--value) 50%, transparent) var(--tw-inset-shadow-alpha), transparent);
+      }
+    }
+
+    .inset-shadow-\\[color\\:var\\(--value\\)\\]\\/\\[0\\.5\\] {
+      --tw-inset-shadow-color: var(--value);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-\\[color\\:var\\(--value\\)\\]\\/\\[0\\.5\\] {
+        --tw-inset-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--value) 50%, transparent) var(--tw-inset-shadow-alpha), transparent);
+      }
+    }
+
+    .inset-shadow-\\[color\\:var\\(--value\\)\\]\\/\\[50\\%\\] {
+      --tw-inset-shadow-color: var(--value);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-\\[color\\:var\\(--value\\)\\]\\/\\[50\\%\\] {
+        --tw-inset-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--value) 50%, transparent) var(--tw-inset-shadow-alpha), transparent);
+      }
     }
 
     .inset-shadow-current {
-      --tw-inset-shadow-color: currentColor;
+      --tw-inset-shadow-color: currentcolor;
     }
 
-    .inset-shadow-current\\/50, .inset-shadow-current\\/\\[0\\.5\\], .inset-shadow-current\\/\\[50\\%\\] {
-      --tw-inset-shadow-color: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-current {
+        --tw-inset-shadow-color: color-mix(in oklab, currentcolor var(--tw-inset-shadow-alpha), transparent);
+      }
+    }
+
+    .inset-shadow-current\\/50 {
+      --tw-inset-shadow-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-current\\/50 {
+        --tw-inset-shadow-color: color-mix(in oklab, color-mix(in oklab, currentcolor 50%, transparent) var(--tw-inset-shadow-alpha), transparent);
+      }
+    }
+
+    .inset-shadow-current\\/\\[0\\.5\\] {
+      --tw-inset-shadow-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-current\\/\\[0\\.5\\] {
+        --tw-inset-shadow-color: color-mix(in oklab, color-mix(in oklab, currentcolor 50%, transparent) var(--tw-inset-shadow-alpha), transparent);
+      }
+    }
+
+    .inset-shadow-current\\/\\[50\\%\\] {
+      --tw-inset-shadow-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-current\\/\\[50\\%\\] {
+        --tw-inset-shadow-color: color-mix(in oklab, color-mix(in oklab, currentcolor 50%, transparent) var(--tw-inset-shadow-alpha), transparent);
+      }
     }
 
     .inset-shadow-inherit {
@@ -16063,45 +28103,82 @@ test('inset-shadow', async () => {
     }
 
     .inset-shadow-red-500 {
-      --tw-inset-shadow-color: var(--color-red-500);
+      --tw-inset-shadow-color: #ef4444;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-red-500 {
+        --tw-inset-shadow-color: color-mix(in oklab, var(--color-red-500) var(--tw-inset-shadow-alpha), transparent);
+      }
     }
 
     .inset-shadow-red-500\\/2\\.5 {
-      --tw-inset-shadow-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      --tw-inset-shadow-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-red-500\\/2\\.5 {
+        --tw-inset-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 2.5%, transparent) var(--tw-inset-shadow-alpha), transparent);
+      }
     }
 
     .inset-shadow-red-500\\/2\\.25 {
-      --tw-inset-shadow-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      --tw-inset-shadow-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-red-500\\/2\\.25 {
+        --tw-inset-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 2.25%, transparent) var(--tw-inset-shadow-alpha), transparent);
+      }
     }
 
     .inset-shadow-red-500\\/2\\.75 {
-      --tw-inset-shadow-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      --tw-inset-shadow-color: #ef444407;
     }
 
-    .inset-shadow-red-500\\/50, .inset-shadow-red-500\\/\\[0\\.5\\], .inset-shadow-red-500\\/\\[50\\%\\] {
-      --tw-inset-shadow-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-red-500\\/2\\.75 {
+        --tw-inset-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 2.75%, transparent) var(--tw-inset-shadow-alpha), transparent);
+      }
+    }
+
+    .inset-shadow-red-500\\/50 {
+      --tw-inset-shadow-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-red-500\\/50 {
+        --tw-inset-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 50%, transparent) var(--tw-inset-shadow-alpha), transparent);
+      }
+    }
+
+    .inset-shadow-red-500\\/\\[0\\.5\\] {
+      --tw-inset-shadow-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-red-500\\/\\[0\\.5\\] {
+        --tw-inset-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 50%, transparent) var(--tw-inset-shadow-alpha), transparent);
+      }
+    }
+
+    .inset-shadow-red-500\\/\\[50\\%\\] {
+      --tw-inset-shadow-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-red-500\\/\\[50\\%\\] {
+        --tw-inset-shadow-color: color-mix(in oklab, color-mix(in oklab, var(--color-red-500) 50%, transparent) var(--tw-inset-shadow-alpha), transparent);
+      }
     }
 
     .inset-shadow-transparent {
       --tw-inset-shadow-color: transparent;
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-shadow: 0 0 #0000;
-          --tw-shadow-color: initial;
-          --tw-inset-shadow: 0 0 #0000;
-          --tw-inset-shadow-color: initial;
-          --tw-ring-color: initial;
-          --tw-ring-shadow: 0 0 #0000;
-          --tw-inset-ring-color: initial;
-          --tw-inset-ring-shadow: 0 0 #0000;
-          --tw-ring-inset: initial;
-          --tw-ring-offset-width: 0px;
-          --tw-ring-offset-color: #fff;
-          --tw-ring-offset-shadow: 0 0 #0000;
-        }
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-shadow-transparent {
+        --tw-inset-shadow-color: color-mix(in oklab, transparent var(--tw-inset-shadow-alpha), transparent);
       }
     }
 
@@ -16116,6 +28193,12 @@ test('inset-shadow', async () => {
       inherits: false
     }
 
+    @property --tw-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+
     @property --tw-inset-shadow {
       syntax: "*";
       inherits: false;
@@ -16127,6 +28210,12 @@ test('inset-shadow', async () => {
       inherits: false
     }
 
+    @property --tw-inset-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+
     @property --tw-ring-color {
       syntax: "*";
       inherits: false
@@ -16170,40 +28259,47 @@ test('inset-shadow', async () => {
       syntax: "*";
       inherits: false;
       initial-value: 0 0 #0000;
-    }"
+    }
+    "
   `)
   expect(
-    await run([
-      '-inset-shadow-sm',
-      '-inset-shadow-none',
-      '-inset-shadow-red-500',
-      '-inset-shadow-red-500/50',
-      '-inset-shadow-red-500/[0.5]',
-      '-inset-shadow-red-500/[50%]',
-      '-inset-shadow-current',
-      '-inset-shadow-current/50',
-      '-inset-shadow-current/[0.5]',
-      '-inset-shadow-current/[50%]',
-      '-inset-shadow-inherit',
-      '-inset-shadow-transparent',
-      '-inset-shadow-[#0088cc]',
-      '-inset-shadow-[#0088cc]/50',
-      '-inset-shadow-[#0088cc]/[0.5]',
-      '-inset-shadow-[#0088cc]/[50%]',
-      '-inset-shadow-[var(--value)]',
-    ]),
+    await run(
+      [
+        '-inset-shadow-sm',
+        '-inset-shadow-none',
+        '-inset-shadow-red-500',
+        '-inset-shadow-red-500/50',
+        '-inset-shadow-red-500/[0.5]',
+        '-inset-shadow-red-500/[50%]',
+        '-inset-shadow-current',
+        '-inset-shadow-current/50',
+        '-inset-shadow-current/[0.5]',
+        '-inset-shadow-current/[50%]',
+        '-inset-shadow-inherit',
+        '-inset-shadow-transparent',
+        '-inset-shadow-[#0088cc]',
+        '-inset-shadow-[#0088cc]/50',
+        '-inset-shadow-[#0088cc]/[0.5]',
+        '-inset-shadow-[#0088cc]/[50%]',
+        '-inset-shadow-[var(--value)]',
+        'inset-shadow/foo',
+        'inset-shadow-sm/foo',
+        'inset-shadow-[10px_10px]/foo',
+      ],
+      css`
+        @theme {
+          --inset-shadow: inset 0 1px 3px 0 rgb(0 0 0 / 0.1);
+          --inset-shadow-sm: inset 0 1px 1px rgb(0 0 0 / 0.05);
+        }
+        @tailwind utilities;
+      `,
+    ),
   ).toEqual('')
 })
 
 test('ring', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         // ring color
         'ring-inset',
@@ -16214,6 +28310,7 @@ test('ring', async () => {
         'ring-red-500/2.75',
         'ring-red-500/[0.5]',
         'ring-red-500/[50%]',
+        'ring-blue-500',
         'ring-current',
         'ring-current/50',
         'ring-current/[0.5]',
@@ -16242,44 +28339,74 @@ test('ring', async () => {
         'ring-[12px]',
         'ring-[length:var(--my-width)]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+          --ring-color-blue-500: #3b82f6;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-shadow: 0 0 #0000;
+          --tw-shadow-color: initial;
+          --tw-shadow-alpha: 100%;
+          --tw-inset-shadow: 0 0 #0000;
+          --tw-inset-shadow-color: initial;
+          --tw-inset-shadow-alpha: 100%;
+          --tw-ring-color: initial;
+          --tw-ring-shadow: 0 0 #0000;
+          --tw-inset-ring-color: initial;
+          --tw-inset-ring-shadow: 0 0 #0000;
+          --tw-ring-inset: initial;
+          --tw-ring-offset-width: 0px;
+          --tw-ring-offset-color: #fff;
+          --tw-ring-offset-shadow: 0 0 #0000;
+        }
+      }
+    }
+
+    :root, :host {
       --color-red-500: #ef4444;
+      --ring-color-blue-500: #3b82f6;
     }
 
     .ring {
-      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentColor);
+      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .ring-0 {
-      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(0px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentColor);
+      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(0px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .ring-1 {
-      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentColor);
+      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .ring-2 {
-      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentColor);
+      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .ring-4 {
-      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentColor);
+      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .ring-\\[12px\\] {
-      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(12px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentColor);
+      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(12px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .ring-\\[length\\:var\\(--my-width\\)\\] {
-      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(var(--my-width)  + var(--tw-ring-offset-width)) var(--tw-ring-color, currentColor);
+      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(var(--my-width) + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
@@ -16288,31 +28415,101 @@ test('ring', async () => {
     }
 
     .ring-\\[\\#0088cc\\]\\/50, .ring-\\[\\#0088cc\\]\\/\\[0\\.5\\], .ring-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      --tw-ring-color: oklab(59.9824% -.06725 -.12414 / .5);
+      --tw-ring-color: oklab(59.9824% -.067 -.124 / .5);
     }
 
-    .ring-\\[color\\:var\\(--my-color\\)\\] {
+    .ring-\\[color\\:var\\(--my-color\\)\\], .ring-\\[color\\:var\\(--my-color\\)\\]\\/50 {
       --tw-ring-color: var(--my-color);
     }
 
-    .ring-\\[color\\:var\\(--my-color\\)\\]\\/50, .ring-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\], .ring-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      --tw-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+        --tw-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
     }
 
-    .ring-\\[var\\(--my-color\\)\\] {
+    .ring-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
       --tw-ring-color: var(--my-color);
     }
 
-    .ring-\\[var\\(--my-color\\)\\]\\/50, .ring-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\], .ring-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      --tw-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        --tw-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
     }
 
-    .ring-current {
-      --tw-ring-color: currentColor;
+    .ring-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-ring-color: var(--my-color);
     }
 
-    .ring-current\\/50, .ring-current\\/\\[0\\.5\\], .ring-current\\/\\[50\\%\\] {
-      --tw-ring-color: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        --tw-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .ring-\\[var\\(--my-color\\)\\], .ring-\\[var\\(--my-color\\)\\]\\/50 {
+      --tw-ring-color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-\\[var\\(--my-color\\)\\]\\/50 {
+        --tw-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .ring-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-ring-color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        --tw-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .ring-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-ring-color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        --tw-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .ring-blue-500 {
+      --tw-ring-color: var(--ring-color-blue-500);
+    }
+
+    .ring-current, .ring-current\\/50 {
+      --tw-ring-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-current\\/50 {
+        --tw-ring-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .ring-current\\/\\[0\\.5\\] {
+      --tw-ring-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-current\\/\\[0\\.5\\] {
+        --tw-ring-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .ring-current\\/\\[50\\%\\] {
+      --tw-ring-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-current\\/\\[50\\%\\] {
+        --tw-ring-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
     }
 
     .ring-inherit {
@@ -16324,19 +28521,63 @@ test('ring', async () => {
     }
 
     .ring-red-500\\/2\\.5 {
-      --tw-ring-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      --tw-ring-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-red-500\\/2\\.5 {
+        --tw-ring-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      }
     }
 
     .ring-red-500\\/2\\.25 {
-      --tw-ring-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      --tw-ring-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-red-500\\/2\\.25 {
+        --tw-ring-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      }
     }
 
     .ring-red-500\\/2\\.75 {
-      --tw-ring-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      --tw-ring-color: #ef444407;
     }
 
-    .ring-red-500\\/50, .ring-red-500\\/\\[0\\.5\\], .ring-red-500\\/\\[50\\%\\] {
-      --tw-ring-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-red-500\\/2\\.75 {
+        --tw-ring-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      }
+    }
+
+    .ring-red-500\\/50 {
+      --tw-ring-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-red-500\\/50 {
+        --tw-ring-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .ring-red-500\\/\\[0\\.5\\] {
+      --tw-ring-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-red-500\\/\\[0\\.5\\] {
+        --tw-ring-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .ring-red-500\\/\\[50\\%\\] {
+      --tw-ring-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-red-500\\/\\[50\\%\\] {
+        --tw-ring-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
     }
 
     .ring-transparent {
@@ -16347,25 +28588,6 @@ test('ring', async () => {
       --tw-ring-inset: inset;
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-shadow: 0 0 #0000;
-          --tw-shadow-color: initial;
-          --tw-inset-shadow: 0 0 #0000;
-          --tw-inset-shadow-color: initial;
-          --tw-ring-color: initial;
-          --tw-ring-shadow: 0 0 #0000;
-          --tw-inset-ring-color: initial;
-          --tw-inset-ring-shadow: 0 0 #0000;
-          --tw-ring-inset: initial;
-          --tw-ring-offset-width: 0px;
-          --tw-ring-offset-color: #fff;
-          --tw-ring-offset-shadow: 0 0 #0000;
-        }
-      }
-    }
-
     @property --tw-shadow {
       syntax: "*";
       inherits: false;
@@ -16377,6 +28599,12 @@ test('ring', async () => {
       inherits: false
     }
 
+    @property --tw-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+
     @property --tw-inset-shadow {
       syntax: "*";
       inherits: false;
@@ -16388,6 +28616,12 @@ test('ring', async () => {
       inherits: false
     }
 
+    @property --tw-inset-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+
     @property --tw-ring-color {
       syntax: "*";
       inherits: false
@@ -16431,7 +28665,126 @@ test('ring', async () => {
       syntax: "*";
       inherits: false;
       initial-value: 0 0 #0000;
-    }"
+    }
+    "
+  `)
+  expect(
+    await run(
+      ['ring'],
+      css`
+        @theme {
+          --default-ring-width: 2px;
+        }
+        @tailwind utilities;
+      `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-shadow: 0 0 #0000;
+          --tw-shadow-color: initial;
+          --tw-shadow-alpha: 100%;
+          --tw-inset-shadow: 0 0 #0000;
+          --tw-inset-shadow-color: initial;
+          --tw-inset-shadow-alpha: 100%;
+          --tw-ring-color: initial;
+          --tw-ring-shadow: 0 0 #0000;
+          --tw-inset-ring-color: initial;
+          --tw-inset-ring-shadow: 0 0 #0000;
+          --tw-ring-inset: initial;
+          --tw-ring-offset-width: 0px;
+          --tw-ring-offset-color: #fff;
+          --tw-ring-offset-shadow: 0 0 #0000;
+        }
+      }
+    }
+
+    .ring {
+      --tw-ring-shadow: var(--tw-ring-inset, ) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
+      box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
+    }
+
+    @property --tw-shadow {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0 0 #0000;
+    }
+
+    @property --tw-shadow-color {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-inset-shadow {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0 0 #0000;
+    }
+
+    @property --tw-inset-shadow-color {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-inset-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+
+    @property --tw-ring-color {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-ring-shadow {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0 0 #0000;
+    }
+
+    @property --tw-inset-ring-color {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-inset-ring-shadow {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0 0 #0000;
+    }
+
+    @property --tw-ring-inset {
+      syntax: "*";
+      inherits: false
+    }
+
+    @property --tw-ring-offset-width {
+      syntax: "<length>";
+      inherits: false;
+      initial-value: 0;
+    }
+
+    @property --tw-ring-offset-color {
+      syntax: "*";
+      inherits: false;
+      initial-value: #fff;
+    }
+
+    @property --tw-ring-offset-shadow {
+      syntax: "*";
+      inherits: false;
+      initial-value: 0 0 #0000;
+    }
+    "
   `)
   expect(
     await run([
@@ -16473,13 +28826,7 @@ test('ring', async () => {
 
 test('inset-ring', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         // ring color
         'inset-ring-red-500',
@@ -16517,44 +28864,72 @@ test('inset-ring', async () => {
         'inset-ring-[12px]',
         'inset-ring-[length:var(--my-width)]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-shadow: 0 0 #0000;
+          --tw-shadow-color: initial;
+          --tw-shadow-alpha: 100%;
+          --tw-inset-shadow: 0 0 #0000;
+          --tw-inset-shadow-color: initial;
+          --tw-inset-shadow-alpha: 100%;
+          --tw-ring-color: initial;
+          --tw-ring-shadow: 0 0 #0000;
+          --tw-inset-ring-color: initial;
+          --tw-inset-ring-shadow: 0 0 #0000;
+          --tw-ring-inset: initial;
+          --tw-ring-offset-width: 0px;
+          --tw-ring-offset-color: #fff;
+          --tw-ring-offset-shadow: 0 0 #0000;
+        }
+      }
+    }
+
+    :root, :host {
       --color-red-500: #ef4444;
     }
 
     .inset-ring {
-      --tw-inset-ring-shadow: inset 0 0 0 1px var(--tw-inset-ring-color, currentColor);
+      --tw-inset-ring-shadow: inset 0 0 0 1px var(--tw-inset-ring-color, currentcolor);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .inset-ring-0 {
-      --tw-inset-ring-shadow: inset 0 0 0 0px var(--tw-inset-ring-color, currentColor);
+      --tw-inset-ring-shadow: inset 0 0 0 0px var(--tw-inset-ring-color, currentcolor);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .inset-ring-1 {
-      --tw-inset-ring-shadow: inset 0 0 0 1px var(--tw-inset-ring-color, currentColor);
+      --tw-inset-ring-shadow: inset 0 0 0 1px var(--tw-inset-ring-color, currentcolor);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .inset-ring-2 {
-      --tw-inset-ring-shadow: inset 0 0 0 2px var(--tw-inset-ring-color, currentColor);
+      --tw-inset-ring-shadow: inset 0 0 0 2px var(--tw-inset-ring-color, currentcolor);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .inset-ring-4 {
-      --tw-inset-ring-shadow: inset 0 0 0 4px var(--tw-inset-ring-color, currentColor);
+      --tw-inset-ring-shadow: inset 0 0 0 4px var(--tw-inset-ring-color, currentcolor);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .inset-ring-\\[12px\\] {
-      --tw-inset-ring-shadow: inset 0 0 0 12px var(--tw-inset-ring-color, currentColor);
+      --tw-inset-ring-shadow: inset 0 0 0 12px var(--tw-inset-ring-color, currentcolor);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
     .inset-ring-\\[length\\:var\\(--my-width\\)\\] {
-      --tw-inset-ring-shadow: inset 0 0 0 var(--my-width) var(--tw-inset-ring-color, currentColor);
+      --tw-inset-ring-shadow: inset 0 0 0 var(--my-width) var(--tw-inset-ring-color, currentcolor);
       box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
     }
 
@@ -16563,31 +28938,97 @@ test('inset-ring', async () => {
     }
 
     .inset-ring-\\[\\#0088cc\\]\\/50, .inset-ring-\\[\\#0088cc\\]\\/\\[0\\.5\\], .inset-ring-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      --tw-inset-ring-color: oklab(59.9824% -.06725 -.12414 / .5);
+      --tw-inset-ring-color: oklab(59.9824% -.067 -.124 / .5);
     }
 
-    .inset-ring-\\[color\\:var\\(--my-color\\)\\] {
+    .inset-ring-\\[color\\:var\\(--my-color\\)\\], .inset-ring-\\[color\\:var\\(--my-color\\)\\]\\/50 {
       --tw-inset-ring-color: var(--my-color);
     }
 
-    .inset-ring-\\[color\\:var\\(--my-color\\)\\]\\/50, .inset-ring-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\], .inset-ring-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      --tw-inset-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+        --tw-inset-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
     }
 
-    .inset-ring-\\[var\\(--my-color\\)\\] {
+    .inset-ring-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
       --tw-inset-ring-color: var(--my-color);
     }
 
-    .inset-ring-\\[var\\(--my-color\\)\\]\\/50, .inset-ring-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\], .inset-ring-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      --tw-inset-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        --tw-inset-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
     }
 
-    .inset-ring-current {
-      --tw-inset-ring-color: currentColor;
+    .inset-ring-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-inset-ring-color: var(--my-color);
     }
 
-    .inset-ring-current\\/50, .inset-ring-current\\/\\[0\\.5\\], .inset-ring-current\\/\\[50\\%\\] {
-      --tw-inset-ring-color: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        --tw-inset-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .inset-ring-\\[var\\(--my-color\\)\\], .inset-ring-\\[var\\(--my-color\\)\\]\\/50 {
+      --tw-inset-ring-color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-\\[var\\(--my-color\\)\\]\\/50 {
+        --tw-inset-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .inset-ring-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-inset-ring-color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        --tw-inset-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .inset-ring-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-inset-ring-color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        --tw-inset-ring-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .inset-ring-current, .inset-ring-current\\/50 {
+      --tw-inset-ring-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-current\\/50 {
+        --tw-inset-ring-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .inset-ring-current\\/\\[0\\.5\\] {
+      --tw-inset-ring-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-current\\/\\[0\\.5\\] {
+        --tw-inset-ring-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .inset-ring-current\\/\\[50\\%\\] {
+      --tw-inset-ring-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-current\\/\\[50\\%\\] {
+        --tw-inset-ring-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
     }
 
     .inset-ring-inherit {
@@ -16599,44 +29040,69 @@ test('inset-ring', async () => {
     }
 
     .inset-ring-red-500\\/2\\.5 {
-      --tw-inset-ring-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      --tw-inset-ring-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-red-500\\/2\\.5 {
+        --tw-inset-ring-color: color-mix(in oklab, var(--color-red-500) 2.5%, transparent);
+      }
     }
 
     .inset-ring-red-500\\/2\\.25 {
-      --tw-inset-ring-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      --tw-inset-ring-color: #ef444406;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-red-500\\/2\\.25 {
+        --tw-inset-ring-color: color-mix(in oklab, var(--color-red-500) 2.25%, transparent);
+      }
     }
 
     .inset-ring-red-500\\/2\\.75 {
-      --tw-inset-ring-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      --tw-inset-ring-color: #ef444407;
     }
 
-    .inset-ring-red-500\\/50, .inset-ring-red-500\\/\\[0\\.5\\], .inset-ring-red-500\\/\\[50\\%\\] {
-      --tw-inset-ring-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-red-500\\/2\\.75 {
+        --tw-inset-ring-color: color-mix(in oklab, var(--color-red-500) 2.75%, transparent);
+      }
+    }
+
+    .inset-ring-red-500\\/50 {
+      --tw-inset-ring-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-red-500\\/50 {
+        --tw-inset-ring-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .inset-ring-red-500\\/\\[0\\.5\\] {
+      --tw-inset-ring-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-red-500\\/\\[0\\.5\\] {
+        --tw-inset-ring-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .inset-ring-red-500\\/\\[50\\%\\] {
+      --tw-inset-ring-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .inset-ring-red-500\\/\\[50\\%\\] {
+        --tw-inset-ring-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
     }
 
     .inset-ring-transparent {
       --tw-inset-ring-color: transparent;
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-shadow: 0 0 #0000;
-          --tw-shadow-color: initial;
-          --tw-inset-shadow: 0 0 #0000;
-          --tw-inset-shadow-color: initial;
-          --tw-ring-color: initial;
-          --tw-ring-shadow: 0 0 #0000;
-          --tw-inset-ring-color: initial;
-          --tw-inset-ring-shadow: 0 0 #0000;
-          --tw-ring-inset: initial;
-          --tw-ring-offset-width: 0px;
-          --tw-ring-offset-color: #fff;
-          --tw-ring-offset-shadow: 0 0 #0000;
-        }
-      }
-    }
-
     @property --tw-shadow {
       syntax: "*";
       inherits: false;
@@ -16648,6 +29114,12 @@ test('inset-ring', async () => {
       inherits: false
     }
 
+    @property --tw-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+
     @property --tw-inset-shadow {
       syntax: "*";
       inherits: false;
@@ -16659,6 +29131,12 @@ test('inset-ring', async () => {
       inherits: false
     }
 
+    @property --tw-inset-shadow-alpha {
+      syntax: "<percentage>";
+      inherits: false;
+      initial-value: 100%;
+    }
+
     @property --tw-ring-color {
       syntax: "*";
       inherits: false
@@ -16702,7 +29180,8 @@ test('inset-ring', async () => {
       syntax: "*";
       inherits: false;
       initial-value: 0 0 #0000;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -16743,13 +29222,7 @@ test('inset-ring', async () => {
 
 test('ring-offset', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --color-red-500: #ef4444;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         // ring color
         'ring-offset-inset',
@@ -16757,6 +29230,7 @@ test('ring-offset', async () => {
         'ring-offset-red-500/50',
         'ring-offset-red-500/[0.5]',
         'ring-offset-red-500/[50%]',
+        'ring-offset-blue-500',
         'ring-offset-current',
         'ring-offset-current/50',
         'ring-offset-current/[0.5]',
@@ -16785,10 +29259,19 @@ test('ring-offset', async () => {
         'ring-offset-[12px]',
         'ring-offset-[length:var(--my-width)]',
       ],
+      css`
+        @theme {
+          --color-red-500: #ef4444;
+          --ring-offset-color-blue-500: #3b82f6;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
+    "
+    :root, :host {
       --color-red-500: #ef4444;
+      --ring-offset-color-blue-500: #3b82f6;
     }
 
     .ring-offset-0 {
@@ -16826,31 +29309,101 @@ test('ring-offset', async () => {
     }
 
     .ring-offset-\\[\\#0088cc\\]\\/50, .ring-offset-\\[\\#0088cc\\]\\/\\[0\\.5\\], .ring-offset-\\[\\#0088cc\\]\\/\\[50\\%\\] {
-      --tw-ring-offset-color: oklab(59.9824% -.06725 -.12414 / .5);
+      --tw-ring-offset-color: oklab(59.9824% -.067 -.124 / .5);
     }
 
-    .ring-offset-\\[color\\:var\\(--my-color\\)\\] {
+    .ring-offset-\\[color\\:var\\(--my-color\\)\\], .ring-offset-\\[color\\:var\\(--my-color\\)\\]\\/50 {
       --tw-ring-offset-color: var(--my-color);
     }
 
-    .ring-offset-\\[color\\:var\\(--my-color\\)\\]\\/50, .ring-offset-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\], .ring-offset-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      --tw-ring-offset-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-offset-\\[color\\:var\\(--my-color\\)\\]\\/50 {
+        --tw-ring-offset-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
     }
 
-    .ring-offset-\\[var\\(--my-color\\)\\] {
+    .ring-offset-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
       --tw-ring-offset-color: var(--my-color);
     }
 
-    .ring-offset-\\[var\\(--my-color\\)\\]\\/50, .ring-offset-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\], .ring-offset-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
-      --tw-ring-offset-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-offset-\\[color\\:var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        --tw-ring-offset-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
     }
 
-    .ring-offset-current {
-      --tw-ring-offset-color: currentColor;
+    .ring-offset-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-ring-offset-color: var(--my-color);
     }
 
-    .ring-offset-current\\/50, .ring-offset-current\\/\\[0\\.5\\], .ring-offset-current\\/\\[50\\%\\] {
-      --tw-ring-offset-color: color-mix(in oklab, currentColor 50%, transparent);
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-offset-\\[color\\:var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        --tw-ring-offset-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .ring-offset-\\[var\\(--my-color\\)\\], .ring-offset-\\[var\\(--my-color\\)\\]\\/50 {
+      --tw-ring-offset-color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-offset-\\[var\\(--my-color\\)\\]\\/50 {
+        --tw-ring-offset-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .ring-offset-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+      --tw-ring-offset-color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-offset-\\[var\\(--my-color\\)\\]\\/\\[0\\.5\\] {
+        --tw-ring-offset-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .ring-offset-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+      --tw-ring-offset-color: var(--my-color);
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-offset-\\[var\\(--my-color\\)\\]\\/\\[50\\%\\] {
+        --tw-ring-offset-color: color-mix(in oklab, var(--my-color) 50%, transparent);
+      }
+    }
+
+    .ring-offset-blue-500 {
+      --tw-ring-offset-color: var(--ring-offset-color-blue-500);
+    }
+
+    .ring-offset-current, .ring-offset-current\\/50 {
+      --tw-ring-offset-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-offset-current\\/50 {
+        --tw-ring-offset-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .ring-offset-current\\/\\[0\\.5\\] {
+      --tw-ring-offset-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-offset-current\\/\\[0\\.5\\] {
+        --tw-ring-offset-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
+    }
+
+    .ring-offset-current\\/\\[50\\%\\] {
+      --tw-ring-offset-color: currentcolor;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-offset-current\\/\\[50\\%\\] {
+        --tw-ring-offset-color: color-mix(in oklab, currentcolor 50%, transparent);
+      }
     }
 
     .ring-offset-inherit {
@@ -16861,13 +29414,40 @@ test('ring-offset', async () => {
       --tw-ring-offset-color: var(--color-red-500);
     }
 
-    .ring-offset-red-500\\/50, .ring-offset-red-500\\/\\[0\\.5\\], .ring-offset-red-500\\/\\[50\\%\\] {
-      --tw-ring-offset-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+    .ring-offset-red-500\\/50 {
+      --tw-ring-offset-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-offset-red-500\\/50 {
+        --tw-ring-offset-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .ring-offset-red-500\\/\\[0\\.5\\] {
+      --tw-ring-offset-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-offset-red-500\\/\\[0\\.5\\] {
+        --tw-ring-offset-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
+    }
+
+    .ring-offset-red-500\\/\\[50\\%\\] {
+      --tw-ring-offset-color: #ef444480;
+    }
+
+    @supports (color: color-mix(in lab, red, red)) {
+      .ring-offset-red-500\\/\\[50\\%\\] {
+        --tw-ring-offset-color: color-mix(in oklab, var(--color-red-500) 50%, transparent);
+      }
     }
 
     .ring-offset-transparent {
       --tw-ring-offset-color: transparent;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -16913,33 +29493,35 @@ test('@container', async () => {
       '@container-normal',
       '@container/sidebar',
       '@container-normal/sidebar',
-      '@container-[size]',
-      '@container-[size]/sidebar',
+      '@container-size',
+      '@container-size/sidebar',
     ]),
   ).toMatchInlineSnapshot(`
-    ".\\@container {
-      container-type: inline-size;
+    "
+    .\\@container-normal\\/sidebar {
+      container: sidebar;
     }
 
-    .\\@container-\\[size\\] {
-      container-type: size;
-    }
-
-    .\\@container-\\[size\\]\\/sidebar {
+    .\\@container-size\\/sidebar {
       container: sidebar / size;
     }
 
+    .\\@container\\/sidebar {
+      container: sidebar / inline-size;
+    }
+
+    .\\@container {
+      container-type: inline-size;
+    }
+
     .\\@container-normal {
       container-type: normal;
     }
 
-    .\\@container-normal\\/sidebar {
-      container: sidebar;
+    .\\@container-size {
+      container-type: size;
     }
-
-    .\\@container\\/sidebar {
-      container: sidebar / inline-size;
-    }"
+    "
   `)
   expect(
     await run([
@@ -16947,66 +29529,77 @@ test('@container', async () => {
       '-@container-normal',
       '-@container/sidebar',
       '-@container-normal/sidebar',
-      '-@container-[size]',
-      '-@container-[size]/sidebar',
+      '-@container-size',
+      '-@container-size/sidebar',
     ]),
   ).toEqual('')
 })
 
 describe('spacing utilities', () => {
   test('`--spacing: initial` disables the spacing multiplier', async () => {
-    let { build } = await compile(css`
-      @theme {
-        --spacing: initial;
-        --spacing-4: 1rem;
-      }
-      @tailwind utilities;
-    `)
-    let compiled = build(['px-1', 'px-4'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      ":root {
+    expect(
+      await run(
+        ['px-1', 'px-4'],
+        css`
+          @theme {
+            --spacing: initial;
+            --spacing-4: 1rem;
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
         --spacing-4: 1rem;
       }
 
       .px-4 {
         padding-inline: var(--spacing-4);
-      }"
+      }
+      "
     `)
   })
 
   test('`--spacing-*: initial` disables the spacing multiplier', async () => {
-    let { build } = await compile(css`
-      @theme {
-        --spacing-*: initial;
-        --spacing-4: 1rem;
-      }
-      @tailwind utilities;
-    `)
-    let compiled = build(['px-1', 'px-4'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      ":root {
+    expect(
+      await run(
+        ['px-1', 'px-4'],
+        css`
+          @theme {
+            --spacing-*: initial;
+            --spacing-4: 1rem;
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
         --spacing-4: 1rem;
       }
 
       .px-4 {
         padding-inline: var(--spacing-4);
-      }"
+      }
+      "
     `)
   })
 
   test('only multiples of 0.25 with no trailing zeroes are supported with the spacing multiplier', async () => {
-    let { build } = await compile(css`
-      @theme {
-        --spacing: 4px;
-      }
-      @tailwind utilities;
-    `)
-    let compiled = build(['px-0.25', 'px-1.5', 'px-2.75', 'px-0.375', 'px-2.50', 'px-.75'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      ":root {
+    expect(
+      await run(
+        ['px-0.25', 'px-1.5', 'px-2.75', 'px-0.375', 'px-2.50', 'px-.75'],
+        css`
+          @theme {
+            --spacing: 4px;
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
         --spacing: 4px;
       }
 
@@ -17020,36 +29613,41 @@ describe('spacing utilities', () => {
 
       .px-2\\.75 {
         padding-inline: calc(var(--spacing) * 2.75);
-      }"
+      }
+      "
     `)
   })
 
   test('spacing utilities must have a value', async () => {
-    let { build } = await compile(css`
-      @theme reference {
-        --spacing: 4px;
-      }
-      @tailwind utilities;
-    `)
-    let compiled = build(['px'])
-
-    expect(optimizeCss(compiled).trim()).toEqual('')
+    expect(
+      await run(
+        ['px'],
+        css`
+          @theme reference {
+            --spacing: 4px;
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toEqual('')
   })
 
   test('--spacing-* variables take precedence over --container-* variables', async () => {
-    let { build } = await compile(css`
-      @theme {
+    expect(
+      await run(
+        ['w-sm', 'max-w-sm', 'min-w-sm', 'basis-sm'],
+        css`
+          @theme {
+            --spacing-sm: 8px;
+            --container-sm: 256px;
+          }
+          @tailwind utilities;
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      :root, :host {
         --spacing-sm: 8px;
-        --container-sm: 256px;
-      }
-      @tailwind utilities;
-    `)
-    let compiled = build(['w-sm', 'max-w-sm', 'min-w-sm', 'basis-sm'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      ":root {
-        --spacing-sm: 8px;
-        --container-sm: 256px;
       }
 
       .w-sm {
@@ -17066,148 +29664,273 @@ describe('spacing utilities', () => {
 
       .basis-sm {
         flex-basis: var(--spacing-sm);
-      }"
+      }
+      "
     `)
   })
 })
 
 describe('custom utilities', () => {
+  test.each([
+    ['foo', true], // Simple name
+    ['foo-123', true], // Ending with a number is valid
+    ['foo-2.5', true], // Dots are valid when surrounded by numbers
+    ['-foo', true], // Simple name with negative sign
+    ['foo-bar', true], // With dashes
+    ['foo_bar', true], // With underscores
+    ['foo-50%', true], // Bare value with percentage
+    ['foo-1/2', true], // Bare value with fraction
+    ['foo-sm/8', true], // Bare value with number modifier
+    ['foo-4/snug', true], // Bare value with named modifier
+    ['foo_', true], // This is supported today, so let's not break it
+    ['foo/bar', true], // A slash to separate the modifier is valid.
+
+    ['Foo', false], // Starting with uppercase letter is invalid
+    ['-Foo', false], // Starting with uppercase letter is invalid (negative)
+    ['foo-', false], // Should not end with a dash
+    ['foo-1/', false], // Invalid fraction/modifier
+    ['foo-p%', false], // Invalid percentage
+    ['foo.bar', false], // Dots are only valid when surrounded by numbers
+    ['foo-1..5', false], // Double dots are invalid
+    ['foo..bar', false], // Double dots are invalid definitely without numbers
+    ['foo/bar/baz', false], // Multiple slashes are invalid
+  ])('valid static utility name "%s" (%s)', (name, valid) => {
+    expect(isValidStaticUtilityName(name)).toBe(valid)
+  })
+
+  test.each([
+    ['foo', false], // Simple name, missing '-*' suffix
+    ['foo-*', true], // Simple name
+    ['foo--*', true], // Root ending in `-` is valid (e.g. `border--*`)
+    ['-foo-*', true], // Simple name (negative)
+    ['foo-bar-*', true], // With dashes
+    ['foo_bar-*', true], // With underscores
+    ['Foo-*', false], // Starting with uppercase letter is invalid
+    ['-Foo-*', false], // Starting with uppercase letter is invalid
+    ['foo!-*', false], // Invalid special character
+    ['foo-[…]', false], // Invalid special character
+  ])('valid functional name "%s" (%s)', (name, valid) => {
+    expect(isValidFunctionalUtilityName(name)).toBe(valid)
+  })
+
   test('custom static utility', async () => {
-    let { build } = await compile(css`
+    expect(
+      await run(
+        ['text-trim', 'lg:text-trim'],
+        css`
+          @layer utilities {
+            @tailwind utilities;
+          }
+
+          @theme reference {
+            --breakpoint-lg: 1024px;
+          }
+
+          @utility text-trim {
+            text-box-trim: both;
+            text-box-edge: cap alphabetic;
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       @layer utilities {
-        @tailwind utilities;
-      }
-
-      @theme reference {
-        --breakpoint-lg: 1024px;
-      }
-
-      @utility text-trim {
-        text-box-trim: both;
-        text-box-edge: cap alphabetic;
-      }
-    `)
-    let compiled = build(['text-trim', 'lg:text-trim'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
         .text-trim {
           text-box-trim: both;
           text-box-edge: cap alphabetic;
         }
 
-        @media (width >= 1024px) {
+        @media (min-width: 1024px) {
           .lg\\:text-trim {
             text-box-trim: both;
             text-box-edge: cap alphabetic;
           }
         }
-      }"
+      }
+      "
+    `)
+  })
+
+  test('custom static utility emit CSS variables if the utility is used', async () => {
+    let input = css`
+      @layer utilities {
+        @tailwind utilities;
+      }
+
+      @theme {
+        --example-foo: 123px;
+      }
+
+      @utility foo {
+        value: var(--example-foo);
+      }
+    `
+
+    // `foo` is not used yet:
+    expect(await compileCss(input)).toMatchInlineSnapshot(`
+      "
+      @layer utilities;
+      "
+    `)
+
+    // `foo` is used, and the CSS variable is emitted:
+    expect(await run(['foo'], input)).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        .foo {
+          value: var(--example-foo);
+        }
+      }
+
+      :root, :host {
+        --example-foo: 123px;
+      }
+      "
+    `)
+  })
+
+  test('custom static utility (negative)', async () => {
+    expect(
+      await run(
+        ['-example', 'lg:-example'],
+        css`
+          @layer utilities {
+            @tailwind utilities;
+          }
+
+          @utility -example {
+            value: -1;
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
+      @layer utilities {
+        .-example {
+          value: -1;
+        }
+      }
+      "
     `)
   })
 
   test('Multiple static utilities are merged', async () => {
-    let { build } = await compile(css`
+    expect(
+      await run(
+        ['really-round'],
+        css`
+          @layer utilities {
+            @tailwind utilities;
+          }
+
+          @utility really-round {
+            --custom-prop: hi;
+            border-radius: 50rem;
+          }
+
+          @utility really-round {
+            border-radius: 30rem;
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       @layer utilities {
-        @tailwind utilities;
-      }
-
-      @utility really-round {
-        --custom-prop: hi;
-        border-radius: 50rem;
-      }
-
-      @utility really-round {
-        border-radius: 30rem;
-      }
-    `)
-    let compiled = build(['really-round'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
         .really-round {
           --custom-prop: hi;
           border-radius: 30rem;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('custom utilities support some special characters', async () => {
-    let { build } = await compile(css`
+    expect(
+      await run(
+        ['push-1/2', 'push-50%'],
+        css`
+          @layer utilities {
+            @tailwind utilities;
+          }
+
+          @utility push-1/2 {
+            right: 50%;
+          }
+
+          @utility push-50% {
+            right: 50%;
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       @layer utilities {
-        @tailwind utilities;
-      }
-
-      @utility push-1/2 {
-        right: 50%;
-      }
-
-      @utility push-50% {
-        right: 50%;
-      }
-    `)
-    let compiled = build(['push-1/2', 'push-50%'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
         .push-1\\/2, .push-50\\% {
           right: 50%;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('can override specific versions of a functional utility with a static utility', async () => {
-    let { build } = await compile(css`
+    expect(
+      await run(
+        ['text-sm'],
+        css`
+          @layer utilities {
+            @tailwind utilities;
+          }
+
+          @theme reference {
+            --text-sm: 0.875rem;
+            --text-sm--line-height: 1.25rem;
+          }
+
+          @utility text-sm {
+            font-size: var(--text-sm, 0.8755rem);
+            line-height: var(--text-sm--line-height, 1.255rem);
+            text-rendering: optimizeLegibility;
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       @layer utilities {
-        @tailwind utilities;
-      }
-
-      @theme reference {
-        --text-sm: 0.875rem;
-        --text-sm--line-height: 1.25rem;
-      }
-
-      @utility text-sm {
-        font-size: var(--text-sm, 0.8755rem);
-        line-height: var(--text-sm--line-height, 1.255rem);
-        text-rendering: optimizeLegibility;
-      }
-    `)
-    let compiled = build(['text-sm'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
         .text-sm {
-          font-size: var(--text-sm);
-          line-height: var(--tw-leading, var(--text-sm--line-height));
           font-size: var(--text-sm, .8755rem);
           line-height: var(--text-sm--line-height, 1.255rem);
-          text-rendering: optimizeLegibility;
+          text-rendering: optimizelegibility;
+          font-size: var(--text-sm, .875rem);
+          line-height: var(--tw-leading, var(--text-sm--line-height, 1.25rem));
         }
-      }"
+      }
+      "
     `)
   })
 
   test('can override the default value of a functional utility', async () => {
-    let { build } = await compile(css`
+    expect(
+      await run(
+        ['rounded', 'rounded-xl', 'rounded-[33px]'],
+        css`
+          @layer utilities {
+            @tailwind utilities;
+          }
+
+          @theme reference {
+            --radius-xl: 16px;
+          }
+
+          @utility rounded {
+            border-radius: 50rem;
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       @layer utilities {
-        @tailwind utilities;
-      }
-
-      @theme reference {
-        --radius-xl: 16px;
-      }
-
-      @utility rounded {
-        border-radius: 50rem;
-      }
-    `)
-    let compiled = build(['rounded', 'rounded-xl', 'rounded-[33px]'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
         .rounded {
           border-radius: 50rem;
         }
@@ -17217,26 +29940,30 @@ describe('custom utilities', () => {
         }
 
         .rounded-xl {
-          border-radius: var(--radius-xl);
+          border-radius: var(--radius-xl, 16px);
         }
-      }"
+      }
+      "
     `)
   })
 
   test('custom utilities are sorted by used properties', async () => {
-    let { build } = await compile(css`
+    expect(
+      await run(
+        ['top-[100px]', 'push-left', 'right-[100px]', 'bottom-[100px]'],
+        css`
+          @layer utilities {
+            @tailwind utilities;
+          }
+
+          @utility push-left {
+            right: 100%;
+          }
+        `,
+      ),
+    ).toMatchInlineSnapshot(`
+      "
       @layer utilities {
-        @tailwind utilities;
-      }
-
-      @utility push-left {
-        right: 100%;
-      }
-    `)
-    let compiled = build(['top-[100px]', 'push-left', 'right-[100px]', 'bottom-[100px]'])
-
-    expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(`
-      "@layer utilities {
         .top-\\[100px\\] {
           top: 100px;
         }
@@ -17252,18 +29979,19 @@ describe('custom utilities', () => {
         .bottom-\\[100px\\] {
           bottom: 100px;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('custom utilities must use a valid name definitions', async () => {
     await expect(() =>
       compile(css`
-        @utility push-* {
+        @utility push-| {
           right: 100%;
         }
       `),
-    ).rejects.toThrowError(/should be alphanumeric/)
+    ).rejects.toThrow(/should be alphanumeric/)
 
     await expect(() =>
       compile(css`
@@ -17271,7 +29999,7 @@ describe('custom utilities', () => {
           right: 100%;
         }
       `),
-    ).rejects.toThrowError(/should be alphanumeric/)
+    ).rejects.toThrow(/should be alphanumeric/)
 
     await expect(() =>
       compile(css`
@@ -17279,12 +30007,13 @@ describe('custom utilities', () => {
           right: 100%;
         }
       `),
-    ).rejects.toThrowError(/should be alphanumeric/)
+    ).rejects.toThrow(/should be alphanumeric/)
   })
 
   test('custom utilities work with `@apply`', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['foo', 'hover:foo', 'bar'],
         css`
           @utility foo {
             @apply flex flex-col underline;
@@ -17300,10 +30029,10 @@ describe('custom utilities', () => {
 
           @tailwind utilities;
         `,
-        ['foo', 'hover:foo', 'bar'],
       ),
     ).toMatchInlineSnapshot(`
-      ".bar {
+      "
+      .bar {
         z-index: 10;
       }
 
@@ -17323,13 +30052,15 @@ describe('custom utilities', () => {
           text-decoration-line: underline;
           display: flex;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('referencing custom utilities in custom utilities via `@apply` should work', async () => {
     expect(
-      await compileCss(
+      await run(
+        ['bar'],
         css`
           @utility foo {
             @apply flex flex-col underline;
@@ -17341,10 +30072,10 @@ describe('custom utilities', () => {
 
           @tailwind utilities;
         `,
-        ['bar'],
       ),
     ).toMatchInlineSnapshot(`
-      ".bar {
+      "
+      .bar {
         flex-wrap: wrap;
       }
 
@@ -17354,13 +30085,15 @@ describe('custom utilities', () => {
           text-decoration-line: underline;
           display: flex;
         }
-      }"
+      }
+      "
     `)
   })
 
   test('custom utilities with `@apply` causing circular dependencies should error', async () => {
     await expect(() =>
-      compileCss(
+      run(
+        ['foo', 'bar'],
         css`
           @utility foo {
             @apply flex-wrap hover:bar;
@@ -17372,16 +30105,16 @@ describe('custom utilities', () => {
 
           @tailwind utilities;
         `,
-        ['foo', 'bar'],
       ),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `[Error: You cannot \`@apply\` the \`dark:foo\` utility here because it creates a circular dependency.]`,
+      `[Error: You cannot \`@apply\` the \`hover:bar\` utility here because it creates a circular dependency.]`,
     )
   })
 
   test('custom utilities with `@apply` causing circular dependencies should error (deeply nesting)', async () => {
     await expect(() =>
-      compileCss(
+      run(
+        ['foo', 'bar'],
         css`
           @utility foo {
             .bar {
@@ -17403,10 +30136,1461 @@ describe('custom utilities', () => {
 
           @tailwind utilities;
         `,
-        ['foo', 'bar'],
       ),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `[Error: You cannot \`@apply\` the \`dark:foo\` utility here because it creates a circular dependency.]`,
+      `[Error: You cannot \`@apply\` the \`hover:bar\` utility here because it creates a circular dependency.]`,
     )
   })
+
+  test('custom utilities with `@apply` causing circular dependencies should error (multiple levels)', async () => {
+    await expect(() =>
+      run(
+        ['foo', 'bar'],
+        css`
+          body {
+            @apply foo;
+          }
+
+          @utility foo {
+            @apply flex-wrap hover:bar;
+          }
+
+          @utility bar {
+            @apply flex dark:baz;
+          }
+
+          @utility baz {
+            @apply flex-wrap hover:foo;
+          }
+
+          @tailwind utilities;
+        `,
+      ),
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `[Error: You cannot \`@apply\` the \`hover:bar\` utility here because it creates a circular dependency.]`,
+    )
+  })
+
+  describe('functional utilities', () => {
+    test('functional utilities require a `--value(…)`', async () => {
+      let input = css`
+        @utility example-* {
+          --resolved-value: 4;
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example', 'example-foo'], input)).toEqual('')
+    })
+
+    test('functional utilities must resolve at least one `--value(…)`', async () => {
+      let input = css`
+        @utility example-* {
+          --resolved-value: --value(integer);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-1', 'example-2'], input)).toMatchInlineSnapshot(`
+        "
+        .example-1 {
+          --resolved-value: 1;
+        }
+
+        .example-2 {
+          --resolved-value: 2;
+        }
+        "
+      `)
+
+      expect(await run(['example', 'example-foo', 'example-2.5'], input)).toEqual('')
+    })
+
+    test('resolving values from `@theme`', async () => {
+      let input = css`
+        @theme reference {
+          --example-1: 1;
+          --example-2: 2;
+          --example-4: 4;
+          --example-a: 8;
+        }
+
+        @utility example-* {
+          --resolved-value: --value(--example);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-1', 'example-2', 'example-4', 'example-a'], input))
+        .toMatchInlineSnapshot(`
+          "
+          .example-1 {
+            --resolved-value: var(--example-1, 1);
+          }
+
+          .example-2 {
+            --resolved-value: var(--example-2, 2);
+          }
+
+          .example-4 {
+            --resolved-value: var(--example-4, 4);
+          }
+
+          .example-a {
+            --resolved-value: var(--example-a, 8);
+          }
+          "
+        `)
+      expect(await run(['example-3', 'example-gitlab'], input)).toEqual('')
+    })
+
+    test('functional utility with double-dash separator', async () => {
+      let input = css`
+        @theme reference {
+          --color-border-0: #e5e7eb;
+          --color-border-1: #d1d5db;
+          --color-border-2: #9ca3af;
+        }
+
+        @utility border--* {
+          border-color: --value(--color-border-*, [color]);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['border--0', 'border--1', 'border--2'], input)).toMatchInlineSnapshot(`
+        "
+        .border--0 {
+          border-color: var(--color-border-0, #e5e7eb);
+        }
+
+        .border--1 {
+          border-color: var(--color-border-1, #d1d5db);
+        }
+
+        .border--2 {
+          border-color: var(--color-border-2, #9ca3af);
+        }
+        "
+      `)
+      expect(await run(['border--3'], input)).toEqual('')
+    })
+
+    test('resolving values from `@theme`, with `--example-*` syntax', async () => {
+      let input =
+        // Explicitly not using the css tagged template literal so that
+        // Prettier doesn't format the `value(--example-*)` as
+        // `value(--example- *)`
+        `
+          @theme reference {
+            --example-1: 1;
+            --example-2: 2;
+            --example-4: 4;
+            --example-a: 8;
+          }
+
+          @utility example-* {
+            --resolved-value: --value(--example-*);
+          }
+
+          @tailwind utilities;
+        `
+
+      expect(await run(['example-1', 'example-2', 'example-4', 'example-a'], input))
+        .toMatchInlineSnapshot(`
+          "
+          .example-1 {
+            --resolved-value: var(--example-1, 1);
+          }
+
+          .example-2 {
+            --resolved-value: var(--example-2, 2);
+          }
+
+          .example-4 {
+            --resolved-value: var(--example-4, 4);
+          }
+
+          .example-a {
+            --resolved-value: var(--example-a, 8);
+          }
+          "
+        `)
+      expect(await run(['example-3', 'example-gitlab'], input)).toEqual('')
+    })
+
+    test('resolving values from `@theme`, with `--example-\\*` syntax (prettier friendly)', async () => {
+      let input = css`
+        @theme reference {
+          --example-1: 1;
+          --example-2: 2;
+          --example-4: 4;
+          --example-a: 8;
+        }
+
+        @utility example-* {
+          --resolved-value: --value(--example-\*);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-1', 'example-2', 'example-4', 'example-a'], input))
+        .toMatchInlineSnapshot(`
+          "
+          .example-1 {
+            --resolved-value: var(--example-1, 1);
+          }
+
+          .example-2 {
+            --resolved-value: var(--example-2, 2);
+          }
+
+          .example-4 {
+            --resolved-value: var(--example-4, 4);
+          }
+
+          .example-a {
+            --resolved-value: var(--example-a, 8);
+          }
+          "
+        `)
+      expect(await run(['example-3', 'example-gitlab'], input)).toEqual('')
+    })
+
+    test('resolving bare values', async () => {
+      let input = css`
+        @utility example-* {
+          --resolved-value: --value(integer);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-1', 'example-76', 'example-971'], input)).toMatchInlineSnapshot(`
+        "
+        .example-1 {
+          --resolved-value: 1;
+        }
+
+        .example-76 {
+          --resolved-value: 76;
+        }
+
+        .example-971 {
+          --resolved-value: 971;
+        }
+        "
+      `)
+      expect(await run(['example-foo'], input)).toEqual('')
+    })
+
+    test('bare values with unsupported data types should result in a warning', async () => {
+      using spy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+      let input = css`
+        @utility paint-* {
+          paint: --value([color], color);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['paint-#0088cc', 'paint-red'], input)).toEqual('')
+      expect(spy.mock.calls).toMatchInlineSnapshot(`
+        [
+          [
+            "Unsupported bare value data type: "color".
+        Only valid data types are: "number", "integer", "ratio", "percentage".
+        ",
+          ],
+          [
+            "\`\`\`css
+        --value([color],color)
+                        ^^^^^
+        \`\`\`",
+          ],
+        ]
+      `)
+    })
+
+    test('resolve literal values', async () => {
+      let input = css`
+        @utility example-* {
+          --resolved-value: --value('revert');
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-revert'], input)).toMatchInlineSnapshot(`
+        "
+        .example-revert {
+          --resolved-value: revert;
+        }
+        "
+      `)
+      expect(await run(['example-initial'], input)).toEqual('')
+    })
+
+    test('resolving bare values with constraints for integer, percentage, and ratio', async () => {
+      let input = css`
+        @utility example-* {
+          --value-as-number: --value(number);
+          --value-as-percentage: --value(percentage);
+          --value-as-ratio: --value(ratio);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-1', 'example-0.5', 'example-20%', 'example-2/3'], input))
+        .toMatchInlineSnapshot(`
+          "
+          .example-0\\.5 {
+            --value-as-number: .5;
+          }
+
+          .example-1 {
+            --value-as-number: 1;
+          }
+
+          .example-2\\/3 {
+            --value-as-ratio: 2 / 3;
+          }
+
+          .example-20\\% {
+            --value-as-percentage: 20%;
+          }
+          "
+        `)
+      expect(
+        await run(
+          ['example-1.23', 'example-12.34%', 'example-1.2/3', 'example-1/2.3', 'example-1.2/3.4'],
+          input,
+        ),
+      ).toEqual('')
+    })
+
+    test('resolving unsupported bare values', async () => {
+      using spy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+      let input = css`
+        @utility example-* {
+          --resolved-value: --value(color);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-#0088cc', 'example-foo'], input)).toEqual('')
+      expect(
+        `\n${spy.mock.calls
+          .map((c) => c.join(' '))
+          .join('\n')
+          .trim()}\n`,
+      ).toMatchInlineSnapshot(`
+        "
+        Unsupported bare value data type: "color".
+        Only valid data types are: "number", "integer", "ratio", "percentage".
+
+        \`\`\`css
+        --value(color)
+                ^^^^^
+        \`\`\`
+        "
+      `)
+    })
+
+    test('resolving arbitrary values', async () => {
+      let input = css`
+        @utility example-* {
+          --resolved-value: --value([integer]);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(
+        await run(
+          [
+            'example-[1]',
+            'example-[76]',
+            'example-[971]',
+            'example-[integer:var(--my-value)]',
+            'example-(integer:my-value)',
+          ],
+          input,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
+        .example-\\[1\\] {
+          --resolved-value: 1;
+        }
+
+        .example-\\[76\\] {
+          --resolved-value: 76;
+        }
+
+        .example-\\[971\\] {
+          --resolved-value: 971;
+        }
+
+        .example-\\[integer\\:var\\(--my-value\\)\\] {
+          --resolved-value: var(--my-value);
+        }
+        "
+      `)
+      expect(
+        await run(
+          [
+            'example-[#0088cc]',
+            'example-[1px]',
+            'example-[var(--my-value)]',
+            'example-(--my-value)',
+            'example-[color:var(--my-value)]',
+            'example-(color:--my-value)',
+          ],
+          input,
+        ),
+      ).toEqual('')
+    })
+
+    test('resolving any arbitrary values', async () => {
+      let input = css`
+        @utility example-* {
+          --resolved-value: --value([*]);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(
+        await run(
+          [
+            'example-[1]',
+            'example-[76]',
+            'example-[971]',
+            'example-[var(--my-value)]',
+            'example-(--my-value)',
+          ],
+          input,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
+        .example-\\(--my-value\\) {
+          --resolved-value: var(--my-value);
+        }
+
+        .example-\\[1\\] {
+          --resolved-value: 1;
+        }
+
+        .example-\\[76\\] {
+          --resolved-value: 76;
+        }
+
+        .example-\\[971\\] {
+          --resolved-value: 971;
+        }
+
+        .example-\\[var\\(--my-value\\)\\] {
+          --resolved-value: var(--my-value);
+        }
+        "
+      `)
+    })
+
+    test('resolving any arbitrary values (without space)', async () => {
+      let input = `
+        @utility example-* {
+          --resolved-value: --value([*]);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(
+        await run(
+          [
+            'example-[1]',
+            'example-[76]',
+            'example-[971]',
+            'example-[var(--my-value)]',
+            'example-(--my-value)',
+          ],
+          input,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
+        .example-\\(--my-value\\) {
+          --resolved-value: var(--my-value);
+        }
+
+        .example-\\[1\\] {
+          --resolved-value: 1;
+        }
+
+        .example-\\[76\\] {
+          --resolved-value: 76;
+        }
+
+        .example-\\[971\\] {
+          --resolved-value: 971;
+        }
+
+        .example-\\[var\\(--my-value\\)\\] {
+          --resolved-value: var(--my-value);
+        }
+        "
+      `)
+    })
+
+    test('resolving any arbitrary values (with escaped `*`)', async () => {
+      let input = css`
+        @utility example-* {
+          --resolved-value: --value([\*]);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(
+        await run(
+          [
+            'example-[1]',
+            'example-[76]',
+            'example-[971]',
+            'example-[var(--my-value)]',
+            'example-(--my-value)',
+          ],
+          input,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
+        .example-\\(--my-value\\) {
+          --resolved-value: var(--my-value);
+        }
+
+        .example-\\[1\\] {
+          --resolved-value: 1;
+        }
+
+        .example-\\[76\\] {
+          --resolved-value: 76;
+        }
+
+        .example-\\[971\\] {
+          --resolved-value: 971;
+        }
+
+        .example-\\[var\\(--my-value\\)\\] {
+          --resolved-value: var(--my-value);
+        }
+        "
+      `)
+    })
+
+    test('resolving theme, bare and arbitrary values all at once', async () => {
+      let input = css`
+        @theme reference {
+          --example-a: 8;
+        }
+
+        @utility example-* {
+          --resolved-value: --value([integer]);
+          --resolved-value: --value(integer);
+          --resolved-value: --value(--example);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-a', 'example-76', 'example-[123]'], input)).toMatchInlineSnapshot(`
+        "
+        .example-76 {
+          --resolved-value: 76;
+        }
+
+        .example-\\[123\\] {
+          --resolved-value: 123;
+        }
+
+        .example-a {
+          --resolved-value: var(--example-a, 8);
+        }
+        "
+      `)
+      expect(await run(['example-[#0088cc]', 'example-[1px]'], input)).toEqual('')
+    })
+
+    test('in combination with calc to produce different data types of values', async () => {
+      let input = css`
+        @theme reference {
+          --example-full: 100%;
+        }
+
+        @utility example-* {
+          --resolved-value: --value([percentage]);
+          --resolved-value: calc(--value(integer) * 1%);
+          --resolved-value: --value(--example);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-full', 'example-12', 'example-[20%]'], input))
+        .toMatchInlineSnapshot(`
+          "
+          .example-12 {
+            --resolved-value: calc(12 * 1%);
+          }
+
+          .example-\\[20\\%\\] {
+            --resolved-value: 20%;
+          }
+
+          .example-full {
+            --resolved-value: var(--example-full, 100%);
+          }
+          "
+        `)
+      expect(await run(['example-half', 'example-[#0088cc]'], input)).toEqual('')
+    })
+
+    test('shorthand if resulting values are of the same type', async () => {
+      let input = css`
+        @theme reference {
+          --example-full: 100%;
+        }
+
+        @utility example-* {
+          --resolved-value: calc(--value(integer) * 1%);
+          --resolved-value: --value(--example, [percentage]);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-37', 'example-[50%]', 'example-full'], input))
+        .toMatchInlineSnapshot(`
+          "
+          .example-37 {
+            --resolved-value: calc(37 * 1%);
+          }
+
+          .example-\\[50\\%\\] {
+            --resolved-value: 50%;
+          }
+
+          .example-full {
+            --resolved-value: var(--example-full, 100%);
+          }
+          "
+        `)
+      expect(await run(['example-foo', 'example-[13px]'], input)).toEqual('')
+    })
+
+    test('negative values', async () => {
+      let input = css`
+        @theme reference {
+          --example-full: 100%;
+        }
+
+        @utility example-* {
+          --resolved-value: --value(--example, [percentage], [length]);
+        }
+
+        @utility -example-* {
+          --resolved-value: calc(--value(--example, [percentage], [length]) * -1);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(
+        await run(
+          [
+            'example-full',
+            '-example-full',
+            'example-[10px]',
+            '-example-[10px]',
+            'example-[20%]',
+            '-example-[20%]',
+          ],
+          input,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
+        .-example-\\[10px\\] {
+          --resolved-value: calc(10px * -1);
+        }
+
+        .-example-\\[20\\%\\] {
+          --resolved-value: calc(20% * -1);
+        }
+
+        .-example-full {
+          --resolved-value: calc(var(--example-full, 100%) * -1);
+        }
+
+        .example-\\[10px\\] {
+          --resolved-value: 10px;
+        }
+
+        .example-\\[20\\%\\] {
+          --resolved-value: 20%;
+        }
+
+        .example-full {
+          --resolved-value: var(--example-full, 100%);
+        }
+        "
+      `)
+      expect(await run(['example-10'], input)).toEqual('')
+    })
+
+    test('using the same value multiple times', async () => {
+      let input = css`
+        @utility example-* {
+          --resolved-value: calc(var(--spacing) * --value(number))
+            calc(var(--spacing) * --value(number));
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-12'], input)).toMatchInlineSnapshot(`
+        "
+        .example-12 {
+          --resolved-value: calc(var(--spacing) * 12)
+                    calc(var(--spacing) * 12);
+        }
+        "
+      `)
+    })
+
+    test('using `--spacing(…)` shorthand', async () => {
+      let input = css`
+        @theme {
+          --spacing: 4px;
+        }
+
+        @utility example-* {
+          margin: --spacing(--value(number));
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-12'], input)).toMatchInlineSnapshot(`
+        "
+        :root, :host {
+          --spacing: 4px;
+        }
+
+        .example-12 {
+          margin: calc(var(--spacing) * 12);
+        }
+        "
+      `)
+    })
+
+    test('using `--spacing(…)` shorthand (inline theme)', async () => {
+      let input = css`
+        @theme inline reference {
+          --spacing: 4px;
+        }
+
+        @utility example-* {
+          margin: --spacing(--value(number));
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-12'], input)).toMatchInlineSnapshot(`
+        "
+        .example-12 {
+          margin: 48px;
+        }
+        "
+      `)
+    })
+
+    test('functional utilities can use `--default(…)` in `--value(…)`', async () => {
+      let input = css`
+        @utility example-* {
+          --resolved-value: --value(integer, --default(4));
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example', 'example-123'], input)).toMatchInlineSnapshot(`
+        "
+        .example {
+          --resolved-value: 4;
+        }
+
+        .example-123 {
+          --resolved-value: 123;
+        }
+        "
+      `)
+
+      expect(await run(['example-foo'], input)).toEqual('')
+    })
+
+    test('functional utilities can use `--default(…)` in complex expressions', async () => {
+      let input = css`
+        @utility example-* {
+          --resolved-value: calc(--value(integer, --default(4)) * 2);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example', 'example-123'], input)).toMatchInlineSnapshot(`
+        "
+        .example {
+          --resolved-value: calc(4 * 2);
+        }
+
+        .example-123 {
+          --resolved-value: calc(123 * 2);
+        }
+        "
+      `)
+
+      expect(await run(['example-foo'], input)).toEqual('')
+    })
+
+    test('functional utilities can use `--default(…)` with `--modifier(…)`', async () => {
+      let input = css`
+        @utility example-* {
+          --resolved-value: --value(integer, --default(4));
+          --resolved-modifier: --modifier(integer);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example', 'example/25'], input)).toMatchInlineSnapshot(`
+        "
+        .example\\/25 {
+          --resolved-value: 4;
+          --resolved-modifier: 25;
+        }
+
+        .example {
+          --resolved-value: 4;
+        }
+        "
+      `)
+
+      expect(await run(['example/foo'], input)).toEqual('')
+    })
+
+    test('functional utilities can use `--default(…)` in `--modifier(…)`', async () => {
+      let input = css`
+        @utility example-* {
+          --resolved-value: --value(integer);
+          --resolved-modifier: --modifier(integer, --default(1));
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-123', 'example-123/25'], input)).toMatchInlineSnapshot(`
+        "
+        .example-123 {
+          --resolved-value: 123;
+          --resolved-modifier: 1;
+        }
+
+        .example-123\\/25 {
+          --resolved-value: 123;
+          --resolved-modifier: 25;
+        }
+        "
+      `)
+
+      expect(await run(['example-123/foo'], input)).toEqual('')
+    })
+
+    test('functional utilities can use `--default(…)` in `--value(…)` and `--modifier(…)`', async () => {
+      let input = css`
+        @utility example-* {
+          --resolved-value: --value(integer, --default(12));
+          --resolved-modifier: --modifier(integer, --default(34));
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example', 'example/1', 'example-1', 'example-1/1'], input))
+        .toMatchInlineSnapshot(`
+          "
+          .example {
+            --resolved-value: 12;
+            --resolved-modifier: 34;
+          }
+
+          .example-1 {
+            --resolved-value: 1;
+            --resolved-modifier: 34;
+          }
+
+          .example-1\\/1 {
+            --resolved-value: 1;
+            --resolved-modifier: 1;
+          }
+
+          .example\\/1 {
+            --resolved-value: 12;
+            --resolved-modifier: 1;
+          }
+          "
+        `)
+
+      expect(await run(['example-123/foo'], input)).toEqual('')
+    })
+
+    test('the value of `--default(…)` is emitted as-is', async () => {
+      let input = css`
+        @theme reference {
+          --text-box-trim-trim-both: trim-both;
+          --text-box-edge-cap: cap alphabetic;
+        }
+
+        @utility trim-* {
+          text-box: --value(--text-box-trim-*)
+            --modifier(--text-box-edge-*, --default(box alphabetic));
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['trim-trim-both', 'trim-trim-both/cap'], input)).toMatchInlineSnapshot(`
+        "
+        .trim-trim-both {
+          text-box: var(--text-box-trim-trim-both, trim-both) box alphabetic;
+        }
+
+        .trim-trim-both\\/cap {
+          text-box: var(--text-box-trim-trim-both, trim-both) var(--text-box-edge-cap, cap alphabetic);
+        }
+        "
+      `)
+    })
+
+    test('modifiers', async () => {
+      let input = css`
+        @theme reference {
+          --value-sm: 14px;
+          --modifier-7: 28px;
+        }
+
+        @utility example-* {
+          --resolved-value: --value(--value, [length]);
+          --resolved-modifier: --modifier(--modifier, [length]);
+          --resolved-modifier-with-calc: calc(--modifier(--modifier, [length]) * 2);
+          --resolved-modifier-literals: --modifier('literal', 'literal-2');
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(
+        await run(
+          [
+            'example-sm',
+            'example-sm/7',
+            'example-[12px]',
+            'example-[12px]/[16px]',
+            'example-sm/literal',
+            'example-sm/literal-2',
+          ],
+          input,
+        ),
+      ).toMatchInlineSnapshot(`
+        "
+        .example-\\[12px\\]\\/\\[16px\\] {
+          --resolved-value: 12px;
+          --resolved-modifier: 16px;
+          --resolved-modifier-with-calc: calc(16px * 2);
+        }
+
+        .example-sm\\/7 {
+          --resolved-value: var(--value-sm, 14px);
+          --resolved-modifier: var(--modifier-7, 28px);
+          --resolved-modifier-with-calc: calc(var(--modifier-7, 28px) * 2);
+        }
+
+        .example-sm\\/literal {
+          --resolved-value: var(--value-sm, 14px);
+          --resolved-modifier-literals: literal;
+        }
+
+        .example-sm\\/literal-2 {
+          --resolved-value: var(--value-sm, 14px);
+          --resolved-modifier-literals: literal-2;
+        }
+
+        .example-\\[12px\\] {
+          --resolved-value: 12px;
+        }
+
+        .example-sm {
+          --resolved-value: var(--value-sm, 14px);
+        }
+        "
+      `)
+      expect(
+        await run(
+          ['example-foo', 'example-foo/[12px]', 'example-foo/12', 'example-sm/unknown-literal'],
+          input,
+        ),
+      ).toEqual('')
+    })
+
+    test('fractions', async () => {
+      let input = css`
+        @theme reference {
+          --example-video: 16 / 9;
+        }
+
+        @utility example-* {
+          --resolved-value: --value(--example, ratio, [ratio]);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-video', 'example-1/1', 'example-[7/9]'], input))
+        .toMatchInlineSnapshot(`
+          "
+          .example-1\\/1 {
+            --resolved-value: 1 / 1;
+          }
+
+          .example-\\[7\\/9\\] {
+            --resolved-value: 7/9;
+          }
+
+          .example-video {
+            --resolved-value: var(--example-video, 16 / 9);
+          }
+          "
+        `)
+      expect(await run(['example-foo'], input)).toEqual('')
+    })
+
+    test('resolve theme values with sub-namespace (--text- * --line-height)', async () => {
+      let input = css`
+        @theme reference {
+          --text-xs: 0.75rem;
+          --text-xs--line-height: calc(1 / 0.75);
+        }
+
+        @utility example-* {
+          font-size: --value(--text);
+          line-height: --value(--text-* --line-height);
+          line-height: --modifier(number);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-xs', 'example-xs/6'], input)).toMatchInlineSnapshot(`
+        "
+        .example-xs\\/6 {
+          font-size: var(--text-xs, .75rem);
+          line-height: var(--text-xs--line-height, calc(1 / .75));
+          line-height: 6;
+        }
+
+        .example-xs {
+          font-size: var(--text-xs, .75rem);
+          line-height: var(--text-xs--line-height, calc(1 / .75));
+        }
+        "
+      `)
+      expect(await run(['example-foo', 'example-xs/foo'], input)).toEqual('')
+    })
+
+    test('resolve theme values with sub-namespace (--text-\\* --line-height)', async () => {
+      let input = css`
+        @theme reference {
+          --text-xs: 0.75rem;
+          --text-xs--line-height: calc(1 / 0.75);
+        }
+
+        @utility example-* {
+          font-size: --value(--text);
+          line-height: --value(--text-\* --line-height);
+          line-height: --modifier(number);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-xs', 'example-xs/6'], input)).toMatchInlineSnapshot(`
+        "
+        .example-xs\\/6 {
+          font-size: var(--text-xs, .75rem);
+          line-height: var(--text-xs--line-height, calc(1 / .75));
+          line-height: 6;
+        }
+
+        .example-xs {
+          font-size: var(--text-xs, .75rem);
+          line-height: var(--text-xs--line-height, calc(1 / .75));
+        }
+        "
+      `)
+      expect(await run(['example-foo', 'example-xs/foo'], input)).toEqual('')
+    })
+
+    test('resolve theme values with sub-namespace (--value(--text --line-height))', async () => {
+      let input = css`
+        @theme reference {
+          --text-xs: 0.75rem;
+          --text-xs--line-height: calc(1 / 0.75);
+        }
+
+        @utility example-* {
+          font-size: --value(--text);
+          line-height: --value(--text --line-height);
+          line-height: --modifier(number);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-xs', 'example-xs/6'], input)).toMatchInlineSnapshot(`
+        "
+        .example-xs\\/6 {
+          font-size: var(--text-xs, .75rem);
+          line-height: var(--text-xs--line-height, calc(1 / .75));
+          line-height: 6;
+        }
+
+        .example-xs {
+          font-size: var(--text-xs, .75rem);
+          line-height: var(--text-xs--line-height, calc(1 / .75));
+        }
+        "
+      `)
+      expect(await run(['example-foo', 'example-xs/foo'], input)).toEqual('')
+    })
+
+    test('resolve theme values with sub-namespace (--value(--text-*--line-height))', async () => {
+      let input = `
+        @theme reference {
+          --text-xs: 0.75rem;
+          --text-xs--line-height: calc(1 / 0.75);
+        }
+
+        @utility example-* {
+          font-size: --value(--text);
+          line-height: --value(--text-*--line-height);
+          line-height: --modifier(number);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-xs', 'example-xs/6'], input)).toMatchInlineSnapshot(`
+        "
+        .example-xs\\/6 {
+          font-size: var(--text-xs, .75rem);
+          line-height: var(--text-xs--line-height, calc(1 / .75));
+          line-height: 6;
+        }
+
+        .example-xs {
+          font-size: var(--text-xs, .75rem);
+          line-height: var(--text-xs--line-height, calc(1 / .75));
+        }
+        "
+      `)
+      expect(await run(['example-foo', 'example-xs/foo'], input)).toEqual('')
+    })
+
+    test('variables used in `@utility` will not be emitted if the utility is not used', async () => {
+      let input = css`
+        @theme {
+          --example-foo: red;
+          --color-red-500: #f00;
+        }
+
+        @utility example-* {
+          color: var(--color-red-500);
+          background-color: --value(--example);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['flex'], input)).toMatchInlineSnapshot(`
+        "
+        .flex {
+          display: flex;
+        }
+        "
+      `)
+    })
+
+    test('variables used in `@utility` will be emitted if the utility is used', async () => {
+      let input = css`
+        @theme {
+          --example-foo: red;
+          --color-red-500: #f00;
+        }
+
+        @utility example-* {
+          color: var(--color-red-500);
+          background-color: --value(--example);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['example-foo'], input)).toMatchInlineSnapshot(`
+        "
+        :root, :host {
+          --example-foo: red;
+          --color-red-500: red;
+        }
+
+        .example-foo {
+          color: var(--color-red-500);
+          background-color: var(--example-foo);
+        }
+        "
+      `)
+    })
+
+    // This originated from a bug. Essentially in the second `--mask-right` we
+    // call both `--modifier(…)` and `--value(…)`. The moment we processed
+    // `--modifier(…)` it deleted the `--mask-right` declaration (expected
+    // behavior). But we didn't properly stop so the `--value(…)` was still
+    // processed and also tried to remove the `--mask-right` declaration.
+    //
+    // This test now ensures that we only remove/replace a declaration once.
+    test('declaration nodes are only replaced/removed once', async () => {
+      let input = css`
+        @utility mask-r-* {
+          --mask-right: linear-gradient(to left, transparent, black --value(percentage));
+          --mask-right: linear-gradient(
+            to left,
+            transparent calc(var(--spacing) * --modifier(integer)),
+            black calc(var(--spacing) * --value(integer))
+          );
+          mask-image: var(--mask-linear), var(--mask-radial), var(--mask-conic);
+        }
+
+        @tailwind utilities;
+      `
+
+      expect(await run(['mask-r-20%'], input)).toMatchInlineSnapshot(`
+        "
+        .mask-r-20\\% {
+          --mask-right: linear-gradient(to left, transparent, black 20%);
+          -webkit-mask-image: var(--mask-linear), var(--mask-radial), var(--mask-conic);
+          -webkit-mask-image: var(--mask-linear), var(--mask-radial), var(--mask-conic);
+          mask-image: var(--mask-linear), var(--mask-radial), var(--mask-conic);
+        }
+        "
+      `)
+    })
+  })
+
+  test('resolve value based on `@theme`', async () => {
+    let input = css`
+      @theme {
+        --example-a: 8;
+      }
+
+      @utility example-* {
+        --resolved-value: --value(--example);
+      }
+
+      @tailwind utilities;
+    `
+
+    expect(await run(['example-a'], input)).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --example-a: 8;
+      }
+
+      .example-a {
+        --resolved-value: var(--example-a);
+      }
+      "
+    `)
+  })
+
+  test('resolve value based on `@theme reference`', async () => {
+    let input = css`
+      @theme reference {
+        --example-a: 8;
+      }
+
+      @utility example-* {
+        --resolved-value: --value(--example);
+      }
+
+      @tailwind utilities;
+    `
+
+    expect(await run(['example-a'], input)).toMatchInlineSnapshot(`
+      "
+      .example-a {
+        --resolved-value: var(--example-a, 8);
+      }
+      "
+    `)
+  })
+
+  test('resolve value based on `@theme inline`', async () => {
+    let input = css`
+      @theme inline {
+        --example-a: 8;
+      }
+
+      @utility example-* {
+        --resolved-value: --value(--example);
+      }
+
+      @tailwind utilities;
+    `
+
+    expect(await run(['example-a'], input)).toMatchInlineSnapshot(`
+      "
+      .example-a {
+        --resolved-value: 8;
+      }
+      "
+    `)
+  })
+
+  test('resolve value based on `@theme inline reference`', async () => {
+    let input = css`
+      @theme inline reference {
+        --example-a: 8;
+      }
+
+      @utility example-* {
+        --resolved-value: --value(--example);
+      }
+
+      @tailwind utilities;
+    `
+
+    expect(await run(['example-a'], input)).toMatchInlineSnapshot(`
+      "
+      .example-a {
+        --resolved-value: 8;
+      }
+      "
+    `)
+  })
+
+  test('sub namespaces can live in different @theme blocks (1)', async () => {
+    let input = `
+      @theme reference {
+        --text-xs: 0.75rem;
+      }
+
+      @theme inline reference {
+        --text-xs--line-height: calc(1 / 0.75);
+      }
+
+      @utility example-* {
+        font-size: --value(--text);
+        line-height: --value(--text-*--line-height);
+      }
+
+      @tailwind utilities;
+    `
+
+    expect(await run(['example-xs'], input)).toMatchInlineSnapshot(`
+      "
+      .example-xs {
+        font-size: var(--text-xs, .75rem);
+        line-height: 1.33333;
+      }
+      "
+    `)
+  })
+
+  test('sub namespaces can live in different @theme blocks (2)', async () => {
+    let input = `
+      @theme inline reference {
+        --text-xs: 0.75rem;
+      }
+
+      @theme reference {
+        --text-xs--line-height: calc(1 / 0.75);
+      }
+
+      @utility example-* {
+        font-size: --value(--text);
+        line-height: --value(--text-*--line-height);
+      }
+
+      @tailwind utilities;
+    `
+
+    expect(await run(['example-xs'], input)).toMatchInlineSnapshot(`
+      "
+      .example-xs {
+        font-size: .75rem;
+        line-height: var(--text-xs--line-height, calc(1 / .75));
+      }
+      "
+    `)
+  })
+
+  test('multiple @utility definitions with the same name but different value types', async () => {
+    let input = css`
+      @theme {
+        --color-red-500: #ef4444;
+        --spacing: 0.25rem;
+      }
+
+      @utility foo-* {
+        color: --value(--color-*);
+      }
+
+      @utility foo-* {
+        font-size: --spacing(--value(number));
+      }
+
+      @tailwind utilities;
+    `
+
+    expect(await run(['foo-red-500', 'foo-123'], input)).toMatchInlineSnapshot(`
+      "
+      :root, :host {
+        --color-red-500: #ef4444;
+        --spacing: .25rem;
+      }
+
+      .foo-123 {
+        font-size: calc(var(--spacing) * 123);
+      }
+
+      .foo-red-500 {
+        color: var(--color-red-500);
+      }
+      "
+    `)
+  })
 })
diff --git a/packages/tailwindcss/src/utilities.ts b/packages/tailwindcss/src/utilities.ts
index 73993934b..477559d7e 100644
--- a/packages/tailwindcss/src/utilities.ts
+++ b/packages/tailwindcss/src/utilities.ts
@@ -1,16 +1,72 @@
-import { atRoot, atRule, decl, styleRule, type AstNode } from './ast'
+import {
+  atRoot,
+  atRule,
+  cloneAstNode,
+  decl,
+  rule,
+  styleRule,
+  type AstNode,
+  type AtRule,
+  type Declaration,
+  type Rule,
+} from './ast'
 import type { Candidate, CandidateModifier, NamedUtilityValue } from './candidate'
+import type { DesignSystem } from './design-system'
 import type { Theme, ThemeKey } from './theme'
 import { compareBreakpoints } from './utils/compare-breakpoints'
 import { DefaultMap } from './utils/default-map'
+import { dimensions } from './utils/dimensions'
+import { unescape } from './utils/escape'
 import {
   inferDataType,
+  isLength,
   isPositiveInteger,
+  isStrictPositiveInteger,
   isValidOpacityValue,
   isValidSpacingMultiplier,
 } from './utils/infer-data-type'
+import { addWhitespaceAroundMathOperators } from './utils/math-operators'
 import { replaceShadowColors } from './utils/replace-shadow-colors'
 import { segment } from './utils/segment'
+import * as ValueParser from './value-parser'
+import { walk, WalkAction } from './walk'
+
+const DEFAULT_SPACING_SUGGESTIONS = [
+  '0',
+  '0.5',
+  '1',
+  '1.5',
+  '2',
+  '2.5',
+  '3',
+  '3.5',
+  '4',
+  '5',
+  '6',
+  '7',
+  '8',
+  '9',
+  '10',
+  '11',
+  '12',
+  '14',
+  '16',
+  '20',
+  '24',
+  '28',
+  '32',
+  '36',
+  '40',
+  '44',
+  '48',
+  '52',
+  '56',
+  '60',
+  '64',
+  '72',
+  '80',
+  '96',
+]
 
 type CompileFn<T extends Candidate['kind']> = (
   value: Extract<Candidate, { kind: T }>,
@@ -26,6 +82,7 @@ type SuggestionDefinition =
   | string
   | {
       supportsNegative?: boolean
+      supportsFractions?: boolean
       values?: string[]
       modifiers?: string[]
       valueThemeKeys?: ThemeKey[]
@@ -65,13 +122,22 @@ export class Utilities {
   }
 
   getCompletions(name: string): SuggestionGroup[] {
+    if (this.has(name, 'static')) {
+      return (
+        this.completions.get(name)?.() ?? [{ supportsNegative: false, values: [], modifiers: [] }]
+      )
+    }
+
     return this.completions.get(name)?.() ?? []
   }
 
   suggest(name: string, groups: () => SuggestionGroup[]) {
-    // TODO: We are calling this multiple times on purpose but ideally only ever
-    // once per utility root.
-    this.completions.set(name, groups)
+    let existingGroups = this.completions.get(name)
+    if (existingGroups) {
+      this.completions.set(name, () => [...existingGroups?.(), ...groups?.()])
+    } else {
+      this.completions.set(name, groups)
+    }
   }
 
   keys(kind: 'static' | 'functional') {
@@ -118,9 +184,29 @@ export function withAlpha(value: string, alpha: string): string {
     alpha = `${alphaAsNumber * 100}%`
   }
 
+  // No need for `color-mix` if the alpha is `100%`
+  if (alpha === '100%') {
+    return value
+  }
+
   return `color-mix(in oklab, ${value} ${alpha}, transparent)`
 }
 
+/**
+ * Replace the opacity in a color using relative color syntax.
+ */
+export function replaceAlpha(value: string, alpha: string): string {
+  // Convert numeric values (like `0.5`) to percentages (like `50%`) so they
+  // work properly with `color-mix`. Assume anything that isn't a number is
+  // safe to pass through as-is, like `var(--my-opacity)`.
+  let alphaAsNumber = Number(alpha)
+  if (!Number.isNaN(alphaAsNumber)) {
+    alpha = `${alphaAsNumber * 100}%`
+  }
+
+  return `oklab(from ${value} l a b / ${alpha})`
+}
+
 /**
  * Resolve a color value + optional opacity modifier to a final color.
  */
@@ -184,7 +270,7 @@ function resolveThemeColor<T extends ThemeKey>(
       break
     }
     case 'current': {
-      value = 'currentColor'
+      value = 'currentcolor'
       break
     }
     default: {
@@ -196,6 +282,15 @@ function resolveThemeColor<T extends ThemeKey>(
   return value ? asColor(value, candidate.modifier, theme) : null
 }
 
+/**
+ * The alpha and beta releases used `_` in theme keys to represent a `.`. This meant we used
+ * `--leading-1_5` instead of `--leading-1\.5` to add utilities like `leading-1.5`.
+ *
+ * We prefer the use of the escaped dot now but still want to make sure suggestions for the
+ * legacy key format still works as expected when surrounded by numbers.
+ */
+const LEGACY_NUMERIC_KEY = /(\d+)_(\d+)/g
+
 export function createUtilities(theme: Theme) {
   let utilities = new Utilities()
 
@@ -205,10 +300,41 @@ export function createUtilities(theme: Theme) {
   function suggest(classRoot: string, defns: () => SuggestionDefinition[]) {
     function* resolve(themeKeys: ThemeKey[]) {
       for (let value of theme.keysInNamespaces(themeKeys)) {
-        yield value.replaceAll('_', '.')
+        yield value.replace(LEGACY_NUMERIC_KEY, (_, a, b) => {
+          return `${a}.${b}`
+        })
       }
     }
 
+    let suggestedFractions = [
+      '1/2',
+      '1/3',
+      '2/3',
+      '1/4',
+      '2/4',
+      '3/4',
+      '1/5',
+      '2/5',
+      '3/5',
+      '4/5',
+      '1/6',
+      '2/6',
+      '3/6',
+      '4/6',
+      '5/6',
+      '1/12',
+      '2/12',
+      '3/12',
+      '4/12',
+      '5/12',
+      '6/12',
+      '7/12',
+      '8/12',
+      '9/12',
+      '10/12',
+      '11/12',
+    ]
+
     utilities.suggest(classRoot, () => {
       let groups: SuggestionGroup[] = []
 
@@ -222,8 +348,13 @@ export function createUtilities(theme: Theme) {
           ...(defn.values ?? []),
           ...resolve(defn.valueThemeKeys ?? []),
         ]
+
         let modifiers = [...(defn.modifiers ?? []), ...resolve(defn.modifierThemeKeys ?? [])]
 
+        if (defn.supportsFractions) {
+          values.push(...suggestedFractions)
+        }
+
         if (defn.hasDefaultValue) {
           values.unshift(null)
         }
@@ -251,9 +382,10 @@ export function createUtilities(theme: Theme) {
     supportsFractions?: boolean
     themeKeys?: ThemeKey[]
     defaultValue?: string | null
+    staticValues?: Record<string, AstNode[]>
     handleBareValue?: (value: NamedUtilityValue) => string | null
     handleNegativeBareValue?: (value: NamedUtilityValue) => string | null
-    handle: (value: string) => AstNode[] | undefined
+    handle: (value: string, dataType: string | null) => AstNode[] | undefined
   }
 
   /**
@@ -261,9 +393,12 @@ export function createUtilities(theme: Theme) {
    * user's theme.
    */
   function functionalUtility(classRoot: string, desc: UtilityDescription) {
+    if (desc.staticValues) desc.staticValues = Object.assign(Object.create(null), desc.staticValues)
+
     function handleFunctionalUtility({ negative }: { negative: boolean }) {
       return (candidate: Extract<Candidate, { kind: 'functional' }>) => {
         let value: string | null = null
+        let dataType: string | null = null
 
         if (!candidate.value) {
           if (candidate.modifier) return
@@ -279,18 +414,26 @@ export function createUtilities(theme: Theme) {
         } else if (candidate.value.kind === 'arbitrary') {
           if (candidate.modifier) return
           value = candidate.value.value
+          dataType = candidate.value.dataType
         } else {
           value = theme.resolve(
             candidate.value.fraction ?? candidate.value.value,
             desc.themeKeys ?? [],
           )
 
+          // If the theme value resolved without consuming the modifier, then
+          // the modifier would be silently ignored and `w-4` and `w-4/foo`
+          // would generate the same CSS.
+          //
+          // The modifier would be consumed if it's a fraction, e.g.: `w-1/2`
+          if (value !== null && candidate.modifier && !candidate.value.fraction) return
+
           // Automatically handle things like `w-1/2` without requiring `1/2` to
           // exist as a theme value.
           if (value === null && desc.supportsFractions && candidate.value.fraction) {
             let [lhs, rhs] = segment(candidate.value.fraction, '/')
             if (!isPositiveInteger(lhs) || !isPositiveInteger(rhs)) return
-            value = `calc(${candidate.value.fraction} * 100%)`
+            value = `calc(${lhs} / ${rhs} * 100%)`
           }
 
           // If there is still no value but the utility supports bare values,
@@ -298,20 +441,28 @@ export function createUtilities(theme: Theme) {
           if (value === null && negative && desc.handleNegativeBareValue) {
             value = desc.handleNegativeBareValue(candidate.value)
             if (!value?.includes('/') && candidate.modifier) return
-            if (value !== null) return desc.handle(value)
+            if (value !== null) return desc.handle(value, null)
           }
 
           if (value === null && desc.handleBareValue) {
             value = desc.handleBareValue(candidate.value)
             if (!value?.includes('/') && candidate.modifier) return
           }
+
+          if (value === null && !negative && desc.staticValues && !candidate.modifier) {
+            let fallback = desc.staticValues[candidate.value.value]
+            if (fallback) return fallback.map(cloneAstNode)
+          }
         }
 
         // If there is no value, don't generate any rules.
         if (value === null) return
 
         // Negate the value if the candidate has a negative prefix.
-        return desc.handle(negative ? `calc(${value} * -1)` : value)
+        return desc.handle(
+          negative ? addWhitespaceAroundMathOperators(`calc(${value} * -1)`) : value,
+          dataType,
+        )
       }
     }
 
@@ -325,8 +476,16 @@ export function createUtilities(theme: Theme) {
         supportsNegative: desc.supportsNegative,
         valueThemeKeys: desc.themeKeys ?? [],
         hasDefaultValue: desc.defaultValue !== undefined && desc.defaultValue !== null,
+        supportsFractions: desc.supportsFractions,
       },
     ])
+
+    // Also suggest any staticValues automatically so callers don't need to
+    // manually add suggestion groups for e.g. `auto`, `none`, `full`, etc.
+    if (desc.staticValues && Object.keys(desc.staticValues).length > 0) {
+      let values = Object.keys(desc.staticValues)
+      suggest(classRoot, () => [{ values }])
+    }
   }
 
   type ColorUtilityDescription = {
@@ -367,6 +526,7 @@ export function createUtilities(theme: Theme) {
       {
         values: ['current', 'inherit', 'transparent'],
         valueThemeKeys: desc.themeKeys,
+        modifierThemeKeys: ['--opacity'],
         modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
       },
     ])
@@ -379,9 +539,11 @@ export function createUtilities(theme: Theme) {
     {
       supportsNegative = false,
       supportsFractions = false,
+      staticValues,
     }: {
       supportsNegative?: boolean
       supportsFractions?: boolean
+      staticValues?: Record<string, AstNode[]>
     } = {},
   ) {
     if (supportsNegative) {
@@ -398,57 +560,24 @@ export function createUtilities(theme: Theme) {
         if (!multiplier) return null
         if (!isValidSpacingMultiplier(value)) return null
 
-        return `calc(${multiplier} * ${value})`
+        return `--spacing(${value})`
       },
       handleNegativeBareValue: ({ value }) => {
         let multiplier = theme.resolve(null, ['--spacing'])
         if (!multiplier) return null
         if (!isValidSpacingMultiplier(value)) return null
 
-        return `calc(${multiplier} * -${value})`
+        return `--spacing(-${value})`
       },
       handle,
+      staticValues,
     })
 
     suggest(name, () => [
       {
-        values: [
-          '0',
-          '0.5',
-          '1',
-          '1.5',
-          '2',
-          '2.5',
-          '3',
-          '3.5',
-          '4',
-          '5',
-          '6',
-          '7',
-          '8',
-          '9',
-          '10',
-          '11',
-          '12',
-          '14',
-          '16',
-          '20',
-          '24',
-          '28',
-          '32',
-          '36',
-          '40',
-          '44',
-          '48',
-          '52',
-          '56',
-          '60',
-          '64',
-          '72',
-          '80',
-          '96',
-        ],
+        values: theme.get(['--spacing']) ? DEFAULT_SPACING_SUGGESTIONS : [],
         supportsNegative,
+        supportsFractions,
         valueThemeKeys: themeKeys,
       },
     ])
@@ -467,7 +596,7 @@ export function createUtilities(theme: Theme) {
     ['padding', '0'],
     ['margin', '-1px'],
     ['overflow', 'hidden'],
-    ['clip', 'rect(0, 0, 0, 0)'],
+    ['clip-path', 'inset(50%)'],
     ['white-space', 'nowrap'],
     ['border-width', '0'],
   ])
@@ -478,7 +607,7 @@ export function createUtilities(theme: Theme) {
     ['padding', '0'],
     ['margin', '0'],
     ['overflow', 'visible'],
-    ['clip', 'auto'],
+    ['clip-path', 'none'],
     ['white-space', 'normal'],
   ])
 
@@ -511,8 +640,10 @@ export function createUtilities(theme: Theme) {
     ['inset', 'inset'],
     ['inset-x', 'inset-inline'],
     ['inset-y', 'inset-block'],
-    ['start', 'inset-inline-start'],
-    ['end', 'inset-inline-end'],
+    ['inset-s', 'inset-inline-start'],
+    ['inset-e', 'inset-inline-end'],
+    ['inset-bs', 'inset-block-start'],
+    ['inset-be', 'inset-block-end'],
     ['top', 'top'],
     ['right', 'right'],
     ['bottom', 'bottom'],
@@ -536,7 +667,6 @@ export function createUtilities(theme: Theme) {
   /**
    * @css `z-index`
    */
-  staticUtility('z-auto', [['z-index', 'auto']])
   functionalUtility('z', {
     supportsNegative: true,
     handleBareValue: ({ value }) => {
@@ -545,6 +675,9 @@ export function createUtilities(theme: Theme) {
     },
     themeKeys: ['--z-index'],
     handle: (value) => [decl('z-index', value)],
+    staticValues: {
+      auto: [decl('z-index', 'auto')],
+    },
   })
 
   suggest('z', () => [
@@ -558,9 +691,6 @@ export function createUtilities(theme: Theme) {
   /**
    * @css `order`
    */
-  staticUtility('order-first', [['order', 'calc(-infinity)']])
-  staticUtility('order-last', [['order', 'calc(infinity)']])
-  staticUtility('order-none', [['order', '0']])
   functionalUtility('order', {
     supportsNegative: true,
     handleBareValue: ({ value }) => {
@@ -569,6 +699,10 @@ export function createUtilities(theme: Theme) {
     },
     themeKeys: ['--order'],
     handle: (value) => [decl('order', value)],
+    staticValues: {
+      first: [decl('order', '-9999')],
+      last: [decl('order', '9999')],
+    },
   })
 
   suggest('order', () => [
@@ -582,24 +716,33 @@ export function createUtilities(theme: Theme) {
   /**
    * @css `grid-column`
    */
-  staticUtility('col-auto', [['grid-column', 'auto']])
   functionalUtility('col', {
+    supportsNegative: true,
+    handleBareValue: ({ value }) => {
+      if (!isPositiveInteger(value)) return null
+      return value
+    },
     themeKeys: ['--grid-column'],
     handle: (value) => [decl('grid-column', value)],
+    staticValues: {
+      auto: [decl('grid-column', 'auto')],
+    },
   })
-  staticUtility('col-span-full', [['grid-column', '1 / -1']])
+
   functionalUtility('col-span', {
     handleBareValue: ({ value }) => {
       if (!isPositiveInteger(value)) return null
       return value
     },
     handle: (value) => [decl('grid-column', `span ${value} / span ${value}`)],
+    staticValues: {
+      full: [decl('grid-column', '1 / -1')],
+    },
   })
 
   /**
    * @css `grid-column-start`
    */
-  staticUtility('col-start-auto', [['grid-column-start', 'auto']])
   functionalUtility('col-start', {
     supportsNegative: true,
     handleBareValue: ({ value }) => {
@@ -608,12 +751,14 @@ export function createUtilities(theme: Theme) {
     },
     themeKeys: ['--grid-column-start'],
     handle: (value) => [decl('grid-column-start', value)],
+    staticValues: {
+      auto: [decl('grid-column-start', 'auto')],
+    },
   })
 
   /**
    * @css `grid-column-end`
    */
-  staticUtility('col-end-auto', [['grid-column-end', 'auto']])
   functionalUtility('col-end', {
     supportsNegative: true,
     handleBareValue: ({ value }) => {
@@ -622,6 +767,9 @@ export function createUtilities(theme: Theme) {
     },
     themeKeys: ['--grid-column-end'],
     handle: (value) => [decl('grid-column-end', value)],
+    staticValues: {
+      auto: [decl('grid-column-end', 'auto')],
+    },
   })
 
   suggest('col-span', () => [
@@ -650,12 +798,19 @@ export function createUtilities(theme: Theme) {
   /**
    * @css `grid-row`
    */
-  staticUtility('row-auto', [['grid-row', 'auto']])
   functionalUtility('row', {
+    supportsNegative: true,
+    handleBareValue: ({ value }) => {
+      if (!isPositiveInteger(value)) return null
+      return value
+    },
     themeKeys: ['--grid-row'],
     handle: (value) => [decl('grid-row', value)],
+    staticValues: {
+      auto: [decl('grid-row', 'auto')],
+    },
   })
-  staticUtility('row-span-full', [['grid-row', '1 / -1']])
+
   functionalUtility('row-span', {
     themeKeys: [],
     handleBareValue: ({ value }) => {
@@ -663,12 +818,14 @@ export function createUtilities(theme: Theme) {
       return value
     },
     handle: (value) => [decl('grid-row', `span ${value} / span ${value}`)],
+    staticValues: {
+      full: [decl('grid-row', '1 / -1')],
+    },
   })
 
   /**
    * @css `grid-row-start`
    */
-  staticUtility('row-start-auto', [['grid-row-start', 'auto']])
   functionalUtility('row-start', {
     supportsNegative: true,
     handleBareValue: ({ value }) => {
@@ -677,12 +834,14 @@ export function createUtilities(theme: Theme) {
     },
     themeKeys: ['--grid-row-start'],
     handle: (value) => [decl('grid-row-start', value)],
+    staticValues: {
+      auto: [decl('grid-row-start', 'auto')],
+    },
   })
 
   /**
    * @css `grid-row-end`
    */
-  staticUtility('row-end-auto', [['grid-row-end', 'auto']])
   functionalUtility('row-end', {
     supportsNegative: true,
     handleBareValue: ({ value }) => {
@@ -691,6 +850,9 @@ export function createUtilities(theme: Theme) {
     },
     themeKeys: ['--grid-row-end'],
     handle: (value) => [decl('grid-row-end', value)],
+    staticValues: {
+      auto: [decl('grid-row-end', 'auto')],
+    },
   })
 
   suggest('row-span', () => [
@@ -744,6 +906,8 @@ export function createUtilities(theme: Theme) {
     ['my', 'margin-block'],
     ['ms', 'margin-inline-start'],
     ['me', 'margin-inline-end'],
+    ['mbs', 'margin-block-start'],
+    ['mbe', 'margin-block-end'],
     ['mt', 'margin-top'],
     ['mr', 'margin-right'],
     ['mb', 'margin-bottom'],
@@ -764,12 +928,6 @@ export function createUtilities(theme: Theme) {
   /**
    * @css `line-clamp`
    */
-  staticUtility('line-clamp-none', [
-    ['overflow', 'visible'],
-    ['display', 'block'],
-    ['-webkit-box-orient', 'horizontal'],
-    ['-webkit-line-clamp', 'unset'],
-  ])
   functionalUtility('line-clamp', {
     themeKeys: ['--line-clamp'],
     handleBareValue: ({ value }) => {
@@ -782,6 +940,14 @@ export function createUtilities(theme: Theme) {
       decl('-webkit-box-orient', 'vertical'),
       decl('-webkit-line-clamp', value),
     ],
+    staticValues: {
+      none: [
+        decl('overflow', 'visible'),
+        decl('display', 'block'),
+        decl('-webkit-box-orient', 'horizontal'),
+        decl('-webkit-line-clamp', 'unset'),
+      ],
+    },
   })
 
   suggest('line-clamp', () => [
@@ -826,17 +992,19 @@ export function createUtilities(theme: Theme) {
   /**
    * @css `aspect-ratio`
    */
-  staticUtility('aspect-auto', [['aspect-ratio', 'auto']])
-  staticUtility('aspect-square', [['aspect-ratio', '1 / 1']])
   functionalUtility('aspect', {
     themeKeys: ['--aspect'],
     handleBareValue: ({ fraction }) => {
       if (fraction === null) return null
       let [lhs, rhs] = segment(fraction, '/')
-      if (!isPositiveInteger(lhs) || !isPositiveInteger(rhs)) return null
+      if (!isValidSpacingMultiplier(lhs) || !isValidSpacingMultiplier(rhs)) return null
       return fraction
     },
     handle: (value) => [decl('aspect-ratio', value)],
+    staticValues: {
+      auto: [decl('aspect-ratio', 'auto')],
+      square: [decl('aspect-ratio', '1 / 1')],
+    },
   })
 
   /**
@@ -849,7 +1017,6 @@ export function createUtilities(theme: Theme) {
    * @css `max-height`
    */
   for (let [key, value] of [
-    ['auto', 'auto'],
     ['full', '100%'],
     ['svw', '100svw'],
     ['lvw', '100lvw'],
@@ -867,13 +1034,27 @@ export function createUtilities(theme: Theme) {
       ['height', value],
     ])
     staticUtility(`w-${key}`, [['width', value]])
-    staticUtility(`min-w-${key}`, [['min-width', value]])
-    staticUtility(`max-w-${key}`, [['max-width', value]])
     staticUtility(`h-${key}`, [['height', value]])
+    staticUtility(`min-w-${key}`, [['min-width', value]])
     staticUtility(`min-h-${key}`, [['min-height', value]])
+    staticUtility(`max-w-${key}`, [['max-width', value]])
     staticUtility(`max-h-${key}`, [['max-height', value]])
   }
 
+  staticUtility(`size-auto`, [
+    ['--tw-sort', 'size'],
+    ['width', 'auto'],
+    ['height', 'auto'],
+  ])
+  staticUtility(`w-auto`, [['width', 'auto']])
+  staticUtility(`h-auto`, [['height', 'auto']])
+  staticUtility(`min-w-auto`, [['min-width', 'auto']])
+  staticUtility(`min-h-auto`, [['min-height', 'auto']])
+
+  staticUtility(`h-lh`, [['height', '1lh']])
+  staticUtility(`min-h-lh`, [['min-height', '1lh']])
+  staticUtility(`max-h-lh`, [['max-height', '1lh']])
+
   staticUtility(`w-screen`, [['width', '100vw']])
   staticUtility(`min-w-screen`, [['min-width', '100vw']])
   staticUtility(`max-w-screen`, [['max-width', '100vw']])
@@ -881,9 +1062,7 @@ export function createUtilities(theme: Theme) {
   staticUtility(`min-h-screen`, [['min-height', '100vh']])
   staticUtility(`max-h-screen`, [['max-height', '100vh']])
 
-  staticUtility(`min-w-none`, [['min-width', 'none']])
   staticUtility(`max-w-none`, [['max-width', 'none']])
-  staticUtility(`min-h-none`, [['min-height', 'none']])
   staticUtility(`max-h-none`, [['max-height', 'none']])
 
   spacingUtility(
@@ -908,6 +1087,82 @@ export function createUtilities(theme: Theme) {
     })
   }
 
+  /**
+   * @css `inline-size`
+   * @css `min-inline-size`
+   * @css `max-inline-size`
+   * @css `block-size`
+   * @css `min-block-size`
+   * @css `max-block-size`
+   */
+  for (let [key, value] of [
+    ['full', '100%'],
+    ['min', 'min-content'],
+    ['max', 'max-content'],
+    ['fit', 'fit-content'],
+  ]) {
+    staticUtility(`inline-${key}`, [['inline-size', value]])
+    staticUtility(`block-${key}`, [['block-size', value]])
+    staticUtility(`min-inline-${key}`, [['min-inline-size', value]])
+    staticUtility(`min-block-${key}`, [['min-block-size', value]])
+    staticUtility(`max-inline-${key}`, [['max-inline-size', value]])
+    staticUtility(`max-block-${key}`, [['max-block-size', value]])
+  }
+
+  // inline-size viewport units (like width)
+  for (let [key, value] of [
+    ['svw', '100svw'],
+    ['lvw', '100lvw'],
+    ['dvw', '100dvw'],
+  ]) {
+    staticUtility(`inline-${key}`, [['inline-size', value]])
+    staticUtility(`min-inline-${key}`, [['min-inline-size', value]])
+    staticUtility(`max-inline-${key}`, [['max-inline-size', value]])
+  }
+
+  // block-size viewport units (like height)
+  for (let [key, value] of [
+    ['svh', '100svh'],
+    ['lvh', '100lvh'],
+    ['dvh', '100dvh'],
+  ]) {
+    staticUtility(`block-${key}`, [['block-size', value]])
+    staticUtility(`min-block-${key}`, [['min-block-size', value]])
+    staticUtility(`max-block-${key}`, [['max-block-size', value]])
+  }
+
+  staticUtility(`inline-auto`, [['inline-size', 'auto']])
+  staticUtility(`block-auto`, [['block-size', 'auto']])
+  staticUtility(`min-inline-auto`, [['min-inline-size', 'auto']])
+  staticUtility(`min-block-auto`, [['min-block-size', 'auto']])
+
+  staticUtility(`block-lh`, [['block-size', '1lh']])
+  staticUtility(`min-block-lh`, [['min-block-size', '1lh']])
+  staticUtility(`max-block-lh`, [['max-block-size', '1lh']])
+
+  staticUtility(`inline-screen`, [['inline-size', '100vw']])
+  staticUtility(`min-inline-screen`, [['min-inline-size', '100vw']])
+  staticUtility(`max-inline-screen`, [['max-inline-size', '100vw']])
+  staticUtility(`block-screen`, [['block-size', '100vh']])
+  staticUtility(`min-block-screen`, [['min-block-size', '100vh']])
+  staticUtility(`max-block-screen`, [['max-block-size', '100vh']])
+
+  staticUtility(`max-inline-none`, [['max-inline-size', 'none']])
+  staticUtility(`max-block-none`, [['max-block-size', 'none']])
+
+  for (let [name, namespaces, property] of [
+    ['inline', ['--spacing', '--container'], 'inline-size'],
+    ['min-inline', ['--spacing', '--container'], 'min-inline-size'],
+    ['max-inline', ['--spacing', '--container'], 'max-inline-size'],
+    ['block', ['--spacing'], 'block-size'],
+    ['min-block', ['--spacing'], 'min-block-size'],
+    ['max-block', ['--spacing'], 'max-block-size'],
+  ] as [string, ThemeKey[], string][]) {
+    spacingUtility(name, namespaces, (value) => [decl(property, value)], {
+      supportsFractions: true,
+    })
+  }
+
   utilities.static('container', () => {
     let breakpoints = [...theme.namespace('--breakpoint').values()]
     breakpoints.sort((a, z) => compareBreakpoints(a, z, 'asc'))
@@ -950,6 +1205,11 @@ export function createUtilities(theme: Theme) {
     }
   })
 
+  suggest('flex', () => [
+    { supportsFractions: true },
+    { values: Array.from({ length: 12 }, (_, i) => `${i + 1}`) },
+  ])
+
   /**
    * @css `flex-shrink`
    */
@@ -1053,41 +1313,47 @@ export function createUtilities(theme: Theme) {
   /**
    * @css `transform-origin`
    */
-  staticUtility('origin-center', [['transform-origin', 'center']])
-  staticUtility('origin-top', [['transform-origin', 'top']])
-  staticUtility('origin-top-right', [['transform-origin', 'top right']])
-  staticUtility('origin-right', [['transform-origin', 'right']])
-  staticUtility('origin-bottom-right', [['transform-origin', 'bottom right']])
-  staticUtility('origin-bottom', [['transform-origin', 'bottom']])
-  staticUtility('origin-bottom-left', [['transform-origin', 'bottom left']])
-  staticUtility('origin-left', [['transform-origin', 'left']])
-  staticUtility('origin-top-left', [['transform-origin', 'top left']])
   functionalUtility('origin', {
     themeKeys: ['--transform-origin'],
     handle: (value) => [decl('transform-origin', value)],
+    staticValues: {
+      center: [decl('transform-origin', 'center')],
+      top: [decl('transform-origin', 'top')],
+      'top-right': [decl('transform-origin', '100% 0')],
+      right: [decl('transform-origin', '100%')],
+      'bottom-right': [decl('transform-origin', '100% 100%')],
+      bottom: [decl('transform-origin', 'bottom')],
+      'bottom-left': [decl('transform-origin', '0 100%')],
+      left: [decl('transform-origin', '0')],
+      'top-left': [decl('transform-origin', '0 0')],
+    },
   })
 
-  staticUtility('perspective-origin-center', [['perspective-origin', 'center']])
-  staticUtility('perspective-origin-top', [['perspective-origin', 'top']])
-  staticUtility('perspective-origin-top-right', [['perspective-origin', 'top right']])
-  staticUtility('perspective-origin-right', [['perspective-origin', 'right']])
-  staticUtility('perspective-origin-bottom-right', [['perspective-origin', 'bottom right']])
-  staticUtility('perspective-origin-bottom', [['perspective-origin', 'bottom']])
-  staticUtility('perspective-origin-bottom-left', [['perspective-origin', 'bottom left']])
-  staticUtility('perspective-origin-left', [['perspective-origin', 'left']])
-  staticUtility('perspective-origin-top-left', [['perspective-origin', 'top left']])
   functionalUtility('perspective-origin', {
     themeKeys: ['--perspective-origin'],
     handle: (value) => [decl('perspective-origin', value)],
+    staticValues: {
+      center: [decl('perspective-origin', 'center')],
+      top: [decl('perspective-origin', 'top')],
+      'top-right': [decl('perspective-origin', '100% 0')],
+      right: [decl('perspective-origin', '100%')],
+      'bottom-right': [decl('perspective-origin', '100% 100%')],
+      bottom: [decl('perspective-origin', 'bottom')],
+      'bottom-left': [decl('perspective-origin', '0 100%')],
+      left: [decl('perspective-origin', '0')],
+      'top-left': [decl('perspective-origin', '0 0')],
+    },
   })
 
   /**
    * @css `perspective`
    */
-  staticUtility('perspective-none', [['perspective', 'none']])
   functionalUtility('perspective', {
     themeKeys: ['--perspective'],
     handle: (value) => [decl('perspective', value)],
+    staticValues: {
+      none: [decl('perspective', 'none')],
+    },
   })
 
   let translateProperties = () =>
@@ -1164,16 +1430,6 @@ export function createUtilities(theme: Theme) {
       supportsNegative: true,
     },
   )
-  staticUtility(`-translate-z-px`, [
-    translateProperties,
-    [`--tw-translate-z`, '-1px'],
-    ['translate', 'var(--tw-translate-x) var(--tw-translate-y) var(--tw-translate-z)'],
-  ])
-  staticUtility(`translate-z-px`, [
-    translateProperties,
-    [`--tw-translate-z`, '1px'],
-    ['translate', 'var(--tw-translate-x) var(--tw-translate-y) var(--tw-translate-z)'],
-  ])
 
   staticUtility('translate-3d', [
     translateProperties,
@@ -1198,6 +1454,7 @@ export function createUtilities(theme: Theme) {
       let value
       if (candidate.value.kind === 'arbitrary') {
         value = candidate.value.value
+        value = negative ? `calc(${value} * -1)` : value
         return [decl('scale', value)]
       } else {
         value = theme.resolve(candidate.value.value, ['--scale'])
@@ -1285,7 +1542,7 @@ export function createUtilities(theme: Theme) {
         if (type === 'vector') {
           return [decl('rotate', `${value} var(--tw-rotate)`)]
         } else if (type !== 'angle') {
-          return [decl('rotate', value)]
+          return [decl('rotate', negative ? `calc(${value} * -1)` : value)]
         }
       } else {
         value = theme.resolve(candidate.value.value, ['--rotate'])
@@ -1311,20 +1568,20 @@ export function createUtilities(theme: Theme) {
 
   {
     let transformValue = [
-      'var(--tw-rotate-x)',
-      'var(--tw-rotate-y)',
-      'var(--tw-rotate-z)',
-      'var(--tw-skew-x)',
-      'var(--tw-skew-y)',
+      'var(--tw-rotate-x, )',
+      'var(--tw-rotate-y, )',
+      'var(--tw-rotate-z, )',
+      'var(--tw-skew-x, )',
+      'var(--tw-skew-y, )',
     ].join(' ')
 
     let transformProperties = () =>
       atRoot([
-        property('--tw-rotate-x', 'rotateX(0)'),
-        property('--tw-rotate-y', 'rotateY(0)'),
-        property('--tw-rotate-z', 'rotateZ(0)'),
-        property('--tw-skew-x', 'skewX(0)'),
-        property('--tw-skew-y', 'skewY(0)'),
+        property('--tw-rotate-x'),
+        property('--tw-rotate-y'),
+        property('--tw-rotate-z'),
+        property('--tw-skew-x'),
+        property('--tw-skew-y'),
       ])
 
     for (let axis of ['x', 'y', 'z']) {
@@ -1458,6 +1715,21 @@ export function createUtilities(theme: Theme) {
     staticUtility('transform-none', [['transform', 'none']])
   }
 
+  /**
+   * @css `zoom`
+   */
+  functionalUtility('zoom', {
+    handleBareValue: ({ value }) => {
+      if (!isPositiveInteger(value)) return null
+      return `${value}%`
+    },
+    handle: (value) => [decl('zoom', value)],
+  })
+
+  suggest('zoom', () => [
+    { values: ['50', '75', '90', '95', '100', '105', '110', '125', '150', '200'] },
+  ])
+
   /**
    * @css `transform-style`
    */
@@ -1542,7 +1814,7 @@ export function createUtilities(theme: Theme) {
     staticUtility(`touch-pan-${value}`, [
       touchProperties,
       ['--tw-pan-x', `pan-${value}`],
-      ['touch-action', 'var(--tw-pan-x,) var(--tw-pan-y,) var(--tw-pinch-zoom,)'],
+      ['touch-action', 'var(--tw-pan-x, ) var(--tw-pan-y, ) var(--tw-pinch-zoom, )'],
     ])
   }
 
@@ -1550,14 +1822,14 @@ export function createUtilities(theme: Theme) {
     staticUtility(`touch-pan-${value}`, [
       touchProperties,
       ['--tw-pan-y', `pan-${value}`],
-      ['touch-action', 'var(--tw-pan-x,) var(--tw-pan-y,) var(--tw-pinch-zoom,)'],
+      ['touch-action', 'var(--tw-pan-x, ) var(--tw-pan-y, ) var(--tw-pinch-zoom, )'],
     ])
   }
 
   staticUtility('touch-pinch-zoom', [
     touchProperties,
     ['--tw-pinch-zoom', `pinch-zoom`],
-    ['touch-action', 'var(--tw-pan-x,) var(--tw-pan-y,) var(--tw-pinch-zoom,)'],
+    ['touch-action', 'var(--tw-pan-x, ) var(--tw-pan-y, ) var(--tw-pinch-zoom, )'],
   ])
 
   /**
@@ -1613,6 +1885,8 @@ export function createUtilities(theme: Theme) {
     ['scroll-my', 'scroll-margin-block'],
     ['scroll-ms', 'scroll-margin-inline-start'],
     ['scroll-me', 'scroll-margin-inline-end'],
+    ['scroll-mbs', 'scroll-margin-block-start'],
+    ['scroll-mbe', 'scroll-margin-block-end'],
     ['scroll-mt', 'scroll-margin-top'],
     ['scroll-mr', 'scroll-margin-right'],
     ['scroll-mb', 'scroll-margin-bottom'],
@@ -1637,6 +1911,8 @@ export function createUtilities(theme: Theme) {
     ['scroll-py', 'scroll-padding-block'],
     ['scroll-ps', 'scroll-padding-inline-start'],
     ['scroll-pe', 'scroll-padding-inline-end'],
+    ['scroll-pbs', 'scroll-padding-block-start'],
+    ['scroll-pbe', 'scroll-padding-block-end'],
     ['scroll-pt', 'scroll-padding-top'],
     ['scroll-pr', 'scroll-padding-right'],
     ['scroll-pb', 'scroll-padding-bottom'],
@@ -1648,23 +1924,24 @@ export function createUtilities(theme: Theme) {
   staticUtility('list-inside', [['list-style-position', 'inside']])
   staticUtility('list-outside', [['list-style-position', 'outside']])
 
-  /**
-   * @css `list-style-type`
-   */
-  staticUtility('list-none', [['list-style-type', 'none']])
-  staticUtility('list-disc', [['list-style-type', 'disc']])
-  staticUtility('list-decimal', [['list-style-type', 'decimal']])
   functionalUtility('list', {
     themeKeys: ['--list-style-type'],
     handle: (value) => [decl('list-style-type', value)],
+    staticValues: {
+      none: [decl('list-style-type', 'none')],
+      disc: [decl('list-style-type', 'disc')],
+      decimal: [decl('list-style-type', 'decimal')],
+    },
   })
 
   // list-image-*
 
-  staticUtility('list-image-none', [['list-style-image', 'none']])
   functionalUtility('list-image', {
     themeKeys: ['--list-style-image'],
     handle: (value) => [decl('list-style-image', value)],
+    staticValues: {
+      none: [decl('list-style-image', 'none')],
+    },
   })
 
   staticUtility('appearance-none', [['appearance', 'none']])
@@ -1677,9 +1954,6 @@ export function createUtilities(theme: Theme) {
   staticUtility('scheme-only-dark', [['color-scheme', 'only dark']])
   staticUtility('scheme-only-light', [['color-scheme', 'only light']])
 
-  // columns-*
-  staticUtility('columns-auto', [['columns', 'auto']])
-
   functionalUtility('columns', {
     themeKeys: ['--columns', '--container'],
     handleBareValue: ({ value }) => {
@@ -1687,6 +1961,9 @@ export function createUtilities(theme: Theme) {
       return value
     },
     handle: (value) => [decl('columns', value)],
+    staticValues: {
+      auto: [decl('columns', 'auto')],
+    },
   })
 
   suggest('columns', () => [
@@ -1714,44 +1991,62 @@ export function createUtilities(theme: Theme) {
   staticUtility('grid-flow-row-dense', [['grid-auto-flow', 'row dense']])
   staticUtility('grid-flow-col-dense', [['grid-auto-flow', 'column dense']])
 
-  staticUtility('auto-cols-auto', [['grid-auto-columns', 'auto']])
-  staticUtility('auto-cols-min', [['grid-auto-columns', 'min-content']])
-  staticUtility('auto-cols-max', [['grid-auto-columns', 'max-content']])
-  staticUtility('auto-cols-fr', [['grid-auto-columns', 'minmax(0, 1fr)']])
   functionalUtility('auto-cols', {
     themeKeys: ['--grid-auto-columns'],
+    handleBareValue: ({ value }) => {
+      if (!theme.resolve(null, ['--spacing'])) return null
+      if (!isValidSpacingMultiplier(value)) return null
+      return `--spacing(${value})`
+    },
     handle: (value) => [decl('grid-auto-columns', value)],
+    staticValues: {
+      auto: [decl('grid-auto-columns', 'auto')],
+      min: [decl('grid-auto-columns', 'min-content')],
+      max: [decl('grid-auto-columns', 'max-content')],
+      fr: [decl('grid-auto-columns', 'minmax(0, 1fr)')],
+    },
   })
 
-  staticUtility('auto-rows-auto', [['grid-auto-rows', 'auto']])
-  staticUtility('auto-rows-min', [['grid-auto-rows', 'min-content']])
-  staticUtility('auto-rows-max', [['grid-auto-rows', 'max-content']])
-  staticUtility('auto-rows-fr', [['grid-auto-rows', 'minmax(0, 1fr)']])
   functionalUtility('auto-rows', {
     themeKeys: ['--grid-auto-rows'],
+    handleBareValue: ({ value }) => {
+      if (!theme.resolve(null, ['--spacing'])) return null
+      if (!isValidSpacingMultiplier(value)) return null
+      return `--spacing(${value})`
+    },
     handle: (value) => [decl('grid-auto-rows', value)],
+    staticValues: {
+      auto: [decl('grid-auto-rows', 'auto')],
+      min: [decl('grid-auto-rows', 'min-content')],
+      max: [decl('grid-auto-rows', 'max-content')],
+      fr: [decl('grid-auto-rows', 'minmax(0, 1fr)')],
+    },
   })
 
-  staticUtility('grid-cols-none', [['grid-template-columns', 'none']])
-  staticUtility('grid-cols-subgrid', [['grid-template-columns', 'subgrid']])
   functionalUtility('grid-cols', {
     themeKeys: ['--grid-template-columns'],
     handleBareValue: ({ value }) => {
-      if (!isPositiveInteger(value)) return null
+      if (!isStrictPositiveInteger(value)) return null
       return `repeat(${value}, minmax(0, 1fr))`
     },
     handle: (value) => [decl('grid-template-columns', value)],
+    staticValues: {
+      none: [decl('grid-template-columns', 'none')],
+      subgrid: [decl('grid-template-columns', 'subgrid')],
+    },
   })
 
-  staticUtility('grid-rows-none', [['grid-template-rows', 'none']])
-  staticUtility('grid-rows-subgrid', [['grid-template-rows', 'subgrid']])
   functionalUtility('grid-rows', {
     themeKeys: ['--grid-template-rows'],
     handleBareValue: ({ value }) => {
-      if (!isPositiveInteger(value)) return null
+      if (!isStrictPositiveInteger(value)) return null
       return `repeat(${value}, minmax(0, 1fr))`
     },
     handle: (value) => [decl('grid-template-rows', value)],
+    staticValues: {
+      none: [decl('grid-template-rows', 'none')],
+      subgrid: [decl('grid-template-rows', 'subgrid')],
+    },
   })
 
   suggest('grid-cols', () => [
@@ -1780,15 +2075,19 @@ export function createUtilities(theme: Theme) {
   staticUtility('place-content-center', [['place-content', 'center']])
   staticUtility('place-content-start', [['place-content', 'start']])
   staticUtility('place-content-end', [['place-content', 'end']])
-  staticUtility('place-content-between', [['place-content', 'between']])
-  staticUtility('place-content-around', [['place-content', 'around']])
-  staticUtility('place-content-evenly', [['place-content', 'evenly']])
+  staticUtility('place-content-center-safe', [['place-content', 'safe center']])
+  staticUtility('place-content-end-safe', [['place-content', 'safe end']])
+  staticUtility('place-content-between', [['place-content', 'space-between']])
+  staticUtility('place-content-around', [['place-content', 'space-around']])
+  staticUtility('place-content-evenly', [['place-content', 'space-evenly']])
   staticUtility('place-content-baseline', [['place-content', 'baseline']])
   staticUtility('place-content-stretch', [['place-content', 'stretch']])
 
   staticUtility('place-items-center', [['place-items', 'center']])
   staticUtility('place-items-start', [['place-items', 'start']])
   staticUtility('place-items-end', [['place-items', 'end']])
+  staticUtility('place-items-center-safe', [['place-items', 'safe center']])
+  staticUtility('place-items-end-safe', [['place-items', 'safe end']])
   staticUtility('place-items-baseline', [['place-items', 'baseline']])
   staticUtility('place-items-stretch', [['place-items', 'stretch']])
 
@@ -1796,6 +2095,8 @@ export function createUtilities(theme: Theme) {
   staticUtility('content-center', [['align-content', 'center']])
   staticUtility('content-start', [['align-content', 'flex-start']])
   staticUtility('content-end', [['align-content', 'flex-end']])
+  staticUtility('content-center-safe', [['align-content', 'safe center']])
+  staticUtility('content-end-safe', [['align-content', 'safe flex-end']])
   staticUtility('content-between', [['align-content', 'space-between']])
   staticUtility('content-around', [['align-content', 'space-around']])
   staticUtility('content-evenly', [['align-content', 'space-evenly']])
@@ -1805,13 +2106,18 @@ export function createUtilities(theme: Theme) {
   staticUtility('items-center', [['align-items', 'center']])
   staticUtility('items-start', [['align-items', 'flex-start']])
   staticUtility('items-end', [['align-items', 'flex-end']])
+  staticUtility('items-center-safe', [['align-items', 'safe center']])
+  staticUtility('items-end-safe', [['align-items', 'safe flex-end']])
   staticUtility('items-baseline', [['align-items', 'baseline']])
+  staticUtility('items-baseline-last', [['align-items', 'last baseline']])
   staticUtility('items-stretch', [['align-items', 'stretch']])
 
   staticUtility('justify-normal', [['justify-content', 'normal']])
   staticUtility('justify-center', [['justify-content', 'center']])
   staticUtility('justify-start', [['justify-content', 'flex-start']])
   staticUtility('justify-end', [['justify-content', 'flex-end']])
+  staticUtility('justify-center-safe', [['justify-content', 'safe center']])
+  staticUtility('justify-end-safe', [['justify-content', 'safe flex-end']])
   staticUtility('justify-between', [['justify-content', 'space-between']])
   staticUtility('justify-around', [['justify-content', 'space-around']])
   staticUtility('justify-evenly', [['justify-content', 'space-evenly']])
@@ -1822,6 +2128,8 @@ export function createUtilities(theme: Theme) {
   staticUtility('justify-items-center', [['justify-items', 'center']])
   staticUtility('justify-items-start', [['justify-items', 'start']])
   staticUtility('justify-items-end', [['justify-items', 'end']])
+  staticUtility('justify-items-center-safe', [['justify-items', 'safe center']])
+  staticUtility('justify-items-end-safe', [['justify-items', 'safe end']])
   staticUtility('justify-items-stretch', [['justify-items', 'stretch']])
 
   spacingUtility('gap', ['--gap', '--spacing'], (value) => [decl('gap', value)])
@@ -1831,31 +2139,65 @@ export function createUtilities(theme: Theme) {
   spacingUtility(
     'space-x',
     ['--space', '--spacing'],
-    (value) => [
-      atRoot([property('--tw-space-x-reverse', '0')]),
+    (value) => {
+      let zero = (() => {
+        if (value === '--spacing(0)') return true
+        if (value === '--spacing(-0)') return true
 
-      styleRule(':where(& > :not(:last-child))', [
-        decl('--tw-sort', 'row-gap'),
-        decl('--tw-space-x-reverse', '0'),
-        decl('margin-inline-start', `calc(${value} * var(--tw-space-x-reverse))`),
-        decl('margin-inline-end', `calc(${value} * calc(1 - var(--tw-space-x-reverse)))`),
-      ]),
-    ],
+        let parsed = dimensions.get(value)
+        if (parsed && parsed[0] === 0 && (parsed[1] === null || isLength(value))) {
+          return true
+        }
+
+        return false
+      })()
+
+      return [
+        atRoot([property('--tw-space-x-reverse', '0')]),
+
+        styleRule(':where(& > :not(:last-child))', [
+          decl('--tw-sort', 'row-gap'),
+          decl('--tw-space-x-reverse', '0'),
+          decl('margin-inline-start', zero ? '0' : `calc(${value} * var(--tw-space-x-reverse))`),
+          decl(
+            'margin-inline-end',
+            zero ? '0' : `calc(${value} * calc(1 - var(--tw-space-x-reverse)))`,
+          ),
+        ]),
+      ]
+    },
     { supportsNegative: true },
   )
 
   spacingUtility(
     'space-y',
     ['--space', '--spacing'],
-    (value) => [
-      atRoot([property('--tw-space-y-reverse', '0')]),
-      styleRule(':where(& > :not(:last-child))', [
-        decl('--tw-sort', 'column-gap'),
-        decl('--tw-space-y-reverse', '0'),
-        decl('margin-block-start', `calc(${value} * var(--tw-space-y-reverse))`),
-        decl('margin-block-end', `calc(${value} * calc(1 - var(--tw-space-y-reverse)))`),
-      ]),
-    ],
+    (value) => {
+      let zero = (() => {
+        if (value === '--spacing(0)') return true
+        if (value === '--spacing(-0)') return true
+
+        let parsed = dimensions.get(value)
+        if (parsed && parsed[0] === 0 && (parsed[1] === null || isLength(value))) {
+          return true
+        }
+
+        return false
+      })()
+
+      return [
+        atRoot([property('--tw-space-y-reverse', '0')]),
+        styleRule(':where(& > :not(:last-child))', [
+          decl('--tw-sort', 'column-gap'),
+          decl('--tw-space-y-reverse', '0'),
+          decl('margin-block-start', zero ? '0' : `calc(${value} * var(--tw-space-y-reverse))`),
+          decl(
+            'margin-block-end',
+            zero ? '0' : `calc(${value} * calc(1 - var(--tw-space-y-reverse)))`,
+          ),
+        ]),
+      ]
+    },
     { supportsNegative: true },
   )
 
@@ -1889,7 +2231,7 @@ export function createUtilities(theme: Theme) {
   })
 
   colorUtility('divide', {
-    themeKeys: ['--divide-color', '--color'],
+    themeKeys: ['--divide-color', '--border-color', '--color'],
     handle: (value) => [
       styleRule(':where(& > :not(:last-child))', [
         decl('--tw-sort', 'divide-color'),
@@ -1902,19 +2244,26 @@ export function createUtilities(theme: Theme) {
   staticUtility('place-self-start', [['place-self', 'start']])
   staticUtility('place-self-end', [['place-self', 'end']])
   staticUtility('place-self-center', [['place-self', 'center']])
+  staticUtility('place-self-end-safe', [['place-self', 'safe end']])
+  staticUtility('place-self-center-safe', [['place-self', 'safe center']])
   staticUtility('place-self-stretch', [['place-self', 'stretch']])
 
   staticUtility('self-auto', [['align-self', 'auto']])
   staticUtility('self-start', [['align-self', 'flex-start']])
   staticUtility('self-end', [['align-self', 'flex-end']])
   staticUtility('self-center', [['align-self', 'center']])
+  staticUtility('self-end-safe', [['align-self', 'safe flex-end']])
+  staticUtility('self-center-safe', [['align-self', 'safe center']])
   staticUtility('self-stretch', [['align-self', 'stretch']])
   staticUtility('self-baseline', [['align-self', 'baseline']])
+  staticUtility('self-baseline-last', [['align-self', 'last baseline']])
 
   staticUtility('justify-self-auto', [['justify-self', 'auto']])
   staticUtility('justify-self-start', [['justify-self', 'flex-start']])
   staticUtility('justify-self-end', [['justify-self', 'flex-end']])
   staticUtility('justify-self-center', [['justify-self', 'center']])
+  staticUtility('justify-self-end-safe', [['justify-self', 'safe flex-end']])
+  staticUtility('justify-self-center-safe', [['justify-self', 'safe center']])
   staticUtility('justify-self-stretch', [['justify-self', 'stretch']])
 
   for (let value of ['auto', 'hidden', 'clip', 'visible', 'scroll']) {
@@ -1932,6 +2281,41 @@ export function createUtilities(theme: Theme) {
   staticUtility('scroll-auto', [['scroll-behavior', 'auto']])
   staticUtility('scroll-smooth', [['scroll-behavior', 'smooth']])
 
+  staticUtility('scrollbar-auto', [['scrollbar-width', 'auto']])
+  staticUtility('scrollbar-thin', [['scrollbar-width', 'thin']])
+  staticUtility('scrollbar-none', [['scrollbar-width', 'none']])
+
+  {
+    let scrollbarColorProperties = () => {
+      return atRoot([
+        property('--tw-scrollbar-thumb', '#0000', '<color>'),
+        property('--tw-scrollbar-track', '#0000', '<color>'),
+      ])
+    }
+
+    colorUtility('scrollbar-thumb', {
+      themeKeys: ['--color'],
+      handle: (value) => [
+        scrollbarColorProperties(),
+        decl('--tw-scrollbar-thumb', value),
+        decl('scrollbar-color', 'var(--tw-scrollbar-thumb) var(--tw-scrollbar-track)'),
+      ],
+    })
+
+    colorUtility('scrollbar-track', {
+      themeKeys: ['--color'],
+      handle: (value) => [
+        scrollbarColorProperties(),
+        decl('--tw-scrollbar-track', value),
+        decl('scrollbar-color', 'var(--tw-scrollbar-thumb) var(--tw-scrollbar-track)'),
+      ],
+    })
+  }
+
+  staticUtility('scrollbar-gutter-auto', [['scrollbar-gutter', 'auto']])
+  staticUtility('scrollbar-gutter-stable', [['scrollbar-gutter', 'stable']])
+  staticUtility('scrollbar-gutter-both', [['scrollbar-gutter', 'stable both-edges']])
+
   staticUtility('truncate', [
     ['overflow', 'hidden'],
     ['text-overflow', 'ellipsis'],
@@ -1961,6 +2345,16 @@ export function createUtilities(theme: Theme) {
   staticUtility('whitespace-pre-wrap', [['white-space', 'pre-wrap']])
   staticUtility('whitespace-break-spaces', [['white-space', 'break-spaces']])
 
+  functionalUtility('tab', {
+    handleBareValue: ({ value }) => {
+      if (!isPositiveInteger(value)) return null
+      return value
+    },
+    handle: (value) => [decl('tab-size', value)],
+  })
+
+  suggest('tab', () => [{ values: ['2', '4', '8'] }])
+
   staticUtility('text-wrap', [['text-wrap', 'wrap']])
   staticUtility('text-nowrap', [['text-wrap', 'nowrap']])
   staticUtility('text-balance', [['text-wrap', 'balance']])
@@ -1969,10 +2363,13 @@ export function createUtilities(theme: Theme) {
     ['overflow-wrap', 'normal'],
     ['word-break', 'normal'],
   ])
-  staticUtility('break-words', [['overflow-wrap', 'break-word']])
   staticUtility('break-all', [['word-break', 'break-all']])
   staticUtility('break-keep', [['word-break', 'keep-all']])
 
+  staticUtility('wrap-anywhere', [['overflow-wrap', 'anywhere']])
+  staticUtility('wrap-break-word', [['overflow-wrap', 'break-word']])
+  staticUtility('wrap-normal', [['overflow-wrap', 'normal']])
+
   {
     // border-radius
     for (let [root, properties] of [
@@ -1992,17 +2389,13 @@ export function createUtilities(theme: Theme) {
       ['rounded-br', ['border-bottom-right-radius']],
       ['rounded-bl', ['border-bottom-left-radius']],
     ] as const) {
-      staticUtility(
-        `${root}-none`,
-        properties.map((property) => [property, '0']),
-      )
-      staticUtility(
-        `${root}-full`,
-        properties.map((property) => [property, 'calc(infinity * 1px)']),
-      )
       functionalUtility(root, {
         themeKeys: ['--radius'],
         handle: (value) => properties.map((property) => decl(property, value)),
+        staticValues: {
+          none: properties.map((property) => decl(property, '0')),
+          full: properties.map((property) => decl(property, 'calc(infinity * 1px)')),
+        },
       })
     }
   }
@@ -2105,6 +2498,7 @@ export function createUtilities(theme: Theme) {
         {
           values: ['current', 'inherit', 'transparent'],
           valueThemeKeys: ['--border-color', '--color'],
+          modifierThemeKeys: ['--opacity'],
           modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
           hasDefaultValue: true,
         },
@@ -2155,6 +2549,22 @@ export function createUtilities(theme: Theme) {
       color: (value) => [decl('border-inline-end-color', value)],
     })
 
+    borderSideUtility('border-bs', {
+      width: (value) => [
+        decl('border-block-start-style', 'var(--tw-border-style)'),
+        decl('border-block-start-width', value),
+      ],
+      color: (value) => [decl('border-block-start-color', value)],
+    })
+
+    borderSideUtility('border-be', {
+      width: (value) => [
+        decl('border-block-end-style', 'var(--tw-border-style)'),
+        decl('border-block-end-width', value),
+      ],
+      color: (value) => [decl('border-block-end-color', value)],
+    })
+
     borderSideUtility('border-t', {
       width: (value) => [
         decl('border-top-style', 'var(--tw-border-style)'),
@@ -2271,27 +2681,39 @@ export function createUtilities(theme: Theme) {
   staticUtility('bg-auto', [['background-size', 'auto']])
   staticUtility('bg-cover', [['background-size', 'cover']])
   staticUtility('bg-contain', [['background-size', 'contain']])
+  functionalUtility('bg-size', {
+    handle(value) {
+      if (!value) return
+      return [decl('background-size', value)]
+    },
+  })
 
   staticUtility('bg-fixed', [['background-attachment', 'fixed']])
   staticUtility('bg-local', [['background-attachment', 'local']])
   staticUtility('bg-scroll', [['background-attachment', 'scroll']])
 
-  staticUtility('bg-center', [['background-position', 'center']])
   staticUtility('bg-top', [['background-position', 'top']])
-  staticUtility('bg-right-top', [['background-position', 'right top']])
-  staticUtility('bg-right', [['background-position', 'right']])
-  staticUtility('bg-right-bottom', [['background-position', 'right bottom']])
+  staticUtility('bg-top-left', [['background-position', 'left top']])
+  staticUtility('bg-top-right', [['background-position', 'right top']])
   staticUtility('bg-bottom', [['background-position', 'bottom']])
-  staticUtility('bg-left-bottom', [['background-position', 'left bottom']])
+  staticUtility('bg-bottom-left', [['background-position', 'left bottom']])
+  staticUtility('bg-bottom-right', [['background-position', 'right bottom']])
   staticUtility('bg-left', [['background-position', 'left']])
-  staticUtility('bg-left-top', [['background-position', 'left top']])
+  staticUtility('bg-right', [['background-position', 'right']])
+  staticUtility('bg-center', [['background-position', 'center']])
+  functionalUtility('bg-position', {
+    handle(value) {
+      if (!value) return
+      return [decl('background-position', value)]
+    },
+  })
 
   staticUtility('bg-repeat', [['background-repeat', 'repeat']])
   staticUtility('bg-no-repeat', [['background-repeat', 'no-repeat']])
   staticUtility('bg-repeat-x', [['background-repeat', 'repeat-x']])
   staticUtility('bg-repeat-y', [['background-repeat', 'repeat-y']])
-  staticUtility('bg-round', [['background-repeat', 'round']])
-  staticUtility('bg-space', [['background-repeat', 'space']])
+  staticUtility('bg-repeat-round', [['background-repeat', 'round']])
+  staticUtility('bg-repeat-space', [['background-repeat', 'space']])
 
   staticUtility('bg-none', [['background-image', 'none']])
 
@@ -2354,7 +2776,7 @@ export function createUtilities(theme: Theme) {
               value = negative ? `calc(${value} * -1)` : `${value}`
 
               return [
-                decl('--tw-gradient-position', `${value},`),
+                decl('--tw-gradient-position', value),
                 decl('background-image', `linear-gradient(var(--tw-gradient-stops,${value}))`),
               ]
             }
@@ -2362,7 +2784,7 @@ export function createUtilities(theme: Theme) {
               if (negative) return
 
               return [
-                decl('--tw-gradient-position', `${value},`),
+                decl('--tw-gradient-position', value),
                 decl('background-image', `linear-gradient(var(--tw-gradient-stops,${value}))`),
               ]
             }
@@ -2382,7 +2804,10 @@ export function createUtilities(theme: Theme) {
         let interpolationMethod = resolveInterpolationModifier(candidate.modifier)
 
         return [
-          decl('--tw-gradient-position', `${value} ${interpolationMethod},`),
+          decl('--tw-gradient-position', `${value}`),
+          rule('@supports (background-image: linear-gradient(in lab, red, red))', [
+            decl('--tw-gradient-position', `${value} ${interpolationMethod}`),
+          ]),
           decl('background-image', `linear-gradient(var(--tw-gradient-stops))`),
         ]
       }
@@ -2409,7 +2834,7 @@ export function createUtilities(theme: Theme) {
           if (candidate.modifier) return
           let value = candidate.value.value
           return [
-            decl('--tw-gradient-position', `${value},`),
+            decl('--tw-gradient-position', value),
             decl('background-image', `conic-gradient(var(--tw-gradient-stops,${value}))`),
           ]
         }
@@ -2418,7 +2843,7 @@ export function createUtilities(theme: Theme) {
 
         if (!candidate.value) {
           return [
-            decl('--tw-gradient-position', `${interpolationMethod},`),
+            decl('--tw-gradient-position', interpolationMethod),
             decl('background-image', `conic-gradient(var(--tw-gradient-stops))`),
           ]
         }
@@ -2427,10 +2852,10 @@ export function createUtilities(theme: Theme) {
 
         if (!isPositiveInteger(value)) return
 
-        value = negative ? `calc(${value} * -1)` : `${value}deg`
+        value = negative ? `calc(${value}deg * -1)` : `${value}deg`
 
         return [
-          decl('--tw-gradient-position', `from ${value} ${interpolationMethod},`),
+          decl('--tw-gradient-position', `from ${value} ${interpolationMethod}`),
           decl('background-image', `conic-gradient(var(--tw-gradient-stops))`),
         ]
       }
@@ -2455,7 +2880,7 @@ export function createUtilities(theme: Theme) {
       if (!candidate.value) {
         let interpolationMethod = resolveInterpolationModifier(candidate.modifier)
         return [
-          decl('--tw-gradient-position', `${interpolationMethod},`),
+          decl('--tw-gradient-position', interpolationMethod),
           decl('background-image', `radial-gradient(var(--tw-gradient-stops))`),
         ]
       }
@@ -2464,7 +2889,7 @@ export function createUtilities(theme: Theme) {
         if (candidate.modifier) return
         let value = candidate.value.value
         return [
-          decl('--tw-gradient-position', `${value},`),
+          decl('--tw-gradient-position', value),
           decl('background-image', `radial-gradient(var(--tw-gradient-stops,${value}))`),
         ]
       }
@@ -2544,6 +2969,7 @@ export function createUtilities(theme: Theme) {
     {
       values: ['current', 'inherit', 'transparent'],
       valueThemeKeys: ['--background-color', '--color'],
+      modifierThemeKeys: ['--opacity'],
       modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
     },
     {
@@ -2623,6 +3049,7 @@ export function createUtilities(theme: Theme) {
       {
         values: ['current', 'inherit', 'transparent'],
         valueThemeKeys: ['--background-color', '--color'],
+        modifierThemeKeys: ['--opacity'],
         modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
       },
       {
@@ -2639,7 +3066,7 @@ export function createUtilities(theme: Theme) {
       decl('--tw-gradient-from', value),
       decl(
         '--tw-gradient-stops',
-        'var(--tw-gradient-via-stops, var(--tw-gradient-position,) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position))',
+        'var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position))',
       ),
     ],
     position: (value) => [gradientStopProperties(), decl('--tw-gradient-from-position', value)],
@@ -2652,7 +3079,7 @@ export function createUtilities(theme: Theme) {
       decl('--tw-gradient-via', value),
       decl(
         '--tw-gradient-via-stops',
-        'var(--tw-gradient-position,) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position)',
+        'var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-via) var(--tw-gradient-via-position), var(--tw-gradient-to) var(--tw-gradient-to-position)',
       ),
       decl('--tw-gradient-stops', 'var(--tw-gradient-via-stops)'),
     ],
@@ -2665,12 +3092,701 @@ export function createUtilities(theme: Theme) {
       decl('--tw-gradient-to', value),
       decl(
         '--tw-gradient-stops',
-        'var(--tw-gradient-via-stops, var(--tw-gradient-position,) var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position))',
+        'var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position))',
       ),
     ],
     position: (value) => [gradientStopProperties(), decl('--tw-gradient-to-position', value)],
   })
 
+  /**
+   * @css `mask-image`
+   */
+
+  staticUtility('mask-none', [['mask-image', 'none']])
+
+  utilities.functional('mask', (candidate) => {
+    if (!candidate.value) return
+    if (candidate.modifier) return
+    if (candidate.value.kind !== 'arbitrary') return
+
+    // Arbitrary values
+    let value: string | null = candidate.value.value
+    let type =
+      candidate.value.dataType ??
+      inferDataType(value, ['image', 'percentage', 'position', 'bg-size', 'length', 'url'])
+
+    switch (type) {
+      case 'percentage':
+      case 'position': {
+        if (candidate.modifier) return
+        return [decl('mask-position', value)]
+      }
+      case 'bg-size':
+      case 'length':
+      case 'size': {
+        return [decl('mask-size', value)]
+      }
+      case 'image':
+      case 'url':
+      default: {
+        return [decl('mask-image', value)]
+      }
+    }
+  })
+
+  /**
+   * @css `mask-composite`
+   */
+
+  staticUtility('mask-add', [['mask-composite', 'add']])
+  staticUtility('mask-subtract', [['mask-composite', 'subtract']])
+  staticUtility('mask-intersect', [['mask-composite', 'intersect']])
+  staticUtility('mask-exclude', [['mask-composite', 'exclude']])
+
+  /**
+   * @css `mask-mode`
+   *
+   * Sets the "mode" of the mask given by mask-image
+   */
+
+  staticUtility('mask-alpha', [['mask-mode', 'alpha']])
+  staticUtility('mask-luminance', [['mask-mode', 'luminance']])
+  staticUtility('mask-match', [['mask-mode', 'match-source']])
+
+  /**
+   * @css `mask-type`
+   *
+   * Sets the "mode" of the current `<mask>` element
+   * Is overridden by `mask-mode` if used
+   */
+  staticUtility('mask-type-alpha', [['mask-type', 'alpha']])
+  staticUtility('mask-type-luminance', [['mask-type', 'luminance']])
+
+  /**
+   * @css `mask-size`
+   */
+
+  staticUtility('mask-auto', [['mask-size', 'auto']])
+  staticUtility('mask-cover', [['mask-size', 'cover']])
+  staticUtility('mask-contain', [['mask-size', 'contain']])
+  functionalUtility('mask-size', {
+    handle(value) {
+      if (!value) return
+      return [decl('mask-size', value)]
+    },
+  })
+
+  /**
+   * @css `mask-position`
+   */
+
+  staticUtility('mask-top', [['mask-position', 'top']])
+  staticUtility('mask-top-left', [['mask-position', 'left top']])
+  staticUtility('mask-top-right', [['mask-position', 'right top']])
+  staticUtility('mask-bottom', [['mask-position', 'bottom']])
+  staticUtility('mask-bottom-left', [['mask-position', 'left bottom']])
+  staticUtility('mask-bottom-right', [['mask-position', 'right bottom']])
+  staticUtility('mask-left', [['mask-position', 'left']])
+  staticUtility('mask-right', [['mask-position', 'right']])
+  staticUtility('mask-center', [['mask-position', 'center']])
+  functionalUtility('mask-position', {
+    handle(value) {
+      if (!value) return
+      return [decl('mask-position', value)]
+    },
+  })
+
+  /**
+   * @css `mask-repeat`
+   */
+
+  staticUtility('mask-repeat', [['mask-repeat', 'repeat']])
+  staticUtility('mask-no-repeat', [['mask-repeat', 'no-repeat']])
+  staticUtility('mask-repeat-x', [['mask-repeat', 'repeat-x']])
+  staticUtility('mask-repeat-y', [['mask-repeat', 'repeat-y']])
+  staticUtility('mask-repeat-round', [['mask-repeat', 'round']])
+  staticUtility('mask-repeat-space', [['mask-repeat', 'space']])
+
+  /**
+   * @css `mask-clip`
+   */
+
+  staticUtility('mask-clip-border', [['mask-clip', 'border-box']])
+  staticUtility('mask-clip-padding', [['mask-clip', 'padding-box']])
+  staticUtility('mask-clip-content', [['mask-clip', 'content-box']])
+  staticUtility('mask-clip-fill', [['mask-clip', 'fill-box']])
+  staticUtility('mask-clip-stroke', [['mask-clip', 'stroke-box']])
+  staticUtility('mask-clip-view', [['mask-clip', 'view-box']])
+  staticUtility('mask-no-clip', [['mask-clip', 'no-clip']])
+
+  /**
+   * @css `mask-origin`
+   */
+
+  staticUtility('mask-origin-border', [['mask-origin', 'border-box']])
+  staticUtility('mask-origin-padding', [['mask-origin', 'padding-box']])
+  staticUtility('mask-origin-content', [['mask-origin', 'content-box']])
+  staticUtility('mask-origin-fill', [['mask-origin', 'fill-box']])
+  staticUtility('mask-origin-stroke', [['mask-origin', 'stroke-box']])
+  staticUtility('mask-origin-view', [['mask-origin', 'view-box']])
+
+  /**
+   * @css `mask-image` gradients
+   */
+
+  let maskPropertiesGradient = () =>
+    atRoot([
+      property('--tw-mask-linear', 'linear-gradient(#fff, #fff)'),
+      property('--tw-mask-radial', 'linear-gradient(#fff, #fff)'),
+      property('--tw-mask-conic', 'linear-gradient(#fff, #fff)'),
+    ])
+
+  type MaskStopDescription = {
+    color: (value: string) => AstNode[] | undefined
+    position: (value: string) => AstNode[] | undefined
+  }
+
+  function maskStopUtility(classRoot: string, desc: MaskStopDescription) {
+    utilities.functional(classRoot, (candidate) => {
+      if (!candidate.value) return
+
+      // Arbitrary values
+      if (candidate.value.kind === 'arbitrary') {
+        let value: string | null = candidate.value.value
+        let type =
+          candidate.value.dataType ?? inferDataType(value, ['length', 'percentage', 'color'])
+
+        switch (type) {
+          case 'color': {
+            value = asColor(value, candidate.modifier, theme)
+            if (value === null) return
+
+            return desc.color(value)
+          }
+          case 'percentage': {
+            if (candidate.modifier) return
+            if (!isPositiveInteger(value.slice(0, -1))) return
+
+            return desc.position(value)
+          }
+          default: {
+            if (candidate.modifier) return
+
+            return desc.position(value)
+          }
+        }
+      }
+
+      // Known values: Color Stops
+      {
+        let value = resolveThemeColor(candidate, theme, ['--background-color', '--color'])
+        if (value) {
+          return desc.color(value)
+        }
+      }
+
+      // Known values: Positions
+      {
+        if (candidate.modifier) return
+
+        let type = inferDataType(candidate.value.value, ['number', 'percentage'])
+        if (!type) return
+
+        switch (type) {
+          case 'number': {
+            let multiplier = theme.resolve(null, ['--spacing'])
+            if (!multiplier) return
+            if (!isValidSpacingMultiplier(candidate.value.value)) return
+
+            return desc.position(`--spacing(${candidate.value.value})`)
+          }
+
+          case 'percentage': {
+            if (!isPositiveInteger(candidate.value.value.slice(0, -1))) return
+            return desc.position(candidate.value.value)
+          }
+
+          default: {
+            return
+          }
+        }
+      }
+    })
+
+    suggest(classRoot, () => [
+      {
+        values: ['current', 'inherit', 'transparent'],
+        valueThemeKeys: ['--background-color', '--color'],
+        modifierThemeKeys: ['--opacity'],
+        modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
+      },
+      {
+        values: Array.from({ length: 21 }, (_, index) => `${index * 5}%`),
+        valueThemeKeys: ['--gradient-color-stop-positions'],
+      },
+    ])
+
+    suggest(classRoot, () => [
+      // Percentages
+      {
+        values: Array.from({ length: 21 }, (_, index) => `${index * 5}%`),
+      },
+
+      // Spacing Scale
+      {
+        values: theme.get(['--spacing']) ? DEFAULT_SPACING_SUGGESTIONS : [],
+      },
+
+      // Colors
+      {
+        values: ['current', 'inherit', 'transparent'],
+        valueThemeKeys: ['--background-color', '--color'],
+        modifierThemeKeys: ['--opacity'],
+        modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
+      },
+    ])
+  }
+
+  /**
+   * Edge masks
+   */
+
+  let maskPropertiesEdge = () =>
+    atRoot([
+      property('--tw-mask-left', 'linear-gradient(#fff, #fff)'),
+      property('--tw-mask-right', 'linear-gradient(#fff, #fff)'),
+      property('--tw-mask-bottom', 'linear-gradient(#fff, #fff)'),
+      property('--tw-mask-top', 'linear-gradient(#fff, #fff)'),
+    ])
+
+  type MaskEdge = 'top' | 'right' | 'bottom' | 'left'
+  type MaskStop = 'from' | 'to'
+
+  function maskEdgeUtility(name: string, stop: MaskStop, edges: Record<MaskEdge, boolean>) {
+    maskStopUtility(name, {
+      color(value) {
+        let nodes: AstNode[] = [
+          // Common @property declarations
+          maskPropertiesGradient(),
+          maskPropertiesEdge(),
+
+          // Common properties to all edge utilities
+          decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+          decl('mask-composite', 'intersect'),
+          decl(
+            '--tw-mask-linear',
+            'var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top)',
+          ),
+        ]
+
+        for (let edge of ['top', 'right', 'bottom', 'left'] as const) {
+          if (!edges[edge]) continue
+
+          nodes.push(
+            decl(
+              `--tw-mask-${edge}`,
+              `linear-gradient(to ${edge}, var(--tw-mask-${edge}-from-color) var(--tw-mask-${edge}-from-position), var(--tw-mask-${edge}-to-color) var(--tw-mask-${edge}-to-position))`,
+            ),
+          )
+
+          nodes.push(
+            atRoot([
+              property(`--tw-mask-${edge}-from-position`, '0%'),
+              property(`--tw-mask-${edge}-to-position`, '100%'),
+              property(`--tw-mask-${edge}-from-color`, 'black'),
+              property(`--tw-mask-${edge}-to-color`, 'transparent'),
+            ]),
+          )
+
+          nodes.push(decl(`--tw-mask-${edge}-${stop}-color`, value))
+        }
+
+        return nodes
+      },
+      position(value) {
+        let nodes: AstNode[] = [
+          // Common @property declarations
+          maskPropertiesGradient(),
+          maskPropertiesEdge(),
+
+          // Common properties to all edge utilities
+          decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+          decl('mask-composite', 'intersect'),
+          decl(
+            '--tw-mask-linear',
+            'var(--tw-mask-left), var(--tw-mask-right), var(--tw-mask-bottom), var(--tw-mask-top)',
+          ),
+        ]
+
+        for (let edge of ['top', 'right', 'bottom', 'left'] as const) {
+          if (!edges[edge]) continue
+
+          nodes.push(
+            decl(
+              `--tw-mask-${edge}`,
+              `linear-gradient(to ${edge}, var(--tw-mask-${edge}-from-color) var(--tw-mask-${edge}-from-position), var(--tw-mask-${edge}-to-color) var(--tw-mask-${edge}-to-position))`,
+            ),
+          )
+
+          nodes.push(
+            atRoot([
+              property(`--tw-mask-${edge}-from-position`, '0%'),
+              property(`--tw-mask-${edge}-to-position`, '100%'),
+              property(`--tw-mask-${edge}-from-color`, 'black'),
+              property(`--tw-mask-${edge}-to-color`, 'transparent'),
+            ]),
+          )
+
+          nodes.push(decl(`--tw-mask-${edge}-${stop}-position`, value))
+        }
+
+        return nodes
+      },
+    })
+  }
+
+  maskEdgeUtility('mask-x-from', 'from', { top: false, right: true, bottom: false, left: true })
+  maskEdgeUtility('mask-x-to', 'to', { top: false, right: true, bottom: false, left: true })
+  maskEdgeUtility('mask-y-from', 'from', { top: true, right: false, bottom: true, left: false })
+  maskEdgeUtility('mask-y-to', 'to', { top: true, right: false, bottom: true, left: false })
+  maskEdgeUtility('mask-t-from', 'from', { top: true, right: false, bottom: false, left: false })
+  maskEdgeUtility('mask-t-to', 'to', { top: true, right: false, bottom: false, left: false })
+  maskEdgeUtility('mask-r-from', 'from', { top: false, right: true, bottom: false, left: false })
+  maskEdgeUtility('mask-r-to', 'to', { top: false, right: true, bottom: false, left: false })
+  maskEdgeUtility('mask-b-from', 'from', { top: false, right: false, bottom: true, left: false })
+  maskEdgeUtility('mask-b-to', 'to', { top: false, right: false, bottom: true, left: false })
+  maskEdgeUtility('mask-l-from', 'from', { top: false, right: false, bottom: false, left: true })
+  maskEdgeUtility('mask-l-to', 'to', { top: false, right: false, bottom: false, left: true })
+
+  /**
+   *  Linear Masks
+   */
+
+  let maskPropertiesLinear = () =>
+    atRoot([
+      property('--tw-mask-linear-position', '0deg'),
+      property('--tw-mask-linear-from-position', '0%'),
+      property('--tw-mask-linear-to-position', '100%'),
+      property('--tw-mask-linear-from-color', 'black'),
+      property('--tw-mask-linear-to-color', 'transparent'),
+    ])
+
+  functionalUtility('mask-linear', {
+    defaultValue: null,
+    supportsNegative: true,
+    supportsFractions: false,
+    handleBareValue({ value }) {
+      if (!isPositiveInteger(value)) return null
+      let valueAsNumber = Number(value)
+      if (valueAsNumber === 0) return '0deg'
+      if (valueAsNumber === 1) return '1deg'
+      return `calc(1deg * ${value})`
+    },
+    handleNegativeBareValue({ value }) {
+      if (!isPositiveInteger(value)) return null
+      let valueAsNumber = Number(value)
+      if (valueAsNumber === 0) return '0deg'
+      if (valueAsNumber === 1) return '-1deg'
+      return `calc(1deg * -${value})`
+    },
+    handle: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesLinear(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-linear',
+        `linear-gradient(var(--tw-mask-linear-stops, var(--tw-mask-linear-position)))`,
+      ),
+      decl('--tw-mask-linear-position', value),
+    ],
+  })
+
+  suggest('mask-linear', () => [
+    {
+      supportsNegative: true,
+      values: ['0', '1', '2', '3', '6', '12', '45', '90', '180'],
+    },
+  ])
+
+  maskStopUtility('mask-linear-from', {
+    color: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesLinear(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-linear-stops',
+        'var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position)',
+      ),
+      decl('--tw-mask-linear', 'linear-gradient(var(--tw-mask-linear-stops))'),
+      decl('--tw-mask-linear-from-color', value),
+    ],
+    position: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesLinear(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-linear-stops',
+        'var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position)',
+      ),
+      decl('--tw-mask-linear', 'linear-gradient(var(--tw-mask-linear-stops))'),
+      decl('--tw-mask-linear-from-position', value),
+    ],
+  })
+
+  maskStopUtility('mask-linear-to', {
+    color: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesLinear(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-linear-stops',
+        'var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position)',
+      ),
+      decl('--tw-mask-linear', 'linear-gradient(var(--tw-mask-linear-stops))'),
+      decl('--tw-mask-linear-to-color', value),
+    ],
+    position: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesLinear(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-linear-stops',
+        'var(--tw-mask-linear-position), var(--tw-mask-linear-from-color) var(--tw-mask-linear-from-position), var(--tw-mask-linear-to-color) var(--tw-mask-linear-to-position)',
+      ),
+      decl('--tw-mask-linear', 'linear-gradient(var(--tw-mask-linear-stops))'),
+      decl('--tw-mask-linear-to-position', value),
+    ],
+  })
+
+  /**
+   * Radial masks
+   */
+
+  let maskPropertiesRadial = () =>
+    atRoot([
+      property('--tw-mask-radial-from-position', '0%'),
+      property('--tw-mask-radial-to-position', '100%'),
+      property('--tw-mask-radial-from-color', 'black'),
+      property('--tw-mask-radial-to-color', 'transparent'),
+      property('--tw-mask-radial-shape', 'ellipse'),
+      property('--tw-mask-radial-size', 'farthest-corner'),
+      property('--tw-mask-radial-position', 'center'),
+    ])
+
+  staticUtility('mask-circle', [['--tw-mask-radial-shape', 'circle']])
+  staticUtility('mask-ellipse', [['--tw-mask-radial-shape', 'ellipse']])
+  staticUtility('mask-radial-closest-side', [['--tw-mask-radial-size', 'closest-side']])
+  staticUtility('mask-radial-farthest-side', [['--tw-mask-radial-size', 'farthest-side']])
+  staticUtility('mask-radial-closest-corner', [['--tw-mask-radial-size', 'closest-corner']])
+  staticUtility('mask-radial-farthest-corner', [['--tw-mask-radial-size', 'farthest-corner']])
+  staticUtility('mask-radial-at-top', [['--tw-mask-radial-position', 'top']])
+  staticUtility('mask-radial-at-top-left', [['--tw-mask-radial-position', 'top left']])
+  staticUtility('mask-radial-at-top-right', [['--tw-mask-radial-position', 'top right']])
+  staticUtility('mask-radial-at-bottom', [['--tw-mask-radial-position', 'bottom']])
+  staticUtility('mask-radial-at-bottom-left', [['--tw-mask-radial-position', 'bottom left']])
+  staticUtility('mask-radial-at-bottom-right', [['--tw-mask-radial-position', 'bottom right']])
+  staticUtility('mask-radial-at-left', [['--tw-mask-radial-position', 'left']])
+  staticUtility('mask-radial-at-right', [['--tw-mask-radial-position', 'right']])
+  staticUtility('mask-radial-at-center', [['--tw-mask-radial-position', 'center']])
+  functionalUtility('mask-radial-at', {
+    defaultValue: null,
+    supportsNegative: false,
+    supportsFractions: false,
+    handle: (value) => [decl('--tw-mask-radial-position', value)],
+  })
+
+  /*
+      This can be used to set just the size in conjunction with `mask-radial-from-*` et al,
+      or can set the whole gradient if it's the only utility you use.
+
+      For example:
+      `mask-radial-[40px_80px] mask-radial-from-50%`
+      `mask-radial-[96px_at_top,black_40%,transparent_80%,black_90%]`
+
+      This will produce nonsense though and break, which is fine:
+      `mask-radial-[96px_at_top,black_40%,transparent_80%,black_90%]  mask-radial-from-50%`
+    */
+  functionalUtility('mask-radial', {
+    defaultValue: null,
+    supportsNegative: false,
+    supportsFractions: false,
+    handle: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesRadial(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-radial',
+        'radial-gradient(var(--tw-mask-radial-stops, var(--tw-mask-radial-size)))',
+      ),
+      decl('--tw-mask-radial-size', value),
+    ],
+  })
+
+  maskStopUtility('mask-radial-from', {
+    color: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesRadial(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-radial-stops',
+        'var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position)',
+      ),
+      decl('--tw-mask-radial', 'radial-gradient(var(--tw-mask-radial-stops))'),
+      decl('--tw-mask-radial-from-color', value),
+    ],
+    position: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesRadial(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-radial-stops',
+        'var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position)',
+      ),
+      decl('--tw-mask-radial', 'radial-gradient(var(--tw-mask-radial-stops))'),
+      decl('--tw-mask-radial-from-position', value),
+    ],
+  })
+
+  maskStopUtility('mask-radial-to', {
+    color: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesRadial(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-radial-stops',
+        'var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position)',
+      ),
+      decl('--tw-mask-radial', 'radial-gradient(var(--tw-mask-radial-stops))'),
+      decl('--tw-mask-radial-to-color', value),
+    ],
+    position: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesRadial(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-radial-stops',
+        'var(--tw-mask-radial-shape) var(--tw-mask-radial-size) at var(--tw-mask-radial-position), var(--tw-mask-radial-from-color) var(--tw-mask-radial-from-position), var(--tw-mask-radial-to-color) var(--tw-mask-radial-to-position)',
+      ),
+      decl('--tw-mask-radial', 'radial-gradient(var(--tw-mask-radial-stops))'),
+      decl('--tw-mask-radial-to-position', value),
+    ],
+  })
+
+  /**
+   * Conic masks
+   */
+
+  let maskPropertiesConic = () =>
+    atRoot([
+      property('--tw-mask-conic-position', '0deg'),
+      property('--tw-mask-conic-from-position', '0%'),
+      property('--tw-mask-conic-to-position', '100%'),
+      property('--tw-mask-conic-from-color', 'black'),
+      property('--tw-mask-conic-to-color', 'transparent'),
+    ])
+
+  functionalUtility('mask-conic', {
+    defaultValue: null,
+    supportsNegative: true,
+    supportsFractions: false,
+    handleBareValue({ value }) {
+      if (!isPositiveInteger(value)) return null
+      let valueAsNumber = Number(value)
+      if (valueAsNumber === 0) return '0deg'
+      if (valueAsNumber === 1) return '1deg'
+      return `calc(1deg * ${value})`
+    },
+    handleNegativeBareValue({ value }) {
+      if (!isPositiveInteger(value)) return null
+      let valueAsNumber = Number(value)
+      if (valueAsNumber === 0) return '0deg'
+      if (valueAsNumber === 1) return '-1deg'
+      return `calc(1deg * -${value})`
+    },
+    handle: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesConic(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-conic',
+        'conic-gradient(var(--tw-mask-conic-stops, var(--tw-mask-conic-position)))',
+      ),
+      decl('--tw-mask-conic-position', value),
+    ],
+  })
+
+  suggest('mask-conic', () => [
+    {
+      supportsNegative: true,
+      values: ['0', '1', '2', '3', '6', '12', '45', '90', '180'],
+    },
+  ])
+
+  maskStopUtility('mask-conic-from', {
+    color: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesConic(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-conic-stops',
+        'from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position)',
+      ),
+      decl('--tw-mask-conic', 'conic-gradient(var(--tw-mask-conic-stops))'),
+      decl('--tw-mask-conic-from-color', value),
+    ],
+    position: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesConic(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-conic-stops',
+        'from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position)',
+      ),
+      decl('--tw-mask-conic', 'conic-gradient(var(--tw-mask-conic-stops))'),
+      decl('--tw-mask-conic-from-position', value),
+    ],
+  })
+
+  maskStopUtility('mask-conic-to', {
+    color: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesConic(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-conic-stops',
+        'from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position)',
+      ),
+      decl('--tw-mask-conic', 'conic-gradient(var(--tw-mask-conic-stops))'),
+      decl('--tw-mask-conic-to-color', value),
+    ],
+    position: (value) => [
+      maskPropertiesGradient(),
+      maskPropertiesConic(),
+      decl('mask-image', 'var(--tw-mask-linear), var(--tw-mask-radial), var(--tw-mask-conic)'),
+      decl('mask-composite', 'intersect'),
+      decl(
+        '--tw-mask-conic-stops',
+        'from var(--tw-mask-conic-position), var(--tw-mask-conic-from-color) var(--tw-mask-conic-from-position), var(--tw-mask-conic-to-color) var(--tw-mask-conic-to-position)',
+      ),
+      decl('--tw-mask-conic', 'conic-gradient(var(--tw-mask-conic-stops))'),
+      decl('--tw-mask-conic-to-position', value),
+    ],
+  })
+
   /**
    * @css `box-decoration-break`
    */
@@ -2740,6 +3856,7 @@ export function createUtilities(theme: Theme) {
     {
       values: ['current', 'inherit', 'transparent'],
       valueThemeKeys: ['--fill', '--color'],
+      modifierThemeKeys: ['--opacity'],
       modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
     },
   ])
@@ -2778,6 +3895,10 @@ export function createUtilities(theme: Theme) {
     }
 
     {
+      // A modifier is only valid as the opacity of a stroke color. The value
+      // did not resolve to a color, so a modifier would be silently ignored.
+      if (candidate.modifier) return
+
       let value = theme.resolve(candidate.value.value, ['--stroke-width'])
       if (value) {
         return [decl('stroke-width', value)]
@@ -2791,6 +3912,7 @@ export function createUtilities(theme: Theme) {
     {
       values: ['current', 'inherit', 'transparent'],
       valueThemeKeys: ['--stroke', '--color'],
+      modifierThemeKeys: ['--opacity'],
       modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
     },
     {
@@ -2805,18 +3927,20 @@ export function createUtilities(theme: Theme) {
   staticUtility('object-none', [['object-fit', 'none']])
   staticUtility('object-scale-down', [['object-fit', 'scale-down']])
 
-  staticUtility('object-bottom', [['object-position', 'bottom']])
-  staticUtility('object-center', [['object-position', 'center']])
-  staticUtility('object-left', [['object-position', 'left']])
-  staticUtility('object-left-bottom', [['object-position', 'left bottom']])
-  staticUtility('object-left-top', [['object-position', 'left top']])
-  staticUtility('object-right', [['object-position', 'right']])
-  staticUtility('object-right-bottom', [['object-position', 'right bottom']])
-  staticUtility('object-right-top', [['object-position', 'right top']])
-  staticUtility('object-top', [['object-position', 'top']])
   functionalUtility('object', {
     themeKeys: ['--object-position'],
     handle: (value) => [decl('object-position', value)],
+    staticValues: {
+      top: [decl('object-position', 'top')],
+      'top-left': [decl('object-position', 'left top')],
+      'top-right': [decl('object-position', 'right top')],
+      bottom: [decl('object-position', 'bottom')],
+      'bottom-left': [decl('object-position', 'left bottom')],
+      'bottom-right': [decl('object-position', 'right bottom')],
+      left: [decl('object-position', 'left')],
+      right: [decl('object-position', 'right')],
+      center: [decl('object-position', 'center')],
+    },
   })
 
   for (let [name, property] of [
@@ -2825,6 +3949,8 @@ export function createUtilities(theme: Theme) {
     ['py', 'padding-block'],
     ['ps', 'padding-inline-start'],
     ['pe', 'padding-inline-end'],
+    ['pbs', 'padding-block-start'],
+    ['pbe', 'padding-block-end'],
     ['pt', 'padding-top'],
     ['pr', 'padding-right'],
     ['pb', 'padding-bottom'],
@@ -2921,21 +4047,19 @@ export function createUtilities(theme: Theme) {
       valueThemeKeys: ['--font'],
     },
     {
-      values: [
-        'thin',
-        'extralight',
-        'light',
-        'normal',
-        'medium',
-        'semibold',
-        'bold',
-        'extrabold',
-        'black',
-      ],
+      values: [],
       valueThemeKeys: ['--font-weight'],
     },
   ])
 
+  /**
+   * @css `font-feature-settings`
+   */
+  functionalUtility('font-features', {
+    themeKeys: [],
+    handle: (value) => [decl('font-feature-settings', value)],
+  })
+
   staticUtility('uppercase', [['text-transform', 'uppercase']])
   staticUtility('lowercase', [['text-transform', 'lowercase']])
   staticUtility('capitalize', [['text-transform', 'capitalize']])
@@ -2976,7 +4100,7 @@ export function createUtilities(theme: Theme) {
   ])
 
   colorUtility('placeholder', {
-    themeKeys: ['--background-color', '--color'],
+    themeKeys: ['--placeholder-color', '--color'],
     handle: (value) => [
       styleRule('&::placeholder', [decl('--tw-sort', 'placeholder-color'), decl('color', value)]),
     ],
@@ -3046,6 +4170,7 @@ export function createUtilities(theme: Theme) {
     {
       values: ['current', 'inherit', 'transparent'],
       valueThemeKeys: ['--text-decoration-color', '--color'],
+      modifierThemeKeys: ['--opacity'],
       modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
     },
     {
@@ -3054,35 +4179,37 @@ export function createUtilities(theme: Theme) {
     },
   ])
 
-  staticUtility('animate-none', [['animation', 'none']])
   functionalUtility('animate', {
     themeKeys: ['--animate'],
     handle: (value) => [decl('animation', value)],
+    staticValues: {
+      none: [decl('animation', 'none')],
+    },
   })
 
   {
     let cssFilterValue = [
-      'var(--tw-blur,)',
-      'var(--tw-brightness,)',
-      'var(--tw-contrast,)',
-      'var(--tw-grayscale,)',
-      'var(--tw-hue-rotate,)',
-      'var(--tw-invert,)',
-      'var(--tw-saturate,)',
-      'var(--tw-sepia,)',
-      'var(--tw-drop-shadow,)',
+      'var(--tw-blur, )',
+      'var(--tw-brightness, )',
+      'var(--tw-contrast, )',
+      'var(--tw-grayscale, )',
+      'var(--tw-hue-rotate, )',
+      'var(--tw-invert, )',
+      'var(--tw-saturate, )',
+      'var(--tw-sepia, )',
+      'var(--tw-drop-shadow, )',
     ].join(' ')
 
     let cssBackdropFilterValue = [
-      'var(--tw-backdrop-blur,)',
-      'var(--tw-backdrop-brightness,)',
-      'var(--tw-backdrop-contrast,)',
-      'var(--tw-backdrop-grayscale,)',
-      'var(--tw-backdrop-hue-rotate,)',
-      'var(--tw-backdrop-invert,)',
-      'var(--tw-backdrop-opacity,)',
-      'var(--tw-backdrop-saturate,)',
-      'var(--tw-backdrop-sepia,)',
+      'var(--tw-backdrop-blur, )',
+      'var(--tw-backdrop-brightness, )',
+      'var(--tw-backdrop-contrast, )',
+      'var(--tw-backdrop-grayscale, )',
+      'var(--tw-backdrop-hue-rotate, )',
+      'var(--tw-backdrop-invert, )',
+      'var(--tw-backdrop-opacity, )',
+      'var(--tw-backdrop-saturate, )',
+      'var(--tw-backdrop-sepia, )',
     ].join(' ')
 
     let filterProperties = () => {
@@ -3096,6 +4223,10 @@ export function createUtilities(theme: Theme) {
         property('--tw-opacity'),
         property('--tw-saturate'),
         property('--tw-sepia'),
+        property('--tw-drop-shadow'),
+        property('--tw-drop-shadow-color'),
+        property('--tw-drop-shadow-alpha', '100%', '<percentage>'),
+        property('--tw-drop-shadow-size'),
       ])
     }
 
@@ -3161,10 +4292,11 @@ export function createUtilities(theme: Theme) {
         decl('--tw-blur', `blur(${value})`),
         decl('filter', cssFilterValue),
       ],
+      staticValues: {
+        none: [filterProperties(), decl('--tw-blur', ' '), decl('filter', cssFilterValue)],
+      },
     })
 
-    staticUtility('blur-none', [filterProperties, ['--tw-blur', ' '], ['filter', cssFilterValue]])
-
     functionalUtility('backdrop-blur', {
       themeKeys: ['--backdrop-blur', '--blur'],
       handle: (value) => [
@@ -3173,15 +4305,16 @@ export function createUtilities(theme: Theme) {
         decl('-webkit-backdrop-filter', cssBackdropFilterValue),
         decl('backdrop-filter', cssBackdropFilterValue),
       ],
+      staticValues: {
+        none: [
+          backdropFilterProperties(),
+          decl('--tw-backdrop-blur', ' '),
+          decl('-webkit-backdrop-filter', cssBackdropFilterValue),
+          decl('backdrop-filter', cssBackdropFilterValue),
+        ],
+      },
     })
 
-    staticUtility('backdrop-blur-none', [
-      backdropFilterProperties,
-      ['--tw-backdrop-blur', ' '],
-      ['-webkit-backdrop-filter', cssBackdropFilterValue],
-      ['backdrop-filter', cssBackdropFilterValue],
-    ])
-
     functionalUtility('brightness', {
       themeKeys: ['--brightness'],
       handleBareValue: ({ value }) => {
@@ -3488,20 +4621,153 @@ export function createUtilities(theme: Theme) {
       ['--tw-drop-shadow', ' '],
       ['filter', cssFilterValue],
     ])
-    functionalUtility('drop-shadow', {
-      themeKeys: ['--drop-shadow'],
-      handle: (value) => [
-        filterProperties(),
-        decl(
-          '--tw-drop-shadow',
-          segment(value, ',')
-            .map((v) => `drop-shadow(${v})`)
-            .join(' '),
-        ),
-        decl('filter', cssFilterValue),
-      ],
+
+    utilities.functional('drop-shadow', (candidate) => {
+      let alpha: string | undefined
+
+      if (candidate.modifier) {
+        if (candidate.modifier.kind === 'arbitrary') {
+          alpha = candidate.modifier.value
+        } else {
+          if (isValidOpacityValue(candidate.modifier.value)) {
+            alpha = `${candidate.modifier.value}%`
+          }
+        }
+      }
+
+      if (!candidate.value) {
+        let value = theme.get(['--drop-shadow'])
+        let resolved = theme.resolve(null, ['--drop-shadow'])
+        if (value === null || resolved === null) return
+        if (candidate.modifier && !alpha) return
+
+        return [
+          filterProperties(),
+          decl('--tw-drop-shadow-alpha', alpha),
+          ...alphaReplacedDropShadowProperties(
+            '--tw-drop-shadow-size',
+            value,
+            alpha,
+            (color) => `var(--tw-drop-shadow-color, ${color})`,
+          ),
+          decl(
+            '--tw-drop-shadow',
+            segment(resolved, ',')
+              .map((value) => `drop-shadow(${value})`)
+              .join(' '),
+          ),
+          decl('filter', cssFilterValue),
+        ]
+      }
+
+      if (candidate.value.kind === 'arbitrary') {
+        let value: string | null = candidate.value.value
+        let type = candidate.value.dataType ?? inferDataType(value, ['color'])
+
+        switch (type) {
+          case 'color': {
+            value = asColor(value, candidate.modifier, theme)
+            if (value === null) return
+            return [
+              filterProperties(),
+              decl('--tw-drop-shadow-color', withAlpha(value, 'var(--tw-drop-shadow-alpha)')),
+              decl('--tw-drop-shadow', `var(--tw-drop-shadow-size)`),
+            ]
+          }
+          default: {
+            if (candidate.modifier && !alpha) return
+
+            return [
+              filterProperties(),
+              decl('--tw-drop-shadow-alpha', alpha),
+              ...alphaReplacedDropShadowProperties(
+                '--tw-drop-shadow-size',
+                value,
+                alpha,
+                (color) => `var(--tw-drop-shadow-color, ${color})`,
+              ),
+              decl('--tw-drop-shadow', `var(--tw-drop-shadow-size)`),
+              decl('filter', cssFilterValue),
+            ]
+          }
+        }
+      }
+
+      // Shadow size
+      {
+        let value = theme.get([`--drop-shadow-${candidate.value.value}`])
+        let resolved = theme.resolve(candidate.value.value, ['--drop-shadow'])
+        if (value && resolved) {
+          if (candidate.modifier && !alpha) return
+
+          if (alpha) {
+            return [
+              filterProperties(),
+              decl('--tw-drop-shadow-alpha', alpha),
+              ...alphaReplacedDropShadowProperties(
+                '--tw-drop-shadow-size',
+                value,
+                alpha,
+                (color) => `var(--tw-drop-shadow-color, ${color})`,
+              ),
+              decl('--tw-drop-shadow', `var(--tw-drop-shadow-size)`),
+              decl('filter', cssFilterValue),
+            ]
+          }
+
+          return [
+            filterProperties(),
+            decl('--tw-drop-shadow-alpha', alpha),
+            ...alphaReplacedDropShadowProperties(
+              '--tw-drop-shadow-size',
+              value,
+              alpha,
+              (color) => `var(--tw-drop-shadow-color, ${color})`,
+            ),
+            decl(
+              '--tw-drop-shadow',
+              segment(resolved, ',')
+                .map((value) => `drop-shadow(${value})`)
+                .join(' '),
+            ),
+            decl('filter', cssFilterValue),
+          ]
+        }
+      }
+
+      // Shadow color
+      {
+        let value = resolveThemeColor(candidate, theme, ['--drop-shadow-color', '--color'])
+        if (value) {
+          if (value === 'inherit') {
+            return [
+              filterProperties(),
+              decl('--tw-drop-shadow-color', 'inherit'),
+              decl('--tw-drop-shadow', `var(--tw-drop-shadow-size)`),
+            ]
+          }
+
+          return [
+            filterProperties(),
+            decl('--tw-drop-shadow-color', withAlpha(value, 'var(--tw-drop-shadow-alpha)')),
+            decl('--tw-drop-shadow', `var(--tw-drop-shadow-size)`),
+          ]
+        }
+      }
     })
 
+    suggest('drop-shadow', () => [
+      {
+        values: ['current', 'inherit', 'transparent'],
+        valueThemeKeys: ['--drop-shadow-color', '--color'],
+        modifierThemeKeys: ['--opacity'],
+        modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
+      },
+      {
+        valueThemeKeys: ['--drop-shadow'],
+      },
+    ])
+
     functionalUtility('backdrop-opacity', {
       themeKeys: ['--backdrop-opacity', '--opacity'],
       handleBareValue: ({ value }) => {
@@ -3528,45 +4794,46 @@ export function createUtilities(theme: Theme) {
     let defaultTimingFunction = `var(--tw-ease, ${theme.resolve(null, ['--default-transition-timing-function']) ?? 'ease'})`
     let defaultDuration = `var(--tw-duration, ${theme.resolve(null, ['--default-transition-duration']) ?? '0s'})`
 
-    staticUtility('transition-none', [['transition-property', 'none']])
-    staticUtility('transition-all', [
-      ['transition-property', 'all'],
-      ['transition-timing-function', defaultTimingFunction],
-      ['transition-duration', defaultDuration],
-    ])
-    staticUtility('transition-colors', [
-      [
-        'transition-property',
-        'color, background-color, border-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to',
-      ],
-      ['transition-timing-function', defaultTimingFunction],
-      ['transition-duration', defaultDuration],
-    ])
-    staticUtility('transition-opacity', [
-      ['transition-property', 'opacity'],
-      ['transition-timing-function', defaultTimingFunction],
-      ['transition-duration', defaultDuration],
-    ])
-    staticUtility('transition-shadow', [
-      ['transition-property', 'box-shadow'],
-      ['transition-timing-function', defaultTimingFunction],
-      ['transition-duration', defaultDuration],
-    ])
-    staticUtility('transition-transform', [
-      ['transition-property', 'transform, translate, scale, rotate'],
-      ['transition-timing-function', defaultTimingFunction],
-      ['transition-duration', defaultDuration],
-    ])
-
     functionalUtility('transition', {
       defaultValue:
-        'color, background-color, border-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter',
+        'color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, backdrop-filter, display, content-visibility, overlay, pointer-events',
       themeKeys: ['--transition-property'],
       handle: (value) => [
         decl('transition-property', value),
         decl('transition-timing-function', defaultTimingFunction),
         decl('transition-duration', defaultDuration),
       ],
+      staticValues: {
+        none: [decl('transition-property', 'none')],
+        all: [
+          decl('transition-property', 'all'),
+          decl('transition-timing-function', defaultTimingFunction),
+          decl('transition-duration', defaultDuration),
+        ],
+        colors: [
+          decl(
+            'transition-property',
+            'color, background-color, border-color, outline-color, text-decoration-color, fill, stroke, --tw-gradient-from, --tw-gradient-via, --tw-gradient-to',
+          ),
+          decl('transition-timing-function', defaultTimingFunction),
+          decl('transition-duration', defaultDuration),
+        ],
+        opacity: [
+          decl('transition-property', 'opacity'),
+          decl('transition-timing-function', defaultTimingFunction),
+          decl('transition-duration', defaultDuration),
+        ],
+        shadow: [
+          decl('transition-property', 'box-shadow'),
+          decl('transition-timing-function', defaultTimingFunction),
+          decl('transition-duration', defaultDuration),
+        ],
+        transform: [
+          decl('transition-property', 'transform, translate, scale, rotate'),
+          decl('transition-timing-function', defaultTimingFunction),
+          decl('transition-duration', defaultDuration),
+        ],
+      },
     })
 
     staticUtility('transition-discrete', [['transition-behavior', 'allow-discrete']])
@@ -3642,12 +4909,6 @@ export function createUtilities(theme: Theme) {
       return atRoot([property('--tw-ease')])
     }
 
-    staticUtility('ease-initial', [transitionTimingFunctionProperty, ['--tw-ease', 'initial']])
-    staticUtility('ease-linear', [
-      transitionTimingFunctionProperty,
-      ['--tw-ease', 'linear'],
-      ['transition-timing-function', 'linear'],
-    ])
     functionalUtility('ease', {
       themeKeys: ['--ease'],
       handle: (value) => [
@@ -3655,6 +4916,14 @@ export function createUtilities(theme: Theme) {
         decl('--tw-ease', value),
         decl('transition-timing-function', value),
       ],
+      staticValues: {
+        initial: [transitionTimingFunctionProperty(), decl('--tw-ease', 'initial')],
+        linear: [
+          transitionTimingFunctionProperty(),
+          decl('--tw-ease', 'linear'),
+          decl('transition-timing-function', 'linear'),
+        ],
+      },
     })
   }
 
@@ -3672,7 +4941,9 @@ export function createUtilities(theme: Theme) {
     ['content', 'none'],
   ])
   functionalUtility('content', {
-    themeKeys: [],
+    // BC: We only read from the `--content` theme key for compatibility reasons. It's recommended
+    // to use the utility with arbitrary values instead.
+    themeKeys: ['--content'],
     handle: (value) => [
       atRoot([property('--tw-content', '""')]),
       decl('--tw-content', value),
@@ -3682,7 +4953,7 @@ export function createUtilities(theme: Theme) {
 
   {
     let cssContainValue =
-      'var(--tw-contain-size,) var(--tw-contain-layout,) var(--tw-contain-paint,) var(--tw-contain-style,)'
+      'var(--tw-contain-size, ) var(--tw-contain-layout, ) var(--tw-contain-paint, ) var(--tw-contain-style, )'
     let cssContainProperties = () => {
       return atRoot([
         property('--tw-contain-size'),
@@ -3735,16 +5006,24 @@ export function createUtilities(theme: Theme) {
   staticUtility('forced-color-adjust-none', [['forced-color-adjust', 'none']])
   staticUtility('forced-color-adjust-auto', [['forced-color-adjust', 'auto']])
 
-  staticUtility('leading-none', [
-    () => atRoot([property('--tw-leading')]),
-    ['--tw-leading', '1'],
-    ['line-height', '1'],
-  ])
-  spacingUtility('leading', ['--leading', '--spacing'], (value) => [
-    atRoot([property('--tw-leading')]),
-    decl('--tw-leading', value),
-    decl('line-height', value),
-  ])
+  spacingUtility(
+    'leading',
+    ['--leading', '--spacing'],
+    (value) => [
+      atRoot([property('--tw-leading')]),
+      decl('--tw-leading', value),
+      decl('line-height', value),
+    ],
+    {
+      staticValues: {
+        none: [
+          atRoot([property('--tw-leading')]),
+          decl('--tw-leading', '1'),
+          decl('line-height', '1'),
+        ],
+      },
+    },
+  )
 
   functionalUtility('tracking', {
     supportsNegative: true,
@@ -3768,7 +5047,7 @@ export function createUtilities(theme: Theme) {
 
   {
     let cssFontVariantNumericValue =
-      'var(--tw-ordinal,) var(--tw-slashed-zero,) var(--tw-numeric-figure,) var(--tw-numeric-spacing,) var(--tw-numeric-fraction,)'
+      'var(--tw-ordinal, ) var(--tw-slashed-zero, ) var(--tw-numeric-figure, ) var(--tw-numeric-spacing, ) var(--tw-numeric-fraction, )'
     let fontVariantNumericProperties = () => {
       return atRoot([
         property('--tw-ordinal'),
@@ -3835,10 +5114,16 @@ export function createUtilities(theme: Theme) {
       return atRoot([property('--tw-outline-style', 'solid')])
     }
 
-    staticUtility('outline-hidden', [
-      ['outline', '2px solid transparent'],
-      ['outline-offset', '2px'],
-    ])
+    utilities.static('outline-hidden', () => {
+      return [
+        decl('--tw-outline-style', 'none'),
+        decl('outline-style', 'none'),
+        atRule('@media', '(forced-colors: active)', [
+          decl('outline', '2px solid transparent'),
+          decl('outline-offset', '2px'),
+        ]),
+      ]
+    })
 
     /**
      * @css `outline-style`
@@ -3867,10 +5152,11 @@ export function createUtilities(theme: Theme) {
     utilities.functional('outline', (candidate) => {
       if (candidate.value === null) {
         if (candidate.modifier) return
+        let value = theme.get(['--default-outline-width']) ?? '1px'
         return [
           outlineProperties(),
           decl('outline-style', 'var(--tw-outline-style)'),
-          decl('outline-width', '1px'),
+          decl('outline-width', value),
         ]
       }
 
@@ -3932,6 +5218,7 @@ export function createUtilities(theme: Theme) {
       {
         values: ['current', 'inherit', 'transparent'],
         valueThemeKeys: ['--outline-color', '--color'],
+        modifierThemeKeys: ['--opacity'],
         modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
         hasDefaultValue: true,
       },
@@ -3953,6 +5240,7 @@ export function createUtilities(theme: Theme) {
 
     suggest('outline-offset', () => [
       {
+        supportsNegative: true,
         values: ['0', '1', '2', '4', '8'],
         valueThemeKeys: ['--outline-offset'],
       },
@@ -3975,7 +5263,6 @@ export function createUtilities(theme: Theme) {
     },
   ])
 
-  staticUtility('underline-offset-auto', [['text-underline-offset', 'auto']])
   functionalUtility('underline-offset', {
     supportsNegative: true,
     themeKeys: ['--text-underline-offset'],
@@ -3984,6 +5271,9 @@ export function createUtilities(theme: Theme) {
       return `${value}px`
     },
     handle: (value) => [decl('text-underline-offset', value)],
+    staticValues: {
+      auto: [decl('text-underline-offset', 'auto')],
+    },
   })
 
   suggest('underline-offset', () => [
@@ -4018,12 +5308,19 @@ export function createUtilities(theme: Theme) {
             if (!modifier && isValidSpacingMultiplier(candidate.modifier.value)) {
               let multiplier = theme.resolve(null, ['--spacing'])
               if (!multiplier) return null
-              modifier = `calc(${multiplier} * ${candidate.modifier.value})`
+              modifier = `--spacing(${candidate.modifier.value})`
+            }
+
+            // Shorthand for `leading-none`
+            if (!modifier && candidate.modifier.value === 'none') {
+              modifier = '1'
             }
 
             if (modifier) {
               return [decl('font-size', value), decl('line-height', modifier)]
             }
+
+            return null
           }
 
           return [decl('font-size', value)]
@@ -4064,7 +5361,16 @@ export function createUtilities(theme: Theme) {
           if (!modifier && isValidSpacingMultiplier(candidate.modifier.value)) {
             let multiplier = theme.resolve(null, ['--spacing'])
             if (!multiplier) return null
-            modifier = `calc(${multiplier} * ${candidate.modifier.value})`
+            modifier = `--spacing(${candidate.modifier.value})`
+          }
+
+          // Shorthand for `leading-none`
+          if (!modifier && candidate.modifier.value === 'none') {
+            modifier = '1'
+          }
+
+          if (!modifier) {
+            return null
           }
 
           let declarations = [decl('font-size', fontSize)]
@@ -4103,6 +5409,7 @@ export function createUtilities(theme: Theme) {
     {
       values: ['current', 'inherit', 'transparent'],
       valueThemeKeys: ['--text-color', '--color'],
+      modifierThemeKeys: ['--opacity'],
       modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
     },
     {
@@ -4113,6 +5420,136 @@ export function createUtilities(theme: Theme) {
     },
   ])
 
+  let textShadowProperties = () => {
+    return atRoot([
+      property('--tw-text-shadow-color'),
+      property('--tw-text-shadow-alpha', '100%', '<percentage>'),
+    ])
+  }
+
+  staticUtility('text-shadow-initial', [
+    textShadowProperties,
+    ['--tw-text-shadow-color', 'initial'],
+  ])
+
+  utilities.functional('text-shadow', (candidate) => {
+    let alpha: string | undefined
+
+    if (candidate.modifier) {
+      if (candidate.modifier.kind === 'arbitrary') {
+        alpha = candidate.modifier.value
+      } else {
+        if (isValidOpacityValue(candidate.modifier.value)) {
+          alpha = `${candidate.modifier.value}%`
+        }
+      }
+    }
+
+    if (!candidate.value) {
+      let value = theme.get(['--text-shadow'])
+      if (value === null) return
+      if (candidate.modifier && !alpha) return
+
+      return [
+        textShadowProperties(),
+        decl('--tw-text-shadow-alpha', alpha),
+        ...alphaReplacedShadowProperties(
+          'text-shadow',
+          value,
+          alpha,
+          (color) => `var(--tw-text-shadow-color, ${color})`,
+        ),
+      ]
+    }
+
+    if (candidate.value.kind === 'arbitrary') {
+      let value: string | null = candidate.value.value
+      let type = candidate.value.dataType ?? inferDataType(value, ['color'])
+
+      switch (type) {
+        case 'color': {
+          value = asColor(value, candidate.modifier, theme)
+          if (value === null) return
+          return [
+            textShadowProperties(),
+            decl('--tw-text-shadow-color', withAlpha(value, 'var(--tw-text-shadow-alpha)')),
+          ]
+        }
+        default: {
+          if (candidate.modifier && !alpha) return
+
+          return [
+            textShadowProperties(),
+            decl('--tw-text-shadow-alpha', alpha),
+            ...alphaReplacedShadowProperties(
+              'text-shadow',
+              value,
+              alpha,
+              (color) => `var(--tw-text-shadow-color, ${color})`,
+            ),
+          ]
+        }
+      }
+    }
+
+    switch (candidate.value.value) {
+      case 'none':
+        if (candidate.modifier) return
+        return [textShadowProperties(), decl('text-shadow', 'none')]
+
+      case 'inherit':
+        if (candidate.modifier) return
+        return [textShadowProperties(), decl('--tw-text-shadow-color', 'inherit')]
+    }
+
+    // Shadow size
+    {
+      let value = theme.get([`--text-shadow-${candidate.value.value}`])
+      if (value) {
+        if (candidate.modifier && !alpha) return
+
+        return [
+          textShadowProperties(),
+          decl('--tw-text-shadow-alpha', alpha),
+          ...alphaReplacedShadowProperties(
+            'text-shadow',
+            value,
+            alpha,
+            (color) => `var(--tw-text-shadow-color, ${color})`,
+          ),
+        ]
+      }
+    }
+
+    // Shadow color
+    {
+      let value = resolveThemeColor(candidate, theme, ['--text-shadow-color', '--color'])
+      if (value) {
+        return [
+          textShadowProperties(),
+          decl('--tw-text-shadow-color', withAlpha(value, 'var(--tw-text-shadow-alpha)')),
+        ]
+      }
+    }
+  })
+
+  suggest('text-shadow', () => [
+    {
+      values: ['current', 'inherit', 'transparent'],
+      valueThemeKeys: ['--text-shadow-color', '--color'],
+      modifierThemeKeys: ['--opacity'],
+      modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
+    },
+    {
+      values: ['none'],
+    },
+    {
+      valueThemeKeys: ['--text-shadow'],
+      modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
+      hasDefaultValue: theme.get(['--text-shadow']) !== null,
+    },
+  ])
+
   {
     let cssBoxShadowValue = [
       'var(--tw-inset-shadow)',
@@ -4127,8 +5564,10 @@ export function createUtilities(theme: Theme) {
       return atRoot([
         property('--tw-shadow', nullShadow),
         property('--tw-shadow-color'),
+        property('--tw-shadow-alpha', '100%', '<percentage>'),
         property('--tw-inset-shadow', nullShadow),
         property('--tw-inset-shadow-color'),
+        property('--tw-inset-shadow-alpha', '100%', '<percentage>'),
         property('--tw-ring-color'),
         property('--tw-ring-shadow', nullShadow),
         property('--tw-inset-ring-color'),
@@ -4145,15 +5584,31 @@ export function createUtilities(theme: Theme) {
     staticUtility('shadow-initial', [boxShadowProperties, ['--tw-shadow-color', 'initial']])
 
     utilities.functional('shadow', (candidate) => {
+      let alpha: string | undefined
+
+      if (candidate.modifier) {
+        if (candidate.modifier.kind === 'arbitrary') {
+          alpha = candidate.modifier.value
+        } else {
+          if (isValidOpacityValue(candidate.modifier.value)) {
+            alpha = `${candidate.modifier.value}%`
+          }
+        }
+      }
+
       if (!candidate.value) {
         let value = theme.get(['--shadow'])
         if (value === null) return
+        if (candidate.modifier && !alpha) return
 
         return [
           boxShadowProperties(),
-          decl(
+          decl('--tw-shadow-alpha', alpha),
+          ...alphaReplacedShadowProperties(
             '--tw-shadow',
-            replaceShadowColors(value, (color) => `var(--tw-shadow-color, ${color})`),
+            value,
+            alpha,
+            (color) => `var(--tw-shadow-color, ${color})`,
           ),
           decl('box-shadow', cssBoxShadowValue),
         ]
@@ -4168,14 +5623,22 @@ export function createUtilities(theme: Theme) {
             value = asColor(value, candidate.modifier, theme)
             if (value === null) return
 
-            return [boxShadowProperties(), decl('--tw-shadow-color', value)]
-          }
-          default: {
             return [
               boxShadowProperties(),
-              decl(
+              decl('--tw-shadow-color', withAlpha(value, 'var(--tw-shadow-alpha)')),
+            ]
+          }
+          default: {
+            if (candidate.modifier && !alpha) return
+
+            return [
+              boxShadowProperties(),
+              decl('--tw-shadow-alpha', alpha),
+              ...alphaReplacedShadowProperties(
                 '--tw-shadow',
-                replaceShadowColors(value, (color) => `var(--tw-shadow-color, ${color})`),
+                value,
+                alpha,
+                (color) => `var(--tw-shadow-color, ${color})`,
               ),
               decl('box-shadow', cssBoxShadowValue),
             ]
@@ -4191,18 +5654,26 @@ export function createUtilities(theme: Theme) {
             decl('--tw-shadow', nullShadow),
             decl('box-shadow', cssBoxShadowValue),
           ]
+
+        case 'inherit':
+          if (candidate.modifier) return
+          return [boxShadowProperties(), decl('--tw-shadow-color', 'inherit')]
       }
 
       // Shadow size
       {
         let value = theme.get([`--shadow-${candidate.value.value}`])
         if (value) {
-          if (candidate.modifier) return
+          if (candidate.modifier && !alpha) return
+
           return [
             boxShadowProperties(),
-            decl(
+            decl('--tw-shadow-alpha', alpha),
+            ...alphaReplacedShadowProperties(
               '--tw-shadow',
-              replaceShadowColors(value, (color) => `var(--tw-shadow-color, ${color})`),
+              value,
+              alpha,
+              (color) => `var(--tw-shadow-color, ${color})`,
             ),
             decl('box-shadow', cssBoxShadowValue),
           ]
@@ -4213,7 +5684,10 @@ export function createUtilities(theme: Theme) {
       {
         let value = resolveThemeColor(candidate, theme, ['--box-shadow-color', '--color'])
         if (value) {
-          return [boxShadowProperties(), decl('--tw-shadow-color', value)]
+          return [
+            boxShadowProperties(),
+            decl('--tw-shadow-color', withAlpha(value, 'var(--tw-shadow-alpha)')),
+          ]
         }
       }
     })
@@ -4222,12 +5696,16 @@ export function createUtilities(theme: Theme) {
       {
         values: ['current', 'inherit', 'transparent'],
         valueThemeKeys: ['--box-shadow-color', '--color'],
+        modifierThemeKeys: ['--opacity'],
         modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
       },
       {
         values: ['none'],
+      },
+      {
         valueThemeKeys: ['--shadow'],
-        hasDefaultValue: true,
+        modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
+        hasDefaultValue: theme.get(['--shadow']) !== null,
       },
     ])
 
@@ -4237,15 +5715,31 @@ export function createUtilities(theme: Theme) {
     ])
 
     utilities.functional('inset-shadow', (candidate) => {
+      let alpha: string | undefined
+
+      if (candidate.modifier) {
+        if (candidate.modifier.kind === 'arbitrary') {
+          alpha = candidate.modifier.value
+        } else {
+          if (isValidOpacityValue(candidate.modifier.value)) {
+            alpha = `${candidate.modifier.value}%`
+          }
+        }
+      }
+
       if (!candidate.value) {
         let value = theme.get(['--inset-shadow'])
         if (value === null) return
+        if (candidate.modifier && !alpha) return
 
         return [
           boxShadowProperties(),
-          decl(
+          decl('--tw-inset-shadow-alpha', alpha),
+          ...alphaReplacedShadowProperties(
             '--tw-inset-shadow',
-            replaceShadowColors(value, (color) => `var(--tw-inset-shadow-color, ${color})`),
+            value,
+            alpha,
+            (color) => `var(--tw-inset-shadow-color, ${color})`,
           ),
           decl('box-shadow', cssBoxShadowValue),
         ]
@@ -4260,14 +5754,23 @@ export function createUtilities(theme: Theme) {
             value = asColor(value, candidate.modifier, theme)
             if (value === null) return
 
-            return [boxShadowProperties(), decl('--tw-inset-shadow-color', value)]
-          }
-          default: {
             return [
               boxShadowProperties(),
-              decl(
+              decl('--tw-inset-shadow-color', withAlpha(value, 'var(--tw-inset-shadow-alpha)')),
+            ]
+          }
+          default: {
+            if (candidate.modifier && !alpha) return
+
+            return [
+              boxShadowProperties(),
+              decl('--tw-inset-shadow-alpha', alpha),
+              ...alphaReplacedShadowProperties(
                 '--tw-inset-shadow',
-                `inset ${replaceShadowColors(value, (color) => `var(--tw-inset-shadow-color, ${color})`)}`,
+                value,
+                alpha,
+                (color) => `var(--tw-inset-shadow-color, ${color})`,
+                'inset',
               ),
               decl('box-shadow', cssBoxShadowValue),
             ]
@@ -4280,9 +5783,13 @@ export function createUtilities(theme: Theme) {
           if (candidate.modifier) return
           return [
             boxShadowProperties(),
-            decl('--tw-inset-shadow', nullShadow),
+            decl('--tw-inset-shadow', `inset ${nullShadow}`),
             decl('box-shadow', cssBoxShadowValue),
           ]
+
+        case 'inherit':
+          if (candidate.modifier) return
+          return [boxShadowProperties(), decl('--tw-inset-shadow-color', 'inherit')]
       }
 
       // Shadow size
@@ -4290,12 +5797,16 @@ export function createUtilities(theme: Theme) {
         let value = theme.get([`--inset-shadow-${candidate.value.value}`])
 
         if (value) {
-          if (candidate.modifier) return
+          if (candidate.modifier && !alpha) return
+
           return [
             boxShadowProperties(),
-            decl(
+            decl('--tw-inset-shadow-alpha', alpha),
+            ...alphaReplacedShadowProperties(
               '--tw-inset-shadow',
-              replaceShadowColors(value, (color) => `var(--tw-inset-shadow-color, ${color})`),
+              value,
+              alpha,
+              (color) => `var(--tw-inset-shadow-color, ${color})`,
             ),
             decl('box-shadow', cssBoxShadowValue),
           ]
@@ -4306,7 +5817,10 @@ export function createUtilities(theme: Theme) {
       {
         let value = resolveThemeColor(candidate, theme, ['--box-shadow-color', '--color'])
         if (value) {
-          return [boxShadowProperties(), decl('--tw-inset-shadow-color', value)]
+          return [
+            boxShadowProperties(),
+            decl('--tw-inset-shadow-color', withAlpha(value, 'var(--tw-inset-shadow-alpha)')),
+          ]
         }
       }
     })
@@ -4315,20 +5829,24 @@ export function createUtilities(theme: Theme) {
       {
         values: ['current', 'inherit', 'transparent'],
         valueThemeKeys: ['--box-shadow-color', '--color'],
+        modifierThemeKeys: ['--opacity'],
         modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
       },
       {
-        values: [],
-        valueThemeKeys: ['--shadow'],
-        hasDefaultValue: true,
+        values: ['none'],
+      },
+      {
+        valueThemeKeys: ['--inset-shadow'],
+        modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
+        hasDefaultValue: theme.get(['--inset-shadow']) !== null,
       },
     ])
 
     staticUtility('ring-inset', [boxShadowProperties, ['--tw-ring-inset', 'inset']])
 
-    let defaultRingColor = theme.get(['--default-ring-color']) ?? 'currentColor'
+    let defaultRingColor = theme.get(['--default-ring-color']) ?? 'currentcolor'
     function ringShadowValue(value: string) {
-      return `var(--tw-ring-inset,) 0 0 0 calc(${value} + var(--tw-ring-offset-width)) var(--tw-ring-color, ${defaultRingColor})`
+      return `var(--tw-ring-inset, ) 0 0 0 calc(${value} + var(--tw-ring-offset-width)) var(--tw-ring-color, ${defaultRingColor})`
     }
     utilities.functional('ring', (candidate) => {
       if (!candidate.value) {
@@ -4392,6 +5910,7 @@ export function createUtilities(theme: Theme) {
       {
         values: ['current', 'inherit', 'transparent'],
         valueThemeKeys: ['--ring-color', '--color'],
+        modifierThemeKeys: ['--opacity'],
         modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
       },
       {
@@ -4402,7 +5921,7 @@ export function createUtilities(theme: Theme) {
     ])
 
     function insetRingShadowValue(value: string) {
-      return `inset 0 0 0 ${value} var(--tw-inset-ring-color, currentColor)`
+      return `inset 0 0 0 ${value} var(--tw-inset-ring-color, currentcolor)`
     }
     utilities.functional('inset-ring', (candidate) => {
       if (!candidate.value) {
@@ -4465,6 +5984,7 @@ export function createUtilities(theme: Theme) {
       {
         values: ['current', 'inherit', 'transparent'],
         valueThemeKeys: ['--ring-color', '--color'],
+        modifierThemeKeys: ['--opacity'],
         modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
       },
       {
@@ -4475,7 +5995,7 @@ export function createUtilities(theme: Theme) {
     ])
 
     let ringOffsetShadowValue =
-      'var(--tw-ring-inset,) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color)'
+      'var(--tw-ring-inset, ) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color)'
     utilities.functional('ring-offset', (candidate) => {
       if (!candidate.value) return
 
@@ -4532,6 +6052,7 @@ export function createUtilities(theme: Theme) {
     {
       values: ['current', 'inherit', 'transparent'],
       valueThemeKeys: ['--ring-offset-color', '--color'],
+      modifierThemeKeys: ['--opacity'],
       modifiers: Array.from({ length: 21 }, (_, index) => `${index * 5}`),
     },
     {
@@ -4548,6 +6069,8 @@ export function createUtilities(theme: Theme) {
       value = candidate.value.value
     } else if (candidate.value.kind === 'named' && candidate.value.value === 'normal') {
       value = 'normal'
+    } else if (candidate.value.kind === 'named' && candidate.value.value === 'size') {
+      value = 'size'
     }
 
     if (value === null) return
@@ -4569,3 +6092,772 @@ export function createUtilities(theme: Theme) {
 
   return utilities
 }
+
+// Only allowed bare value data types, to prevent creating new syntax that we
+// typically don't support right now. E.g.: `--value(color)` would allow you to
+// use `text-#0088cc` as a valid utility, which is not what we want.
+export const BARE_VALUE_DATA_TYPES = [
+  'number', // 2.5
+  'integer', // 8
+  'ratio', // 2/3
+  'percentage', // 25%
+]
+
+export function createCssUtility(node: AtRule) {
+  // Allow escaped characters in the name for compatibility with formatters and
+  // other parsers, to ensure valid CSS syntax. E.g.: `@utility foo-1\/2`.
+  //
+  // Note: the actual utility will be `foo-1/2`
+  let name = unescape(node.params)
+
+  // Functional utilities. E.g.: `tab-size-*`
+  if (isValidFunctionalUtilityName(name)) {
+    // API:
+    //
+    // - `--value('literal')`         resolves a literal named value
+    // - `--value(number)`            resolves a bare value of type number
+    // - `--value([number])`          resolves an arbitrary value of type number
+    // - `--value(--color)`           resolves a theme value in the `color` namespace
+    // - `--value(--default(4))`      resolves to a default value when only the
+    //                                root of the functional utility was used.
+    // - `--value(number, [number])`  resolves a bare value of type number or an
+    //                                arbitrary value of type number in order.
+    //
+    // Rules:
+    //
+    // - If `--value(…)` does not resolve to a valid value, the declaration is
+    //   removed.
+    // - If a `--value(ratio)` resolves, the `--modifier(…)` cannot be used.
+    // - If a candidate looks like `foo-2/3`, then the `--value(ratio)` should
+    //   be used OR the `--value(…)` and `--modifier(…)` must be used. But not
+    //   both.
+    // - All parts of the candidate must resolve, otherwise it's not a valid
+    //   utility. E.g.:`
+    //   ```
+    //   @utility foo-* {
+    //     test: --value(number)
+    //   }
+    //   ```
+    //   If you then use `foo-1/2`, this is invalid, because the modifier is not used.
+
+    return (designSystem: DesignSystem) => {
+      let storage = {
+        '--value': {
+          usedSpacingInteger: false,
+          usedSpacingNumber: false,
+          themeKeys: new Set<`--${string}`>(),
+          literals: new Set<string>(),
+        },
+        '--modifier': {
+          usedSpacingInteger: false,
+          usedSpacingNumber: false,
+          themeKeys: new Set<`--${string}`>(),
+          literals: new Set<string>(),
+        },
+      }
+
+      // Pre-process the AST to make it easier to work with.
+      //
+      // - Normalize theme values used in `--value(…)` and `--modifier(…)`
+      //   functions.
+      // - Track information for suggestions
+      walk(node.nodes, (child) => {
+        if (child.kind !== 'declaration') return
+        if (!child.value) return
+        if (!child.value.includes('--value(') && !child.value.includes('--modifier(')) return
+
+        let declarationValueAst = ValueParser.parse(child.value)
+
+        // Required manipulations:
+        //
+        // - `--value(--spacing)`                 -> `--value(--spacing-*)`
+        // - `--value(--spacing- *)`              -> `--value(--spacing-*)`
+        // - `--value(--text- * --line-height)`   -> `--value(--text-*--line-height)`
+        // - `--value(--text --line-height)`      -> `--value(--text-*--line-height)`
+        // - `--value(--text-\\* --line-height)`  -> `--value(--text-*--line-height)`
+        // - `--value([ *])`                      -> `--value([*])`
+        //
+        // Once Prettier / Biome handle these better (e.g.: not crashing without
+        // `\\*` or not inserting whitespace) then most of these can go away.
+        walk(declarationValueAst, (fn) => {
+          if (fn.kind !== 'function') return
+
+          // Track usage of `--spacing(…)`
+          if (
+            fn.value === '--spacing' &&
+            // Quick bail check if we already know that `--value` and `--modifier` are
+            // using the full `--spacing` theme scale.
+            !(storage['--modifier'].usedSpacingNumber && storage['--value'].usedSpacingNumber)
+          ) {
+            walk(fn.nodes, (node) => {
+              if (node.kind !== 'function') return
+              if (node.value !== '--value' && node.value !== '--modifier') return
+              const key = node.value
+
+              for (let arg of node.nodes) {
+                if (arg.kind !== 'word') continue
+
+                if (arg.value === 'integer') {
+                  storage[key].usedSpacingInteger ||= true
+                } else if (arg.value === 'number') {
+                  storage[key].usedSpacingNumber ||= true
+
+                  // Once both `--value` and `--modifier` are using the full
+                  // `number` spacing scale, then there's no need to continue
+                  if (
+                    storage['--modifier'].usedSpacingNumber &&
+                    storage['--value'].usedSpacingNumber
+                  ) {
+                    return WalkAction.Stop
+                  }
+                }
+              }
+            })
+            return WalkAction.Continue
+          }
+
+          if (fn.value !== '--value' && fn.value !== '--modifier') return
+
+          let args = segment(ValueParser.toCss(fn.nodes), ',')
+          for (let [idx, arg] of args.entries()) {
+            arg = arg.trim()
+
+            // The value of `--default(…)` is emitted as-is, so it should not be
+            // normalized.
+            if (arg.startsWith('--default(')) {
+              args[idx] = arg
+              continue
+            }
+
+            // Transform escaped `\\*` -> `*`
+            arg = arg.replace(/\\\*/g, '*')
+
+            // Ensure `--value(--foo --bar)` becomes `--value(--foo-*--bar)`
+            arg = arg.replace(/--(.*?)\s--(.*?)/g, '--$1-*--$2')
+
+            // Remove whitespace, e.g.: `--value([ *])` -> `--value([*])`
+            arg = arg.replace(/\s+/g, '')
+
+            // Ensure multiple `-*` becomes a single `-*`
+            arg = arg.replace(/(-\*){2,}/g, '-*')
+
+            // Ensure trailing `-*` exists if `-*` isn't present yet
+            if (arg[0] === '-' && arg[1] === '-' && !arg.includes('(') && !arg.includes('-*')) {
+              arg += '-*'
+            }
+
+            args[idx] = arg
+          }
+          fn.nodes = ValueParser.parse(args.join(','))
+
+          for (let node of fn.nodes) {
+            // Track literal values
+            if (
+              node.kind === 'word' &&
+              (node.value[0] === '"' || node.value[0] === "'") &&
+              node.value[0] === node.value[node.value.length - 1]
+            ) {
+              let value = node.value.slice(1, -1)
+              storage[fn.value].literals.add(value)
+            }
+
+            // Track theme keys
+            else if (node.kind === 'word' && node.value[0] === '-' && node.value[1] === '-') {
+              let value = node.value.replace(/-\*.*$/g, '') as `--${string}`
+              storage[fn.value].themeKeys.add(value)
+            }
+
+            // Validate bare value data types
+            else if (
+              node.kind === 'word' &&
+              !(node.value[0] === '[' && node.value[node.value.length - 1] === ']') && // Ignore arbitrary values
+              !BARE_VALUE_DATA_TYPES.includes(node.value)
+            ) {
+              console.warn(
+                `Unsupported bare value data type: "${node.value}".\nOnly valid data types are: ${BARE_VALUE_DATA_TYPES.map((x) => `"${x}"`).join(', ')}.\n`,
+              )
+              // TODO: Once we properly track the location of the node, we can
+              //       clean this up in a better way.
+              let dataType = node.value
+              let copy = structuredClone(fn)
+              let sentinelValue = '¶'
+              walk(copy.nodes, (node) => {
+                if (node.kind === 'word' && node.value === dataType) {
+                  return WalkAction.ReplaceSkip({ kind: 'word', value: sentinelValue } as const)
+                }
+              })
+              let underline = '^'.repeat(ValueParser.toCss([node]).length)
+              let offset = ValueParser.toCss([copy]).indexOf(sentinelValue)
+              let output = [
+                '```css',
+                ValueParser.toCss([fn]),
+                ' '.repeat(offset) + underline,
+                '```',
+              ].join('\n')
+              console.warn(output)
+            }
+          }
+        })
+
+        child.value = ValueParser.toCss(declarationValueAst)
+      })
+
+      designSystem.utilities.functional(name.slice(0, -2), (candidate) => {
+        let atRule = cloneAstNode(node)
+
+        let value = candidate.value
+        let modifier = candidate.modifier
+
+        // Functional CSS utilities must resolve at least one `--value(…)`.
+        // Use `--default(…)` inside `--value(…)` for the omitted-value case.
+
+        // Whether `--value(…)` was used
+        let usedValueFn = false
+
+        // Whether any of the declarations successfully resolved a `--value(…)`.
+        // E.g:
+        // ```css
+        // @utility tab-size-* {
+        //   tab-size: --value(integer);
+        //   tab-size: --value(--tab-size);
+        //   tab-size: --value([integer]);
+        // }
+        // ```
+        // Any of these `tab-size` declarations have to resolve to a valid in
+        // order to make the utility valid.
+        let resolvedValueFn = false
+
+        // Whether `--modifier(…)` was used
+        let usedModifierFn = false
+
+        // Whether any of the declarations successfully resolved a `--modifier(…)`
+        let resolvedModifierFn = false
+
+        // A map of all declarations we replaced and their parent rules. We
+        // might need to remove some later on. E.g.: remove declarations that
+        // used `--value(number)` when `--value(ratio)` was resolved.
+        let resolvedDeclarations = new Map<Declaration, AtRule | Rule>()
+
+        // Whether `--value(ratio)` was resolved
+        let resolvedRatioValue = false
+
+        walk<AstNode>([atRule], (node, ctx) => {
+          let parent = ctx.parent
+          if (parent?.kind !== 'rule' && parent?.kind !== 'at-rule') return
+          if (node.kind !== 'declaration') return
+          if (!node.value) return
+
+          let shouldRemoveDeclaration = false
+
+          let valueAst = ValueParser.parse(node.value)
+          walk(valueAst, (fnNode) => {
+            if (fnNode.kind !== 'function') return
+
+            // Value function, e.g.: `--value(integer)`
+            if (fnNode.value === '--value') {
+              usedValueFn = true
+
+              let resolved = resolveValueFunction(value, fnNode, designSystem)
+              if (resolved) {
+                resolvedValueFn = true
+                if (resolved.ratio) {
+                  resolvedRatioValue = true
+                } else {
+                  resolvedDeclarations.set(node, parent)
+                }
+                return WalkAction.ReplaceSkip(resolved.nodes)
+              }
+
+              // Drop the declaration in case we couldn't resolve the value
+              shouldRemoveDeclaration = true
+              return WalkAction.Stop
+            }
+
+            // Modifier function, e.g.: `--modifier(integer)`
+            else if (fnNode.value === '--modifier') {
+              usedModifierFn = true
+
+              let resolved = resolveValueFunction(modifier, fnNode, designSystem)
+              if (resolved) {
+                resolvedModifierFn = true
+                return WalkAction.ReplaceSkip(resolved.nodes)
+              }
+
+              // Drop the declaration in case we couldn't resolve the value
+              shouldRemoveDeclaration = true
+              return WalkAction.Stop
+            }
+          })
+
+          if (shouldRemoveDeclaration) {
+            return WalkAction.ReplaceSkip([])
+          }
+
+          node.value = ValueParser.toCss(valueAst)
+        })
+
+        // Functional CSS utilities require `--value(…)`, and one of those
+        // branches must resolve for the candidate to be valid.
+        if (!usedValueFn || !resolvedValueFn) return null
+
+        // Used `--modifier(…)` but nothing resolved
+        if (usedModifierFn && !resolvedModifierFn && modifier !== null) return null
+
+        // Resolved `--value(ratio)` and `--modifier(…)`, which is invalid
+        if (resolvedRatioValue && resolvedModifierFn) return null
+
+        // When a candidate has a modifier, then the `--modifier(…)` must
+        // resolve correctly or the `--value(ratio)` must resolve correctly.
+        if (modifier && !resolvedRatioValue && !resolvedModifierFn) return null
+
+        // Resolved `--value(ratio)`, so all other declarations that didn't use
+        // `--value(ratio)` should be removed. E.g.: `--value(number)` would
+        // otherwise resolve for `foo-1/2`.
+        if (resolvedRatioValue) {
+          for (let [declaration, parent] of resolvedDeclarations) {
+            let idx = parent.nodes.indexOf(declaration)
+            if (idx !== -1) parent.nodes.splice(idx, 1)
+          }
+        }
+
+        return atRule.nodes
+      })
+
+      designSystem.utilities.suggest(name.slice(0, -2), () => {
+        let values: string[] = []
+        let modifiers: string[] = []
+
+        for (let [target, { literals, usedSpacingNumber, usedSpacingInteger, themeKeys }] of [
+          [values, storage['--value']],
+          [modifiers, storage['--modifier']],
+        ] as const) {
+          // Suggest literal values. E.g.: `--value('literal')`
+          for (let value of literals) {
+            target.push(value)
+          }
+
+          // Suggest `--spacing(…)` values. E.g.: `--spacing(--value(integer))`
+          if (usedSpacingNumber) {
+            target.push(...DEFAULT_SPACING_SUGGESTIONS)
+          } else if (usedSpacingInteger) {
+            for (let value of DEFAULT_SPACING_SUGGESTIONS) {
+              if (isPositiveInteger(value)) {
+                target.push(value)
+              }
+            }
+          }
+
+          // Suggest theme values. E.g.: `--value(--color-*)`
+          for (let value of designSystem.theme.keysInNamespaces(themeKeys)) {
+            target.push(
+              value.replace(LEGACY_NUMERIC_KEY, (_, a, b) => {
+                return `${a}.${b}`
+              }),
+            )
+          }
+        }
+
+        return [{ values, modifiers }] satisfies SuggestionGroup[]
+      })
+    }
+  }
+
+  if (isValidStaticUtilityName(name)) {
+    return (designSystem: DesignSystem) => {
+      designSystem.utilities.static(name, () => node.nodes.map(cloneAstNode))
+    }
+  }
+
+  return null
+}
+
+function resolveValueFunction(
+  value:
+    | Extract<Candidate, { kind: 'functional' }>['value']
+    | Extract<Candidate, { kind: 'functional' }>['modifier'],
+  fn: ValueParser.ValueFunctionNode,
+  designSystem: DesignSystem,
+): { nodes: ValueParser.ValueAstNode[]; ratio?: boolean } | undefined {
+  // No value provided, we can try `--default(…)`
+  if (value === null) {
+    for (let arg of fn.nodes) {
+      // Resolve default value, e.g.: `--default(…)`
+      if (arg.kind === 'function' && arg.value === '--default') {
+        return { nodes: arg.nodes }
+      }
+    }
+    return
+  }
+
+  for (let arg of fn.nodes) {
+    // Resolve literal value, e.g.: `--modifier('closest-side')`
+    if (
+      value.kind === 'named' &&
+      arg.kind === 'word' &&
+      // Should be wreapped in quotes
+      (arg.value[0] === "'" || arg.value[0] === '"') &&
+      arg.value[arg.value.length - 1] === arg.value[0] &&
+      // Values should match
+      arg.value.slice(1, -1) === value.value
+    ) {
+      return { nodes: ValueParser.parse(value.value) }
+    }
+
+    // Resolving theme value, e.g.: `--value(--color)`
+    else if (
+      value.kind === 'named' &&
+      arg.kind === 'word' &&
+      arg.value[0] === '-' &&
+      arg.value[1] === '-'
+    ) {
+      let themeKey = arg.value as `--${string}`
+
+      // Resolve the theme value, e.g.: `--value(--color)`
+      if (themeKey.endsWith('-*')) {
+        // Without `-*` postfix
+        themeKey = themeKey.slice(0, -2) as `--${string}`
+
+        let resolved = designSystem.theme.resolve(value.value, [themeKey])
+        if (resolved) return { nodes: ValueParser.parse(resolved) }
+      }
+
+      // Split `--text-*--line-height` into `--text` and `--line-height`
+      else {
+        let nestedKeys = themeKey.split('-*') as `--${string}`[]
+        if (nestedKeys.length <= 1) continue
+
+        // Resolve theme values with nested keys, e.g.: `--value(--text-*--line-height)`
+        let themeKeys = [nestedKeys.shift()!]
+        let resolved = designSystem.theme.resolveWith(value.value, themeKeys, nestedKeys)
+        if (resolved) {
+          let [, options = {}] = resolved
+
+          // Resolve the value from the `options`
+          {
+            let resolved = options[nestedKeys.pop()!]
+            if (resolved) return { nodes: ValueParser.parse(resolved) }
+          }
+        }
+      }
+    }
+
+    // Bare value, e.g.: `--value(integer)`
+    else if (value.kind === 'named' && arg.kind === 'word') {
+      // Limit the bare value types, to prevent new syntax that we
+      // don't want to support. E.g.: `text-#000` is something we
+      // don't want to support, but could be built this way.
+      if (!BARE_VALUE_DATA_TYPES.includes(arg.value)) {
+        continue
+      }
+
+      let resolved = arg.value === 'ratio' && 'fraction' in value ? value.fraction : value.value
+      if (!resolved) continue
+
+      let type = inferDataType(resolved, [arg.value as any])
+      if (type === null) continue
+
+      // Ratio must be a valid fraction, e.g.: <integer>/<integer>
+      if (type === 'ratio') {
+        let [lhs, rhs] = segment(resolved, '/').map(Number)
+        if (!isPositiveInteger(lhs) || !isPositiveInteger(rhs)) continue
+      }
+
+      // Non-integer numbers should be a valid multiplier,
+      // e.g.: `1.5`
+      else if (type === 'number' && !isValidSpacingMultiplier(resolved)) {
+        continue
+      }
+
+      // Percentages must be an integer, e.g.: `50%`
+      else if (type === 'percentage' && !isPositiveInteger(resolved.slice(0, -1))) {
+        continue
+      }
+
+      if (type === 'ratio') {
+        let [lhs, rhs] = segment(resolved, '/')
+        return { nodes: ValueParser.parse(`${lhs.trim()} / ${rhs.trim()}`), ratio: true }
+      }
+
+      return { nodes: ValueParser.parse(resolved), ratio: false }
+    }
+
+    // Arbitrary value, e.g.: `--value([integer])`
+    else if (
+      value.kind === 'arbitrary' &&
+      arg.kind === 'word' &&
+      arg.value[0] === '[' &&
+      arg.value[arg.value.length - 1] === ']'
+    ) {
+      let dataType = arg.value.slice(1, -1)
+
+      // Allow any data type, e.g.: `--value([*])`
+      if (dataType === '*') {
+        return { nodes: ValueParser.parse(value.value) }
+      }
+
+      // The forced arbitrary value hint must match the expected
+      // data type.
+      //
+      // ```css
+      // @utility tab-* {
+      //   tab-size: --value([integer]);
+      // }
+      // ```
+      //
+      // Given a candidate like `tab-(color:var(--my-value))`,
+      // should not match because `color` and `integer` don't
+      // match.
+      if ('dataType' in value && value.dataType && value.dataType !== dataType) {
+        continue
+      }
+
+      // Use the provided data type hint
+      if ('dataType' in value && value.dataType) {
+        return { nodes: ValueParser.parse(value.value) }
+      }
+
+      // No data type hint provided, so we have to infer it
+      let type = inferDataType(value.value, [dataType as any])
+      if (type !== null) {
+        return { nodes: ValueParser.parse(value.value) }
+      }
+    }
+  }
+}
+
+function alphaReplacedShadowProperties(
+  property: string,
+  value: string,
+  alpha: string | null | undefined,
+  varInjector: (color: string) => string,
+  prefix: string = '',
+): AstNode[] {
+  let requiresFallback = false
+  let replacedValue = replaceShadowColors(value, (color) => {
+    if (alpha == null) {
+      return varInjector(color)
+    }
+
+    // When the input is currentcolor, we use our existing `color-mix(…)` approach to increase
+    // browser support. Note that the fallback of this is handled more generically in
+    // post-processing.
+    if (color.startsWith('current')) {
+      return varInjector(withAlpha(color, alpha))
+    }
+
+    // If any dynamic values are needed for the relative color syntax, we need to insert a
+    // replacement as lightningcss won't be able to resolve them statically.
+    if (color.startsWith('var(') || alpha.startsWith('var(')) {
+      requiresFallback = true
+    }
+
+    return varInjector(replaceAlpha(color, alpha))
+  })
+
+  function applyPrefix(x: string) {
+    if (!prefix) return x
+    return segment(x, ',')
+      .map((value) => prefix.trim() + ' ' + value.trim())
+      .join(', ')
+  }
+
+  if (requiresFallback) {
+    return [
+      decl(property, applyPrefix(replaceShadowColors(value, varInjector))),
+      rule('@supports (color: lab(from red l a b))', [decl(property, applyPrefix(replacedValue))]),
+    ]
+  } else {
+    return [decl(property, applyPrefix(replacedValue))]
+  }
+}
+
+function alphaReplacedDropShadowProperties(
+  property: string,
+  value: string,
+  alpha: string | null | undefined,
+  varInjector: (color: string) => string,
+  prefix: string = '',
+): AstNode[] {
+  let requiresFallback = false
+
+  let replacedValue = segment(value, ',')
+    .map((value) =>
+      replaceShadowColors(value, (color) => {
+        if (alpha == null) {
+          return varInjector(color)
+        }
+
+        // When the input is currentcolor, we use our existing `color-mix(…)` approach to increase
+        // browser support. Note that the fallback of this is handled more generically in
+        // post-processing.
+        if (color.startsWith('current')) {
+          return varInjector(withAlpha(color, alpha))
+        }
+
+        // If any dynamic values are needed for the relative color syntax, we need to insert a
+        // replacement as lightningcss won't be able to resolve them statically.
+        if (color.startsWith('var(') || alpha.startsWith('var(')) {
+          requiresFallback = true
+        }
+
+        return varInjector(replaceAlpha(color, alpha))
+      }),
+    )
+    .map((value) => `drop-shadow(${value})`)
+    .join(' ')
+
+  if (requiresFallback) {
+    return [
+      decl(
+        property,
+        prefix +
+          segment(value, ',')
+            .map((value) => `drop-shadow(${replaceShadowColors(value, varInjector)})`)
+            .join(' '),
+      ),
+      rule('@supports (color: lab(from red l a b))', [decl(property, prefix + replacedValue)]),
+    ]
+  } else {
+    return [decl(property, prefix + replacedValue)]
+  }
+}
+
+const UTILITY_ROOT = /^-?[a-z][a-zA-Z0-9_-]*/
+
+const PERCENT = 37
+const SLASH = 47
+const DOT = 46
+const LOWER_A = 97
+const LOWER_Z = 122
+const UPPER_A = 65
+const UPPER_Z = 90
+const ZERO = 48
+const NINE = 57
+const UNDERSCORE = 95
+const DASH = 45
+
+export function isValidStaticUtilityName(name: string): boolean {
+  let match = UTILITY_ROOT.exec(name)
+  if (match === null) return false // Invalid root
+
+  let root = match[0]
+  let value = name.slice(root.length)
+
+  // Root should not end in `-` if there is no value
+  //
+  // `tab-size-`
+  //  ---------     Root
+  if (value.length === 0 && root.endsWith('-')) {
+    return false
+  }
+
+  // No remaining value is valid
+  //
+  // `tab-size`
+  //  --------    Root
+  if (value.length === 0) {
+    return true
+  }
+
+  // Any valid (static) utility should be valid including:
+  // - Bare values with `.`: `p-1.5`
+  // - Bare values with `%`: `w-50%`
+  // - With an embedded modifier: `text-xs/8`
+
+  let seenSlash = false
+  for (let i = 0; i < value.length; i++) {
+    let charCode = value.charCodeAt(i)
+    switch (charCode) {
+      case PERCENT: {
+        // A percentage is only valid at the end of the value
+        if (i !== value.length - 1) return false
+
+        // A percent is only valid when preceded by a digit. E.g.: `w-%` is invalid
+        let previousChar = value[i - 1] || root[root.length - 1] || ''
+        let previousCharCode = previousChar.charCodeAt(0)
+        if (previousCharCode < ZERO || previousCharCode > NINE) return false
+        break
+      }
+
+      case SLASH: {
+        // A slash must be followed by at least 1 character. E.g.: `foo/` is invalid
+        if (i === value.length - 1) return false
+
+        // A slash can only appear once. E.g.: `foo/bar/baz` is invalid
+        if (seenSlash) return false
+        seenSlash = true
+        break
+      }
+
+      case DOT: {
+        // Dots are only allowed between digits. E.g.: `p-1.a` is invalid
+        let previousChar = value[i - 1] || root[root.length - 1] || ''
+        let previousCharCode = previousChar.charCodeAt(0)
+        if (previousCharCode < ZERO || previousCharCode > NINE) return false
+
+        let nextChar = value[i + 1] || ''
+        let nextCharCode = nextChar.charCodeAt(0)
+        if (nextCharCode < ZERO || nextCharCode > NINE) return false
+        break
+      }
+
+      // Allowed special characters
+      case UNDERSCORE:
+      case DASH: {
+        continue
+      }
+
+      default: {
+        if (
+          (charCode >= LOWER_A && charCode <= LOWER_Z) || // Allow a-z
+          (charCode >= UPPER_A && charCode <= UPPER_Z) || // Allow A-Z
+          (charCode >= ZERO && charCode <= NINE) // Allow 0-9
+        ) {
+          continue
+        }
+
+        // Everything else is invalid
+        return false
+      }
+    }
+  }
+
+  return true
+}
+
+export function isValidFunctionalUtilityName(name: string): boolean {
+  if (!name.endsWith('-*')) return false // Missing '-*' suffix
+  name = name.slice(0, -2)
+
+  let match = UTILITY_ROOT.exec(name)
+  if (match === null) return false // Invalid root
+
+  let root = match[0]
+  let value = name.slice(root.length)
+
+  // No remaining value is valid
+  //
+  // `tab-size-*`
+  //  --------    Root
+  //          --  Suffix
+  //
+  // Backwards compatibility: a root ending in `-` was valid and correctly
+  // scanned by Oxide. This means that custom utilities can result in candidates
+  // such as `foo--bar`.
+  //
+  // We might want to revisit this for Tailwind CSS v5, but for now we have to
+  // make it backwards compatible.
+  //
+  // PR: https://github.com/tailwindlabs/tailwindcss/pull/19696
+  //
+  if (value.length === 0) {
+    return true
+  }
+
+  // But if there is a value remaining, it's invalid.
+  //
+  // E.g.: `tab-size-[…]-*`
+  //
+  // If we allow more characters, we can extend the validation here
+  return false
+}
diff --git a/packages/tailwindcss/src/utils/brace-expansion.bench.ts b/packages/tailwindcss/src/utils/brace-expansion.bench.ts
new file mode 100644
index 000000000..6a0e3d8fd
--- /dev/null
+++ b/packages/tailwindcss/src/utils/brace-expansion.bench.ts
@@ -0,0 +1,14 @@
+// import braces from 'braces'
+import { bench } from 'vitest'
+import { expand } from './brace-expansion'
+
+const PATTERN =
+  '{{xs,sm,md,lg}:,}{border-{x,y,t,r,b,l,s,e},bg,text,cursor,accent}-{{red,orange,amber,yellow,lime,green,emerald,teal,cyan,sky,blue,indigo,violet,purple,fuchsia,pink,rose,slate,gray,zinc,neutral,stone}-{50,{100..900..100},950},black,white}{,/{0..100}}'
+
+// bench('braces', () => {
+//   void braces.expand(PATTERN)
+// })
+
+bench('./brace-expansion', () => {
+  void expand(PATTERN)
+})
diff --git a/packages/tailwindcss/src/utils/brace-expansion.test.ts b/packages/tailwindcss/src/utils/brace-expansion.test.ts
new file mode 100644
index 000000000..bab93ac43
--- /dev/null
+++ b/packages/tailwindcss/src/utils/brace-expansion.test.ts
@@ -0,0 +1,81 @@
+import { describe, expect, test } from 'vitest'
+import { expand } from './brace-expansion'
+
+describe('expand(…)', () => {
+  test.each([
+    ['a/b/c', ['a/b/c']],
+
+    // Groups
+    ['a/{x,y,z}/b', ['a/x/b', 'a/y/b', 'a/z/b']],
+    ['{a,b}/{x,y}', ['a/x', 'a/y', 'b/x', 'b/y']],
+    ['{{xs,sm,md,lg}:,}hidden', ['xs:hidden', 'sm:hidden', 'md:hidden', 'lg:hidden', 'hidden']],
+
+    // Numeric ranges
+    ['a/{0..5}/b', ['a/0/b', 'a/1/b', 'a/2/b', 'a/3/b', 'a/4/b', 'a/5/b']],
+    ['a/{-5..0}/b', ['a/-5/b', 'a/-4/b', 'a/-3/b', 'a/-2/b', 'a/-1/b', 'a/0/b']],
+    ['a/{0..-5}/b', ['a/0/b', 'a/-1/b', 'a/-2/b', 'a/-3/b', 'a/-4/b', 'a/-5/b']],
+    ['a/{0..10..5}/b', ['a/0/b', 'a/5/b', 'a/10/b']],
+    ['a/{0..10..-5}/b', ['a/10/b', 'a/5/b', 'a/0/b']],
+    ['a/{10..0..5}/b', ['a/10/b', 'a/5/b', 'a/0/b']],
+    ['a/{10..0..-5}/b', ['a/0/b', 'a/5/b', 'a/10/b']],
+
+    // Numeric range with padding (we do not support padding)
+    ['a/{00..05}/b', ['a/0/b', 'a/1/b', 'a/2/b', 'a/3/b', 'a/4/b', 'a/5/b']],
+    ['a{001..9}b', ['a1b', 'a2b', 'a3b', 'a4b', 'a5b', 'a6b', 'a7b', 'a8b', 'a9b']],
+
+    // Numeric range with step
+    ['a/{0..5..2}/b', ['a/0/b', 'a/2/b', 'a/4/b']],
+    [
+      'bg-red-{100..900..100}',
+      [
+        'bg-red-100',
+        'bg-red-200',
+        'bg-red-300',
+        'bg-red-400',
+        'bg-red-500',
+        'bg-red-600',
+        'bg-red-700',
+        'bg-red-800',
+        'bg-red-900',
+      ],
+    ],
+
+    // Nested braces
+    ['a{b,c,/{x,y}}/e', ['ab/e', 'ac/e', 'a/x/e', 'a/y/e']],
+    ['a{b,c,/{x,y},{z,w}}/e', ['ab/e', 'ac/e', 'a/x/e', 'a/y/e', 'az/e', 'aw/e']],
+    ['a{b,c,/{x,y},{0..2}}/e', ['ab/e', 'ac/e', 'a/x/e', 'a/y/e', 'a0/e', 'a1/e', 'a2/e']],
+    [
+      'bg-red-{50,{100..900..100},950}',
+      [
+        'bg-red-50',
+        'bg-red-100',
+        'bg-red-200',
+        'bg-red-300',
+        'bg-red-400',
+        'bg-red-500',
+        'bg-red-600',
+        'bg-red-700',
+        'bg-red-800',
+        'bg-red-900',
+        'bg-red-950',
+      ],
+    ],
+
+    // Should not try to expand ranges with decimals
+    ['{1.1..2.2}', ['1.1..2.2']],
+  ])('should expand %s (%#)', (input, expected) => {
+    expect(expand(input).sort()).toEqual(expected.sort())
+  })
+
+  test('throws on unbalanced braces', () => {
+    expect(() => expand('a{b,c{d,e},{f,g}h}x{y,z')).toThrowErrorMatchingInlineSnapshot(
+      `[Error: The pattern \`x{y,z\` is not balanced.]`,
+    )
+  })
+
+  test('throws when step is set to zero', () => {
+    expect(() => expand('a{0..5..0}/b')).toThrowErrorMatchingInlineSnapshot(
+      `[Error: Step cannot be zero in sequence expansion.]`,
+    )
+  })
+})
diff --git a/packages/tailwindcss/src/utils/brace-expansion.ts b/packages/tailwindcss/src/utils/brace-expansion.ts
new file mode 100644
index 000000000..ee382cd82
--- /dev/null
+++ b/packages/tailwindcss/src/utils/brace-expansion.ts
@@ -0,0 +1,91 @@
+import { segment } from './segment'
+
+const NUMERICAL_RANGE = /^(-?\d+)\.\.(-?\d+)(?:\.\.(-?\d+))?$/
+
+export function expand(pattern: string): string[] {
+  let index = pattern.indexOf('{')
+  if (index === -1) return [pattern]
+
+  let result: string[] = []
+  let pre = pattern.slice(0, index)
+  let rest = pattern.slice(index)
+
+  // Find the matching closing brace
+  let depth = 0
+  let endIndex = rest.lastIndexOf('}')
+  for (let i = 0; i < rest.length; i++) {
+    let char = rest[i]
+    if (char === '{') {
+      depth++
+    } else if (char === '}') {
+      depth--
+      if (depth === 0) {
+        endIndex = i
+        break
+      }
+    }
+  }
+
+  if (endIndex === -1) {
+    throw new Error(`The pattern \`${pattern}\` is not balanced.`)
+  }
+
+  let inside = rest.slice(1, endIndex)
+  let post = rest.slice(endIndex + 1)
+  let parts: string[]
+
+  if (isSequence(inside)) {
+    parts = expandSequence(inside)
+  } else {
+    parts = segment(inside, ',')
+  }
+
+  parts = parts.flatMap((part) => expand(part))
+
+  let expandedTail = expand(post)
+
+  for (let tail of expandedTail) {
+    for (let part of parts) {
+      result.push(pre + part + tail)
+    }
+  }
+  return result
+}
+
+function isSequence(str: string): boolean {
+  return NUMERICAL_RANGE.test(str)
+}
+
+/**
+ * Expands a sequence string like "01..20" (optionally with a step).
+ */
+function expandSequence(seq: string): string[] {
+  let seqMatch = seq.match(NUMERICAL_RANGE)
+  if (!seqMatch) {
+    return [seq]
+  }
+  let [, start, end, stepStr] = seqMatch
+  let step = stepStr ? parseInt(stepStr, 10) : undefined
+  let result: string[] = []
+
+  if (/^-?\d+$/.test(start) && /^-?\d+$/.test(end)) {
+    let startNum = parseInt(start, 10)
+    let endNum = parseInt(end, 10)
+
+    if (step === undefined) {
+      step = startNum <= endNum ? 1 : -1
+    }
+    if (step === 0) {
+      throw new Error('Step cannot be zero in sequence expansion.')
+    }
+
+    let increasing = startNum < endNum
+    if (increasing && step < 0) step = -step
+    if (!increasing && step > 0) step = -step
+
+    for (let i = startNum; increasing ? i <= endNum : i >= endNum; i += step) {
+      result.push(i.toString())
+    }
+  }
+  return result
+}
diff --git a/packages/tailwindcss/src/utils/compare-breakpoints.ts b/packages/tailwindcss/src/utils/compare-breakpoints.ts
index 08e97998e..4eb562764 100644
--- a/packages/tailwindcss/src/utils/compare-breakpoints.ts
+++ b/packages/tailwindcss/src/utils/compare-breakpoints.ts
@@ -25,7 +25,7 @@ export function compareBreakpoints(a: string, z: string, direction: 'asc' | 'des
     // Compare by bucket name
     (aBucket === zBucket ? 0 : aBucket < zBucket ? -1 : 1) ||
     // If bucket names are the same, compare by value
-    (direction === 'asc' ? parseInt(a) - parseInt(z) : parseInt(z) - parseInt(a))
+    (direction === 'asc' ? parseFloat(a) - parseFloat(z) : parseFloat(z) - parseFloat(a))
 
   // If the groups are the same, and the contents are not numbers, the
   // `order` will result in `NaN`. In this case, we want to make sorting
diff --git a/packages/tailwindcss/src/utils/compare.test.ts b/packages/tailwindcss/src/utils/compare.test.ts
index d4075d289..329691fe5 100644
--- a/packages/tailwindcss/src/utils/compare.test.ts
+++ b/packages/tailwindcss/src/utils/compare.test.ts
@@ -21,6 +21,12 @@ it.each([
   ['2', '1', GREATER],
   ['1', '10', LESS],
   ['10', '1', GREATER],
+
+  // Numbers of different lengths
+  ['75', '700', LESS],
+  ['700', '75', GREATER],
+  ['75', '770', LESS],
+  ['770', '75', GREATER],
 ])('should compare "%s" with "%s" as "%d"', (a, b, expected) => {
   expect(Math.sign(compare(a, b))).toBe(expected)
 })
@@ -124,3 +130,39 @@ it('should sort strings with multiple numbers consistently using the `compare` f
     ]
   `)
 })
+
+it('sort is stable', () => {
+  // Heap's algorithm for permutations
+  function* permutations<T>(input: T[]) {
+    let pos = 1
+    let stack = input.map(() => 0)
+
+    yield input.slice()
+
+    while (pos < input.length) {
+      if (stack[pos] < pos) {
+        let k = pos % 2 == 0 ? 0 : stack[pos]
+        ;[input[k], input[pos]] = [input[pos], input[k]]
+        yield input.slice()
+        ++stack[pos]
+        pos = 1
+      } else {
+        stack[pos] = 0
+        ++pos
+      }
+    }
+  }
+
+  let classes = ['duration-initial', 'duration-75', 'duration-150', 'duration-700', 'duration-1000']
+
+  for (let permutation of permutations(classes)) {
+    let sorted = [...permutation].sort(compare)
+    expect(sorted).toEqual([
+      'duration-75',
+      'duration-150',
+      'duration-700',
+      'duration-1000',
+      'duration-initial',
+    ])
+  }
+})
diff --git a/packages/tailwindcss/src/utils/compare.ts b/packages/tailwindcss/src/utils/compare.ts
index 18d100a55..53b15d174 100644
--- a/packages/tailwindcss/src/utils/compare.ts
+++ b/packages/tailwindcss/src/utils/compare.ts
@@ -14,9 +14,6 @@ export function compare(a: string, z: string) {
     let aCode = a.charCodeAt(i)
     let zCode = z.charCodeAt(i)
 
-    // Continue if the characters are the same
-    if (aCode === zCode) continue
-
     // If both are numbers, compare them as numbers instead of strings.
     if (aCode >= ZERO && aCode <= NINE && zCode >= ZERO && zCode <= NINE) {
       let aStart = i
@@ -35,14 +32,24 @@ export function compare(a: string, z: string) {
       let aNumber = a.slice(aStart, aEnd)
       let zNumber = z.slice(zStart, zEnd)
 
-      return (
-        Number(aNumber) - Number(zNumber) ||
-        // Fallback case if numbers are the same but the string representation
-        // is not. Fallback to string sorting. E.g.: `0123` vs `123`
-        (aNumber < zNumber ? -1 : 1)
-      )
+      let diff = Number(aNumber) - Number(zNumber)
+      if (diff) return diff
+
+      // Fallback case if numbers are the same but the string representation
+      // is not. Fallback to string sorting. E.g.: `0123` vs `123`
+      if (aNumber < zNumber) return -1
+      if (aNumber > zNumber) return 1
+
+      // Continue with the next character otherwise short strings will appear
+      // after long ones when containing numbers. E.g.:
+      // - bg-red-500/70
+      // - bg-red-500
+      continue
     }
 
+    // Continue if the characters are the same
+    if (aCode === zCode) continue
+
     // Otherwise, compare them as strings
     return aCode - zCode
   }
diff --git a/packages/tailwindcss/src/utils/decode-arbitrary-value.test.ts b/packages/tailwindcss/src/utils/decode-arbitrary-value.test.ts
index 2dccd897f..0bc4d425c 100644
--- a/packages/tailwindcss/src/utils/decode-arbitrary-value.test.ts
+++ b/packages/tailwindcss/src/utils/decode-arbitrary-value.test.ts
@@ -84,6 +84,28 @@ describe('adds spaces around math operators', () => {
     ['calc(theme(spacing.foo-2))', 'calc(theme(spacing.foo-2))'],
     ['calc(theme(spacing.foo-bar))', 'calc(theme(spacing.foo-bar))'],
 
+    // With percentages
+    ['calc(100%-var(--foo))', 'calc(100% - var(--foo))'],
+
+    // With uppercase units
+    ['calc(100PX-theme(spacing.1))', 'calc(100PX - theme(spacing.1))'],
+
+    // Preserving CSS keyword tokens like fit-content without splitting around hyphens in complex expressions
+    ['min(fit-content,calc(100dvh-4rem))', 'min(fit-content, calc(100dvh - 4rem))'],
+    [
+      'min(theme(spacing.foo-bar),fit-content,calc(20*calc(40-30)))',
+      'min(theme(spacing.foo-bar), fit-content, calc(20 * calc(40 - 30)))',
+    ],
+    [
+      'min(fit-content,calc(100dvh-4rem)-calc(50dvh--2px))',
+      'min(fit-content, calc(100dvh - 4rem) - calc(50dvh - -2px))',
+    ],
+    ['min(-3.4e-2-var(--foo),calc-size(auto))', 'min(-3.4e-2 - var(--foo), calc-size(auto))'],
+    [
+      'clamp(-10e3-var(--foo),calc-size(max-content),var(--foo)+-10e3)',
+      'clamp(-10e3 - var(--foo), calc-size(max-content), var(--foo) + -10e3)',
+    ],
+
     // A negative number immediately after a `,` should not have spaces inserted
     ['clamp(-3px+4px,-3px+4px,-3px+4px)', 'clamp(-3px + 4px, -3px + 4px, -3px + 4px)'],
 
@@ -93,6 +115,12 @@ describe('adds spaces around math operators', () => {
     // Prevent formatting inside `env()` functions
     ['calc(env(safe-area-inset-bottom)*2)', 'calc(env(safe-area-inset-bottom) * 2)'],
 
+    // Handle dashed functions that look like known dashed idents
+    [
+      'fit-content(min(max-content,max(min-content,calc(20px+1em))))',
+      'fit-content(min(max-content, max(min-content, calc(20px + 1em))))',
+    ],
+
     // Should format inside `calc()` nested in `env()`
     [
       'env(safe-area-inset-bottom,calc(10px+20px))',
@@ -122,7 +150,7 @@ describe('adds spaces around math operators', () => {
 
     // round(…) function
     ['round(1+2,1+3)', 'round(1 + 2, 1 + 3)'],
-    ['round(to-zero,1+2,1+3)', 'round(to-zero,1 + 2, 1 + 3)'],
+    ['round(to-zero,1+2,1+3)', 'round(to-zero, 1 + 2, 1 + 3)'],
 
     // Nested parens in non-math functions don't format their contents
     ['env((safe-area-inset-bottom))', 'env((safe-area-inset-bottom))'],
diff --git a/packages/tailwindcss/src/utils/decode-arbitrary-value.ts b/packages/tailwindcss/src/utils/decode-arbitrary-value.ts
index 11ec871c5..145103188 100644
--- a/packages/tailwindcss/src/utils/decode-arbitrary-value.ts
+++ b/packages/tailwindcss/src/utils/decode-arbitrary-value.ts
@@ -20,7 +20,7 @@ export function decodeArbitraryValue(input: string): string {
  * Convert `_` to ` `, except for escaped underscores `\_` they should be
  * converted to `_` instead.
  */
-function convertUnderscoresToWhitespace(input: string) {
+function convertUnderscoresToWhitespace(input: string, skipUnderscoreToSpace = false) {
   let output = ''
   for (let i = 0; i < input.length; i++) {
     let char = input[i]
@@ -32,7 +32,7 @@ function convertUnderscoresToWhitespace(input: string) {
     }
 
     // Unescaped underscore
-    else if (char === '_') {
+    else if (char === '_' && !skipUnderscoreToSpace) {
       output += ' '
     }
 
@@ -61,11 +61,11 @@ function recursivelyDecodeArbitraryValues(ast: ValueParser.ValueAstNode[]) {
           node.value === 'theme' ||
           node.value.endsWith('_theme')
         ) {
-          // Don't decode underscores in the first argument of var() but do
-          // decode the function name
           node.value = convertUnderscoresToWhitespace(node.value)
           for (let i = 0; i < node.nodes.length; i++) {
+            // Don't decode underscores to spaces in the first argument of var()
             if (i == 0 && node.nodes[i].kind === 'word') {
+              node.nodes[i].value = convertUnderscoresToWhitespace(node.nodes[i].value, true)
               continue
             }
             recursivelyDecodeArbitraryValues([node.nodes[i]])
diff --git a/packages/tailwindcss/src/utils/dimensions.ts b/packages/tailwindcss/src/utils/dimensions.ts
new file mode 100644
index 000000000..7d647ffe0
--- /dev/null
+++ b/packages/tailwindcss/src/utils/dimensions.ts
@@ -0,0 +1,20 @@
+import { DefaultMap } from '../../../tailwindcss/src/utils/default-map'
+
+const DIMENSION_REGEX = /^(?<value>[-+]?(?:\d*\.)?\d+)(?<unit>[a-z]+|%)?$/i
+
+// Parse a dimension such as `64rem` into `[64, 'rem']`.
+export const dimensions = new DefaultMap((input) => {
+  let match = DIMENSION_REGEX.exec(input)
+  if (!match) return null
+
+  let value = match.groups?.value
+  if (value === undefined) return null
+
+  let valueAsNumber = Number(value)
+  if (Number.isNaN(valueAsNumber)) return null
+
+  let unit = match.groups?.unit
+  if (unit === undefined) return [valueAsNumber, null] as const
+
+  return [valueAsNumber, unit] as const
+})
diff --git a/packages/tailwindcss/src/utils/escape.test.ts b/packages/tailwindcss/src/utils/escape.test.ts
index ff7715b9d..f4c8e1192 100644
--- a/packages/tailwindcss/src/utils/escape.test.ts
+++ b/packages/tailwindcss/src/utils/escape.test.ts
@@ -11,4 +11,14 @@ describe('unescape', () => {
   test('removes backslashes', () => {
     expect(unescape(String.raw`red-1\/2`)).toMatchInlineSnapshot(`"red-1/2"`)
   })
+
+  test('replaces out-of-range escaped code points', () => {
+    expect(
+      unescape(
+        String.raw`--Coding-Projects-CharacterMapper-Master-Workspace\d8819554-4725-4235-9d22-2d0ed572e924`,
+      ),
+    ).toMatchInlineSnapshot(
+      `"--Coding-Projects-CharacterMapper-Master-Workspace�54-4725-4235-9d22-2d0ed572e924"`,
+    )
+  })
 })
diff --git a/packages/tailwindcss/src/utils/escape.ts b/packages/tailwindcss/src/utils/escape.ts
index 246c59df2..c430e4ad4 100644
--- a/packages/tailwindcss/src/utils/escape.ts
+++ b/packages/tailwindcss/src/utils/escape.ts
@@ -1,20 +1,20 @@
 // https://drafts.csswg.org/cssom/#serialize-an-identifier
 export function escape(value: string) {
-  if (arguments.length == 0) {
+  if (arguments.length === 0) {
     throw new TypeError('`CSS.escape` requires an argument.')
   }
-  var string = String(value)
-  var length = string.length
-  var index = -1
-  var codeUnit
-  var result = ''
-  var firstCodeUnit = string.charCodeAt(0)
+  let string = String(value)
+  let length = string.length
+  let index = -1
+  let codeUnit: number
+  let result = ''
+  let firstCodeUnit = string.charCodeAt(0)
 
   if (
     // If the character is the first character and is a `-` (U+002D), and
     // there is no second character, […]
-    length == 1 &&
-    firstCodeUnit == 0x002d
+    length === 1 &&
+    firstCodeUnit === 0x002d
   ) {
     return '\\' + string
   }
@@ -26,7 +26,7 @@ export function escape(value: string) {
 
     // If the character is NULL (U+0000), then the REPLACEMENT CHARACTER
     // (U+FFFD).
-    if (codeUnit == 0x0000) {
+    if (codeUnit === 0x0000) {
       result += '\uFFFD'
       continue
     }
@@ -35,13 +35,13 @@ export function escape(value: string) {
       // If the character is in the range [\1-\1F] (U+0001 to U+001F) or is
       // U+007F, […]
       (codeUnit >= 0x0001 && codeUnit <= 0x001f) ||
-      codeUnit == 0x007f ||
+      codeUnit === 0x007f ||
       // If the character is the first character and is in the range [0-9]
       // (U+0030 to U+0039), […]
-      (index == 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
+      (index === 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
       // If the character is the second character and is in the range [0-9]
       // (U+0030 to U+0039) and the first character is a `-` (U+002D), […]
-      (index == 1 && codeUnit >= 0x0030 && codeUnit <= 0x0039 && firstCodeUnit == 0x002d)
+      (index === 1 && codeUnit >= 0x0030 && codeUnit <= 0x0039 && firstCodeUnit === 0x002d)
     ) {
       // https://drafts.csswg.org/cssom/#escape-a-character-as-code-point
       result += '\\' + codeUnit.toString(16) + ' '
@@ -54,8 +54,8 @@ export function escape(value: string) {
     // U+005A), or [a-z] (U+0061 to U+007A), […]
     if (
       codeUnit >= 0x0080 ||
-      codeUnit == 0x002d ||
-      codeUnit == 0x005f ||
+      codeUnit === 0x002d ||
+      codeUnit === 0x005f ||
       (codeUnit >= 0x0030 && codeUnit <= 0x0039) ||
       (codeUnit >= 0x0041 && codeUnit <= 0x005a) ||
       (codeUnit >= 0x0061 && codeUnit <= 0x007a)
@@ -74,8 +74,24 @@ export function escape(value: string) {
 
 export function unescape(escaped: string) {
   return escaped.replace(/\\([\dA-Fa-f]{1,6}[\t\n\f\r ]?|[\S\s])/g, (match) => {
-    return match.length > 2
-      ? String.fromCodePoint(Number.parseInt(match.slice(1).trim(), 16))
-      : match[1]
+    if (match.length <= 2) {
+      return match[1]
+    }
+
+    let codePoint = Number.parseInt(match.slice(1).trim(), 16)
+
+    if (
+      // Invalid codepoint: https://infra.spec.whatwg.org/#code-point
+      codePoint === 0x0000 ||
+      codePoint > 0x10ffff ||
+      // Is surrogate: https://infra.spec.whatwg.org/#leading-surrogate
+      //  - A leading surrogate is a code point that is in the range U+D800 to U+DBFF, inclusive.
+      //  - A trailing surrogate is a code point that is in the range U+DC00 to U+DFFF, inclusive.
+      (codePoint >= 0xd800 && codePoint <= 0xdfff)
+    ) {
+      return '\uFFFD'
+    }
+
+    return String.fromCodePoint(codePoint)
   })
 }
diff --git a/packages/tailwindcss/src/utils/infer-data-type.ts b/packages/tailwindcss/src/utils/infer-data-type.ts
index c6a0881a8..3317572f3 100644
--- a/packages/tailwindcss/src/utils/infer-data-type.ts
+++ b/packages/tailwindcss/src/utils/infer-data-type.ts
@@ -6,7 +6,9 @@ type DataType =
   | 'color'
   | 'length'
   | 'percentage'
+  | 'ratio'
   | 'number'
+  | 'integer'
   | 'url'
   | 'position'
   | 'bg-size'
@@ -23,7 +25,9 @@ const checks: Record<DataType, (value: string) => boolean> = {
   color: isColor,
   length: isLength,
   percentage: isPercentage,
+  ratio: isFraction,
   number: isNumber,
+  integer: isPositiveInteger,
   url: isUrl,
   position: isBackgroundPosition,
   'bg-size': isBackgroundSize,
@@ -63,7 +67,14 @@ function isUrl(value: string): boolean {
 /* -------------------------------------------------------------------------- */
 
 function isLineWidth(value: string): boolean {
-  return value === 'thin' || value === 'medium' || value === 'thick'
+  return segment(value, ' ').every(
+    (value) =>
+      isLength(value) ||
+      isNumber(value) ||
+      value === 'thin' ||
+      value === 'medium' ||
+      value === 'thick',
+  )
 }
 
 /* -------------------------------------------------------------------------- */
@@ -173,6 +184,14 @@ function isPercentage(value: string): boolean {
 
 /* -------------------------------------------------------------------------- */
 
+const IS_FRACTION = new RegExp(`^${HAS_NUMBER.source}\\s*/\\s*${HAS_NUMBER.source}$`)
+
+function isFraction(value: string): boolean {
+  return IS_FRACTION.test(value) || hasMathFn(value)
+}
+
+/* -------------------------------------------------------------------------- */
+
 /**
  * Please refer to MDN when updating this list:
  * @see https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Values_and_units
@@ -213,9 +232,10 @@ const LENGTH_UNITS = [
 ]
 
 const IS_LENGTH = new RegExp(`^${HAS_NUMBER.source}(${LENGTH_UNITS.join('|')})$`)
+const IS_LENGTH_FN = /^(--spacing)\(/i
 
-function isLength(value: string): boolean {
-  return IS_LENGTH.test(value) || hasMathFn(value)
+export function isLength(value: string): boolean {
+  return IS_LENGTH.test(value) || IS_LENGTH_FN.test(value) || hasMathFn(value)
 }
 
 /* -------------------------------------------------------------------------- */
@@ -329,6 +349,11 @@ export function isPositiveInteger(value: any) {
   return Number.isInteger(num) && num >= 0 && String(num) === String(value)
 }
 
+export function isStrictPositiveInteger(value: any) {
+  let num = Number(value)
+  return Number.isInteger(num) && num > 0 && String(num) === String(value)
+}
+
 export function isValidSpacingMultiplier(value: any) {
   return isMultipleOf(value, 0.25)
 }
diff --git a/packages/tailwindcss/src/utils/is-color.ts b/packages/tailwindcss/src/utils/is-color.ts
index e3501aa86..de7c4cbd4 100644
--- a/packages/tailwindcss/src/utils/is-color.ts
+++ b/packages/tailwindcss/src/utils/is-color.ts
@@ -195,10 +195,14 @@ const NAMED_COLORS = new Set([
   'accentcolortext',
 ])
 
-const IS_COLOR_FN = /^(rgba?|hsla?|hwb|color|(ok)?(lab|lch)|light-dark|color-mix)\(/i
+const IS_COLOR_FN = /^(rgba?|hsla?|hwb|color|(ok)?(lab|lch)|light-dark|color-mix|--alpha)\(/i
 
 export function isColor(value: string): boolean {
   return (
     value.charCodeAt(0) === HASH || IS_COLOR_FN.test(value) || NAMED_COLORS.has(value.toLowerCase())
   )
 }
+
+export function isNamedColor(value: string): boolean {
+  return NAMED_COLORS.has(value.toLowerCase())
+}
diff --git a/packages/tailwindcss/src/utils/is-valid-arbitrary.ts b/packages/tailwindcss/src/utils/is-valid-arbitrary.ts
new file mode 100644
index 000000000..2ee433e48
--- /dev/null
+++ b/packages/tailwindcss/src/utils/is-valid-arbitrary.ts
@@ -0,0 +1,93 @@
+const BACKSLASH = 0x5c
+const OPEN_CURLY = 0x7b
+const CLOSE_CURLY = 0x7d
+const OPEN_PAREN = 0x28
+const CLOSE_PAREN = 0x29
+const OPEN_BRACKET = 0x5b
+const CLOSE_BRACKET = 0x5d
+const DOUBLE_QUOTE = 0x22
+const SINGLE_QUOTE = 0x27
+const SEMICOLON = 0x3b
+
+// This is a shared buffer that is used to keep track of the current nesting level
+// of parens, brackets, and braces. It is used to determine if a character is at
+// the top-level of a string. This is a performance optimization to avoid memory
+// allocations on every call to `segment`.
+const closingBracketStack = new Uint8Array(256)
+
+/**
+ * Determine if a given string might be a valid arbitrary value.
+ *
+ * Unbalanced parens, brackets, and braces are not allowed. Additionally, a
+ * top-level `;` is not allowed.
+ *
+ * This function is very similar to `segment` but `segment` cannot be used
+ * because we'd need to split on a bracket stack character.
+ */
+export function isValidArbitrary(input: string) {
+  // SAFETY: We can use an index into a shared buffer because this function is
+  // synchronous, non-recursive, and runs in a single-threaded environment.
+  let stackPos = 0
+  let len = input.length
+
+  for (let idx = 0; idx < len; idx++) {
+    let char = input.charCodeAt(idx)
+
+    switch (char) {
+      case BACKSLASH:
+        // The next character is escaped, so we skip it.
+        idx += 1
+        break
+      // Strings should be handled as-is until the end of the string. No need to
+      // worry about balancing parens, brackets, or curlies inside a string.
+      case SINGLE_QUOTE:
+      case DOUBLE_QUOTE:
+        // Ensure we don't go out of bounds.
+        while (++idx < len) {
+          let nextChar = input.charCodeAt(idx)
+
+          // The next character is escaped, so we skip it.
+          if (nextChar === BACKSLASH) {
+            idx += 1
+            continue
+          }
+
+          if (nextChar === char) {
+            break
+          }
+        }
+        break
+      case OPEN_PAREN:
+        closingBracketStack[stackPos] = CLOSE_PAREN
+        stackPos++
+        break
+      case OPEN_BRACKET:
+        closingBracketStack[stackPos] = CLOSE_BRACKET
+        stackPos++
+        break
+      case OPEN_CURLY:
+        // NOTE: We intentionally do not consider `{` to move the stack pointer
+        // because a candidate like `[&{color:red}]:flex` should not be valid.
+        break
+      case CLOSE_BRACKET:
+      case CLOSE_CURLY:
+      case CLOSE_PAREN:
+        if (stackPos === 0) return false
+
+        if (stackPos > 0 && char === closingBracketStack[stackPos - 1]) {
+          // SAFETY: The buffer does not need to be mutated because the stack is
+          // only ever read from or written to its current position. Its current
+          // position is only ever incremented after writing to it. Meaning that
+          // the buffer can be dirty for the next use and still be correct since
+          // reading/writing always starts at position `0`.
+          stackPos--
+        }
+        break
+      case SEMICOLON:
+        if (stackPos === 0) return false
+        break
+    }
+  }
+
+  return true
+}
diff --git a/packages/tailwindcss/src/utils/math-operators.ts b/packages/tailwindcss/src/utils/math-operators.ts
index e6e83fe79..d31cc3c52 100644
--- a/packages/tailwindcss/src/utils/math-operators.ts
+++ b/packages/tailwindcss/src/utils/math-operators.ts
@@ -1,3 +1,21 @@
+const LOWER_A = 0x61
+const LOWER_Z = 0x7a
+const UPPER_A = 0x41
+const UPPER_Z = 0x5a
+const LOWER_E = 0x65
+const UPPER_E = 0x45
+const ZERO = 0x30
+const NINE = 0x39
+const ADD = 0x2b
+const SUB = 0x2d
+const MUL = 0x2a
+const DIV = 0x2f
+const OPEN_PAREN = 0x28
+const CLOSE_PAREN = 0x29
+const COMMA = 0x2c
+const SPACE = 0x20
+const PERCENT = 0x25
+
 const MATH_FUNCTIONS = [
   'calc',
   'min',
@@ -20,9 +38,6 @@ const MATH_FUNCTIONS = [
   'round',
 ]
 
-const KNOWN_DASHED_FUNCTIONS = ['anchor-size']
-const DASHED_FUNCTIONS_REGEX = new RegExp(`(${KNOWN_DASHED_FUNCTIONS.join('|')})\\(`, 'g')
-
 export function hasMathFn(input: string) {
   return input.indexOf('(') !== -1 && MATH_FUNCTIONS.some((fn) => input.includes(`${fn}(`))
 }
@@ -33,25 +48,41 @@ export function addWhitespaceAroundMathOperators(input: string) {
     return input
   }
 
-  // Replace known functions with a placeholder
-  let hasKnownFunctions = false
-  if (KNOWN_DASHED_FUNCTIONS.some((fn) => input.includes(fn))) {
-    DASHED_FUNCTIONS_REGEX.lastIndex = 0
-    input = input.replace(DASHED_FUNCTIONS_REGEX, (_, fn) => {
-      hasKnownFunctions = true
-      return `$${KNOWN_DASHED_FUNCTIONS.indexOf(fn)}$(`
-    })
-  }
-
   let result = ''
   let formattable: boolean[] = []
 
+  let valuePos = null
+  let lastValuePos = null
+
   for (let i = 0; i < input.length; i++) {
-    let char = input[i]
+    let char = input.charCodeAt(i)
+
+    // Track if we see a number followed by a unit, then we know for sure that
+    // this is not a function call.
+    if (char >= ZERO && char <= NINE) {
+      valuePos = i
+    }
+
+    // If we saw a number before, and we see normal a-z character, then we
+    // assume this is a value such as `123px`
+    else if (
+      valuePos !== null &&
+      (char === PERCENT ||
+        (char >= LOWER_A && char <= LOWER_Z) ||
+        (char >= UPPER_A && char <= UPPER_Z))
+    ) {
+      valuePos = i
+    }
+
+    // Once we see something else, we reset the value position
+    else {
+      lastValuePos = valuePos
+      valuePos = null
+    }
 
     // Determine if we're inside a math function
-    if (char === '(') {
-      result += char
+    if (char === OPEN_PAREN) {
+      result += input[i]
 
       // Scan backwards to determine the function name. This assumes math
       // functions are named with lowercase alphanumeric characters.
@@ -60,9 +91,9 @@ export function addWhitespaceAroundMathOperators(input: string) {
       for (let j = i - 1; j >= 0; j--) {
         let inner = input.charCodeAt(j)
 
-        if (inner >= 48 && inner <= 57) {
+        if (inner >= ZERO && inner <= NINE) {
           start = j // 0-9
-        } else if (inner >= 97 && inner <= 122) {
+        } else if (inner >= LOWER_A && inner <= LOWER_Z) {
           start = j // a-z
         } else {
           break
@@ -91,76 +122,84 @@ export function addWhitespaceAroundMathOperators(input: string) {
 
     // We've exited the function so format according to the parent function's
     // type.
-    else if (char === ')') {
-      result += char
+    else if (char === CLOSE_PAREN) {
+      result += input[i]
       formattable.shift()
     }
 
     // Add spaces after commas in math functions
-    else if (char === ',' && formattable[0]) {
+    else if (char === COMMA && formattable[0]) {
       result += `, `
       continue
     }
 
     // Skip over consecutive whitespace
-    else if (char === ' ' && formattable[0] && result[result.length - 1] === ' ') {
+    else if (char === SPACE && formattable[0] && result.charCodeAt(result.length - 1) === SPACE) {
       continue
     }
 
     // Add whitespace around operators inside math functions
-    else if ((char === '+' || char === '*' || char === '/' || char === '-') && formattable[0]) {
+    else if ((char === ADD || char === MUL || char === DIV || char === SUB) && formattable[0]) {
       let trimmed = result.trimEnd()
-      let prev = trimmed[trimmed.length - 1]
+      let prev = trimmed.charCodeAt(trimmed.length - 1)
+      let prevPrev = trimmed.charCodeAt(trimmed.length - 2)
+      let next = input.charCodeAt(i + 1)
+
+      // Do not add spaces for scientific notation, e.g.: `-3.4e-2`
+      if ((prev === LOWER_E || prev === UPPER_E) && prevPrev >= ZERO && prevPrev <= NINE) {
+        result += input[i]
+        continue
+      }
 
       // If we're preceded by an operator don't add spaces
-      if (prev === '+' || prev === '*' || prev === '/' || prev === '-') {
-        result += char
+      else if (prev === ADD || prev === MUL || prev === DIV || prev === SUB) {
+        result += input[i]
         continue
       }
 
       // If we're at the beginning of an argument don't add spaces
-      else if (prev === '(' || prev === ',') {
-        result += char
+      else if (prev === OPEN_PAREN || prev === COMMA) {
+        result += input[i]
         continue
       }
 
       // Add spaces only after the operator if we already have spaces before it
-      else if (input[i - 1] === ' ') {
-        result += `${char} `
+      else if (input.charCodeAt(i - 1) === SPACE) {
+        result += `${input[i]} `
       }
 
-      // Add spaces around the operator
+      // Add spaces around the operator, if...
+      else if (
+        // Previous is a digit
+        (prev >= ZERO && prev <= NINE) ||
+        // Next is a digit
+        (next >= ZERO && next <= NINE) ||
+        // Previous is end of a function call (or parenthesized expression)
+        prev === CLOSE_PAREN ||
+        // Next is start of a parenthesized expression
+        next === OPEN_PAREN ||
+        // Next is an operator
+        next === ADD ||
+        next === MUL ||
+        next === DIV ||
+        next === SUB ||
+        // Previous position was a value (+ unit)
+        (lastValuePos !== null && lastValuePos === i - 1)
+      ) {
+        result += ` ${input[i]} `
+      }
+
+      // Everything else
       else {
-        result += ` ${char} `
+        result += input[i]
       }
     }
 
-    // Skip over `to-zero` when in a math function.
-    //
-    // This is specifically to handle this value in the round(…) function:
-    //
-    // ```
-    // round(to-zero, 1px)
-    //       ^^^^^^^
-    // ```
-    //
-    // This is because the first argument is optionally a keyword and `to-zero`
-    // contains a hyphen and we want to avoid adding spaces inside it.
-    else if (formattable[0] && input.startsWith('to-zero', i)) {
-      let start = i
-      i += 7
-      result += input.slice(start, i + 1)
-    }
-
     // Handle all other characters
     else {
-      result += char
+      result += input[i]
     }
   }
 
-  if (hasKnownFunctions) {
-    return result.replace(/\$(\d+)\$/g, (fn, idx) => KNOWN_DASHED_FUNCTIONS[idx] ?? fn)
-  }
-
   return result
 }
diff --git a/packages/tailwindcss/src/utils/replace-object.ts b/packages/tailwindcss/src/utils/replace-object.ts
new file mode 100644
index 000000000..b4fc993fa
--- /dev/null
+++ b/packages/tailwindcss/src/utils/replace-object.ts
@@ -0,0 +1,7 @@
+export function replaceObject<T extends object, U extends object | null>(target: T, source: U): U {
+  // Clear out the target object, otherwise inspecting the final object will
+  // look very confusing.
+  for (let key in target) delete target[key]
+
+  return Object.assign(target, source)
+}
diff --git a/packages/tailwindcss/src/utils/replace-shadow-colors.test.ts b/packages/tailwindcss/src/utils/replace-shadow-colors.test.ts
index 3b1e90ba6..701e80f05 100644
--- a/packages/tailwindcss/src/utils/replace-shadow-colors.test.ts
+++ b/packages/tailwindcss/src/utils/replace-shadow-colors.test.ts
@@ -1,49 +1,141 @@
-import { expect, it } from 'vitest'
+import { describe, expect, it } from 'vitest'
+import { cartesian } from '../cartesian'
+import { replaceAlpha } from '../utilities'
 import { replaceShadowColors } from './replace-shadow-colors'
 
-const table = [
-  {
-    input: 'var(--my-shadow)',
-    output: 'var(--my-shadow)',
-  },
-  {
-    input: '1px var(--my-shadow)',
-    output: '1px var(--my-shadow)',
-  },
-  {
-    input: '1px 1px var(--my-color)',
-    output: '1px 1px var(--tw-shadow-color, var(--my-color))',
-  },
-  {
-    input: '0 0 0 var(--my-color)',
-    output: '0 0 0 var(--tw-shadow-color, var(--my-color))',
-  },
-  {
-    input: '1px 2px',
-    output: '1px 2px var(--tw-shadow-color, currentcolor)',
-  },
-  {
-    input: '1px 2px 3px',
-    output: '1px 2px 3px var(--tw-shadow-color, currentcolor)',
-  },
-  {
-    input: '1px 2px 3px 4px',
-    output: '1px 2px 3px 4px var(--tw-shadow-color, currentcolor)',
-  },
-  {
-    input: ['var(--my-shadow)', '1px 1px var(--my-color)', '0 0 1px var(--my-color)'].join(', '),
-    output: [
-      'var(--my-shadow)',
-      '1px 1px var(--tw-shadow-color, var(--my-color))',
-      '0 0 1px var(--tw-shadow-color, var(--my-color))',
-    ].join(', '),
-  },
-]
+describe('without replacer', () => {
+  let replacer = (color: string) => `var(--tw-shadow-color, ${color})`
 
-it.each(table)(
-  'should replace the color of box-shadow $input with $output',
-  ({ input, output }) => {
-    let parsed = replaceShadowColors(input, (color) => `var(--tw-shadow-color, ${color})`)
-    expect(parsed).toEqual(output)
-  },
-)
+  it('should handle var shadow', () => {
+    let parsed = replaceShadowColors('var(--my-shadow)', replacer)
+    expect(parsed).toMatchInlineSnapshot(`"var(--my-shadow)"`)
+  })
+
+  it('should handle var shadow with offset', () => {
+    let parsed = replaceShadowColors('1px var(--my-shadow)', replacer)
+    expect(parsed).toMatchInlineSnapshot(`"1px var(--my-shadow)"`)
+  })
+
+  it('should handle var color with offsets', () => {
+    let parsed = replaceShadowColors('1px 1px var(--my-color)', replacer)
+    expect(parsed).toMatchInlineSnapshot(`"1px 1px var(--tw-shadow-color, var(--my-color))"`)
+  })
+
+  it('should handle var color with zero offsets', () => {
+    let parsed = replaceShadowColors('0 0 0 var(--my-color)', replacer)
+    expect(parsed).toMatchInlineSnapshot(`"0 0 0 var(--tw-shadow-color, var(--my-color))"`)
+  })
+
+  it('should handle two values with currentcolor', () => {
+    let parsed = replaceShadowColors('1px 2px', replacer)
+    expect(parsed).toMatchInlineSnapshot(`"1px 2px var(--tw-shadow-color, currentcolor)"`)
+  })
+
+  it('should handle three values with currentcolor', () => {
+    let parsed = replaceShadowColors('1px 2px 3px', replacer)
+    expect(parsed).toMatchInlineSnapshot(`"1px 2px 3px var(--tw-shadow-color, currentcolor)"`)
+  })
+
+  it('should handle four values with currentcolor', () => {
+    let parsed = replaceShadowColors('1px 2px 3px 4px', replacer)
+    expect(parsed).toMatchInlineSnapshot(`"1px 2px 3px 4px var(--tw-shadow-color, currentcolor)"`)
+  })
+
+  it('should find the color regardless of its position', () => {
+    for (let [x, y, blur, spread, color] of cartesian(
+      ['calc(var(--spacing) * 1)', '1', '--spacing(1)'], // x
+      ['calc(var(--spacing) * 2)', '2', '--spacing(2)'], // y
+      ['calc(var(--spacing) * 3)', '3', '--spacing(3)'], // blur
+      ['calc(var(--spacing) * 4)', '4', '--spacing(4)'], // spread
+      ['black', 'rgb(0, 0, 0)', '#000', '--alpha(var(--color) / 50%)', 'var(--uknown-color)'], // color
+    )) {
+      let expectedColor = `var(--tw-shadow-color, ${color})`
+
+      {
+        let input = `${x} ${color} ${y} ${blur} ${spread}`
+        expect(replaceShadowColors(input, replacer)).toEqual(input.replace(color, expectedColor))
+      }
+
+      {
+        let input = `${x} ${y} ${color} ${blur} ${spread}`
+        expect(replaceShadowColors(input, replacer)).toEqual(input.replace(color, expectedColor))
+      }
+
+      {
+        let input = `${x} ${y} ${blur} ${color} ${spread}`
+        expect(replaceShadowColors(input, replacer)).toEqual(input.replace(color, expectedColor))
+      }
+    }
+  })
+
+  // When using `var(…)`, we don't know the types of the used variables, but we
+  // might be able to find the color itself.
+  it.each([
+    'black', // Named color
+    '#000', // Hex color
+    'rgb(0, 0, 0)', // Color functions
+    '--alpha(var(--color) / 50%)', // Known custom functions
+  ])('should find the color (%s)', (color) => {
+    let expectedColor = `var(--tw-shadow-color, ${color})`
+
+    {
+      let input = `var(--x) var(--y) ${color}`
+      expect(replaceShadowColors(input, replacer)).toEqual(input.replace(color, expectedColor))
+    }
+
+    {
+      let input = `var(--x) var(--y) var(--blur) ${color}`
+      expect(replaceShadowColors(input, replacer)).toEqual(input.replace(color, expectedColor))
+    }
+
+    {
+      let input = `var(--x) var(--y) var(--blur) var(--spread) ${color}`
+      expect(replaceShadowColors(input, replacer)).toEqual(input.replace(color, expectedColor))
+    }
+  })
+
+  it('should handle multiple shadows', () => {
+    let parsed = replaceShadowColors(
+      ['var(--my-shadow)', '1px 1px var(--my-color)', '0 0 1px var(--my-color)'].join(', '),
+      replacer,
+    )
+    expect(parsed).toMatchInlineSnapshot(
+      `"var(--my-shadow), 1px 1px var(--tw-shadow-color, var(--my-color)), 0 0 1px var(--tw-shadow-color, var(--my-color))"`,
+    )
+  })
+})
+
+describe('with replacer', () => {
+  let replacer = (color: string) => `var(--tw-shadow-color, ${replaceAlpha(color, '50%')})`
+
+  it('should handle var color with intensity', () => {
+    let parsed = replaceShadowColors('1px 1px var(--my-color)', replacer)
+    expect(parsed).toMatchInlineSnapshot(
+      `"1px 1px var(--tw-shadow-color, oklab(from var(--my-color) l a b / 50%))"`,
+    )
+  })
+
+  it('should handle box-shadow with intensity', () => {
+    let parsed = replaceShadowColors('1px 1px var(--my-color)', replacer)
+    expect(parsed).toMatchInlineSnapshot(
+      `"1px 1px var(--tw-shadow-color, oklab(from var(--my-color) l a b / 50%))"`,
+    )
+  })
+
+  it('should handle four values with intensity and no color value', () => {
+    let parsed = replaceShadowColors('1px 2px 3px 4px', replacer)
+    expect(parsed).toMatchInlineSnapshot(
+      `"1px 2px 3px 4px var(--tw-shadow-color, oklab(from currentcolor l a b / 50%))"`,
+    )
+  })
+
+  it('should handle multiple shadows with intensity', () => {
+    let parsed = replaceShadowColors(
+      ['var(--my-shadow)', '1px 1px var(--my-color)', '0 0 1px var(--my-color)'].join(', '),
+      replacer,
+    )
+    expect(parsed).toMatchInlineSnapshot(
+      `"var(--my-shadow), 1px 1px var(--tw-shadow-color, oklab(from var(--my-color) l a b / 50%)), 0 0 1px var(--tw-shadow-color, oklab(from var(--my-color) l a b / 50%))"`,
+    )
+  })
+})
diff --git a/packages/tailwindcss/src/utils/replace-shadow-colors.ts b/packages/tailwindcss/src/utils/replace-shadow-colors.ts
index e51f9c2a0..5f9e0264c 100644
--- a/packages/tailwindcss/src/utils/replace-shadow-colors.ts
+++ b/packages/tailwindcss/src/utils/replace-shadow-colors.ts
@@ -1,47 +1,134 @@
+import * as ValueParser from '../value-parser'
+import { walk, WalkAction } from '../walk'
+import { isNamedColor } from './is-color'
 import { segment } from './segment'
 
 const KEYWORDS = new Set(['inset', 'inherit', 'initial', 'revert', 'unset'])
-const LENGTH = /^-?(\d+|\.\d+)(.*?)$/g
+const LENGTH_FUNCTIONS = new Set(['calc', 'clamp', 'max', 'min', '--spacing'])
+const COLOR_FUNCTIONS = new Set([
+  'color',
+  'color-mix',
+  'contrast-color',
+  'device-cmyk',
+  'hsl',
+  'hsla',
+  'hwb',
+  'lab',
+  'lch',
+  'light-dark',
+  'oklab',
+  'oklch',
+  'rgb',
+  'rgba',
+  '--alpha',
+])
+const LENGTH = /^-?(\d+|\.\d+)(.*?)$/
 
 export function replaceShadowColors(input: string, replacement: (color: string) => string) {
+  function replaceAst(node: ValueParser.ValueAstNode): ValueParser.ValueAstNode[] {
+    let color = ValueParser.toCss([node])
+    let updatedColor = replacement(color)
+    let ast = ValueParser.parse(updatedColor)
+    return ast
+  }
+
   let shadows = segment(input, ',').map((shadow) => {
     shadow = shadow.trim()
-    let parts = segment(shadow, ' ').filter((part) => part.trim() !== '')
-    let color = null
-    let offsetX = null
-    let offsetY = null
+    let ast = ValueParser.parse(shadow)
 
-    for (let part of parts) {
-      if (KEYWORDS.has(part)) {
-        continue
-      } else if (LENGTH.test(part)) {
-        if (offsetX === null) {
-          offsetX = part
-        } else if (offsetY === null) {
-          offsetY = part
+    let unknown: ValueParser.ValueAstNode | null = null
+    let unknowns = 0
+    let lengths = 0
+    let replaced = false
+
+    walk(ast, (node) => {
+      switch (node.kind) {
+        case 'word': {
+          // Skip known keywords
+          if (KEYWORDS.has(node.value.toLowerCase())) {
+            return WalkAction.Continue
+          }
+
+          // Must be a length
+          if (LENGTH.test(node.value.toLowerCase())) {
+            lengths++
+            return WalkAction.Continue
+          }
+
+          // Must be a color
+          if (node.value[0] === '#' || isNamedColor(node.value)) {
+            replaced = true
+            return WalkAction.ReplaceStop(replaceAst(node))
+          }
+
+          // We're not sure yet
+          unknown = node
+          unknowns++
+          break
         }
 
-        // Reset index, since the regex is stateful.
-        LENGTH.lastIndex = 0
-      } else if (color === null) {
-        color = part
+        case 'function': {
+          // Must be a color
+          if (COLOR_FUNCTIONS.has(node.value.toLowerCase())) {
+            replaced = true
+            return WalkAction.ReplaceStop(replaceAst(node))
+          }
+
+          // Must be a length
+          if (LENGTH_FUNCTIONS.has(node.value.toLowerCase())) {
+            lengths++
+            return WalkAction.Skip
+          }
+
+          // We're not sure yet
+          unknown = node
+          unknowns++
+
+          // We're not interested in the arguments of the function
+          return WalkAction.Skip
+        }
+
+        // Ignore separators
+        case 'separator':
+          return WalkAction.Continue
+
+        default:
+          node satisfies never
       }
+    })
+
+    // We definitely found a color, nothing else to do
+    if (replaced) {
+      return ValueParser.toCss(ast)
     }
 
     // If the x and y offsets were not detected, the shadow is either invalid or
     // using a variable to represent more than one field in the shadow value, so
     // we can't know what to replace.
-    if (offsetX === null || offsetY === null) return shadow
-
-    let replacementColor = replacement(color ?? 'currentcolor')
-
-    if (color !== null) {
-      // If a color was found, replace the color.
-      return shadow.replace(color, replacementColor)
+    if (lengths < 2) {
+      return shadow
     }
+
     // If no color was found, assume the shadow is relying on the browser
     // default shadow color and append the replacement color.
-    return `${shadow} ${replacementColor}`
+    if (unknowns === 0) {
+      return `${shadow} ${replacement('currentcolor')}`
+    }
+
+    // A single left-over, we assume that this is the color
+    if (unknowns === 1) {
+      walk(ast, (node) => {
+        if (node === unknown) {
+          replaced = true
+          return WalkAction.ReplaceStop(replaceAst(node))
+        }
+
+        // Keep the walk top-level only, no need to go into functions
+        return WalkAction.Skip
+      })
+    }
+
+    return replaced ? ValueParser.toCss(ast) : shadow
   })
 
   return shadows.join(', ')
diff --git a/packages/tailwindcss/src/utils/topological-sort.ts b/packages/tailwindcss/src/utils/topological-sort.ts
new file mode 100644
index 000000000..ae20da4aa
--- /dev/null
+++ b/packages/tailwindcss/src/utils/topological-sort.ts
@@ -0,0 +1,36 @@
+export function topologicalSort<Key>(
+  graph: Map<Key, Set<Key>>,
+  options: { onCircularDependency: (path: Key[], start: Key) => void },
+): Key[] {
+  let seen = new Set<Key>()
+  let wip = new Set<Key>()
+
+  let sorted: Key[] = []
+
+  function visit(node: Key, path: Key[] = []) {
+    if (!graph.has(node)) return
+    if (seen.has(node)) return
+
+    // Circular dependency detected
+    if (wip.has(node)) options.onCircularDependency?.(path, node)
+
+    wip.add(node)
+
+    for (let dependency of graph.get(node) ?? []) {
+      path.push(node)
+      visit(dependency, path)
+      path.pop()
+    }
+
+    seen.add(node)
+    wip.delete(node)
+
+    sorted.push(node)
+  }
+
+  for (let node of graph.keys()) {
+    visit(node)
+  }
+
+  return sorted
+}
diff --git a/packages/tailwindcss/src/utils/variables.ts b/packages/tailwindcss/src/utils/variables.ts
new file mode 100644
index 000000000..b72987565
--- /dev/null
+++ b/packages/tailwindcss/src/utils/variables.ts
@@ -0,0 +1,23 @@
+import * as ValueParser from '../value-parser'
+import { walk, WalkAction } from '../walk'
+import { DefaultMap } from './default-map'
+
+let extractUsedVariablesCache = new DefaultMap((raw) => {
+  let variables: string[] = []
+  walk(ValueParser.parse(raw), (node) => {
+    if (node.kind !== 'function' || node.value !== 'var') return
+
+    walk(node.nodes, (child) => {
+      if (child.kind !== 'word' || child.value[0] !== '-' || child.value[1] !== '-') return
+
+      variables.push(child.value)
+    })
+
+    return WalkAction.Skip
+  })
+  return variables
+})
+
+export function extractUsedVariables(raw: string): string[] {
+  return extractUsedVariablesCache.get(raw)
+}
diff --git a/packages/tailwindcss/src/value-parser.test.ts b/packages/tailwindcss/src/value-parser.test.ts
index e1e64832c..f12949505 100644
--- a/packages/tailwindcss/src/value-parser.test.ts
+++ b/packages/tailwindcss/src/value-parser.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from 'vitest'
-import { parse, toCss, walk } from './value-parser'
+import { parse, toCss } from './value-parser'
+import { walk, WalkAction } from './walk'
 
 describe('parse', () => {
   it('should parse a value', () => {
@@ -89,7 +90,7 @@ describe('parse', () => {
         value: 'theme',
         nodes: [
           { kind: 'word', value: 'colors.red.500' },
-          { kind: 'separator', value: '/' },
+          { kind: 'word', value: '/' },
           { kind: 'function', value: 'var', nodes: [{ kind: 'word', value: '--opacity' }] },
         ],
       },
@@ -165,6 +166,22 @@ describe('parse', () => {
       },
     ])
   })
+
+  it('should not error when extra `)` was passed', () => {
+    expect(parse('calc(1 + 2))')).toEqual([
+      {
+        kind: 'function',
+        value: 'calc',
+        nodes: [
+          { kind: 'word', value: '1' },
+          { kind: 'separator', value: ' ' },
+          { kind: 'word', value: '+' },
+          { kind: 'separator', value: ' ' },
+          { kind: 'word', value: '2' },
+        ],
+      },
+    ])
+  })
 })
 
 describe('toCss', () => {
@@ -191,9 +208,9 @@ describe('walk', () => {
   it('can be used to replace a function call', () => {
     const ast = parse('(min-width: 600px) and (max-width: theme(lg))')
 
-    walk(ast, (node, { replaceWith }) => {
+    walk(ast, (node) => {
       if (node.kind === 'function' && node.value === 'theme') {
-        replaceWith({ kind: 'word', value: '64rem' })
+        return WalkAction.Replace({ kind: 'word', value: '64rem' } as const)
       }
     })
 
diff --git a/packages/tailwindcss/src/value-parser.ts b/packages/tailwindcss/src/value-parser.ts
index d51b793cb..c9f41f809 100644
--- a/packages/tailwindcss/src/value-parser.ts
+++ b/packages/tailwindcss/src/value-parser.ts
@@ -15,9 +15,8 @@ export type ValueSeparatorNode = {
 }
 
 export type ValueAstNode = ValueWordNode | ValueFunctionNode | ValueSeparatorNode
-type ValueParentNode = ValueFunctionNode | null
 
-function word(value: string): ValueWordNode {
+export function word(value: string): ValueWordNode {
   return {
     kind: 'word',
     value,
@@ -39,56 +38,6 @@ function separator(value: string): ValueSeparatorNode {
   }
 }
 
-export const enum ValueWalkAction {
-  /** Continue walking, which is the default */
-  Continue,
-
-  /** Skip visiting the children of this node */
-  Skip,
-
-  /** Stop the walk entirely */
-  Stop,
-}
-
-export function walk(
-  ast: ValueAstNode[],
-  visit: (
-    node: ValueAstNode,
-    utils: {
-      parent: ValueParentNode
-      replaceWith(newNode: ValueAstNode | ValueAstNode[]): void
-    },
-  ) => void | ValueWalkAction,
-  parent: ValueParentNode = null,
-) {
-  for (let i = 0; i < ast.length; i++) {
-    let node = ast[i]
-    let status =
-      visit(node, {
-        parent,
-        replaceWith(newNode) {
-          ast.splice(i, 1, ...(Array.isArray(newNode) ? newNode : [newNode]))
-          // We want to visit the newly replaced node(s), which start at the
-          // current index (i). By decrementing the index here, the next loop
-          // will process this position (containing the replaced node) again.
-          i--
-        },
-      }) ?? ValueWalkAction.Continue
-
-    // Stop the walk entirely
-    if (status === ValueWalkAction.Stop) return ValueWalkAction.Stop
-
-    // Skip visiting the children of this node
-    if (status === ValueWalkAction.Skip) continue
-
-    if (node.kind === 'function') {
-      if (walk(node.nodes, visit, node) === ValueWalkAction.Stop) {
-        return ValueWalkAction.Stop
-      }
-    }
-  }
-}
-
 export function toCss(ast: ValueAstNode[]) {
   let css = ''
   for (const node of ast) {
@@ -138,6 +87,41 @@ export function parse(input: string) {
     let currentChar = input.charCodeAt(i)
 
     switch (currentChar) {
+      // Current character is a `\` therefore the next character is escaped,
+      // consume it together with the next character and continue.
+      case BACKSLASH: {
+        buffer += input[i] + input[i + 1]
+        i++
+        break
+      }
+
+      // Typically for math operators, they have to have spaces around them. But
+      // there are situations in `theme(colors.red.500/10)` where we use `/`
+      // without spaces. Let's make sure this is a separate word as well.
+      case SLASH: {
+        // 1. Handle everything before the separator as a word
+        // Handle everything before the closing paren as a word
+        if (buffer.length > 0) {
+          let node = word(buffer)
+          if (parent) {
+            parent.nodes.push(node)
+          } else {
+            ast.push(node)
+          }
+          buffer = ''
+        }
+
+        // 2. Track the `/` as a word on its own
+        let node = word(input[i])
+        if (parent) {
+          parent.nodes.push(node)
+        } else {
+          ast.push(node)
+        }
+
+        break
+      }
+
       // Space and commas are bundled into separators
       //
       // E.g.:
@@ -152,7 +136,6 @@ export function parse(input: string) {
       case GREATER_THAN:
       case LESS_THAN:
       case NEWLINE:
-      case SLASH:
       case SPACE:
       case TAB: {
         // 1. Handle everything before the separator as a word
@@ -179,7 +162,6 @@ export function parse(input: string) {
             peekChar !== GREATER_THAN &&
             peekChar !== LESS_THAN &&
             peekChar !== NEWLINE &&
-            peekChar !== SLASH &&
             peekChar !== SPACE &&
             peekChar !== TAB
           ) {
@@ -268,7 +250,7 @@ export function parse(input: string) {
         // Handle everything before the closing paren a word
         if (buffer.length > 0) {
           let node = word(buffer)
-          tail!.nodes.push(node)
+          tail?.nodes.push(node)
           buffer = ''
         }
 
diff --git a/packages/tailwindcss/src/variants.test.ts b/packages/tailwindcss/src/variants.test.ts
index 5eaa374c2..37f9ebbea 100644
--- a/packages/tailwindcss/src/variants.test.ts
+++ b/packages/tailwindcss/src/variants.test.ts
@@ -1,194 +1,239 @@
-import dedent from 'dedent'
 import { expect, test } from 'vitest'
 import createPlugin from './plugin'
-import { compileCss, run } from './test-utils/run'
+import { run } from './test-utils/run'
 import { Compounds, compoundsForSelectors } from './variants'
 
 const css = String.raw
 
-test('force', async () => {
-  expect(await run(['force:flex'])).toMatchInlineSnapshot(`
-    ".force\\:flex {
-      display: flex;
-    }"
-  `)
-  expect(await run(['force/foo:flex'])).toEqual('')
-})
-
 test('*', async () => {
   expect(await run(['*:flex'])).toMatchInlineSnapshot(`
-    ":is(.\\*\\:flex > *) {
+    "
+    :is(.\\*\\:flex > *) {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['*/foo:flex'])).toEqual('')
 })
 
 test('**', async () => {
   expect(await run(['**:flex'])).toMatchInlineSnapshot(`
-    ":is(.\\*\\*\\:flex *) {
+    "
+    :is(.\\*\\*\\:flex *) {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['**/foo:flex'])).toEqual('')
 })
 
 test('first-letter', async () => {
   expect(await run(['first-letter:flex'])).toMatchInlineSnapshot(`
-    ".first-letter\\:flex:first-letter {
+    "
+    .first-letter\\:flex:first-letter {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['first-letter/foo:flex'])).toEqual('')
 })
 
 test('first-line', async () => {
   expect(await run(['first-line:flex'])).toMatchInlineSnapshot(`
-    ".first-line\\:flex:first-line {
+    "
+    .first-line\\:flex:first-line {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['first-line/foo:flex'])).toEqual('')
 })
 
 test('marker', async () => {
   expect(await run(['marker:flex'])).toMatchInlineSnapshot(`
-    ".marker\\:flex ::marker, .marker\\:flex::marker {
+    "
+    .marker\\:flex ::marker {
       display: flex;
-    }"
+    }
+
+    .marker\\:flex::marker {
+      display: flex;
+    }
+
+    .marker\\:flex ::-webkit-details-marker {
+      display: flex;
+    }
+
+    .marker\\:flex::-webkit-details-marker {
+      display: flex;
+    }
+    "
   `)
   expect(await run(['marker/foo:flex'])).toEqual('')
 })
 
 test('selection', async () => {
   expect(await run(['selection:flex'])).toMatchInlineSnapshot(`
-    ".selection\\:flex ::selection {
+    "
+    .selection\\:flex ::selection {
       display: flex;
     }
 
     .selection\\:flex::selection {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['selection/foo:flex'])).toEqual('')
 })
 
 test('file', async () => {
   expect(await run(['file:flex'])).toMatchInlineSnapshot(`
-    ".file\\:flex::file-selector-button {
+    "
+    .file\\:flex::file-selector-button {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['file/foo:flex'])).toEqual('')
 })
 
 test('placeholder', async () => {
   expect(await run(['placeholder:flex'])).toMatchInlineSnapshot(`
-    ".placeholder\\:flex::placeholder {
+    "
+    .placeholder\\:flex::placeholder {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['placeholder/foo:flex'])).toEqual('')
 })
 
 test('backdrop', async () => {
   expect(await run(['backdrop:flex'])).toMatchInlineSnapshot(`
-    ".backdrop\\:flex::backdrop {
+    "
+    .backdrop\\:flex::backdrop {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['backdrop/foo:flex'])).toEqual('')
 })
 
-test('before', async () => {
-  expect(await run(['before:flex'])).toMatchInlineSnapshot(`
-    ".before\\:flex:before {
-      content: var(--tw-content);
+test('details-content', async () => {
+  expect(await run(['details-content:flex'])).toMatchInlineSnapshot(`
+    "
+    .details-content\\:flex::details-content {
       display: flex;
     }
+    "
+  `)
+  expect(await run(['details-content/foo:flex'])).toEqual('')
+})
 
-    @supports (-moz-orient: inline) {
-      @layer base {
+test('before', async () => {
+  expect(await run(['before:flex'])).toMatchInlineSnapshot(`
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-content: "";
         }
       }
     }
 
+    .before\\:flex:before {
+      content: var(--tw-content);
+      display: flex;
+    }
+
     @property --tw-content {
       syntax: "*";
       inherits: false;
       initial-value: "";
-    }"
+    }
+    "
   `)
   expect(await run(['before/foo:flex'])).toEqual('')
 })
 
 test('after', async () => {
   expect(await run(['after:flex'])).toMatchInlineSnapshot(`
-    ".after\\:flex:after {
-      content: var(--tw-content);
-      display: flex;
-    }
-
-    @supports (-moz-orient: inline) {
-      @layer base {
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
         *, :before, :after, ::backdrop {
           --tw-content: "";
         }
       }
     }
 
+    .after\\:flex:after {
+      content: var(--tw-content);
+      display: flex;
+    }
+
     @property --tw-content {
       syntax: "*";
       inherits: false;
       initial-value: "";
-    }"
+    }
+    "
   `)
   expect(await run(['after/foo:flex'])).toEqual('')
 })
 
 test('first', async () => {
   expect(await run(['first:flex', 'group-first:flex', 'peer-first:flex'])).toMatchInlineSnapshot(`
-    ".group-first\\:flex:is(:where(.group):first-child *), .peer-first\\:flex:is(:where(.peer):first-child ~ *), .first\\:flex:first-child {
+    "
+    :is(:where(.group):first-child .group-first\\:flex), :is(:where(.peer):first-child ~ .peer-first\\:flex), .first\\:flex:first-child {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['first/foo:flex'])).toEqual('')
 })
 
 test('last', async () => {
   expect(await run(['last:flex', 'group-last:flex', 'peer-last:flex'])).toMatchInlineSnapshot(`
-    ".group-last\\:flex:is(:where(.group):last-child *), .peer-last\\:flex:is(:where(.peer):last-child ~ *), .last\\:flex:last-child {
+    "
+    :is(:where(.group):last-child .group-last\\:flex), :is(:where(.peer):last-child ~ .peer-last\\:flex), .last\\:flex:last-child {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['last/foo:flex'])).toEqual('')
 })
 
 test('only', async () => {
   expect(await run(['only:flex', 'group-only:flex', 'peer-only:flex'])).toMatchInlineSnapshot(`
-    ".group-only\\:flex:is(:where(.group):only-child *), .peer-only\\:flex:is(:where(.peer):only-child ~ *), .only\\:flex:only-child {
+    "
+    :is(:where(.group):only-child .group-only\\:flex), :is(:where(.peer):only-child ~ .peer-only\\:flex), .only\\:flex:only-child {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['only/foo:flex'])).toEqual('')
 })
 
 test('odd', async () => {
   expect(await run(['odd:flex', 'group-odd:flex', 'peer-odd:flex'])).toMatchInlineSnapshot(`
-    ".group-odd\\:flex:is(:where(.group):nth-child(odd) *), .peer-odd\\:flex:is(:where(.peer):nth-child(odd) ~ *), .odd\\:flex:nth-child(odd) {
+    "
+    :is(:where(.group):nth-child(odd) .group-odd\\:flex), :is(:where(.peer):nth-child(odd) ~ .peer-odd\\:flex), .odd\\:flex:nth-child(odd) {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['odd/foo:flex'])).toEqual('')
 })
 
 test('even', async () => {
   expect(await run(['even:flex', 'group-even:flex', 'peer-even:flex'])).toMatchInlineSnapshot(`
-    ".group-even\\:flex:is(:where(.group):nth-child(2n) *), .peer-even\\:flex:is(:where(.peer):nth-child(2n) ~ *), .even\\:flex:nth-child(2n) {
+    "
+    :is(:where(.group):nth-child(2n) .group-even\\:flex), :is(:where(.peer):nth-child(2n) ~ .peer-even\\:flex), .even\\:flex:nth-child(2n) {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['even/foo:flex'])).toEqual('')
 })
@@ -196,9 +241,11 @@ test('even', async () => {
 test('first-of-type', async () => {
   expect(await run(['first-of-type:flex', 'group-first-of-type:flex', 'peer-first-of-type:flex']))
     .toMatchInlineSnapshot(`
-      ".group-first-of-type\\:flex:is(:where(.group):first-of-type *), .peer-first-of-type\\:flex:is(:where(.peer):first-of-type ~ *), .first-of-type\\:flex:first-of-type {
+      "
+      :is(:where(.group):first-of-type .group-first-of-type\\:flex), :is(:where(.peer):first-of-type ~ .peer-first-of-type\\:flex), .first-of-type\\:flex:first-of-type {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['first-of-type/foo:flex'])).toEqual('')
 })
@@ -206,9 +253,11 @@ test('first-of-type', async () => {
 test('last-of-type', async () => {
   expect(await run(['last-of-type:flex', 'group-last-of-type:flex', 'peer-last-of-type:flex']))
     .toMatchInlineSnapshot(`
-      ".group-last-of-type\\:flex:is(:where(.group):last-of-type *), .peer-last-of-type\\:flex:is(:where(.peer):last-of-type ~ *), .last-of-type\\:flex:last-of-type {
+      "
+      :is(:where(.group):last-of-type .group-last-of-type\\:flex), :is(:where(.peer):last-of-type ~ .peer-last-of-type\\:flex), .last-of-type\\:flex:last-of-type {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['last-of-type/foo:flex'])).toEqual('')
 })
@@ -216,9 +265,11 @@ test('last-of-type', async () => {
 test('only-of-type', async () => {
   expect(await run(['only-of-type:flex', 'group-only-of-type:flex', 'peer-only-of-type:flex']))
     .toMatchInlineSnapshot(`
-      ".group-only-of-type\\:flex:is(:where(.group):only-of-type *), .peer-only-of-type\\:flex:is(:where(.peer):only-of-type ~ *), .only-of-type\\:flex:only-of-type {
+      "
+      :is(:where(.group):only-of-type .group-only-of-type\\:flex), :is(:where(.peer):only-of-type ~ .peer-only-of-type\\:flex), .only-of-type\\:flex:only-of-type {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['only-of-type/foo:flex'])).toEqual('')
 })
@@ -226,9 +277,11 @@ test('only-of-type', async () => {
 test('visited', async () => {
   expect(await run(['visited:flex', 'group-visited:flex', 'peer-visited:flex']))
     .toMatchInlineSnapshot(`
-      ".group-visited\\:flex:is(:where(.group):visited *), .peer-visited\\:flex:is(:where(.peer):visited ~ *), .visited\\:flex:visited {
+      "
+      :is(:where(.group):visited .group-visited\\:flex), :is(:where(.peer):visited ~ .peer-visited\\:flex), .visited\\:flex:visited {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['visited/foo:flex'])).toEqual('')
 })
@@ -236,28 +289,35 @@ test('visited', async () => {
 test('target', async () => {
   expect(await run(['target:flex', 'group-target:flex', 'peer-target:flex']))
     .toMatchInlineSnapshot(`
-      ".group-target\\:flex:is(:where(.group):target *), .peer-target\\:flex:is(:where(.peer):target ~ *), .target\\:flex:target {
+      "
+      :is(:where(.group):target .group-target\\:flex), :is(:where(.peer):target ~ .peer-target\\:flex), .target\\:flex:target {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['target/foo:flex'])).toEqual('')
 })
 
 test('open', async () => {
-  expect(await run(['open:flex', 'group-open:flex', 'peer-open:flex'])).toMatchInlineSnapshot(`
-    ".group-open\\:flex:is(:where(.group):is([open], :popover-open) *), .peer-open\\:flex:is(:where(.peer):is([open], :popover-open) ~ *), .open\\:flex:is([open], :popover-open) {
-      display: flex;
-    }"
-  `)
+  expect(await run(['open:flex', 'group-open:flex', 'peer-open:flex', 'not-open:flex']))
+    .toMatchInlineSnapshot(`
+      "
+      .not-open\\:flex:not(:is([open], :popover-open, :open)), :is(:where(.group):is([open], :popover-open, :open) .group-open\\:flex), :is(:where(.peer):is([open], :popover-open, :open) ~ .peer-open\\:flex), .open\\:flex:is([open], :popover-open, :open) {
+        display: flex;
+      }
+      "
+    `)
   expect(await run(['open/foo:flex'])).toEqual('')
 })
 
 test('default', async () => {
   expect(await run(['default:flex', 'group-default:flex', 'peer-default:flex']))
     .toMatchInlineSnapshot(`
-      ".group-default\\:flex:is(:where(.group):default *), .peer-default\\:flex:is(:where(.peer):default ~ *), .default\\:flex:default {
+      "
+      :is(:where(.group):default .group-default\\:flex), :is(:where(.peer):default ~ .peer-default\\:flex), .default\\:flex:default {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['default/foo:flex'])).toEqual('')
 })
@@ -265,9 +325,11 @@ test('default', async () => {
 test('checked', async () => {
   expect(await run(['checked:flex', 'group-checked:flex', 'peer-checked:flex']))
     .toMatchInlineSnapshot(`
-      ".group-checked\\:flex:is(:where(.group):checked *), .peer-checked\\:flex:is(:where(.peer):checked ~ *), .checked\\:flex:checked {
+      "
+      :is(:where(.group):checked .group-checked\\:flex), :is(:where(.peer):checked ~ .peer-checked\\:flex), .checked\\:flex:checked {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['checked/foo:flex'])).toEqual('')
 })
@@ -275,9 +337,11 @@ test('checked', async () => {
 test('indeterminate', async () => {
   expect(await run(['indeterminate:flex', 'group-indeterminate:flex', 'peer-indeterminate:flex']))
     .toMatchInlineSnapshot(`
-      ".group-indeterminate\\:flex:is(:where(.group):indeterminate *), .peer-indeterminate\\:flex:is(:where(.peer):indeterminate ~ *), .indeterminate\\:flex:indeterminate {
+      "
+      :is(:where(.group):indeterminate .group-indeterminate\\:flex), :is(:where(.peer):indeterminate ~ .peer-indeterminate\\:flex), .indeterminate\\:flex:indeterminate {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['indeterminate/foo:flex'])).toEqual('')
 })
@@ -290,9 +354,11 @@ test('placeholder-shown', async () => {
       'peer-placeholder-shown:flex',
     ]),
   ).toMatchInlineSnapshot(`
-    ".group-placeholder-shown\\:flex:is(:where(.group):placeholder-shown *), .peer-placeholder-shown\\:flex:is(:where(.peer):placeholder-shown ~ *), .placeholder-shown\\:flex:placeholder-shown {
+    "
+    :is(:where(.group):placeholder-shown .group-placeholder-shown\\:flex), :is(:where(.peer):placeholder-shown ~ .peer-placeholder-shown\\:flex), .placeholder-shown\\:flex:placeholder-shown {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['placeholder-shown/foo:flex'])).toEqual('')
 })
@@ -300,9 +366,15 @@ test('placeholder-shown', async () => {
 test('autofill', async () => {
   expect(await run(['autofill:flex', 'group-autofill:flex', 'peer-autofill:flex']))
     .toMatchInlineSnapshot(`
-      ".group-autofill\\:flex:is(:where(.group):autofill *), .peer-autofill\\:flex:is(:where(.peer):autofill ~ *), .autofill\\:flex:autofill {
+      "
+      :is(:where(.group):autofill .group-autofill\\:flex), :is(:where(.peer):autofill ~ .peer-autofill\\:flex) {
         display: flex;
-      }"
+      }
+
+      .autofill\\:flex:autofill {
+        display: flex;
+      }
+      "
     `)
   expect(await run(['autofill/foo:flex'])).toEqual('')
 })
@@ -310,9 +382,11 @@ test('autofill', async () => {
 test('optional', async () => {
   expect(await run(['optional:flex', 'group-optional:flex', 'peer-optional:flex']))
     .toMatchInlineSnapshot(`
-      ".group-optional\\:flex:is(:where(.group):optional *), .peer-optional\\:flex:is(:where(.peer):optional ~ *), .optional\\:flex:optional {
+      "
+      :is(:where(.group):optional .group-optional\\:flex), :is(:where(.peer):optional ~ .peer-optional\\:flex), .optional\\:flex:optional {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['optional/foo:flex'])).toEqual('')
 })
@@ -320,18 +394,22 @@ test('optional', async () => {
 test('required', async () => {
   expect(await run(['required:flex', 'group-required:flex', 'peer-required:flex']))
     .toMatchInlineSnapshot(`
-      ".group-required\\:flex:is(:where(.group):required *), .peer-required\\:flex:is(:where(.peer):required ~ *), .required\\:flex:required {
+      "
+      :is(:where(.group):required .group-required\\:flex), :is(:where(.peer):required ~ .peer-required\\:flex), .required\\:flex:required {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['required/foo:flex'])).toEqual('')
 })
 
 test('valid', async () => {
   expect(await run(['valid:flex', 'group-valid:flex', 'peer-valid:flex'])).toMatchInlineSnapshot(`
-    ".group-valid\\:flex:is(:where(.group):valid *), .peer-valid\\:flex:is(:where(.peer):valid ~ *), .valid\\:flex:valid {
+    "
+    :is(:where(.group):valid .group-valid\\:flex), :is(:where(.peer):valid ~ .peer-valid\\:flex), .valid\\:flex:valid {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['valid/foo:flex'])).toEqual('')
 })
@@ -339,19 +417,55 @@ test('valid', async () => {
 test('invalid', async () => {
   expect(await run(['invalid:flex', 'group-invalid:flex', 'peer-invalid:flex']))
     .toMatchInlineSnapshot(`
-      ".group-invalid\\:flex:is(:where(.group):invalid *), .peer-invalid\\:flex:is(:where(.peer):invalid ~ *), .invalid\\:flex:invalid {
+      "
+      :is(:where(.group):invalid .group-invalid\\:flex), :is(:where(.peer):invalid ~ .peer-invalid\\:flex), .invalid\\:flex:invalid {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['invalid/foo:flex'])).toEqual('')
 })
 
+test('user-valid', async () => {
+  expect(await run(['user-valid:flex', 'group-user-valid:flex', 'peer-user-valid:flex']))
+    .toMatchInlineSnapshot(`
+      "
+      :is(:where(.group):user-valid .group-user-valid\\:flex), :is(:where(.peer):user-valid ~ .peer-user-valid\\:flex) {
+        display: flex;
+      }
+
+      .user-valid\\:flex:user-valid {
+        display: flex;
+      }
+      "
+    `)
+  expect(await run(['user-valid/foo:flex'])).toEqual('')
+})
+
+test('user-invalid', async () => {
+  expect(await run(['user-invalid:flex', 'group-user-invalid:flex', 'peer-user-invalid:flex']))
+    .toMatchInlineSnapshot(`
+      "
+      :is(:where(.group):user-invalid .group-user-invalid\\:flex), :is(:where(.peer):user-invalid ~ .peer-user-invalid\\:flex) {
+        display: flex;
+      }
+
+      .user-invalid\\:flex:user-invalid {
+        display: flex;
+      }
+      "
+    `)
+  expect(await run(['user-invalid/foo:flex'])).toEqual('')
+})
+
 test('in-range', async () => {
   expect(await run(['in-range:flex', 'group-in-range:flex', 'peer-in-range:flex']))
     .toMatchInlineSnapshot(`
-      ".group-in-range\\:flex:is(:where(.group):in-range *), .peer-in-range\\:flex:is(:where(.peer):in-range ~ *), .in-range\\:flex:in-range {
+      "
+      :is(:where(.group):in-range .group-in-range\\:flex), :is(:where(.peer):in-range ~ .peer-in-range\\:flex), .in-range\\:flex:in-range {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['in-range/foo:flex'])).toEqual('')
 })
@@ -359,9 +473,11 @@ test('in-range', async () => {
 test('out-of-range', async () => {
   expect(await run(['out-of-range:flex', 'group-out-of-range:flex', 'peer-out-of-range:flex']))
     .toMatchInlineSnapshot(`
-      ".group-out-of-range\\:flex:is(:where(.group):out-of-range *), .peer-out-of-range\\:flex:is(:where(.peer):out-of-range ~ *), .out-of-range\\:flex:out-of-range {
+      "
+      :is(:where(.group):out-of-range .group-out-of-range\\:flex), :is(:where(.peer):out-of-range ~ .peer-out-of-range\\:flex), .out-of-range\\:flex:out-of-range {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['out-of-range/foo:flex'])).toEqual('')
 })
@@ -369,18 +485,22 @@ test('out-of-range', async () => {
 test('read-only', async () => {
   expect(await run(['read-only:flex', 'group-read-only:flex', 'peer-read-only:flex']))
     .toMatchInlineSnapshot(`
-      ".group-read-only\\:flex:is(:where(.group):read-only *), .peer-read-only\\:flex:is(:where(.peer):read-only ~ *), .read-only\\:flex:read-only {
+      "
+      :is(:where(.group):read-only .group-read-only\\:flex), :is(:where(.peer):read-only ~ .peer-read-only\\:flex), .read-only\\:flex:read-only {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['read-only/foo:flex'])).toEqual('')
 })
 
 test('empty', async () => {
   expect(await run(['empty:flex', 'group-empty:flex', 'peer-empty:flex'])).toMatchInlineSnapshot(`
-    ".group-empty\\:flex:is(:where(.group):empty *), .peer-empty\\:flex:is(:where(.peer):empty ~ *), .empty\\:flex:empty {
+    "
+    :is(:where(.group):empty .group-empty\\:flex), :is(:where(.peer):empty ~ .peer-empty\\:flex), .empty\\:flex:empty {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['empty/foo:flex'])).toEqual('')
 })
@@ -388,64 +508,89 @@ test('empty', async () => {
 test('focus-within', async () => {
   expect(await run(['focus-within:flex', 'group-focus-within:flex', 'peer-focus-within:flex']))
     .toMatchInlineSnapshot(`
-      ".group-focus-within\\:flex:is(:where(.group):focus-within *), .peer-focus-within\\:flex:is(:where(.peer):focus-within ~ *), .focus-within\\:flex:focus-within {
+      "
+      :is(:where(.group):focus-within .group-focus-within\\:flex), :is(:where(.peer):focus-within ~ .peer-focus-within\\:flex), .focus-within\\:flex:focus-within {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['focus-within/foo:flex'])).toEqual('')
 })
 
 test('hover', async () => {
   expect(await run(['hover:flex', 'group-hover:flex', 'peer-hover:flex'])).toMatchInlineSnapshot(`
-    "@media (hover: hover) {
-      .group-hover\\:flex:is(:where(.group):hover *), .peer-hover\\:flex:is(:where(.peer):hover ~ *), .hover\\:flex:hover {
+    "
+    @media (hover: hover) {
+      :is(:where(.group):hover .group-hover\\:flex), :is(:where(.peer):hover ~ .peer-hover\\:flex), .hover\\:flex:hover {
         display: flex;
       }
-    }"
+    }
+    "
   `)
   expect(await run(['hover/foo:flex'])).toEqual('')
 })
 
 test('focus', async () => {
   expect(await run(['focus:flex', 'group-focus:flex', 'peer-focus:flex'])).toMatchInlineSnapshot(`
-    ".group-focus\\:flex:is(:where(.group):focus *), .peer-focus\\:flex:is(:where(.peer):focus ~ *), .focus\\:flex:focus {
+    "
+    :is(:where(.group):focus .group-focus\\:flex), :is(:where(.peer):focus ~ .peer-focus\\:flex), .focus\\:flex:focus {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['focus/foo:flex'])).toEqual('')
 })
 
 test('group-hover group-focus sorting', async () => {
   expect(await run(['group-hover:flex', 'group-focus:flex'])).toMatchInlineSnapshot(`
-    "@media (hover: hover) {
-      .group-hover\\:flex:is(:where(.group):hover *) {
+    "
+    @media (hover: hover) {
+      :is(:where(.group):hover .group-hover\\:flex) {
         display: flex;
       }
     }
 
-    .group-focus\\:flex:is(:where(.group):focus *) {
+    :is(:where(.group):focus .group-focus\\:flex) {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['group-focus:flex', 'group-hover:flex'])).toMatchInlineSnapshot(`
-    "@media (hover: hover) {
-      .group-hover\\:flex:is(:where(.group):hover *) {
+    "
+    @media (hover: hover) {
+      :is(:where(.group):hover .group-hover\\:flex) {
         display: flex;
       }
     }
 
-    .group-focus\\:flex:is(:where(.group):focus *) {
+    :is(:where(.group):focus .group-focus\\:flex) {
       display: flex;
-    }"
+    }
+    "
   `)
 })
 
+test('stacking group and peer variants does not duplicate the target selector', async () => {
+  let candidate = Array.from(
+    { length: 12 },
+    (_, i) => `${i % 2 === 0 ? 'group' : 'peer'}-data-active/name${i}`,
+  ).join(':')
+
+  let output = await run([`${candidate}:flex`])
+  expect(output).toContain('display: flex')
+  // Repeating `&` in each variant makes the generated selector grow
+  // exponentially. This many variants should still produce a small rule.
+  expect(output.length).toBeLessThan(2_000)
+})
+
 test('focus-visible', async () => {
   expect(await run(['focus-visible:flex', 'group-focus-visible:flex', 'peer-focus-visible:flex']))
     .toMatchInlineSnapshot(`
-      ".group-focus-visible\\:flex:is(:where(.group):focus-visible *), .peer-focus-visible\\:flex:is(:where(.peer):focus-visible ~ *), .focus-visible\\:flex:focus-visible {
+      "
+      :is(:where(.group):focus-visible .group-focus-visible\\:flex), :is(:where(.peer):focus-visible ~ .peer-focus-visible\\:flex), .focus-visible\\:flex:focus-visible {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['focus-visible/foo:flex'])).toEqual('')
 })
@@ -453,9 +598,11 @@ test('focus-visible', async () => {
 test('active', async () => {
   expect(await run(['active:flex', 'group-active:flex', 'peer-active:flex']))
     .toMatchInlineSnapshot(`
-      ".group-active\\:flex:is(:where(.group):active *), .peer-active\\:flex:is(:where(.peer):active ~ *), .active\\:flex:active {
+      "
+      :is(:where(.group):active .group-active\\:flex), :is(:where(.peer):active ~ .peer-active\\:flex), .active\\:flex:active {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['active/foo:flex'])).toEqual('')
 })
@@ -463,9 +610,11 @@ test('active', async () => {
 test('enabled', async () => {
   expect(await run(['enabled:flex', 'group-enabled:flex', 'peer-enabled:flex']))
     .toMatchInlineSnapshot(`
-      ".group-enabled\\:flex:is(:where(.group):enabled *), .peer-enabled\\:flex:is(:where(.peer):enabled ~ *), .enabled\\:flex:enabled {
+      "
+      :is(:where(.group):enabled .group-enabled\\:flex), :is(:where(.peer):enabled ~ .peer-enabled\\:flex), .enabled\\:flex:enabled {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['enabled/foo:flex'])).toEqual('')
 })
@@ -473,18 +622,22 @@ test('enabled', async () => {
 test('disabled', async () => {
   expect(await run(['disabled:flex', 'group-disabled:flex', 'peer-disabled:flex']))
     .toMatchInlineSnapshot(`
-      ".group-disabled\\:flex:is(:where(.group):disabled *), .peer-disabled\\:flex:is(:where(.peer):disabled ~ *), .disabled\\:flex:disabled {
+      "
+      :is(:where(.group):disabled .group-disabled\\:flex), :is(:where(.peer):disabled ~ .peer-disabled\\:flex), .disabled\\:flex:disabled {
         display: flex;
-      }"
+      }
+      "
     `)
   expect(await run(['disabled/foo:flex'])).toEqual('')
 })
 
 test('inert', async () => {
   expect(await run(['inert:flex', 'group-inert:flex', 'peer-inert:flex'])).toMatchInlineSnapshot(`
-    ".group-inert\\:flex:is(:where(.group):is([inert], [inert] *) *), .peer-inert\\:flex:is(:where(.peer):is([inert], [inert] *) ~ *), .inert\\:flex:is([inert], [inert] *) {
+    "
+    :is(:where(.group):is([inert], [inert] *) .group-inert\\:flex), :is(:where(.peer):is([inert], [inert] *) ~ .peer-inert\\:flex), .inert\\:flex:is([inert], [inert] *) {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['inert/foo:flex'])).toEqual('')
 })
@@ -499,45 +652,38 @@ test('group-[...]', async () => {
       'group-[&:hover]:group-[&_p]:flex',
     ]),
   ).toMatchInlineSnapshot(`
-    ".group-\\[\\&_p\\]\\:flex:is(:where(.group) p *), .group-\\[\\&\\:hover\\]\\:group-\\[\\&_p\\]\\:flex:is(:where(.group):hover *):is(:where(.group) p *) {
+    "
+    :is(:where(.group) p .group-\\[\\&_p\\]\\:flex), :is(:where(.group) p :is(:where(.group):hover .group-\\[\\&\\:hover\\]\\:group-\\[\\&_p\\]\\:flex)) {
       display: flex;
     }
 
     @media (hover: hover) {
-      .group-\\[\\&_p\\]\\:hover\\:flex:is(:where(.group) p *):hover, .hover\\:group-\\[\\&_p\\]\\:flex:hover:is(:where(.group) p *) {
+      :is(:where(.group) p .group-\\[\\&_p\\]\\:hover\\:flex):hover, :is(:where(.group) p .hover\\:group-\\[\\&_p\\]\\:flex:hover) {
         display: flex;
       }
 
       @media (hover: hover) {
-        .hover\\:group-\\[\\&_p\\]\\:hover\\:flex:hover:is(:where(.group) p *):hover {
+        :is(:where(.group) p .hover\\:group-\\[\\&_p\\]\\:hover\\:flex:hover):hover {
           display: flex;
         }
       }
-    }"
+    }
+    "
   `)
 
   expect(
-    await compileCss(
-      css`
-        @tailwind utilities;
-      `,
-      ['group-[]:flex', 'group-hover/[]:flex', 'group-[@media_foo]:flex', 'group-[>img]:flex'],
-    ),
+    await run([
+      'group-[]:flex',
+      'group-hover/[]:flex',
+      'group-[@media_foo]:flex',
+      'group-[>img]:flex',
+    ]),
   ).toEqual('')
 })
 
 test('group-*', async () => {
   expect(
-    await compileCss(
-      css`
-        @variant hocus {
-          &:hover,
-          &:focus {
-            @slot;
-          }
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'group-hover:flex',
         'group-focus:flex',
@@ -546,34 +692,46 @@ test('group-*', async () => {
         'group-hover:group-focus:flex',
         'group-focus:group-hover:flex',
       ],
+      css`
+        @custom-variant hocus {
+          &:hover,
+          &:focus {
+            @slot;
+          }
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    "@media (hover: hover) {
-      .group-hover\\:flex:is(:where(.group):hover *) {
+    "
+    @media (hover: hover) {
+      :is(:where(.group):hover .group-hover\\:flex) {
         display: flex;
       }
     }
 
-    .group-focus\\:flex:is(:where(.group):focus *) {
+    :is(:where(.group):focus .group-focus\\:flex) {
       display: flex;
     }
 
     @media (hover: hover) {
-      .group-focus\\:group-hover\\:flex:is(:where(.group):focus *):is(:where(.group):hover *), .group-hover\\:group-focus\\:flex:is(:where(.group):hover *):is(:where(.group):focus *) {
+      :is(:where(.group):hover :is(:where(.group):focus .group-focus\\:group-hover\\:flex)), :is(:where(.group):focus :is(:where(.group):hover .group-hover\\:group-focus\\:flex)) {
         display: flex;
       }
     }
 
-    .group-hocus\\:flex:is(:is(:where(.group):hover, :where(.group):focus) *) {
+    :is(:is(:where(.group):hover, :where(.group):focus) .group-hocus\\:flex) {
       display: flex;
-    }"
+    }
+    "
   `)
 
   expect(
-    await compileCss(
+    await run(
+      ['group-custom-at-rule:flex', 'group-nested-selectors:flex'],
       css`
-        @variant custom-at-rule (@media foo);
-        @variant nested-selectors {
+        @custom-variant custom-at-rule (@media foo);
+        @custom-variant nested-selectors {
           &:hover {
             &:focus {
               @slot;
@@ -582,7 +740,6 @@ test('group-*', async () => {
         }
         @tailwind utilities;
       `,
-      ['group-custom-at-rule:flex', 'group-nested-selectors:flex'],
     ),
   ).toEqual('')
 })
@@ -597,39 +754,27 @@ test('peer-[...]', async () => {
       'peer-[&:hover]:peer-[&_p]:flex',
     ]),
   ).toMatchInlineSnapshot(`
-    ".peer-\\[\\&_p\\]\\:flex:is(:where(.peer) p ~ *), .peer-\\[\\&\\:hover\\]\\:peer-\\[\\&_p\\]\\:flex:is(:where(.peer):hover ~ *):is(:where(.peer) p ~ *) {
+    "
+    :is(:where(.peer) p ~ .peer-\\[\\&_p\\]\\:flex), :is(:where(.peer) p ~ :is(:where(.peer):hover ~ .peer-\\[\\&\\:hover\\]\\:peer-\\[\\&_p\\]\\:flex)) {
       display: flex;
     }
 
     @media (hover: hover) {
-      .hover\\:peer-\\[\\&_p\\]\\:flex:hover:is(:where(.peer) p ~ *), .peer-\\[\\&_p\\]\\:hover\\:flex:is(:where(.peer) p ~ *):hover, .hover\\:peer-\\[\\&_p\\]\\:focus\\:flex:hover:is(:where(.peer) p ~ *):focus {
+      :is(:where(.peer) p ~ .hover\\:peer-\\[\\&_p\\]\\:flex:hover), :is(:where(.peer) p ~ .peer-\\[\\&_p\\]\\:hover\\:flex):hover, :is(:where(.peer) p ~ .hover\\:peer-\\[\\&_p\\]\\:focus\\:flex:hover):focus {
         display: flex;
       }
-    }"
+    }
+    "
   `)
 
   expect(
-    await compileCss(
-      css`
-        @tailwind utilities;
-      `,
-      ['peer-[]:flex', 'peer-hover/[]:flex', 'peer-[@media_foo]:flex', 'peer-[>img]:flex'],
-    ),
+    await run(['peer-[]:flex', 'peer-hover/[]:flex', 'peer-[@media_foo]:flex', 'peer-[>img]:flex']),
   ).toEqual('')
 })
 
 test('peer-*', async () => {
   expect(
-    await compileCss(
-      css`
-        @variant hocus {
-          &:hover,
-          &:focus {
-            @slot;
-          }
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'peer-hover:flex',
         'peer-focus:flex',
@@ -637,34 +782,46 @@ test('peer-*', async () => {
         'peer-hover:peer-focus:flex',
         'peer-focus:peer-hover:flex',
       ],
+      css`
+        @custom-variant hocus {
+          &:hover,
+          &:focus {
+            @slot;
+          }
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    "@media (hover: hover) {
-      .peer-hover\\:flex:is(:where(.peer):hover ~ *) {
+    "
+    @media (hover: hover) {
+      :is(:where(.peer):hover ~ .peer-hover\\:flex) {
         display: flex;
       }
     }
 
-    .peer-focus\\:flex:is(:where(.peer):focus ~ *) {
+    :is(:where(.peer):focus ~ .peer-focus\\:flex) {
       display: flex;
     }
 
     @media (hover: hover) {
-      .peer-focus\\:peer-hover\\:flex:is(:where(.peer):focus ~ *):is(:where(.peer):hover ~ *), .peer-hover\\:peer-focus\\:flex:is(:where(.peer):hover ~ *):is(:where(.peer):focus ~ *) {
+      :is(:where(.peer):hover ~ :is(:where(.peer):focus ~ .peer-focus\\:peer-hover\\:flex)), :is(:where(.peer):focus ~ :is(:where(.peer):hover ~ .peer-hover\\:peer-focus\\:flex)) {
         display: flex;
       }
     }
 
-    .peer-hocus\\:flex:is(:is(:where(.peer):hover, :where(.peer):focus) ~ *) {
+    :is(:is(:where(.peer):hover, :where(.peer):focus) ~ .peer-hocus\\:flex) {
       display: flex;
-    }"
+    }
+    "
   `)
 
   expect(
-    await compileCss(
+    await run(
+      ['peer-custom-at-rule:flex', 'peer-nested-selectors:flex'],
       css`
-        @variant custom-at-rule (@media foo);
-        @variant nested-selectors {
+        @custom-variant custom-at-rule (@media foo);
+        @custom-variant nested-selectors {
           &:hover {
             &:focus {
               @slot;
@@ -673,87 +830,101 @@ test('peer-*', async () => {
         }
         @tailwind utilities;
       `,
-      ['peer-custom-at-rule:flex', 'peer-nested-selectors:flex'],
     ),
   ).toEqual('')
 })
 
 test('ltr', async () => {
   expect(await run(['ltr:flex'])).toMatchInlineSnapshot(`
-    ".ltr\\:flex:where(:dir(ltr), [dir="ltr"], [dir="ltr"] *) {
+    "
+    .ltr\\:flex:where(:dir(ltr), [dir="ltr"], [dir="ltr"] *) {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['ltr/foo:flex'])).toEqual('')
 })
 
 test('rtl', async () => {
   expect(await run(['rtl:flex'])).toMatchInlineSnapshot(`
-    ".rtl\\:flex:where(:dir(rtl), [dir="rtl"], [dir="rtl"] *) {
+    "
+    .rtl\\:flex:where(:dir(rtl), [dir="rtl"], [dir="rtl"] *) {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['rtl/foo:flex'])).toEqual('')
 })
 
 test('motion-safe', async () => {
   expect(await run(['motion-safe:flex'])).toMatchInlineSnapshot(`
-    "@media (prefers-reduced-motion: no-preference) {
+    "
+    @media (prefers-reduced-motion: no-preference) {
       .motion-safe\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
   expect(await run(['motion-safe/foo:flex'])).toEqual('')
 })
 
 test('motion-reduce', async () => {
   expect(await run(['motion-reduce:flex'])).toMatchInlineSnapshot(`
-    "@media (prefers-reduced-motion: reduce) {
+    "
+    @media (prefers-reduced-motion: reduce) {
       .motion-reduce\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
   expect(await run(['motion-reduce/foo:flex'])).toEqual('')
 })
 
 test('dark', async () => {
   expect(await run(['dark:flex'])).toMatchInlineSnapshot(`
-    "@media (prefers-color-scheme: dark) {
+    "
+    @media (prefers-color-scheme: dark) {
       .dark\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
   expect(await run(['dark/foo:flex'])).toEqual('')
 })
 
 test('starting', async () => {
   expect(await run(['starting:opacity-0'])).toMatchInlineSnapshot(`
-    "@starting-style {
+    "
+    @starting-style {
       .starting\\:opacity-0 {
         opacity: 0;
       }
-    }"
+    }
+    "
   `)
   expect(await run(['starting/foo:flex'])).toEqual('')
 })
 
 test('print', async () => {
   expect(await run(['print:flex'])).toMatchInlineSnapshot(`
-    "@media print {
+    "
+    @media print {
       .print\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
   expect(await run(['print/foo:flex'])).toEqual('')
 })
 
 test('default breakpoints', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['sm:flex', 'md:flex', 'lg:flex', 'xl:flex', '2xl:flex'],
       css`
         @theme {
           /* Breakpoints */
@@ -765,49 +936,43 @@ test('default breakpoints', async () => {
         }
         @tailwind utilities;
       `,
-      ['sm:flex', 'md:flex', 'lg:flex', 'xl:flex', '2xl:flex'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 640px;
-      --breakpoint-md: 768px;
-      --breakpoint-lg: 1024px;
-      --breakpoint-xl: 1280px;
-      --breakpoint-2xl: 1536px;
-    }
-
-    @media (width >= 640px) {
+    "
+    @media (min-width: 640px) {
       .sm\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 768px) {
+    @media (min-width: 768px) {
       .md\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 1024px) {
+    @media (min-width: 1024px) {
       .lg\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 1280px) {
+    @media (min-width: 1280px) {
       .xl\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 1536px) {
+    @media (min-width: 1536px) {
       .\\32 xl\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
   expect(
-    await compileCss(
+    await run(
+      ['sm/foo:flex', 'md/foo:flex', 'lg/foo:flex', 'xl/foo:flex', '2xl/foo:flex'],
       css`
         @theme reference {
           /* Breakpoints */
@@ -819,38 +984,36 @@ test('default breakpoints', async () => {
         }
         @tailwind utilities;
       `,
-      ['sm/foo:flex', 'md/foo:flex', 'lg/foo:flex', 'xl/foo:flex', '2xl/foo:flex'],
     ),
   ).toEqual('')
 })
 
 test('custom breakpoint', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['10xl:flex'],
       css`
         @theme {
           --breakpoint-10xl: 5000px;
         }
         @tailwind utilities;
       `,
-      ['10xl:flex'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-10xl: 5000px;
-    }
-
-    @media (width >= 5000px) {
+    "
+    @media (min-width: 5000px) {
       .\\31 0xl\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
 })
 
 test('max-*', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['max-lg:flex', 'max-sm:flex', 'max-md:flex'],
       css`
         @theme {
           /* Explicitly ordered in a strange way */
@@ -860,35 +1023,31 @@ test('max-*', async () => {
         }
         @tailwind utilities;
       `,
-      ['max-lg:flex', 'max-sm:flex', 'max-md:flex'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 640px;
-      --breakpoint-lg: 1024px;
-      --breakpoint-md: 768px;
-    }
-
-    @media (width < 1024px) {
+    "
+    @media not all and (min-width: 1024px) {
       .max-lg\\:flex {
         display: flex;
       }
     }
 
-    @media (width < 768px) {
+    @media not all and (min-width: 768px) {
       .max-md\\:flex {
         display: flex;
       }
     }
 
-    @media (width < 640px) {
+    @media not all and (min-width: 640px) {
       .max-sm\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
   expect(
-    await compileCss(
+    await run(
+      ['max-lg/foo:flex', 'max-sm/foo:flex', 'max-md/foo:flex'],
       css`
         @theme reference {
           /* Explicitly ordered in a strange way */
@@ -898,14 +1057,14 @@ test('max-*', async () => {
         }
         @tailwind utilities;
       `,
-      ['max-lg/foo:flex', 'max-sm/foo:flex', 'max-md/foo:flex'],
     ),
   ).toEqual('')
 })
 
 test('min-*', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['min-lg:flex', 'min-sm:flex', 'min-md:flex'],
       css`
         @theme {
           /* Explicitly ordered in a strange way */
@@ -915,35 +1074,31 @@ test('min-*', async () => {
         }
         @tailwind utilities;
       `,
-      ['min-lg:flex', 'min-sm:flex', 'min-md:flex'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 640px;
-      --breakpoint-lg: 1024px;
-      --breakpoint-md: 768px;
-    }
-
-    @media (width >= 640px) {
+    "
+    @media (min-width: 640px) {
       .min-sm\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 768px) {
+    @media (min-width: 768px) {
       .min-md\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 1024px) {
+    @media (min-width: 1024px) {
       .min-lg\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
   expect(
-    await compileCss(
+    await run(
+      ['min-lg/foo:flex', 'min-sm/foo:flex', 'min-md/foo:flex'],
       css`
         @theme reference {
           /* Explicitly ordered in a strange way */
@@ -953,14 +1108,14 @@ test('min-*', async () => {
         }
         @tailwind utilities;
       `,
-      ['min-lg/foo:flex', 'min-sm/foo:flex', 'min-md/foo:flex'],
     ),
   ).toEqual('')
 })
 
 test('sorting stacked min-* and max-* variants', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['min-sm:max-lg:flex', 'min-sm:max-xl:flex', 'min-md:max-lg:flex', 'min-xs:max-sm:flex'],
       css`
         @theme {
           /* Explicitly ordered in a strange way */
@@ -972,52 +1127,46 @@ test('sorting stacked min-* and max-* variants', async () => {
         }
         @tailwind utilities;
       `,
-      ['min-sm:max-lg:flex', 'min-sm:max-xl:flex', 'min-md:max-lg:flex', 'min-xs:max-sm:flex'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 640px;
-      --breakpoint-lg: 1024px;
-      --breakpoint-md: 768px;
-      --breakpoint-xl: 1280px;
-      --breakpoint-xs: 280px;
-    }
-
-    @media (width >= 280px) {
-      @media (width < 640px) {
+    "
+    @media (min-width: 280px) {
+      @media not all and (min-width: 640px) {
         .min-xs\\:max-sm\\:flex {
           display: flex;
         }
       }
     }
 
-    @media (width >= 640px) {
-      @media (width < 1280px) {
+    @media (min-width: 640px) {
+      @media not all and (min-width: 1280px) {
         .min-sm\\:max-xl\\:flex {
           display: flex;
         }
       }
 
-      @media (width < 1024px) {
+      @media not all and (min-width: 1024px) {
         .min-sm\\:max-lg\\:flex {
           display: flex;
         }
       }
     }
 
-    @media (width >= 768px) {
-      @media (width < 1024px) {
+    @media (min-width: 768px) {
+      @media not all and (min-width: 1024px) {
         .min-md\\:max-lg\\:flex {
           display: flex;
         }
       }
-    }"
+    }
+    "
   `)
 })
 
 test('stacked min-* and max-* variants should come after unprefixed variants', async () => {
   expect(
-    await compileCss(
+    await run(
+      ['sm:flex', 'min-sm:max-lg:flex', 'md:flex', 'min-md:max-lg:flex'],
       css`
         @theme {
           /* Explicitly ordered in a strange way */
@@ -1027,53 +1176,39 @@ test('stacked min-* and max-* variants should come after unprefixed variants', a
         }
         @tailwind utilities;
       `,
-      ['sm:flex', 'min-sm:max-lg:flex', 'md:flex', 'min-md:max-lg:flex'],
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 640px;
-      --breakpoint-lg: 1024px;
-      --breakpoint-md: 768px;
-    }
-
-    @media (width >= 640px) {
+    "
+    @media (min-width: 640px) {
       .sm\\:flex {
         display: flex;
       }
 
-      @media (width < 1024px) {
+      @media not all and (min-width: 1024px) {
         .min-sm\\:max-lg\\:flex {
           display: flex;
         }
       }
     }
 
-    @media (width >= 768px) {
+    @media (min-width: 768px) {
       .md\\:flex {
         display: flex;
       }
 
-      @media (width < 1024px) {
+      @media not all and (min-width: 1024px) {
         .min-md\\:max-lg\\:flex {
           display: flex;
         }
       }
-    }"
+    }
+    "
   `)
 })
 
 test('min, max and unprefixed breakpoints', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          /* Explicitly ordered in a strange way */
-          --breakpoint-sm: 640px;
-          --breakpoint-lg: 1024px;
-          --breakpoint-md: 768px;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'max-lg-sm-potato:flex',
         'min-lg-sm-potato:flex',
@@ -1090,61 +1225,66 @@ test('min, max and unprefixed breakpoints', async () => {
         'sm:flex',
         'lg:flex',
       ],
+      css`
+        @theme {
+          /* Explicitly ordered in a strange way */
+          --breakpoint-sm: 640px;
+          --breakpoint-lg: 1024px;
+          --breakpoint-md: 768px;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 640px;
-      --breakpoint-lg: 1024px;
-      --breakpoint-md: 768px;
-    }
-
-    @media (width < 1024px) {
+    "
+    @media not all and (min-width: 1024px) {
       .max-lg\\:flex {
         display: flex;
       }
     }
 
-    @media (width < 1000px) {
+    @media not all and (min-width: 1000px) {
       .max-\\[1000px\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width < 768px) {
+    @media not all and (min-width: 768px) {
       .max-md\\:flex {
         display: flex;
       }
     }
 
-    @media (width < 640px) {
+    @media not all and (min-width: 640px) {
       .max-sm\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 640px) {
+    @media (min-width: 640px) {
       .min-sm\\:flex, .sm\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 700px) {
+    @media (min-width: 700px) {
       .min-\\[700px\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 768px) {
+    @media (min-width: 768px) {
       .md\\:flex, .min-md\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 1024px) {
+    @media (min-width: 1024px) {
       .lg\\:flex, .min-lg\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
 })
 
@@ -1173,125 +1313,201 @@ test('sorting `min` and `max` should sort by unit, then by value, then alphabeti
       'max-[12vh]:flex',
     ]),
   ).toMatchInlineSnapshot(`
-    "@media (width < calc(1000px + 12em)) {
+    "
+    @media not all and (min-width: calc(1000px + 12em)) {
       .max-\\[calc\\(1000px\\+12em\\)\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width < calc(50vh + 12em)) {
+    @media not all and (min-width: calc(50vh + 12em)) {
       .max-\\[calc\\(50vh\\+12em\\)\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width < 12em) {
+    @media not all and (min-width: 12em) {
       .max-\\[12em\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width < 10em) {
+    @media not all and (min-width: 10em) {
       .max-\\[10em\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width < 12px) {
+    @media not all and (min-width: 12px) {
       .max-\\[12px\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width < 10px) {
+    @media not all and (min-width: 10px) {
       .max-\\[10px\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width < 12rem) {
+    @media not all and (min-width: 12rem) {
       .max-\\[12rem\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width < 10rem) {
+    @media not all and (min-width: 10rem) {
       .max-\\[10rem\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width < 12vh) {
+    @media not all and (min-width: 12vh) {
       .max-\\[12vh\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width < 10vh) {
+    @media not all and (min-width: 10vh) {
       .max-\\[10vh\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= calc(1000px + 12em)) {
+    @media (min-width: calc(1000px + 12em)) {
       .min-\\[calc\\(1000px\\+12em\\)\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= calc(50vh + 12em)) {
+    @media (min-width: calc(50vh + 12em)) {
       .min-\\[calc\\(50vh\\+12em\\)\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 10em) {
+    @media (min-width: 10em) {
       .min-\\[10em\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 12em) {
+    @media (min-width: 12em) {
       .min-\\[12em\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 10px) {
+    @media (min-width: 10px) {
       .min-\\[10px\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 12px) {
+    @media (min-width: 12px) {
       .min-\\[12px\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 10rem) {
+    @media (min-width: 10rem) {
       .min-\\[10rem\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 12rem) {
+    @media (min-width: 12rem) {
       .min-\\[12rem\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 10vh) {
+    @media (min-width: 10vh) {
       .min-\\[10vh\\]\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 12vh) {
+    @media (min-width: 12vh) {
       .min-\\[12vh\\]\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
+  `)
+})
+
+test('sorting `min` and `max` should compare decimal values numerically', async () => {
+  expect(
+    await run([
+      'min-[40.5rem]:flex',
+      'min-[40.25rem]:flex',
+      'max-[40.25rem]:flex',
+      'max-[40.5rem]:flex',
+    ]),
+  ).toMatchInlineSnapshot(`
+    "
+    @media not all and (min-width: 40.5rem) {
+      .max-\\[40\\.5rem\\]\\:flex {
+        display: flex;
+      }
+    }
+
+    @media not all and (min-width: 40.25rem) {
+      .max-\\[40\\.25rem\\]\\:flex {
+        display: flex;
+      }
+    }
+
+    @media (min-width: 40.25rem) {
+      .min-\\[40\\.25rem\\]\\:flex {
+        display: flex;
+      }
+    }
+
+    @media (min-width: 40.5rem) {
+      .min-\\[40\\.5rem\\]\\:flex {
+        display: flex;
+      }
+    }
+    "
+  `)
+})
+
+test('sorting `@min` and `@max` should compare decimal values numerically', async () => {
+  expect(
+    await run([
+      '@min-[40.5rem]:flex',
+      '@min-[40.25rem]:flex',
+      '@max-[40.25rem]:flex',
+      '@max-[40.5rem]:flex',
+    ]),
+  ).toMatchInlineSnapshot(`
+    "
+    @container not (min-width: 40.5rem) {
+      .\\@max-\\[40\\.5rem\\]\\:flex {
+        display: flex;
+      }
+    }
+
+    @container not (min-width: 40.25rem) {
+      .\\@max-\\[40\\.25rem\\]\\:flex {
+        display: flex;
+      }
+    }
+
+    @container (min-width: 40.25rem) {
+      .\\@min-\\[40\\.25rem\\]\\:flex {
+        display: flex;
+      }
+    }
+
+    @container (min-width: 40.5rem) {
+      .\\@min-\\[40\\.5rem\\]\\:flex {
+        display: flex;
+      }
+    }
+    "
   `)
 })
 
@@ -1306,20 +1522,44 @@ test('supports', async () => {
       'supports-[font-tech(color-COLRv1)]:flex',
       'supports-[var(--test)]:flex',
       'supports-[--test]:flex',
+
+      // Only top-level and/or/not should have spaces around them. We should
+      // ignore and/or/not inside of `selector(…)`
+      'supports-[selector(a:not(.foo))]:flex',
+      'supports-[selector(a:is(.and,.or))]:flex',
+      'supports-[(display:grid)or(display:flex)]:grid',
+      'supports-[not(display:grid)]:flex',
+      'supports-[foo-not(display:grid)]:flex',
+      'supports-[selector([data-foo="("])or(display:grid)]:flex',
+      'supports-[selector(.foo\\(bar)or(display:grid)]:flex',
+      'supports-[((display:grid)or(display:flex))]:grid',
     ]),
   ).toMatchInlineSnapshot(`
-    "@supports (gap: var(--tw)) {
+    "
+    @supports (gap: var(--tw)) {
       .supports-gap\\:grid {
         display: grid;
       }
     }
 
+    @supports (display: grid) or (display: flex) {
+      .supports-\\[\\(\\(display\\:grid\\)or\\(display\\:flex\\)\\)\\]\\:grid {
+        display: grid;
+      }
+    }
+
     @supports (display: grid) and font-format(opentype) {
       .supports-\\[\\(display\\:grid\\)_and_font-format\\(opentype\\)\\]\\:grid {
         display: grid;
       }
     }
 
+    @supports (display: grid) or (display: flex) {
+      .supports-\\[\\(display\\:grid\\)or\\(display\\:flex\\)\\]\\:grid {
+        display: grid;
+      }
+    }
+
     @supports (--test: var(--tw)) {
       .supports-\\[--test\\]\\:flex {
         display: flex;
@@ -1344,17 +1584,54 @@ test('supports', async () => {
       }
     }
 
+    @supports foo-not(display:grid) {
+      .supports-\\[foo-not\\(display\\:grid\\)\\]\\:flex {
+        display: flex;
+      }
+    }
+
+    @supports not (display: grid) {
+      .supports-\\[not\\(display\\:grid\\)\\]\\:flex {
+        display: flex;
+      }
+    }
+
+    @supports selector(.foo\\(bar) or (display: grid) {
+      .supports-\\[selector\\(\\.foo\\\\\\(bar\\)or\\(display\\:grid\\)\\]\\:flex {
+        display: flex;
+      }
+    }
+
     @supports selector(A > B) {
       .supports-\\[selector\\(A_\\>_B\\)\\]\\:flex {
         display: flex;
       }
     }
 
+    @supports selector([data-foo="("]) or (display: grid) {
+      .supports-\\[selector\\(\\[data-foo\\=\\"\\(\\"\\]\\)or\\(display\\:grid\\)\\]\\:flex {
+        display: flex;
+      }
+    }
+
+    @supports selector(a:is(.and,.or)) {
+      .supports-\\[selector\\(a\\:is\\(\\.and\\,\\.or\\)\\)\\]\\:flex {
+        display: flex;
+      }
+    }
+
+    @supports selector(a:not(.foo)) {
+      .supports-\\[selector\\(a\\:not\\(\\.foo\\)\\)\\]\\:flex {
+        display: flex;
+      }
+    }
+
     @supports var(--test) {
       .supports-\\[var\\(--test\\)\\]\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -1371,30 +1648,7 @@ test('supports', async () => {
 
 test('not', async () => {
   expect(
-    await compileCss(
-      css`
-        @variant hocus {
-          &:hover,
-          &:focus {
-            @slot;
-          }
-        }
-
-        @variant device-hocus {
-          @media (hover: hover) {
-            &:hover,
-            &:focus {
-              @slot;
-            }
-          }
-        }
-
-        @theme {
-          --breakpoint-sm: 640px;
-        }
-
-        @tailwind utilities;
-      `,
+    await run(
       [
         'not-[:checked]:flex',
         'not-[@media_print]:flex',
@@ -1468,6 +1722,7 @@ test('not', async () => {
         'not-contrast-less:flex',
         'not-forced-colors:flex',
         'not-nth-2:flex',
+        'not-noscript:flex',
 
         'not-sm:flex',
         'not-min-sm:flex',
@@ -1475,31 +1730,51 @@ test('not', async () => {
         'not-max-sm:flex',
         'not-max-[130px]:flex',
       ],
+      css`
+        @custom-variant hocus {
+          &:hover,
+          &:focus {
+            @slot;
+          }
+        }
+
+        @custom-variant device-hocus {
+          @media (hover: hover) {
+            &:hover,
+            &:focus {
+              @slot;
+            }
+          }
+        }
+
+        @theme {
+          --breakpoint-sm: 640px;
+        }
+
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 640px;
-    }
-
-    .not-first\\:flex:not(:first-child), .not-last\\:flex:not(:last-child), .not-only\\:flex:not(:only-child), .not-odd\\:flex:not(:nth-child(odd)), .not-even\\:flex:not(:nth-child(2n)), .not-first-of-type\\:flex:not(:first-of-type), .not-last-of-type\\:flex:not(:last-of-type), .not-only-of-type\\:flex:not(:only-of-type), .not-visited\\:flex:not(:visited), .not-target\\:flex:not(:target) {
+    "
+    .not-first\\:flex:not(:first-child), .not-last\\:flex:not(:last-child), .not-only\\:flex:not(:only-child), .not-odd\\:flex:not(:nth-child(odd)), .not-even\\:flex:not(:nth-child(2n)), .not-first-of-type\\:flex:not(:first-of-type), .not-last-of-type\\:flex:not(:last-of-type), .not-only-of-type\\:flex:not(:only-of-type), .not-visited\\:flex:not(:visited), .not-target\\:flex:not(:target), .not-open\\:flex:not(:is([open], :popover-open, :open)), .not-default\\:flex:not(:default), .not-checked\\:flex:not(:checked), .not-indeterminate\\:flex:not(:indeterminate), .not-placeholder-shown\\:flex:not(:placeholder-shown) {
       display: flex;
     }
 
-    .not-open\\:flex:not([open], :popover-open) {
+    .not-autofill\\:flex:not(:autofill) {
       display: flex;
     }
 
-    .not-default\\:flex:not(:default), .not-checked\\:flex:not(:checked), .not-indeterminate\\:flex:not(:indeterminate), .not-placeholder-shown\\:flex:not(:placeholder-shown), .not-autofill\\:flex:not(:autofill), .not-optional\\:flex:not(:optional), .not-required\\:flex:not(:required), .not-valid\\:flex:not(:valid), .not-invalid\\:flex:not(:invalid), .not-in-range\\:flex:not(:in-range), .not-out-of-range\\:flex:not(:out-of-range), .not-read-only\\:flex:not(:read-only), .not-empty\\:flex:not(:empty), .not-focus-within\\:flex:not(:focus-within), .not-hover\\:flex:not(:hover) {
+    .not-optional\\:flex:not(:optional), .not-required\\:flex:not(:required), .not-valid\\:flex:not(:valid), .not-invalid\\:flex:not(:invalid), .not-in-range\\:flex:not(:in-range), .not-out-of-range\\:flex:not(:out-of-range), .not-read-only\\:flex:not(:read-only), .not-empty\\:flex:not(:empty), .not-focus-within\\:flex:not(:focus-within), .not-hover\\:flex:not(:hover) {
       display: flex;
     }
 
-    @media not (hover: hover) {
+    @media not all and (hover: hover) {
       .not-hover\\:flex {
         display: flex;
       }
     }
 
-    .not-focus\\:flex:not(:focus), .not-focus-visible\\:flex:not(:focus-visible), .not-active\\:flex:not(:active), .not-enabled\\:flex:not(:enabled), .not-disabled\\:flex:not(:disabled), .not-inert\\:flex:not([inert], [inert] *), .not-has-checked\\:flex:not(:has(:checked)), .not-aria-selected\\:flex:not([aria-selected="true"]), .not-data-foo\\:flex:not([data-foo]), .not-nth-2\\:flex:not(:nth-child(2)) {
+    .not-focus\\:flex:not(:focus), .not-focus-visible\\:flex:not(:focus-visible), .not-active\\:flex:not(:active), .not-enabled\\:flex:not(:enabled), .not-disabled\\:flex:not(:disabled), .not-inert\\:flex:not(:is([inert], [inert] *)), .not-has-checked\\:flex:not(:has(:checked)), .not-aria-selected\\:flex:not([aria-selected="true"]), .not-data-foo\\:flex:not([data-foo]), .not-nth-2\\:flex:not(:nth-child(2)) {
       display: flex;
     }
 
@@ -1509,61 +1784,61 @@ test('not', async () => {
       }
     }
 
-    @media not (prefers-reduced-motion: no-preference) {
+    @media not all and (prefers-reduced-motion: no-preference) {
       .not-motion-safe\\:flex {
         display: flex;
       }
     }
 
-    @media not (prefers-reduced-motion: reduce) {
+    @media not all and (prefers-reduced-motion: reduce) {
       .not-motion-reduce\\:flex {
         display: flex;
       }
     }
 
-    @media not (prefers-contrast: more) {
+    @media not all and (prefers-contrast: more) {
       .not-contrast-more\\:flex {
         display: flex;
       }
     }
 
-    @media not (prefers-contrast: less) {
+    @media not all and (prefers-contrast: less) {
       .not-contrast-less\\:flex {
         display: flex;
       }
     }
 
-    @media not (width < 640px) {
+    @media (min-width: 640px) {
       .not-max-sm\\:flex {
         display: flex;
       }
     }
 
-    @media not (width < 130px) {
+    @media (min-width: 130px) {
       .not-max-\\[130px\\]\\:flex {
         display: flex;
       }
     }
 
-    @media not (width >= 130px) {
+    @media not all and (min-width: 130px) {
       .not-min-\\[130px\\]\\:flex {
         display: flex;
       }
     }
 
-    @media not (width >= 640px) {
+    @media not all and (min-width: 640px) {
       .not-min-sm\\:flex, .not-sm\\:flex {
         display: flex;
       }
     }
 
-    @media not (orientation: portrait) {
+    @media not all and (orientation: portrait) {
       .not-portrait\\:flex {
         display: flex;
       }
     }
 
-    @media not (orientation: landscape) {
+    @media not all and (orientation: landscape) {
       .not-landscape\\:flex {
         display: flex;
       }
@@ -1573,7 +1848,7 @@ test('not', async () => {
       display: flex;
     }
 
-    @media not (prefers-color-scheme: dark) {
+    @media not all and (prefers-color-scheme: dark) {
       .not-dark\\:flex {
         display: flex;
       }
@@ -1585,17 +1860,23 @@ test('not', async () => {
       }
     }
 
-    @media not (forced-colors: active) {
+    @media not all and (forced-colors: active) {
       .not-forced-colors\\:flex {
         display: flex;
       }
     }
 
+    @media not all and (scripting: none) {
+      .not-noscript\\:flex {
+        display: flex;
+      }
+    }
+
     .not-hocus\\:flex:not(:hover, :focus), .not-device-hocus\\:flex:not(:hover, :focus) {
       display: flex;
     }
 
-    @media not (hover: hover) {
+    @media not all and (hover: hover) {
       .not-device-hocus\\:flex {
         display: flex;
       }
@@ -1605,7 +1886,7 @@ test('not', async () => {
       display: flex;
     }
 
-    @media not (orientation: landscape) {
+    @media not all and (orientation: landscape) {
       .not-\\[\\@media_\\(orientation\\:landscape\\)\\]\\:flex {
         display: flex;
       }
@@ -1623,41 +1904,83 @@ test('not', async () => {
       }
     }
 
-    @media not (orientation: portrait) {
+    @media not all and (orientation: portrait) {
       .not-\\[\\@media\\(orientation\\:portrait\\)\\]\\:flex {
         display: flex;
       }
     }
 
-    .group-not-checked\\:flex:is(:where(.group):not(:checked) *), .group-not-hocus\\:flex:is(:where(.group):not(:hover, :focus) *), .group-not-hocus\\/parent-name\\:flex:is(:where(.group\\/parent-name):not(:hover, :focus) *), .group-not-\\[\\:checked\\]\\:flex:is(:where(.group):not(:checked) *), .group-not-\\[\\:checked\\]\\/parent-name\\:flex:is(:where(.group\\/parent-name):not(:checked) *), .peer-not-checked\\:flex:is(:where(.peer):not(:checked) ~ *), .peer-not-hocus\\:flex:is(:where(.peer):not(:hover, :focus) ~ *), .peer-not-hocus\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name):not(:hover, :focus) ~ *), .peer-not-\\[\\:checked\\]\\:flex:is(:where(.peer):not(:checked) ~ *), .peer-not-\\[\\:checked\\]\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name):not(:checked) ~ *) {
+    :is(:where(.group):not(:checked) .group-not-checked\\:flex), :is(:where(.group):not(:hover, :focus) .group-not-hocus\\:flex), :is(:where(.group\\/parent-name):not(:hover, :focus) .group-not-hocus\\/parent-name\\:flex), :is(:where(.group):not(:checked) .group-not-\\[\\:checked\\]\\:flex), :is(:where(.group\\/parent-name):not(:checked) .group-not-\\[\\:checked\\]\\/parent-name\\:flex), :is(:where(.peer):not(:checked) ~ .peer-not-checked\\:flex), :is(:where(.peer):not(:hover, :focus) ~ .peer-not-hocus\\:flex), :is(:where(.peer\\/sibling-name):not(:hover, :focus) ~ .peer-not-hocus\\/sibling-name\\:flex), :is(:where(.peer):not(:checked) ~ .peer-not-\\[\\:checked\\]\\:flex), :is(:where(.peer\\/sibling-name):not(:checked) ~ .peer-not-\\[\\:checked\\]\\/sibling-name\\:flex) {
       display: flex;
-    }"
+    }
+    "
   `)
 
+  // https://github.com/tailwindlabs/tailwindcss/issues/20058
   expect(
-    await compileCss(
+    await run(
+      ['not-has-a:flex', 'not-has-b:flex', 'not-has-c:flex', 'not-has-d:flex'],
       css`
-        @variant nested-at-rules {
-          @media foo {
-            @media bar {
-              @slot;
-            }
-          }
-        }
-        @variant multiple-media-conditions {
-          @media foo, bar {
+        @custom-variant has-a {
+          @container style(--a) {
             @slot;
           }
         }
-        @variant nested-style-rules {
-          &:hover {
-            &:focus {
-              @slot;
-            }
+
+        /* Already negated case */
+        @custom-variant has-b {
+          @container not style(--b) {
+            @slot;
           }
         }
+
+        /* Named @container */
+        @custom-variant has-c {
+          @container foo style(--c) {
+            @slot;
+          }
+        }
+
+        /* Named @container, that's already negated case */
+        @custom-variant has-d {
+          @container bar not style(--d) {
+            @slot;
+          }
+        }
+
         @tailwind utilities;
       `,
+    ),
+  ).toMatchInlineSnapshot(`
+    "
+    @container not style(--a) {
+      .not-has-a\\:flex {
+        display: flex;
+      }
+    }
+
+    @container style(--b) {
+      .not-has-b\\:flex {
+        display: flex;
+      }
+    }
+
+    @container foo not style(--c) {
+      .not-has-c\\:flex {
+        display: flex;
+      }
+    }
+
+    @container bar style(--d) {
+      .not-has-d\\:flex {
+        display: flex;
+      }
+    }
+    "
+  `)
+
+  expect(
+    await run(
       [
         'not-[>img]:flex',
         'not-[+img]:flex',
@@ -1672,27 +1995,77 @@ test('not', async () => {
         'not-multiple-media-conditions:flex',
         'not-starting:flex',
 
+        'not-parallel-style-rules:flex',
+        'not-parallel-at-rules:flex',
+        'not-parallel-mixed-rules:flex',
+
         // The following built-in variants don't have not-* versions because
         // there is no sensible negative version of them.
 
         // These just don't make sense as not-*
-        'not-force',
-        'not-*',
+        'not-force:flex',
+        'not-*:flex',
 
         // These contain pseudo-elements
-        'not-first-letter',
-        'not-first-line',
-        'not-marker',
-        'not-selection',
-        'not-file',
-        'not-placeholder',
-        'not-backdrop',
-        'not-before',
-        'not-after',
+        'not-first-letter:flex',
+        'not-first-line:flex',
+        'not-marker:flex',
+        'not-selection:flex',
+        'not-file:flex',
+        'not-placeholder:flex',
+        'not-backdrop:flex',
+        'not-before:flex',
+        'not-after:flex',
 
         // This is not a conditional at rule
         'not-starting:flex',
       ],
+      css`
+        @custom-variant nested-at-rules {
+          @media foo {
+            @media bar {
+              @slot;
+            }
+          }
+        }
+        @custom-variant multiple-media-conditions {
+          @media foo, bar {
+            @slot;
+          }
+        }
+        @custom-variant nested-style-rules {
+          &:hover {
+            &:focus {
+              @slot;
+            }
+          }
+        }
+        @custom-variant parallel-style-rules {
+          &:hover {
+            @slot;
+          }
+          &:focus {
+            @slot;
+          }
+        }
+        @custom-variant parallel-at-rules {
+          @media foo {
+            @slot;
+          }
+          @media bar {
+            @slot;
+          }
+        }
+        @custom-variant parallel-mixed-rules {
+          &:hover {
+            @slot;
+          }
+          @media bar {
+            @slot;
+          }
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toEqual('')
 })
@@ -1707,25 +2080,18 @@ test('in', async () => {
       'in-data-visible:flex',
     ]),
   ).toMatchInlineSnapshot(`
-    ".not-in-\\[\\.group\\]\\:flex:not(:where(.group) *), .not-in-\\[p\\]\\:flex:not(:where(:is(p)) *), :where([data-visible]) .in-data-visible\\:flex, :where(.group) .in-\\[\\.group\\]\\:flex, :where(:is(p)) .in-\\[p\\]\\:flex {
+    "
+    .not-in-\\[\\.group\\]\\:flex:not(:where(.group) *), .not-in-\\[p\\]\\:flex:not(:where(:is(p)) *), :where([data-visible]) .in-data-visible\\:flex, :where(.group) .in-\\[\\.group\\]\\:flex, :where(:is(p)) .in-\\[p\\]\\:flex {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['in-p:flex', 'in-foo-bar:flex'])).toEqual('')
 })
 
 test('has', async () => {
   expect(
-    await compileCss(
-      css`
-        @variant hocus {
-          &:hover,
-          &:focus {
-            @slot;
-          }
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         'has-checked:flex',
         'has-[:checked]:flex',
@@ -1761,18 +2127,35 @@ test('has', async () => {
         'peer-has-hocus:flex',
         'peer-has-hocus/sibling-name:flex',
       ],
+      css`
+        @custom-variant hocus {
+          &:hover,
+          &:focus {
+            @slot;
+          }
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ".group-has-checked\\:flex:is(:where(.group):has(:checked) *), .group-has-checked\\/parent-name\\:flex:is(:where(.group\\/parent-name):has(:checked) *), .group-has-hocus\\:flex:is(:where(.group):has(:hover, :focus) *), .group-has-hocus\\/parent-name\\:flex:is(:where(.group\\/parent-name):has(:hover, :focus) *), .group-has-\\[\\:checked\\]\\:flex:is(:where(.group):has(:checked) *), .group-has-\\[\\:checked\\]\\/parent-name\\:flex:is(:where(.group\\/parent-name):has(:checked) *), .group-has-\\[\\&\\>img\\]\\:flex:is(:where(.group):has(* > img) *), .group-has-\\[\\&\\>img\\]\\/parent-name\\:flex:is(:where(.group\\/parent-name):has(* > img) *), .group-has-\\[\\+img\\]\\:flex:is(:where(.group):has( + img) *), .group-has-\\[\\>img\\]\\:flex:is(:where(.group):has( > img) *), .group-has-\\[\\>img\\]\\/parent-name\\:flex:is(:where(.group\\/parent-name):has( > img) *), .group-has-\\[\\~img\\]\\:flex:is(:where(.group):has( ~ img) *), .peer-has-checked\\:flex:is(:where(.peer):has(:checked) ~ *), .peer-has-checked\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name):has(:checked) ~ *), .peer-has-hocus\\:flex:is(:where(.peer):has(:hover, :focus) ~ *), .peer-has-hocus\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name):has(:hover, :focus) ~ *), .peer-has-\\[\\:checked\\]\\:flex:is(:where(.peer):has(:checked) ~ *), .peer-has-\\[\\:checked\\]\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name):has(:checked) ~ *), .peer-has-\\[\\&\\>img\\]\\:flex:is(:where(.peer):has(* > img) ~ *), .peer-has-\\[\\&\\>img\\]\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name):has(* > img) ~ *), .peer-has-\\[\\+img\\]\\:flex:is(:where(.peer):has( + img) ~ *), .peer-has-\\[\\>img\\]\\:flex:is(:where(.peer):has( > img) ~ *), .peer-has-\\[\\>img\\]\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name):has( > img) ~ *), .peer-has-\\[\\~img\\]\\:flex:is(:where(.peer):has( ~ img) ~ *), .has-checked\\:flex:has(:checked), .has-hocus\\:flex:has(:hover, :focus), .has-\\[\\:checked\\]\\:flex:has(:checked), .has-\\[\\&\\>img\\]\\:flex:has(* > img), .has-\\[\\+img\\]\\:flex:has( + img), .has-\\[\\>img\\]\\:flex:has( > img), .has-\\[\\~img\\]\\:flex:has( ~ img) {
+    "
+    :is(:where(.group):has(:checked) .group-has-checked\\:flex), :is(:where(.group\\/parent-name):has(:checked) .group-has-checked\\/parent-name\\:flex), :is(:where(.group):has(:hover, :focus) .group-has-hocus\\:flex), :is(:where(.group\\/parent-name):has(:hover, :focus) .group-has-hocus\\/parent-name\\:flex), :is(:where(.group):has(:checked) .group-has-\\[\\:checked\\]\\:flex), :is(:where(.group\\/parent-name):has(:checked) .group-has-\\[\\:checked\\]\\/parent-name\\:flex), :is(:where(.group):has(* > img) .group-has-\\[\\&\\>img\\]\\:flex), :is(:where(.group\\/parent-name):has(* > img) .group-has-\\[\\&\\>img\\]\\/parent-name\\:flex), :is(:where(.group):has( + img) .group-has-\\[\\+img\\]\\:flex), :is(:where(.group):has( > img) .group-has-\\[\\>img\\]\\:flex), :is(:where(.group\\/parent-name):has( > img) .group-has-\\[\\>img\\]\\/parent-name\\:flex), :is(:where(.group):has( ~ img) .group-has-\\[\\~img\\]\\:flex), :is(:where(.peer):has(:checked) ~ .peer-has-checked\\:flex), :is(:where(.peer\\/sibling-name):has(:checked) ~ .peer-has-checked\\/sibling-name\\:flex), :is(:where(.peer):has(:hover, :focus) ~ .peer-has-hocus\\:flex), :is(:where(.peer\\/sibling-name):has(:hover, :focus) ~ .peer-has-hocus\\/sibling-name\\:flex), :is(:where(.peer):has(:checked) ~ .peer-has-\\[\\:checked\\]\\:flex), :is(:where(.peer\\/sibling-name):has(:checked) ~ .peer-has-\\[\\:checked\\]\\/sibling-name\\:flex), :is(:where(.peer):has(* > img) ~ .peer-has-\\[\\&\\>img\\]\\:flex), :is(:where(.peer\\/sibling-name):has(* > img) ~ .peer-has-\\[\\&\\>img\\]\\/sibling-name\\:flex), :is(:where(.peer):has( + img) ~ .peer-has-\\[\\+img\\]\\:flex), :is(:where(.peer):has( > img) ~ .peer-has-\\[\\>img\\]\\:flex), :is(:where(.peer\\/sibling-name):has( > img) ~ .peer-has-\\[\\>img\\]\\/sibling-name\\:flex), :is(:where(.peer):has( ~ img) ~ .peer-has-\\[\\~img\\]\\:flex), .has-checked\\:flex:has(:checked), .has-hocus\\:flex:has(:hover, :focus), .has-\\[\\:checked\\]\\:flex:has(:checked), .has-\\[\\&\\>img\\]\\:flex:has(* > img), .has-\\[\\+img\\]\\:flex:has( + img), .has-\\[\\>img\\]\\:flex:has( > img), .has-\\[\\~img\\]\\:flex:has( ~ img) {
       display: flex;
-    }"
+    }
+    "
   `)
 
   expect(
-    await compileCss(
+    await run(
+      [
+        'has-[:checked]/foo:flex',
+        'has-[@media_print]:flex',
+        'has-custom-at-rule:flex',
+        'has-nested-selectors:flex',
+      ],
       css`
-        @variant custom-at-rule (@media foo);
-        @variant nested-selectors {
+        @custom-variant custom-at-rule (@media foo);
+        @custom-variant nested-selectors {
           &:hover {
             &:focus {
               @slot;
@@ -1781,12 +2164,6 @@ test('has', async () => {
         }
         @tailwind utilities;
       `,
-      [
-        'has-[:checked]/foo:flex',
-        'has-[@media_print]:flex',
-        'has-custom-at-rule:flex',
-        'has-nested-selectors:flex',
-      ],
     ),
   ).toEqual('')
 })
@@ -1814,9 +2191,11 @@ test('aria', async () => {
       'peer-aria-[valuenow=1]/sibling-name:flex',
     ]),
   ).toMatchInlineSnapshot(`
-    ".group-aria-checked\\:flex:is(:where(.group)[aria-checked="true"] *), .group-aria-checked\\/parent-name\\:flex:is(:where(.group\\/parent-name)[aria-checked="true"] *), .group-aria-\\[modal\\]\\:flex:is(:where(.group)[aria-modal] *), .group-aria-\\[modal\\]\\/parent-name\\:flex:is(:where(.group\\/parent-name)[aria-modal] *), .group-aria-\\[valuenow\\=1\\]\\:flex:is(:where(.group)[aria-valuenow="1"] *), .group-aria-\\[valuenow\\=1\\]\\/parent-name\\:flex:is(:where(.group\\/parent-name)[aria-valuenow="1"] *), .peer-aria-checked\\:flex:is(:where(.peer)[aria-checked="true"] ~ *), .peer-aria-checked\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name)[aria-checked="true"] ~ *), .peer-aria-\\[modal\\]\\:flex:is(:where(.peer)[aria-modal] ~ *), .peer-aria-\\[modal\\]\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name)[aria-modal] ~ *), .peer-aria-\\[valuenow\\=1\\]\\:flex:is(:where(.peer)[aria-valuenow="1"] ~ *), .peer-aria-\\[valuenow\\=1\\]\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name)[aria-valuenow="1"] ~ *), .aria-checked\\:flex[aria-checked="true"], .aria-\\[invalid\\=spelling\\]\\:flex[aria-invalid="spelling"], .aria-\\[valuenow_\\=_\\"1\\"\\]\\:flex[aria-valuenow="1"], .aria-\\[valuenow\\=1\\]\\:flex[aria-valuenow="1"] {
+    "
+    :is(:where(.group)[aria-checked="true"] .group-aria-checked\\:flex), :is(:where(.group\\/parent-name)[aria-checked="true"] .group-aria-checked\\/parent-name\\:flex), :is(:where(.group)[aria-modal] .group-aria-\\[modal\\]\\:flex), :is(:where(.group\\/parent-name)[aria-modal] .group-aria-\\[modal\\]\\/parent-name\\:flex), :is(:where(.group)[aria-valuenow="1"] .group-aria-\\[valuenow\\=1\\]\\:flex), :is(:where(.group\\/parent-name)[aria-valuenow="1"] .group-aria-\\[valuenow\\=1\\]\\/parent-name\\:flex), :is(:where(.peer)[aria-checked="true"] ~ .peer-aria-checked\\:flex), :is(:where(.peer\\/sibling-name)[aria-checked="true"] ~ .peer-aria-checked\\/sibling-name\\:flex), :is(:where(.peer)[aria-modal] ~ .peer-aria-\\[modal\\]\\:flex), :is(:where(.peer\\/sibling-name)[aria-modal] ~ .peer-aria-\\[modal\\]\\/sibling-name\\:flex), :is(:where(.peer)[aria-valuenow="1"] ~ .peer-aria-\\[valuenow\\=1\\]\\:flex), :is(:where(.peer\\/sibling-name)[aria-valuenow="1"] ~ .peer-aria-\\[valuenow\\=1\\]\\/sibling-name\\:flex), .aria-checked\\:flex[aria-checked="true"], .aria-\\[invalid\\=spelling\\]\\:flex[aria-invalid="spelling"], .aria-\\[valuenow_\\=_\\"1\\"\\]\\:flex[aria-valuenow="1"], .aria-\\[valuenow\\=1\\]\\:flex[aria-valuenow="1"] {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(await run(['aria-checked/foo:flex', 'aria-[invalid=spelling]/foo:flex'])).toEqual('')
 })
@@ -1851,9 +2230,11 @@ test('data', async () => {
       'peer-data-[foo$=bar_baz_i]/sibling-name:flex',
     ]),
   ).toMatchInlineSnapshot(`
-    ".group-data-\\[disabled\\]\\:flex:is(:where(.group)[data-disabled] *), .group-data-\\[disabled\\]\\/parent-name\\:flex:is(:where(.group\\/parent-name)[data-disabled] *), .group-data-\\[foo\\$\\=\\'bar\\'_i\\]\\/parent-name\\:flex:is(:where(.group\\/parent-name)[data-foo$="bar" i] *), .group-data-\\[foo\\$\\=bar_baz_i\\]\\/parent-name\\:flex:is(:where(.group\\/parent-name)[data-foo$="bar baz" i] *), .group-data-\\[foo\\=1\\]\\:flex:is(:where(.group)[data-foo="1"] *), .group-data-\\[foo\\=1\\]\\/parent-name\\:flex:is(:where(.group\\/parent-name)[data-foo="1"] *), .group-data-\\[foo\\=bar\\ baz\\]\\/parent-name\\:flex:is(:where(.group\\/parent-name)[data-foo="bar baz"] *), .peer-data-\\[disabled\\]\\:flex:is(:where(.peer)[data-disabled] ~ *), .peer-data-\\[disabled\\]\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name)[data-disabled] ~ *), .peer-data-\\[foo\\$\\=\\'bar\\'_i\\]\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name)[data-foo$="bar" i] ~ *), .peer-data-\\[foo\\$\\=bar_baz_i\\]\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name)[data-foo$="bar baz" i] ~ *), .peer-data-\\[foo\\=1\\]\\:flex:is(:where(.peer)[data-foo="1"] ~ *), .peer-data-\\[foo\\=1\\]\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name)[data-foo="1"] ~ *), .peer-data-\\[foo\\=bar\\ baz\\]\\/sibling-name\\:flex:is(:where(.peer\\/sibling-name)[data-foo="bar baz"] ~ *), .data-disabled\\:flex[data-disabled], .data-\\[foo\\$\\=\\'bar\\'_i\\]\\:flex[data-foo$="bar" i], .data-\\[foo\\$\\=bar_baz_i\\]\\:flex[data-foo$="bar baz" i], .data-\\[foo\\=1\\]\\:flex[data-foo="1"], .data-\\[foo\\=bar_baz\\]\\:flex[data-foo="bar baz"], .data-\\[potato_\\=_\\"salad\\"\\]\\:flex[data-potato="salad"], .data-\\[potato_\\^\\=_\\"salad\\"\\]\\:flex[data-potato^="salad"], .data-\\[potato\\=\\"\\^_\\=\\"\\]\\:flex[data-potato="^ ="], .data-\\[potato\\=salad\\]\\:flex[data-potato="salad"] {
+    "
+    :is(:where(.group)[data-disabled] .group-data-\\[disabled\\]\\:flex), :is(:where(.group\\/parent-name)[data-disabled] .group-data-\\[disabled\\]\\/parent-name\\:flex), :is(:where(.group\\/parent-name)[data-foo$="bar" i] .group-data-\\[foo\\$\\=\\'bar\\'_i\\]\\/parent-name\\:flex), :is(:where(.group\\/parent-name)[data-foo$="bar baz" i] .group-data-\\[foo\\$\\=bar_baz_i\\]\\/parent-name\\:flex), :is(:where(.group)[data-foo="1"] .group-data-\\[foo\\=1\\]\\:flex), :is(:where(.group\\/parent-name)[data-foo="1"] .group-data-\\[foo\\=1\\]\\/parent-name\\:flex), :is(:where(.group\\/parent-name)[data-foo="bar baz"] .group-data-\\[foo\\=bar\\ baz\\]\\/parent-name\\:flex), :is(:where(.peer)[data-disabled] ~ .peer-data-\\[disabled\\]\\:flex), :is(:where(.peer\\/sibling-name)[data-disabled] ~ .peer-data-\\[disabled\\]\\/sibling-name\\:flex), :is(:where(.peer\\/sibling-name)[data-foo$="bar" i] ~ .peer-data-\\[foo\\$\\=\\'bar\\'_i\\]\\/sibling-name\\:flex), :is(:where(.peer\\/sibling-name)[data-foo$="bar baz" i] ~ .peer-data-\\[foo\\$\\=bar_baz_i\\]\\/sibling-name\\:flex), :is(:where(.peer)[data-foo="1"] ~ .peer-data-\\[foo\\=1\\]\\:flex), :is(:where(.peer\\/sibling-name)[data-foo="1"] ~ .peer-data-\\[foo\\=1\\]\\/sibling-name\\:flex), :is(:where(.peer\\/sibling-name)[data-foo="bar baz"] ~ .peer-data-\\[foo\\=bar\\ baz\\]\\/sibling-name\\:flex), .data-disabled\\:flex[data-disabled], .data-\\[foo\\$\\=\\'bar\\'_i\\]\\:flex[data-foo$="bar" i], .data-\\[foo\\$\\=bar_baz_i\\]\\:flex[data-foo$="bar baz" i], .data-\\[foo\\=1\\]\\:flex[data-foo="1"], .data-\\[foo\\=bar_baz\\]\\:flex[data-foo="bar baz"], .data-\\[potato_\\=_\\"salad\\"\\]\\:flex[data-potato="salad"], .data-\\[potato_\\^\\=_\\"salad\\"\\]\\:flex[data-potato^="salad"], .data-\\[potato\\=\\"\\^_\\=\\"\\]\\:flex[data-potato="^ ="], .data-\\[potato\\=salad\\]\\:flex[data-potato="salad"] {
       display: flex;
-    }"
+    }
+    "
   `)
   expect(
     await run([
@@ -1863,63 +2244,178 @@ test('data', async () => {
       'data-[potato=salad]/foo:flex',
     ]),
   ).toEqual('')
+
+  // Non-ASCII code points are valid in attribute names
+  expect(await run(['data-[état]:flex', 'aria-[état]:flex'])).toMatchInlineSnapshot(`
+    "
+    .aria-\\[état\\]\\:flex[aria-état], .data-\\[état\\]\\:flex[data-état] {
+      display: flex;
+    }
+    "
+  `)
 })
 
 test('portrait', async () => {
   expect(await run(['portrait:flex'])).toMatchInlineSnapshot(`
-    "@media (orientation: portrait) {
+    "
+    @media (orientation: portrait) {
       .portrait\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
   expect(await run(['portrait/foo:flex'])).toEqual('')
 })
 
 test('landscape', async () => {
   expect(await run(['landscape:flex'])).toMatchInlineSnapshot(`
-    "@media (orientation: landscape) {
+    "
+    @media (orientation: landscape) {
       .landscape\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
   expect(await run(['landscape/foo:flex'])).toEqual('')
 })
 
 test('contrast-more', async () => {
   expect(await run(['contrast-more:flex'])).toMatchInlineSnapshot(`
-    "@media (prefers-contrast: more) {
+    "
+    @media (prefers-contrast: more) {
       .contrast-more\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
   expect(await run(['contrast-more/foo:flex'])).toEqual('')
 })
 
 test('contrast-less', async () => {
   expect(await run(['contrast-less:flex'])).toMatchInlineSnapshot(`
-    "@media (prefers-contrast: less) {
+    "
+    @media (prefers-contrast: less) {
       .contrast-less\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
   expect(await run(['contrast-less/foo:flex'])).toEqual('')
 })
 
 test('forced-colors', async () => {
   expect(await run(['forced-colors:flex'])).toMatchInlineSnapshot(`
-    "@media (forced-colors: active) {
+    "
+    @media (forced-colors: active) {
       .forced-colors\\:flex {
         display: flex;
       }
-    }"
+    }
+    "
   `)
   expect(await run(['forced-colors/foo:flex'])).toEqual('')
 })
 
+test('inverted-colors', async () => {
+  expect(await run(['inverted-colors:flex'])).toMatchInlineSnapshot(`
+    "
+    @media (inverted-colors: inverted) {
+      .inverted-colors\\:flex {
+        display: flex;
+      }
+    }
+    "
+  `)
+})
+
+test('pointer-none', async () => {
+  expect(await run(['pointer-none:flex'])).toMatchInlineSnapshot(`
+    "
+    @media (pointer: none) {
+      .pointer-none\\:flex {
+        display: flex;
+      }
+    }
+    "
+  `)
+})
+
+test('pointer-coarse', async () => {
+  expect(await run(['pointer-coarse:flex'])).toMatchInlineSnapshot(`
+    "
+    @media (pointer: coarse) {
+      .pointer-coarse\\:flex {
+        display: flex;
+      }
+    }
+    "
+  `)
+})
+
+test('pointer-fine', async () => {
+  expect(await run(['pointer-fine:flex'])).toMatchInlineSnapshot(`
+    "
+    @media (pointer: fine) {
+      .pointer-fine\\:flex {
+        display: flex;
+      }
+    }
+    "
+  `)
+})
+
+test('any-pointer-none', async () => {
+  expect(await run(['any-pointer-none:flex'])).toMatchInlineSnapshot(`
+    "
+    @media (any-pointer: none) {
+      .any-pointer-none\\:flex {
+        display: flex;
+      }
+    }
+    "
+  `)
+})
+
+test('any-pointer-coarse', async () => {
+  expect(await run(['any-pointer-coarse:flex'])).toMatchInlineSnapshot(`
+    "
+    @media (any-pointer: coarse) {
+      .any-pointer-coarse\\:flex {
+        display: flex;
+      }
+    }
+    "
+  `)
+})
+
+test('any-pointer-fine', async () => {
+  expect(await run(['any-pointer-fine:flex'])).toMatchInlineSnapshot(`
+    "
+    @media (any-pointer: fine) {
+      .any-pointer-fine\\:flex {
+        display: flex;
+      }
+    }
+    "
+  `)
+})
+
+test('scripting-none', async () => {
+  expect(await run(['noscript:flex'])).toMatchInlineSnapshot(`
+    "
+    @media (scripting: none) {
+      .noscript\\:flex {
+        display: flex;
+      }
+    }
+    "
+  `)
+})
+
 test('nth', async () => {
   expect(
     await run([
@@ -1935,9 +2431,11 @@ test('nth', async () => {
       'nth-last-of-type-[2n+1]:flex',
     ]),
   ).toMatchInlineSnapshot(`
-    ".nth-3\\:flex:nth-child(3), .nth-\\[2n\\+1\\]\\:flex:nth-child(odd), .nth-\\[2n\\+1_of_\\.foo\\]\\:flex:nth-child(odd of .foo), .nth-last-3\\:flex:nth-last-child(3), .nth-last-\\[2n\\+1\\]\\:flex:nth-last-child(odd), .nth-last-\\[2n\\+1_of_\\.foo\\]\\:flex:nth-last-child(odd of .foo), .nth-of-type-3\\:flex:nth-of-type(3), .nth-of-type-\\[2n\\+1\\]\\:flex:nth-of-type(odd), .nth-last-of-type-3\\:flex:nth-last-of-type(3), .nth-last-of-type-\\[2n\\+1\\]\\:flex:nth-last-of-type(odd) {
+    "
+    .nth-3\\:flex:nth-child(3), .nth-\\[2n\\+1\\]\\:flex:nth-child(odd), .nth-\\[2n\\+1_of_\\.foo\\]\\:flex:nth-child(odd of .foo), .nth-last-3\\:flex:nth-last-child(3), .nth-last-\\[2n\\+1\\]\\:flex:nth-last-child(odd), .nth-last-\\[2n\\+1_of_\\.foo\\]\\:flex:nth-last-child(odd of .foo), .nth-of-type-3\\:flex:nth-of-type(3), .nth-of-type-\\[2n\\+1\\]\\:flex:nth-of-type(odd), .nth-last-of-type-3\\:flex:nth-last-of-type(3), .nth-last-of-type-\\[2n\\+1\\]\\:flex:nth-last-of-type(odd) {
       display: flex;
-    }"
+    }
+    "
   `)
 
   expect(
@@ -1969,111 +2467,171 @@ test('nth', async () => {
 })
 
 test('container queries', async () => {
+  let input = css`
+    @theme {
+      --container-lg: 1024px;
+      --container-foo-bar: 1440px;
+    }
+    @tailwind utilities;
+  `
+
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --container-lg: 1024px;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         '@lg:flex',
         '@lg/name:flex',
         '@[123px]:flex',
         '@[456px]/name:flex',
+        '@foo-bar:flex',
+        '@foo-bar/name:flex',
 
         '@min-lg:flex',
         '@min-lg/name:flex',
         '@min-[123px]:flex',
         '@min-[456px]/name:flex',
+        '@min-foo-bar:flex',
+        '@min-foo-bar/name:flex',
 
         '@max-lg:flex',
         '@max-lg/name:flex',
         '@max-[123px]:flex',
         '@max-[456px]/name:flex',
+        '@max-foo-bar:flex',
+        '@max-foo-bar/name:flex',
       ],
+      input,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --container-lg: 1024px;
+    "
+    @container name not (min-width: 1440px) {
+      .\\@max-foo-bar\\/name\\:flex {
+        display: flex;
+      }
     }
 
-    @container name (width < 1024px) {
+    @container not (min-width: 1440px) {
+      .\\@max-foo-bar\\:flex {
+        display: flex;
+      }
+    }
+
+    @container name not (min-width: 1024px) {
       .\\@max-lg\\/name\\:flex {
         display: flex;
       }
     }
 
-    @container (width < 1024px) {
+    @container not (min-width: 1024px) {
       .\\@max-lg\\:flex {
         display: flex;
       }
     }
 
-    @container name (width < 456px) {
+    @container name not (min-width: 456px) {
       .\\@max-\\[456px\\]\\/name\\:flex {
         display: flex;
       }
     }
 
-    @container (width < 123px) {
+    @container not (min-width: 123px) {
       .\\@max-\\[123px\\]\\:flex {
         display: flex;
       }
     }
 
-    @container (width >= 123px) {
+    @container (min-width: 123px) {
       .\\@\\[123px\\]\\:flex, .\\@min-\\[123px\\]\\:flex {
         display: flex;
       }
     }
 
-    @container name (width >= 456px) {
+    @container name (min-width: 456px) {
       .\\@\\[456px\\]\\/name\\:flex, .\\@min-\\[456px\\]\\/name\\:flex {
         display: flex;
       }
     }
 
-    @container name (width >= 1024px) {
+    @container name (min-width: 1024px) {
       .\\@lg\\/name\\:flex {
         display: flex;
       }
     }
 
-    @container (width >= 1024px) {
+    @container (min-width: 1024px) {
       .\\@lg\\:flex {
         display: flex;
       }
     }
 
-    @container name (width >= 1024px) {
+    @container name (min-width: 1024px) {
       .\\@min-lg\\/name\\:flex {
         display: flex;
       }
     }
 
-    @container (width >= 1024px) {
+    @container (min-width: 1024px) {
       .\\@min-lg\\:flex {
         display: flex;
       }
-    }"
+    }
+
+    @container name (min-width: 1440px) {
+      .\\@foo-bar\\/name\\:flex {
+        display: flex;
+      }
+    }
+
+    @container (min-width: 1440px) {
+      .\\@foo-bar\\:flex {
+        display: flex;
+      }
+    }
+
+    @container name (min-width: 1440px) {
+      .\\@min-foo-bar\\/name\\:flex {
+        display: flex;
+      }
+    }
+
+    @container (min-width: 1440px) {
+      .\\@min-foo-bar\\:flex {
+        display: flex;
+      }
+    }
+    "
   `)
+  expect(
+    await run(
+      [
+        '@-lg:flex',
+        '@-lg/name:flex',
+        '@-[123px]:flex',
+        '@-[456px]/name:flex',
+        '@-foo-bar:flex',
+        '@-foo-bar/name:flex',
+
+        '@-min-lg:flex',
+        '@-min-lg/name:flex',
+        '@-min-[123px]:flex',
+        '@-min-[456px]/name:flex',
+        '@-min-foo-bar:flex',
+        '@-min-foo-bar/name:flex',
+
+        '@-max-lg:flex',
+        '@-max-lg/name:flex',
+        '@-max-[123px]:flex',
+        '@-max-[456px]/name:flex',
+        '@-max-foo-bar:flex',
+        '@-max-foo-bar/name:flex',
+      ],
+      input,
+    ),
+  ).toEqual('')
 })
 
 test('variant order', async () => {
   expect(
-    await compileCss(
-      css`
-        @theme {
-          --breakpoint-sm: 640px;
-          --breakpoint-md: 768px;
-          --breakpoint-lg: 1024px;
-          --breakpoint-xl: 1280px;
-          --breakpoint-2xl: 1536px;
-        }
-        @tailwind utilities;
-      `,
+    await run(
       [
         '[&_p]:flex',
         '2xl:flex',
@@ -2099,6 +2657,7 @@ test('variant order', async () => {
         'data-custom:flex',
         'data-[custom=true]:flex',
         'default:flex',
+        'details-content:flex',
         'disabled:flex',
         'empty:flex',
         'enabled:flex',
@@ -2149,23 +2708,50 @@ test('variant order', async () => {
         'visited:flex',
         'xl:flex',
       ],
+      css`
+        @theme {
+          --breakpoint-sm: 640px;
+          --breakpoint-md: 768px;
+          --breakpoint-lg: 1024px;
+          --breakpoint-xl: 1280px;
+          --breakpoint-2xl: 1536px;
+        }
+        @tailwind utilities;
+      `,
     ),
   ).toMatchInlineSnapshot(`
-    ":root {
-      --breakpoint-sm: 640px;
-      --breakpoint-md: 768px;
-      --breakpoint-lg: 1024px;
-      --breakpoint-xl: 1280px;
-      --breakpoint-2xl: 1536px;
+    "
+    @layer properties {
+      @supports (((-webkit-hyphens: none)) and (not (margin-trim: inline))) or ((-moz-orient: inline) and (not (color: rgb(from red r g b)))) {
+        *, :before, :after, ::backdrop {
+          --tw-content: "";
+        }
+      }
     }
 
     @media (hover: hover) {
-      .group-hover\\:flex:is(:where(.group):hover *), .peer-hover\\:flex:is(:where(.peer):hover ~ *) {
+      :is(:where(.group):hover .group-hover\\:flex), :is(:where(.peer):hover ~ .peer-hover\\:flex) {
         display: flex;
       }
     }
 
-    .first-letter\\:flex:first-letter, .first-line\\:flex:first-line, .marker\\:flex ::marker, .marker\\:flex::marker {
+    .first-letter\\:flex:first-letter, .first-line\\:flex:first-line {
+      display: flex;
+    }
+
+    .marker\\:flex ::marker {
+      display: flex;
+    }
+
+    .marker\\:flex::marker {
+      display: flex;
+    }
+
+    .marker\\:flex ::-webkit-details-marker {
+      display: flex;
+    }
+
+    .marker\\:flex::-webkit-details-marker {
       display: flex;
     }
 
@@ -2185,12 +2771,24 @@ test('variant order', async () => {
       display: flex;
     }
 
+    .details-content\\:flex::details-content {
+      display: flex;
+    }
+
     .before\\:flex:before, .after\\:flex:after {
       content: var(--tw-content);
       display: flex;
     }
 
-    .first\\:flex:first-child, .last\\:flex:last-child, .only\\:flex:only-child, .odd\\:flex:nth-child(odd), .even\\:flex:nth-child(2n), .first-of-type\\:flex:first-of-type, .last-of-type\\:flex:last-of-type, .only-of-type\\:flex:only-of-type, .visited\\:flex:visited, .target\\:flex:target, .open\\:flex:is([open], :popover-open), .default\\:flex:default, .checked\\:flex:checked, .indeterminate\\:flex:indeterminate, .placeholder-shown\\:flex:placeholder-shown, .autofill\\:flex:autofill, .optional\\:flex:optional, .required\\:flex:required, .valid\\:flex:valid, .invalid\\:flex:invalid, .in-range\\:flex:in-range, .out-of-range\\:flex:out-of-range, .read-only\\:flex:read-only, .empty\\:flex:empty, .focus-within\\:flex:focus-within {
+    .first\\:flex:first-child, .last\\:flex:last-child, .only\\:flex:only-child, .odd\\:flex:nth-child(odd), .even\\:flex:nth-child(2n), .first-of-type\\:flex:first-of-type, .last-of-type\\:flex:last-of-type, .only-of-type\\:flex:only-of-type, .visited\\:flex:visited, .target\\:flex:target, .open\\:flex:is([open], :popover-open, :open), .default\\:flex:default, .checked\\:flex:checked, .indeterminate\\:flex:indeterminate, .placeholder-shown\\:flex:placeholder-shown {
+      display: flex;
+    }
+
+    .autofill\\:flex:autofill {
+      display: flex;
+    }
+
+    .optional\\:flex:optional, .required\\:flex:required, .valid\\:flex:valid, .invalid\\:flex:invalid, .in-range\\:flex:in-range, .out-of-range\\:flex:out-of-range, .read-only\\:flex:read-only, .empty\\:flex:empty, .focus-within\\:flex:focus-within {
       display: flex;
     }
 
@@ -2234,31 +2832,31 @@ test('variant order', async () => {
       }
     }
 
-    @media (width >= 640px) {
+    @media (min-width: 640px) {
       .sm\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 768px) {
+    @media (min-width: 768px) {
       .md\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 1024px) {
+    @media (min-width: 1024px) {
       .lg\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 1280px) {
+    @media (min-width: 1280px) {
       .xl\\:flex {
         display: flex;
       }
     }
 
-    @media (width >= 1536px) {
+    @media (min-width: 1536px) {
       .\\32 xl\\:flex {
         display: flex;
       }
@@ -2302,19 +2900,12 @@ test('variant order', async () => {
       display: flex;
     }
 
-    @supports (-moz-orient: inline) {
-      @layer base {
-        *, :before, :after, ::backdrop {
-          --tw-content: "";
-        }
-      }
-    }
-
     @property --tw-content {
       syntax: "*";
       inherits: false;
       initial-value: "";
-    }"
+    }
+    "
   `)
 })
 
@@ -2340,15 +2931,13 @@ test('variants with the same root are sorted deterministically', async () => {
   ])
 
   for (let classList of classLists) {
-    let output = await compileCss('@tailwind utilities;', classList)
-
-    expect(output.trim()).toEqual(
-      dedent(`
-        .data-active\\:flex[data-active], .data-focus\\:flex[data-focus], .data-hover\\:flex[data-hover], .data-\\[bar\\]\\:flex[data-bar], .data-\\[baz\\]\\:flex[data-baz], .data-\\[foo\\]\\:flex[data-foo] {
-          display: flex;
-        }
-      `),
-    )
+    expect(await run(classList)).toMatchInlineSnapshot(`
+      "
+      .data-active\\:flex[data-active], .data-focus\\:flex[data-focus], .data-hover\\:flex[data-hover], .data-\\[bar\\]\\:flex[data-bar], .data-\\[baz\\]\\:flex[data-baz], .data-\\[foo\\]\\:flex[data-foo] {
+        display: flex;
+      }
+      "
+    `)
   }
 })
 
@@ -2373,33 +2962,54 @@ test('matchVariant sorts deterministically', async () => {
   ])
 
   for (let classList of classLists) {
-    let output = await compileCss('@tailwind utilities; @plugin "./plugin.js";', classList, {
-      loadModule(id: string) {
-        return {
-          base: '/',
-          module: createPlugin(({ matchVariant }) => {
-            matchVariant('is-data', (value) => `&:is([data-${value}])`, {
-              values: {
-                DEFAULT: 'default',
-                foo: 'foo',
-                bar: 'bar',
-              },
-            })
-          }),
-        }
-      },
-    })
-
-    expect(output.trim()).toEqual(
-      dedent(`
-        .is-data\\:flex[data-default], .is-data-foo\\:flex[data-foo], .is-data-bar\\:flex[data-bar], .is-data-\\[potato\\]\\:flex[data-potato], .is-data-\\[sandwich\\]\\:flex[data-sandwich] {
-          display: flex;
-        }
-      `),
-    )
+    expect(
+      await run(classList, '@tailwind utilities; @plugin "./plugin.js";', {
+        async loadModule(_id: string) {
+          return {
+            path: '',
+            base: '/',
+            module: createPlugin(({ matchVariant }) => {
+              matchVariant('is-data', (value) => `&:is([data-${value}])`, {
+                values: {
+                  DEFAULT: 'default',
+                  foo: 'foo',
+                  bar: 'bar',
+                },
+              })
+            }),
+          }
+        },
+      }),
+    ).toMatchInlineSnapshot(`
+      "
+      .is-data\\:flex[data-default], .is-data-foo\\:flex[data-foo], .is-data-bar\\:flex[data-bar], .is-data-\\[potato\\]\\:flex[data-potato], .is-data-\\[sandwich\\]\\:flex[data-sandwich] {
+        display: flex;
+      }
+      "
+    `)
   }
 })
 
+test('move modifier of compound variant to sub-variant if its also a compound variant', async () => {
+  expect(
+    await run([
+      'not-group-focus/name:flex',
+      'has-group-focus/name:flex',
+      'in-group-focus/name:flex',
+
+      // Keep the `name` on the `group`, don't move it to the `peer` because
+      // that would be a breaking change.
+      'group-peer-focus/name:flex',
+    ]),
+  ).toMatchInlineSnapshot(`
+    "
+    .not-group-focus\\/name\\:flex:not(:is(:where(.group\\/name):focus *)), :is(:is(:where(.peer):focus ~ :where(.group\\/name)) .group-peer-focus\\/name\\:flex), :where(:is(:where(.group\\/name):focus *)) .in-group-focus\\/name\\:flex, .has-group-focus\\/name\\:flex:has(:is(:where(.group\\/name):focus *)) {
+      display: flex;
+    }
+    "
+  `)
+})
+
 test.each([
   // These are style rules
   [['.foo'], Compounds.StyleRules],
diff --git a/packages/tailwindcss/src/variants.ts b/packages/tailwindcss/src/variants.ts
index 99cd20a45..d2695b4d2 100644
--- a/packages/tailwindcss/src/variants.ts
+++ b/packages/tailwindcss/src/variants.ts
@@ -1,22 +1,30 @@
+import { Features } from '.'
 import {
-  WalkAction,
   atRoot,
   atRule,
+  cloneAstNode,
+  context,
   decl,
   rule,
   styleRule,
-  walk,
   type AstNode,
   type AtRule,
   type Rule,
   type StyleRule,
 } from './ast'
+import * as AttributeSelectorParser from './attribute-selector-parser'
 import { type Variant } from './candidate'
+import { applyVariant } from './compile'
+import type { DesignSystem } from './design-system'
 import type { Theme } from './theme'
 import { compareBreakpoints } from './utils/compare-breakpoints'
 import { DefaultMap } from './utils/default-map'
 import { isPositiveInteger } from './utils/infer-data-type'
 import { segment } from './utils/segment'
+import * as ValueParser from './value-parser'
+import { walk, WalkAction } from './walk'
+
+export const IS_VALID_VARIANT_NAME = /^@?[a-z0-9][a-zA-Z0-9_-]*(?<![_-])$/
 
 type VariantFn<T extends Variant['kind']> = (
   rule: Rule,
@@ -78,13 +86,18 @@ export class Variants {
     })
   }
 
-  fromAst(name: string, ast: AstNode[]) {
+  fromAst(name: string, ast: AstNode[], designSystem: DesignSystem) {
     let selectors: string[] = []
 
+    let usesAtVariant = false
+    let usesAtScope = false
     walk(ast, (node) => {
       if (node.kind === 'rule') {
         selectors.push(node.selector)
+      } else if (node.kind === 'at-rule' && node.name === '@variant') {
+        usesAtVariant = true
       } else if (node.kind === 'at-rule' && node.name !== '@slot') {
+        if (node.name === '@scope') usesAtScope = true
         selectors.push(`${node.name} ${node.params}`)
       }
     })
@@ -92,13 +105,18 @@ export class Variants {
     this.static(
       name,
       (r) => {
-        let body = structuredClone(ast)
-        substituteAtSlot(body, r.nodes)
-        r.nodes = body
-      },
-      {
-        compounds: compoundsForSelectors(selectors),
+        let body = ast.map(cloneAstNode)
+        if (usesAtVariant) substituteAtVariant(body, designSystem)
+
+        if (usesAtScope) {
+          substituteAtSlot(body, [context({ source: 'user' }, r.nodes)])
+          r.nodes = [context({ source: 'variant' }, body)]
+        } else {
+          substituteAtSlot(body, r.nodes)
+          r.nodes = body
+        }
       },
+      { compounds: compoundsForSelectors(selectors) },
     )
   }
 
@@ -363,41 +381,88 @@ export function createVariants(theme: Theme): Variants {
     )
   }
 
-  variants.static('force', () => {}, { compounds: Compounds.Never })
   staticVariant('*', [':is(& > *)'], { compounds: Compounds.Never })
   staticVariant('**', [':is(& *)'], { compounds: Compounds.Never })
 
   function negateConditions(ruleName: string, conditions: string[]) {
     return conditions.map((condition) => {
-      condition = condition.trim()
+      switch (ruleName) {
+        case '@container': {
+          let ast = ValueParser.parse(condition.trim())
 
-      let parts = segment(condition, ' ')
+          // @container {query}
+          //            ^^^^^^^
+          // ast        0
+          if (ast.length >= 1 && ast[0].kind === 'function') {
+            return `not ${condition}`
+          }
 
-      // @media not {query}
-      // @supports not {query}
-      // @container not {query}
-      if (parts[0] === 'not') {
-        return parts.slice(1).join(' ')
-      }
+          // @container not   {query}
+          //            ^^^ ^ ^^^^^^^
+          // ast        0   1 2
+          else if (
+            ast.length >= 3 &&
+            ast[0].kind === 'word' &&
+            ast[0].value === 'not' &&
+            ast[2].kind === 'function'
+          ) {
+            // Drop the leading `not` (ast[0]) and separator (ast[1])
+            ast.splice(0, 2)
+
+            return ValueParser.toCss(ast)
+          }
+
+          // @container {name}   not   {query}
+          //            ^^^^^^ ^ ^^^ ^ ^^^^^^^
+          // ast        0      1 2   3 4
+          else if (
+            ast.length >= 5 &&
+            ast[0].kind === 'word' &&
+            ast[2].kind === 'word' &&
+            ast[2].value === 'not' &&
+            ast[4].kind === 'function'
+          ) {
+            // Drop the `not` (ast[2]) and separator (ast[3])
+            ast.splice(2, 2)
+
+            return ValueParser.toCss(ast)
+          }
+
+          // @container {name}   {query}
+          //            ^^^^^^ ^ ^^^^^^^
+          // ast        0      1 2
+          else if (
+            ast.length >= 3 &&
+            ast[0].kind === 'word' &&
+            ast[0].value !== 'not' &&
+            ast[2].kind === 'function'
+          ) {
+            // Inject a separator and a `not`, after the `name` (ast[0])
+            ast.splice(1, 0, { kind: 'separator', value: ' ' }, { kind: 'word', value: 'not' })
+
+            return ValueParser.toCss(ast)
+          }
+
+          // Fallback
+          else {
+            return `not ${condition}`
+          }
+        }
+
+        default: {
+          condition = condition.trim()
+
+          let parts = segment(condition, ' ')
+
+          // @media not {query}
+          // @supports not {query}
+          if (parts[0] === 'not') {
+            return parts.slice(1).join(' ')
+          }
 
-      if (ruleName === '@container') {
-        // @container {query}
-        if (parts[0][0] === '(') {
           return `not ${condition}`
         }
-
-        // @container {name} not {query}
-        else if (parts[1] === 'not') {
-          return `${parts[0]} ${parts.slice(2).join(' ')}`
-        }
-
-        // @container {name} {query}
-        else {
-          return `${parts[0]} not ${parts.slice(1).join(' ')}`
-        }
       }
-
-      return `not ${condition}`
     })
   }
 
@@ -425,11 +490,6 @@ export function createVariants(theme: Theme): Variants {
     if (selector.includes('::')) return null
 
     let selectors = segment(selector, ',').map((sel) => {
-      // Remove unnecessary wrapping &:is(…) to reduce the selector size
-      if (sel.startsWith('&:is(') && sel.endsWith(')')) {
-        sel = sel.slice(5, -1)
-      }
-
       // Replace `&` in target variant with `*`, so variants like `&:hover`
       // become `&:not(*:hover)`. The `*` will often be optimized away.
       sel = sel.replaceAll('&', '*')
@@ -447,7 +507,7 @@ export function createVariants(theme: Theme): Variants {
 
     let didApply = false
 
-    walk([ruleNode], (node, { path }) => {
+    walk([ruleNode], (node, ctx) => {
       if (node.kind !== 'rule' && node.kind !== 'at-rule') return WalkAction.Continue
       if (node.nodes.length > 0) return WalkAction.Continue
 
@@ -455,11 +515,14 @@ export function createVariants(theme: Theme): Variants {
       let atRules: AtRule[] = []
       let styleRules: StyleRule[] = []
 
-      for (let parent of path) {
-        if (parent.kind === 'at-rule') {
-          atRules.push(parent)
-        } else if (parent.kind === 'rule') {
-          styleRules.push(parent)
+      let path = ctx.path()
+      path.push(node)
+
+      for (let node of path) {
+        if (node.kind === 'at-rule') {
+          atRules.push(node)
+        } else if (node.kind === 'rule') {
+          styleRules.push(node)
         }
       }
 
@@ -523,11 +586,11 @@ export function createVariants(theme: Theme): Variants {
 
     let didApply = false
 
-    walk([ruleNode], (node, { path }) => {
+    walk([ruleNode], (node, ctx) => {
       if (node.kind !== 'rule') return WalkAction.Continue
 
       // Throw out any candidates with variants using nested style rules
-      for (let parent of path.slice(0, -1)) {
+      for (let parent of ctx.path()) {
         if (parent.kind !== 'rule') continue
 
         didApply = false
@@ -547,7 +610,13 @@ export function createVariants(theme: Theme): Variants {
         selector = `:is(${selector})`
       }
 
-      node.selector = `&:is(${selector} *)`
+      // Put the target inside `:is` so browsers can limit style invalidation to
+      // it when the group changes. Keep `&` instead of the candidate's class so
+      // this also works with `@apply` and variants that change the target.
+      //
+      // The `:is` wrapper also keeps `has-group-*` from anchoring the group
+      // itself to the element carrying the utility.
+      node.selector = `:is(${selector} &)`
 
       // Track that the variant was actually applied
       didApply = true
@@ -575,11 +644,11 @@ export function createVariants(theme: Theme): Variants {
 
     let didApply = false
 
-    walk([ruleNode], (node, { path }) => {
+    walk([ruleNode], (node, ctx) => {
       if (node.kind !== 'rule') return WalkAction.Continue
 
       // Throw out any candidates with variants using nested style rules
-      for (let parent of path.slice(0, -1)) {
+      for (let parent of ctx.path()) {
         if (parent.kind !== 'rule') continue
 
         didApply = false
@@ -588,7 +657,7 @@ export function createVariants(theme: Theme): Variants {
 
       // For most variants we rely entirely on CSS nesting to build-up the final
       // selector, but there is no way to use CSS nesting to make `&` refer to
-      // just the `.group` class the way we'd need to for these variants, so we
+      // just the `.peer` class the way we'd need to for these variants, so we
       // need to replace it in the selector ourselves.
       let selector = node.selector.replaceAll('&', variantSelector)
 
@@ -599,7 +668,8 @@ export function createVariants(theme: Theme): Variants {
         selector = `:is(${selector})`
       }
 
-      node.selector = `&:is(${selector} ~ *)`
+      // As with `group`, constrain the target without repeating its selector.
+      node.selector = `:is(${selector} ~ &)`
 
       // Track that the variant was actually applied
       didApply = true
@@ -619,13 +689,18 @@ export function createVariants(theme: Theme): Variants {
   staticVariant('first-letter', ['&::first-letter'])
   staticVariant('first-line', ['&::first-line'])
 
-  // TODO: Remove alpha vars or no?
-  staticVariant('marker', ['& *::marker', '&::marker'])
+  staticVariant('marker', [
+    '& *::marker',
+    '&::marker',
+    '& *::-webkit-details-marker',
+    '&::-webkit-details-marker',
+  ])
 
   staticVariant('selection', ['& *::selection', '&::selection'])
   staticVariant('file', ['&::file-selector-button'])
   staticVariant('placeholder', ['&::placeholder'])
   staticVariant('backdrop', ['&::backdrop'])
+  staticVariant('details-content', ['&::details-content'])
 
   {
     function contentProperties() {
@@ -679,7 +754,7 @@ export function createVariants(theme: Theme): Variants {
   // State
   staticVariant('visited', ['&:visited'])
   staticVariant('target', ['&:target'])
-  staticVariant('open', ['&:is([open], :popover-open)'])
+  staticVariant('open', ['&:is([open], :popover-open, :open)'])
 
   // Forms
   staticVariant('default', ['&:default'])
@@ -691,6 +766,8 @@ export function createVariants(theme: Theme): Variants {
   staticVariant('required', ['&:required'])
   staticVariant('valid', ['&:valid'])
   staticVariant('invalid', ['&:invalid'])
+  staticVariant('user-valid', ['&:user-valid'])
+  staticVariant('user-invalid', ['&:user-invalid'])
   staticVariant('in-range', ['&:in-range'])
   staticVariant('out-of-range', ['&:out-of-range'])
   staticVariant('read-only', ['&:read-only'])
@@ -716,11 +793,11 @@ export function createVariants(theme: Theme): Variants {
 
     let didApply = false
 
-    walk([ruleNode], (node, { path }) => {
+    walk([ruleNode], (node, ctx) => {
       if (node.kind !== 'rule') return WalkAction.Continue
 
       // Throw out any candidates with variants using nested style rules
-      for (let parent of path.slice(0, -1)) {
+      for (let parent of ctx.path()) {
         if (parent.kind !== 'rule') continue
 
         didApply = false
@@ -751,11 +828,11 @@ export function createVariants(theme: Theme): Variants {
 
     let didApply = false
 
-    walk([ruleNode], (node, { path }) => {
+    walk([ruleNode], (node, ctx) => {
       if (node.kind !== 'rule') return WalkAction.Continue
 
       // Throw out any candidates with variants using nested style rules
-      for (let parent of path.slice(0, -1)) {
+      for (let parent of ctx.path()) {
         if (parent.kind !== 'rule') continue
 
         didApply = false
@@ -785,11 +862,15 @@ export function createVariants(theme: Theme): Variants {
     if (!variant.value || variant.modifier) return null
 
     if (variant.value.kind === 'arbitrary') {
-      ruleNode.nodes = [
-        styleRule(`&[aria-${quoteAttributeValue(variant.value.value)}]`, ruleNode.nodes),
-      ]
+      let selector = `[aria-${quoteAttributeValue(variant.value.value)}]`
+      let parsed = AttributeSelectorParser.parse(selector)
+      if (parsed === null) return null
+      ruleNode.nodes = [styleRule(`&${selector}`, ruleNode.nodes)]
     } else {
-      ruleNode.nodes = [styleRule(`&[aria-${variant.value.value}="true"]`, ruleNode.nodes)]
+      let selector = `[aria-${variant.value.value}="true"]`
+      let parsed = AttributeSelectorParser.parse(selector)
+      if (parsed === null) return null
+      ruleNode.nodes = [styleRule(`&${selector}`, ruleNode.nodes)]
     }
   })
 
@@ -808,9 +889,11 @@ export function createVariants(theme: Theme): Variants {
   variants.functional('data', (ruleNode, variant) => {
     if (!variant.value || variant.modifier) return null
 
-    ruleNode.nodes = [
-      styleRule(`&[data-${quoteAttributeValue(variant.value.value)}]`, ruleNode.nodes),
-    ]
+    let selector = `[data-${quoteAttributeValue(variant.value.value)}]`
+    let parsed = AttributeSelectorParser.parse(selector)
+    if (parsed === null) return null
+
+    ruleNode.nodes = [styleRule(`&${selector}`, ruleNode.nodes)]
   })
 
   variants.functional('nth', (ruleNode, variant) => {
@@ -862,7 +945,22 @@ export function createVariants(theme: Theme): Variants {
       if (/^[\w-]*\s*\(/.test(value)) {
         // Chrome has a bug where `(condition1)or(condition2)` is not valid, but
         // `(condition1) or (condition2)` is supported.
-        let query = value.replace(/\b(and|or|not)\b/g, ' $1 ')
+        let changed = false
+        let ast = ValueParser.parse(value)
+        walk(ast, (node) => {
+          if (node.kind !== 'function') return
+
+          // Leave selectors as-is, they could contain `selector(a:not(b))`, and
+          // in this case we don't want the space around the `not`.
+          if (node.value === 'selector') return WalkAction.Skip
+
+          if (node.value === 'and' || node.value === 'or' || node.value === 'not') {
+            changed = true
+            node.value = ` ${node.value} `
+          }
+        })
+
+        let query = changed ? ValueParser.toCss(ast) : value
 
         ruleNode.nodes = [atRule('@supports', query, ruleNode.nodes)]
         return
@@ -1115,6 +1213,11 @@ export function createVariants(theme: Theme): Variants {
         '@min',
         () => Array.from(widths.keys()).filter((key) => key !== null) as string[],
       )
+
+      variants.suggest(
+        '@',
+        () => Array.from(widths.keys()).filter((key) => key !== null) as string[],
+      )
     }
   }
 
@@ -1132,6 +1235,17 @@ export function createVariants(theme: Theme): Variants {
 
   staticVariant('forced-colors', ['@media (forced-colors: active)'])
 
+  staticVariant('inverted-colors', ['@media (inverted-colors: inverted)'])
+
+  staticVariant('pointer-none', ['@media (pointer: none)'])
+  staticVariant('pointer-coarse', ['@media (pointer: coarse)'])
+  staticVariant('pointer-fine', ['@media (pointer: fine)'])
+  staticVariant('any-pointer-none', ['@media (any-pointer: none)'])
+  staticVariant('any-pointer-coarse', ['@media (any-pointer: coarse)'])
+  staticVariant('any-pointer-fine', ['@media (any-pointer: fine)'])
+
+  staticVariant('noscript', ['@media (scripting: none)'])
+
   return variants
 }
 
@@ -1166,10 +1280,10 @@ function quoteAttributeValue(input: string) {
 }
 
 export function substituteAtSlot(ast: AstNode[], nodes: AstNode[]) {
-  walk(ast, (node, { replaceWith }) => {
+  walk(ast, (node) => {
     // Replace `@slot` with rule nodes
     if (node.kind === 'at-rule' && node.name === '@slot') {
-      replaceWith(nodes)
+      return WalkAction.ReplaceSkip(nodes)
     }
 
     // Wrap `@keyframes` and `@property` in `AtRoot` nodes
@@ -1179,3 +1293,56 @@ export function substituteAtSlot(ast: AstNode[], nodes: AstNode[]) {
     }
   })
 }
+
+export function substituteAtVariant(ast: AstNode[], designSystem: DesignSystem): Features {
+  let features = Features.None
+  walk(ast, (variantNode) => {
+    if (variantNode.kind !== 'at-rule' || variantNode.name !== '@variant') return
+
+    let nodes: AstNode[] = []
+    let compoundVariants = segment(variantNode.params, ',')
+    for (let [idx, compoundVariant] of compoundVariants.entries()) {
+      // Starting with the `&` rule node
+      //
+      // Only clone the nodes when we have multiple compound variants to deal
+      // with. The last one can use the original nodes. We do need unique AST
+      // nodes for sourcemap `dst` location information.
+      let node = styleRule(
+        '&',
+        idx === compoundVariants.length - 1
+          ? variantNode.nodes
+          : variantNode.nodes.map(cloneAstNode),
+      )
+
+      let stackedVariants = segment(compoundVariant, ':')
+      for (let i = stackedVariants.length - 1; i >= 0; --i) {
+        let variant = stackedVariants[i].trim()
+
+        if (!variant) {
+          throw new Error(`Cannot use \`@variant\` with empty variant`)
+        }
+
+        let variantAst = designSystem.parseVariant(variant)
+        if (variantAst === null) {
+          throw new Error(`Cannot use \`@variant\` with unknown variant: ${variant}`)
+        }
+
+        let result = applyVariant(node, variantAst, designSystem.variants)
+        if (result === null) {
+          throw new Error(`Cannot use \`@variant\` with variant: ${variant}`)
+        }
+      }
+
+      if (node.selector === '&') {
+        nodes.push(...node.nodes)
+      } else {
+        nodes.push(node)
+      }
+    }
+
+    // Update the variant at-rule node, to be the `&` rule node
+    features |= Features.Variants
+    return WalkAction.Replace(nodes)
+  })
+  return features
+}
diff --git a/packages/tailwindcss/src/walk.test.ts b/packages/tailwindcss/src/walk.test.ts
new file mode 100644
index 000000000..794d7e629
--- /dev/null
+++ b/packages/tailwindcss/src/walk.test.ts
@@ -0,0 +1,1598 @@
+import { describe, expect, test } from 'vitest'
+import { decl, rule, toCss, type AstNode as CSSAstNode } from './ast'
+import { walk, WalkAction } from './walk'
+
+type AstNode = { kind: string } | { kind: string; nodes: AstNode[] }
+
+describe('AST Enter (function)', () => {
+  test('visit all nodes in an AST', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, (node) => {
+      visited.push(node.kind)
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
+  })
+
+  test('visit all nodes in an AST and calculate their path', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let paths: string[] = []
+    walk(ast, (node, ctx) => {
+      let path = ctx.path().map((n) => n.kind)
+      if (path.length === 0) path.unshift('ø')
+      path.push(node.kind)
+
+      paths.push(path.join(' → ') || 'ø')
+    })
+
+    expect(`\n${paths.join('\n')}\n`).toMatchInlineSnapshot(`
+      "
+      ø → a
+      a → b
+      a → b → c
+      a → d
+      a → d → e
+      a → d → e → f
+      a → g
+      a → g → h
+      ø → i
+      "
+    `)
+  })
+
+  test("skip a node's children (first node)", () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, (node) => {
+      visited.push(node.kind)
+
+      if (node.kind === 'b') {
+        return WalkAction.Skip
+      }
+    })
+
+    expect(visited).toEqual(['a', 'b', 'd', 'e', 'f', 'g', 'h', 'i'])
+  })
+
+  test("skip a node's children (middle node)", () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, (node) => {
+      visited.push(node.kind)
+
+      if (node.kind === 'd') {
+        return WalkAction.Skip
+      }
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd', 'g', 'h', 'i'])
+  })
+
+  test("skip a node's children (last node)", () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, (node) => {
+      visited.push(node.kind)
+
+      if (node.kind === 'g') {
+        return WalkAction.Skip
+      }
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'i'])
+  })
+
+  test('stop entirely', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, (node) => {
+      visited.push(node.kind)
+
+      if (node.kind === 'd') {
+        return WalkAction.Stop
+      }
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd'])
+  })
+
+  test('replace a node, and visit the replacements', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, (node) => {
+      visited.push(node.kind)
+
+      if (node.kind === 'd') {
+        return WalkAction.Replace([
+          { kind: 'e1', nodes: [{ kind: 'f1' }] },
+          { kind: 'e2', nodes: [{ kind: 'f2' }] },
+        ])
+      }
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd', 'e1', 'f1', 'e2', 'f2', 'g', 'h', 'i'])
+  })
+
+  test('replace a node, and not visit the replacements', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, (node) => {
+      visited.push(node.kind)
+
+      if (node.kind === 'd') {
+        return WalkAction.ReplaceSkip([
+          { kind: 'e1', nodes: [{ kind: 'f1' }] },
+          { kind: 'e2', nodes: [{ kind: 'f2' }] },
+        ])
+      }
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd', 'g', 'h', 'i'])
+
+    // Let's walk the mutated AST again, to ensure that we properly replaced the
+    // node with new nodes.
+    visited.splice(0)
+    walk(ast, (node) => {
+      visited.push(node.kind)
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'e1', 'f1', 'e2', 'f2', 'g', 'h', 'i'])
+  })
+
+  test('replace a leaf node, and visit the replacements', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, (node) => {
+      visited.push(node.kind)
+
+      if (node.kind === 'f') {
+        return WalkAction.Replace([
+          { kind: 'foo1', nodes: [{ kind: 'bar1' }] },
+          { kind: 'foo2', nodes: [{ kind: 'bar2' }] },
+        ])
+      }
+    })
+
+    expect(visited).toEqual([
+      'a',
+      'b',
+      'c',
+      'd',
+      'e',
+      'f',
+      'foo1',
+      'bar1',
+      'foo2',
+      'bar2',
+      'g',
+      'h',
+      'i',
+    ])
+  })
+
+  test('replace a leaf node, and not visit the replacements', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, (node) => {
+      visited.push(node.kind)
+
+      if (node.kind === 'f') {
+        return WalkAction.ReplaceSkip([
+          { kind: 'foo1', nodes: [{ kind: 'bar1' }] },
+          { kind: 'foo2', nodes: [{ kind: 'bar2' }] },
+        ])
+      }
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
+
+    // Let's walk the mutated AST again, to ensure that we properly replaced the
+    // node with new nodes.
+    visited.splice(0)
+    walk(ast, (node) => {
+      visited.push(node.kind)
+    })
+
+    expect(visited).toEqual([
+      'a',
+      'b',
+      'c',
+      'd',
+      'e',
+      'foo1',
+      'bar1',
+      'foo2',
+      'bar2',
+      'g',
+      'h',
+      'i',
+    ])
+  })
+
+  test('replace a node, and stop the walk entirely', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, (node) => {
+      visited.push(node.kind)
+
+      if (node.kind === 'd') {
+        return WalkAction.ReplaceStop([
+          { kind: 'e1', nodes: [{ kind: 'f1' }] },
+          { kind: 'e2', nodes: [{ kind: 'f2' }] },
+        ])
+      }
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd'])
+
+    // Let's walk the mutated AST again, to ensure that we properly replaced the
+    // node with new nodes.
+    visited.splice(0)
+    walk(ast, (node) => {
+      visited.push(node.kind)
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'e1', 'f1', 'e2', 'f2', 'g', 'h', 'i'])
+  })
+})
+
+describe('AST Enter (obj)', () => {
+  test('visit all nodes in an AST', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      enter(node) {
+        visited.push(node.kind)
+      },
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
+  })
+
+  test('visit all nodes in an AST and calculate their path', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let paths: string[] = []
+    walk(ast, {
+      enter(node, ctx) {
+        let path = ctx.path().map((n) => n.kind)
+        if (path.length === 0) path.unshift('ø')
+        path.push(node.kind)
+
+        paths.push(path.join(' → ') || 'ø')
+      },
+    })
+
+    expect(`\n${paths.join('\n')}\n`).toMatchInlineSnapshot(`
+      "
+      ø → a
+      a → b
+      a → b → c
+      a → d
+      a → d → e
+      a → d → e → f
+      a → g
+      a → g → h
+      ø → i
+      "
+    `)
+  })
+
+  test("skip a node's children (first node)", () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      enter(node) {
+        visited.push(node.kind)
+
+        if (node.kind === 'b') {
+          return WalkAction.Skip
+        }
+      },
+    })
+
+    expect(visited).toEqual(['a', 'b', 'd', 'e', 'f', 'g', 'h', 'i'])
+  })
+
+  test("skip a node's children (middle node)", () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      enter(node) {
+        visited.push(node.kind)
+
+        if (node.kind === 'd') {
+          return WalkAction.Skip
+        }
+      },
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd', 'g', 'h', 'i'])
+  })
+
+  test("skip a node's children (last node)", () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      enter(node) {
+        visited.push(node.kind)
+
+        if (node.kind === 'g') {
+          return WalkAction.Skip
+        }
+      },
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'i'])
+  })
+
+  test('stop entirely', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      enter(node) {
+        visited.push(node.kind)
+
+        if (node.kind === 'd') {
+          return WalkAction.Stop
+        }
+      },
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd'])
+  })
+
+  test('replace a node, and visit the replacements', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      enter(node) {
+        visited.push(node.kind)
+
+        if (node.kind === 'd') {
+          return WalkAction.Replace([
+            { kind: 'e1', nodes: [{ kind: 'f1' }] },
+            { kind: 'e2', nodes: [{ kind: 'f2' }] },
+          ])
+        }
+      },
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd', 'e1', 'f1', 'e2', 'f2', 'g', 'h', 'i'])
+  })
+
+  test('replace a node, and not visit the replacements', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      enter(node) {
+        visited.push(node.kind)
+
+        if (node.kind === 'd') {
+          return WalkAction.ReplaceSkip([
+            { kind: 'e1', nodes: [{ kind: 'f1' }] },
+            { kind: 'e2', nodes: [{ kind: 'f2' }] },
+          ])
+        }
+      },
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd', 'g', 'h', 'i'])
+
+    // Let's walk the mutated AST again, to ensure that we properly replaced the
+    // node with new nodes.
+    visited.splice(0)
+    walk(ast, (node) => {
+      visited.push(node.kind)
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'e1', 'f1', 'e2', 'f2', 'g', 'h', 'i'])
+  })
+
+  test('replace a leaf node, and visit the replacements', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      enter(node) {
+        visited.push(node.kind)
+
+        if (node.kind === 'f') {
+          return WalkAction.Replace([
+            { kind: 'foo1', nodes: [{ kind: 'bar1' }] },
+            { kind: 'foo2', nodes: [{ kind: 'bar2' }] },
+          ])
+        }
+      },
+    })
+
+    expect(visited).toEqual([
+      'a',
+      'b',
+      'c',
+      'd',
+      'e',
+      'f',
+      'foo1',
+      'bar1',
+      'foo2',
+      'bar2',
+      'g',
+      'h',
+      'i',
+    ])
+  })
+
+  test('replace a leaf node, and not visit the replacements', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      enter(node) {
+        visited.push(node.kind)
+
+        if (node.kind === 'f') {
+          return WalkAction.ReplaceSkip([
+            { kind: 'foo1', nodes: [{ kind: 'bar1' }] },
+            { kind: 'foo2', nodes: [{ kind: 'bar2' }] },
+          ])
+        }
+      },
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
+
+    // Let's walk the mutated AST again, to ensure that we properly replaced the
+    // node with new nodes.
+    visited.splice(0)
+    walk(ast, (node) => {
+      visited.push(node.kind)
+    })
+
+    expect(visited).toEqual([
+      'a',
+      'b',
+      'c',
+      'd',
+      'e',
+      'foo1',
+      'bar1',
+      'foo2',
+      'bar2',
+      'g',
+      'h',
+      'i',
+    ])
+  })
+
+  test('replace a node, and stop the walk entirely', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      enter(node) {
+        visited.push(node.kind)
+
+        if (node.kind === 'd') {
+          return WalkAction.ReplaceStop([
+            { kind: 'e1', nodes: [{ kind: 'f1' }] },
+            { kind: 'e2', nodes: [{ kind: 'f2' }] },
+          ])
+        }
+      },
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd'])
+
+    // Let's walk the mutated AST again, to ensure that we properly replaced the
+    // node with new nodes.
+    visited.splice(0)
+    walk(ast, (node) => {
+      visited.push(node.kind)
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'e1', 'f1', 'e2', 'f2', 'g', 'h', 'i'])
+  })
+})
+
+describe('AST Exit (obj)', () => {
+  test('visit all nodes in an AST', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      exit(node) {
+        visited.push(node.kind)
+      },
+    })
+
+    expect(visited).toEqual(['c', 'b', 'f', 'e', 'd', 'h', 'g', 'a', 'i'])
+  })
+
+  test('visit all nodes in an AST and calculate their path', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let paths: string[] = []
+    walk(ast, {
+      exit(node, ctx) {
+        let path = ctx.path().map((n) => n.kind)
+        if (path.length === 0) path.unshift('ø')
+        path.push(node.kind)
+
+        paths.push(path.join(' → ') || 'ø')
+      },
+    })
+
+    expect(`\n${paths.join('\n')}\n`).toMatchInlineSnapshot(`
+      "
+      a → b → c
+      a → b
+      a → d → e → f
+      a → d → e
+      a → d
+      a → g → h
+      a → g
+      ø → a
+      ø → i
+      "
+    `)
+  })
+
+  test('stop entirely', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      exit(node) {
+        visited.push(node.kind)
+
+        if (node.kind === 'd') {
+          return WalkAction.Stop
+        }
+      },
+    })
+
+    expect(visited).toEqual(['c', 'b', 'f', 'e', 'd'])
+  })
+
+  test('replace a node, and not visit the replacements', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      exit(node) {
+        visited.push(node.kind)
+
+        if (node.kind === 'd') {
+          return WalkAction.Replace([
+            { kind: 'e1', nodes: [{ kind: 'f1' }] },
+            { kind: 'e2', nodes: [{ kind: 'f2' }] },
+          ])
+        }
+      },
+    })
+
+    expect(visited).toEqual(['c', 'b', 'f', 'e', 'd', 'h', 'g', 'a', 'i'])
+
+    // Let's walk the mutated AST again, to ensure that we properly replaced the
+    // node with new nodes.
+    visited.splice(0)
+    walk(ast, (node) => {
+      visited.push(node.kind)
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'e1', 'f1', 'e2', 'f2', 'g', 'h', 'i'])
+  })
+
+  test('replace a leaf node, and not visit the replacements', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      exit(node) {
+        visited.push(node.kind)
+
+        if (node.kind === 'f') {
+          return WalkAction.Replace([{ kind: 'f1' }, { kind: 'f2' }])
+        }
+      },
+    })
+
+    expect(visited).toEqual(['c', 'b', 'f', 'e', 'd', 'h', 'g', 'a', 'i'])
+
+    // Let's walk the mutated AST again, to ensure that we properly replaced the
+    // node with new nodes.
+    visited.splice(0)
+    walk(ast, (node) => {
+      visited.push(node.kind)
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'd', 'e', 'f1', 'f2', 'g', 'h', 'i'])
+  })
+
+  test('replace a node, and stop the walk entirely', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      exit(node) {
+        visited.push(node.kind)
+
+        if (node.kind === 'd') {
+          return WalkAction.ReplaceStop([
+            { kind: 'e1', nodes: [{ kind: 'f1' }] },
+            { kind: 'e2', nodes: [{ kind: 'f2' }] },
+          ])
+        }
+      },
+    })
+
+    expect(visited).toEqual(['c', 'b', 'f', 'e', 'd'])
+
+    // Let's walk the mutated AST again, to ensure that we properly replaced the
+    // node with new nodes.
+    visited.splice(0)
+    walk(ast, (node) => {
+      visited.push(node.kind)
+    })
+
+    expect(visited).toEqual(['a', 'b', 'c', 'e1', 'f1', 'e2', 'f2', 'g', 'h', 'i'])
+  })
+})
+
+describe('AST Enter & Exit', () => {
+  test('visit all nodes in an AST', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let visited: string[] = []
+    walk(ast, {
+      enter(node, ctx) {
+        expect(ctx.index).toEqual(ctx.siblings.indexOf(node))
+        visited.push(`${'  '.repeat(ctx.depth)} Enter(${node.kind} @ ${ctx.index})`)
+      },
+      exit(node, ctx) {
+        expect(ctx.index).toEqual(ctx.siblings.indexOf(node))
+        visited.push(`${'  '.repeat(ctx.depth)} Exit(${node.kind} @ ${ctx.index})`)
+      },
+    })
+
+    expect(`\n${visited.join('\n')}\n`).toMatchInlineSnapshot(`
+      "
+       Enter(a @ 0)
+         Enter(b @ 0)
+           Enter(c @ 0)
+           Exit(c @ 0)
+         Exit(b @ 0)
+         Enter(d @ 1)
+           Enter(e @ 0)
+             Enter(f @ 0)
+             Exit(f @ 0)
+           Exit(e @ 0)
+         Exit(d @ 1)
+         Enter(g @ 2)
+           Enter(h @ 0)
+           Exit(h @ 0)
+         Exit(g @ 2)
+       Exit(a @ 0)
+       Enter(i @ 1)
+       Exit(i @ 1)
+      "
+    `)
+  })
+
+  test('visit all nodes in an AST and calculate their path', () => {
+    let ast: AstNode[] = [
+      {
+        kind: 'a',
+        nodes: [
+          { kind: 'b', nodes: [{ kind: 'c' }] },
+          { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+          { kind: 'g', nodes: [{ kind: 'h' }] },
+        ],
+      },
+      { kind: 'i' },
+    ]
+
+    let paths: string[] = []
+    walk(ast, {
+      enter(node, ctx) {
+        let path = ctx.path().map((n) => n.kind)
+        if (path.length === 0) path.unshift('ø')
+        path.push(node.kind)
+
+        paths.push(`Enter(${path.join(' → ') || 'ø'})`)
+      },
+      exit(node, ctx) {
+        let path = ctx.path().map((n) => n.kind)
+        if (path.length === 0) path.unshift('ø')
+        path.push(node.kind)
+
+        paths.push(`Exit(${path.join(' → ') || 'ø'})`)
+      },
+    })
+
+    expect(`\n${paths.join('\n')}\n`).toMatchInlineSnapshot(`
+      "
+      Enter(ø → a)
+      Enter(a → b)
+      Enter(a → b → c)
+      Exit(a → b → c)
+      Exit(a → b)
+      Enter(a → d)
+      Enter(a → d → e)
+      Enter(a → d → e → f)
+      Exit(a → d → e → f)
+      Exit(a → d → e)
+      Exit(a → d)
+      Enter(a → g)
+      Enter(a → g → h)
+      Exit(a → g → h)
+      Exit(a → g)
+      Exit(ø → a)
+      Enter(ø → i)
+      Exit(ø → i)
+      "
+    `)
+  })
+
+  test('"real" world use case', () => {
+    let ast: CSSAstNode[] = [
+      rule('.example', [
+        decl('margin-top', '12px'),
+        decl('padding', '8px'),
+        decl('margin', '16px 18px'),
+        decl('colors', 'red'),
+      ]),
+    ]
+
+    walk(ast, {
+      enter(node) {
+        // Expand `margin` shorthand into multiple properties
+        if (node.kind === 'declaration' && node.property === 'margin' && node.value) {
+          let [y, x] = node.value.split(' ')
+          return WalkAction.Replace([
+            decl('margin-top', y),
+            decl('margin-bottom', y),
+            decl('margin-left', x),
+            decl('margin-right', x),
+          ])
+        }
+
+        // These properties should not be uppercased, so skip them
+        else if (node.kind === 'declaration' && node.property === 'colors' && node.value) {
+          return WalkAction.ReplaceSkip([
+            decl('color', node.value),
+            decl('background-color', node.value),
+            decl('border-color', node.value),
+          ])
+        }
+
+        // Make all properties uppercase (this should see the expanded margin properties as well)
+        // but it should not see the `color` property as we skipped it above.
+        else if (node.kind === 'declaration') {
+          node.property = node.property.toUpperCase()
+        }
+      },
+
+      exit(node) {
+        // Sort declarations alphabetically within a rule (this should see the
+        // nodes after transformations in `enter` phase)
+        if (node.kind === 'rule') {
+          node.nodes.sort((a, z) => {
+            if (a.kind === 'declaration' && z.kind === 'declaration') {
+              return a.property.localeCompare(z.property)
+            }
+
+            // Stable sort
+            return 0
+          })
+        }
+      },
+    })
+
+    expect(toCss(ast)).toMatchInlineSnapshot(`
+      ".example {
+        background-color: red;
+        border-color: red;
+        color: red;
+        MARGIN-BOTTOM: 16px;
+        MARGIN-LEFT: 18px;
+        MARGIN-RIGHT: 18px;
+        MARGIN-TOP: 12px;
+        MARGIN-TOP: 16px;
+        PADDING: 8px;
+      }
+      "
+    `)
+  })
+
+  describe('enter phase', () => {
+    test('visit all nodes in an AST', () => {
+      let ast: AstNode[] = [
+        {
+          kind: 'a',
+          nodes: [
+            { kind: 'b', nodes: [{ kind: 'c' }] },
+            { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+            { kind: 'g', nodes: [{ kind: 'h' }] },
+          ],
+        },
+        { kind: 'i' },
+      ]
+
+      let visited: string[] = []
+      walk(ast, {
+        enter(node) {
+          visited.push(node.kind)
+        },
+        exit() {},
+      })
+
+      expect(visited).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
+    })
+
+    test("skip a node's children (first node)", () => {
+      let ast: AstNode[] = [
+        {
+          kind: 'a',
+          nodes: [
+            { kind: 'b', nodes: [{ kind: 'c' }] },
+            { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+            { kind: 'g', nodes: [{ kind: 'h' }] },
+          ],
+        },
+        { kind: 'i' },
+      ]
+
+      let visited: string[] = []
+      walk(ast, {
+        enter(node) {
+          visited.push(node.kind)
+
+          if (node.kind === 'b') {
+            return WalkAction.Skip
+          }
+        },
+        exit() {},
+      })
+
+      expect(visited).toEqual(['a', 'b', 'd', 'e', 'f', 'g', 'h', 'i'])
+    })
+
+    test("skip a node's children (middle node)", () => {
+      let ast: AstNode[] = [
+        {
+          kind: 'a',
+          nodes: [
+            { kind: 'b', nodes: [{ kind: 'c' }] },
+            { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+            { kind: 'g', nodes: [{ kind: 'h' }] },
+          ],
+        },
+        { kind: 'i' },
+      ]
+
+      let visited: string[] = []
+      walk(ast, {
+        enter(node) {
+          visited.push(node.kind)
+
+          if (node.kind === 'd') {
+            return WalkAction.Skip
+          }
+        },
+        exit() {},
+      })
+
+      expect(visited).toEqual(['a', 'b', 'c', 'd', 'g', 'h', 'i'])
+    })
+
+    test("skip a node's children (last node)", () => {
+      let ast: AstNode[] = [
+        {
+          kind: 'a',
+          nodes: [
+            { kind: 'b', nodes: [{ kind: 'c' }] },
+            { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+            { kind: 'g', nodes: [{ kind: 'h' }] },
+          ],
+        },
+        { kind: 'i' },
+      ]
+
+      let visited: string[] = []
+      walk(ast, {
+        enter(node) {
+          visited.push(node.kind)
+
+          if (node.kind === 'g') {
+            return WalkAction.Skip
+          }
+        },
+        exit() {},
+      })
+
+      expect(visited).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'i'])
+    })
+
+    test('stop entirely', () => {
+      let ast: AstNode[] = [
+        {
+          kind: 'a',
+          nodes: [
+            { kind: 'b', nodes: [{ kind: 'c' }] },
+            { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+            { kind: 'g', nodes: [{ kind: 'h' }] },
+          ],
+        },
+        { kind: 'i' },
+      ]
+
+      let visited: string[] = []
+      walk(ast, {
+        enter(node) {
+          visited.push(node.kind)
+
+          if (node.kind === 'd') {
+            return WalkAction.Stop
+          }
+        },
+        exit() {},
+      })
+
+      expect(visited).toEqual(['a', 'b', 'c', 'd'])
+    })
+
+    test('replace a node, and visit the replacements', () => {
+      let ast: AstNode[] = [
+        {
+          kind: 'a',
+          nodes: [
+            { kind: 'b', nodes: [{ kind: 'c' }] },
+            { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+            { kind: 'g', nodes: [{ kind: 'h' }] },
+          ],
+        },
+        { kind: 'i' },
+      ]
+
+      let visited: string[] = []
+      walk(ast, {
+        enter(node) {
+          visited.push(node.kind)
+
+          if (node.kind === 'd') {
+            return WalkAction.Replace([
+              { kind: 'e1', nodes: [{ kind: 'f1' }] },
+              { kind: 'e2', nodes: [{ kind: 'f2' }] },
+            ])
+          }
+        },
+        exit() {},
+      })
+
+      expect(visited).toEqual(['a', 'b', 'c', 'd', 'e1', 'f1', 'e2', 'f2', 'g', 'h', 'i'])
+    })
+
+    test('replace a node, and not visit the replacements', () => {
+      let ast: AstNode[] = [
+        {
+          kind: 'a',
+          nodes: [
+            { kind: 'b', nodes: [{ kind: 'c' }] },
+            { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+            { kind: 'g', nodes: [{ kind: 'h' }] },
+          ],
+        },
+        { kind: 'i' },
+      ]
+
+      let visited: string[] = []
+      walk(ast, {
+        enter(node) {
+          visited.push(node.kind)
+
+          if (node.kind === 'd') {
+            return WalkAction.ReplaceSkip([
+              { kind: 'e1', nodes: [{ kind: 'f1' }] },
+              { kind: 'e2', nodes: [{ kind: 'f2' }] },
+            ])
+          }
+        },
+        exit() {},
+      })
+
+      expect(visited).toEqual(['a', 'b', 'c', 'd', 'g', 'h', 'i'])
+
+      // Let's walk the mutated AST again, to ensure that we properly replaced the
+      // node with new nodes.
+      visited.splice(0)
+      walk(ast, (node) => {
+        visited.push(node.kind)
+      })
+
+      expect(visited).toEqual(['a', 'b', 'c', 'e1', 'f1', 'e2', 'f2', 'g', 'h', 'i'])
+    })
+
+    test('replace a leaf node, and visit the replacements', () => {
+      let ast: AstNode[] = [
+        {
+          kind: 'a',
+          nodes: [
+            { kind: 'b', nodes: [{ kind: 'c' }] },
+            { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+            { kind: 'g', nodes: [{ kind: 'h' }] },
+          ],
+        },
+        { kind: 'i' },
+      ]
+
+      let visited: string[] = []
+      walk(ast, {
+        enter(node) {
+          visited.push(node.kind)
+
+          if (node.kind === 'f') {
+            return WalkAction.Replace([
+              { kind: 'foo1', nodes: [{ kind: 'bar1' }] },
+              { kind: 'foo2', nodes: [{ kind: 'bar2' }] },
+            ])
+          }
+        },
+        exit() {},
+      })
+
+      expect(visited).toEqual([
+        'a',
+        'b',
+        'c',
+        'd',
+        'e',
+        'f',
+        'foo1',
+        'bar1',
+        'foo2',
+        'bar2',
+        'g',
+        'h',
+        'i',
+      ])
+    })
+
+    test('replace a leaf node, and not visit the replacements', () => {
+      let ast: AstNode[] = [
+        {
+          kind: 'a',
+          nodes: [
+            { kind: 'b', nodes: [{ kind: 'c' }] },
+            { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+            { kind: 'g', nodes: [{ kind: 'h' }] },
+          ],
+        },
+        { kind: 'i' },
+      ]
+
+      let visited: string[] = []
+      walk(ast, {
+        enter(node) {
+          visited.push(node.kind)
+
+          if (node.kind === 'f') {
+            return WalkAction.ReplaceSkip([
+              { kind: 'foo1', nodes: [{ kind: 'bar1' }] },
+              { kind: 'foo2', nodes: [{ kind: 'bar2' }] },
+            ])
+          }
+        },
+        exit() {},
+      })
+
+      expect(visited).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
+
+      // Let's walk the mutated AST again, to ensure that we properly replaced the
+      // node with new nodes.
+      visited.splice(0)
+      walk(ast, (node) => {
+        visited.push(node.kind)
+      })
+
+      expect(visited).toEqual([
+        'a',
+        'b',
+        'c',
+        'd',
+        'e',
+        'foo1',
+        'bar1',
+        'foo2',
+        'bar2',
+        'g',
+        'h',
+        'i',
+      ])
+    })
+
+    test('replace a node, and stop the walk entirely', () => {
+      let ast: AstNode[] = [
+        {
+          kind: 'a',
+          nodes: [
+            { kind: 'b', nodes: [{ kind: 'c' }] },
+            { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+            { kind: 'g', nodes: [{ kind: 'h' }] },
+          ],
+        },
+        { kind: 'i' },
+      ]
+
+      let visited: string[] = []
+      walk(ast, {
+        enter(node) {
+          visited.push(node.kind)
+
+          if (node.kind === 'd') {
+            return WalkAction.ReplaceStop([
+              { kind: 'e1', nodes: [{ kind: 'f1' }] },
+              { kind: 'e2', nodes: [{ kind: 'f2' }] },
+            ])
+          }
+        },
+        exit() {},
+      })
+
+      expect(visited).toEqual(['a', 'b', 'c', 'd'])
+
+      // Let's walk the mutated AST again, to ensure that we properly replaced the
+      // node with new nodes.
+      visited.splice(0)
+      walk(ast, (node) => {
+        visited.push(node.kind)
+      })
+
+      expect(visited).toEqual(['a', 'b', 'c', 'e1', 'f1', 'e2', 'f2', 'g', 'h', 'i'])
+    })
+  })
+
+  describe('exit phase', () => {
+    test('visit all nodes in an AST', () => {
+      let ast: AstNode[] = [
+        {
+          kind: 'a',
+          nodes: [
+            { kind: 'b', nodes: [{ kind: 'c' }] },
+            { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+            { kind: 'g', nodes: [{ kind: 'h' }] },
+          ],
+        },
+        { kind: 'i' },
+      ]
+
+      let visited: string[] = []
+      walk(ast, {
+        enter() {},
+        exit(node) {
+          visited.push(node.kind)
+        },
+      })
+
+      expect(visited).toEqual(['c', 'b', 'f', 'e', 'd', 'h', 'g', 'a', 'i'])
+    })
+
+    test('stop entirely', () => {
+      let ast: AstNode[] = [
+        {
+          kind: 'a',
+          nodes: [
+            { kind: 'b', nodes: [{ kind: 'c' }] },
+            { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+            { kind: 'g', nodes: [{ kind: 'h' }] },
+          ],
+        },
+        { kind: 'i' },
+      ]
+
+      let visited: string[] = []
+      walk(ast, {
+        enter() {},
+        exit(node) {
+          visited.push(node.kind)
+
+          if (node.kind === 'd') {
+            return WalkAction.Stop
+          }
+        },
+      })
+
+      expect(visited).toEqual(['c', 'b', 'f', 'e', 'd'])
+    })
+
+    test('replace a node, and not visit the replacements', () => {
+      let ast: AstNode[] = [
+        {
+          kind: 'a',
+          nodes: [
+            { kind: 'b', nodes: [{ kind: 'c' }] },
+            { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+            { kind: 'g', nodes: [{ kind: 'h' }] },
+          ],
+        },
+        { kind: 'i' },
+      ]
+
+      let visited: string[] = []
+      walk(ast, {
+        enter() {},
+        exit(node) {
+          visited.push(node.kind)
+
+          if (node.kind === 'd') {
+            return WalkAction.Replace([
+              { kind: 'e1', nodes: [{ kind: 'f1' }] },
+              { kind: 'e2', nodes: [{ kind: 'f2' }] },
+            ])
+          }
+        },
+      })
+
+      expect(visited).toEqual(['c', 'b', 'f', 'e', 'd', 'h', 'g', 'a', 'i'])
+
+      // Let's walk the mutated AST again, to ensure that we properly replaced the
+      // node with new nodes.
+      visited.splice(0)
+      walk(ast, (node) => {
+        visited.push(node.kind)
+      })
+
+      expect(visited).toEqual(['a', 'b', 'c', 'e1', 'f1', 'e2', 'f2', 'g', 'h', 'i'])
+    })
+
+    test('replace a node, and stop the walk entirely', () => {
+      let ast: AstNode[] = [
+        {
+          kind: 'a',
+          nodes: [
+            { kind: 'b', nodes: [{ kind: 'c' }] },
+            { kind: 'd', nodes: [{ kind: 'e', nodes: [{ kind: 'f' }] }] },
+            { kind: 'g', nodes: [{ kind: 'h' }] },
+          ],
+        },
+        { kind: 'i' },
+      ]
+
+      let visited: string[] = []
+      walk(ast, {
+        enter() {},
+        exit(node) {
+          visited.push(node.kind)
+
+          if (node.kind === 'd') {
+            return WalkAction.ReplaceStop([
+              { kind: 'e1', nodes: [{ kind: 'f1' }] },
+              { kind: 'e2', nodes: [{ kind: 'f2' }] },
+            ])
+          }
+        },
+      })
+
+      expect(visited).toEqual(['c', 'b', 'f', 'e', 'd'])
+
+      // Let's walk the mutated AST again, to ensure that we properly replaced the
+      // node with new nodes.
+      visited.splice(0)
+      walk(ast, (node) => {
+        visited.push(node.kind)
+      })
+
+      expect(visited).toEqual(['a', 'b', 'c', 'e1', 'f1', 'e2', 'f2', 'g', 'h', 'i'])
+    })
+  })
+})
diff --git a/packages/tailwindcss/src/walk.ts b/packages/tailwindcss/src/walk.ts
new file mode 100644
index 000000000..2c268a7bd
--- /dev/null
+++ b/packages/tailwindcss/src/walk.ts
@@ -0,0 +1,204 @@
+const enum WalkKind {
+  Continue,
+  Skip,
+  Stop,
+  Replace,
+  ReplaceSkip,
+  ReplaceStop,
+}
+
+export const WalkAction = {
+  Continue: { kind: WalkKind.Continue } as const,
+  Skip: { kind: WalkKind.Skip } as const,
+  Stop: { kind: WalkKind.Stop } as const,
+  Replace: <T>(nodes: T | T[]) =>
+    ({ kind: WalkKind.Replace, nodes: Array.isArray(nodes) ? nodes : [nodes] }) as const,
+  ReplaceSkip: <T>(nodes: T | T[]) =>
+    ({ kind: WalkKind.ReplaceSkip, nodes: Array.isArray(nodes) ? nodes : [nodes] }) as const,
+  ReplaceStop: <T>(nodes: T | T[]) =>
+    ({ kind: WalkKind.ReplaceStop, nodes: Array.isArray(nodes) ? nodes : [nodes] }) as const,
+} as const
+
+type WalkAction = typeof WalkAction
+type WalkResult<T> =
+  | WalkAction['Continue']
+  | WalkAction['Skip']
+  | WalkAction['Stop']
+  | ReturnType<typeof WalkAction.Replace<T>>
+  | ReturnType<typeof WalkAction.ReplaceSkip<T>>
+  | ReturnType<typeof WalkAction.ReplaceStop<T>>
+
+type EnterResult<T> = WalkResult<T>
+type ExitResult<T> = Exclude<WalkResult<T>, { kind: WalkKind.Skip }>
+
+type Parent<T> = T & { nodes: T[] }
+
+export interface VisitContext<T> {
+  parent: Parent<T> | null
+  depth: number
+  index: number
+  siblings: T[]
+  path: () => T[]
+}
+
+export function walk<T extends object>(
+  ast: T[],
+  hooks:
+    | ((node: T, ctx: VisitContext<T>) => EnterResult<T> | void) // Old API, enter only
+    | {
+        enter?: (node: T, ctx: VisitContext<T>) => EnterResult<T> | void
+        exit?: (node: T, ctx: VisitContext<T>) => ExitResult<T> | void
+      },
+): void {
+  if (typeof hooks === 'function') walkImplementation(ast, hooks)
+  else walkImplementation(ast, hooks.enter, hooks.exit)
+}
+
+interface Stack<T> {
+  value: T
+  prev: Stack<T> | null
+}
+
+function walkImplementation<T extends { nodes?: T[] }>(
+  ast: T[],
+  enter: (node: T, ctx: VisitContext<T>) => EnterResult<T> | void = () => WalkAction.Continue,
+  exit: (node: T, ctx: VisitContext<T>) => ExitResult<T> | void = () => WalkAction.Continue,
+) {
+  type StackFrame = [nodes: T[], offset: number, parent: Parent<T> | null]
+  let stack: Stack<StackFrame> | null = { value: [ast, 0, null], prev: null }
+
+  let ctx: VisitContext<T> = {
+    parent: null,
+    depth: 0,
+    index: 0,
+    siblings: ast,
+    path() {
+      let path: T[] = []
+
+      let frames: Stack<StackFrame> | null = stack
+
+      while (frames) {
+        let parent = frames.value[2]
+        if (parent) path.push(parent)
+        frames = frames.prev
+      }
+
+      path.reverse()
+
+      return path
+    },
+  }
+
+  while (stack !== null) {
+    let frame = stack.value
+    let nodes = frame[0]
+    let offset = frame[1]
+    let parent = frame[2]
+
+    // Done with this level
+    if (offset >= nodes.length) {
+      stack = stack.prev
+      ctx.depth -= 1
+      continue
+    }
+
+    ctx.parent = parent
+    ctx.siblings = nodes
+
+    // Enter phase (offsets are positive)
+    if (offset >= 0) {
+      ctx.index = offset
+
+      let node = nodes[offset]
+      let result = enter(node, ctx) ?? WalkAction.Continue
+
+      switch (result.kind) {
+        case WalkKind.Continue: {
+          if (node.nodes && node.nodes.length > 0) {
+            ctx.depth += 1
+            stack = {
+              value: [node.nodes, 0, node as Parent<T>],
+              prev: stack,
+            }
+          }
+
+          frame[1] = ~offset // Prepare for exit phase, same offset
+          continue
+        }
+
+        case WalkKind.Stop:
+          return // Stop immediately
+
+        case WalkKind.Skip: {
+          frame[1] = ~offset // Prepare for exit phase, same offset
+          continue
+        }
+
+        case WalkKind.Replace: {
+          nodes.splice(offset, 1, ...result.nodes)
+          continue // Re-process at same offset
+        }
+
+        case WalkKind.ReplaceStop: {
+          nodes.splice(offset, 1, ...result.nodes)
+          return // Stop immediately
+        }
+
+        case WalkKind.ReplaceSkip: {
+          nodes.splice(offset, 1, ...result.nodes)
+          frame[1] += result.nodes.length // Advance to next sibling past replacements
+          continue
+        }
+
+        default: {
+          result satisfies never
+          throw new Error(
+            // @ts-expect-error enterResult.kind may be invalid
+            `Invalid \`WalkAction.${WalkKind[result.kind] ?? `Unknown(${result.kind})`}\` in enter.`,
+          )
+        }
+      }
+    }
+
+    // Exit phase for nodes[~offset]
+    let index = ~offset // Two's complement to get original offset
+    ctx.index = index
+    let node = nodes[index]
+
+    let result = exit(node, ctx) ?? WalkAction.Continue
+
+    switch (result.kind) {
+      case WalkKind.Continue:
+        frame[1] = index + 1 // Advance to next sibling
+        continue
+
+      case WalkKind.Stop:
+        return // Stop immediately
+
+      case WalkKind.Replace: {
+        nodes.splice(index, 1, ...result.nodes)
+        frame[1] = index + result.nodes.length // Advance to next sibling past replacements
+        continue
+      }
+
+      case WalkKind.ReplaceStop: {
+        nodes.splice(index, 1, ...result.nodes)
+        return // Stop immediately
+      }
+
+      case WalkKind.ReplaceSkip: {
+        nodes.splice(index, 1, ...result.nodes)
+        frame[1] = index + result.nodes.length // Advance to next sibling past replacements
+        continue
+      }
+
+      default: {
+        result satisfies never
+        throw new Error(
+          // @ts-expect-error `result.kind` could still be filled with an invalid value
+          `Invalid \`WalkAction.${WalkKind[result.kind] ?? `Unknown(${result.kind})`}\` in exit.`,
+        )
+      }
+    }
+  }
+}
diff --git a/packages/tailwindcss/tests/ui.spec.ts b/packages/tailwindcss/tests/ui.spec.ts
index 5b3563ed2..e5da091d8 100644
--- a/packages/tailwindcss/tests/ui.spec.ts
+++ b/packages/tailwindcss/tests/ui.spec.ts
@@ -2,8 +2,9 @@ import { expect, test, type Page } from '@playwright/test'
 import { Scanner } from '@tailwindcss/oxide'
 import fs from 'node:fs'
 import path from 'node:path'
+import { optimize } from '../../@tailwindcss-node/src/optimize'
 import { compile } from '../src'
-import { optimizeCss } from '../src/test-utils/run'
+import { segment } from '../src/utils/segment'
 
 const html = String.raw
 const css = String.raw
@@ -157,6 +158,10 @@ for (let [classes, expected] of [
     'bg-radial-[at_0%_0%,var(--color-red),transparent]',
     'radial-gradient(at 0% 0%, rgb(255, 0, 0), rgba(0, 0, 0, 0))',
   ],
+  [
+    'bg-radial-[at_center] from-red to-green',
+    'radial-gradient(rgb(255, 0, 0) 0%, rgb(0, 255, 0) 100%)',
+  ],
 ]) {
   test(`radial gradient, "${classes}"`, async ({ page }) => {
     let { getPropertyValue } = await render(
@@ -168,6 +173,1305 @@ for (let [classes, expected] of [
   })
 }
 
+/**
+ * Edge mask utilities
+ */
+for (let [classes, expected] of [
+  //
+  // Single values (from)
+  //
+  [
+    'mask-x-from-20%',
+    [
+      // Linear
+      'linear-gradient(to left, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+      'linear-gradient(to right, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-y-from-20%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+      'linear-gradient(to top, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-t-from-20%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(to top, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-r-from-20%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(to right, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-b-from-20%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-l-from-20%',
+    [
+      // Linear
+      'linear-gradient(to left, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+
+  //
+  // Single values (to)
+  //
+  [
+    'mask-x-to-80%',
+    [
+      // Linear
+      'linear-gradient(to left, rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 80%)',
+      'linear-gradient(to right, rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 80%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-y-to-80%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 80%)',
+      'linear-gradient(to top, rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 80%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-t-to-80%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(to top, rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 80%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-r-to-80%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(to right, rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 80%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-b-to-80%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 80%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-l-to-80%',
+    [
+      // Linear
+      'linear-gradient(to left, rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 80%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+
+  //
+  // Multiple values (from + to)
+  //
+  [
+    'mask-x-from-20% mask-x-to-80%',
+    [
+      // Linear
+      'linear-gradient(to left, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+      'linear-gradient(to right, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-y-from-20% mask-y-to-80%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+      'linear-gradient(to top, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-t-from-20% mask-t-to-80%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(to top, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-r-from-20% mask-r-to-80%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(to right, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-b-from-20% mask-b-to-80%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-l-from-20% mask-l-to-80%',
+    [
+      // Linear
+      'linear-gradient(to left, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+
+  //
+  // Multiple edges
+  //
+  [
+    'mask-t-from-10% mask-t-to-20% mask-r-from-30% mask-r-to-40% mask-b-from-50% mask-b-to-60% mask-l-from-70% mask-l-to-80%',
+    [
+      // Linear
+      'linear-gradient(to left, rgb(0, 0, 0) 70%, rgba(0, 0, 0, 0) 80%)',
+      'linear-gradient(to right, rgb(0, 0, 0) 30%, rgba(0, 0, 0, 0) 40%)',
+      'linear-gradient(rgb(0, 0, 0) 50%, rgba(0, 0, 0, 0) 60%)',
+      'linear-gradient(to top, rgb(0, 0, 0) 10%, rgba(0, 0, 0, 0) 20%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-x-from-10% mask-x-to-20% mask-y-from-30% mask-y-to-40%',
+    [
+      // Linear
+      'linear-gradient(to left, rgb(0, 0, 0) 10%, rgba(0, 0, 0, 0) 20%)',
+      'linear-gradient(to right, rgb(0, 0, 0) 10%, rgba(0, 0, 0, 0) 20%)',
+      'linear-gradient(rgb(0, 0, 0) 30%, rgba(0, 0, 0, 0) 40%)',
+      'linear-gradient(to top, rgb(0, 0, 0) 30%, rgba(0, 0, 0, 0) 40%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+
+  //
+  // Multiple edges
+  // TRBL takes precedence over XY
+  //
+  [
+    'mask-x-from-20% mask-x-to-80% mask-l-from-30% mask-r-to-70%',
+    [
+      // Linear
+      'linear-gradient(to left, rgb(0, 0, 0) 30%, rgba(0, 0, 0, 0) 80%)',
+      'linear-gradient(to right, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 70%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-y-from-20% mask-y-to-80% mask-t-from-30% mask-b-to-70%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 70%)',
+      'linear-gradient(to top, rgb(0, 0, 0) 30%, rgba(0, 0, 0, 0) 80%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+]) {
+  test(`mask edges, "${classes}"`, async ({ page }) => {
+    let { getPropertyValue } = await render(
+      page,
+      html`<div id="x" class="${classes}">Hello world</div>`,
+    )
+
+    if (Array.isArray(expected)) {
+      expect(expected).toContain(await getPropertyValue('#x', 'mask-image'))
+    } else {
+      expect(await getPropertyValue('#x', 'mask-image')).toEqual(expected)
+    }
+  })
+}
+
+/**
+ * Linear mask utilities
+ */
+for (let [classes, expected] of [
+  //
+  // Single values (from, to)
+  //
+  [
+    'mask-linear-45 mask-linear-from-20%',
+    [
+      // WebKit / Firefox
+      [
+        // Linear
+        'linear-gradient(45deg, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+        // Radial
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Conic
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      ].join(', '),
+
+      // Chromium
+      [
+        // Linear
+        'linear-gradient(calc(45deg), rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+        // Radial
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Conic
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      ].join(', '),
+    ],
+  ],
+  [
+    'mask-linear-45 mask-linear-to-80%',
+    [
+      // WebKit / Firefox
+      [
+        // Linear
+        'linear-gradient(45deg, rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 80%)',
+        // Radial
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Conic
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      ].join(', '),
+
+      // Chromium
+      [
+        // Linear
+        'linear-gradient(calc(45deg), rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 80%)',
+        // Radial
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Conic
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      ].join(', '),
+    ],
+  ],
+
+  //
+  // Multiple values
+  //
+  [
+    'mask-linear-45 mask-linear-from-20% mask-linear-to-80%',
+    [
+      // WebKit / Firefox
+      [
+        // Linear
+        'linear-gradient(45deg, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+        // Radial
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Conic
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      ].join(', '),
+
+      // Chromium
+      [
+        // Linear
+        'linear-gradient(calc(45deg), rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+        // Radial
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Conic
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      ].join(', '),
+    ],
+  ],
+]) {
+  test(`mask linear, "${classes}"`, async ({ page }) => {
+    let { getPropertyValue } = await render(
+      page,
+      html`<div id="x" class="${classes}">Hello world</div>`,
+    )
+
+    if (Array.isArray(expected)) {
+      expect(expected).toContain(await getPropertyValue('#x', 'mask-image'))
+    } else {
+      expect(await getPropertyValue('#x', 'mask-image')).toEqual(expected)
+    }
+  })
+}
+
+/**
+ * Radial mask utilities
+ */
+for (let [classes, expected] of [
+  //
+  // Single values (from, to)
+  //
+  [
+    'mask-radial-from-20%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'radial-gradient(rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-radial-to-80%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'radial-gradient(rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 80%)',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+
+  //
+  // Multiple values (from, to)
+  //
+  [
+    'mask-radial-from-20% mask-radial-to-80%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'radial-gradient(rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+
+  //
+  // Shapes
+  //
+  [
+    'mask-circle mask-radial-from-20% mask-radial-to-80%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'radial-gradient(circle, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+  [
+    'mask-ellipse mask-radial-from-20% mask-radial-to-80%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'radial-gradient(rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+
+  //
+  // Positions
+  //
+  [
+    'mask-radial-at-top-left mask-radial-from-20% mask-radial-to-80%',
+    [
+      // WebKit / Firefox
+      [
+        // Linear
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Radial
+        'radial-gradient(at 0% 0%, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+        // Conic
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      ].join(', '),
+
+      // Chromium
+      [
+        // Linear
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Radial
+        'radial-gradient(at left top, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+        // Conic
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      ].join(', '),
+    ],
+  ],
+  [
+    'mask-circle mask-radial-at-top-left mask-radial-from-20% mask-radial-to-80%',
+    [
+      // WebKit / Firefox
+      [
+        // Linear
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Radial
+        'radial-gradient(circle at 0% 0%, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+        // Conic
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      ].join(', '),
+
+      // Chromium
+      [
+        // Linear
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Radial
+        'radial-gradient(circle at left top, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+        // Conic
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      ].join(', '),
+    ],
+  ],
+
+  //
+  // Sizes
+  //
+  [
+    'mask-radial-[100%_100%] mask-radial-from-20%',
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'radial-gradient(100% 100%, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ],
+
+  //
+  // Complicated radial gradient
+  //
+  [
+    'mask-radial-[25%_150%] mask-radial-at-top mask-ellipse mask-radial-from-20% mask-radial-to-80%',
+    [
+      // WebKit / Firefox
+      [
+        // Linear
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Radial
+        'radial-gradient(25% 150% at 50% 0%, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+        // Conic
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      ].join(', '),
+
+      // Chromium
+      [
+        // Linear
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Radial
+        'radial-gradient(25% 150% at center top, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+        // Conic
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      ].join(', '),
+    ],
+  ],
+]) {
+  test(`mask radial, "${classes}"`, async ({ page }) => {
+    let { getPropertyValue } = await render(
+      page,
+      html`<div id="x" class="${classes}">Hello world</div>`,
+    )
+
+    if (Array.isArray(expected)) {
+      expect(expected).toContain(await getPropertyValue('#x', 'mask-image'))
+    } else {
+      expect(await getPropertyValue('#x', 'mask-image')).toEqual(expected)
+    }
+  })
+}
+
+/**
+ * Conic mask utilities
+ */
+for (let [classes, expected] of [
+  //
+  // Single values (from, to)
+  //
+  [
+    'mask-conic-45 mask-conic-from-20%',
+    [
+      // WebKit / Firefox
+      [
+        // Linear
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Radial
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Conic
+        'conic-gradient(from 45deg, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+      ].join(', '),
+
+      // Chromium
+      [
+        // Linear
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Radial
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Conic
+        'conic-gradient(from calc(45deg), rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+      ].join(', '),
+    ],
+  ],
+  [
+    'mask-conic-45 mask-conic-to-80%',
+    [
+      // WebKit / Firefox
+      [
+        // Linear
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Radial
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Conic
+        'conic-gradient(from 45deg, rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 80%)',
+      ].join(', '),
+
+      // Chromium
+      [
+        // Linear
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Radial
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Conic
+        'conic-gradient(from calc(45deg), rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 80%)',
+      ].join(', '),
+    ],
+  ],
+
+  //
+  // Multiple values
+  //
+  [
+    'mask-conic-45 mask-conic-from-20% mask-conic-to-80%',
+    [
+      // WebKit / Firefox
+      [
+        // Linear
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Radial
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Conic
+        'conic-gradient(from 45deg, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+      ].join(', '),
+
+      // Chromium
+      [
+        // Linear
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Radial
+        'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+        // Conic
+        'conic-gradient(from calc(45deg), rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 80%)',
+      ].join(', '),
+    ],
+  ],
+]) {
+  test(`mask conic, "${classes}"`, async ({ page }) => {
+    let { getPropertyValue } = await render(
+      page,
+      html`<div id="x" class="${classes}">Hello world</div>`,
+    )
+
+    if (Array.isArray(expected)) {
+      expect(expected).toContain(await getPropertyValue('#x', 'mask-image'))
+    } else {
+      expect(await getPropertyValue('#x', 'mask-image')).toEqual(expected)
+    }
+  })
+}
+
+/**
+ * Multiple masks
+ */
+for (let [classes, expected] of [
+  //
+  // Single values (from, to)
+  //
+  [
+    'mask-conic-45 mask-conic-from-20% mask-linear-30 mask-linear-to-70% mask-circle mask-radial-from-40% mask-radial-to-80%',
+    [
+      // WebKit / Firefox
+      [
+        // Linear
+        'linear-gradient(30deg, rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 70%)',
+        // Radial
+        'radial-gradient(circle, rgb(0, 0, 0) 40%, rgba(0, 0, 0, 0) 80%)',
+        // Conic
+        'conic-gradient(from 45deg, rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+      ].join(', '),
+
+      // Chromium
+      [
+        // Linear
+        'linear-gradient(calc(30deg), rgb(0, 0, 0) 0%, rgba(0, 0, 0, 0) 70%)',
+        // Radial
+        'radial-gradient(circle, rgb(0, 0, 0) 40%, rgba(0, 0, 0, 0) 80%)',
+        // Conic
+        'conic-gradient(from calc(45deg), rgb(0, 0, 0) 20%, rgba(0, 0, 0, 0) 100%)',
+      ].join(', '),
+    ],
+  ],
+]) {
+  test(`mask multiple, "${classes}"`, async ({ page }) => {
+    let { getPropertyValue } = await render(
+      page,
+      html`<div id="x" class="${classes}">Hello world</div>`,
+    )
+
+    if (Array.isArray(expected)) {
+      expect(expected).toContain(await getPropertyValue('#x', 'mask-image'))
+    } else {
+      expect(await getPropertyValue('#x', 'mask-image')).toEqual(expected)
+    }
+  })
+}
+
+test('mask edges can be changed on hover', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html` <div id="x" class="mask-x-from-25% hover:mask-x-to-75%">Hello world</div> `,
+  )
+
+  expect(await getPropertyValue('#x', 'mask-image')).toEqual(
+    [
+      // Linear
+      'linear-gradient(to left, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      'linear-gradient(to right, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  )
+
+  await page.locator('#x').hover()
+
+  expect(await getPropertyValue('#x', 'mask-image')).toEqual(
+    [
+      // Linear
+      'linear-gradient(to left, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 75%)',
+      'linear-gradient(to right, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 75%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  )
+})
+
+test('mask edge colors can be changed on hover', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html`
+      <div id="x" class="mask-x-from-25% hover:mask-x-from-transparent hover:mask-x-to-black">
+        Hello world
+      </div>
+    `,
+  )
+
+  expect(await getPropertyValue('#x', 'mask-image')).toEqual(
+    [
+      // Linear
+      'linear-gradient(to left, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      'linear-gradient(to right, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  )
+
+  await page.locator('#x').hover()
+
+  expect(await getPropertyValue('#x', 'mask-image')).toEqual(
+    [
+      // Linear
+      'linear-gradient(to left, rgba(0, 0, 0, 0) 25%, rgb(0, 0, 0) 100%)',
+      'linear-gradient(to right, rgba(0, 0, 0, 0) 25%, rgb(0, 0, 0) 100%)',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  )
+})
+
+test('linear mask direction can be changed on hover', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html`
+      <div id="x" class="mask-linear-15 mask-linear-from-25% hover:mask-linear-45">Hello world</div>
+    `,
+  )
+
+  expect([
+    // WebKit / Firefox
+    [
+      // Linear
+      'linear-gradient(15deg, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+
+    // Chromium
+    [
+      // Linear
+      'linear-gradient(calc(15deg), rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ]).toContain(await getPropertyValue('#x', 'mask-image'))
+
+  await page.locator('#x').hover()
+
+  expect([
+    // WebKit / Firefox
+    [
+      // Linear
+      'linear-gradient(45deg, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+
+    // Chromium
+    [
+      // Linear
+      'linear-gradient(calc(45deg), rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ]).toContain(await getPropertyValue('#x', 'mask-image'))
+})
+
+test('linear mask position can be changed on hover', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html`
+      <div id="x" class="mask-linear-15 mask-linear-from-25% hover:mask-linear-to-75%">
+        Hello world
+      </div>
+    `,
+  )
+
+  expect([
+    // WebKit / Firefox
+    [
+      // Linear
+      'linear-gradient(15deg, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+
+    // Chromium
+    [
+      // Linear
+      'linear-gradient(calc(15deg), rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ]).toContain(await getPropertyValue('#x', 'mask-image'))
+
+  await page.locator('#x').hover()
+
+  expect([
+    // WebKit / Firefox
+    [
+      // Linear
+      'linear-gradient(15deg, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 75%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+
+    // Chromium
+    [
+      // Linear
+      'linear-gradient(calc(15deg), rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 75%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ]).toContain(await getPropertyValue('#x', 'mask-image'))
+})
+
+test('linear mask colors can be changed on hover', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html`
+      <div
+        id="x"
+        class="mask-linear-15 mask-linear-from-25% hover:mask-linear-from-transparent hover:mask-linear-to-black"
+      >
+        Hello world
+      </div>
+    `,
+  )
+
+  expect([
+    // WebKit / Firefox
+    [
+      // Linear
+      'linear-gradient(15deg, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+
+    // Chromium
+    [
+      // Linear
+      'linear-gradient(calc(15deg), rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ]).toContain(await getPropertyValue('#x', 'mask-image'))
+
+  await page.locator('#x').hover()
+
+  expect([
+    // WebKit / Firefox
+    [
+      // Linear
+      'linear-gradient(15deg, rgba(0, 0, 0, 0) 25%, rgb(0, 0, 0) 100%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+
+    // Chromium
+    [
+      // Linear
+      'linear-gradient(calc(15deg), rgba(0, 0, 0, 0) 25%, rgb(0, 0, 0) 100%)',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  ]).toContain(await getPropertyValue('#x', 'mask-image'))
+})
+
+test('radial mask size can be changed on hover', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html`
+      <div id="x" class="mask-radial-[50%_50%] mask-radial-from-25% hover:mask-radial-[125%_25%]">
+        Hello world
+      </div>
+    `,
+  )
+
+  expect(await getPropertyValue('#x', 'mask-image')).toEqual(
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'radial-gradient(50% 50%, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  )
+
+  await page.locator('#x').hover()
+
+  expect(await getPropertyValue('#x', 'mask-image')).toEqual(
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'radial-gradient(125% 25%, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  )
+})
+
+test('radial mask position can be changed on hover', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html`
+      <div id="x" class="mask-radial-[50%_50%] mask-radial-from-25% hover:mask-radial-to-75%">
+        Hello world
+      </div>
+    `,
+  )
+
+  expect(await getPropertyValue('#x', 'mask-image')).toEqual(
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'radial-gradient(50% 50%, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  )
+
+  await page.locator('#x').hover()
+
+  expect(await getPropertyValue('#x', 'mask-image')).toEqual(
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'radial-gradient(50% 50%, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 75%)',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  )
+})
+
+test('radial mask color can be changed on hover', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html`
+      <div
+        id="x"
+        class="mask-radial-[50%_50%] mask-radial-from-25% hover:mask-radial-from-transparent hover:mask-radial-to-black"
+      >
+        Hello world
+      </div>
+    `,
+  )
+
+  expect(await getPropertyValue('#x', 'mask-image')).toEqual(
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'radial-gradient(50% 50%, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  )
+
+  await page.locator('#x').hover()
+
+  expect(await getPropertyValue('#x', 'mask-image')).toEqual(
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'radial-gradient(50% 50%, rgba(0, 0, 0, 0) 25%, rgb(0, 0, 0) 100%)',
+      // Conic
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+    ].join(', '),
+  )
+})
+
+test('conic mask direction can be changed on hover', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html`
+      <div id="x" class="mask-conic-15 mask-conic-from-25% hover:mask-conic-45">Hello world</div>
+    `,
+  )
+
+  expect([
+    // WebKit / Firefox
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'conic-gradient(from 15deg, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+    ].join(', '),
+
+    // Chromium
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'conic-gradient(from calc(15deg), rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+    ].join(', '),
+  ]).toContain(await getPropertyValue('#x', 'mask-image'))
+
+  await page.locator('#x').hover()
+
+  expect([
+    // WebKit / Firefox
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'conic-gradient(from 45deg, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+    ].join(', '),
+
+    // Chromium
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'conic-gradient(from calc(45deg), rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+    ].join(', '),
+  ]).toContain(await getPropertyValue('#x', 'mask-image'))
+})
+
+test('conic mask position can be changed on hover', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html`
+      <div id="x" class="mask-conic-15 mask-conic-from-25% hover:mask-conic-to-75%">
+        Hello world
+      </div>
+    `,
+  )
+
+  expect([
+    // WebKit / Firefox
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'conic-gradient(from 15deg, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+    ].join(', '),
+
+    // Chromium
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'conic-gradient(from calc(15deg), rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+    ].join(', '),
+  ]).toContain(await getPropertyValue('#x', 'mask-image'))
+
+  await page.locator('#x').hover()
+
+  expect([
+    // WebKit / Firefox
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'conic-gradient(from 15deg, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 75%)',
+    ].join(', '),
+
+    // Chromium
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'conic-gradient(from calc(15deg), rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 75%)',
+    ].join(', '),
+  ]).toContain(await getPropertyValue('#x', 'mask-image'))
+})
+
+test('conic mask color can be changed on hover', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html`
+      <div
+        id="x"
+        class="mask-conic-15 mask-conic-from-25% hover:mask-conic-from-transparent hover:mask-conic-to-black"
+      >
+        Hello world
+      </div>
+    `,
+  )
+
+  expect([
+    // WebKit / Firefox
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'conic-gradient(from 15deg, rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+    ].join(', '),
+
+    // Chromium
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'conic-gradient(from calc(15deg), rgb(0, 0, 0) 25%, rgba(0, 0, 0, 0) 100%)',
+    ].join(', '),
+  ]).toContain(await getPropertyValue('#x', 'mask-image'))
+
+  await page.locator('#x').hover()
+
+  expect([
+    // WebKit / Firefox
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'conic-gradient(from 15deg, rgba(0, 0, 0, 0) 25%, rgb(0, 0, 0) 100%)',
+    ].join(', '),
+
+    // Chromium
+    [
+      // Linear
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Radial
+      'linear-gradient(rgb(255, 255, 255), rgb(255, 255, 255))',
+      // Conic
+      'conic-gradient(from calc(15deg), rgba(0, 0, 0, 0) 25%, rgb(0, 0, 0) 100%)',
+    ].join(', '),
+  ]).toContain(await getPropertyValue('#x', 'mask-image'))
+})
+
 test("::backdrop can receive a border with just the 'border' utility", async ({ page }) => {
   let { getPropertyValue } = await render(
     page,
@@ -210,7 +1514,7 @@ test.skip("::file-selector-button can receive a border with just the 'border' ut
 })
 
 test('composing shadow, inset shadow, ring, and inset ring', async ({ page }) => {
-  let { getPropertyValue } = await render(
+  let { getPropertyList } = await render(
     page,
     html`<div
       id="x"
@@ -218,19 +1522,19 @@ test('composing shadow, inset shadow, ring, and inset ring', async ({ page }) =>
     ></div>`,
   )
 
-  expect(await getPropertyValue('#x', 'box-shadow')).toEqual(
-    [
-      'rgb(0, 255, 0) 0px 2px 4px 0px inset', // inset-shadow
-      'rgb(0, 0, 255) 0px 0px 0px 1px inset', // inset-ring
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px', // ring-offset (disabled)
-      'rgb(255, 255, 255) 0px 0px 0px 1px', // ring
-      'rgb(255, 0, 0) 0px 1px 3px 0px, rgb(255, 0, 0) 0px 1px 2px -1px', // shadow
-    ].join(', '),
-  )
+  expect(await getPropertyList('#x', 'box-shadow')).toEqual([
+    expect.stringMatching(/oklab\(0.866\d+ -0.233\d+ 0.179\d+\) 0px 2px 4px 0px inset/), // inset-shadow
+    'rgb(0, 0, 255) 0px 0px 0px 1px inset', // inset-ring
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px', // ring-offset (disabled)
+    'rgb(255, 255, 255) 0px 0px 0px 1px', // ring
+
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 3px 0px/), // shadow
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 2px -1px/), // shadow
+  ])
 })
 
 test('shadow colors', async ({ page }) => {
-  let { getPropertyValue } = await render(
+  let { getPropertyList } = await render(
     page,
     html`
       <div id="a" class="shadow-sm shadow-red"></div>
@@ -240,84 +1544,111 @@ test('shadow colors', async ({ page }) => {
       <div id="e" class="shadow-sm shadow-red hover:shadow-xl hover:shadow-initial">
         Hello world
       </div>
+
+      <div id="f" class="shadow-xs/75">Hello world</div>
+      <div id="g" class="shadow-xs/75 shadow-red/75">Hello world</div>
     `,
   )
 
-  expect(await getPropertyValue('#a', 'box-shadow')).toEqual(
-    [
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgb(255, 0, 0) 0px 1px 3px 0px, rgb(255, 0, 0) 0px 1px 2px -1px',
-    ].join(', '),
-  )
-  expect(await getPropertyValue('#b', 'box-shadow')).toEqual(
-    [
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgb(255, 0, 0) 0px 20px 25px -5px, rgb(255, 0, 0) 0px 8px 10px -6px',
-    ].join(', '),
-  )
-  expect(await getPropertyValue('#c', 'box-shadow')).toEqual(
-    [
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgb(255, 0, 0) 0px 2px 4px 0px',
-    ].join(', '),
-  )
+  expect(await getPropertyList('#a', 'box-shadow')).toEqual([
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
 
-  expect(await getPropertyValue('#d', 'box-shadow')).toEqual(
-    [
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgb(255, 0, 0) 0px 1px 3px 0px, rgb(255, 0, 0) 0px 1px 2px -1px',
-    ].join(', '),
-  )
+    //
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 3px 0px/),
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 2px -1px/),
+  ])
+
+  expect(await getPropertyList('#b', 'box-shadow')).toEqual([
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+
+    //
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 20px 25px -5px/),
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 8px 10px -6px/),
+  ])
+
+  expect(await getPropertyList('#c', 'box-shadow')).toEqual([
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+
+    //
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 2px 4px 0px/),
+  ])
+
+  expect(await getPropertyList('#d', 'box-shadow')).toEqual([
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+
+    //
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 3px 0px/),
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 2px -1px/),
+  ])
+
+  expect(await getPropertyList('#f', 'box-shadow')).toEqual([
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'oklab(0 0 0 / 0.75) 0px 1px 2px 0px',
+  ])
+
+  expect(await getPropertyList('#g', 'box-shadow')).toEqual([
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+ \/ 0.56\d+\) 0px 1px 2px 0px/),
+  ])
 
   await page.locator('#d').hover()
 
-  expect(await getPropertyValue('#d', 'box-shadow')).toEqual(
-    [
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgb(255, 0, 0) 0px 20px 25px -5px, rgb(255, 0, 0) 0px 8px 10px -6px',
-    ].join(', '),
-  )
+  expect(await getPropertyList('#d', 'box-shadow')).toEqual([
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
 
-  expect(await getPropertyValue('#e', 'box-shadow')).toEqual(
-    [
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgb(255, 0, 0) 0px 1px 3px 0px, rgb(255, 0, 0) 0px 1px 2px -1px',
-    ].join(', '),
-  )
+    //
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 20px 25px -5px/),
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 8px 10px -6px/),
+  ])
+
+  expect(await getPropertyList('#e', 'box-shadow')).toEqual([
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+
+    //
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 3px 0px/),
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 2px -1px/),
+  ])
 
   await page.locator('#e').hover()
 
-  expect(await getPropertyValue('#e', 'box-shadow')).toEqual(
-    [
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0.1) 0px 20px 25px -5px, rgba(0, 0, 0, 0.1) 0px 8px 10px -6px',
-    ].join(', '),
-  )
+  expect(await getPropertyList('#e', 'box-shadow')).toEqual([
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+
+    //
+    'rgba(0, 0, 0, 0.1) 0px 20px 25px -5px',
+    'rgba(0, 0, 0, 0.1) 0px 8px 10px -6px',
+  ])
 })
 
 test('inset shadow colors', async ({ page }) => {
-  let { getPropertyValue } = await render(
+  let { getPropertyList } = await render(
     page,
     html`
       <div id="a" class="inset-shadow-xs inset-shadow-red"></div>
@@ -330,89 +1661,257 @@ test('inset shadow colors', async ({ page }) => {
       >
         Hello world
       </div>
+
+      <div id="f" class="inset-shadow-xs/75">Hello world</div>
+      <div id="g" class="inset-shadow-xs/75 inset-shadow-red/75">Hello world</div>
     `,
   )
 
-  expect(await getPropertyValue('#a', 'box-shadow')).toEqual(
-    [
-      'rgb(255, 0, 0) 0px 1px 1px 0px inset',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-    ].join(', '),
-  )
-  expect(await getPropertyValue('#b', 'box-shadow')).toEqual(
-    [
-      'rgb(255, 0, 0) 0px 2px 4px 0px inset',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-    ].join(', '),
-  )
-  expect(await getPropertyValue('#c', 'box-shadow')).toEqual(
-    [
-      'rgb(255, 0, 0) 0px 3px 6px 0px inset',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-    ].join(', '),
+  expect(await getPropertyList('#a', 'box-shadow')).toEqual([
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 1px 0px inset/),
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+  ])
+  expect(await getPropertyList('#b', 'box-shadow')).toEqual([
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 2px 4px 0px inset/),
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+  ])
+  expect(await getPropertyList('#c', 'box-shadow')).toEqual([
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 3px 6px 0px inset/),
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+  ])
+
+  expect(await getPropertyList('#d', 'box-shadow')).toEqual([
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 1px 0px inset/),
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+  ])
+
+  expect(await getPropertyList('#f', 'box-shadow')).toEqual([
+    'oklab(0 0 0 / 0.75) 0px 1px 1px 0px inset',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+  ])
+
+  expect(await getPropertyList('#g', 'box-shadow')).toEqual([
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+ \/ 0.56\d+\) 0px 1px 1px 0px inset/),
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+  ])
+
+  await page.locator('#d').hover()
+
+  expect(await getPropertyList('#d', 'box-shadow')).toEqual([
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 2px 4px 0px inset/),
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+  ])
+
+  expect(await getPropertyList('#e', 'box-shadow')).toEqual([
+    expect.stringMatching(/oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 1px 0px inset/),
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+  ])
+
+  await page.locator('#e').hover()
+
+  expect(await getPropertyList('#e', 'box-shadow')).toEqual([
+    'rgba(0, 0, 0, 0.05) 0px 2px 4px 0px inset',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+    'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
+  ])
+})
+
+test('text shadow colors', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html`
+      <div id="a" class="text-shadow-xs text-shadow-red"></div>
+      <div id="b" class="text-shadow-lg text-shadow-red"></div>
+      <div id="c" class="text-shadow-[0px_2px_4px] text-shadow-red"></div>
+      <div id="d" class="text-shadow-xs text-shadow-red hover:text-shadow-lg">Hello world</div>
+      <div
+        id="e"
+        class="text-shadow-xs text-shadow-red hover:text-shadow-lg hover:text-shadow-initial"
+      >
+        Hello world
+      </div>
+
+      <div id="f" class="text-shadow-xs/75">Hello world</div>
+      <div id="g" class="text-shadow-xs/75 text-shadow-red/75">Hello world</div>
+    `,
   )
 
-  expect(await getPropertyValue('#d', 'box-shadow')).toEqual(
-    [
-      'rgb(255, 0, 0) 0px 1px 1px 0px inset',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-    ].join(', '),
+  expect(await getPropertyValue('#a', 'text-shadow')).toMatch(
+    /oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 1px/,
+  )
+  expect(await getPropertyValue('#b', 'text-shadow')).toMatch(
+    /oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 2px, oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 3px 2px, oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 4px 8px/,
+  )
+  expect(await getPropertyValue('#c', 'text-shadow')).toMatch(
+    /oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 2px 4px/,
+  )
+  expect(await getPropertyValue('#d', 'text-shadow')).toMatch(
+    /oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 1px/,
+  )
+
+  expect(await getPropertyValue('#f', 'text-shadow')).toEqual('oklab(0 0 0 / 0.75) 0px 1px 1px')
+  expect(await getPropertyValue('#g', 'text-shadow')).toMatch(
+    /oklab\(0.627\d+ 0.224\d+ 0.125\d+ \/ 0.56\d+\) 0px 1px 1px/,
   )
 
   await page.locator('#d').hover()
 
-  expect(await getPropertyValue('#d', 'box-shadow')).toEqual(
-    [
-      'rgb(255, 0, 0) 0px 2px 4px 0px inset',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-    ].join(', '),
+  expect(await getPropertyValue('#d', 'text-shadow')).toMatch(
+    /oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 2px, oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 3px 2px, oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 4px 8px/,
   )
 
-  expect(await getPropertyValue('#e', 'box-shadow')).toEqual(
-    [
-      'rgb(255, 0, 0) 0px 1px 1px 0px inset',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-    ].join(', '),
+  expect(await getPropertyValue('#e', 'text-shadow')).toMatch(
+    /oklab\(0.627\d+ 0.224\d+ 0.125\d+\) 0px 1px 1px/,
   )
 
   await page.locator('#e').hover()
 
-  expect(await getPropertyValue('#e', 'box-shadow')).toEqual(
-    [
-      'rgba(0, 0, 0, 0.05) 0px 2px 4px 0px inset',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-      'rgba(0, 0, 0, 0) 0px 0px 0px 0px',
-    ].join(', '),
+  expect(await getPropertyValue('#e', 'text-shadow')).toEqual(
+    'rgba(0, 0, 0, 0.1) 0px 1px 2px, rgba(0, 0, 0, 0.1) 0px 3px 2px, rgba(0, 0, 0, 0.1) 0px 4px 8px',
   )
 })
 
+test('filter', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html`
+      <div
+        id="a"
+        class="blur-md brightness-50 contrast-50 drop-shadow-md grayscale hue-rotate-180 invert saturate-50 sepia"
+      >
+        <div id="b" class="contrast-100"></div>
+      </div>
+    `,
+  )
+
+  expect(await getPropertyValue('#a', 'filter')).toEqual(
+    [
+      'blur(12px)',
+      'brightness(0.5)',
+      'contrast(0.5)',
+      'grayscale(1)',
+      'hue-rotate(180deg)',
+      'invert(1)',
+      'saturate(0.5)',
+      'sepia(1)',
+      'drop-shadow(rgba(0, 0, 0, 0.12) 0px 3px 3px)',
+    ].join(' '),
+  )
+  expect(await getPropertyValue('#b', 'filter')).toEqual('contrast(1)')
+})
+
+test('drop shadow colors', async ({ page }) => {
+  let { getPropertyList } = await render(
+    page,
+    html`
+      <div id="a" class="drop-shadow-md"></div>
+      <div id="b" class="drop-shadow-md drop-shadow-red"></div>
+      <div id="c" class="drop-shadow-md/50"></div>
+      <div id="d" class="drop-shadow-md/50 drop-shadow-red"></div>
+      <div id="e" class="drop-shadow-md/50 drop-shadow-red/50"></div>
+    `,
+  )
+
+  expect(await getPropertyList('#a', 'filter')).toEqual([
+    'drop-shadow(rgba(0, 0, 0, 0.12) 0px 3px 3px)',
+  ])
+
+  expect(await getPropertyList('#b', 'filter')).toEqual([
+    expect.stringMatching(/drop-shadow\(oklab\(0\.627\d+ 0\.224\d+ 0\.125\d+\) 0px 3px 3px\)/),
+  ])
+
+  expect(await getPropertyList('#c', 'filter')).toEqual([
+    'drop-shadow(oklab(0 0 0 / 0.5) 0px 3px 3px)',
+  ])
+
+  expect(await getPropertyList('#d', 'filter')).toEqual([
+    expect.stringMatching(
+      /drop-shadow\(oklab\(0\.627\d+ 0\.224\d+ 0\.125\d+ \/ 0\.5\) 0px 3px 3px\)/,
+    ),
+  ])
+
+  expect(await getPropertyList('#e', 'filter')).toEqual([
+    expect.stringMatching(
+      /drop-shadow\(oklab\(0\.627\d+ 0\.224\d+ 0\.125\d+ \/ 0\.25\) 0px 3px 3px\)/,
+    ),
+  ])
+})
+
+test('multiple drop shadow filters with `@theme inline`', async ({ page }) => {
+  let { getPropertyList } = await render(
+    page,
+    html`
+      <div id="a" class="drop-shadow-inlined"></div>
+      <div id="b" class="drop-shadow-inlined drop-shadow-red"></div>
+      <div style="--drop-shadow-var: 0 20px 20px rgb(0 0 0 / 0.75)">
+        <div id="c" class="drop-shadow-var"></div>
+      </div>
+      <div style="--drop-shadow-var: 0 10px 10px rgb(0 0 0 / 0.75), 0 20px 20px rgb(0 0 0 / 0.75)">
+        <div id="d" class="drop-shadow-var"></div>
+      </div>
+    `,
+    css`
+      @theme {
+        --drop-shadow-var: 0 1px 1px rgb(0 0 0 / 0.5), 0 10px 10px rgb(0 0 0 / 0.25);
+      }
+      @theme inline {
+        --drop-shadow-inlined: 0 1px 1px rgb(0 0 0 / 0.5), 0 10px 10px rgb(0 0 0 / 0.25);
+      }
+    `,
+  )
+
+  expect(await getPropertyList('#a', 'filter')).toEqual([
+    'drop-shadow(rgba(0, 0, 0, 0.5) 0px 1px 1px) drop-shadow(rgba(0, 0, 0, 0.25) 0px 10px 10px)',
+  ])
+
+  expect(await getPropertyList('#b', 'filter')).toEqual([
+    expect.stringMatching(
+      /drop-shadow\(oklab\(0\.627\d+ 0\.224\d+ 0\.125\d+\) 0px 1px 1px\) drop-shadow\(oklab\(0\.627\d+ 0\.224\d+ 0\.125\d+\) 0px 10px 10px\)/,
+    ),
+  ])
+
+  expect(await getPropertyList('#c', 'filter')).toEqual([
+    'drop-shadow(rgba(0, 0, 0, 0.75) 0px 20px 20px)',
+  ])
+
+  // Multiple values are only supported with `@theme inline` because otherwise we use var(…)
+  // inside of drop-shadow(…) which can only ever be a single shadow
+  expect(await getPropertyList('#d', 'filter')).toEqual(['none'])
+})
+
 test('outline style is optional', async ({ page }) => {
   let { getPropertyValue } = await render(
     page,
     html`<div id="x" class="outline-2 outline-white"></div>`,
   )
 
-  expect(await getPropertyValue('#x', 'outline')).toEqual('rgb(255, 255, 255) solid 2px')
+  expect(await getPropertyValue('#x', 'outline')).toEqual('2px solid rgb(255, 255, 255)')
 })
 
 test('outline style is preserved when changing outline width', async ({ page }) => {
@@ -423,11 +1922,11 @@ test('outline style is preserved when changing outline width', async ({ page })
     </div>`,
   )
 
-  expect(await getPropertyValue('#x', 'outline')).toEqual('rgb(255, 255, 255) dotted 2px')
+  expect(await getPropertyValue('#x', 'outline')).toEqual('2px dotted rgb(255, 255, 255)')
 
   await page.locator('#x').hover()
 
-  expect(await getPropertyValue('#x', 'outline')).toEqual('rgb(255, 255, 255) dotted 4px')
+  expect(await getPropertyValue('#x', 'outline')).toEqual('4px dotted rgb(255, 255, 255)')
 })
 
 test('borders can be added without a border-style utility', async ({ page }) => {
@@ -639,6 +2138,369 @@ test('explicit duration and ease utilities are respected when overriding transit
   expect(await getPropertyValue('#x', 'transition-duration')).toEqual('0.5s')
 })
 
+test('shadow DOM has access to variables', async ({ page }) => {
+  await render(
+    page,
+    html`
+      <script type="text/javascript">
+        class Component extends HTMLElement {
+          constructor() {
+            super()
+            this.attachShadow({ mode: 'open' })
+          }
+
+          connectedCallback() {
+            this.shadowRoot.innerHTML =
+              '<style>' +
+              document.querySelector('style').textContent +
+              '</style>' +
+              '<div class="flex gap-2" id="x">' +
+              '  <div>one</div>' +
+              '  <div>two</div>' +
+              '</div>'
+          }
+        }
+
+        customElements.define('my-component', Component)
+      </script>
+
+      <my-component id="shadow"></my-component>
+    `,
+  )
+
+  let gap = await page.evaluate(() => {
+    let shadowRoot = document.querySelector('#shadow')!.shadowRoot!
+    let x = shadowRoot.querySelector('#x')!
+    return window.getComputedStyle(x).getPropertyValue('gap')
+  })
+
+  expect(gap).toBe('8px')
+})
+
+// @scope related tests
+{
+  test('custom variant using `@scope`', async ({ page }) => {
+    let { getPropertyValue } = await render(
+      page,
+      html`
+        <div class="checkout">
+          <div id="in" class="in-checkout:underline">In scope</div>
+          <div class="payment">
+            <div id="beyond" class="in-checkout:underline">Beyond the limit</div>
+          </div>
+        </div>
+        <div id="out" class="in-checkout:underline">Not in scope</div>
+      `,
+      css`
+        @custom-variant in-checkout {
+          @scope (.checkout) to (.payment) {
+            @slot;
+          }
+        }
+      `,
+    )
+
+    test.skip(!(await supportsAtScope(page)), '`@scope` is not supported in this browser')
+
+    expect(await getPropertyValue('#in', 'text-decoration-line')).toEqual('underline')
+    expect(await getPropertyValue('#beyond', 'text-decoration-line')).toEqual('none')
+    expect(await getPropertyValue('#out', 'text-decoration-line')).toEqual('none')
+  })
+
+  test('custom variant using `@scope` behaves like the equivalent authored CSS', async ({
+    page,
+  }) => {
+    // Render the same structure twice:
+    // - Once styled by authored CSS using `@scope`, like the "normal CSS"
+    //   reference in https://github.com/tailwindlabs/tailwindcss/issues/18961
+    // - Once styled by utilities using an equivalent custom variant
+    function structure(prefix: string, probe: string) {
+      return html`
+        <div class="checkout">
+          <div id="${prefix}-in" class="${probe}">In scope</div>
+          <div class="payment">
+            <div id="${prefix}-beyond" class="${probe}">Beyond the limit</div>
+          </div>
+        </div>
+        <div id="${prefix}-out" class="${probe}">Not in scope</div>
+      `
+    }
+
+    let { getPropertyValue } = await render(
+      page,
+      structure('a', 'a-probe') + structure('c', 'in-checkout:underline'),
+      css`
+        @custom-variant in-checkout {
+          @scope (.checkout) to (.payment) {
+            @slot;
+          }
+        }
+      `,
+    )
+
+    // The `a-*` structure is styled by the authored CSS as-is
+    await page.addStyleTag({
+      content: css`
+        @scope (.checkout) to (.payment) {
+          .a-probe {
+            text-decoration-line: underline;
+          }
+        }
+      `,
+    })
+
+    test.skip(!(await supportsAtScope(page)), '`@scope` is not supported in this browser')
+
+    for (let prefix of ['a', 'c']) {
+      expect(await getPropertyValue(`#${prefix}-in`, 'text-decoration-line')).toEqual('underline')
+      expect(await getPropertyValue(`#${prefix}-beyond`, 'text-decoration-line')).toEqual('none')
+      expect(await getPropertyValue(`#${prefix}-out`, 'text-decoration-line')).toEqual('none')
+    }
+  })
+
+  test('user-authored nested `@scope` behaves like the authored CSS', async ({ page }) => {
+    // User-authored `@scope` rules are compiled to their native CSS nesting
+    // semantics. Rendering the same structure twice:
+    // - Once styled by the authored (nested) CSS as-is
+    // - Once styled by the compiled output
+    function structure(prefix: string) {
+      return html`
+        <div class="${prefix}-parent">
+          <div class="${prefix}-scope">
+            <span class="${prefix}-content" id="${prefix}-in">in scope</span>
+            <div class="${prefix}-limit">
+              <span class="${prefix}-content" id="${prefix}-beyond">beyond the limit</span>
+            </div>
+          </div>
+        </div>
+        <div class="${prefix}-scope">
+          <span class="${prefix}-content" id="${prefix}-out">scope not inside parent</span>
+        </div>
+      `
+    }
+
+    function scopeCss(prefix: string) {
+      return css`
+        .${prefix}-parent {
+          @scope (& > .${prefix}-scope) to (& .${prefix}-limit) {
+            .${prefix}-content {
+              text-decoration-line: underline;
+            }
+          }
+        }
+      `
+    }
+
+    // The `c-*` structure is styled by the compiled CSS
+    let { getPropertyValue } = await render(page, structure('a') + structure('c'), scopeCss('c'))
+
+    // The `a-*` structure is styled by the authored CSS as-is
+    await page.addStyleTag({ content: scopeCss('a') })
+
+    test.skip(!(await supportsAtScope(page)), '`@scope` is not supported in this browser')
+
+    // The compiled output only applies within the scope
+    expect(await getPropertyValue('#c-in', 'text-decoration-line')).toEqual('underline')
+    expect(await getPropertyValue('#c-beyond', 'text-decoration-line')).toEqual('none')
+    expect(await getPropertyValue('#c-out', 'text-decoration-line')).toEqual('none')
+
+    // The authored CSS behaves the same
+    expect(await getPropertyValue('#a-in', 'text-decoration-line')).toEqual('underline')
+    expect(await getPropertyValue('#a-out', 'text-decoration-line')).toEqual('none')
+
+    // WebKit currently drops the `<scope-end>` limit entirely when it contains
+    // `&`. Since we resolve the `&` at build time, the compiled output works
+    // even though the authored CSS doesn't.
+    if (test.info().project.name !== 'webkit') {
+      expect(await getPropertyValue('#a-beyond', 'text-decoration-line')).toEqual('none')
+    }
+  })
+
+  test('user-authored `@scope` nested inside another `@scope`', async ({ page }) => {
+    function structure(prefix: string) {
+      return html`
+        <!-- Control: outer > middle > inner -->
+        <div class="${prefix}-outer">
+          <div class="${prefix}-middle">
+            <div class="${prefix}-inner" id="${prefix}-ctrl">ctrl</div>
+          </div>
+        </div>
+
+        <!-- Middle is an ancestor of the outer scope root -->
+        <div class="${prefix}-middle">
+          <div class="${prefix}-outer">
+            <div class="${prefix}-inner" id="${prefix}-ancestor">ancestor</div>
+          </div>
+        </div>
+
+        <!-- Middle is beyond the outer limit -->
+        <div class="${prefix}-outer">
+          <div class="${prefix}-outer-limit">
+            <div class="${prefix}-middle">
+              <div class="${prefix}-inner" id="${prefix}-beyond">beyond</div>
+            </div>
+          </div>
+        </div>
+      `
+    }
+
+    function scopeCss(prefix: string) {
+      return css`
+        @scope (.${prefix}-outer) to (.${prefix}-outer-limit) {
+          .${prefix}-middle {
+            @scope (.${prefix}-inner) to (.${prefix}-inner-limit) {
+              text-decoration-line: underline;
+            }
+          }
+        }
+      `
+    }
+
+    // The `c-*` structure is styled by the compiled CSS
+    let { getPropertyValue } = await render(page, structure('a') + structure('c'), scopeCss('c'))
+
+    // The `a-*` structure is styled by the authored CSS as-is
+    await page.addStyleTag({ content: scopeCss('a') })
+
+    test.skip(!(await supportsAtScope(page)), '`@scope` is not supported in this browser')
+
+    // The compiled output behaves the same in every browser
+    expect(await getPropertyValue('#c-ctrl', 'text-decoration-line')).toEqual('underline')
+    expect(await getPropertyValue('#c-ancestor', 'text-decoration-line')).toEqual('none')
+    expect(await getPropertyValue('#c-beyond', 'text-decoration-line')).toEqual('none')
+
+    // The authored CSS behaves the same …
+    expect(await getPropertyValue('#a-ctrl', 'text-decoration-line')).toEqual('underline')
+    expect(await getPropertyValue('#a-beyond', 'text-decoration-line')).toEqual('none')
+
+    // … except in Chromium, which resolves the nesting context of a
+    // rule-nested `@scope` without the enclosing scope's constraint (Safari
+    // and Firefox both constrain it). The compiled output normalizes this
+    // browser difference.
+    if (test.info().project.name !== 'chromium') {
+      expect(await getPropertyValue('#a-ancestor', 'text-decoration-line')).toEqual('none')
+    }
+  })
+
+  function supportsAtScope(page: Page) {
+    return page.evaluate(() => typeof CSSScopeRule !== 'undefined')
+  }
+}
+
+for (let kind of ['group', 'peer']) {
+  test(`${kind}-* variants`, async ({ page }) => {
+    let targets = html`
+      <div id="target" class="${kind}-focus:z-10"></div>
+      <div id="applied" class="applied"></div>
+    `
+
+    let { getPropertyValue } = await render(
+      page,
+      kind === 'group'
+        ? html`<div id="trigger" tabindex="0" class="group owner">${targets}</div>`
+        : html`<div class="owner">
+            <div id="trigger" tabindex="0" class="peer"></div>
+            ${targets}
+          </div>`,
+      css`
+        .owner > .applied {
+          @apply ${kind}-focus:z-20;
+        }
+      `,
+    )
+
+    expect(await getPropertyValue('#target', 'z-index')).toEqual('auto')
+    expect(await getPropertyValue('#applied', 'z-index')).toEqual('auto')
+
+    await page.locator('#trigger').focus()
+
+    expect(await getPropertyValue('#target', 'z-index')).toEqual('10')
+    expect(await getPropertyValue('#applied', 'z-index')).toEqual('20')
+
+    await page.locator('#trigger').blur()
+
+    expect(await getPropertyValue('#target', 'z-index')).toEqual('auto')
+    expect(await getPropertyValue('#applied', 'z-index')).toEqual('auto')
+  })
+}
+
+test('group-* variants do not change specificity', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html`
+      <div id="trigger" tabindex="0" class="group">
+        <div id="target" class="target group-focus:z-10"></div>
+      </div>
+    `,
+    css`
+      @layer utilities {
+        .target {
+          z-index: 20;
+        }
+        .target.equal {
+          z-index: 30;
+        }
+      }
+    `,
+  )
+
+  await page.locator('#trigger').focus()
+
+  expect(await getPropertyValue('#target', 'z-index')).toEqual('10')
+
+  await page.locator('#target').evaluate((element) => element.classList.add('equal'))
+
+  expect(await getPropertyValue('#target', 'z-index')).toEqual('30')
+})
+
+test('stacked group-* variants match regardless of the order of the groups', async ({ page }) => {
+  for (let [outer, inner] of [
+    ['a', 'b'],
+    ['b', 'a'],
+  ]) {
+    let { getPropertyValue } = await render(
+      page,
+      html`
+        <div class="group/${outer}" data-active>
+          <div id="inner" class="group/${inner}" data-active>
+            <div id="target" class="group-data-active/a:group-data-active/b:z-10"></div>
+          </div>
+        </div>
+      `,
+    )
+
+    expect(await getPropertyValue('#target', 'z-index')).toEqual('10')
+
+    await page.locator('#inner').evaluate((element) => element.removeAttribute('data-active'))
+
+    expect(await getPropertyValue('#target', 'z-index')).toEqual('auto')
+  }
+})
+
+test('compound group-* and peer-* variants', async ({ page }) => {
+  let { getPropertyValue } = await render(
+    page,
+    html`
+      <div id="outer" tabindex="0" class="group">
+        <div id="peer" tabindex="0" class="peer"></div>
+        <div id="middle" class="group peer-group-focus:z-20">
+          <div id="target" class="group-peer-focus:z-10"></div>
+        </div>
+      </div>
+    `,
+  )
+
+  await page.locator('#peer').focus()
+
+  expect(await getPropertyValue('#target', 'z-index')).toEqual('10')
+  expect(await getPropertyValue('#middle', 'z-index')).toEqual('auto')
+
+  await page.locator('#outer').focus()
+
+  expect(await getPropertyValue('#target', 'z-index')).toEqual('auto')
+  expect(await getPropertyValue('#middle', 'z-index')).toEqual('20')
+})
+
 // ---
 
 const preflight = fs.readFileSync(path.resolve(__dirname, '..', 'preflight.css'), 'utf-8')
@@ -654,6 +2516,8 @@ async function render(page: Page, content: string, extraCss: string = '') {
         --color-red: rgb(255, 0, 0);
         --color-green: rgb(0, 255, 0);
         --color-blue: rgb(0, 0, 255);
+        --color-black: black;
+        --color-transparent: transparent;
       }
     }
     @layer base {
@@ -673,14 +2537,13 @@ async function render(page: Page, content: string, extraCss: string = '') {
   // mouse to before running the tests.
   content = `<div id="mouse-park" class="size-12"></div>${content}`
 
-  await page.setContent(content)
-
   let scanner = new Scanner({})
   let candidates = scanner.scanFiles([{ content, extension: 'html' }])
 
-  await page.addStyleTag({
-    content: optimizeCss(build(candidates)),
-  })
+  let { code: styles } = optimize(build(candidates))
+
+  content = `<style type="text/css">${styles}</style>${content}`
+  await page.setContent(content)
 
   await page.locator('#mouse-park').hover()
 
@@ -692,6 +2555,16 @@ async function render(page: Page, content: string, extraCss: string = '') {
         property,
       )
     },
+
+    async getPropertyList(selector: string | [string, string], property: string) {
+      let value = await getPropertyValue(
+        page,
+        Array.isArray(selector) ? selector : [selector, undefined],
+        property,
+      )
+
+      return segment(value, ',').map((item) => item.trim())
+    },
   }
 }
 
@@ -700,7 +2573,7 @@ async function getPropertyValue(
   selector: [string, string | undefined],
   property: string,
 ) {
-  return page.evaluate(
+  let value = await page.evaluate(
     ([[selector, pseudo], property]) => {
       return window
         .getComputedStyle(document.querySelector(selector)!, pseudo)
@@ -708,4 +2581,16 @@ async function getPropertyValue(
     },
     [selector, property] as const,
   )
+
+  switch (property) {
+    case 'outline':
+      // Order in webkit vs chromium is different. Sort to normalize.
+      return segment(value, ' ')
+        .map((part) => part.trim())
+        .sort((a, z) => a.length - z.length)
+        .join(' ')
+
+    default:
+      return value
+  }
 }
diff --git a/packages/tailwindcss/theme.css b/packages/tailwindcss/theme.css
index a0652e07d..05364f5c2 100644
--- a/packages/tailwindcss/theme.css
+++ b/packages/tailwindcss/theme.css
@@ -1,273 +1,323 @@
 @theme default {
-  --font-sans: ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
-    'Segoe UI Symbol', 'Noto Color Emoji';
+  --font-sans:
+    -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', 'Noto Sans', Arial,
+    sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
   --font-serif: ui-serif, Georgia, Cambria, 'Times New Roman', Times, serif;
-  --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono',
-    'Courier New', monospace;
+  --font-mono:
+    ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New',
+    monospace;
 
-  --color-red-50: oklch(0.971 0.013 17.38);
-  --color-red-100: oklch(0.936 0.032 17.717);
-  --color-red-200: oklch(0.885 0.062 18.334);
-  --color-red-300: oklch(0.808 0.114 19.571);
-  --color-red-400: oklch(0.704 0.191 22.216);
-  --color-red-500: oklch(0.637 0.237 25.331);
-  --color-red-600: oklch(0.577 0.245 27.325);
-  --color-red-700: oklch(0.505 0.213 27.518);
-  --color-red-800: oklch(0.444 0.177 26.899);
-  --color-red-900: oklch(0.396 0.141 25.723);
-  --color-red-950: oklch(0.258 0.092 26.042);
+  --color-red-50: oklch(97.1% 0.013 17.38);
+  --color-red-100: oklch(93.6% 0.032 17.717);
+  --color-red-200: oklch(88.5% 0.062 18.334);
+  --color-red-300: oklch(80.8% 0.114 19.571);
+  --color-red-400: oklch(70.4% 0.191 22.216);
+  --color-red-500: oklch(63.7% 0.237 25.331);
+  --color-red-600: oklch(57.7% 0.245 27.325);
+  --color-red-700: oklch(50.5% 0.213 27.518);
+  --color-red-800: oklch(44.4% 0.177 26.899);
+  --color-red-900: oklch(39.6% 0.141 25.723);
+  --color-red-950: oklch(25.8% 0.092 26.042);
 
-  --color-orange-50: oklch(0.98 0.016 73.684);
-  --color-orange-100: oklch(0.954 0.038 75.164);
-  --color-orange-200: oklch(0.901 0.076 70.697);
-  --color-orange-300: oklch(0.837 0.128 66.29);
-  --color-orange-400: oklch(0.75 0.183 55.934);
-  --color-orange-500: oklch(0.705 0.213 47.604);
-  --color-orange-600: oklch(0.646 0.222 41.116);
-  --color-orange-700: oklch(0.553 0.195 38.402);
-  --color-orange-800: oklch(0.47 0.157 37.304);
-  --color-orange-900: oklch(0.408 0.123 38.172);
-  --color-orange-950: oklch(0.266 0.079 36.259);
+  --color-orange-50: oklch(98% 0.016 73.684);
+  --color-orange-100: oklch(95.4% 0.038 75.164);
+  --color-orange-200: oklch(90.1% 0.076 70.697);
+  --color-orange-300: oklch(83.7% 0.128 66.29);
+  --color-orange-400: oklch(75% 0.183 55.934);
+  --color-orange-500: oklch(70.5% 0.213 47.604);
+  --color-orange-600: oklch(64.6% 0.222 41.116);
+  --color-orange-700: oklch(55.3% 0.195 38.402);
+  --color-orange-800: oklch(47% 0.157 37.304);
+  --color-orange-900: oklch(40.8% 0.123 38.172);
+  --color-orange-950: oklch(26.6% 0.079 36.259);
 
-  --color-amber-50: oklch(0.987 0.022 95.277);
-  --color-amber-100: oklch(0.962 0.059 95.617);
-  --color-amber-200: oklch(0.924 0.12 95.746);
-  --color-amber-300: oklch(0.879 0.169 91.605);
-  --color-amber-400: oklch(0.828 0.189 84.429);
-  --color-amber-500: oklch(0.769 0.188 70.08);
-  --color-amber-600: oklch(0.666 0.179 58.318);
-  --color-amber-700: oklch(0.555 0.163 48.998);
-  --color-amber-800: oklch(0.473 0.137 46.201);
-  --color-amber-900: oklch(0.414 0.112 45.904);
-  --color-amber-950: oklch(0.279 0.077 45.635);
+  --color-amber-50: oklch(98.7% 0.022 95.277);
+  --color-amber-100: oklch(96.2% 0.059 95.617);
+  --color-amber-200: oklch(92.4% 0.12 95.746);
+  --color-amber-300: oklch(87.9% 0.169 91.605);
+  --color-amber-400: oklch(82.8% 0.189 84.429);
+  --color-amber-500: oklch(76.9% 0.188 70.08);
+  --color-amber-600: oklch(66.6% 0.179 58.318);
+  --color-amber-700: oklch(55.5% 0.163 48.998);
+  --color-amber-800: oklch(47.3% 0.137 46.201);
+  --color-amber-900: oklch(41.4% 0.112 45.904);
+  --color-amber-950: oklch(27.9% 0.077 45.635);
 
-  --color-yellow-50: oklch(0.987 0.026 102.212);
-  --color-yellow-100: oklch(0.973 0.071 103.193);
-  --color-yellow-200: oklch(0.945 0.129 101.54);
-  --color-yellow-300: oklch(0.905 0.182 98.111);
-  --color-yellow-400: oklch(0.852 0.199 91.936);
-  --color-yellow-500: oklch(0.795 0.184 86.047);
-  --color-yellow-600: oklch(0.681 0.162 75.834);
-  --color-yellow-700: oklch(0.554 0.135 66.442);
-  --color-yellow-800: oklch(0.476 0.114 61.907);
-  --color-yellow-900: oklch(0.421 0.095 57.708);
-  --color-yellow-950: oklch(0.286 0.066 53.813);
+  --color-yellow-50: oklch(98.7% 0.026 102.212);
+  --color-yellow-100: oklch(97.3% 0.071 103.193);
+  --color-yellow-200: oklch(94.5% 0.129 101.54);
+  --color-yellow-300: oklch(90.5% 0.182 98.111);
+  --color-yellow-400: oklch(85.2% 0.199 91.936);
+  --color-yellow-500: oklch(79.5% 0.184 86.047);
+  --color-yellow-600: oklch(68.1% 0.162 75.834);
+  --color-yellow-700: oklch(55.4% 0.135 66.442);
+  --color-yellow-800: oklch(47.6% 0.114 61.907);
+  --color-yellow-900: oklch(42.1% 0.095 57.708);
+  --color-yellow-950: oklch(28.6% 0.066 53.813);
 
-  --color-lime-50: oklch(0.986 0.031 120.757);
-  --color-lime-100: oklch(0.967 0.067 122.328);
-  --color-lime-200: oklch(0.938 0.127 124.321);
-  --color-lime-300: oklch(0.897 0.196 126.665);
-  --color-lime-400: oklch(0.841 0.238 128.85);
-  --color-lime-500: oklch(0.768 0.233 130.85);
-  --color-lime-600: oklch(0.648 0.2 131.684);
-  --color-lime-700: oklch(0.532 0.157 131.589);
-  --color-lime-800: oklch(0.453 0.124 130.933);
-  --color-lime-900: oklch(0.405 0.101 131.063);
-  --color-lime-950: oklch(0.274 0.072 132.109);
+  --color-lime-50: oklch(98.6% 0.031 120.757);
+  --color-lime-100: oklch(96.7% 0.067 122.328);
+  --color-lime-200: oklch(93.8% 0.127 124.321);
+  --color-lime-300: oklch(89.7% 0.196 126.665);
+  --color-lime-400: oklch(84.1% 0.238 128.85);
+  --color-lime-500: oklch(76.8% 0.233 130.85);
+  --color-lime-600: oklch(64.8% 0.2 131.684);
+  --color-lime-700: oklch(53.2% 0.157 131.589);
+  --color-lime-800: oklch(45.3% 0.124 130.933);
+  --color-lime-900: oklch(40.5% 0.101 131.063);
+  --color-lime-950: oklch(27.4% 0.072 132.109);
 
-  --color-green-50: oklch(0.982 0.018 155.826);
-  --color-green-100: oklch(0.962 0.044 156.743);
-  --color-green-200: oklch(0.925 0.084 155.995);
-  --color-green-300: oklch(0.871 0.15 154.449);
-  --color-green-400: oklch(0.792 0.209 151.711);
-  --color-green-500: oklch(0.723 0.219 149.579);
-  --color-green-600: oklch(0.627 0.194 149.214);
-  --color-green-700: oklch(0.527 0.154 150.069);
-  --color-green-800: oklch(0.448 0.119 151.328);
-  --color-green-900: oklch(0.393 0.095 152.535);
-  --color-green-950: oklch(0.266 0.065 152.934);
+  --color-green-50: oklch(98.2% 0.018 155.826);
+  --color-green-100: oklch(96.2% 0.044 156.743);
+  --color-green-200: oklch(92.5% 0.084 155.995);
+  --color-green-300: oklch(87.1% 0.15 154.449);
+  --color-green-400: oklch(79.2% 0.209 151.711);
+  --color-green-500: oklch(72.3% 0.219 149.579);
+  --color-green-600: oklch(62.7% 0.194 149.214);
+  --color-green-700: oklch(52.7% 0.154 150.069);
+  --color-green-800: oklch(44.8% 0.119 151.328);
+  --color-green-900: oklch(39.3% 0.095 152.535);
+  --color-green-950: oklch(26.6% 0.065 152.934);
 
-  --color-emerald-50: oklch(0.979 0.021 166.113);
-  --color-emerald-100: oklch(0.95 0.052 163.051);
-  --color-emerald-200: oklch(0.905 0.093 164.15);
-  --color-emerald-300: oklch(0.845 0.143 164.978);
-  --color-emerald-400: oklch(0.765 0.177 163.223);
-  --color-emerald-500: oklch(0.696 0.17 162.48);
-  --color-emerald-600: oklch(0.596 0.145 163.225);
-  --color-emerald-700: oklch(0.508 0.118 165.612);
-  --color-emerald-800: oklch(0.432 0.095 166.913);
-  --color-emerald-900: oklch(0.378 0.077 168.94);
-  --color-emerald-950: oklch(0.262 0.051 172.552);
+  --color-emerald-50: oklch(97.9% 0.021 166.113);
+  --color-emerald-100: oklch(95% 0.052 163.051);
+  --color-emerald-200: oklch(90.5% 0.093 164.15);
+  --color-emerald-300: oklch(84.5% 0.143 164.978);
+  --color-emerald-400: oklch(76.5% 0.177 163.223);
+  --color-emerald-500: oklch(69.6% 0.17 162.48);
+  --color-emerald-600: oklch(59.6% 0.145 163.225);
+  --color-emerald-700: oklch(50.8% 0.118 165.612);
+  --color-emerald-800: oklch(43.2% 0.095 166.913);
+  --color-emerald-900: oklch(37.8% 0.077 168.94);
+  --color-emerald-950: oklch(26.2% 0.051 172.552);
 
-  --color-teal-50: oklch(0.984 0.014 180.72);
-  --color-teal-100: oklch(0.953 0.051 180.801);
-  --color-teal-200: oklch(0.91 0.096 180.426);
-  --color-teal-300: oklch(0.855 0.138 181.071);
-  --color-teal-400: oklch(0.777 0.152 181.912);
-  --color-teal-500: oklch(0.704 0.14 182.503);
-  --color-teal-600: oklch(0.6 0.118 184.704);
-  --color-teal-700: oklch(0.511 0.096 186.391);
-  --color-teal-800: oklch(0.437 0.078 188.216);
-  --color-teal-900: oklch(0.386 0.063 188.416);
-  --color-teal-950: oklch(0.277 0.046 192.524);
+  --color-teal-50: oklch(98.4% 0.014 180.72);
+  --color-teal-100: oklch(95.3% 0.051 180.801);
+  --color-teal-200: oklch(91% 0.096 180.426);
+  --color-teal-300: oklch(85.5% 0.138 181.071);
+  --color-teal-400: oklch(77.7% 0.152 181.912);
+  --color-teal-500: oklch(70.4% 0.14 182.503);
+  --color-teal-600: oklch(60% 0.118 184.704);
+  --color-teal-700: oklch(51.1% 0.096 186.391);
+  --color-teal-800: oklch(43.7% 0.078 188.216);
+  --color-teal-900: oklch(38.6% 0.063 188.416);
+  --color-teal-950: oklch(27.7% 0.046 192.524);
 
-  --color-cyan-50: oklch(0.984 0.019 200.873);
-  --color-cyan-100: oklch(0.956 0.045 203.388);
-  --color-cyan-200: oklch(0.917 0.08 205.041);
-  --color-cyan-300: oklch(0.865 0.127 207.078);
-  --color-cyan-400: oklch(0.789 0.154 211.53);
-  --color-cyan-500: oklch(0.715 0.143 215.221);
-  --color-cyan-600: oklch(0.609 0.126 221.723);
-  --color-cyan-700: oklch(0.52 0.105 223.128);
-  --color-cyan-800: oklch(0.45 0.085 224.283);
-  --color-cyan-900: oklch(0.398 0.07 227.392);
-  --color-cyan-950: oklch(0.302 0.056 229.695);
+  --color-cyan-50: oklch(98.4% 0.019 200.873);
+  --color-cyan-100: oklch(95.6% 0.045 203.388);
+  --color-cyan-200: oklch(91.7% 0.08 205.041);
+  --color-cyan-300: oklch(86.5% 0.127 207.078);
+  --color-cyan-400: oklch(78.9% 0.154 211.53);
+  --color-cyan-500: oklch(71.5% 0.143 215.221);
+  --color-cyan-600: oklch(60.9% 0.126 221.723);
+  --color-cyan-700: oklch(52% 0.105 223.128);
+  --color-cyan-800: oklch(45% 0.085 224.283);
+  --color-cyan-900: oklch(39.8% 0.07 227.392);
+  --color-cyan-950: oklch(30.2% 0.056 229.695);
 
-  --color-sky-50: oklch(0.977 0.013 236.62);
-  --color-sky-100: oklch(0.951 0.026 236.824);
-  --color-sky-200: oklch(0.901 0.058 230.902);
-  --color-sky-300: oklch(0.828 0.111 230.318);
-  --color-sky-400: oklch(0.746 0.16 232.661);
-  --color-sky-500: oklch(0.685 0.169 237.323);
-  --color-sky-600: oklch(0.588 0.158 241.966);
-  --color-sky-700: oklch(0.5 0.134 242.749);
-  --color-sky-800: oklch(0.443 0.11 240.79);
-  --color-sky-900: oklch(0.391 0.09 240.876);
-  --color-sky-950: oklch(0.293 0.066 243.157);
+  --color-sky-50: oklch(97.7% 0.013 236.62);
+  --color-sky-100: oklch(95.1% 0.026 236.824);
+  --color-sky-200: oklch(90.1% 0.058 230.902);
+  --color-sky-300: oklch(82.8% 0.111 230.318);
+  --color-sky-400: oklch(74.6% 0.16 232.661);
+  --color-sky-500: oklch(68.5% 0.169 237.323);
+  --color-sky-600: oklch(58.8% 0.158 241.966);
+  --color-sky-700: oklch(50% 0.134 242.749);
+  --color-sky-800: oklch(44.3% 0.11 240.79);
+  --color-sky-900: oklch(39.1% 0.09 240.876);
+  --color-sky-950: oklch(29.3% 0.066 243.157);
 
-  --color-blue-50: oklch(0.97 0.014 254.604);
-  --color-blue-100: oklch(0.932 0.032 255.585);
-  --color-blue-200: oklch(0.882 0.059 254.128);
-  --color-blue-300: oklch(0.809 0.105 251.813);
-  --color-blue-400: oklch(0.707 0.165 254.624);
-  --color-blue-500: oklch(0.623 0.214 259.815);
-  --color-blue-600: oklch(0.546 0.245 262.881);
-  --color-blue-700: oklch(0.488 0.243 264.376);
-  --color-blue-800: oklch(0.424 0.199 265.638);
-  --color-blue-900: oklch(0.379 0.146 265.522);
-  --color-blue-950: oklch(0.282 0.091 267.935);
+  --color-blue-50: oklch(97% 0.014 254.604);
+  --color-blue-100: oklch(93.2% 0.032 255.585);
+  --color-blue-200: oklch(88.2% 0.059 254.128);
+  --color-blue-300: oklch(80.9% 0.105 251.813);
+  --color-blue-400: oklch(70.7% 0.165 254.624);
+  --color-blue-500: oklch(62.3% 0.214 259.815);
+  --color-blue-600: oklch(54.6% 0.245 262.881);
+  --color-blue-700: oklch(48.8% 0.243 264.376);
+  --color-blue-800: oklch(42.4% 0.199 265.638);
+  --color-blue-900: oklch(37.9% 0.146 265.522);
+  --color-blue-950: oklch(28.2% 0.091 267.935);
 
-  --color-indigo-50: oklch(0.962 0.018 272.314);
-  --color-indigo-100: oklch(0.93 0.034 272.788);
-  --color-indigo-200: oklch(0.87 0.065 274.039);
-  --color-indigo-300: oklch(0.785 0.115 274.713);
-  --color-indigo-400: oklch(0.673 0.182 276.935);
-  --color-indigo-500: oklch(0.585 0.233 277.117);
-  --color-indigo-600: oklch(0.511 0.262 276.966);
-  --color-indigo-700: oklch(0.457 0.24 277.023);
-  --color-indigo-800: oklch(0.398 0.195 277.366);
-  --color-indigo-900: oklch(0.359 0.144 278.697);
-  --color-indigo-950: oklch(0.257 0.09 281.288);
+  --color-indigo-50: oklch(96.2% 0.018 272.314);
+  --color-indigo-100: oklch(93% 0.034 272.788);
+  --color-indigo-200: oklch(87% 0.065 274.039);
+  --color-indigo-300: oklch(78.5% 0.115 274.713);
+  --color-indigo-400: oklch(67.3% 0.182 276.935);
+  --color-indigo-500: oklch(58.5% 0.233 277.117);
+  --color-indigo-600: oklch(51.1% 0.262 276.966);
+  --color-indigo-700: oklch(45.7% 0.24 277.023);
+  --color-indigo-800: oklch(39.8% 0.195 277.366);
+  --color-indigo-900: oklch(35.9% 0.144 278.697);
+  --color-indigo-950: oklch(25.7% 0.09 281.288);
 
-  --color-violet-50: oklch(0.969 0.016 293.756);
-  --color-violet-100: oklch(0.943 0.029 294.588);
-  --color-violet-200: oklch(0.894 0.057 293.283);
-  --color-violet-300: oklch(0.811 0.111 293.571);
-  --color-violet-400: oklch(0.702 0.183 293.541);
-  --color-violet-500: oklch(0.606 0.25 292.717);
-  --color-violet-600: oklch(0.541 0.281 293.009);
-  --color-violet-700: oklch(0.491 0.27 292.581);
-  --color-violet-800: oklch(0.432 0.232 292.759);
-  --color-violet-900: oklch(0.38 0.189 293.745);
-  --color-violet-950: oklch(0.283 0.141 291.089);
+  --color-violet-50: oklch(96.9% 0.016 293.756);
+  --color-violet-100: oklch(94.3% 0.029 294.588);
+  --color-violet-200: oklch(89.4% 0.057 293.283);
+  --color-violet-300: oklch(81.1% 0.111 293.571);
+  --color-violet-400: oklch(70.2% 0.183 293.541);
+  --color-violet-500: oklch(60.6% 0.25 292.717);
+  --color-violet-600: oklch(54.1% 0.281 293.009);
+  --color-violet-700: oklch(49.1% 0.27 292.581);
+  --color-violet-800: oklch(43.2% 0.232 292.759);
+  --color-violet-900: oklch(38% 0.189 293.745);
+  --color-violet-950: oklch(28.3% 0.141 291.089);
 
-  --color-purple-50: oklch(0.977 0.014 308.299);
-  --color-purple-100: oklch(0.946 0.033 307.174);
-  --color-purple-200: oklch(0.902 0.063 306.703);
-  --color-purple-300: oklch(0.827 0.119 306.383);
-  --color-purple-400: oklch(0.714 0.203 305.504);
-  --color-purple-500: oklch(0.627 0.265 303.9);
-  --color-purple-600: oklch(0.558 0.288 302.321);
-  --color-purple-700: oklch(0.496 0.265 301.924);
-  --color-purple-800: oklch(0.438 0.218 303.724);
-  --color-purple-900: oklch(0.381 0.176 304.987);
-  --color-purple-950: oklch(0.291 0.149 302.717);
+  --color-purple-50: oklch(97.7% 0.014 308.299);
+  --color-purple-100: oklch(94.6% 0.033 307.174);
+  --color-purple-200: oklch(90.2% 0.063 306.703);
+  --color-purple-300: oklch(82.7% 0.119 306.383);
+  --color-purple-400: oklch(71.4% 0.203 305.504);
+  --color-purple-500: oklch(62.7% 0.265 303.9);
+  --color-purple-600: oklch(55.8% 0.288 302.321);
+  --color-purple-700: oklch(49.6% 0.265 301.924);
+  --color-purple-800: oklch(43.8% 0.218 303.724);
+  --color-purple-900: oklch(38.1% 0.176 304.987);
+  --color-purple-950: oklch(29.1% 0.149 302.717);
 
-  --color-fuchsia-50: oklch(0.977 0.017 320.058);
-  --color-fuchsia-100: oklch(0.952 0.037 318.852);
-  --color-fuchsia-200: oklch(0.903 0.076 319.62);
-  --color-fuchsia-300: oklch(0.833 0.145 321.434);
-  --color-fuchsia-400: oklch(0.74 0.238 322.16);
-  --color-fuchsia-500: oklch(0.667 0.295 322.15);
-  --color-fuchsia-600: oklch(0.591 0.293 322.896);
-  --color-fuchsia-700: oklch(0.518 0.253 323.949);
-  --color-fuchsia-800: oklch(0.452 0.211 324.591);
-  --color-fuchsia-900: oklch(0.401 0.17 325.612);
-  --color-fuchsia-950: oklch(0.293 0.136 325.661);
+  --color-fuchsia-50: oklch(97.7% 0.017 320.058);
+  --color-fuchsia-100: oklch(95.2% 0.037 318.852);
+  --color-fuchsia-200: oklch(90.3% 0.076 319.62);
+  --color-fuchsia-300: oklch(83.3% 0.145 321.434);
+  --color-fuchsia-400: oklch(74% 0.238 322.16);
+  --color-fuchsia-500: oklch(66.7% 0.295 322.15);
+  --color-fuchsia-600: oklch(59.1% 0.293 322.896);
+  --color-fuchsia-700: oklch(51.8% 0.253 323.949);
+  --color-fuchsia-800: oklch(45.2% 0.211 324.591);
+  --color-fuchsia-900: oklch(40.1% 0.17 325.612);
+  --color-fuchsia-950: oklch(29.3% 0.136 325.661);
 
-  --color-pink-50: oklch(0.971 0.014 343.198);
-  --color-pink-100: oklch(0.948 0.028 342.258);
-  --color-pink-200: oklch(0.899 0.061 343.231);
-  --color-pink-300: oklch(0.823 0.12 346.018);
-  --color-pink-400: oklch(0.718 0.202 349.761);
-  --color-pink-500: oklch(0.656 0.241 354.308);
-  --color-pink-600: oklch(0.592 0.249 0.584);
-  --color-pink-700: oklch(0.525 0.223 3.958);
-  --color-pink-800: oklch(0.459 0.187 3.815);
-  --color-pink-900: oklch(0.408 0.153 2.432);
-  --color-pink-950: oklch(0.284 0.109 3.907);
+  --color-pink-50: oklch(97.1% 0.014 343.198);
+  --color-pink-100: oklch(94.8% 0.028 342.258);
+  --color-pink-200: oklch(89.9% 0.061 343.231);
+  --color-pink-300: oklch(82.3% 0.12 346.018);
+  --color-pink-400: oklch(71.8% 0.202 349.761);
+  --color-pink-500: oklch(65.6% 0.241 354.308);
+  --color-pink-600: oklch(59.2% 0.249 0.584);
+  --color-pink-700: oklch(52.5% 0.223 3.958);
+  --color-pink-800: oklch(45.9% 0.187 3.815);
+  --color-pink-900: oklch(40.8% 0.153 2.432);
+  --color-pink-950: oklch(28.4% 0.109 3.907);
 
-  --color-rose-50: oklch(0.969 0.015 12.422);
-  --color-rose-100: oklch(0.941 0.03 12.58);
-  --color-rose-200: oklch(0.892 0.058 10.001);
-  --color-rose-300: oklch(0.81 0.117 11.638);
-  --color-rose-400: oklch(0.712 0.194 13.428);
-  --color-rose-500: oklch(0.645 0.246 16.439);
-  --color-rose-600: oklch(0.586 0.253 17.585);
-  --color-rose-700: oklch(0.514 0.222 16.935);
-  --color-rose-800: oklch(0.455 0.188 13.697);
-  --color-rose-900: oklch(0.41 0.159 10.272);
-  --color-rose-950: oklch(0.271 0.105 12.094);
+  --color-rose-50: oklch(96.9% 0.015 12.422);
+  --color-rose-100: oklch(94.1% 0.03 12.58);
+  --color-rose-200: oklch(89.2% 0.058 10.001);
+  --color-rose-300: oklch(81% 0.117 11.638);
+  --color-rose-400: oklch(71.2% 0.194 13.428);
+  --color-rose-500: oklch(64.5% 0.246 16.439);
+  --color-rose-600: oklch(58.6% 0.253 17.585);
+  --color-rose-700: oklch(51.4% 0.222 16.935);
+  --color-rose-800: oklch(45.5% 0.188 13.697);
+  --color-rose-900: oklch(41% 0.159 10.272);
+  --color-rose-950: oklch(27.1% 0.105 12.094);
 
-  --color-slate-50: oklch(0.984 0.003 247.858);
-  --color-slate-100: oklch(0.968 0.007 247.896);
-  --color-slate-200: oklch(0.929 0.013 255.508);
-  --color-slate-300: oklch(0.869 0.022 252.894);
-  --color-slate-400: oklch(0.704 0.04 256.788);
-  --color-slate-500: oklch(0.554 0.046 257.417);
-  --color-slate-600: oklch(0.446 0.043 257.281);
-  --color-slate-700: oklch(0.372 0.044 257.287);
-  --color-slate-800: oklch(0.279 0.041 260.031);
-  --color-slate-900: oklch(0.208 0.042 265.755);
-  --color-slate-950: oklch(0.129 0.042 264.695);
+  --color-slate-50: oklch(98.4% 0.003 247.858);
+  --color-slate-100: oklch(96.8% 0.007 247.896);
+  --color-slate-200: oklch(92.9% 0.013 255.508);
+  --color-slate-300: oklch(86.9% 0.022 252.894);
+  --color-slate-400: oklch(70.4% 0.04 256.788);
+  --color-slate-500: oklch(55.4% 0.046 257.417);
+  --color-slate-600: oklch(44.6% 0.043 257.281);
+  --color-slate-700: oklch(37.2% 0.044 257.287);
+  --color-slate-800: oklch(27.9% 0.041 260.031);
+  --color-slate-900: oklch(20.8% 0.042 265.755);
+  --color-slate-950: oklch(12.9% 0.042 264.695);
 
-  --color-gray-50: oklch(0.985 0.002 247.839);
-  --color-gray-100: oklch(0.967 0.003 264.542);
-  --color-gray-200: oklch(0.928 0.006 264.531);
-  --color-gray-300: oklch(0.872 0.01 258.338);
-  --color-gray-400: oklch(0.707 0.022 261.325);
-  --color-gray-500: oklch(0.551 0.027 264.364);
-  --color-gray-600: oklch(0.446 0.03 256.802);
-  --color-gray-700: oklch(0.373 0.034 259.733);
-  --color-gray-800: oklch(0.278 0.033 256.848);
-  --color-gray-900: oklch(0.21 0.034 264.665);
-  --color-gray-950: oklch(0.13 0.028 261.692);
+  --color-gray-50: oklch(98.5% 0.002 247.839);
+  --color-gray-100: oklch(96.7% 0.003 264.542);
+  --color-gray-200: oklch(92.8% 0.006 264.531);
+  --color-gray-300: oklch(87.2% 0.01 258.338);
+  --color-gray-400: oklch(70.7% 0.022 261.325);
+  --color-gray-500: oklch(55.1% 0.027 264.364);
+  --color-gray-600: oklch(44.6% 0.03 256.802);
+  --color-gray-700: oklch(37.3% 0.034 259.733);
+  --color-gray-800: oklch(27.8% 0.033 256.848);
+  --color-gray-900: oklch(21% 0.034 264.665);
+  --color-gray-950: oklch(13% 0.028 261.692);
 
-  --color-zinc-50: oklch(0.985 0 0);
-  --color-zinc-100: oklch(0.967 0.001 286.375);
-  --color-zinc-200: oklch(0.92 0.004 286.32);
-  --color-zinc-300: oklch(0.871 0.006 286.286);
-  --color-zinc-400: oklch(0.705 0.015 286.067);
-  --color-zinc-500: oklch(0.552 0.016 285.938);
-  --color-zinc-600: oklch(0.442 0.017 285.786);
-  --color-zinc-700: oklch(0.37 0.013 285.805);
-  --color-zinc-800: oklch(0.274 0.006 286.033);
-  --color-zinc-900: oklch(0.21 0.006 285.885);
-  --color-zinc-950: oklch(0.141 0.005 285.823);
+  --color-zinc-50: oklch(98.5% 0 none);
+  --color-zinc-100: oklch(96.7% 0.001 286.375);
+  --color-zinc-200: oklch(92% 0.004 286.32);
+  --color-zinc-300: oklch(87.1% 0.006 286.286);
+  --color-zinc-400: oklch(70.5% 0.015 286.067);
+  --color-zinc-500: oklch(55.2% 0.016 285.938);
+  --color-zinc-600: oklch(44.2% 0.017 285.786);
+  --color-zinc-700: oklch(37% 0.013 285.805);
+  --color-zinc-800: oklch(27.4% 0.006 286.033);
+  --color-zinc-900: oklch(21% 0.006 285.885);
+  --color-zinc-950: oklch(14.1% 0.005 285.823);
 
-  --color-neutral-50: oklch(0.985 0 0);
-  --color-neutral-100: oklch(0.97 0 0);
-  --color-neutral-200: oklch(0.922 0 0);
-  --color-neutral-300: oklch(0.87 0 0);
-  --color-neutral-400: oklch(0.708 0 0);
-  --color-neutral-500: oklch(0.556 0 0);
-  --color-neutral-600: oklch(0.439 0 0);
-  --color-neutral-700: oklch(0.371 0 0);
-  --color-neutral-800: oklch(0.269 0 0);
-  --color-neutral-900: oklch(0.205 0 0);
-  --color-neutral-950: oklch(0.145 0 0);
+  --color-neutral-50: oklch(98.5% 0 none);
+  --color-neutral-100: oklch(97% 0 none);
+  --color-neutral-200: oklch(92.2% 0 none);
+  --color-neutral-300: oklch(87% 0 none);
+  --color-neutral-400: oklch(70.8% 0 none);
+  --color-neutral-500: oklch(55.6% 0 none);
+  --color-neutral-600: oklch(43.9% 0 none);
+  --color-neutral-700: oklch(37.1% 0 none);
+  --color-neutral-800: oklch(26.9% 0 none);
+  --color-neutral-900: oklch(20.5% 0 none);
+  --color-neutral-950: oklch(14.5% 0 none);
 
-  --color-stone-50: oklch(0.985 0.001 106.423);
-  --color-stone-100: oklch(0.97 0.001 106.424);
-  --color-stone-200: oklch(0.923 0.003 48.717);
-  --color-stone-300: oklch(0.869 0.005 56.366);
-  --color-stone-400: oklch(0.709 0.01 56.259);
-  --color-stone-500: oklch(0.553 0.013 58.071);
-  --color-stone-600: oklch(0.444 0.011 73.639);
-  --color-stone-700: oklch(0.374 0.01 67.558);
-  --color-stone-800: oklch(0.268 0.007 34.298);
-  --color-stone-900: oklch(0.216 0.006 56.043);
-  --color-stone-950: oklch(0.147 0.004 49.25);
+  --color-stone-50: oklch(98.5% 0.001 106.423);
+  --color-stone-100: oklch(97% 0.001 106.424);
+  --color-stone-200: oklch(92.3% 0.003 48.717);
+  --color-stone-300: oklch(86.9% 0.005 56.366);
+  --color-stone-400: oklch(70.9% 0.01 56.259);
+  --color-stone-500: oklch(55.3% 0.013 58.071);
+  --color-stone-600: oklch(44.4% 0.011 73.639);
+  --color-stone-700: oklch(37.4% 0.01 67.558);
+  --color-stone-800: oklch(26.8% 0.007 34.298);
+  --color-stone-900: oklch(21.6% 0.006 56.043);
+  --color-stone-950: oklch(14.7% 0.004 49.25);
+
+  --color-mauve-50: oklch(98.5% 0 none);
+  --color-mauve-100: oklch(96% 0.003 325.6);
+  --color-mauve-200: oklch(92.2% 0.005 325.62);
+  --color-mauve-300: oklch(86.5% 0.012 325.68);
+  --color-mauve-400: oklch(71.1% 0.019 323.02);
+  --color-mauve-500: oklch(54.2% 0.034 322.5);
+  --color-mauve-600: oklch(43.5% 0.029 321.78);
+  --color-mauve-700: oklch(36.4% 0.029 323.89);
+  --color-mauve-800: oklch(26.3% 0.024 320.12);
+  --color-mauve-900: oklch(21.2% 0.019 322.12);
+  --color-mauve-950: oklch(14.5% 0.008 326);
+
+  --color-olive-50: oklch(98.8% 0.003 106.5);
+  --color-olive-100: oklch(96.6% 0.005 106.5);
+  --color-olive-200: oklch(93% 0.007 106.5);
+  --color-olive-300: oklch(88% 0.011 106.6);
+  --color-olive-400: oklch(73.7% 0.021 106.9);
+  --color-olive-500: oklch(58% 0.031 107.3);
+  --color-olive-600: oklch(46.6% 0.025 107.3);
+  --color-olive-700: oklch(39.4% 0.023 107.4);
+  --color-olive-800: oklch(28.6% 0.016 107.4);
+  --color-olive-900: oklch(22.8% 0.013 107.4);
+  --color-olive-950: oklch(15.3% 0.006 107.1);
+
+  --color-mist-50: oklch(98.7% 0.002 197.1);
+  --color-mist-100: oklch(96.3% 0.002 197.1);
+  --color-mist-200: oklch(92.5% 0.005 214.3);
+  --color-mist-300: oklch(87.2% 0.007 219.6);
+  --color-mist-400: oklch(72.3% 0.014 214.4);
+  --color-mist-500: oklch(56% 0.021 213.5);
+  --color-mist-600: oklch(45% 0.017 213.2);
+  --color-mist-700: oklch(37.8% 0.015 216);
+  --color-mist-800: oklch(27.5% 0.011 216.9);
+  --color-mist-900: oklch(21.8% 0.008 223.9);
+  --color-mist-950: oklch(14.8% 0.004 228.8);
+
+  --color-taupe-50: oklch(98.6% 0.002 67.8);
+  --color-taupe-100: oklch(96% 0.002 17.2);
+  --color-taupe-200: oklch(92.2% 0.005 34.3);
+  --color-taupe-300: oklch(86.8% 0.007 39.5);
+  --color-taupe-400: oklch(71.4% 0.014 41.2);
+  --color-taupe-500: oklch(54.7% 0.021 43.1);
+  --color-taupe-600: oklch(43.8% 0.017 39.3);
+  --color-taupe-700: oklch(36.7% 0.016 35.7);
+  --color-taupe-800: oklch(26.8% 0.011 36.5);
+  --color-taupe-900: oklch(21.4% 0.009 43.1);
+  --color-taupe-950: oklch(14.7% 0.004 49.3);
 
   --color-black: #000;
   --color-white: #fff;
@@ -293,7 +343,6 @@
   --container-5xl: 64rem;
   --container-6xl: 72rem;
   --container-7xl: 80rem;
-  --container-prose: 65ch;
 
   --text-xs: 0.75rem;
   --text-xs--line-height: calc(1 / 0.75);
@@ -373,6 +422,15 @@
   --drop-shadow-xl: 0 9px 7px rgb(0 0 0 / 0.1);
   --drop-shadow-2xl: 0 25px 25px rgb(0 0 0 / 0.15);
 
+  --text-shadow-2xs: 0px 1px 0px rgb(0 0 0 / 0.15);
+  --text-shadow-xs: 0px 1px 1px rgb(0 0 0 / 0.2);
+  --text-shadow-sm:
+    0px 1px 0px rgb(0 0 0 / 0.075), 0px 1px 1px rgb(0 0 0 / 0.075), 0px 2px 2px rgb(0 0 0 / 0.075);
+  --text-shadow-md:
+    0px 1px 1px rgb(0 0 0 / 0.1), 0px 1px 2px rgb(0 0 0 / 0.1), 0px 2px 4px rgb(0 0 0 / 0.1);
+  --text-shadow-lg:
+    0px 1px 2px rgb(0 0 0 / 0.1), 0px 3px 2px rgb(0 0 0 / 0.1), 0px 4px 8px rgb(0 0 0 / 0.1);
+
   --ease-in: cubic-bezier(0.4, 0, 1, 1);
   --ease-out: cubic-bezier(0, 0, 0.2, 1);
   --ease-in-out: cubic-bezier(0.4, 0, 0.2, 1);
@@ -433,12 +491,12 @@
 
   --default-transition-duration: 150ms;
   --default-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-  --default-font-family: var(--font-sans);
-  --default-font-feature-settings: var(--font-sans--font-feature-settings);
-  --default-font-variation-settings: var(--font-sans--font-variation-settings);
-  --default-mono-font-family: var(--font-mono);
-  --default-mono-font-feature-settings: var(--font-mono--font-feature-settings);
-  --default-mono-font-variation-settings: var(--font-mono--font-variation-settings);
+  --default-font-family: --theme(--font-sans, initial);
+  --default-font-feature-settings: --theme(--font-sans--font-feature-settings, initial);
+  --default-font-variation-settings: --theme(--font-sans--font-variation-settings, initial);
+  --default-mono-font-family: --theme(--font-mono, initial);
+  --default-mono-font-feature-settings: --theme(--font-mono--font-feature-settings, initial);
+  --default-mono-font-variation-settings: --theme(--font-mono--font-variation-settings, initial);
 }
 
 /* Deprecated */
@@ -448,4 +506,5 @@
   --shadow-inner: inset 0 2px 4px 0 rgb(0 0 0 / 0.05);
   --drop-shadow: 0 1px 2px rgb(0 0 0 / 0.1), 0 1px 1px rgb(0 0 0 / 0.06);
   --radius: 0.25rem;
+  --max-width-prose: 65ch;
 }
diff --git a/packages/tailwindcss/tsconfig.json b/packages/tailwindcss/tsconfig.json
index 6ae022f65..d2131cbeb 100644
--- a/packages/tailwindcss/tsconfig.json
+++ b/packages/tailwindcss/tsconfig.json
@@ -1,3 +1,6 @@
 {
   "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "verbatimModuleSyntax": false,
+  },
 }
diff --git a/packages/tailwindcss/tsup.config.ts b/packages/tailwindcss/tsup.config.ts
index 59c8bdfa2..6bc831056 100644
--- a/packages/tailwindcss/tsup.config.ts
+++ b/packages/tailwindcss/tsup.config.ts
@@ -12,6 +12,9 @@ export default defineConfig([
       'default-theme': 'src/compat/default-theme.ts',
       'flatten-color-palette': 'src/compat/flatten-color-palette.ts',
     },
+    define: {
+      'process.env.FEATURES_ENV': JSON.stringify(process.env.FEATURES_ENV ?? 'insiders'),
+    },
   },
   {
     format: ['cjs'],
@@ -24,5 +27,8 @@ export default defineConfig([
       'default-theme': 'src/compat/default-theme.cts',
       'flatten-color-palette': 'src/compat/flatten-color-palette.cts',
     },
+    define: {
+      'process.env.FEATURES_ENV': JSON.stringify(process.env.FEATURES_ENV ?? 'insiders'),
+    },
   },
 ])
diff --git a/packages/tailwindcss/vitest.config.ts b/packages/tailwindcss/vitest.config.mts
similarity index 100%
rename from packages/tailwindcss/vitest.config.ts
rename to packages/tailwindcss/vitest.config.mts
diff --git a/patches/@napi-rs__cli@3.7.4.patch b/patches/@napi-rs__cli@3.7.4.patch
new file mode 100644
index 000000000..e72212499
--- /dev/null
+++ b/patches/@napi-rs__cli@3.7.4.patch
@@ -0,0 +1,80 @@
+diff --git a/dist/cli.js b/dist/cli.js
+index c4c2d568bc070c07dbf3a1f9f4a0c946466668cf..353bbca86e3261a2ba9a8fc56dc612c7c84dab6d 100755
+--- a/dist/cli.js
++++ b/dist/cli.js
+@@ -1,4 +1,13 @@
+ #!/usr/bin/env node
++// PATCHED (see patches/@napi-rs__cli@3.7.4.patch): the embedded wasi loader
++// and worker templates below retry `new WASI(...)` with narrower preopens,
++// because preopening `/` throws `UVWASI_EACCES` on sandboxed platforms (e.g.
++// OpenHarmony), which would make the generated wasm binding fail to load.
++//
++// The same templates also exist in `dist/index.js` and `dist/index.cjs` (the
++// programmatic API). Those are intentionally NOT patched because we only
++// build through the `napi` bin, which runs this file. If we ever start using
++// the programmatic API, update the patch to cover those bundles too.
+ import { createRequire } from "node:module";
+ import { Cli, Command, Option } from "clipanion";
+ import path, { basename, dirname, isAbsolute, join, parse, resolve } from "node:path";
+@@ -1021,13 +1030,25 @@ const {
+ 
+ const __rootDir = __nodePath.parse(process.cwd()).root
+ 
+-const __wasi = new __nodeWASI({
+-  version: 'preview1',
+-  env: process.env,
+-  preopens: {
+-    [__rootDir]: __rootDir,
++const __wasi = (() => {
++  // Preopening '/' fails with UVWASI_EACCES in sandboxed environments (e.g.
++  // OpenHarmony, Android), which would prevent the wasm binding from loading
++  // at all. Retry with narrower preopens instead. Without any preopens the
++  // binding still loads; only file system access is unavailable.
++  let lastError = null
++  for (const dir of [__rootDir, process.cwd(), null]) {
++    try {
++      return new __nodeWASI({
++        version: 'preview1',
++        env: process.env,
++        preopens: dir === null ? {} : { [dir]: dir },
++      })
++    } catch (error) {
++      lastError = error
++    }
+   }
+-})
++  throw lastError
++})()
+ 
+ const __emnapiContext = __emnapiGetDefaultContext()
+ 
+@@ -1151,13 +1172,22 @@ const __rootDir = parse(process.cwd()).root;
+ 
+ const handler = new MessageHandler({
+   onLoad({ wasmModule, wasmMemory }) {
+-    const wasi = new WASI({
+-      version: 'preview1',
+-      env: process.env,
+-      preopens: {
+-        [__rootDir]: __rootDir,
+-      },
+-    });
++    // Keep in sync with the preopen fallback in the main-thread loader.
++    const wasi = (() => {
++      let lastError = null;
++      for (const dir of [__rootDir, process.cwd(), null]) {
++        try {
++          return new WASI({
++            version: 'preview1',
++            env: process.env,
++            preopens: dir === null ? {} : { [dir]: dir },
++          });
++        } catch (error) {
++          lastError = error;
++        }
++      }
++      throw lastError;
++    })();
+ 
+     return instantiateNapiModuleSync(wasmModule, {
+       childThread: true,
diff --git a/patches/@parcel__watcher@2.5.0.patch b/patches/@parcel__watcher@2.5.0.patch
deleted file mode 100644
index 4f0f223ff..000000000
--- a/patches/@parcel__watcher@2.5.0.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/index.js b/index.js
-index 8afb2b1126dcc687b7ff9b631589da252c1f9c22..f3b1158eb5612235388ff5f5347f6edcbf323090 100644
---- a/index.js
-+++ b/index.js
-@@ -1,41 +1,27 @@
--const {createWrapper} = require('./wrapper');
-+const { createWrapper } = require('./wrapper')
- 
--let name = `@parcel/watcher-${process.platform}-${process.arch}`;
--if (process.platform === 'linux') {
--  const { MUSL, family } = require('detect-libc');
--  if (family === MUSL) {
--    name += '-musl';
--  } else {
--    name += '-glibc';
--  }
--}
-+function loadPackage() {
-+  if (process.platform === 'linux') {
-+    let { MUSL, GLIBC, family, familySync } = require('detect-libc')
-+    // Bun polyfills `detect-libc` in compiled binaries. We rely on
-+    // detect-libc@1.0.3 but the polyfilled version is 2.x. In detect-libc@2x
-+    // there is a `familySync` function that we can use instead.
-+    if (typeof familySync === 'function') family = familySync()
- 
--let binding;
--try {
--  binding = require(name);
--} catch (err) {
--  handleError(err);
--  try {
--    binding = require('./build/Release/watcher.node');
--  } catch (err) {
--    handleError(err);
--    try {
--      binding = require('./build/Debug/watcher.node');
--    } catch (err) {
--      handleError(err);
--      throw new Error(`No prebuild or local build of @parcel/watcher found. Tried ${name}. Please ensure it is installed (don't use --no-optional when installing with npm). Otherwise it is possible we don't support your platform yet. If this is the case, please report an issue to https://github.com/parcel-bundler/watcher.`);
-+    if (family === MUSL) {
-+      return require(`@parcel/watcher-${process.platform}-${process.arch}-musl`)
-+    } else if (family === GLIBC) {
-+      return require(`@parcel/watcher-${process.platform}-${process.arch}-glibc`)
-+    } else {
-+      throw new Error(`Unsupported libc on: ${process.platform}-${process.arch}`)
-     }
-+  } else {
-+    return require(`@parcel/watcher-${process.platform}-${process.arch}`)
-   }
- }
- 
--function handleError(err) {
--  if (err?.code !== 'MODULE_NOT_FOUND') {
--    throw err;
--  }
--}
--
--const wrapper = createWrapper(binding);
--exports.writeSnapshot = wrapper.writeSnapshot;
--exports.getEventsSince = wrapper.getEventsSince;
--exports.subscribe = wrapper.subscribe;
--exports.unsubscribe = wrapper.unsubscribe;
-+const wrapper = createWrapper(loadPackage())
-+exports.writeSnapshot = wrapper.writeSnapshot
-+exports.getEventsSince = wrapper.getEventsSince
-+exports.subscribe = wrapper.subscribe
-+exports.unsubscribe = wrapper.unsubscribe
diff --git a/patches/@parcel__watcher@2.6.0.patch b/patches/@parcel__watcher@2.6.0.patch
new file mode 100644
index 000000000..37ff83f04
--- /dev/null
+++ b/patches/@parcel__watcher@2.6.0.patch
@@ -0,0 +1,70 @@
+diff --git a/index.js b/index.js
+index 78ee744d74900c39a839cafa46b295258fc86307..f28fd092644ccfb8aff2618b966cb5219a181a02 100644
+--- a/index.js
++++ b/index.js
+@@ -1,43 +1,32 @@
+ const {createWrapper} = require('./wrapper');
+ 
+-let name = `@parcel/watcher-${process.platform}-${process.arch}`;
+-if (process.platform === 'linux') {
+-  const {MUSL, familySync} = require('detect-libc');
+-  const family = familySync();
+-  if (family === MUSL) {
+-    name += '-musl';
+-  } else {
+-    name += '-glibc';
+-  }
+-}
++// We need to take the `process.env.PLATFORM_LIBC` into account, and we also
++// need static analysis, so we can't make use of the `parts.push(…)` approach.
++function loadPackage() {
++  if (process.platform === 'linux') {
++    if (process.env.PLATFORM_LIBC === "musl") {
++      return require(`@parcel/watcher-${process.platform}-${process.arch}-musl`)
++    } else if (process.env.PLATFORM_LIBC === "glibc") {
++      return require(`@parcel/watcher-${process.platform}-${process.arch}-glibc`)
++    } else {
++      let { MUSL, GLIBC, familySync } = require('detect-libc')
++      let family = familySync()
+ 
+-let binding;
+-try {
+-  binding = require(name);
+-} catch (err) {
+-  handleError(err);
+-  try {
+-    binding = require('./build/Release/watcher.node');
+-  } catch (err) {
+-    handleError(err);
+-    try {
+-      binding = require('./build/Debug/watcher.node');
+-    } catch (err) {
+-      handleError(err);
+-      throw new Error(
+-        `No prebuild or local build of @parcel/watcher found. Tried ${name}. Please ensure it is installed (don't use --no-optional when installing with npm). Otherwise it is possible we don't support your platform yet. If this is the case, please report an issue to https://github.com/parcel-bundler/watcher.`,
+-      );
+-    }
+-  }
+-}
+ 
+-function handleError(err) {
+-  if (err?.code !== 'MODULE_NOT_FOUND') {
+-    throw err;
++      if (family === MUSL) {
++        return require(`@parcel/watcher-${process.platform}-${process.arch}-musl`)
++      } else if (family === GLIBC) {
++        return require(`@parcel/watcher-${process.platform}-${process.arch}-glibc`)
++      } else {
++        throw new Error(`Unsupported libc on: ${process.platform}-${process.arch}`)
++      }
++    }
++  } else {
++    return require(`@parcel/watcher-${process.platform}-${process.arch}`)
+   }
+ }
+ 
+-const wrapper = createWrapper(binding);
++const wrapper = createWrapper(loadPackage());
+ exports.writeSnapshot = wrapper.writeSnapshot;
+ exports.getEventsSince = wrapper.getEventsSince;
+ exports.subscribe = wrapper.subscribe;
diff --git a/patches/lightningcss@1.26.0.patch b/patches/lightningcss@1.26.0.patch
deleted file mode 100644
index 1b83d90c8..000000000
--- a/patches/lightningcss@1.26.0.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/node/index.js b/node/index.js
-index a9f2f6d5f3394329fcf8bc06af549030c01167a5..b92cc804adb694dbb17ee48368f13a03dd729267 100644
---- a/node/index.js
-+++ b/node/index.js
-@@ -1,27 +1,32 @@
--let parts = [process.platform, process.arch];
--if (process.platform === 'linux') {
--  const { MUSL, family } = require('detect-libc');
--  if (family === MUSL) {
--    parts.push('musl');
--  } else if (process.arch === 'arm') {
--    parts.push('gnueabihf');
--  } else {
--    parts.push('gnu');
--  }
--} else if (process.platform === 'win32') {
--  parts.push('msvc');
--}
-+function loadPackage() {
-+  if (process.platform === "linux") {
-+    let { MUSL, GLIBC, family, familySync } = require("detect-libc");
-+    // Bun polyfills `detect-libc` in compiled binaries. We rely on
-+    // detect-libc@1.0.3 but the polyfilled version is 2.x. In detect-libc@2x
-+    // there is a `familySync` function that we can use instead.
-+    if (typeof familySync === 'function') family = familySync()
- 
--if (process.env.CSS_TRANSFORMER_WASM) {
--  module.exports = require(`../pkg`);
--} else {
--  try {
--    module.exports = require(`lightningcss-${parts.join('-')}`);
--  } catch (err) {
--    module.exports = require(`../lightningcss.${parts.join('-')}.node`);
-+    if (family === MUSL) {
-+      return require(`lightningcss-${process.platform}-${process.arch}-musl`);
-+    } else if (family === GLIBC) {
-+      if (process.arch === "arm") {
-+        return require(`lightningcss-${process.platform}-${process.arch}-gnueabihf`);
-+      } else {
-+        return require(`lightningcss-${process.platform}-${process.arch}-gnu`);
-+      }
-+    } else {
-+      throw new Error(
-+        `Unsupported libc on: ${process.platform}-${process.arch}`
-+      );
-+    }
-+  } else if (process.platform === "win32") {
-+    return require(`lightningcss-${process.platform}-${process.arch}-msvc`);
-+  } else {
-+    return require(`lightningcss-${process.platform}-${process.arch}`);
-   }
- }
- 
--module.exports.browserslistToTargets = require('./browserslistToTargets');
--module.exports.composeVisitors = require('./composeVisitors');
--module.exports.Features = require('./flags').Features;
-+module.exports = loadPackage();
-+module.exports.browserslistToTargets = require("./browserslistToTargets");
-+module.exports.composeVisitors = require("./composeVisitors");
-+module.exports.Features = require("./flags").Features;
diff --git a/patches/lightningcss@1.33.0.patch b/patches/lightningcss@1.33.0.patch
new file mode 100644
index 000000000..e70be2315
--- /dev/null
+++ b/patches/lightningcss@1.33.0.patch
@@ -0,0 +1,62 @@
+diff --git a/node/index.js b/node/index.js
+index 6fe25aef457aa5448f9ee6204da1e253f5534800..742be0229b94450b631b6e069ffc372d2b35df47 100644
+--- a/node/index.js
++++ b/node/index.js
+@@ -1,25 +1,40 @@
+-let parts = [process.platform, process.arch];
+-if (process.platform === 'linux') {
+-  const { MUSL, familySync } = require('detect-libc');
+-  const family = familySync();
+-  if (family === MUSL) {
+-    parts.push('musl');
+-  } else if (process.arch === 'arm') {
+-    parts.push('gnueabihf');
++// We need to take the `process.env.PLATFORM_LIBC` into account, and we also
++// need static analysis, so we can't make use of the `parts.push(…)` approach.
++function loadPackage() {
++  if (process.platform === 'linux') {
++    if (process.env.PLATFORM_LIBC === 'musl') {
++      return require(`lightningcss-${process.platform}-${process.arch}-musl`)
++    } else if (process.env.PLATFORM_LIBC === 'glibc') {
++      if (process.arch === 'arm') {
++        return require(`lightningcss-${process.platform}-${process.arch}-gnueabihf`)
++      } else {
++        return require(`lightningcss-${process.platform}-${process.arch}-gnu`)
++      }
++    } else {
++      let { MUSL, GLIBC, familySync } = require('detect-libc')
++      let family = familySync()
++
++      if (family === MUSL) {
++        return require(`lightningcss-${process.platform}-${process.arch}-musl`)
++      } else if (family === GLIBC) {
++        if (process.arch === 'arm') {
++          return require(`lightningcss-${process.platform}-${process.arch}-gnueabihf`)
++        } else {
++          return require(`lightningcss-${process.platform}-${process.arch}-gnu`)
++        }
++      } else {
++        throw new Error(`Unsupported libc on: ${process.platform}-${process.arch}`)
++      }
++    }
++  } else if (process.platform === 'win32') {
++    return require(`lightningcss-${process.platform}-${process.arch}-msvc`)
+   } else {
+-    parts.push('gnu');
++    return require(`lightningcss-${process.platform}-${process.arch}`)
+   }
+-} else if (process.platform === 'win32') {
+-  parts.push('msvc');
+ }
+ 
+-let native;
+-try {
+-  native = require(`lightningcss-${parts.join('-')}`);
+-} catch (err) {
+-  native = require(`../lightningcss.${parts.join('-')}.node`);
+-}
+ 
++let native = loadPackage();
+ module.exports.transform = wrap(native.transform);
+ module.exports.transformStyleAttribute = wrap(native.transformStyleAttribute);
+ module.exports.bundle = wrap(native.bundle);
diff --git a/playgrounds/nextjs/app/layout.tsx b/playgrounds/nextjs/app/layout.tsx
index cf832e94e..41ee7f492 100644
--- a/playgrounds/nextjs/app/layout.tsx
+++ b/playgrounds/nextjs/app/layout.tsx
@@ -15,7 +15,7 @@ export default function RootLayout({
   children: React.ReactNode
 }>) {
   return (
-    <html lang="en" className="[&_h1]:font-thin">
+    <html lang="en">
       <head>{/* <script src="https://cdn.tailwindcss.com"></script> */}</head>
       <body className={inter.className}>{children}</body>
     </html>
diff --git a/playgrounds/nextjs/app/page.module.css b/playgrounds/nextjs/app/page.module.css
index e0c1bf51e..b0117f44c 100644
--- a/playgrounds/nextjs/app/page.module.css
+++ b/playgrounds/nextjs/app/page.module.css
@@ -1,228 +1,5 @@
-.main {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  align-items: center;
-  padding: 6rem;
-  min-height: 100vh;
-}
-
-.description {
-  display: inherit;
-  justify-content: inherit;
-  align-items: inherit;
-  font-size: 0.85rem;
-  max-width: var(--max-width);
-  width: 100%;
-  z-index: 2;
-  font-family: var(--font-mono);
-}
-
-.description a {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  gap: 0.5rem;
-}
-
-.description p {
-  position: relative;
-  margin: 0;
-  padding: 1rem;
-  background-color: rgba(var(--callout-rgb), 0.5);
-  border: 1px solid rgba(var(--callout-border-rgb), 0.3);
-  border-radius: var(--border-radius);
-}
-
-.code {
-  font-weight: 700;
-  font-family: var(--font-mono);
-}
-
-.grid {
-  display: grid;
-  grid-template-columns: repeat(4, minmax(25%, auto));
-  max-width: 100%;
-  width: var(--max-width);
-}
-
-.card {
-  padding: 1rem 1.2rem;
-  border-radius: var(--border-radius);
-  background: rgba(var(--card-rgb), 0);
-  border: 1px solid rgba(var(--card-border-rgb), 0);
-  transition:
-    background 200ms,
-    border 200ms;
-}
-
-.card span {
-  display: inline-block;
-  transition: transform 200ms;
-}
-
-.card h2 {
-  font-weight: 600;
-  margin-bottom: 0.7rem;
-}
-
-.card p {
-  margin: 0;
-  opacity: 0.6;
-  font-size: 0.9rem;
-  line-height: 1.5;
-  max-width: 30ch;
-  text-wrap: balance;
-}
-
-.center {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  position: relative;
-  padding: 4rem 0;
-}
-
-.center::before {
-  background: var(--secondary-glow);
-  border-radius: 50%;
-  width: 480px;
-  height: 360px;
-  margin-left: -400px;
-}
-
-.center::after {
-  background: var(--primary-glow);
-  width: 240px;
-  height: 180px;
-  z-index: -1;
-}
-
-.center::before,
-.center::after {
-  content: '';
-  left: 50%;
-  position: absolute;
-  filter: blur(45px);
-  transform: translateZ(0);
-}
-
-.logo {
-  position: relative;
-}
-/* Enable hover only on non-touch devices */
-@media (hover: hover) and (pointer: fine) {
-  .card:hover {
-    background: rgba(var(--card-rgb), 0.1);
-    border: 1px solid rgba(var(--card-border-rgb), 0.15);
-  }
-
-  .card:hover span {
-    transform: translateX(4px);
-  }
-}
-
-@media (prefers-reduced-motion) {
-  .card:hover span {
-    transform: none;
-  }
-}
-
-/* Mobile */
-@media (max-width: 700px) {
-  .content {
-    padding: 4rem;
-  }
-
-  .grid {
-    grid-template-columns: 1fr;
-    margin-bottom: 120px;
-    max-width: 320px;
-    text-align: center;
-  }
-
-  .card {
-    padding: 1rem 2.5rem;
-  }
-
-  .card h2 {
-    margin-bottom: 0.5rem;
-  }
-
-  .center {
-    padding: 8rem 0 6rem;
-  }
-
-  .center::before {
-    transform: none;
-    height: 300px;
-  }
-
-  .description {
-    font-size: 0.8rem;
-  }
-
-  .description a {
-    padding: 1rem;
-  }
-
-  .description p,
-  .description div {
-    display: flex;
-    justify-content: center;
-    position: fixed;
-    width: 100%;
-  }
-
-  .description p {
-    align-items: center;
-    inset: 0 0 auto;
-    padding: 2rem 1rem 1.4rem;
-    border-radius: 0;
-    border: none;
-    border-bottom: 1px solid rgba(var(--callout-border-rgb), 0.25);
-    background: linear-gradient(
-      to bottom,
-      rgba(var(--background-start-rgb), 1),
-      rgba(var(--callout-rgb), 0.5)
-    );
-    background-clip: padding-box;
-    backdrop-filter: blur(24px);
-  }
-
-  .description div {
-    align-items: flex-end;
-    pointer-events: none;
-    inset: auto 0 0;
-    padding: 2rem;
-    height: 200px;
-    background: linear-gradient(to bottom, transparent 0%, rgb(var(--background-end-rgb)) 40%);
-    z-index: 1;
-  }
-}
-
-/* Tablet and Smaller Desktop */
-@media (min-width: 701px) and (max-width: 1120px) {
-  .grid {
-    grid-template-columns: repeat(2, 50%);
-  }
-}
-
-@media (prefers-color-scheme: dark) {
-  .vercelLogo {
-    filter: invert(1);
-  }
-
-  .logo {
-    filter: invert(1) drop-shadow(0 0 0.3rem #ffffff70);
-  }
-}
-
-@keyframes rotate {
-  from {
-    transform: rotate(360deg);
-  }
-  to {
-    transform: rotate(0deg);
-  }
+@reference "./globals.css";
+
+.heading {
+  @apply text-red-500;
 }
diff --git a/playgrounds/nextjs/app/page.tsx b/playgrounds/nextjs/app/page.tsx
index 3c5390442..70ea89898 100644
--- a/playgrounds/nextjs/app/page.tsx
+++ b/playgrounds/nextjs/app/page.tsx
@@ -1,3 +1,5 @@
+import styles from './page.module.css'
+
 export default function Home() {
-  return <h1 className="text-3xl font-bold underline border ring">Hello world!</h1>
+  return <h1 className={styles.heading}>Hello world!</h1>
 }
diff --git a/playgrounds/nextjs/package.json b/playgrounds/nextjs/package.json
index 8468750dc..5487af5a5 100644
--- a/playgrounds/nextjs/package.json
+++ b/playgrounds/nextjs/package.json
@@ -5,23 +5,20 @@
   "scripts": {
     "dev": "next dev",
     "build": "next build",
-    "start": "next start",
-    "lint": "next lint"
+    "start": "next start"
   },
   "dependencies": {
     "@tailwindcss/postcss": "workspace:^",
-    "fast-glob": "^3.3.2",
-    "next": "15.0.3",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "fast-glob": "^3.3.3",
+    "next": "16.2.7",
+    "react": "19.2.7",
+    "react-dom": "19.2.7",
     "tailwindcss": "workspace:^"
   },
   "devDependencies": {
     "@types/node": "catalog:",
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
-    "eslint": "^9.15.0",
-    "eslint-config-next": "^15.0.3",
-    "typescript": "^5.5.4"
+    "@types/react": "19.2.15",
+    "@types/react-dom": "19.2.3",
+    "typescript": "^6.0.3"
   }
 }
diff --git a/playgrounds/nextjs/tsconfig.json b/playgrounds/nextjs/tsconfig.json
index 862143548..27414aae7 100644
--- a/playgrounds/nextjs/tsconfig.json
+++ b/playgrounds/nextjs/tsconfig.json
@@ -10,7 +10,7 @@
     "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "preserve",
+    "jsx": "react-jsx",
     "incremental": true,
     "plugins": [
       {
@@ -20,7 +20,14 @@
     "paths": {
       "@/*": ["./*"],
     },
+    "target": "ES2017",
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts",
+    ".next/dev/types/**/*.ts",
+  ],
   "exclude": ["node_modules"],
 }
diff --git a/playgrounds/v3/package.json b/playgrounds/v3/package.json
index c69808098..8c08310db 100644
--- a/playgrounds/v3/package.json
+++ b/playgrounds/v3/package.json
@@ -9,18 +9,16 @@
     "upgrade": "node scripts/upgrade.mjs"
   },
   "dependencies": {
-    "next": "15.0.3",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "next": "16.2.7",
+    "react": "19.2.7",
+    "react-dom": "19.2.7",
     "tailwindcss": "^3"
   },
   "devDependencies": {
-    "@types/node": "^20.14.8",
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
-    "autoprefixer": "^10.4.20",
-    "eslint": "^9.15.0",
-    "eslint-config-next": "^15.0.3",
-    "typescript": "^5.5.4"
+    "@types/node": "catalog:",
+    "@types/react": "19.2.15",
+    "@types/react-dom": "19.2.3",
+    "autoprefixer": "^10.5.0",
+    "typescript": "^6.0.3"
   }
 }
diff --git a/playgrounds/v3/tsconfig.json b/playgrounds/v3/tsconfig.json
index 862143548..27414aae7 100644
--- a/playgrounds/v3/tsconfig.json
+++ b/playgrounds/v3/tsconfig.json
@@ -10,7 +10,7 @@
     "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "preserve",
+    "jsx": "react-jsx",
     "incremental": true,
     "plugins": [
       {
@@ -20,7 +20,14 @@
     "paths": {
       "@/*": ["./*"],
     },
+    "target": "ES2017",
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts",
+    ".next/dev/types/**/*.ts",
+  ],
   "exclude": ["node_modules"],
 }
diff --git a/playgrounds/vite/package.json b/playgrounds/vite/package.json
index 716337c36..25ab1a33b 100644
--- a/playgrounds/vite/package.json
+++ b/playgrounds/vite/package.json
@@ -10,15 +10,15 @@
   },
   "dependencies": {
     "@tailwindcss/vite": "workspace:^",
-    "@vitejs/plugin-react": "^4.3.1",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "@vitejs/plugin-react": "^6.0.2",
+    "react": "^19.2.6",
+    "react-dom": "^19.2.6",
     "tailwindcss": "workspace:^"
   },
   "devDependencies": {
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
-    "bun": "^1.1.29",
+    "@types/react": "^19.2.15",
+    "@types/react-dom": "^19.2.3",
+    "bun": "^1.3.14",
     "vite": "catalog:"
   }
 }
diff --git a/playgrounds/vite/src/app.tsx b/playgrounds/vite/src/app.tsx
index 4abc17cb5..8ec502989 100644
--- a/playgrounds/vite/src/app.tsx
+++ b/playgrounds/vite/src/app.tsx
@@ -2,7 +2,6 @@ export function App() {
   return (
     <div className="m-3 p-3 border">
       <h1 className="text-blue-500">Hello World</h1>
-      <div className="-inset-x-full -inset-y-full -space-x-full -space-y-full -inset-full"></div>
     </div>
   )
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 440843400..8382b2ba5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,52 +4,138 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
+catalogs:
+  default:
+    '@parcel/watcher':
+      specifier: 2.6.0
+      version: 2.6.0
+    '@parcel/watcher-darwin-arm64':
+      specifier: 2.6.0
+      version: 2.6.0
+    '@parcel/watcher-darwin-x64':
+      specifier: 2.6.0
+      version: 2.6.0
+    '@parcel/watcher-linux-arm64-glibc':
+      specifier: 2.6.0
+      version: 2.6.0
+    '@parcel/watcher-linux-arm64-musl':
+      specifier: 2.6.0
+      version: 2.6.0
+    '@parcel/watcher-linux-x64-glibc':
+      specifier: 2.6.0
+      version: 2.6.0
+    '@parcel/watcher-linux-x64-musl':
+      specifier: 2.6.0
+      version: 2.6.0
+    '@parcel/watcher-win32-x64':
+      specifier: 2.6.0
+      version: 2.6.0
+    '@types/node':
+      specifier: 22.20.1
+      version: 22.20.1
+    dedent:
+      specifier: 1.7.2
+      version: 1.7.2
+    enhanced-resolve:
+      specifier: ^5.24.5
+      version: 5.24.5
+    lightningcss:
+      specifier: 1.33.0
+      version: 1.33.0
+    lightningcss-darwin-arm64:
+      specifier: 1.33.0
+      version: 1.33.0
+    lightningcss-darwin-x64:
+      specifier: 1.33.0
+      version: 1.33.0
+    lightningcss-linux-arm64-gnu:
+      specifier: 1.33.0
+      version: 1.33.0
+    lightningcss-linux-arm64-musl:
+      specifier: 1.33.0
+      version: 1.33.0
+    lightningcss-linux-x64-gnu:
+      specifier: 1.33.0
+      version: 1.33.0
+    lightningcss-linux-x64-musl:
+      specifier: 1.33.0
+      version: 1.33.0
+    lightningcss-win32-x64-msvc:
+      specifier: 1.33.0
+      version: 1.33.0
+    postcss:
+      specifier: ^8.5.25
+      version: 8.5.25
+    prettier:
+      specifier: 3.9.6
+      version: 3.9.6
+    vite:
+      specifier: ^8.2.0
+      version: 8.2.0
+    webpack:
+      specifier: ^5.109.2
+      version: 5.109.2
+
 patchedDependencies:
-  '@parcel/watcher@2.5.0':
-    hash: pyfayeoxwesjxsefsxp3jpev4q
-    path: patches/@parcel__watcher@2.5.0.patch
-  lightningcss@1.26.0:
-    hash: 5hwfyehqvg5wjb7mwtdvubqbl4
-    path: patches/lightningcss@1.26.0.patch
+  '@napi-rs/cli@3.7.4': 9912bf0a9c2cef8329d11c41fbce4d33ce2bdcf660a630b258c962c0a3c44bed
+  '@parcel/watcher@2.6.0': 705ce75ccea54337110c4d7fe0a8b421658ea0c23e1a77c1fa890a86041179da
+  lightningcss@1.33.0: 1d4a8800d60d13d42887b88b3a86576df4b451670308145fb432ec8abbf40930
 
 importers:
+
   .:
     devDependencies:
       '@playwright/test':
-        specifier: ^1.49.0
-        version: 1.49.0
+        specifier: ^1.62.1
+        version: 1.62.1
       '@types/node':
         specifier: 'catalog:'
-        version: 20.14.13
+        version: 22.20.1
       postcss:
-        specifier: 8.4.49
-        version: 8.4.49
+        specifier: 'catalog:'
+        version: 8.5.25
       postcss-import:
-        specifier: ^16.1.0
-        version: 16.1.0(postcss@8.4.49)
+        specifier: ^16.1.1
+        version: 16.1.1(postcss@8.5.25)
       prettier:
-        specifier: ^3.3.3
-        version: 3.3.3
+        specifier: 'catalog:'
+        version: 3.9.6
       prettier-plugin-embed:
-        specifier: ^0.4.15
-        version: 0.4.15
+        specifier: ^0.5.1
+        version: 0.5.1
       prettier-plugin-organize-imports:
-        specifier: ^4.0.0
-        version: 4.0.0(prettier@3.3.3)(typescript@5.5.4)
+        specifier: ^4.3.0
+        version: 4.3.0(prettier@3.9.6)(typescript@5.9.3)
       tsup:
-        specifier: ^8.2.4
-        version: 8.2.4(jiti@2.4.0)(postcss@8.4.49)(tsx@4.19.1)(typescript@5.5.4)(yaml@2.6.0)
+        specifier: ^8.5.1
+        version: 8.5.1(jiti@2.7.0)(postcss@8.5.25)(typescript@5.9.3)(yaml@2.9.0)
       turbo:
-        specifier: ^2.2.3
-        version: 2.2.3
+        specifier: ^2.10.8
+        version: 2.10.8
       typescript:
-        specifier: ^5.5.4
-        version: 5.5.4
+        specifier: ^5.9.3
+        version: 5.9.3
       vitest:
-        specifier: ^2.0.5
-        version: 2.0.5(@types/node@20.14.13)(lightningcss@1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4))(terser@5.31.6)
+        specifier: ^4.1.10
+        version: 4.1.10(@types/node@22.20.1)(vite@8.2.0(@types/node@22.20.1)(esbuild@0.27.7)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0))
 
   crates/node:
+    devDependencies:
+      '@emnapi/core':
+        specifier: 1.11.3
+        version: 1.11.3
+      '@emnapi/runtime':
+        specifier: 1.11.3
+        version: 1.11.3
+      '@napi-rs/cli':
+        specifier: 3.7.4
+        version: 3.7.4(patch_hash=9912bf0a9c2cef8329d11c41fbce4d33ce2bdcf660a630b258c962c0a3c44bed)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@types/node@25.9.1)(node-addon-api@8.7.0)
+      '@napi-rs/wasm-runtime':
+        specifier: ^1.2.2
+        version: 1.2.2(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)
+      emnapi:
+        specifier: 1.11.3
+        version: 1.11.3(node-addon-api@8.7.0)
     optionalDependencies:
       '@tailwindcss/oxide-android-arm64':
         specifier: workspace:*
@@ -78,16 +164,15 @@ importers:
       '@tailwindcss/oxide-linux-x64-musl':
         specifier: workspace:*
         version: link:npm/linux-x64-musl
+      '@tailwindcss/oxide-wasm32-wasi':
+        specifier: workspace:*
+        version: link:npm/wasm32-wasi
       '@tailwindcss/oxide-win32-arm64-msvc':
         specifier: workspace:*
         version: link:npm/win32-arm64-msvc
       '@tailwindcss/oxide-win32-x64-msvc':
         specifier: workspace:*
         version: link:npm/win32-x64-msvc
-    devDependencies:
-      '@napi-rs/cli':
-        specifier: ^2.18.4
-        version: 2.18.4
 
   crates/node/npm/android-arm-eabi: {}
 
@@ -109,6 +194,27 @@ importers:
 
   crates/node/npm/linux-x64-musl: {}
 
+  crates/node/npm/wasm32-wasi:
+    dependencies:
+      '@emnapi/core':
+        specifier: ^1.11.3
+        version: 1.11.3
+      '@emnapi/runtime':
+        specifier: ^1.11.3
+        version: 1.11.3
+      '@emnapi/wasi-threads':
+        specifier: ^1.2.3
+        version: 1.2.3
+      '@napi-rs/wasm-runtime':
+        specifier: ^1.2.2
+        version: 1.2.2(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)
+      '@tybys/wasm-util':
+        specifier: ^0.10.3
+        version: 0.10.3
+      tslib:
+        specifier: ^2.8.1
+        version: 2.8.1
+
   crates/node/npm/win32-arm64-msvc: {}
 
   crates/node/npm/win32-x64-msvc: {}
@@ -116,29 +222,44 @@ importers:
   integrations:
     devDependencies:
       dedent:
-        specifier: 1.5.3
-        version: 1.5.3
+        specifier: 'catalog:'
+        version: 1.7.2
       fast-glob:
-        specifier: ^3.3.2
-        version: 3.3.2
+        specifier: ^3.3.3
+        version: 3.3.3
+      source-map-js:
+        specifier: ^1.2.1
+        version: 1.2.1
+      yaml:
+        specifier: ^2.9.0
+        version: 2.9.0
+
+  packages/@tailwindcss-browser:
+    devDependencies:
+      h3:
+        specifier: ^1.15.11
+        version: 1.15.11
+      listhen:
+        specifier: ^1.10.1
+        version: 1.10.1(@parcel/watcher@2.6.0(patch_hash=705ce75ccea54337110c4d7fe0a8b421658ea0c23e1a77c1fa890a86041179da))
+      tailwindcss:
+        specifier: workspace:*
+        version: link:../tailwindcss
 
   packages/@tailwindcss-cli:
     dependencies:
       '@parcel/watcher':
-        specifier: ^2.5.0
-        version: 2.5.0(patch_hash=pyfayeoxwesjxsefsxp3jpev4q)
+        specifier: 'catalog:'
+        version: 2.6.0(patch_hash=705ce75ccea54337110c4d7fe0a8b421658ea0c23e1a77c1fa890a86041179da)
       '@tailwindcss/node':
-        specifier: workspace:^
+        specifier: workspace:*
         version: link:../@tailwindcss-node
       '@tailwindcss/oxide':
-        specifier: workspace:^
+        specifier: workspace:*
         version: link:../../crates/node
       enhanced-resolve:
-        specifier: ^5.17.1
-        version: 5.17.1
-      lightningcss:
         specifier: 'catalog:'
-        version: 1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4)
+        version: 5.24.5
       mri:
         specifier: ^1.2.0
         version: 1.2.0
@@ -151,12 +272,24 @@ importers:
 
   packages/@tailwindcss-node:
     dependencies:
+      '@jridgewell/remapping':
+        specifier: ^2.3.5
+        version: 2.3.5
       enhanced-resolve:
-        specifier: ^5.17.1
-        version: 5.17.1
+        specifier: 'catalog:'
+        version: 5.24.5
       jiti:
-        specifier: ^2.4.0
-        version: 2.4.0
+        specifier: ^2.7.0
+        version: 2.7.0
+      lightningcss:
+        specifier: 'catalog:'
+        version: 1.33.0(patch_hash=1d4a8800d60d13d42887b88b3a86576df4b451670308145fb432ec8abbf40930)
+      magic-string:
+        specifier: ^1.1.0
+        version: 1.1.0
+      source-map-js:
+        specifier: ^1.2.1
+        version: 1.2.1
       tailwindcss:
         specifier: workspace:*
         version: link:../tailwindcss
@@ -167,36 +300,33 @@ importers:
         specifier: ^5.2.0
         version: 5.2.0
       '@tailwindcss/node':
-        specifier: workspace:^
+        specifier: workspace:*
         version: link:../@tailwindcss-node
       '@tailwindcss/oxide':
-        specifier: workspace:^
+        specifier: workspace:*
         version: link:../../crates/node
-      lightningcss:
-        specifier: 'catalog:'
-        version: 1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4)
       postcss:
-        specifier: ^8.4.41
-        version: 8.4.41
+        specifier: 'catalog:'
+        version: 8.5.25
       tailwindcss:
         specifier: workspace:*
         version: link:../tailwindcss
     devDependencies:
       '@types/node':
         specifier: 'catalog:'
-        version: 20.14.13
+        version: 22.20.1
       '@types/postcss-import':
         specifier: 14.0.3
         version: 14.0.3
       dedent:
-        specifier: 1.5.3
-        version: 1.5.3
+        specifier: 'catalog:'
+        version: 1.7.2
       internal-example-plugin:
         specifier: workspace:*
         version: link:../internal-example-plugin
       postcss-import:
-        specifier: ^16.1.0
-        version: 16.1.0(postcss@8.4.41)
+        specifier: ^16.1.1
+        version: 16.1.1(postcss@8.5.25)
 
   packages/@tailwindcss-standalone:
     dependencies:
@@ -204,96 +334,115 @@ importers:
         specifier: ^0.4.2
         version: 0.4.2(tailwindcss@packages+tailwindcss)
       '@tailwindcss/cli':
-        specifier: workspace:^
+        specifier: workspace:*
         version: link:../@tailwindcss-cli
       '@tailwindcss/forms':
-        specifier: ^0.5.9
-        version: 0.5.9(tailwindcss@packages+tailwindcss)
+        specifier: ^0.5.11
+        version: 0.5.11(tailwindcss@packages+tailwindcss)
       '@tailwindcss/typography':
-        specifier: ^0.5.15
-        version: 0.5.15(tailwindcss@packages+tailwindcss)
+        specifier: ^0.5.20
+        version: 0.5.20(tailwindcss@packages+tailwindcss)
       detect-libc:
         specifier: 1.0.3
         version: 1.0.3
       enhanced-resolve:
-        specifier: ^5.17.1
-        version: 5.17.1
+        specifier: 'catalog:'
+        version: 5.24.5
       tailwindcss:
-        specifier: workspace:^
+        specifier: workspace:*
         version: link:../tailwindcss
     devDependencies:
       '@parcel/watcher-darwin-arm64':
-        specifier: ^2.5.0
-        version: 2.5.0
+        specifier: 'catalog:'
+        version: 2.6.0
       '@parcel/watcher-darwin-x64':
-        specifier: ^2.5.0
-        version: 2.5.0
+        specifier: 'catalog:'
+        version: 2.6.0
       '@parcel/watcher-linux-arm64-glibc':
-        specifier: ^2.5.0
-        version: 2.5.0
+        specifier: 'catalog:'
+        version: 2.6.0
       '@parcel/watcher-linux-arm64-musl':
-        specifier: ^2.5.0
-        version: 2.5.0
+        specifier: 'catalog:'
+        version: 2.6.0
       '@parcel/watcher-linux-x64-glibc':
-        specifier: ^2.5.0
-        version: 2.5.0
+        specifier: 'catalog:'
+        version: 2.6.0
       '@parcel/watcher-linux-x64-musl':
-        specifier: ^2.5.0
-        version: 2.5.0
+        specifier: 'catalog:'
+        version: 2.6.0
       '@parcel/watcher-win32-x64':
-        specifier: ^2.5.0
-        version: 2.5.0
+        specifier: 'catalog:'
+        version: 2.6.0
       '@types/bun':
-        specifier: ^1.1.13
-        version: 1.1.13
+        specifier: ^1.3.14
+        version: 1.3.14
       bun:
-        specifier: 1.1.29
-        version: 1.1.29
+        specifier: ^1.3.14
+        version: 1.3.14
       lightningcss-darwin-arm64:
-        specifier: ^1.25.1
-        version: 1.26.0
+        specifier: 'catalog:'
+        version: 1.33.0
       lightningcss-darwin-x64:
-        specifier: ^1.25.1
-        version: 1.26.0
+        specifier: 'catalog:'
+        version: 1.33.0
       lightningcss-linux-arm64-gnu:
-        specifier: ^1.25.1
-        version: 1.26.0
+        specifier: 'catalog:'
+        version: 1.33.0
       lightningcss-linux-arm64-musl:
-        specifier: ^1.25.1
-        version: 1.26.0
+        specifier: 'catalog:'
+        version: 1.33.0
       lightningcss-linux-x64-gnu:
-        specifier: ^1.25.1
-        version: 1.26.0
+        specifier: 'catalog:'
+        version: 1.33.0
       lightningcss-linux-x64-musl:
-        specifier: ^1.25.1
-        version: 1.26.0
+        specifier: 'catalog:'
+        version: 1.33.0
       lightningcss-win32-x64-msvc:
-        specifier: ^1.25.1
-        version: 1.26.0
+        specifier: 'catalog:'
+        version: 1.33.0
+
+  packages/@tailwindcss-turbopack:
+    dependencies:
+      '@alloc/quick-lru':
+        specifier: ^5.2.0
+        version: 5.2.0
+      '@tailwindcss/node':
+        specifier: workspace:*
+        version: link:../@tailwindcss-node
+      '@tailwindcss/oxide':
+        specifier: workspace:*
+        version: link:../../crates/node
+      tailwindcss:
+        specifier: workspace:*
+        version: link:../tailwindcss
+    devDependencies:
+      '@types/node':
+        specifier: 'catalog:'
+        version: 22.20.1
+      webpack:
+        specifier: 'catalog:'
+        version: 5.109.2(esbuild@0.27.7)(postcss@8.5.25)
 
   packages/@tailwindcss-upgrade:
     dependencies:
       '@tailwindcss/node':
-        specifier: workspace:^
+        specifier: workspace:*
         version: link:../@tailwindcss-node
       '@tailwindcss/oxide':
-        specifier: workspace:^
+        specifier: workspace:*
         version: link:../../crates/node
-      braces:
-        specifier: ^3.0.3
-        version: 3.0.3
       dedent:
-        specifier: 1.5.3
-        version: 1.5.3
+        specifier: 'catalog:'
+        version: 1.7.2
       enhanced-resolve:
-        specifier: ^5.17.1
-        version: 5.17.1
+        specifier: 'catalog:'
+        version: 5.24.5
       globby:
-        specifier: ^14.0.2
-        version: 14.0.2
+        specifier: ^16.2.2
+        version: 16.2.2
       jiti:
-        specifier: ^2.0.0-beta.3
-        version: 2.4.0
+        specifier: ^2.7.0
+        version: 2.7.0
       mri:
         specifier: ^1.2.0
         version: 1.2.0
@@ -301,75 +450,109 @@ importers:
         specifier: ^1.1.1
         version: 1.1.1
       postcss:
-        specifier: ^8.4.41
-        version: 8.4.41
+        specifier: 'catalog:'
+        version: 8.5.25
       postcss-import:
-        specifier: ^16.1.0
-        version: 16.1.0(postcss@8.4.41)
+        specifier: ^16.1.1
+        version: 16.1.1(postcss@8.5.25)
       postcss-selector-parser:
-        specifier: ^7.0.0
-        version: 7.0.0
+        specifier: ^7.1.4
+        version: 7.1.4
       prettier:
-        specifier: ^3.3.3
-        version: 3.3.3
+        specifier: 'catalog:'
+        version: 3.9.6
+      semver:
+        specifier: ^7.8.5
+        version: 7.8.5
       tailwindcss:
         specifier: workspace:*
         version: link:../tailwindcss
       tree-sitter:
-        specifier: ^0.22.1
-        version: 0.22.1
+        specifier: ^0.25.1
+        version: 0.25.1
       tree-sitter-typescript:
         specifier: ^0.23.2
-        version: 0.23.2(tree-sitter@0.22.1)
+        version: 0.23.2(tree-sitter@0.25.1)
     devDependencies:
-      '@types/braces':
-        specifier: ^3.0.4
-        version: 3.0.4
       '@types/node':
         specifier: 'catalog:'
-        version: 20.14.13
+        version: 22.20.1
       '@types/postcss-import':
         specifier: ^14.0.3
         version: 14.0.3
+      '@types/semver':
+        specifier: ^7.8.0
+        version: 7.8.0
 
   packages/@tailwindcss-vite:
     dependencies:
       '@tailwindcss/node':
-        specifier: workspace:^
+        specifier: workspace:*
         version: link:../@tailwindcss-node
       '@tailwindcss/oxide':
-        specifier: workspace:^
+        specifier: workspace:*
         version: link:../../crates/node
-      lightningcss:
-        specifier: 'catalog:'
-        version: 1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4)
       tailwindcss:
         specifier: workspace:*
         version: link:../tailwindcss
     devDependencies:
       '@types/node':
         specifier: 'catalog:'
-        version: 20.14.13
+        version: 22.20.1
       vite:
         specifier: 'catalog:'
-        version: 6.0.0(@types/node@20.14.13)(jiti@2.4.0)(lightningcss@1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4))(terser@5.31.6)(tsx@4.19.1)(yaml@2.6.0)
+        version: 8.2.0(@types/node@22.20.1)(esbuild@0.27.7)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0)
+
+  packages/@tailwindcss-webpack:
+    dependencies:
+      '@alloc/quick-lru':
+        specifier: ^5.2.0
+        version: 5.2.0
+      '@rspack/core':
+        specifier: ^1.0.0 || ^2.0.0
+        version: 2.0.2(@swc/helpers@0.5.15)
+      '@tailwindcss/node':
+        specifier: workspace:*
+        version: link:../@tailwindcss-node
+      '@tailwindcss/oxide':
+        specifier: workspace:*
+        version: link:../../crates/node
+      tailwindcss:
+        specifier: workspace:*
+        version: link:../tailwindcss
+    devDependencies:
+      '@types/node':
+        specifier: 'catalog:'
+        version: 22.20.1
+      webpack:
+        specifier: 'catalog:'
+        version: 5.109.2(esbuild@0.27.7)(postcss@8.5.25)
 
   packages/internal-example-plugin: {}
 
   packages/tailwindcss:
     devDependencies:
+      '@jridgewell/remapping':
+        specifier: ^2.3.5
+        version: 2.3.5
       '@tailwindcss/oxide':
         specifier: workspace:^
         version: link:../../crates/node
       '@types/node':
         specifier: 'catalog:'
-        version: 20.14.13
+        version: 22.20.1
       dedent:
-        specifier: 1.5.3
-        version: 1.5.3
+        specifier: 'catalog:'
+        version: 1.7.2
       lightningcss:
         specifier: 'catalog:'
-        version: 1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4)
+        version: 1.33.0(patch_hash=1d4a8800d60d13d42887b88b3a86576df4b451670308145fb432ec8abbf40930)
+      magic-string:
+        specifier: ^1.1.0
+        version: 1.1.0
+      source-map-js:
+        specifier: ^1.2.1
+        version: 1.2.1
 
   playgrounds/nextjs:
     dependencies:
@@ -377,76 +560,64 @@ importers:
         specifier: workspace:^
         version: link:../../packages/@tailwindcss-postcss
       fast-glob:
-        specifier: ^3.3.2
-        version: 3.3.2
+        specifier: ^3.3.3
+        version: 3.3.3
       next:
-        specifier: 15.0.3
-        version: 15.0.3(@playwright/test@1.49.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: 16.2.7
+        version: 16.2.7(@playwright/test@1.62.1)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
       react:
-        specifier: ^18.3.1
-        version: 18.3.1
+        specifier: 19.2.7
+        version: 19.2.7
       react-dom:
-        specifier: ^18.3.1
-        version: 18.3.1(react@18.3.1)
+        specifier: 19.2.7
+        version: 19.2.7(react@19.2.7)
       tailwindcss:
         specifier: workspace:^
         version: link:../../packages/tailwindcss
     devDependencies:
       '@types/node':
         specifier: 'catalog:'
-        version: 20.14.13
+        version: 22.20.1
       '@types/react':
-        specifier: ^18.3.12
-        version: 18.3.12
+        specifier: 19.2.15
+        version: 19.2.15
       '@types/react-dom':
-        specifier: ^18.3.1
-        version: 18.3.1
-      eslint:
-        specifier: ^9.15.0
-        version: 9.15.0(jiti@2.4.0)
-      eslint-config-next:
-        specifier: ^15.0.3
-        version: 15.0.3(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4)
+        specifier: 19.2.3
+        version: 19.2.3(@types/react@19.2.15)
       typescript:
-        specifier: ^5.5.4
-        version: 5.5.4
+        specifier: ^6.0.3
+        version: 6.0.3
 
   playgrounds/v3:
     dependencies:
       next:
-        specifier: 15.0.3
-        version: 15.0.3(@playwright/test@1.49.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: 16.2.7
+        version: 16.2.7(@playwright/test@1.62.1)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
       react:
-        specifier: ^18.3.1
-        version: 18.3.1
+        specifier: 19.2.7
+        version: 19.2.7
       react-dom:
-        specifier: ^18.3.1
-        version: 18.3.1(react@18.3.1)
+        specifier: 19.2.7
+        version: 19.2.7(react@19.2.7)
       tailwindcss:
         specifier: ^3
-        version: 3.4.14
+        version: 3.4.19(yaml@2.9.0)
     devDependencies:
       '@types/node':
-        specifier: ^20.14.8
-        version: 20.14.13
+        specifier: 'catalog:'
+        version: 22.20.1
       '@types/react':
-        specifier: ^18.3.12
-        version: 18.3.12
+        specifier: 19.2.15
+        version: 19.2.15
       '@types/react-dom':
-        specifier: ^18.3.1
-        version: 18.3.1
+        specifier: 19.2.3
+        version: 19.2.3(@types/react@19.2.15)
       autoprefixer:
-        specifier: ^10.4.20
-        version: 10.4.20(postcss@8.4.47)
-      eslint:
-        specifier: ^9.15.0
-        version: 9.15.0(jiti@2.4.0)
-      eslint-config-next:
-        specifier: ^15.0.3
-        version: 15.0.3(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3)
+        specifier: ^10.5.0
+        version: 10.5.0(postcss@8.5.25)
       typescript:
-        specifier: ^5.5.4
-        version: 5.6.3
+        specifier: ^6.0.3
+        version: 6.0.3
 
   playgrounds/vite:
     dependencies:
@@ -454,4194 +625,2306 @@ importers:
         specifier: workspace:^
         version: link:../../packages/@tailwindcss-vite
       '@vitejs/plugin-react':
-        specifier: ^4.3.1
-        version: 4.3.1(vite@6.0.0(@types/node@20.14.13)(jiti@2.4.0)(lightningcss@1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4))(terser@5.31.6)(tsx@4.19.1)(yaml@2.6.0))
+        specifier: ^6.0.2
+        version: 6.0.2(vite@8.2.0(@types/node@25.9.1)(esbuild@0.27.7)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0))
       react:
-        specifier: ^18.3.1
-        version: 18.3.1
+        specifier: ^19.2.6
+        version: 19.2.6
       react-dom:
-        specifier: ^18.3.1
-        version: 18.3.1(react@18.3.1)
+        specifier: ^19.2.6
+        version: 19.2.6(react@19.2.6)
       tailwindcss:
         specifier: workspace:^
         version: link:../../packages/tailwindcss
     devDependencies:
       '@types/react':
-        specifier: ^18.3.12
-        version: 18.3.12
+        specifier: ^19.2.15
+        version: 19.2.15
       '@types/react-dom':
-        specifier: ^18.3.1
-        version: 18.3.1
+        specifier: ^19.2.3
+        version: 19.2.3(@types/react@19.2.15)
       bun:
-        specifier: ^1.1.29
-        version: 1.1.29
+        specifier: ^1.3.14
+        version: 1.3.14
       vite:
         specifier: 'catalog:'
-        version: 6.0.0(@types/node@20.14.13)(jiti@2.4.0)(lightningcss@1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4))(terser@5.31.6)(tsx@4.19.1)(yaml@2.6.0)
+        version: 8.2.0(@types/node@25.9.1)(esbuild@0.27.7)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0)
 
 packages:
+
   '@alloc/quick-lru@5.2.0':
-    resolution:
-      {
-        integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
+    engines: {node: '>=10'}
 
-  '@ampproject/remapping@2.3.0':
-    resolution:
-      {
-        integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==,
-      }
-    engines: { node: '>=6.0.0' }
+  '@emnapi/core@1.10.0':
+    resolution: {integrity: sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==}
 
-  '@babel/code-frame@7.24.7':
-    resolution:
-      {
-        integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==,
-      }
-    engines: { node: '>=6.9.0' }
+  '@emnapi/core@1.11.3':
+    resolution: {integrity: sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==}
 
-  '@babel/compat-data@7.25.2':
-    resolution:
-      {
-        integrity: sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==,
-      }
-    engines: { node: '>=6.9.0' }
+  '@emnapi/core@2.0.0-alpha.3':
+    resolution: {integrity: sha512-AZypUeJ/yByuxyS7BlSNRDOMLMlROYtjYdIAuBmJssVz1UJDSeYxLrdizhXCFYhedC5bqd/ASy8EuNXbVVXp9g==}
 
-  '@babel/core@7.25.2':
-    resolution:
-      {
-        integrity: sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==,
-      }
-    engines: { node: '>=6.9.0' }
+  '@emnapi/runtime@1.10.0':
+    resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==}
 
-  '@babel/generator@7.25.0':
-    resolution:
-      {
-        integrity: sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==,
-      }
-    engines: { node: '>=6.9.0' }
+  '@emnapi/runtime@1.11.3':
+    resolution: {integrity: sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==}
 
-  '@babel/helper-compilation-targets@7.25.2':
-    resolution:
-      {
-        integrity: sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==,
-      }
-    engines: { node: '>=6.9.0' }
+  '@emnapi/runtime@2.0.0-alpha.3':
+    resolution: {integrity: sha512-hFPAhMUjJD9BSyCANEISPOogeXC9Zo9ZQl7L6vKnaVsMkCtzznaW/naYypeyl0Gv5rYfWYsZbpixTMpjDJzQeA==}
 
-  '@babel/helper-module-imports@7.24.7':
-    resolution:
-      {
-        integrity: sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==,
-      }
-    engines: { node: '>=6.9.0' }
+  '@emnapi/wasi-threads@1.2.1':
+    resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==}
 
-  '@babel/helper-module-transforms@7.25.2':
-    resolution:
-      {
-        integrity: sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==,
-      }
-    engines: { node: '>=6.9.0' }
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  '@emnapi/wasi-threads@1.2.3':
+    resolution: {integrity: sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==}
 
-  '@babel/helper-plugin-utils@7.24.8':
-    resolution:
-      {
-        integrity: sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==,
-      }
-    engines: { node: '>=6.9.0' }
+  '@emnapi/wasi-threads@2.0.1':
+    resolution: {integrity: sha512-9DsSk+o5NBX0CCJT8s0EROGSGxjR/tKu6aBTaVyq+SjAEQH4XcdcRxPBRzsBLizTTJ49MJjF+jgu3qnO9GLQcQ==}
 
-  '@babel/helper-simple-access@7.24.7':
-    resolution:
-      {
-        integrity: sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==,
-      }
-    engines: { node: '>=6.9.0' }
-
-  '@babel/helper-string-parser@7.24.8':
-    resolution:
-      {
-        integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==,
-      }
-    engines: { node: '>=6.9.0' }
-
-  '@babel/helper-validator-identifier@7.24.7':
-    resolution:
-      {
-        integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==,
-      }
-    engines: { node: '>=6.9.0' }
-
-  '@babel/helper-validator-option@7.24.8':
-    resolution:
-      {
-        integrity: sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==,
-      }
-    engines: { node: '>=6.9.0' }
-
-  '@babel/helpers@7.25.0':
-    resolution:
-      {
-        integrity: sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==,
-      }
-    engines: { node: '>=6.9.0' }
-
-  '@babel/highlight@7.24.7':
-    resolution:
-      {
-        integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==,
-      }
-    engines: { node: '>=6.9.0' }
-
-  '@babel/parser@7.25.3':
-    resolution:
-      {
-        integrity: sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==,
-      }
-    engines: { node: '>=6.0.0' }
-    hasBin: true
-
-  '@babel/plugin-transform-react-jsx-self@7.24.7':
-    resolution:
-      {
-        integrity: sha512-fOPQYbGSgH0HUp4UJO4sMBFjY6DuWq+2i8rixyUMb3CdGixs/gccURvYOAhajBdKDoGajFr3mUq5rH3phtkGzw==,
-      }
-    engines: { node: '>=6.9.0' }
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/plugin-transform-react-jsx-source@7.24.7':
-    resolution:
-      {
-        integrity: sha512-J2z+MWzZHVOemyLweMqngXrgGC42jQ//R0KdxqkIz/OrbVIIlhFI3WigZ5fO+nwFvBlncr4MGapd8vTyc7RPNQ==,
-      }
-    engines: { node: '>=6.9.0' }
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-
-  '@babel/template@7.25.0':
-    resolution:
-      {
-        integrity: sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==,
-      }
-    engines: { node: '>=6.9.0' }
-
-  '@babel/traverse@7.25.3':
-    resolution:
-      {
-        integrity: sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==,
-      }
-    engines: { node: '>=6.9.0' }
-
-  '@babel/types@7.25.2':
-    resolution:
-      {
-        integrity: sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==,
-      }
-    engines: { node: '>=6.9.0' }
-
-  '@emnapi/runtime@1.3.1':
-    resolution:
-      {
-        integrity: sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==,
-      }
-
-  '@esbuild/aix-ppc64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/aix-ppc64@0.27.7':
+    resolution: {integrity: sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==}
+    engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/aix-ppc64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [ppc64]
-    os: [aix]
-
-  '@esbuild/aix-ppc64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [ppc64]
-    os: [aix]
-
-  '@esbuild/aix-ppc64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [ppc64]
-    os: [aix]
-
-  '@esbuild/android-arm64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/android-arm64@0.27.7':
+    resolution: {integrity: sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [android]
-
-  '@esbuild/android-arm64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [android]
-
-  '@esbuild/android-arm64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [android]
-
-  '@esbuild/android-arm@0.21.5':
-    resolution:
-      {
-        integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/android-arm@0.27.7':
+    resolution: {integrity: sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==}
+    engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.23.0':
-    resolution:
-      {
-        integrity: sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm]
-    os: [android]
-
-  '@esbuild/android-arm@0.23.1':
-    resolution:
-      {
-        integrity: sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm]
-    os: [android]
-
-  '@esbuild/android-arm@0.24.0':
-    resolution:
-      {
-        integrity: sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm]
-    os: [android]
-
-  '@esbuild/android-x64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/android-x64@0.27.7':
+    resolution: {integrity: sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [android]
-
-  '@esbuild/android-x64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [android]
-
-  '@esbuild/android-x64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [android]
-
-  '@esbuild/darwin-arm64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/darwin-arm64@0.27.7':
+    resolution: {integrity: sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-arm64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [darwin]
-
-  '@esbuild/darwin-arm64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [darwin]
-
-  '@esbuild/darwin-arm64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [darwin]
-
-  '@esbuild/darwin-x64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/darwin-x64@0.27.7':
+    resolution: {integrity: sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [darwin]
-
-  '@esbuild/darwin-x64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [darwin]
-
-  '@esbuild/darwin-x64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [darwin]
-
-  '@esbuild/freebsd-arm64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/freebsd-arm64@0.27.7':
+    resolution: {integrity: sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-arm64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-arm64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-arm64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-x64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/freebsd-x64@0.27.7':
+    resolution: {integrity: sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-x64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-x64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [freebsd]
-
-  '@esbuild/linux-arm64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-arm64@0.27.7':
+    resolution: {integrity: sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [linux]
-
-  '@esbuild/linux-arm64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [linux]
-
-  '@esbuild/linux-arm64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [linux]
-
-  '@esbuild/linux-arm@0.21.5':
-    resolution:
-      {
-        integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-arm@0.27.7':
+    resolution: {integrity: sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==}
+    engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-arm@0.23.0':
-    resolution:
-      {
-        integrity: sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm]
-    os: [linux]
-
-  '@esbuild/linux-arm@0.23.1':
-    resolution:
-      {
-        integrity: sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm]
-    os: [linux]
-
-  '@esbuild/linux-arm@0.24.0':
-    resolution:
-      {
-        integrity: sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm]
-    os: [linux]
-
-  '@esbuild/linux-ia32@0.21.5':
-    resolution:
-      {
-        integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-ia32@0.27.7':
+    resolution: {integrity: sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==}
+    engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.23.0':
-    resolution:
-      {
-        integrity: sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [ia32]
-    os: [linux]
-
-  '@esbuild/linux-ia32@0.23.1':
-    resolution:
-      {
-        integrity: sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [ia32]
-    os: [linux]
-
-  '@esbuild/linux-ia32@0.24.0':
-    resolution:
-      {
-        integrity: sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [ia32]
-    os: [linux]
-
-  '@esbuild/linux-loong64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-loong64@0.27.7':
+    resolution: {integrity: sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==}
+    engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==,
-      }
-    engines: { node: '>=18' }
-    cpu: [loong64]
-    os: [linux]
-
-  '@esbuild/linux-loong64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [loong64]
-    os: [linux]
-
-  '@esbuild/linux-loong64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==,
-      }
-    engines: { node: '>=18' }
-    cpu: [loong64]
-    os: [linux]
-
-  '@esbuild/linux-mips64el@0.21.5':
-    resolution:
-      {
-        integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-mips64el@0.27.7':
+    resolution: {integrity: sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==}
+    engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.23.0':
-    resolution:
-      {
-        integrity: sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==,
-      }
-    engines: { node: '>=18' }
-    cpu: [mips64el]
-    os: [linux]
-
-  '@esbuild/linux-mips64el@0.23.1':
-    resolution:
-      {
-        integrity: sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==,
-      }
-    engines: { node: '>=18' }
-    cpu: [mips64el]
-    os: [linux]
-
-  '@esbuild/linux-mips64el@0.24.0':
-    resolution:
-      {
-        integrity: sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [mips64el]
-    os: [linux]
-
-  '@esbuild/linux-ppc64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-ppc64@0.27.7':
+    resolution: {integrity: sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==}
+    engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [ppc64]
-    os: [linux]
-
-  '@esbuild/linux-ppc64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [ppc64]
-    os: [linux]
-
-  '@esbuild/linux-ppc64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [ppc64]
-    os: [linux]
-
-  '@esbuild/linux-riscv64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-riscv64@0.27.7':
+    resolution: {integrity: sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==}
+    engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [riscv64]
-    os: [linux]
-
-  '@esbuild/linux-riscv64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [riscv64]
-    os: [linux]
-
-  '@esbuild/linux-riscv64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [riscv64]
-    os: [linux]
-
-  '@esbuild/linux-s390x@0.21.5':
-    resolution:
-      {
-        integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-s390x@0.27.7':
+    resolution: {integrity: sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==}
+    engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.23.0':
-    resolution:
-      {
-        integrity: sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==,
-      }
-    engines: { node: '>=18' }
-    cpu: [s390x]
-    os: [linux]
-
-  '@esbuild/linux-s390x@0.23.1':
-    resolution:
-      {
-        integrity: sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [s390x]
-    os: [linux]
-
-  '@esbuild/linux-s390x@0.24.0':
-    resolution:
-      {
-        integrity: sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==,
-      }
-    engines: { node: '>=18' }
-    cpu: [s390x]
-    os: [linux]
-
-  '@esbuild/linux-x64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/linux-x64@0.27.7':
+    resolution: {integrity: sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [linux]
+  '@esbuild/netbsd-arm64@0.27.7':
+    resolution: {integrity: sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
 
-  '@esbuild/linux-x64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [linux]
-
-  '@esbuild/linux-x64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [linux]
-
-  '@esbuild/netbsd-x64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/netbsd-x64@0.27.7':
+    resolution: {integrity: sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [netbsd]
-
-  '@esbuild/netbsd-x64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [netbsd]
-
-  '@esbuild/netbsd-x64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [netbsd]
-
-  '@esbuild/openbsd-arm64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==,
-      }
-    engines: { node: '>=18' }
+  '@esbuild/openbsd-arm64@0.27.7':
+    resolution: {integrity: sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
 
-  '@esbuild/openbsd-arm64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==,
-      }
-    engines: { node: '>=18' }
+  '@esbuild/openbsd-x64@0.27.7':
+    resolution: {integrity: sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/openharmony-arm64@0.27.7':
+    resolution: {integrity: sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==}
+    engines: {node: '>=18'}
     cpu: [arm64]
-    os: [openbsd]
+    os: [openharmony]
 
-  '@esbuild/openbsd-arm64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [openbsd]
-
-  '@esbuild/openbsd-x64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==,
-      }
-    engines: { node: '>=12' }
-    cpu: [x64]
-    os: [openbsd]
-
-  '@esbuild/openbsd-x64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [openbsd]
-
-  '@esbuild/openbsd-x64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [openbsd]
-
-  '@esbuild/openbsd-x64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [openbsd]
-
-  '@esbuild/sunos-x64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/sunos-x64@0.27.7':
+    resolution: {integrity: sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [sunos]
-
-  '@esbuild/sunos-x64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [sunos]
-
-  '@esbuild/sunos-x64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [sunos]
-
-  '@esbuild/win32-arm64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/win32-arm64@0.27.7':
+    resolution: {integrity: sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-arm64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [win32]
-
-  '@esbuild/win32-arm64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [win32]
-
-  '@esbuild/win32-arm64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [arm64]
-    os: [win32]
-
-  '@esbuild/win32-ia32@0.21.5':
-    resolution:
-      {
-        integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/win32-ia32@0.27.7':
+    resolution: {integrity: sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==}
+    engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.23.0':
-    resolution:
-      {
-        integrity: sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [ia32]
-    os: [win32]
-
-  '@esbuild/win32-ia32@0.23.1':
-    resolution:
-      {
-        integrity: sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==,
-      }
-    engines: { node: '>=18' }
-    cpu: [ia32]
-    os: [win32]
-
-  '@esbuild/win32-ia32@0.24.0':
-    resolution:
-      {
-        integrity: sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==,
-      }
-    engines: { node: '>=18' }
-    cpu: [ia32]
-    os: [win32]
-
-  '@esbuild/win32-x64@0.21.5':
-    resolution:
-      {
-        integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==,
-      }
-    engines: { node: '>=12' }
+  '@esbuild/win32-x64@0.27.7':
+    resolution: {integrity: sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.23.0':
-    resolution:
-      {
-        integrity: sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [win32]
+  '@img/colour@1.1.0':
+    resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==}
+    engines: {node: '>=18'}
 
-  '@esbuild/win32-x64@0.23.1':
-    resolution:
-      {
-        integrity: sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [win32]
-
-  '@esbuild/win32-x64@0.24.0':
-    resolution:
-      {
-        integrity: sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==,
-      }
-    engines: { node: '>=18' }
-    cpu: [x64]
-    os: [win32]
-
-  '@eslint-community/eslint-utils@4.4.0':
-    resolution:
-      {
-        integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-
-  '@eslint-community/regexpp@4.11.1':
-    resolution:
-      {
-        integrity: sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==,
-      }
-    engines: { node: ^12.0.0 || ^14.0.0 || >=16.0.0 }
-
-  '@eslint-community/regexpp@4.12.1':
-    resolution:
-      {
-        integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==,
-      }
-    engines: { node: ^12.0.0 || ^14.0.0 || >=16.0.0 }
-
-  '@eslint/config-array@0.19.0':
-    resolution:
-      {
-        integrity: sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
-
-  '@eslint/core@0.9.0':
-    resolution:
-      {
-        integrity: sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
-
-  '@eslint/eslintrc@3.2.0':
-    resolution:
-      {
-        integrity: sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
-
-  '@eslint/js@9.15.0':
-    resolution:
-      {
-        integrity: sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
-
-  '@eslint/object-schema@2.1.4':
-    resolution:
-      {
-        integrity: sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
-
-  '@eslint/plugin-kit@0.2.3':
-    resolution:
-      {
-        integrity: sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
-
-  '@humanfs/core@0.19.1':
-    resolution:
-      {
-        integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==,
-      }
-    engines: { node: '>=18.18.0' }
-
-  '@humanfs/node@0.16.6':
-    resolution:
-      {
-        integrity: sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==,
-      }
-    engines: { node: '>=18.18.0' }
-
-  '@humanwhocodes/module-importer@1.0.1':
-    resolution:
-      {
-        integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==,
-      }
-    engines: { node: '>=12.22' }
-
-  '@humanwhocodes/retry@0.3.1':
-    resolution:
-      {
-        integrity: sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==,
-      }
-    engines: { node: '>=18.18' }
-
-  '@humanwhocodes/retry@0.4.1':
-    resolution:
-      {
-        integrity: sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==,
-      }
-    engines: { node: '>=18.18' }
-
-  '@img/sharp-darwin-arm64@0.33.5':
-    resolution:
-      {
-        integrity: sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==,
-      }
-    engines: { node: ^18.17.0 || ^20.3.0 || >=21.0.0 }
+  '@img/sharp-darwin-arm64@0.34.5':
+    resolution: {integrity: sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@img/sharp-darwin-x64@0.33.5':
-    resolution:
-      {
-        integrity: sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==,
-      }
-    engines: { node: ^18.17.0 || ^20.3.0 || >=21.0.0 }
+  '@img/sharp-darwin-x64@0.34.5':
+    resolution: {integrity: sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [darwin]
 
-  '@img/sharp-libvips-darwin-arm64@1.0.4':
-    resolution:
-      {
-        integrity: sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==,
-      }
+  '@img/sharp-libvips-darwin-arm64@1.2.4':
+    resolution: {integrity: sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==}
     cpu: [arm64]
     os: [darwin]
 
-  '@img/sharp-libvips-darwin-x64@1.0.4':
-    resolution:
-      {
-        integrity: sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==,
-      }
+  '@img/sharp-libvips-darwin-x64@1.2.4':
+    resolution: {integrity: sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==}
     cpu: [x64]
     os: [darwin]
 
-  '@img/sharp-libvips-linux-arm64@1.0.4':
-    resolution:
-      {
-        integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==,
-      }
+  '@img/sharp-libvips-linux-arm64@1.2.4':
+    resolution: {integrity: sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
-  '@img/sharp-libvips-linux-arm@1.0.5':
-    resolution:
-      {
-        integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==,
-      }
+  '@img/sharp-libvips-linux-arm@1.2.4':
+    resolution: {integrity: sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
-  '@img/sharp-libvips-linux-s390x@1.0.4':
-    resolution:
-      {
-        integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==,
-      }
+  '@img/sharp-libvips-linux-ppc64@1.2.4':
+    resolution: {integrity: sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-riscv64@1.2.4':
+    resolution: {integrity: sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-s390x@1.2.4':
+    resolution: {integrity: sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
-  '@img/sharp-libvips-linux-x64@1.0.4':
-    resolution:
-      {
-        integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==,
-      }
+  '@img/sharp-libvips-linux-x64@1.2.4':
+    resolution: {integrity: sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
-  '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
-    resolution:
-      {
-        integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==,
-      }
+  '@img/sharp-libvips-linuxmusl-arm64@1.2.4':
+    resolution: {integrity: sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
-  '@img/sharp-libvips-linuxmusl-x64@1.0.4':
-    resolution:
-      {
-        integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==,
-      }
+  '@img/sharp-libvips-linuxmusl-x64@1.2.4':
+    resolution: {integrity: sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
-  '@img/sharp-linux-arm64@0.33.5':
-    resolution:
-      {
-        integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==,
-      }
-    engines: { node: ^18.17.0 || ^20.3.0 || >=21.0.0 }
+  '@img/sharp-linux-arm64@0.34.5':
+    resolution: {integrity: sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
-  '@img/sharp-linux-arm@0.33.5':
-    resolution:
-      {
-        integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==,
-      }
-    engines: { node: ^18.17.0 || ^20.3.0 || >=21.0.0 }
+  '@img/sharp-linux-arm@0.34.5':
+    resolution: {integrity: sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
-  '@img/sharp-linux-s390x@0.33.5':
-    resolution:
-      {
-        integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==,
-      }
-    engines: { node: ^18.17.0 || ^20.3.0 || >=21.0.0 }
+  '@img/sharp-linux-ppc64@0.34.5':
+    resolution: {integrity: sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-riscv64@0.34.5':
+    resolution: {integrity: sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-s390x@0.34.5':
+    resolution: {integrity: sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
-  '@img/sharp-linux-x64@0.33.5':
-    resolution:
-      {
-        integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==,
-      }
-    engines: { node: ^18.17.0 || ^20.3.0 || >=21.0.0 }
+  '@img/sharp-linux-x64@0.34.5':
+    resolution: {integrity: sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
-  '@img/sharp-linuxmusl-arm64@0.33.5':
-    resolution:
-      {
-        integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==,
-      }
-    engines: { node: ^18.17.0 || ^20.3.0 || >=21.0.0 }
+  '@img/sharp-linuxmusl-arm64@0.34.5':
+    resolution: {integrity: sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
-  '@img/sharp-linuxmusl-x64@0.33.5':
-    resolution:
-      {
-        integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==,
-      }
-    engines: { node: ^18.17.0 || ^20.3.0 || >=21.0.0 }
+  '@img/sharp-linuxmusl-x64@0.34.5':
+    resolution: {integrity: sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
-  '@img/sharp-wasm32@0.33.5':
-    resolution:
-      {
-        integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==,
-      }
-    engines: { node: ^18.17.0 || ^20.3.0 || >=21.0.0 }
+  '@img/sharp-wasm32@0.34.5':
+    resolution: {integrity: sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [wasm32]
 
-  '@img/sharp-win32-ia32@0.33.5':
-    resolution:
-      {
-        integrity: sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==,
-      }
-    engines: { node: ^18.17.0 || ^20.3.0 || >=21.0.0 }
+  '@img/sharp-win32-arm64@0.34.5':
+    resolution: {integrity: sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [win32]
+
+  '@img/sharp-win32-ia32@0.34.5':
+    resolution: {integrity: sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [ia32]
     os: [win32]
 
-  '@img/sharp-win32-x64@0.33.5':
-    resolution:
-      {
-        integrity: sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==,
-      }
-    engines: { node: ^18.17.0 || ^20.3.0 || >=21.0.0 }
+  '@img/sharp-win32-x64@0.34.5':
+    resolution: {integrity: sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [win32]
 
-  '@isaacs/cliui@8.0.2':
-    resolution:
-      {
-        integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==,
-      }
-    engines: { node: '>=12' }
+  '@inquirer/ansi@2.0.7':
+    resolution: {integrity: sha512-3eTuUO1vH2cZm2ZKHeQxnOqlTi9EfZDGgIe3BL3I4u+rJHocr9Fz86M4fjYABPvFnQG/gGK551HqDiIcETwU6Q==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
 
-  '@jridgewell/gen-mapping@0.3.5':
-    resolution:
-      {
-        integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==,
-      }
-    engines: { node: '>=6.0.0' }
+  '@inquirer/checkbox@5.2.1':
+    resolution: {integrity: sha512-b6xmA/VlTe0ZgDQHDui+Nav470u7u49nRd8/iuhOcQPO9Ch7lGuogydhi2VOmNlZ+zXcM8IcPuNSwQcdJaF/kw==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/confirm@6.1.1':
+    resolution: {integrity: sha512-eb8DBZcz/2qHWQda4rk2JiQk5h9QV/cVHi1yjt0f69WFZMRFn0sJTye3EAP8icut8UDMjQPsaH5KbcOogefrFQ==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/core@11.2.1':
+    resolution: {integrity: sha512-Qd6GJT1yVyrZZCfN8W2qKF5ApmqryXRhRKCuip8h01x2w/esJQ2XIYc6f9abMIHgKQdBfFTSOdbHRLAhuM09UA==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/editor@5.2.2':
+    resolution: {integrity: sha512-ZRVd/oD+sYsUd5zVm0NflqEzlqfYCyHNsqkHl2oWXEUHs12tCbcSFi+wVFEvD8+LGRaMUsVrE7qeo6lSG/S1Vg==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/expand@5.1.1':
+    resolution: {integrity: sha512-YmQpenjbFSHAK3sOd44puHh3V1KXXr+JiNpUztoSQ4drLh2rTVzTap/YtlAVu/5xavifIlBfNEzJ/neZJ1a/1g==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/external-editor@3.0.3':
+    resolution: {integrity: sha512-6thf5I8q7lZwzGLAxPaaGEREEkZ3nyePPDQ1oyobblxmEE8mqTLguScP7pDjUTAibiyb4hfXl+qjUEJ+di/aNA==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/figures@2.0.7':
+    resolution: {integrity: sha512-aJ8TBPOGB6f/2qziPfElISTCEd5XOYTFckA2SGjhNmiKzfK/u4ot3v0DUzGVdUnKjN10EqnnEPck36BkyfLnJw==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+
+  '@inquirer/input@5.1.2':
+    resolution: {integrity: sha512-9K/DDBSQpOyZSkt6sOVP9Vo0TR7atX2kuILsUu0x3wVcVbe97lJwIJKMLdMw25tDYuXl/qp6erT0Xs1rfmcfZg==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/number@4.1.1':
+    resolution: {integrity: sha512-XF4IXAbPnGPgw0wsbC/i2tPcyfdZgDpUlhsqU0SfT4IRIGWha6Xm9VRgN5yYxJq+jnyXlfXI/nQ3ulfk0iEICA==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/password@5.1.1':
+    resolution: {integrity: sha512-3XBfF7DAsp5qeDsvN5Rd1HmbNokVvEQoUM0QLrRcybC9nX96w3Pbmu7qUsb3IT3J3jBvs2+mTXaKHOUsgHMLzg==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/prompts@8.5.2':
+    resolution: {integrity: sha512-IYR/3C/paEVVQYQvdDlFZVjRCJVYHHON0XXMH91KO9GSxs0TdKYWlUdvfQl2EfAHDxUaN3IBffkE/BDTh5nJ6g==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/rawlist@5.3.1':
+    resolution: {integrity: sha512-QqdTqQddL3qPX/PPrjobpsO25NZ4dWXgTLenrR445L2ptLEYE6Z+PD5c5CNDJNx4ugRgELAIpSIJxZaO2jJ2Og==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/search@4.2.1':
+    resolution: {integrity: sha512-xJj8QWKRSrfKoBIITLZK61dD3zwo0Rz11fgDImku30/Oe81zMdIdGgrLY2h6RkJ+KZ/GhNYIRMKnH/62qBTA5g==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/select@5.2.1':
+    resolution: {integrity: sha512-FlDndEUww8m7BfukO2nJa25vhD+H5jxxCv4oGioKqzyWz3nPHhhw4LKdYRSlXuAx7DsdWia7iyaBPKKS95Evfw==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/type@4.0.7':
+    resolution: {integrity: sha512-t28inv14nMQ1PhKpsJPY+kEs/c00qzeCOS2gTNRyTjG5d6qsVA2fItxW4hkvGZ5lvanGLdtCzVIx5dwdRpN1+g==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@jridgewell/gen-mapping@0.3.13':
+    resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
+
+  '@jridgewell/remapping@2.3.5':
+    resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==}
 
   '@jridgewell/resolve-uri@3.1.2':
-    resolution:
-      {
-        integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==,
-      }
-    engines: { node: '>=6.0.0' }
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
 
-  '@jridgewell/set-array@1.2.1':
-    resolution:
-      {
-        integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==,
-      }
-    engines: { node: '>=6.0.0' }
+  '@jridgewell/source-map@0.3.11':
+    resolution: {integrity: sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==}
 
-  '@jridgewell/source-map@0.3.6':
-    resolution:
-      {
-        integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==,
-      }
+  '@jridgewell/sourcemap-codec@1.5.5':
+    resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
 
-  '@jridgewell/sourcemap-codec@1.5.0':
-    resolution:
-      {
-        integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==,
-      }
+  '@jridgewell/trace-mapping@0.3.31':
+    resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
 
-  '@jridgewell/trace-mapping@0.3.25':
-    resolution:
-      {
-        integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==,
-      }
-
-  '@napi-rs/cli@2.18.4':
-    resolution:
-      {
-        integrity: sha512-SgJeA4df9DE2iAEpr3M2H0OKl/yjtg1BnRI5/JyowS71tUWhrfSu2LT0V3vlHET+g1hBVlrO60PmEXwUEKp8Mg==,
-      }
-    engines: { node: '>= 10' }
+  '@napi-rs/cli@3.7.4':
+    resolution: {integrity: sha512-idELIUceJ9zPgx/shcMt1fSSsteFG68v56RIXi4qUm7OYuJOt7CoMj2KnHVmbOqXgUHWQU1lCULrtQdZDG4F5A==}
+    engines: {node: '>= 16'}
     hasBin: true
+    peerDependencies:
+      '@emnapi/runtime': ^1.7.1
+    peerDependenciesMeta:
+      '@emnapi/runtime':
+        optional: true
 
-  '@next/env@15.0.3':
-    resolution:
-      {
-        integrity: sha512-t9Xy32pjNOvVn2AS+Utt6VmyrshbpfUMhIjFO60gI58deSo/KgLOp31XZ4O+kY/Is8WAGYwA5gR7kOb1eORDBA==,
-      }
+  '@napi-rs/cross-toolchain@1.0.3':
+    resolution: {integrity: sha512-ENPfLe4937bsKVTDA6zdABx4pq9w0tHqRrJHyaGxgaPq03a2Bd1unD5XSKjXJjebsABJ+MjAv1A2OvCgK9yehg==}
+    peerDependencies:
+      '@napi-rs/cross-toolchain-arm64-target-aarch64': ^1.0.3
+      '@napi-rs/cross-toolchain-arm64-target-armv7': ^1.0.3
+      '@napi-rs/cross-toolchain-arm64-target-ppc64le': ^1.0.3
+      '@napi-rs/cross-toolchain-arm64-target-s390x': ^1.0.3
+      '@napi-rs/cross-toolchain-arm64-target-x86_64': ^1.0.3
+      '@napi-rs/cross-toolchain-x64-target-aarch64': ^1.0.3
+      '@napi-rs/cross-toolchain-x64-target-armv7': ^1.0.3
+      '@napi-rs/cross-toolchain-x64-target-ppc64le': ^1.0.3
+      '@napi-rs/cross-toolchain-x64-target-s390x': ^1.0.3
+      '@napi-rs/cross-toolchain-x64-target-x86_64': ^1.0.3
+    peerDependenciesMeta:
+      '@napi-rs/cross-toolchain-arm64-target-aarch64':
+        optional: true
+      '@napi-rs/cross-toolchain-arm64-target-armv7':
+        optional: true
+      '@napi-rs/cross-toolchain-arm64-target-ppc64le':
+        optional: true
+      '@napi-rs/cross-toolchain-arm64-target-s390x':
+        optional: true
+      '@napi-rs/cross-toolchain-arm64-target-x86_64':
+        optional: true
+      '@napi-rs/cross-toolchain-x64-target-aarch64':
+        optional: true
+      '@napi-rs/cross-toolchain-x64-target-armv7':
+        optional: true
+      '@napi-rs/cross-toolchain-x64-target-ppc64le':
+        optional: true
+      '@napi-rs/cross-toolchain-x64-target-s390x':
+        optional: true
+      '@napi-rs/cross-toolchain-x64-target-x86_64':
+        optional: true
 
-  '@next/eslint-plugin-next@15.0.3':
-    resolution:
-      {
-        integrity: sha512-3Ln/nHq2V+v8uIaxCR6YfYo7ceRgZNXfTd3yW1ukTaFbO+/I8jNakrjYWODvG9BuR2v5kgVtH/C8r0i11quOgw==,
-      }
+  '@napi-rs/lzma-android-arm-eabi@1.4.5':
+    resolution: {integrity: sha512-Up4gpyw2SacmyKWWEib06GhiDdF+H+CCU0LAV8pnM4aJIDqKKd5LHSlBht83Jut6frkB0vwEPmAkv4NjQ5u//Q==}
+    engines: {node: '>= 10'}
+    cpu: [arm]
+    os: [android]
 
-  '@next/swc-darwin-arm64@15.0.3':
-    resolution:
-      {
-        integrity: sha512-s3Q/NOorCsLYdCKvQlWU+a+GeAd3C8Rb3L1YnetsgwXzhc3UTWrtQpB/3eCjFOdGUj5QmXfRak12uocd1ZiiQw==,
-      }
-    engines: { node: '>= 10' }
+  '@napi-rs/lzma-android-arm64@1.4.5':
+    resolution: {integrity: sha512-uwa8sLlWEzkAM0MWyoZJg0JTD3BkPknvejAFG2acUA1raXM8jLrqujWCdOStisXhqQjZ2nDMp3FV6cs//zjfuQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [android]
+
+  '@napi-rs/lzma-darwin-arm64@1.4.5':
+    resolution: {integrity: sha512-0Y0TQLQ2xAjVabrMDem1NhIssOZzF/y/dqetc6OT8mD3xMTDtF8u5BqZoX3MyPc9FzpsZw4ksol+w7DsxHrpMA==}
+    engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@next/swc-darwin-x64@15.0.3':
-    resolution:
-      {
-        integrity: sha512-Zxl/TwyXVZPCFSf0u2BNj5sE0F2uR6iSKxWpq4Wlk/Sv9Ob6YCKByQTkV2y6BCic+fkabp9190hyrDdPA/dNrw==,
-      }
-    engines: { node: '>= 10' }
+  '@napi-rs/lzma-darwin-x64@1.4.5':
+    resolution: {integrity: sha512-vR2IUyJY3En+V1wJkwmbGWcYiT8pHloTAWdW4pG24+51GIq+intst6Uf6D/r46citObGZrlX0QvMarOkQeHWpw==}
+    engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@next/swc-linux-arm64-gnu@15.0.3':
-    resolution:
-      {
-        integrity: sha512-T5+gg2EwpsY3OoaLxUIofmMb7ohAUlcNZW0fPQ6YAutaWJaxt1Z1h+8zdl4FRIOr5ABAAhXtBcpkZNwUcKI2fw==,
-      }
-    engines: { node: '>= 10' }
+  '@napi-rs/lzma-freebsd-x64@1.4.5':
+    resolution: {integrity: sha512-XpnYQC5SVovO35tF0xGkbHYjsS6kqyNCjuaLQ2dbEblFRr5cAZVvsJ/9h7zj/5FluJPJRDojVNxGyRhTp4z2lw==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@napi-rs/lzma-linux-arm-gnueabihf@1.4.5':
+    resolution: {integrity: sha512-ic1ZZMoRfRMwtSwxkyw4zIlbDZGC6davC9r+2oX6x9QiF247BRqqT94qGeL5ZP4Vtz0Hyy7TEViWhx5j6Bpzvw==}
+    engines: {node: '>= 10'}
+    cpu: [arm]
+    os: [linux]
+
+  '@napi-rs/lzma-linux-arm64-gnu@1.4.5':
+    resolution: {integrity: sha512-asEp7FPd7C1Yi6DQb45a3KPHKOFBSfGuJWXcAd4/bL2Fjetb2n/KK2z14yfW8YC/Fv6x3rBM0VAZKmJuz4tysg==}
+    engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
-  '@next/swc-linux-arm64-musl@15.0.3':
-    resolution:
-      {
-        integrity: sha512-WkAk6R60mwDjH4lG/JBpb2xHl2/0Vj0ZRu1TIzWuOYfQ9tt9NFsIinI1Epma77JVgy81F32X/AeD+B2cBu/YQA==,
-      }
-    engines: { node: '>= 10' }
+  '@napi-rs/lzma-linux-arm64-musl@1.4.5':
+    resolution: {integrity: sha512-yWjcPDgJ2nIL3KNvi4536dlT/CcCWO0DUyEOlBs/SacG7BeD6IjGh6yYzd3/X1Y3JItCbZoDoLUH8iB1lTXo3w==}
+    engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
-  '@next/swc-linux-x64-gnu@15.0.3':
-    resolution:
-      {
-        integrity: sha512-gWL/Cta1aPVqIGgDb6nxkqy06DkwJ9gAnKORdHWX1QBbSZZB+biFYPFti8aKIQL7otCE1pjyPaXpFzGeG2OS2w==,
-      }
-    engines: { node: '>= 10' }
+  '@napi-rs/lzma-linux-ppc64-gnu@1.4.5':
+    resolution: {integrity: sha512-0XRhKuIU/9ZjT4WDIG/qnX7Xz7mSQHYZo9Gb3MP2gcvBgr6BA4zywQ9k3gmQaPn9ECE+CZg2V7DV7kT+x2pUMQ==}
+    engines: {node: '>= 10'}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@napi-rs/lzma-linux-riscv64-gnu@1.4.5':
+    resolution: {integrity: sha512-QrqDIPEUUB23GCpyQj/QFyMlr8SGxxyExeZz9OWFnHfb70kXdTLWrHS/hEI1Ru+lSbQ/6xRqeoGyQ4Aqdg+/RA==}
+    engines: {node: '>= 10'}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@napi-rs/lzma-linux-s390x-gnu@1.4.5':
+    resolution: {integrity: sha512-k8RVM5aMhW86E9H0QXdquwojew4H3SwPxbRVbl49/COJQWCUjGi79X6mYruMnMPEznZinUiT1jgKbFo2A00NdA==}
+    engines: {node: '>= 10'}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@napi-rs/lzma-linux-x64-gnu@1.4.5':
+    resolution: {integrity: sha512-6rMtBgnIq2Wcl1rQdZsnM+rtCcVCbws1nF8S2NzaUsVaZv8bjrPiAa0lwg4Eqnn1d9lgwqT+cZgm5m+//K08Kw==}
+    engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
-  '@next/swc-linux-x64-musl@15.0.3':
-    resolution:
-      {
-        integrity: sha512-QQEMwFd8r7C0GxQS62Zcdy6GKx999I/rTO2ubdXEe+MlZk9ZiinsrjwoiBL5/57tfyjikgh6GOU2WRQVUej3UA==,
-      }
-    engines: { node: '>= 10' }
+  '@napi-rs/lzma-linux-x64-musl@1.4.5':
+    resolution: {integrity: sha512-eiadGBKi7Vd0bCArBUOO/qqRYPHt/VQVvGyYvDFt6C2ZSIjlD+HuOl+2oS1sjf4CFjK4eDIog6EdXnL0NE6iyQ==}
+    engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
-  '@next/swc-win32-arm64-msvc@15.0.3':
-    resolution:
-      {
-        integrity: sha512-9TEp47AAd/ms9fPNgtgnT7F3M1Hf7koIYYWCMQ9neOwjbVWJsHZxrFbI3iEDJ8rf1TDGpmHbKxXf2IFpAvheIQ==,
-      }
-    engines: { node: '>= 10' }
+  '@napi-rs/lzma-wasm32-wasi@1.4.5':
+    resolution: {integrity: sha512-+VyHHlr68dvey6fXc2hehw9gHVFIW3TtGF1XkcbAu65qVXsA9D/T+uuoRVqhE+JCyFHFrO0ixRbZDRK1XJt1sA==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+
+  '@napi-rs/lzma-win32-arm64-msvc@1.4.5':
+    resolution: {integrity: sha512-eewnqvIyyhHi3KaZtBOJXohLvwwN27gfS2G/YDWdfHlbz1jrmfeHAmzMsP5qv8vGB+T80TMHNkro4kYjeh6Deg==}
+    engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
 
-  '@next/swc-win32-x64-msvc@15.0.3':
-    resolution:
-      {
-        integrity: sha512-VNAz+HN4OGgvZs6MOoVfnn41kBzT+M+tB+OK4cww6DNyWS6wKaDpaAm/qLeOUbnMh0oVx1+mg0uoYARF69dJyA==,
-      }
-    engines: { node: '>= 10' }
+  '@napi-rs/lzma-win32-ia32-msvc@1.4.5':
+    resolution: {integrity: sha512-OeacFVRCJOKNU/a0ephUfYZ2Yt+NvaHze/4TgOwJ0J0P4P7X1mHzN+ig9Iyd74aQDXYqc7kaCXA2dpAOcH87Cg==}
+    engines: {node: '>= 10'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@napi-rs/lzma-win32-x64-msvc@1.4.5':
+    resolution: {integrity: sha512-T4I1SamdSmtyZgDXGAGP+y5LEK5vxHUFwe8mz6D4R7Sa5/WCxTcCIgPJ9BD7RkpO17lzhlaM2vmVvMy96Lvk9Q==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@napi-rs/lzma@1.4.5':
+    resolution: {integrity: sha512-zS5LuN1OBPAyZpda2ZZgYOEDC+xecUdAGnrvbYzjnLXkrq/OBC3B9qcRvlxbDR3k5H/gVfvef1/jyUqPknqjbg==}
+    engines: {node: '>= 10'}
+
+  '@napi-rs/tar-android-arm-eabi@1.1.0':
+    resolution: {integrity: sha512-h2Ryndraj/YiKgMV/r5by1cDusluYIRT0CaE0/PekQ4u+Wpy2iUVqvzVU98ZPnhXaNeYxEvVJHNGafpOfaD0TA==}
+    engines: {node: '>= 10'}
+    cpu: [arm]
+    os: [android]
+
+  '@napi-rs/tar-android-arm64@1.1.0':
+    resolution: {integrity: sha512-DJFyQHr1ZxNZorm/gzc1qBNLF/FcKzcH0V0Vwan5P+o0aE2keQIGEjJ09FudkF9v6uOuJjHCVDdK6S6uHtShAw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [android]
+
+  '@napi-rs/tar-darwin-arm64@1.1.0':
+    resolution: {integrity: sha512-Zz2sXRzjIX4e532zD6xm2SjXEym6MkvfCvL2RMpG2+UwNVDVscHNcz3d47Pf3sysP2e2af7fBB3TIoK2f6trPw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@napi-rs/tar-darwin-x64@1.1.0':
+    resolution: {integrity: sha512-EI+CptIMNweT0ms9S3mkP/q+J6FNZ1Q6pvpJOEcWglRfyfQpLqjlC0O+dptruTPE8VamKYuqdjxfqD8hifZDOA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@napi-rs/tar-freebsd-x64@1.1.0':
+    resolution: {integrity: sha512-J0PIqX+pl6lBIAckL/c87gpodLbjZB1OtIK+RDscKC9NLdpVv6VGOxzUV/fYev/hctcE8EfkLbgFOfpmVQPg2g==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@napi-rs/tar-linux-arm-gnueabihf@1.1.0':
+    resolution: {integrity: sha512-SLgIQo3f3EjkZ82ZwvrEgFvMdDAhsxCYjyoSuWfHCz0U16qx3SuGCp8+FYOPYCECHN3ZlGjXnoAIt9ERd0dEUg==}
+    engines: {node: '>= 10'}
+    cpu: [arm]
+    os: [linux]
+
+  '@napi-rs/tar-linux-arm64-gnu@1.1.0':
+    resolution: {integrity: sha512-d014cdle52EGaH6GpYTQOP9Py7glMO1zz/+ynJPjjzYFSxvdYx0byrjumZk2UQdIyGZiJO2MEFpCkEEKFSgPYA==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@napi-rs/tar-linux-arm64-musl@1.1.0':
+    resolution: {integrity: sha512-L/y1/26q9L/uBqiW/JdOb/Dc94egFvNALUZV2WCGKQXc6UByPBMgdiEyW2dtoYxYYYYc+AKD+jr+wQPcvX2vrQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@napi-rs/tar-linux-ppc64-gnu@1.1.0':
+    resolution: {integrity: sha512-EPE1K/80RQvPbLRJDJs1QmCIcH+7WRi0F73+oTe1582y9RtfGRuzAkzeBuAGRXAQEjRQw/RjtNqr6UTJ+8UuWQ==}
+    engines: {node: '>= 10'}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@napi-rs/tar-linux-s390x-gnu@1.1.0':
+    resolution: {integrity: sha512-B2jhWiB1ffw1nQBqLUP1h4+J1ovAxBOoe5N2IqDMOc63fsPZKNqF1PvO/dIem8z7LL4U4bsfmhy3gBfu547oNQ==}
+    engines: {node: '>= 10'}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@napi-rs/tar-linux-x64-gnu@1.1.0':
+    resolution: {integrity: sha512-tbZDHnb9617lTnsDMGo/eAMZxnsQFnaRe+MszRqHguKfMwkisc9CCJnks/r1o84u5fECI+J/HOrKXgczq/3Oww==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@napi-rs/tar-linux-x64-musl@1.1.0':
+    resolution: {integrity: sha512-dV6cODlzbO8u6Anmv2N/ilQHq/AWz0xyltuXoLU3yUyXbZcnWYZuB2rL8OBGPmqNcD+x9NdScBNXh7vWN0naSQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@napi-rs/tar-wasm32-wasi@1.1.0':
+    resolution: {integrity: sha512-jIa9nb2HzOrfH0F8QQ9g3WE4aMH5vSI5/1NYVNm9ysCmNjCCtMXCAhlI3WKCdm/DwHf0zLqdrrtDFXODcNaqMw==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+
+  '@napi-rs/tar-win32-arm64-msvc@1.1.0':
+    resolution: {integrity: sha512-vfpG71OB0ijtjemp3WTdmBKJm9R70KM8vsSExMsIQtV0lVzP07oM1CW6JbNRPXNLhRoue9ofYLiUDk8bE0Hckg==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@napi-rs/tar-win32-ia32-msvc@1.1.0':
+    resolution: {integrity: sha512-hGPyPW60YSpOSgzfy68DLBHgi6HxkAM+L59ZZZPMQ0TOXjQg+p2EW87+TjZfJOkSpbYiEkULwa/f4a2hcVjsqQ==}
+    engines: {node: '>= 10'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@napi-rs/tar-win32-x64-msvc@1.1.0':
+    resolution: {integrity: sha512-L6Ed1DxXK9YSCMyvpR8MiNAyKNkQLjsHsHK9E0qnHa8NzLFqzDKhvs5LfnWxM2kJ+F7m/e5n9zPm24kHb3LsVw==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@napi-rs/tar@1.1.0':
+    resolution: {integrity: sha512-7cmzIu+Vbupriudo7UudoMRH2OA3cTw67vva8MxeoAe5S7vPFI7z0vp0pMXiA25S8IUJefImQ90FeJjl8fjEaQ==}
+    engines: {node: '>= 10'}
+
+  '@napi-rs/wasm-runtime@1.1.4':
+    resolution: {integrity: sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==}
+    peerDependencies:
+      '@emnapi/core': ^1.7.1
+      '@emnapi/runtime': ^1.7.1
+
+  '@napi-rs/wasm-runtime@1.2.2':
+    resolution: {integrity: sha512-JfB4kuJQjaoHuCTseIINHtHWeJnvgEcxjwA5t/Y00ZgaOO1Crz3fjT/p8kT28zA/Caz7oiUMn3d6H2yOVCVwuw==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0}
+    peerDependencies:
+      '@emnapi/core': ^1.7.1 || ^2.0.0-alpha.3
+      '@emnapi/runtime': ^1.7.1 || ^2.0.0-alpha.3
+
+  '@napi-rs/wasm-tools-android-arm-eabi@1.0.1':
+    resolution: {integrity: sha512-lr07E/l571Gft5v4aA1dI8koJEmF1F0UigBbsqg9OWNzg80H3lDPO+auv85y3T/NHE3GirDk7x/D3sLO57vayw==}
+    engines: {node: '>= 10'}
+    cpu: [arm]
+    os: [android]
+
+  '@napi-rs/wasm-tools-android-arm64@1.0.1':
+    resolution: {integrity: sha512-WDR7S+aRLV6LtBJAg5fmjKkTZIdrEnnQxgdsb7Cf8pYiMWBHLU+LC49OUVppQ2YSPY0+GeYm9yuZWW3kLjJ7Bg==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [android]
+
+  '@napi-rs/wasm-tools-darwin-arm64@1.0.1':
+    resolution: {integrity: sha512-qWTI+EEkiN0oIn/N2gQo7+TVYil+AJ20jjuzD2vATS6uIjVz+Updeqmszi7zq7rdFTLp6Ea3/z4kDKIfZwmR9g==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@napi-rs/wasm-tools-darwin-x64@1.0.1':
+    resolution: {integrity: sha512-bA6hubqtHROR5UI3tToAF/c6TDmaAgF0SWgo4rADHtQ4wdn0JeogvOk50gs2TYVhKPE2ZD2+qqt7oBKB+sxW3A==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@napi-rs/wasm-tools-freebsd-x64@1.0.1':
+    resolution: {integrity: sha512-90+KLBkD9hZEjPQW1MDfwSt5J1L46EUKacpCZWyRuL6iIEO5CgWU0V/JnEgFsDOGyyYtiTvHc5bUdUTWd4I9Vg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@napi-rs/wasm-tools-linux-arm64-gnu@1.0.1':
+    resolution: {integrity: sha512-rG0QlS65x9K/u3HrKafDf8cFKj5wV2JHGfl8abWgKew0GVPyp6vfsDweOwHbWAjcHtp2LHi6JHoW80/MTHm52Q==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@napi-rs/wasm-tools-linux-arm64-musl@1.0.1':
+    resolution: {integrity: sha512-jAasbIvjZXCgX0TCuEFQr+4D6Lla/3AAVx2LmDuMjgG4xoIXzjKWl7c4chuaD+TI+prWT0X6LJcdzFT+ROKGHQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@napi-rs/wasm-tools-linux-x64-gnu@1.0.1':
+    resolution: {integrity: sha512-Plgk5rPqqK2nocBGajkMVbGm010Z7dnUgq0wtnYRZbzWWxwWcXfZMPa8EYxrK4eE8SzpI7VlZP1tdVsdjgGwMw==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@napi-rs/wasm-tools-linux-x64-musl@1.0.1':
+    resolution: {integrity: sha512-GW7AzGuWxtQkyHknHWYFdR0CHmW6is8rG2Rf4V6GNmMpmwtXt/ItWYWtBe4zqJWycMNazpfZKSw/BpT7/MVCXQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@napi-rs/wasm-tools-wasm32-wasi@1.0.1':
+    resolution: {integrity: sha512-/nQVSTrqSsn7YdAc2R7Ips/tnw5SPUcl3D7QrXCNGPqjbatIspnaexvaOYNyKMU6xPu+pc0BTnKVmqhlJJCPLA==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+
+  '@napi-rs/wasm-tools-win32-arm64-msvc@1.0.1':
+    resolution: {integrity: sha512-PFi7oJIBu5w7Qzh3dwFea3sHRO3pojMsaEnUIy22QvsW+UJfNQwJCryVrpoUt8m4QyZXI+saEq/0r4GwdoHYFQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@napi-rs/wasm-tools-win32-ia32-msvc@1.0.1':
+    resolution: {integrity: sha512-gXkuYzxQsgkj05Zaq+KQTkHIN83dFAwMcTKa2aQcpYPRImFm2AQzEyLtpXmyCWzJ0F9ZYAOmbSyrNew8/us6bw==}
+    engines: {node: '>= 10'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@napi-rs/wasm-tools-win32-x64-msvc@1.0.1':
+    resolution: {integrity: sha512-rEAf05nol3e3eei2sRButmgXP+6ATgm0/38MKhz9Isne82T4rPIMYsCIFj0kOisaGeVwoi2fnm7O9oWp5YVnYQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@napi-rs/wasm-tools@1.0.1':
+    resolution: {integrity: sha512-enkZYyuCdo+9jneCPE/0fjIta4wWnvVN9hBo2HuiMpRF0q3lzv1J6b/cl7i0mxZUKhBrV3aCKDBQnCOhwKbPmQ==}
+    engines: {node: '>= 10'}
+
+  '@next/env@16.2.7':
+    resolution: {integrity: sha512-tMJizPlj6ZYpBMMdK8S0LJufrP4QTdR6pcv9KQ/bVETPAmg0j1mlHE9G2c38UyGHxoBapgwuj7XjbGJ2RcDFOg==}
+
+  '@next/swc-darwin-arm64@16.2.7':
+    resolution: {integrity: sha512-vm1EDI/pVaBNNiychmxk3fft+OhQPVD9cIM/tReLZIQ3TfQ4kqI9DwKk00dzuS1ulC7icbrzCFrmRRlk9PfNdw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@next/swc-darwin-x64@16.2.7':
+    resolution: {integrity: sha512-O3IRSv1ZBL1zs0WrIgefTEcTKFVn+ryxBNe54erJ6KsD+2f/Mmt7g2jOYh8PSBdUwPtKQJuCsTMlZ7tIu2AcsQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@next/swc-linux-arm64-gnu@16.2.7':
+    resolution: {integrity: sha512-Re6PZtjBDd0aMU+VcZcC/PrIvj4WhrjDYtMhhCVQamWN4L90EVP0pcEOBQD25prSlw7OzNw5QpHLWMilRLsRNw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@next/swc-linux-arm64-musl@16.2.7':
+    resolution: {integrity: sha512-qyogG9QtBzWxgJfeGBvOEHI3851gTfCF3wLZ5RDLTBJGAmE9p1qDwKCOdrBrvBzRvYDT+gUDp72pzlSEfAXgNA==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@next/swc-linux-x64-gnu@16.2.7':
+    resolution: {integrity: sha512-Vhe4ZDuBpmMogrGi5D4R2Kq4JAQlj6+wvgaFYy31zfES0zPmt6TLA+cuYpM/OLrPZjo2MYQTHVqNUSCR6+fDZQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@next/swc-linux-x64-musl@16.2.7':
+    resolution: {integrity: sha512-srvian89JahFLw1YLBEuhvPJ0DO5lpUeJQMXy4xYo7g628ZlNgXdNkqoxSAv9OYrBfByh6vxISMwW/mRbzCY+g==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@next/swc-win32-arm64-msvc@16.2.7':
+    resolution: {integrity: sha512-GX3wvLpULFuRFJzwHaKfm7QZJ18F4ZSuxlPJ96BoBglCzBmdSjyeBKF+ZhWhvL/ckxNfLnNa7bsObO2ipYpszw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@next/swc-win32-x64-msvc@16.2.7':
+    resolution: {integrity: sha512-J4WlM72NMk076Qsg0jTdK3SNXatlSdnjW7L7oNGLst1tAGjHrJh/FYi+pw9wyIjEtGRKDNzD0zuiY16oWYWVaw==}
+    engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
 
   '@nodelib/fs.scandir@2.1.5':
-    resolution:
-      {
-        integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
+    engines: {node: '>= 8'}
 
   '@nodelib/fs.stat@2.0.5':
-    resolution:
-      {
-        integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
+    engines: {node: '>= 8'}
 
   '@nodelib/fs.walk@1.2.8':
-    resolution:
-      {
-        integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
+    engines: {node: '>= 8'}
 
-  '@nolyfill/is-core-module@1.0.39':
-    resolution:
-      {
-        integrity: sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==,
-      }
-    engines: { node: '>=12.4.0' }
+  '@octokit/auth-token@6.0.0':
+    resolution: {integrity: sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==}
+    engines: {node: '>= 20'}
 
-  '@oven/bun-darwin-aarch64@1.1.29':
-    resolution:
-      {
-        integrity: sha512-Z8WnrXoAXg6ENU6z+Mil94oipMBMliJIj4XWWqjNC33/ZGPqMdPT5MbFQjbdHjxe5bRBW/aHaMU3G35fGx9Seg==,
-      }
+  '@octokit/core@7.0.6':
+    resolution: {integrity: sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==}
+    engines: {node: '>= 20'}
+
+  '@octokit/endpoint@11.0.3':
+    resolution: {integrity: sha512-FWFlNxghg4HrXkD3ifYbS/IdL/mDHjh9QcsNyhQjN8dplUoZbejsdpmuqdA76nxj2xoWPs7p8uX2SNr9rYu0Ag==}
+    engines: {node: '>= 20'}
+
+  '@octokit/graphql@9.0.3':
+    resolution: {integrity: sha512-grAEuupr/C1rALFnXTv6ZQhFuL1D8G5y8CN04RgrO4FIPMrtm+mcZzFG7dcBm+nq+1ppNixu+Jd78aeJOYxlGA==}
+    engines: {node: '>= 20'}
+
+  '@octokit/openapi-types@27.0.0':
+    resolution: {integrity: sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==}
+
+  '@octokit/plugin-paginate-rest@14.0.0':
+    resolution: {integrity: sha512-fNVRE7ufJiAA3XUrha2omTA39M6IXIc6GIZLvlbsm8QOQCYvpq/LkMNGyFlB1d8hTDzsAXa3OKtybdMAYsV/fw==}
+    engines: {node: '>= 20'}
+    peerDependencies:
+      '@octokit/core': '>=6'
+
+  '@octokit/plugin-request-log@6.0.0':
+    resolution: {integrity: sha512-UkOzeEN3W91/eBq9sPZNQ7sUBvYCqYbrrD8gTbBuGtHEuycE4/awMXcYvx6sVYo7LypPhmQwwpUe4Yyu4QZN5Q==}
+    engines: {node: '>= 20'}
+    peerDependencies:
+      '@octokit/core': '>=6'
+
+  '@octokit/plugin-rest-endpoint-methods@17.0.0':
+    resolution: {integrity: sha512-B5yCyIlOJFPqUUeiD0cnBJwWJO8lkJs5d8+ze9QDP6SvfiXSz1BF+91+0MeI1d2yxgOhU/O+CvtiZ9jSkHhFAw==}
+    engines: {node: '>= 20'}
+    peerDependencies:
+      '@octokit/core': '>=6'
+
+  '@octokit/request-error@7.1.0':
+    resolution: {integrity: sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==}
+    engines: {node: '>= 20'}
+
+  '@octokit/request@10.0.9':
+    resolution: {integrity: sha512-o8Bi3f608eyM+7BmBiUWxFsdjLb3/ym1cQek5LZOv9KkZcxRrHCPhhRzm6xjO6HVZ85ItD6+sTsjxo821SVa/A==}
+    engines: {node: '>= 20'}
+
+  '@octokit/rest@22.0.1':
+    resolution: {integrity: sha512-Jzbhzl3CEexhnivb1iQ0KJ7s5vvjMWcmRtq5aUsKmKDrRW6z3r84ngmiFKFvpZjpiU/9/S6ITPFRpn5s/3uQJw==}
+    engines: {node: '>= 20'}
+
+  '@octokit/types@16.0.0':
+    resolution: {integrity: sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==}
+
+  '@oven/bun-darwin-aarch64@1.3.14':
+    resolution: {integrity: sha512-Omj20SuiHBOUjUBIyqtkNjSUIjOtEOJwmbix/ZyFH4BaQ6OZTaaRWIR4TjHVz0yadHgli6lLTiAh1uarnvD49A==}
     cpu: [arm64]
     os: [darwin]
 
-  '@oven/bun-darwin-x64-baseline@1.1.29':
-    resolution:
-      {
-        integrity: sha512-B+zKlJR+3ANPDU+vNjvXaqgB63hYcCk16/k45hiInvIsDXfSdDn4+LMHwZTFdfUWTCGbNMFg9u4bZCtK0nhMDw==,
-      }
+  '@oven/bun-darwin-x64-baseline@1.3.14':
+    resolution: {integrity: sha512-OSfsTZstc898HHElhU4NccaBGOSSDn5VfahiVTnidZ9B/+wb7WTyfZJaBeJcfjwJ9H2W9uTh2TGtl3UfcXgV9g==}
     cpu: [x64]
     os: [darwin]
 
-  '@oven/bun-darwin-x64@1.1.29':
-    resolution:
-      {
-        integrity: sha512-tDHDR+OWLCKEP0xE8IGCWRxSsxO5tr3rvyrSzy6CXYkoWPz66kODbtbGfWl8HSwunrQxJKnE2L9LWX2Eiz3Cpw==,
-      }
+  '@oven/bun-darwin-x64@1.3.14':
+    resolution: {integrity: sha512-FFj3QdU/OhlDyZOJ8CWfN5eWLpRlT4qjZg7lMQi7jA6GuoY5ajlO1zWLP/MuHYRSbXQUvV52RejNi8DVnAp13w==}
     cpu: [x64]
     os: [darwin]
 
-  '@oven/bun-linux-aarch64@1.1.29':
-    resolution:
-      {
-        integrity: sha512-BuV2Gni+FaMo1r7+3vLjefQYtQcWE01zJJ4zCjyzikP1L4r6PUaLeJyKXbqF6sIR0cLjG6LWj66EGskakDyvWA==,
-      }
+  '@oven/bun-freebsd-aarch64@1.3.14':
+    resolution: {integrity: sha512-LIKrXaFxAHybVO5Pf+9XP2FHUj/5APvXTUKk9dqHm5iFz4oH+W24cmhjkJirNujh9hKeTyrpWSe3no9JZKowIw==}
     cpu: [arm64]
-    os: [linux]
+    os: [freebsd]
 
-  '@oven/bun-linux-x64-baseline@1.1.29':
-    resolution:
-      {
-        integrity: sha512-tQhm1SDyymBvc2L3zIN7FI+sI3g9gxavDYuvL/Lz17nEk1oqP5DFE2lF9QWJMDdQL3XQKH/drI27yNpfPHgAPw==,
-      }
-    cpu: [x64]
-    os: [linux]
-
-  '@oven/bun-linux-x64@1.1.29':
-    resolution:
-      {
-        integrity: sha512-JVLiTafybuOFIeC80mZEzHdkOCCzlOtOV5zCbvYAIb7D3SM64fNBwrR0dvDkJTQtsjbwt8YeVFN2YRSI/wlFkw==,
-      }
-    cpu: [x64]
-    os: [linux]
-
-  '@oven/bun-windows-x64-baseline@1.1.29':
-    resolution:
-      {
-        integrity: sha512-+QWT8Kp+3Sl54QUa6uBsDzQlX11thMMVAw+yUwSRU4Y5FVSN8RPuxhN8ijJ1QGm1KOYA2sCI6V+3lyNMNmRvAA==,
-      }
-    cpu: [x64]
-    os: [win32]
-
-  '@oven/bun-windows-x64@1.1.29':
-    resolution:
-      {
-        integrity: sha512-d930+pSkNVHPJJBryIh1gsAKk7lp1HzcktFe0bfxwmpHwjj4BiVfMjU1YaCnsdWKNs2Nv1Y1PLVDNyUCQVfo0Q==,
-      }
-    cpu: [x64]
-    os: [win32]
-
-  '@parcel/watcher-android-arm64@2.5.0':
-    resolution:
-      {
-        integrity: sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==,
-      }
-    engines: { node: '>= 10.0.0' }
-    cpu: [arm64]
-    os: [android]
-
-  '@parcel/watcher-darwin-arm64@2.5.0':
-    resolution:
-      {
-        integrity: sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==,
-      }
-    engines: { node: '>= 10.0.0' }
-    cpu: [arm64]
-    os: [darwin]
-
-  '@parcel/watcher-darwin-x64@2.5.0':
-    resolution:
-      {
-        integrity: sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==,
-      }
-    engines: { node: '>= 10.0.0' }
-    cpu: [x64]
-    os: [darwin]
-
-  '@parcel/watcher-freebsd-x64@2.5.0':
-    resolution:
-      {
-        integrity: sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==,
-      }
-    engines: { node: '>= 10.0.0' }
+  '@oven/bun-freebsd-x64@1.3.14':
+    resolution: {integrity: sha512-uwD+fGUH1ADpIF3B1U2jWzzb20QwRLZfj5QZ28GUCGrAJ/nTmWrD6YYGsblCY1wuhldRez3lU40AyuvSCyLYmw==}
     cpu: [x64]
     os: [freebsd]
 
-  '@parcel/watcher-linux-arm-glibc@2.5.0':
-    resolution:
-      {
-        integrity: sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==,
-      }
-    engines: { node: '>= 10.0.0' }
+  '@oven/bun-linux-aarch64-android@1.3.14':
+    resolution: {integrity: sha512-y4kq5b85lsrmFb9Xvi4w9mA5IEFJkLMrSmYn06q24KjL9rUWDWO3VFZEtteZxUN5+ec3Zm5S8OnJw1umaCbVjA==}
+    cpu: [arm64]
+    os: [android]
+
+  '@oven/bun-linux-aarch64-musl@1.3.14':
+    resolution: {integrity: sha512-jmqOA92Cd1NL/1XBd4bFkJLxQ86K0RW7ohxS2qzzAvuitO4JiIxjjTeCspoU44zCozH72HpfZfUE2On31OjnWA==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@oven/bun-linux-aarch64@1.3.14':
+    resolution: {integrity: sha512-X5SsPZHs+iYO8R/efIcRtc7gT2Q2DgPfliCxEkx4cXBumwkw0c/EsHMNwH3EgGpCDaZ7IYVPhpCG/xBOQHEwZw==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@oven/bun-linux-x64-android@1.3.14':
+    resolution: {integrity: sha512-qe9e1d+3VAEU7nAA2ol9Jvmy/o99PVMSgZhHn7Q/9O3YcDrfEqyQ8zm4zoe5qTEo8HZH0dN03Le0Ys2eQPs7eg==}
+    cpu: [x64]
+    os: [android]
+
+  '@oven/bun-linux-x64-baseline@1.3.14':
+    resolution: {integrity: sha512-q/8EdOC0yUE8FPeoOVq8/Pw5I9/tJaYmUfO/uDUAREx8IUnOJH1RJ5A3BjFqre8pvJoiZA9AovPJq5FnNNjSxA==}
+    cpu: [x64]
+    os: [linux]
+
+  '@oven/bun-linux-x64-musl-baseline@1.3.14':
+    resolution: {integrity: sha512-n6iE71G4lQE4XkrZhQQcL5YUlxDbnq6nqV7zeQi33PMsLT/0kYE+RvHOtBWZ3w0wMdXZfINmp63hIb9ijUBGtw==}
+    cpu: [x64]
+    os: [linux]
+
+  '@oven/bun-linux-x64-musl@1.3.14':
+    resolution: {integrity: sha512-GBCB/k/sIqcr06eTNgg7g46qiUv35Jasx4XiccJ/n7RGqrE4RWUD/XJBbWFprVPjvqd59+QtSnS99XGqvftHfg==}
+    cpu: [x64]
+    os: [linux]
+
+  '@oven/bun-linux-x64@1.3.14':
+    resolution: {integrity: sha512-7OVTAKvwfPmSbIV1HpdOoVVx5VRc427GuPPne93N6vk4eQBPId9nXmZDh9/zGaKPdbVjVtQSZafWQoUjx38Utw==}
+    cpu: [x64]
+    os: [linux]
+
+  '@oven/bun-windows-aarch64@1.3.14':
+    resolution: {integrity: sha512-T7s3x/BsVKQObGU6QDkZeI6wKynzqGbBH1yI77jrrj5siElclxr3DQrDIk8CV4G5/SJq2HHq4kpLyYY2DKCSmA==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@oven/bun-windows-x64-baseline@1.3.14':
+    resolution: {integrity: sha512-uIjLUC1S9DWgICzuoMba7vurBJnBruE4S5CxnvmZkdqWVXRzx1Rgu636HoH+k0qeaQCFh3jeG3JQ1y6fRHv0sw==}
+    cpu: [x64]
+    os: [win32]
+
+  '@oven/bun-windows-x64@1.3.14':
+    resolution: {integrity: sha512-mUFWL3BoYkNpjd8e9PqROiFF/1Xeotq20mABJsiQH62jM1g5zqWh4khw1RZ6bX8Q8fWvlPaxG1PjofkmjUi3vg==}
+    cpu: [x64]
+    os: [win32]
+
+  '@oxc-project/types@0.142.0':
+    resolution: {integrity: sha512-7W+2q5AKQVU36fkaryontrHn3YDt1RyUYXatw9i5H8ocYe2sPKSFB6eS8WNPeRKiN1qAWWZUPm7gwFzJGrccqQ==}
+
+  '@parcel/watcher-android-arm64@2.6.0':
+    resolution: {integrity: sha512-trgpLSCKRC/huFjXX/Smh+0sWe4+YtKfktIToiMl59ghz7z+qkH6kMvNnUbLyRs9N11t8l4svSCs1+5B3rOAhA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [android]
+
+  '@parcel/watcher-darwin-arm64@2.6.0':
+    resolution: {integrity: sha512-Y3QV0gl7Q1zbfueunkWIERICbEojQFCgpyG7YqOGNFLsckXyI1xu9mAIUpKY9QBYzBtSkN8dBPwd3yiAO9ovMw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@parcel/watcher-darwin-x64@2.6.0':
+    resolution: {integrity: sha512-Ohv6OpzhUfKYD7Beb8kDvG0jbIxORCYY1JRdZnaBtnjjkJxgD7ZVL0nw2sCYd0yTMKTvz3nnTnOF3cDifK+kvw==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@parcel/watcher-freebsd-x64@2.6.0':
+    resolution: {integrity: sha512-5HmXvDgs8VK+74jF9y9/2FE3/OnlcKmc56tjmSrEuZjpSZOGL+fvAu+HKJBdPs9uwoP2hE6TlSUpXZ/C5jUFmQ==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@parcel/watcher-linux-arm-glibc@2.6.0':
+    resolution: {integrity: sha512-Ps/hui3A+vMbjdqlqAowK2ZL8+BO8dBjxeWXj6npTBs3jx4wWmbPpaLuqwrQrSqIVMCnpWo238bJ1U37GhQOYg==}
+    engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
-  '@parcel/watcher-linux-arm-musl@2.5.0':
-    resolution:
-      {
-        integrity: sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==,
-      }
-    engines: { node: '>= 10.0.0' }
+  '@parcel/watcher-linux-arm-musl@2.6.0':
+    resolution: {integrity: sha512-9c6AUHgHoG+IY88MRIHupztQiQnrbqHYQjkM2btA+Bf/wQnQMuiD0Wfk1EVv3TlNT3x41uU71rn6E4xh/+zvkw==}
+    engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
-  '@parcel/watcher-linux-arm64-glibc@2.5.0':
-    resolution:
-      {
-        integrity: sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==,
-      }
-    engines: { node: '>= 10.0.0' }
+  '@parcel/watcher-linux-arm64-glibc@2.6.0':
+    resolution: {integrity: sha512-yHRqS2owEXe6Hic9z6Mh1ECsCd+ODVOGvZDyciqRd21+v+o+DnXMOrw50DSpIG2sb8GPEaPPmfeCAWKPJdq46g==}
+    engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
 
-  '@parcel/watcher-linux-arm64-musl@2.5.0':
-    resolution:
-      {
-        integrity: sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==,
-      }
-    engines: { node: '>= 10.0.0' }
+  '@parcel/watcher-linux-arm64-musl@2.6.0':
+    resolution: {integrity: sha512-WhB2e/V7rqdHHWZusBSPuy5Ei8S6lSz6FE5TKKQz5h3a0O+C+mhY7vxU9b/stqvMb8beLnPY82ZrFTLKs+SrKA==}
+    engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
 
-  '@parcel/watcher-linux-x64-glibc@2.5.0':
-    resolution:
-      {
-        integrity: sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==,
-      }
-    engines: { node: '>= 10.0.0' }
+  '@parcel/watcher-linux-x64-glibc@2.6.0':
+    resolution: {integrity: sha512-ulGE6x6Oz6iAwg75T8YQSoguBWasniIbX+QWpaYPcCnDOpdWX3k+4xbEYPZVLxOuoJI+svJJPD3sEj8G7lrQ3A==}
+    engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
 
-  '@parcel/watcher-linux-x64-musl@2.5.0':
-    resolution:
-      {
-        integrity: sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==,
-      }
-    engines: { node: '>= 10.0.0' }
+  '@parcel/watcher-linux-x64-musl@2.6.0':
+    resolution: {integrity: sha512-tkBYKt7YQrjIJWYDnto2YgO8MRkjlMTSNoRHzsXinBqbLdeOM3L32wPZJvIZxqaLMfSlS/4sUjH/6STVP/XDLw==}
+    engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
 
-  '@parcel/watcher-win32-arm64@2.5.0':
-    resolution:
-      {
-        integrity: sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==,
-      }
-    engines: { node: '>= 10.0.0' }
+  '@parcel/watcher-wasm@2.5.6':
+    resolution: {integrity: sha512-byAiBZ1t3tXQvc8dMD/eoyE7lTXYorhn+6uVW5AC+JGI1KtJC/LvDche5cfUE+qiefH+Ybq0bUCJU0aB1cSHUA==}
+    engines: {node: '>= 10.0.0'}
+    bundledDependencies:
+      - napi-wasm
+
+  '@parcel/watcher-win32-arm64@2.6.0':
+    resolution: {integrity: sha512-gIZAP23jaHjGWasY/TY6yL7NHFClf0Ga7FN+iINvk+KN94rhm94lYZhFsbYFNcA04/onvGD9kKmiJLJB2HbNwQ==}
+    engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [win32]
 
-  '@parcel/watcher-win32-ia32@2.5.0':
-    resolution:
-      {
-        integrity: sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==,
-      }
-    engines: { node: '>= 10.0.0' }
-    cpu: [ia32]
-    os: [win32]
-
-  '@parcel/watcher-win32-x64@2.5.0':
-    resolution:
-      {
-        integrity: sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==,
-      }
-    engines: { node: '>= 10.0.0' }
+  '@parcel/watcher-win32-x64@2.6.0':
+    resolution: {integrity: sha512-cA+/pXV2YkfxlIcXOQ5fSWqAzzPyD78/x5qbK/I0vUkrlYHA8TIz+MXjAbGouguKVSI4bOmkTSJ1/poVSsgt+A==}
+    engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [win32]
 
-  '@parcel/watcher@2.5.0':
-    resolution:
-      {
-        integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==,
-      }
-    engines: { node: '>= 10.0.0' }
+  '@parcel/watcher@2.6.0':
+    resolution: {integrity: sha512-7FNeNl8NCE7aINx7WXiKQrPYZWC/hvrTsmk6zmxbI7LTXE7hVek/n8AfVgpe2y82zl3w0HvCHN0bVKMBoJcC0w==}
+    engines: {node: '>= 10.0.0'}
 
-  '@pkgjs/parseargs@0.11.0':
-    resolution:
-      {
-        integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==,
-      }
-    engines: { node: '>=14' }
-
-  '@playwright/test@1.49.0':
-    resolution:
-      {
-        integrity: sha512-DMulbwQURa8rNIQrf94+jPJQ4FmOVdpE5ZppRNvWVjvhC+6sOeo28r8MgIpQRYouXRtt/FCCXU7zn20jnHR4Qw==,
-      }
-    engines: { node: '>=18' }
+  '@playwright/test@1.62.1':
+    resolution: {integrity: sha512-DTcUc8qii+cpHvtOwggMtBRMjKZHXYWdw8syRYu2vtzuq4Wxphqq4NfCs5Zt44L6mA8rfDfj+PHnxFc/FeK6mQ==}
+    engines: {node: '>=20'}
     hasBin: true
 
-  '@rollup/rollup-android-arm-eabi@4.20.0':
-    resolution:
-      {
-        integrity: sha512-TSpWzflCc4VGAUJZlPpgAJE1+V60MePDQnBd7PPkpuEmOy8i87aL6tinFGKBFKuEDikYpig72QzdT3QPYIi+oA==,
-      }
-    cpu: [arm]
-    os: [android]
-
-  '@rollup/rollup-android-arm-eabi@4.27.4':
-    resolution:
-      {
-        integrity: sha512-2Y3JT6f5MrQkICUyRVCw4oa0sutfAsgaSsb0Lmmy1Wi2y7X5vT9Euqw4gOsCyy0YfKURBg35nhUKZS4mDcfULw==,
-      }
-    cpu: [arm]
-    os: [android]
-
-  '@rollup/rollup-android-arm64@4.20.0':
-    resolution:
-      {
-        integrity: sha512-u00Ro/nok7oGzVuh/FMYfNoGqxU5CPWz1mxV85S2w9LxHR8OoMQBuSk+3BKVIDYgkpeOET5yXkx90OYFc+ytpQ==,
-      }
+  '@rolldown/binding-android-arm64@1.2.1':
+    resolution: {integrity: sha512-02hOeOSryYxVrOIphmLAsqnCJWxwlzFk+pEt/N/i6OgT3lShHO7xGCU5cpgchRDHboAEbSjzgGh+O/u1GswQmA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.27.4':
-    resolution:
-      {
-        integrity: sha512-wzKRQXISyi9UdCVRqEd0H4cMpzvHYt1f/C3CoIjES6cG++RHKhrBj2+29nPF0IB5kpy9MS71vs07fvrNGAl/iA==,
-      }
-    cpu: [arm64]
-    os: [android]
-
-  '@rollup/rollup-darwin-arm64@4.20.0':
-    resolution:
-      {
-        integrity: sha512-uFVfvzvsdGtlSLuL0ZlvPJvl6ZmrH4CBwLGEFPe7hUmf7htGAN+aXo43R/V6LATyxlKVC/m6UsLb7jbG+LG39Q==,
-      }
+  '@rolldown/binding-darwin-arm64@1.2.1':
+    resolution: {integrity: sha512-fMsTOnN0OjFm3CyppWPitKnc8UlliVARUULW6cfU6AIqjdtgmSFWSk9vecHzZduv/yMWIHDlRhM1e8Iff9uAfA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-arm64@4.27.4':
-    resolution:
-      {
-        integrity: sha512-PlNiRQapift4LNS8DPUHuDX/IdXiLjf8mc5vdEmUR0fF/pyy2qWwzdLjB+iZquGr8LuN4LnUoSEvKRwjSVYz3Q==,
-      }
-    cpu: [arm64]
-    os: [darwin]
-
-  '@rollup/rollup-darwin-x64@4.20.0':
-    resolution:
-      {
-        integrity: sha512-xbrMDdlev53vNXexEa6l0LffojxhqDTBeL+VUxuuIXys4x6xyvbKq5XqTXBCEUA8ty8iEJblHvFaWRJTk/icAQ==,
-      }
+  '@rolldown/binding-darwin-x64@1.2.1':
+    resolution: {integrity: sha512-1wjKdz/XLGKHaTNHjQveQ/B23TKx4ItAqm1JbyVuvNPc4Ze0Fb48s49TAd/2zcplPl8okE/UbTgmlVfwT7eFeQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.27.4':
-    resolution:
-      {
-        integrity: sha512-o9bH2dbdgBDJaXWJCDTNDYa171ACUdzpxSZt+u/AAeQ20Nk5x+IhA+zsGmrQtpkLiumRJEYef68gcpn2ooXhSQ==,
-      }
-    cpu: [x64]
-    os: [darwin]
-
-  '@rollup/rollup-freebsd-arm64@4.27.4':
-    resolution:
-      {
-        integrity: sha512-NBI2/i2hT9Q+HySSHTBh52da7isru4aAAo6qC3I7QFVsuhxi2gM8t/EI9EVcILiHLj1vfi+VGGPaLOUENn7pmw==,
-      }
-    cpu: [arm64]
-    os: [freebsd]
-
-  '@rollup/rollup-freebsd-x64@4.27.4':
-    resolution:
-      {
-        integrity: sha512-wYcC5ycW2zvqtDYrE7deary2P2UFmSh85PUpAx+dwTCO9uw3sgzD6Gv9n5X4vLaQKsrfTSZZ7Z7uynQozPVvWA==,
-      }
+  '@rolldown/binding-freebsd-x64@1.2.1':
+    resolution: {integrity: sha512-Fa0jHR07E7YBN4vOEsbVf2briYNsuOowfLJaXULZM0ldMlaCaj2LJgLMbMe4iacRyZmvR8efFhgR9wKuGclQUg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.20.0':
-    resolution:
-      {
-        integrity: sha512-jMYvxZwGmoHFBTbr12Xc6wOdc2xA5tF5F2q6t7Rcfab68TT0n+r7dgawD4qhPEvasDsVpQi+MgDzj2faOLsZjA==,
-      }
+  '@rolldown/binding-linux-arm-gnueabihf@1.2.1':
+    resolution: {integrity: sha512-pzkgu1SSHGgRRyRZ4fbmSgmajbVt+epaLP99NDjFft69v/ypfTi6swBMiVdh2EkQ0OSnHE1lZDM7DRGkyAzUpA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.27.4':
-    resolution:
-      {
-        integrity: sha512-9OwUnK/xKw6DyRlgx8UizeqRFOfi9mf5TYCw1uolDaJSbUmBxP85DE6T4ouCMoN6pXw8ZoTeZCSEfSaYo+/s1w==,
-      }
-    cpu: [arm]
-    os: [linux]
-
-  '@rollup/rollup-linux-arm-musleabihf@4.20.0':
-    resolution:
-      {
-        integrity: sha512-1asSTl4HKuIHIB1GcdFHNNZhxAYEdqML/MW4QmPS4G0ivbEcBr1JKlFLKsIRqjSwOBkdItn3/ZDlyvZ/N6KPlw==,
-      }
-    cpu: [arm]
-    os: [linux]
-
-  '@rollup/rollup-linux-arm-musleabihf@4.27.4':
-    resolution:
-      {
-        integrity: sha512-Vgdo4fpuphS9V24WOV+KwkCVJ72u7idTgQaBoLRD0UxBAWTF9GWurJO9YD9yh00BzbkhpeXtm6na+MvJU7Z73A==,
-      }
-    cpu: [arm]
-    os: [linux]
-
-  '@rollup/rollup-linux-arm64-gnu@4.20.0':
-    resolution:
-      {
-        integrity: sha512-COBb8Bkx56KldOYJfMf6wKeYJrtJ9vEgBRAOkfw6Ens0tnmzPqvlpjZiLgkhg6cA3DGzCmLmmd319pmHvKWWlQ==,
-      }
+  '@rolldown/binding-linux-arm64-gnu@1.2.1':
+    resolution: {integrity: sha512-QI5SEDY8cbiYWHx0VO4vIc3UlS6a32vXHjU8Qy/17adEmZIPuByJg13UEvo9c/UCiUkdcVWY83C+b+JrwnNyUg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
-  '@rollup/rollup-linux-arm64-gnu@4.27.4':
-    resolution:
-      {
-        integrity: sha512-pleyNgyd1kkBkw2kOqlBx+0atfIIkkExOTiifoODo6qKDSpnc6WzUY5RhHdmTdIJXBdSnh6JknnYTtmQyobrVg==,
-      }
+  '@rolldown/binding-linux-arm64-musl@1.2.1':
+    resolution: {integrity: sha512-Sm41FyCeXqmYcERoYOCbGIL5hNfd8w9LQ7Y61Bev48HkcjaJqV/iiVOaiDxjVTRMS+QKrZmD8cfPt4uMVnvM+A==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
-  '@rollup/rollup-linux-arm64-musl@4.20.0':
-    resolution:
-      {
-        integrity: sha512-+it+mBSyMslVQa8wSPvBx53fYuZK/oLTu5RJoXogjk6x7Q7sz1GNRsXWjn6SwyJm8E/oMjNVwPhmNdIjwP135Q==,
-      }
-    cpu: [arm64]
-    os: [linux]
-
-  '@rollup/rollup-linux-arm64-musl@4.27.4':
-    resolution:
-      {
-        integrity: sha512-caluiUXvUuVyCHr5DxL8ohaaFFzPGmgmMvwmqAITMpV/Q+tPoaHZ/PWa3t8B2WyoRcIIuu1hkaW5KkeTDNSnMA==,
-      }
-    cpu: [arm64]
-    os: [linux]
-
-  '@rollup/rollup-linux-powerpc64le-gnu@4.20.0':
-    resolution:
-      {
-        integrity: sha512-yAMvqhPfGKsAxHN8I4+jE0CpLWD8cv4z7CK7BMmhjDuz606Q2tFKkWRY8bHR9JQXYcoLfopo5TTqzxgPUjUMfw==,
-      }
+  '@rolldown/binding-linux-ppc64-gnu@1.2.1':
+    resolution: {integrity: sha512-2x+WhXTGl9yJYPbltW/BSEPTVz9OIWQyER4N+gJEDWkkn904eRcBzELqh/Hf7K0w/ubGbKNMv0ZC+94QK/IFEg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.27.4':
-    resolution:
-      {
-        integrity: sha512-FScrpHrO60hARyHh7s1zHE97u0KlT/RECzCKAdmI+LEoC1eDh/RDji9JgFqyO+wPDb86Oa/sXkily1+oi4FzJQ==,
-      }
-    cpu: [ppc64]
-    os: [linux]
-
-  '@rollup/rollup-linux-riscv64-gnu@4.20.0':
-    resolution:
-      {
-        integrity: sha512-qmuxFpfmi/2SUkAw95TtNq/w/I7Gpjurx609OOOV7U4vhvUhBcftcmXwl3rqAek+ADBwSjIC4IVNLiszoj3dPA==,
-      }
-    cpu: [riscv64]
-    os: [linux]
-
-  '@rollup/rollup-linux-riscv64-gnu@4.27.4':
-    resolution:
-      {
-        integrity: sha512-qyyprhyGb7+RBfMPeww9FlHwKkCXdKHeGgSqmIXw9VSUtvyFZ6WZRtnxgbuz76FK7LyoN8t/eINRbPUcvXB5fw==,
-      }
-    cpu: [riscv64]
-    os: [linux]
-
-  '@rollup/rollup-linux-s390x-gnu@4.20.0':
-    resolution:
-      {
-        integrity: sha512-I0BtGXddHSHjV1mqTNkgUZLnS3WtsqebAXv11D5BZE/gfw5KoyXSAXVqyJximQXNvNzUo4GKlCK/dIwXlz+jlg==,
-      }
+  '@rolldown/binding-linux-s390x-gnu@1.2.1':
+    resolution: {integrity: sha512-eEjmQpuRQayHPWWnywaWHkFT3ToPbP3RYy42VVd/B9aBGDA+Ol25EIWHxKQST3IiWJjikCWUF7KtbfqwZrzVwQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
-  '@rollup/rollup-linux-s390x-gnu@4.27.4':
-    resolution:
-      {
-        integrity: sha512-PFz+y2kb6tbh7m3A7nA9++eInGcDVZUACulf/KzDtovvdTizHpZaJty7Gp0lFwSQcrnebHOqxF1MaKZd7psVRg==,
-      }
-    cpu: [s390x]
-    os: [linux]
-
-  '@rollup/rollup-linux-x64-gnu@4.20.0':
-    resolution:
-      {
-        integrity: sha512-y+eoL2I3iphUg9tN9GB6ku1FA8kOfmF4oUEWhztDJ4KXJy1agk/9+pejOuZkNFhRwHAOxMsBPLbXPd6mJiCwew==,
-      }
+  '@rolldown/binding-linux-x64-gnu@1.2.1':
+    resolution: {integrity: sha512-/Orga1fZYkLc/56jBICcHrKchl8Z2UKdDSr3LG9ToWO1lQ6a4Livk9Xz+9WN91zsz5QR3XQz2NNoSDEvP6qadw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
-  '@rollup/rollup-linux-x64-gnu@4.27.4':
-    resolution:
-      {
-        integrity: sha512-Ni8mMtfo+o/G7DVtweXXV/Ol2TFf63KYjTtoZ5f078AUgJTmaIJnj4JFU7TK/9SVWTaSJGxPi5zMDgK4w+Ez7Q==,
-      }
+  '@rolldown/binding-linux-x64-musl@1.2.1':
+    resolution: {integrity: sha512-xxBJRL+0q0Kce7orznGWLuylHDY65vuARXZRpX+hPdv+DqK2c3NlCsVA98tlWzWNEE7yPqA/1NQ5nnCrj49Y5A==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
-  '@rollup/rollup-linux-x64-musl@4.20.0':
-    resolution:
-      {
-        integrity: sha512-hM3nhW40kBNYUkZb/r9k2FKK+/MnKglX7UYd4ZUy5DJs8/sMsIbqWK2piZtVGE3kcXVNj3B2IrUYROJMMCikNg==,
-      }
-    cpu: [x64]
-    os: [linux]
+  '@rolldown/binding-openharmony-arm64@1.2.1':
+    resolution: {integrity: sha512-M6AdXIXw3s+/8XpKMzdGDEXGS1S7kwUsy+rcTIUIOx5Ge4nXKCtAFHFV9YKkXvGcC5WMoTjAteLzlsQROVI0Yw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [openharmony]
 
-  '@rollup/rollup-linux-x64-musl@4.27.4':
-    resolution:
-      {
-        integrity: sha512-5AeeAF1PB9TUzD+3cROzFTnAJAcVUGLuR8ng0E0WXGkYhp6RD6L+6szYVX+64Rs0r72019KHZS1ka1q+zU/wUw==,
-      }
-    cpu: [x64]
-    os: [linux]
+  '@rolldown/binding-wasm32-wasi@1.2.1':
+    resolution: {integrity: sha512-/TX0SoRGojHzSAHpfVBbavRVSazg5U3h3Y3VXfcc0cdugq6kxdqw8LPGFiPr+/7gE/60zRcsOY2Vi9b9eT0jww==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0}
 
-  '@rollup/rollup-win32-arm64-msvc@4.20.0':
-    resolution:
-      {
-        integrity: sha512-psegMvP+Ik/Bg7QRJbv8w8PAytPA7Uo8fpFjXyCRHWm6Nt42L+JtoqH8eDQ5hRP7/XW2UiIriy1Z46jf0Oa1kA==,
-      }
+  '@rolldown/binding-win32-arm64-msvc@1.2.1':
+    resolution: {integrity: sha512-EvRrivJieyHG+AO9lleZWgq+g0+S7oV2C51yuqlcyU/R9net+sI4Pj0F+lUoP2bEr6TWX3SqFaaS0SzfLxSzkw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-arm64-msvc@4.27.4':
-    resolution:
-      {
-        integrity: sha512-yOpVsA4K5qVwu2CaS3hHxluWIK5HQTjNV4tWjQXluMiiiu4pJj4BN98CvxohNCpcjMeTXk/ZMJBRbgRg8HBB6A==,
-      }
+  '@rolldown/binding-win32-x64-msvc@1.2.1':
+    resolution: {integrity: sha512-Z4eCmn5QJ/5+azF9knpLWKfVd9aidn0mAe9TpJgvBLId9Ax3t0+JVxBmT25Bv7NBbVW1TZyKjQjQReouMeH5UQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [win32]
+
+  '@rolldown/pluginutils@1.0.1':
+    resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==}
+
+  '@rollup/rollup-android-arm-eabi@4.60.4':
+    resolution: {integrity: sha512-F5QXMSiFebS9hKZj02XhWLLnRpJ3B3AROP0tWbFBSj+6kCbg5m9j5JoHKd4mmSVy5mS/IMQloYgYxCuJC0fxEQ==}
+    cpu: [arm]
+    os: [android]
+
+  '@rollup/rollup-android-arm64@4.60.4':
+    resolution: {integrity: sha512-GxxTKApUpzRhof7poWvCJHRF51C67u1R7D6DiluBE8wKU1u5GWE8t+v81JvJYtbawoBFX1hLv5Ei4eVjkWokaw==}
+    cpu: [arm64]
+    os: [android]
+
+  '@rollup/rollup-darwin-arm64@4.60.4':
+    resolution: {integrity: sha512-tua0TaJxMOB1R0V0RS1jFZ/RpURFDJIOR2A6jWwQeawuFyS4gBW+rntLRaQd0EQ4bd6Vp44Z2rXW+YYDBsj6IA==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rollup/rollup-darwin-x64@4.60.4':
+    resolution: {integrity: sha512-CSKq7MsP+5PFIcydhAiR1K0UhEI1A2jWXVKHPCBZ151yOutENwvnPocgVHkivu2kviURtCEB6zUQw0vs8RrhMg==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rollup/rollup-freebsd-arm64@4.60.4':
+    resolution: {integrity: sha512-+O8OkVdyvXMtJEciu2wS/pzm1IxntEEQx3z5TAVy4l32G0etZn+RsA48ARRrFm6Ri8fvqPQfgrvNxSjKAbnd3g==}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@rollup/rollup-freebsd-x64@4.60.4':
+    resolution: {integrity: sha512-Iw3oMskH3AfNuhU0MSN7vNbdi4me/NiYo2azqPz/Le16zHSa+3RRmliCMWWQmh4lcndccU40xcJuTYJZxNo/lw==}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@rollup/rollup-linux-arm-gnueabihf@4.60.4':
+    resolution: {integrity: sha512-EIPRXTVQpHyF8WOo219AD2yEltPehLTcTMz2fn6JsatLYSzQf00hj3rulF+yauOlF9/FtM2WpkT/hJh/KJFGhA==}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-arm-musleabihf@4.60.4':
+    resolution: {integrity: sha512-J3Yh9PzzF1Ovah2At+lHiGQdsYgArxBbXv/zHfSyaiFQEqvNv7DcW98pCrmdjCZBrqBiKrKKe2V+aaSGWuBe/w==}
+    cpu: [arm]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-arm64-gnu@4.60.4':
+    resolution: {integrity: sha512-BFDEZMYfUvLn37ONE1yMBojPxnMlTFsdyNoqncT0qFq1mAfllL+ATMMJd8TeuVMiX84s1KbcxcZbXInmcO2mRg==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-arm64-musl@4.60.4':
+    resolution: {integrity: sha512-pc9EYOSlOgdQ2uPl1o9PF6/kLSgaUosia7gOuS8mB69IxJvlclko1MECXysjs5ryez1/5zjYqx3+xYU0TU6R1A==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-loong64-gnu@4.60.4':
+    resolution: {integrity: sha512-NxnomyxYerDh5n4iLrNa+sH+Z+U4BMEE46V2PgQ/hoB909i8gV1M5wPojWg9fk1jWpO3IQnOs20K4wyZuFLEFQ==}
+    cpu: [loong64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-loong64-musl@4.60.4':
+    resolution: {integrity: sha512-nbJnQ8a3z1mtmrwImCYhc6BGpThAyYVRQxw9uKSKG4wR6aAYno9sVjJ0zaZcW9BPJX1GbrDPf+SvdWjgTuDmnw==}
+    cpu: [loong64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-ppc64-gnu@4.60.4':
+    resolution: {integrity: sha512-2EU6acNrQLd8tYvo/LXW535wupT3m6fo7HKo6lr7ktQoItxTyOL1ZCR/GfGCuXl2vR+zmfI6eRXkSemafv+iVg==}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-ppc64-musl@4.60.4':
+    resolution: {integrity: sha512-WeBtoMuaMxiiIrO2IYP3xs6GMWkJP2C0EoT8beTLkUPmzV1i/UcOSVw1d5r9KBODtHKilG5yFxsGRnBbK3wJ4A==}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-riscv64-gnu@4.60.4':
+    resolution: {integrity: sha512-FJHFfqpKUI3A10WrWKiFbBZ7yVbGT4q4B5o1qKFFojqpaYoh9LrQgqWCmmcxQzVSXYtyB5bzkXrYzlHTs21MYA==}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-riscv64-musl@4.60.4':
+    resolution: {integrity: sha512-mcEl6CUT5IAUmQf1m9FYSmVqCJlpQ8r8eyftFUHG8i9OhY7BkBXSUdnLH5DOf0wCOjcP9v/QO93zpmF1SptCCw==}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-s390x-gnu@4.60.4':
+    resolution: {integrity: sha512-ynt3JxVd2w2buzoKDWIyiV1pJW93xlQic1THVLXilz429oijRpSHivZAgp65KBu+cMcgf1eVVjdnTLvPxgCuoQ==}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-x64-gnu@4.60.4':
+    resolution: {integrity: sha512-Boiz5+MsaROEWDf+GGEwF8VMHGhlUoQMtIPjOgA5fv4osupqTVnJteQNKJwUcnUog2G55jYXH7KZFFiJe0TEzQ==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-x64-musl@4.60.4':
+    resolution: {integrity: sha512-+qfSY27qIrFfI/Hom04KYFw3GKZSGU4lXus51wsb5EuySfFlWRwjkKWoE9emgRw/ukoT4Udsj4W/+xxG8VbPKg==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-openbsd-x64@4.60.4':
+    resolution: {integrity: sha512-VpTfOPHgVXEBeeR8hZ2O0F3aSso+JDWqTWmTmzcQKted54IAdUVbxE+j/MVxUsKa8L20HJhv3vUezVPoquqWjA==}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@rollup/rollup-openharmony-arm64@4.60.4':
+    resolution: {integrity: sha512-IPOsh5aRYuLv/nkU51X10Bf75Bsf6+gZdx1X+QP5QM6lIJFHHqbHLG0uJn/hWthzo13UAc2umiUorqZy3axoZg==}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@rollup/rollup-win32-arm64-msvc@4.60.4':
+    resolution: {integrity: sha512-4QzE9E81OohJ/HKzHhsqU+zcYYojVOXlFMs1DdyMT6qXl/niOH7AVElmmEdUNHHS/oRkc++d5k6Vy85zFs0DEw==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.20.0':
-    resolution:
-      {
-        integrity: sha512-GabekH3w4lgAJpVxkk7hUzUf2hICSQO0a/BLFA11/RMxQT92MabKAqyubzDZmMOC/hcJNlc+rrypzNzYl4Dx7A==,
-      }
+  '@rollup/rollup-win32-ia32-msvc@4.60.4':
+    resolution: {integrity: sha512-zTPgT1YuHHcd+Tmx7h8aml0FWFVelV5N54oHow9SLj+GfoDy/huQ+UV396N/C7KpMDMiPspRktzM1/0r1usYEA==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.27.4':
-    resolution:
-      {
-        integrity: sha512-KtwEJOaHAVJlxV92rNYiG9JQwQAdhBlrjNRp7P9L8Cb4Rer3in+0A+IPhJC9y68WAi9H0sX4AiG2NTsVlmqJeQ==,
-      }
+  '@rollup/rollup-win32-x64-gnu@4.60.4':
+    resolution: {integrity: sha512-DRS4G7mi9lJxqEDezIkKCaUIKCrLUUDCUaCsTPCi/rtqaC6D/jjwslMQyiDU50Ka0JKpeXeRBFBAXwArY52vBw==}
+    cpu: [x64]
+    os: [win32]
+
+  '@rollup/rollup-win32-x64-msvc@4.60.4':
+    resolution: {integrity: sha512-QVTUovf40zgTqlFVrKA1uXMVvU2QWEFWfAH8Wdc48IxLvrJMQVMBRjuQyUpzZCDkakImib9eVazbWlC6ksWtJw==}
+    cpu: [x64]
+    os: [win32]
+
+  '@rspack/binding-darwin-arm64@2.0.2':
+    resolution: {integrity: sha512-0o7lbgBBsDlICWdjIH0q3e0BsSco4GRiImHWVfZSVEG+q2+ykZJvSvYCVhPM1Co375Z0S3VMPa/8SjcY1FHwlw==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rspack/binding-darwin-x64@2.0.2':
+    resolution: {integrity: sha512-tOwxZpoPlTlRs/w6UyUinXJ4TYRVHMlR7+eQxO1R3muKpixvhXQjtvoaY16HuFyTVky5F0IfOoWr3x9FEsgdLg==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rspack/binding-linux-arm64-gnu@2.0.2':
+    resolution: {integrity: sha512-1ZD4YFhG1rmgqj+W8hfwHyKV8xDxGsc/3KgU0FwmiVEX7JfzhCkgBO/xlCG79kRKSrzuVzt4icO/G3cCKn0pag==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rspack/binding-linux-arm64-musl@2.0.2':
+    resolution: {integrity: sha512-/PtTkM/DsDLjeuXTmeJeRfbjCDbcL9jvoVgZrgxYFZ28y2cdLvbChbW9uigOzs5dQEs1CIBQXMTTj7KhdBTuQg==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@rspack/binding-linux-x64-gnu@2.0.2':
+    resolution: {integrity: sha512-bBjsZxMHRaPo6X9SokApm6ucs+UhXtAJFyJJyuk2BH4XJsLeCU9Dz1vMwioeohFbJUUeTASVPm6/BL+RhSaunw==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rspack/binding-linux-x64-musl@2.0.2':
+    resolution: {integrity: sha512-HjlpInqzabDNkhVsUJpsHPqa9QYVWBViJoyWNjzXCAW0vKMDvwaphyUvokSinX8FGTlZi/sr5UEaHJo6XtQ35g==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@rspack/binding-wasm32-wasi@2.0.2':
+    resolution: {integrity: sha512-YaRYNFLJRpkGfYjSWR7n9f+nQKtrlmrrffpAn/blc2geHcRvXoBc5SCs1idPtsLhj7H9qWWhs7ucjyHy4csWFg==}
+    cpu: [wasm32]
+
+  '@rspack/binding-win32-arm64-msvc@2.0.2':
+    resolution: {integrity: sha512-d/3kTEKq+asLjRFPO96t+wfWiM7DLN76VQEPDD9bc1kdsZXlVJBuvyXfsgK8bbEvKplWXYcSsokhmEnuXrLOpg==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rspack/binding-win32-ia32-msvc@2.0.2':
+    resolution: {integrity: sha512-161cWineq3RW+Jdm1FAfSpXeUtYWvhB3kAbm46vNT9h/YYz+spwsFMvveAZ1nsVSVL0IC5lDBGUte7yUAY8K2g==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.20.0':
-    resolution:
-      {
-        integrity: sha512-aJ1EJSuTdGnM6qbVC4B5DSmozPTqIag9fSzXRNNo+humQLG89XpPgdt16Ia56ORD7s+H8Pmyx44uczDQ0yDzpg==,
-      }
+  '@rspack/binding-win32-x64-msvc@2.0.2':
+    resolution: {integrity: sha512-y7Q0S1FE+OlkL5GMqLG0PwxrPw6E1r892KhGrGKE1Vdufe5YTEx6xTPxzZ+b7N2KPD7s9G1/iJmWHQxb1+Bjkg==}
     cpu: [x64]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.27.4':
-    resolution:
-      {
-        integrity: sha512-3j4jx1TppORdTAoBJRd+/wJRGCPC0ETWkXOecJ6PPZLj6SptXkrXcNqdj0oclbKML6FkQltdz7bBA3rUSirZug==,
-      }
-    cpu: [x64]
-    os: [win32]
+  '@rspack/binding@2.0.2':
+    resolution: {integrity: sha512-0kZPplW9GWx8mfC6DfsaRY3QBIYPuUs42JfmSM6aSb8tMHZAXQeLeMB8M+h8i4SeI+aFtCgO6UuYGtyWf7+L+A==}
 
-  '@rtsao/scc@1.1.0':
-    resolution:
-      {
-        integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==,
-      }
+  '@rspack/core@2.0.2':
+    resolution: {integrity: sha512-VM3UHOo26uC+4QSqY5tU1ybI7KuXY5rTof8nhFOaBY9SYau0Smvr+hMSAPmrmHwknB6dXT8yaNVxrj7I+qxE1Q==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    peerDependencies:
+      '@module-federation/runtime-tools': ^0.24.1 || ^2.0.0
+      '@swc/helpers': '>=0.5.1'
+    peerDependenciesMeta:
+      '@module-federation/runtime-tools':
+        optional: true
+      '@swc/helpers':
+        optional: true
 
-  '@rushstack/eslint-patch@1.10.4':
-    resolution:
-      {
-        integrity: sha512-WJgX9nzTqknM393q1QJDJmoW28kUfEnybeTfVNcNAPnIx210RXm2DiXiHzfNPJNIUUb1tJnz/l4QGtJ30PgWmA==,
-      }
+  '@sindresorhus/merge-streams@4.0.0':
+    resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==}
+    engines: {node: '>=18'}
 
-  '@sindresorhus/merge-streams@2.3.0':
-    resolution:
-      {
-        integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==,
-      }
-    engines: { node: '>=18' }
+  '@standard-schema/spec@1.1.0':
+    resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
 
-  '@swc/counter@0.1.3':
-    resolution:
-      {
-        integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==,
-      }
-
-  '@swc/helpers@0.5.13':
-    resolution:
-      {
-        integrity: sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==,
-      }
+  '@swc/helpers@0.5.15':
+    resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==}
 
   '@tailwindcss/aspect-ratio@0.4.2':
-    resolution:
-      {
-        integrity: sha512-8QPrypskfBa7QIMuKHg2TA7BqES6vhBrDLOv8Unb6FcFyd3TjKbc6lcmb9UPQHxfl24sXoJ41ux/H7qQQvfaSQ==,
-      }
+    resolution: {integrity: sha512-8QPrypskfBa7QIMuKHg2TA7BqES6vhBrDLOv8Unb6FcFyd3TjKbc6lcmb9UPQHxfl24sXoJ41ux/H7qQQvfaSQ==}
     peerDependencies:
       tailwindcss: '>=2.0.0 || >=3.0.0 || >=3.0.0-alpha.1'
 
-  '@tailwindcss/forms@0.5.9':
-    resolution:
-      {
-        integrity: sha512-tM4XVr2+UVTxXJzey9Twx48c1gcxFStqn1pQz0tRsX8o3DvxhN5oY5pvyAbUx7VTaZxpej4Zzvc6h+1RJBzpIg==,
-      }
+  '@tailwindcss/forms@0.5.11':
+    resolution: {integrity: sha512-h9wegbZDPurxG22xZSoWtdzc41/OlNEUQERNqI/0fOwa2aVlWGu7C35E/x6LDyD3lgtztFSSjKZyuVM0hxhbgA==}
     peerDependencies:
-      tailwindcss: '>=3.0.0 || >= 3.0.0-alpha.1 || >= 4.0.0-alpha.20'
+      tailwindcss: '>=3.0.0 || >= 3.0.0-alpha.1 || >= 4.0.0-alpha.20 || >= 4.0.0-beta.1'
 
-  '@tailwindcss/typography@0.5.15':
-    resolution:
-      {
-        integrity: sha512-AqhlCXl+8grUz8uqExv5OTtgpjuVIwFTSXTrh8y9/pw6q2ek7fJ+Y8ZEVw7EB2DCcuCOtEjf9w3+J3rzts01uA==,
-      }
+  '@tailwindcss/typography@0.5.20':
+    resolution: {integrity: sha512-hwbzQuNUfcPvbegQFatVPl/MY/tcM9KLl963hQ5laJKPh81TEZ1+dNG9PirGvcaDBkp+BCshExAyKVPW91dozw==}
     peerDependencies:
-      tailwindcss: '>=3.0.0 || insiders || >=4.0.0-alpha.20'
+      tailwindcss: '>=3.0.0 || >=4.0.0 || insiders'
 
-  '@types/babel__core@7.20.5':
-    resolution:
-      {
-        integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==,
-      }
+  '@turbo/darwin-64@2.10.8':
+    resolution: {integrity: sha512-po+7rfJfUnFXjWlcoN2RwhErgzCdRtBc1T26vYPcywHlggmCQiQe1uWaE4j+BibI2uY9/2pDoFzMN0rmSaPFOw==}
+    cpu: [x64]
+    os: [darwin]
 
-  '@types/babel__generator@7.6.8':
-    resolution:
-      {
-        integrity: sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==,
-      }
+  '@turbo/darwin-arm64@2.10.8':
+    resolution: {integrity: sha512-+zB2btDJ00lnPRuqOvpVvgl4x34k/djZQGZTTCfjn7JgNCl8QFY5Njo5+dqkY1g/+9gbbsnAvWm9CmJg9ebcXA==}
+    cpu: [arm64]
+    os: [darwin]
 
-  '@types/babel__template@7.4.4':
-    resolution:
-      {
-        integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==,
-      }
+  '@turbo/linux-64@2.10.8':
+    resolution: {integrity: sha512-K1dxqiVisyN7cViVsfQLs6xscQbYuI8aO2nbUhFURDACgEDfZRdP/b4CCxeosBJpcMfhYyiibWqJorCnvz9kKg==}
+    cpu: [x64]
+    os: [android, linux]
 
-  '@types/babel__traverse@7.20.6':
-    resolution:
-      {
-        integrity: sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==,
-      }
+  '@turbo/linux-arm64@2.10.8':
+    resolution: {integrity: sha512-Gi77ibVnrE1fEmvr+/wBD/yvRqhwp/RQuCp2+//lv1U1wNFFyVg0V7Wj8FG9FXPFAw5QHReo8rxc9+wBSDZjzA==}
+    cpu: [arm64]
+    os: [android, linux]
 
-  '@types/braces@3.0.4':
-    resolution:
-      {
-        integrity: sha512-0WR3b8eaISjEW7RpZnclONaLFDf7buaowRHdqLp4vLj54AsSAYWfh3DRbfiYJY9XDxMgx1B4sE1Afw2PGpuHOA==,
-      }
+  '@turbo/windows-64@2.10.8':
+    resolution: {integrity: sha512-znnLO1haJPYTHoKMKwlAvlkjRiYbbhBzME6wIGaMd+fwir23U6jVd1ecaTWWi1fbnRVqxMfgDBKseQ/hLKb83g==}
+    cpu: [x64]
+    os: [win32]
 
-  '@types/bun@1.1.13':
-    resolution:
-      {
-        integrity: sha512-KmQxSBgVWCl6RSuerlLGZlIWfdxkKqat0nxN61+qu4y1KDn0Ll3j7v1Pl8GnaL3a/U6GGWVTJh75ap62kR1E8Q==,
-      }
+  '@turbo/windows-arm64@2.10.8':
+    resolution: {integrity: sha512-VN30vh3b3Czh2WzYHNTfF1FE0YMZ5aHsLO8dBMGHJewA6792wX6iJR8ZxlzFW6WdOu0gEAKIvlYhfyT81Wkm4Q==}
+    cpu: [arm64]
+    os: [win32]
 
-  '@types/estree@1.0.5':
-    resolution:
-      {
-        integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==,
-      }
+  '@tybys/wasm-util@0.10.3':
+    resolution: {integrity: sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==}
 
-  '@types/estree@1.0.6':
-    resolution:
-      {
-        integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==,
-      }
+  '@types/bun@1.3.14':
+    resolution: {integrity: sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw==}
+
+  '@types/chai@5.2.3':
+    resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==}
+
+  '@types/deep-eql@4.0.2':
+    resolution: {integrity: sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==}
+
+  '@types/estree@1.0.8':
+    resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
+
+  '@types/estree@1.0.9':
+    resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==}
 
   '@types/json-schema@7.0.15':
-    resolution:
-      {
-        integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==,
-      }
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
-  '@types/json5@0.0.29':
-    resolution:
-      {
-        integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==,
-      }
+  '@types/node@22.20.1':
+    resolution: {integrity: sha512-EANqOCF9QFyra+4pfxUcX9STKJpCLjMbObVzljIJomAWSnuSIEAvyzEU53GaajbXJEgdh0iEcPL+DGvpUd4k1Q==}
 
-  '@types/node@20.12.14':
-    resolution:
-      {
-        integrity: sha512-scnD59RpYD91xngrQQLGkE+6UrHUPzeKZWhhjBSa3HSkwjbQc38+q3RoIVEwxQGRw3M+j5hpNAM+lgV3cVormg==,
-      }
-
-  '@types/node@20.14.13':
-    resolution:
-      {
-        integrity: sha512-+bHoGiZb8UiQ0+WEtmph2IWQCjIqg8MDZMAV+ppRRhUZnquF5mQkP/9vpSwJClEiSM/C7fZZExPzfU0vJTyp8w==,
-      }
+  '@types/node@25.9.1':
+    resolution: {integrity: sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==}
 
   '@types/postcss-import@14.0.3':
-    resolution:
-      {
-        integrity: sha512-raZhRVTf6Vw5+QbmQ7LOHSDML71A5rj4+EqDzAbrZPfxfoGzFxMHRCq16VlddGIZpHELw0BG4G0YE2ANkdZiIQ==,
-      }
+    resolution: {integrity: sha512-raZhRVTf6Vw5+QbmQ7LOHSDML71A5rj4+EqDzAbrZPfxfoGzFxMHRCq16VlddGIZpHELw0BG4G0YE2ANkdZiIQ==}
 
-  '@types/prop-types@15.7.13':
-    resolution:
-      {
-        integrity: sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==,
-      }
-
-  '@types/react-dom@18.3.1':
-    resolution:
-      {
-        integrity: sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==,
-      }
-
-  '@types/react@18.3.12':
-    resolution:
-      {
-        integrity: sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==,
-      }
-
-  '@types/ws@8.5.12':
-    resolution:
-      {
-        integrity: sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==,
-      }
-
-  '@typescript-eslint/eslint-plugin@8.11.0':
-    resolution:
-      {
-        integrity: sha512-KhGn2LjW1PJT2A/GfDpiyOfS4a8xHQv2myUagTM5+zsormOmBlYsnQ6pobJ8XxJmh6hnHwa2Mbe3fPrDJoDhbA==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+  '@types/react-dom@19.2.3':
+    resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}
     peerDependencies:
-      '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '*'
+      '@types/react': ^19.2.0
+
+  '@types/react@19.2.15':
+    resolution: {integrity: sha512-eRwcGNHve+E8qtEQSSRl6urh+rFop4v8gm6O8rGv25CodbvFdLjA1vVQ1KkiFE0w0UPOnb8tDiFKL5lp0rtY5Q==}
+
+  '@types/semver@7.8.0':
+    resolution: {integrity: sha512-1mAINjtQCXXeLkJ9ehXkwOcBpqtLxiVtKhpUf83DdRNdQKV0iXZpaHYqRr7nj+wvxuJzoAmAwXI+sCNMv1CzLQ==}
+
+  '@vitejs/plugin-react@6.0.2':
+    resolution: {integrity: sha512-DlSMqo4WhThw4vB8Mpn0Woe9J+Jfq1geJ61AKW0QEgLzGMNwtIMdxbDUzLxcun8W7NbJO0e2Jg/Nxm3cCSVzzg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    peerDependencies:
+      '@rolldown/plugin-babel': ^0.1.7 || ^0.2.0
+      babel-plugin-react-compiler: ^1.0.0
+      vite: ^8.0.0
     peerDependenciesMeta:
-      typescript:
+      '@rolldown/plugin-babel':
+        optional: true
+      babel-plugin-react-compiler:
         optional: true
 
-  '@typescript-eslint/parser@8.11.0':
-    resolution:
-      {
-        integrity: sha512-lmt73NeHdy1Q/2ul295Qy3uninSqi6wQI18XwSpm8w0ZbQXUpjCAWP1Vlv/obudoBiIjJVjlztjQ+d/Md98Yxg==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+  '@vitest/expect@4.1.10':
+    resolution: {integrity: sha512-YsCn+qAk1GWjQOWFEsEcL2gNQ0zmVmQu3T03qP6UyjhtmdtwtbuI+DASn/7iQB3HGTXkdBwGddzxPlmiql5vlA==}
+
+  '@vitest/mocker@4.1.10':
+    resolution: {integrity: sha512-v0xaezt+DKEmKfaxg133ldzADrwLGd7Ze1MfQQTYfvs8OqZIwbxyxaYURivwV7sWy5fqn3rH5uOrSp07bp44Ow==}
     peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '*'
+      msw: ^2.4.9
+      vite: ^6.0.0 || ^7.0.0 || ^8.0.0
     peerDependenciesMeta:
-      typescript:
+      msw:
+        optional: true
+      vite:
         optional: true
 
-  '@typescript-eslint/scope-manager@8.11.0':
-    resolution:
-      {
-        integrity: sha512-Uholz7tWhXmA4r6epo+vaeV7yjdKy5QFCERMjs1kMVsLRKIrSdM6o21W2He9ftp5PP6aWOVpD5zvrvuHZC0bMQ==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+  '@vitest/pretty-format@4.1.10':
+    resolution: {integrity: sha512-W1HsjSH4MXQ9YfmmhLAoIYf1HRfekQCGngeIgcei6MP5QQGWUe0gkopdZQaVCFO+JDJMrAJGwa5pRpNpvy4P8Q==}
 
-  '@typescript-eslint/type-utils@8.11.0':
-    resolution:
-      {
-        integrity: sha512-ItiMfJS6pQU0NIKAaybBKkuVzo6IdnAhPFZA/2Mba/uBjuPQPet/8+zh5GtLHwmuFRShZx+8lhIs7/QeDHflOg==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@vitest/runner@4.1.10':
+    resolution: {integrity: sha512-IKI6kpIH+LmpROplyLwBBaCfMgOZOMsygVa6BARD6ahA04VRuJSa6OaVG7kRvSEMD870Vd91rSSw0eegtWyLGg==}
 
-  '@typescript-eslint/types@8.11.0':
-    resolution:
-      {
-        integrity: sha512-tn6sNMHf6EBAYMvmPUaKaVeYvhUsrE6x+bXQTxjQRp360h1giATU0WvgeEys1spbvb5R+VpNOZ+XJmjD8wOUHw==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+  '@vitest/snapshot@4.1.10':
+    resolution: {integrity: sha512-xRkfOT1qpTAi/Ti4Y1LtfRc3kEuqxGw59eN2jN9pRWMtS/XDevekhcFSqvQqjUNGksfjMJu3Y+oJ+4Ypn2OaJw==}
 
-  '@typescript-eslint/typescript-estree@8.11.0':
-    resolution:
-      {
-        integrity: sha512-yHC3s1z1RCHoCz5t06gf7jH24rr3vns08XXhfEqzYpd6Hll3z/3g23JRi0jM8A47UFKNc3u/y5KIMx8Ynbjohg==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@vitest/spy@4.1.10':
+    resolution: {integrity: sha512-PLf/Ugvoq5wO/b4rwYCR1h2PSIdXz7wnkQFMiUpLdtM7l6pqVFcQIBEHyT1+l+cj7mNwAfZHzqXqDyjvOuwbDw==}
 
-  '@typescript-eslint/utils@8.11.0':
-    resolution:
-      {
-        integrity: sha512-CYiX6WZcbXNJV7UNB4PLDIBtSdRmRI/nb0FMyqHPTQD1rMjA0foPLaPUV39C/MxkTd/QKSeX+Gb34PPsDVC35g==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
-    peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
+  '@vitest/utils@4.1.10':
+    resolution: {integrity: sha512-fy9am/HWxbaGt/Sawrp90vt6Y6jQwf1RX77cz3uwoJwJVMli/e1IEwRPnMNJ7vKfPTwo0diXifkpPvwH9v7nGA==}
 
-  '@typescript-eslint/visitor-keys@8.11.0':
-    resolution:
-      {
-        integrity: sha512-EaewX6lxSjRJnc+99+dqzTeoDZUfyrA52d2/HRrkI830kgovWsmIiTfmr0NZorzqic7ga+1bS60lRBUgR3n/Bw==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+  '@webassemblyjs/ast@1.14.1':
+    resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==}
 
-  '@vitejs/plugin-react@4.3.1':
-    resolution:
-      {
-        integrity: sha512-m/V2syj5CuVnaxcUJOQRel/Wr31FFXRFlnOoq1TVtkCxsY5veGMTEmpWHndrhB2U8ScHtCQB1e+4hWYExQc6Lg==,
-      }
-    engines: { node: ^14.18.0 || >=16.0.0 }
-    peerDependencies:
-      vite: ^4.2.0 || ^5.0.0
+  '@webassemblyjs/floating-point-hex-parser@1.13.2':
+    resolution: {integrity: sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==}
 
-  '@vitest/expect@2.0.5':
-    resolution:
-      {
-        integrity: sha512-yHZtwuP7JZivj65Gxoi8upUN2OzHTi3zVfjwdpu2WrvCZPLwsJ2Ey5ILIPccoW23dd/zQBlJ4/dhi7DWNyXCpA==,
-      }
+  '@webassemblyjs/helper-api-error@1.13.2':
+    resolution: {integrity: sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==}
 
-  '@vitest/pretty-format@2.0.5':
-    resolution:
-      {
-        integrity: sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==,
-      }
+  '@webassemblyjs/helper-buffer@1.14.1':
+    resolution: {integrity: sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==}
 
-  '@vitest/runner@2.0.5':
-    resolution:
-      {
-        integrity: sha512-TfRfZa6Bkk9ky4tW0z20WKXFEwwvWhRY+84CnSEtq4+3ZvDlJyY32oNTJtM7AW9ihW90tX/1Q78cb6FjoAs+ig==,
-      }
+  '@webassemblyjs/helper-numbers@1.13.2':
+    resolution: {integrity: sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==}
 
-  '@vitest/snapshot@2.0.5':
-    resolution:
-      {
-        integrity: sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==,
-      }
+  '@webassemblyjs/helper-wasm-bytecode@1.13.2':
+    resolution: {integrity: sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==}
 
-  '@vitest/spy@2.0.5':
-    resolution:
-      {
-        integrity: sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==,
-      }
+  '@webassemblyjs/helper-wasm-section@1.14.1':
+    resolution: {integrity: sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==}
 
-  '@vitest/utils@2.0.5':
-    resolution:
-      {
-        integrity: sha512-d8HKbqIcya+GR67mkZbrzhS5kKhtp8dQLcmRZLGTscGVg7yImT82cIrhtn2L8+VujWcy6KZweApgNmPsTAO/UQ==,
-      }
+  '@webassemblyjs/ieee754@1.13.2':
+    resolution: {integrity: sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==}
 
-  acorn-jsx@5.3.2:
-    resolution:
-      {
-        integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==,
-      }
-    peerDependencies:
-      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+  '@webassemblyjs/leb128@1.13.2':
+    resolution: {integrity: sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==}
 
-  acorn@8.14.0:
-    resolution:
-      {
-        integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==,
-      }
-    engines: { node: '>=0.4.0' }
+  '@webassemblyjs/utf8@1.13.2':
+    resolution: {integrity: sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==}
+
+  '@webassemblyjs/wasm-edit@1.14.1':
+    resolution: {integrity: sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==}
+
+  '@webassemblyjs/wasm-gen@1.14.1':
+    resolution: {integrity: sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==}
+
+  '@webassemblyjs/wasm-opt@1.14.1':
+    resolution: {integrity: sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==}
+
+  '@webassemblyjs/wasm-parser@1.14.1':
+    resolution: {integrity: sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==}
+
+  '@webassemblyjs/wast-printer@1.14.1':
+    resolution: {integrity: sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==}
+
+  '@xtuc/ieee754@1.2.0':
+    resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
+
+  '@xtuc/long@4.2.2':
+    resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
+
+  acorn@8.16.0:
+    resolution: {integrity: sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==}
+    engines: {node: '>=0.4.0'}
     hasBin: true
 
-  ajv@6.12.6:
-    resolution:
-      {
-        integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==,
-      }
+  ajv-formats@2.1.1:
+    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
 
-  ansi-regex@5.0.1:
-    resolution:
-      {
-        integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==,
-      }
-    engines: { node: '>=8' }
+  ajv-keywords@5.1.0:
+    resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==}
+    peerDependencies:
+      ajv: ^8.8.2
 
-  ansi-regex@6.0.1:
-    resolution:
-      {
-        integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==,
-      }
-    engines: { node: '>=12' }
-
-  ansi-styles@3.2.1:
-    resolution:
-      {
-        integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==,
-      }
-    engines: { node: '>=4' }
-
-  ansi-styles@4.3.0:
-    resolution:
-      {
-        integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==,
-      }
-    engines: { node: '>=8' }
-
-  ansi-styles@6.2.1:
-    resolution:
-      {
-        integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==,
-      }
-    engines: { node: '>=12' }
+  ajv@8.20.0:
+    resolution: {integrity: sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==}
 
   any-promise@1.3.0:
-    resolution:
-      {
-        integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==,
-      }
+    resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
 
   anymatch@3.1.3:
-    resolution:
-      {
-        integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
+    engines: {node: '>= 8'}
 
   arg@5.0.2:
-    resolution:
-      {
-        integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==,
-      }
+    resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
 
   argparse@2.0.1:
-    resolution:
-      {
-        integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==,
-      }
-
-  aria-query@5.3.2:
-    resolution:
-      {
-        integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==,
-      }
-    engines: { node: '>= 0.4' }
-
-  array-buffer-byte-length@1.0.1:
-    resolution:
-      {
-        integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==,
-      }
-    engines: { node: '>= 0.4' }
-
-  array-includes@3.1.8:
-    resolution:
-      {
-        integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  array-union@2.1.0:
-    resolution:
-      {
-        integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==,
-      }
-    engines: { node: '>=8' }
-
-  array.prototype.findlast@1.2.5:
-    resolution:
-      {
-        integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  array.prototype.findlastindex@1.2.5:
-    resolution:
-      {
-        integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  array.prototype.flat@1.3.2:
-    resolution:
-      {
-        integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==,
-      }
-    engines: { node: '>= 0.4' }
-
-  array.prototype.flatmap@1.3.2:
-    resolution:
-      {
-        integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  array.prototype.tosorted@1.1.4:
-    resolution:
-      {
-        integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==,
-      }
-    engines: { node: '>= 0.4' }
-
-  arraybuffer.prototype.slice@1.0.3:
-    resolution:
-      {
-        integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
   assertion-error@2.0.1:
-    resolution:
-      {
-        integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
+    engines: {node: '>=12'}
 
-  ast-types-flow@0.0.8:
-    resolution:
-      {
-        integrity: sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==,
-      }
-
-  autoprefixer@10.4.20:
-    resolution:
-      {
-        integrity: sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==,
-      }
-    engines: { node: ^10 || ^12 || >=14 }
+  autoprefixer@10.5.0:
+    resolution: {integrity: sha512-FMhOoZV4+qR6aTUALKX2rEqGG+oyATvwBt9IIzVR5rMa2HRWPkxf+P+PAJLD1I/H5/II+HuZcBJYEFBpq39ong==}
+    engines: {node: ^10 || ^12 || >=14}
     hasBin: true
     peerDependencies:
       postcss: ^8.1.0
 
-  available-typed-arrays@1.0.7:
-    resolution:
-      {
-        integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  axe-core@4.10.2:
-    resolution:
-      {
-        integrity: sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==,
-      }
-    engines: { node: '>=4' }
-
-  axobject-query@4.1.0:
-    resolution:
-      {
-        integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  balanced-match@1.0.2:
-    resolution:
-      {
-        integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==,
-      }
-
-  binary-extensions@2.3.0:
-    resolution:
-      {
-        integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==,
-      }
-    engines: { node: '>=8' }
-
-  brace-expansion@1.1.11:
-    resolution:
-      {
-        integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==,
-      }
-
-  brace-expansion@2.0.1:
-    resolution:
-      {
-        integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==,
-      }
-
-  braces@3.0.3:
-    resolution:
-      {
-        integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==,
-      }
-    engines: { node: '>=8' }
-
-  browserslist@4.23.2:
-    resolution:
-      {
-        integrity: sha512-qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==,
-      }
-    engines: { node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7 }
+  baseline-browser-mapping@2.10.31:
+    resolution: {integrity: sha512-MujYO3eP72uvmSE0i4wltsodRfIpZATP3jvzRNRGGxgzId7aVocVJJV3nf01qnzzKFGxQVC9bpWxl5cjxTr/7Q==}
+    engines: {node: '>=6.0.0'}
     hasBin: true
 
-  browserslist@4.24.2:
-    resolution:
-      {
-        integrity: sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==,
-      }
-    engines: { node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7 }
+  before-after-hook@4.0.0:
+    resolution: {integrity: sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ==}
+
+  binary-extensions@2.3.0:
+    resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
+    engines: {node: '>=8'}
+
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
+
+  browserslist@4.28.2:
+    resolution: {integrity: sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
   buffer-from@1.1.2:
-    resolution:
-      {
-        integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==,
-      }
+    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
-  bun-types@1.1.34:
-    resolution:
-      {
-        integrity: sha512-br5QygTEL/TwB4uQOb96Ky22j4Gq2WxWH/8Oqv20fk5HagwKXo/akB+LiYgSfzexCt6kkcUaVm+bKiPl71xPvw==,
-      }
+  bun-types@1.3.14:
+    resolution: {integrity: sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ==}
 
-  bun@1.1.29:
-    resolution:
-      {
-        integrity: sha512-SKhpyKNZtgxrVel9ec9xon3LDv8mgpiuFhARgcJo1YIbggY2PBrKHRNiwQ6Qlb+x3ivmRurfuwWgwGexjpgBRg==,
-      }
+  bun@1.3.14:
+    resolution: {integrity: sha512-aB6GVd42x1Y5ie1K16SF+oLGtgSkwX9hgoDdIW88pjvfTccU8F1vfpoOt34QLv0dZ1v3XimtaxPlZUG81Gx9Zg==}
     cpu: [arm64, x64]
-    os: [darwin, linux, win32]
+    os: [darwin, linux, android, freebsd, win32]
     hasBin: true
 
-  bundle-require@5.0.0:
-    resolution:
-      {
-        integrity: sha512-GuziW3fSSmopcx4KRymQEJVbZUfqlCqcq7dvs6TYwKRZiegK/2buMxQTPs6MGlNv50wms1699qYO54R8XfRX4w==,
-      }
-    engines: { node: ^12.20.0 || ^14.13.1 || >=16.0.0 }
+  bundle-require@5.1.0:
+    resolution: {integrity: sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
       esbuild: '>=0.18'
 
-  busboy@1.6.0:
-    resolution:
-      {
-        integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==,
-      }
-    engines: { node: '>=10.16.0' }
-
   cac@6.7.14:
-    resolution:
-      {
-        integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==,
-      }
-    engines: { node: '>=8' }
-
-  call-bind@1.0.7:
-    resolution:
-      {
-        integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==,
-      }
-    engines: { node: '>= 0.4' }
-
-  callsites@3.1.0:
-    resolution:
-      {
-        integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
+    engines: {node: '>=8'}
 
   camelcase-css@2.0.1:
-    resolution:
-      {
-        integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
+    engines: {node: '>= 6'}
 
-  caniuse-lite@1.0.30001669:
-    resolution:
-      {
-        integrity: sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==,
-      }
+  caniuse-lite@1.0.30001793:
+    resolution: {integrity: sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==}
 
-  chai@5.1.1:
-    resolution:
-      {
-        integrity: sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==,
-      }
-    engines: { node: '>=12' }
+  chai@6.2.2:
+    resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==}
+    engines: {node: '>=18'}
 
-  chalk@2.4.2:
-    resolution:
-      {
-        integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==,
-      }
-    engines: { node: '>=4' }
-
-  chalk@4.1.2:
-    resolution:
-      {
-        integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==,
-      }
-    engines: { node: '>=10' }
-
-  check-error@2.1.1:
-    resolution:
-      {
-        integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==,
-      }
-    engines: { node: '>= 16' }
+  chardet@2.1.1:
+    resolution: {integrity: sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ==}
 
   chokidar@3.6.0:
-    resolution:
-      {
-        integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==,
-      }
-    engines: { node: '>= 8.10.0' }
+    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
+    engines: {node: '>= 8.10.0'}
+
+  chokidar@4.0.3:
+    resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
+    engines: {node: '>= 14.16.0'}
+
+  chrome-trace-event@1.0.4:
+    resolution: {integrity: sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==}
+    engines: {node: '>=6.0'}
+
+  citty@0.2.2:
+    resolution: {integrity: sha512-+6vJA3L98yv+IdfKGZHBNiGW5KHn22e/JwID0Strsz8h4S/csAu/OuICwxrg44k5MRiZHWIo8XXuJgQTriRP4w==}
+
+  cli-width@4.1.0:
+    resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==}
+    engines: {node: '>= 12'}
 
   client-only@0.0.1:
-    resolution:
-      {
-        integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==,
-      }
+    resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==}
 
-  color-convert@1.9.3:
-    resolution:
-      {
-        integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==,
-      }
+  clipanion@4.0.0-rc.4:
+    resolution: {integrity: sha512-CXkMQxU6s9GklO/1f714dkKBMu1lopS1WFF0B8o4AxPykR1hpozxSiUZ5ZUeBjfPgCWqbcNOtZVFhB8Lkfp1+Q==}
+    peerDependencies:
+      typanion: '*'
 
-  color-convert@2.0.1:
-    resolution:
-      {
-        integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==,
-      }
-    engines: { node: '>=7.0.0' }
-
-  color-name@1.1.3:
-    resolution:
-      {
-        integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==,
-      }
-
-  color-name@1.1.4:
-    resolution:
-      {
-        integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==,
-      }
-
-  color-string@1.9.1:
-    resolution:
-      {
-        integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==,
-      }
-
-  color@4.2.3:
-    resolution:
-      {
-        integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==,
-      }
-    engines: { node: '>=12.5.0' }
+  colorette@2.0.20:
+    resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
 
   commander@2.20.3:
-    resolution:
-      {
-        integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==,
-      }
+    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
 
   commander@4.1.1:
-    resolution:
-      {
-        integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
+    engines: {node: '>= 6'}
 
-  concat-map@0.0.1:
-    resolution:
-      {
-        integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==,
-      }
+  confbox@0.1.8:
+    resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
 
-  consola@3.2.3:
-    resolution:
-      {
-        integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==,
-      }
-    engines: { node: ^14.18.0 || >=16.10.0 }
+  consola@3.4.2:
+    resolution: {integrity: sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==}
+    engines: {node: ^14.18.0 || >=16.10.0}
+
+  content-type@2.0.0:
+    resolution: {integrity: sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==}
+    engines: {node: '>=18'}
 
   convert-source-map@2.0.0:
-    resolution:
-      {
-        integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==,
-      }
+    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
 
-  cross-spawn@7.0.3:
-    resolution:
-      {
-        integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==,
-      }
-    engines: { node: '>= 8' }
+  cookie-es@1.2.3:
+    resolution: {integrity: sha512-lXVyvUvrNXblMqzIRrxHb57UUVmqsSWlxqt3XIjCkUP0wDAf6uicO6KMbEgYrMNtEvWgWHwe42CKxPu9MYAnWw==}
 
-  cross-spawn@7.0.6:
-    resolution:
-      {
-        integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==,
-      }
-    engines: { node: '>= 8' }
+  crossws@0.3.5:
+    resolution: {integrity: sha512-ojKiDvcmByhwa8YYqbQI/hg7MEU0NC03+pSdEq4ZUnZR9xXpwk7E43SMNGkn+JxJGPFtNvQ48+vV2p+P1ml5PA==}
+
+  crossws@0.4.10:
+    resolution: {integrity: sha512-pz3oubH/dt12KjqsUB0IuXW4nwRDQ583iDsP4555Cpdqx0NoU7pGlWBcayyFI8f/l/idRpgjMEfwuOxSWJYlIA==}
+    peerDependencies:
+      srvx: '>=0.11.5'
+    peerDependenciesMeta:
+      srvx:
+        optional: true
 
   cssesc@3.0.0:
-    resolution:
-      {
-        integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
+    engines: {node: '>=4'}
     hasBin: true
 
-  csstype@3.1.3:
-    resolution:
-      {
-        integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==,
-      }
+  csstype@3.2.3:
+    resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
 
-  damerau-levenshtein@1.0.8:
-    resolution:
-      {
-        integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==,
-      }
-
-  data-view-buffer@1.0.1:
-    resolution:
-      {
-        integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==,
-      }
-    engines: { node: '>= 0.4' }
-
-  data-view-byte-length@1.0.1:
-    resolution:
-      {
-        integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  data-view-byte-offset@1.0.0:
-    resolution:
-      {
-        integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==,
-      }
-    engines: { node: '>= 0.4' }
-
-  debug@3.2.7:
-    resolution:
-      {
-        integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==,
-      }
+  debug@4.4.3:
+    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
+    engines: {node: '>=6.0'}
     peerDependencies:
       supports-color: '*'
     peerDependenciesMeta:
       supports-color:
         optional: true
 
-  debug@4.3.6:
-    resolution:
-      {
-        integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==,
-      }
-    engines: { node: '>=6.0' }
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-
-  debug@4.3.7:
-    resolution:
-      {
-        integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==,
-      }
-    engines: { node: '>=6.0' }
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-
-  dedent@1.5.3:
-    resolution:
-      {
-        integrity: sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==,
-      }
+  dedent@1.7.2:
+    resolution: {integrity: sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==}
     peerDependencies:
       babel-plugin-macros: ^3.1.0
     peerDependenciesMeta:
       babel-plugin-macros:
         optional: true
 
-  deep-eql@5.0.2:
-    resolution:
-      {
-        integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==,
-      }
-    engines: { node: '>=6' }
+  defu@6.1.7:
+    resolution: {integrity: sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==}
 
-  deep-is@0.1.4:
-    resolution:
-      {
-        integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==,
-      }
-
-  define-data-property@1.1.4:
-    resolution:
-      {
-        integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==,
-      }
-    engines: { node: '>= 0.4' }
-
-  define-properties@1.2.1:
-    resolution:
-      {
-        integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==,
-      }
-    engines: { node: '>= 0.4' }
+  destr@2.0.5:
+    resolution: {integrity: sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==}
 
   detect-libc@1.0.3:
-    resolution:
-      {
-        integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==,
-      }
-    engines: { node: '>=0.10' }
+    resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
+    engines: {node: '>=0.10'}
     hasBin: true
 
-  detect-libc@2.0.3:
-    resolution:
-      {
-        integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==,
-      }
-    engines: { node: '>=8' }
+  detect-libc@2.1.2:
+    resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
+    engines: {node: '>=8'}
 
   didyoumean@1.2.2:
-    resolution:
-      {
-        integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==,
-      }
-
-  dir-glob@3.0.1:
-    resolution:
-      {
-        integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
 
   dlv@1.1.3:
-    resolution:
-      {
-        integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==,
-      }
+    resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
 
-  doctrine@2.1.0:
-    resolution:
-      {
-        integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==,
-      }
-    engines: { node: '>=0.10.0' }
+  electron-to-chromium@1.5.361:
+    resolution: {integrity: sha512-Q6Hts7N9FnJc5LeGRINFvLhCI9xZmNtTDe5ZbcVezQz7cU4a8Aua3GH1b8J2XY8Al9PF+OCwYqhgsOOheMdvkA==}
 
-  eastasianwidth@0.2.0:
-    resolution:
-      {
-        integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==,
-      }
+  emnapi@1.11.3:
+    resolution: {integrity: sha512-+/ZS90YK/rYfVOHtGLHkGffVsnmD/MAKaBHio+Y4XAtg75RLr4cveV/w0jTkUdLM1CcAlaRgG76mpIemWAlk0A==}
+    peerDependencies:
+      node-addon-api: '>= 6.1.0'
+    peerDependenciesMeta:
+      node-addon-api:
+        optional: true
 
-  electron-to-chromium@1.5.4:
-    resolution:
-      {
-        integrity: sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==,
-      }
-
-  electron-to-chromium@1.5.45:
-    resolution:
-      {
-        integrity: sha512-vOzZS6uZwhhbkZbcRyiy99Wg+pYFV5hk+5YaECvx0+Z31NR3Tt5zS6dze2OepT6PCTzVzT0dIJItti+uAW5zmw==,
-      }
-
-  emoji-regex@8.0.0:
-    resolution:
-      {
-        integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==,
-      }
-
-  emoji-regex@9.2.2:
-    resolution:
-      {
-        integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==,
-      }
-
-  enhanced-resolve@5.17.1:
-    resolution:
-      {
-        integrity: sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==,
-      }
-    engines: { node: '>=10.13.0' }
-
-  es-abstract@1.23.3:
-    resolution:
-      {
-        integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==,
-      }
-    engines: { node: '>= 0.4' }
-
-  es-define-property@1.0.0:
-    resolution:
-      {
-        integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==,
-      }
-    engines: { node: '>= 0.4' }
+  enhanced-resolve@5.24.5:
+    resolution: {integrity: sha512-L1l8TNvomm6UVW5B253AGxQagSQr+vGwhMlrrfRS2qmhx46AMpMVJKQYLvWYbysTMY8VoicOvzHzoHMbyzB+4A==}
+    engines: {node: '>=10.13.0'}
 
   es-errors@1.3.0:
-    resolution:
-      {
-        integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+    engines: {node: '>= 0.4'}
 
-  es-iterator-helpers@1.1.0:
-    resolution:
-      {
-        integrity: sha512-/SurEfycdyssORP/E+bj4sEu1CWw4EmLDsHynHwSXQ7utgbrMRWW195pTrCjFgFCddf/UkYm3oqKPRq5i8bJbw==,
-      }
-    engines: { node: '>= 0.4' }
+  es-module-lexer@2.1.0:
+    resolution: {integrity: sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==}
 
-  es-object-atoms@1.0.0:
-    resolution:
-      {
-        integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==,
-      }
-    engines: { node: '>= 0.4' }
+  es-toolkit@1.50.0:
+    resolution: {integrity: sha512-OyZKhUVvEep9ITEiwHn8GKnMRQIVqoSIX7WnRbkWgJkllCujilqP2rD0u979tkl8wqyc8ICwlc1UBVv/Sl1G6w==}
 
-  es-set-tostringtag@2.0.3:
-    resolution:
-      {
-        integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  es-shim-unscopables@1.0.2:
-    resolution:
-      {
-        integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==,
-      }
-
-  es-to-primitive@1.2.1:
-    resolution:
-      {
-        integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==,
-      }
-    engines: { node: '>= 0.4' }
-
-  esbuild@0.21.5:
-    resolution:
-      {
-        integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==,
-      }
-    engines: { node: '>=12' }
+  esbuild@0.27.7:
+    resolution: {integrity: sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==}
+    engines: {node: '>=18'}
     hasBin: true
 
-  esbuild@0.23.0:
-    resolution:
-      {
-        integrity: sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==,
-      }
-    engines: { node: '>=18' }
-    hasBin: true
-
-  esbuild@0.23.1:
-    resolution:
-      {
-        integrity: sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==,
-      }
-    engines: { node: '>=18' }
-    hasBin: true
-
-  esbuild@0.24.0:
-    resolution:
-      {
-        integrity: sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==,
-      }
-    engines: { node: '>=18' }
-    hasBin: true
-
-  escalade@3.1.2:
-    resolution:
-      {
-        integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==,
-      }
-    engines: { node: '>=6' }
-
   escalade@3.2.0:
-    resolution:
-      {
-        integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
+    engines: {node: '>=6'}
 
-  escape-string-regexp@1.0.5:
-    resolution:
-      {
-        integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==,
-      }
-    engines: { node: '>=0.8.0' }
-
-  escape-string-regexp@4.0.0:
-    resolution:
-      {
-        integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==,
-      }
-    engines: { node: '>=10' }
-
-  eslint-config-next@15.0.3:
-    resolution:
-      {
-        integrity: sha512-IGP2DdQQrgjcr4mwFPve4DrCqo7CVVez1WoYY47XwKSrYO4hC0Dlb+iJA60i0YfICOzgNADIb8r28BpQ5Zs0wg==,
-      }
-    peerDependencies:
-      eslint: ^7.23.0 || ^8.0.0 || ^9.0.0
-      typescript: '>=3.3.1'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  eslint-import-resolver-node@0.3.9:
-    resolution:
-      {
-        integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==,
-      }
-
-  eslint-import-resolver-typescript@3.6.3:
-    resolution:
-      {
-        integrity: sha512-ud9aw4szY9cCT1EWWdGv1L1XR6hh2PaRWif0j2QjQ0pgTY/69iw+W0Z4qZv5wHahOl8isEr+k/JnyAqNQkLkIA==,
-      }
-    engines: { node: ^14.18.0 || >=16.0.0 }
-    peerDependencies:
-      eslint: '*'
-      eslint-plugin-import: '*'
-      eslint-plugin-import-x: '*'
-    peerDependenciesMeta:
-      eslint-plugin-import:
-        optional: true
-      eslint-plugin-import-x:
-        optional: true
-
-  eslint-module-utils@2.12.0:
-    resolution:
-      {
-        integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==,
-      }
-    engines: { node: '>=4' }
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: '*'
-      eslint-import-resolver-node: '*'
-      eslint-import-resolver-typescript: '*'
-      eslint-import-resolver-webpack: '*'
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
-      eslint:
-        optional: true
-      eslint-import-resolver-node:
-        optional: true
-      eslint-import-resolver-typescript:
-        optional: true
-      eslint-import-resolver-webpack:
-        optional: true
-
-  eslint-plugin-import@2.31.0:
-    resolution:
-      {
-        integrity: sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==,
-      }
-    engines: { node: '>=4' }
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
-
-  eslint-plugin-jsx-a11y@6.10.1:
-    resolution:
-      {
-        integrity: sha512-zHByM9WTUMnfsDTafGXRiqxp6lFtNoSOWBY6FonVRn3A+BUwN1L/tdBXT40BcBJi0cZjOGTXZ0eD/rTG9fEJ0g==,
-      }
-    engines: { node: '>=4.0' }
-    peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9
-
-  eslint-plugin-react-hooks@5.0.0:
-    resolution:
-      {
-        integrity: sha512-hIOwI+5hYGpJEc4uPRmz2ulCjAGD/N13Lukkh8cLV0i2IRk/bdZDYjgLVHj+U9Z704kLIdIO6iueGvxNur0sgw==,
-      }
-    engines: { node: '>=10' }
-    peerDependencies:
-      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0
-
-  eslint-plugin-react@7.37.2:
-    resolution:
-      {
-        integrity: sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==,
-      }
-    engines: { node: '>=4' }
-    peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
-
-  eslint-scope@8.2.0:
-    resolution:
-      {
-        integrity: sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
-
-  eslint-visitor-keys@3.4.3:
-    resolution:
-      {
-        integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
-
-  eslint-visitor-keys@4.2.0:
-    resolution:
-      {
-        integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
-
-  eslint@9.15.0:
-    resolution:
-      {
-        integrity: sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
-    hasBin: true
-    peerDependencies:
-      jiti: '*'
-    peerDependenciesMeta:
-      jiti:
-        optional: true
-
-  espree@10.3.0:
-    resolution:
-      {
-        integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
-
-  esquery@1.6.0:
-    resolution:
-      {
-        integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==,
-      }
-    engines: { node: '>=0.10' }
+  eslint-scope@5.1.1:
+    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
+    engines: {node: '>=8.0.0'}
 
   esrecurse@4.3.0:
-    resolution:
-      {
-        integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==,
-      }
-    engines: { node: '>=4.0' }
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
+
+  estraverse@4.3.0:
+    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
+    engines: {node: '>=4.0'}
 
   estraverse@5.3.0:
-    resolution:
-      {
-        integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==,
-      }
-    engines: { node: '>=4.0' }
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
 
   estree-walker@3.0.3:
-    resolution:
-      {
-        integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==,
-      }
+    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
 
-  esutils@2.0.3:
-    resolution:
-      {
-        integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==,
-      }
-    engines: { node: '>=0.10.0' }
+  events@3.3.0:
+    resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
+    engines: {node: '>=0.8.x'}
 
-  execa@5.1.1:
-    resolution:
-      {
-        integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==,
-      }
-    engines: { node: '>=10' }
+  expect-type@1.3.0:
+    resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==}
+    engines: {node: '>=12.0.0'}
 
-  execa@8.0.1:
-    resolution:
-      {
-        integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==,
-      }
-    engines: { node: '>=16.17' }
+  fast-content-type-parse@3.0.0:
+    resolution: {integrity: sha512-ZvLdcY8P+N8mGQJahJV5G4U88CSvT1rP8ApL6uETe88MBXrBHAkZlSEySdUlyztF7ccb+Znos3TFqaepHxdhBg==}
 
   fast-deep-equal@3.1.3:
-    resolution:
-      {
-        integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==,
-      }
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
-  fast-glob@3.3.1:
-    resolution:
-      {
-        integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==,
-      }
-    engines: { node: '>=8.6.0' }
+  fast-equals@5.4.0:
+    resolution: {integrity: sha512-jt2DW/aNFNwke7AUd+Z+e6pz39KO5rzdbbFCg2sGafS4mk13MI7Z8O5z9cADNn5lhGODIgLwug6TZO2ctf7kcw==}
+    engines: {node: '>=6.0.0'}
 
-  fast-glob@3.3.2:
-    resolution:
-      {
-        integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==,
-      }
-    engines: { node: '>=8.6.0' }
+  fast-glob@3.3.3:
+    resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}
+    engines: {node: '>=8.6.0'}
 
-  fast-json-stable-stringify@2.1.0:
-    resolution:
-      {
-        integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==,
-      }
+  fast-string-truncated-width@3.0.3:
+    resolution: {integrity: sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==}
 
-  fast-levenshtein@2.0.6:
-    resolution:
-      {
-        integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==,
-      }
+  fast-string-width@3.0.2:
+    resolution: {integrity: sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==}
 
-  fastq@1.17.1:
-    resolution:
-      {
-        integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==,
-      }
+  fast-stringify@4.0.0:
+    resolution: {integrity: sha512-lE2DIivBaLysf6hK5WH/VfMgqRbvBVHcpGVVTmA5Zi8oWIjq9YxIt6lYGdUgP1HNSXxTIat7HEIDnrSvXSeKQw==}
 
-  file-entry-cache@8.0.0:
-    resolution:
-      {
-        integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==,
-      }
-    engines: { node: '>=16.0.0' }
+  fast-uri@3.1.2:
+    resolution: {integrity: sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==}
+
+  fast-wrap-ansi@0.2.2:
+    resolution: {integrity: sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==}
+
+  fastq@1.20.1:
+    resolution: {integrity: sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==}
+
+  fdir@6.5.0:
+    resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
 
   fill-range@7.1.1:
-    resolution:
-      {
-        integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
 
-  find-up-simple@1.0.0:
-    resolution:
-      {
-        integrity: sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==,
-      }
-    engines: { node: '>=18' }
+  find-up-simple@1.0.1:
+    resolution: {integrity: sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==}
+    engines: {node: '>=18'}
 
-  find-up@5.0.0:
-    resolution:
-      {
-        integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==,
-      }
-    engines: { node: '>=10' }
+  fix-dts-default-cjs-exports@1.0.1:
+    resolution: {integrity: sha512-pVIECanWFC61Hzl2+oOCtoJ3F17kglZC/6N94eRWycFgBH35hHx0Li604ZIzhseh97mf2p0cv7vVrOZGoqhlEg==}
 
-  flat-cache@4.0.1:
-    resolution:
-      {
-        integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==,
-      }
-    engines: { node: '>=16' }
-
-  flatted@3.3.1:
-    resolution:
-      {
-        integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==,
-      }
-
-  for-each@0.3.3:
-    resolution:
-      {
-        integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==,
-      }
-
-  foreground-child@3.3.0:
-    resolution:
-      {
-        integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==,
-      }
-    engines: { node: '>=14' }
-
-  fraction.js@4.3.7:
-    resolution:
-      {
-        integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==,
-      }
+  fraction.js@5.3.4:
+    resolution: {integrity: sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==}
 
   fsevents@2.3.2:
-    resolution:
-      {
-        integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==,
-      }
-    engines: { node: ^8.16.0 || ^10.6.0 || >=11.0.0 }
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
 
   fsevents@2.3.3:
-    resolution:
-      {
-        integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==,
-      }
-    engines: { node: ^8.16.0 || ^10.6.0 || >=11.0.0 }
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
 
   function-bind@1.1.2:
-    resolution:
-      {
-        integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==,
-      }
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
-  function.prototype.name@1.1.6:
-    resolution:
-      {
-        integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==,
-      }
-    engines: { node: '>= 0.4' }
-
-  functions-have-names@1.2.3:
-    resolution:
-      {
-        integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==,
-      }
-
-  gensync@1.0.0-beta.2:
-    resolution:
-      {
-        integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==,
-      }
-    engines: { node: '>=6.9.0' }
-
-  get-func-name@2.0.2:
-    resolution:
-      {
-        integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==,
-      }
-
-  get-intrinsic@1.2.4:
-    resolution:
-      {
-        integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  get-stream@6.0.1:
-    resolution:
-      {
-        integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==,
-      }
-    engines: { node: '>=10' }
-
-  get-stream@8.0.1:
-    resolution:
-      {
-        integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==,
-      }
-    engines: { node: '>=16' }
-
-  get-symbol-description@1.0.2:
-    resolution:
-      {
-        integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==,
-      }
-    engines: { node: '>= 0.4' }
-
-  get-tsconfig@4.8.1:
-    resolution:
-      {
-        integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==,
-      }
+  get-port-please@3.2.0:
+    resolution: {integrity: sha512-I9QVvBw5U/hw3RmWpYKRumUeaDgxTPd401x364rLmWBJcOQ753eov1eTgzDqRG9bqFIfDc7gfzcQEWrUri3o1A==}
 
   glob-parent@5.1.2:
-    resolution:
-      {
-        integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
+    engines: {node: '>= 6'}
 
   glob-parent@6.0.2:
-    resolution:
-      {
-        integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==,
-      }
-    engines: { node: '>=10.13.0' }
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
 
-  glob@10.4.5:
-    resolution:
-      {
-        integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==,
-      }
-    hasBin: true
-
-  globals@11.12.0:
-    resolution:
-      {
-        integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==,
-      }
-    engines: { node: '>=4' }
-
-  globals@14.0.0:
-    resolution:
-      {
-        integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==,
-      }
-    engines: { node: '>=18' }
-
-  globalthis@1.0.4:
-    resolution:
-      {
-        integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  globby@11.1.0:
-    resolution:
-      {
-        integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==,
-      }
-    engines: { node: '>=10' }
-
-  globby@14.0.2:
-    resolution:
-      {
-        integrity: sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==,
-      }
-    engines: { node: '>=18' }
-
-  gopd@1.0.1:
-    resolution:
-      {
-        integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==,
-      }
+  globby@16.2.2:
+    resolution: {integrity: sha512-NLvV9ubZ6NDsJaOpKPy3cQeJpKi9DcWiyCiFUpJPA0YihRqiE6RWaLUmgNNPr8MgPpLZjnBjSmou7uZBRJv9wA==}
+    engines: {node: '>=20'}
 
   graceful-fs@4.2.11:
-    resolution:
-      {
-        integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==,
-      }
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
-  graphemer@1.4.0:
-    resolution:
-      {
-        integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==,
-      }
-
-  has-bigints@1.0.2:
-    resolution:
-      {
-        integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==,
-      }
-
-  has-flag@3.0.0:
-    resolution:
-      {
-        integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==,
-      }
-    engines: { node: '>=4' }
+  h3@1.15.11:
+    resolution: {integrity: sha512-L3THSe2MPeBwgIZVSH5zLdBBU90TOxarvhK9d04IDY2AmVS8j2Jz2LIWtwsGOU3lu2I5jCN7FNvVfY2+XyF+mg==}
 
   has-flag@4.0.0:
-    resolution:
-      {
-        integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
 
-  has-property-descriptors@1.0.2:
-    resolution:
-      {
-        integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==,
-      }
+  hasown@2.0.3:
+    resolution: {integrity: sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==}
+    engines: {node: '>= 0.4'}
 
-  has-proto@1.0.3:
-    resolution:
-      {
-        integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==,
-      }
-    engines: { node: '>= 0.4' }
+  http-shutdown@1.2.2:
+    resolution: {integrity: sha512-S9wWkJ/VSY9/k4qcjG318bqJNruzE4HySUhFYknwmu6LBP97KLLfwNf+n4V1BHurvFNkSKLFnK/RsuUnRTf9Vw==}
+    engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
 
-  has-symbols@1.0.3:
-    resolution:
-      {
-        integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==,
-      }
-    engines: { node: '>= 0.4' }
+  iconv-lite@0.7.2:
+    resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==}
+    engines: {node: '>=0.10.0'}
 
-  has-tostringtag@1.0.2:
-    resolution:
-      {
-        integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==,
-      }
-    engines: { node: '>= 0.4' }
+  ignore@7.0.5:
+    resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
+    engines: {node: '>= 4'}
 
-  hasown@2.0.2:
-    resolution:
-      {
-        integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  human-signals@2.1.0:
-    resolution:
-      {
-        integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==,
-      }
-    engines: { node: '>=10.17.0' }
-
-  human-signals@5.0.0:
-    resolution:
-      {
-        integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==,
-      }
-    engines: { node: '>=16.17.0' }
-
-  ignore@5.3.1:
-    resolution:
-      {
-        integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==,
-      }
-    engines: { node: '>= 4' }
-
-  ignore@5.3.2:
-    resolution:
-      {
-        integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==,
-      }
-    engines: { node: '>= 4' }
-
-  import-fresh@3.3.0:
-    resolution:
-      {
-        integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==,
-      }
-    engines: { node: '>=6' }
-
-  imurmurhash@0.1.4:
-    resolution:
-      {
-        integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==,
-      }
-    engines: { node: '>=0.8.19' }
-
-  internal-slot@1.0.7:
-    resolution:
-      {
-        integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-array-buffer@3.0.4:
-    resolution:
-      {
-        integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-arrayish@0.3.2:
-    resolution:
-      {
-        integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==,
-      }
-
-  is-async-function@2.0.0:
-    resolution:
-      {
-        integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-bigint@1.0.4:
-    resolution:
-      {
-        integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==,
-      }
+  iron-webcrypto@1.2.1:
+    resolution: {integrity: sha512-feOM6FaSr6rEABp/eDfVseKyTMDt+KGpeB35SkVn9Tyn0CqvVsY3EwI0v5i8nMHyJnzCIQf7nsy3p41TPkJZhg==}
 
   is-binary-path@2.1.0:
-    resolution:
-      {
-        integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
+    engines: {node: '>=8'}
 
-  is-boolean-object@1.1.2:
-    resolution:
-      {
-        integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-bun-module@1.2.1:
-    resolution:
-      {
-        integrity: sha512-AmidtEM6D6NmUiLOvvU7+IePxjEjOzra2h0pSrsfSAcXwl/83zLLXDByafUJy9k/rKK0pvXMLdwKwGHlX2Ke6Q==,
-      }
-
-  is-callable@1.2.7:
-    resolution:
-      {
-        integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-core-module@2.15.0:
-    resolution:
-      {
-        integrity: sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-core-module@2.15.1:
-    resolution:
-      {
-        integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-data-view@1.0.1:
-    resolution:
-      {
-        integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-date-object@1.0.5:
-    resolution:
-      {
-        integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==,
-      }
-    engines: { node: '>= 0.4' }
+  is-core-module@2.16.2:
+    resolution: {integrity: sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==}
+    engines: {node: '>= 0.4'}
 
   is-extglob@2.1.1:
-    resolution:
-      {
-        integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==,
-      }
-    engines: { node: '>=0.10.0' }
-
-  is-finalizationregistry@1.0.2:
-    resolution:
-      {
-        integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==,
-      }
-
-  is-fullwidth-code-point@3.0.0:
-    resolution:
-      {
-        integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==,
-      }
-    engines: { node: '>=8' }
-
-  is-generator-function@1.0.10:
-    resolution:
-      {
-        integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
 
   is-glob@4.0.3:
-    resolution:
-      {
-        integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==,
-      }
-    engines: { node: '>=0.10.0' }
-
-  is-map@2.0.3:
-    resolution:
-      {
-        integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-negative-zero@2.0.3:
-    resolution:
-      {
-        integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-number-object@1.0.7:
-    resolution:
-      {
-        integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
 
   is-number@7.0.0:
-    resolution:
-      {
-        integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==,
-      }
-    engines: { node: '>=0.12.0' }
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
 
-  is-regex@1.1.4:
-    resolution:
-      {
-        integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==,
-      }
-    engines: { node: '>= 0.4' }
+  is-path-inside@4.0.0:
+    resolution: {integrity: sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==}
+    engines: {node: '>=12'}
 
-  is-set@2.0.3:
-    resolution:
-      {
-        integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==,
-      }
-    engines: { node: '>= 0.4' }
+  jest-worker@27.5.1:
+    resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
+    engines: {node: '>= 10.13.0'}
 
-  is-shared-array-buffer@1.0.3:
-    resolution:
-      {
-        integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-stream@2.0.1:
-    resolution:
-      {
-        integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==,
-      }
-    engines: { node: '>=8' }
-
-  is-stream@3.0.0:
-    resolution:
-      {
-        integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==,
-      }
-    engines: { node: ^12.20.0 || ^14.13.1 || >=16.0.0 }
-
-  is-string@1.0.7:
-    resolution:
-      {
-        integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-symbol@1.0.4:
-    resolution:
-      {
-        integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-typed-array@1.1.13:
-    resolution:
-      {
-        integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-weakmap@2.0.2:
-    resolution:
-      {
-        integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==,
-      }
-    engines: { node: '>= 0.4' }
-
-  is-weakref@1.0.2:
-    resolution:
-      {
-        integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==,
-      }
-
-  is-weakset@2.0.3:
-    resolution:
-      {
-        integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  isarray@2.0.5:
-    resolution:
-      {
-        integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==,
-      }
-
-  isexe@2.0.0:
-    resolution:
-      {
-        integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==,
-      }
-
-  iterator.prototype@1.1.3:
-    resolution:
-      {
-        integrity: sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  jackspeak@3.4.3:
-    resolution:
-      {
-        integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==,
-      }
-
-  jiti@1.21.6:
-    resolution:
-      {
-        integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==,
-      }
+  jiti@1.21.7:
+    resolution: {integrity: sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==}
     hasBin: true
 
-  jiti@2.4.0:
-    resolution:
-      {
-        integrity: sha512-H5UpaUI+aHOqZXlYOaFP/8AzKsg+guWu+Pr3Y8i7+Y3zr1aXAvCvTAQ1RxSc6oVD8R8c7brgNtTVP91E7upH/g==,
-      }
+  jiti@2.7.0:
+    resolution: {integrity: sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==}
     hasBin: true
 
   joycon@3.1.1:
-    resolution:
-      {
-        integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
+    engines: {node: '>=10'}
 
-  js-tokens@4.0.0:
-    resolution:
-      {
-        integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==,
-      }
-
-  js-yaml@4.1.0:
-    resolution:
-      {
-        integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==,
-      }
+  js-yaml@4.3.1:
+    resolution: {integrity: sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==}
     hasBin: true
 
-  jsesc@2.5.2:
-    resolution:
-      {
-        integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==,
-      }
-    engines: { node: '>=4' }
-    hasBin: true
+  json-schema-traverse@1.0.0:
+    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
 
-  json-buffer@3.0.1:
-    resolution:
-      {
-        integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==,
-      }
+  json-with-bigint@3.5.8:
+    resolution: {integrity: sha512-eq/4KP6K34kwa7TcFdtvnftvHCD9KvHOGGICWwMFc4dOOKF5t4iYqnfLK8otCRCRv06FXOzGGyqE8h8ElMvvdw==}
 
-  json-schema-traverse@0.4.1:
-    resolution:
-      {
-        integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==,
-      }
+  lightningcss-android-arm64@1.33.0:
+    resolution: {integrity: sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [android]
 
-  json-stable-stringify-without-jsonify@1.0.1:
-    resolution:
-      {
-        integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==,
-      }
-
-  json5@1.0.2:
-    resolution:
-      {
-        integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==,
-      }
-    hasBin: true
-
-  json5@2.2.3:
-    resolution:
-      {
-        integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==,
-      }
-    engines: { node: '>=6' }
-    hasBin: true
-
-  jsx-ast-utils@3.3.5:
-    resolution:
-      {
-        integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==,
-      }
-    engines: { node: '>=4.0' }
-
-  keyv@4.5.4:
-    resolution:
-      {
-        integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==,
-      }
-
-  language-subtag-registry@0.3.23:
-    resolution:
-      {
-        integrity: sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==,
-      }
-
-  language-tags@1.0.9:
-    resolution:
-      {
-        integrity: sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==,
-      }
-    engines: { node: '>=0.10' }
-
-  levn@0.4.1:
-    resolution:
-      {
-        integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==,
-      }
-    engines: { node: '>= 0.8.0' }
-
-  lightningcss-darwin-arm64@1.26.0:
-    resolution:
-      {
-        integrity: sha512-n4TIvHO1NY1ondKFYpL2ZX0bcC2y6yjXMD6JfyizgR8BCFNEeArINDzEaeqlfX9bXz73Bpz/Ow0nu+1qiDrBKg==,
-      }
-    engines: { node: '>= 12.0.0' }
+  lightningcss-darwin-arm64@1.33.0:
+    resolution: {integrity: sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==}
+    engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [darwin]
 
-  lightningcss-darwin-x64@1.26.0:
-    resolution:
-      {
-        integrity: sha512-Rf9HuHIDi1R6/zgBkJh25SiJHF+dm9axUZW/0UoYCW1/8HV0gMI0blARhH4z+REmWiU1yYT/KyNF3h7tHyRXUg==,
-      }
-    engines: { node: '>= 12.0.0' }
+  lightningcss-darwin-x64@1.33.0:
+    resolution: {integrity: sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==}
+    engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [darwin]
 
-  lightningcss-freebsd-x64@1.26.0:
-    resolution:
-      {
-        integrity: sha512-C/io7POAxp6sZxFSVGezjajMlCKQ8KSwISLLGRq8xLQpQMokYrUoqYEwmIX8mLmF6C/CZPk0gFmRSzd8biWM0g==,
-      }
-    engines: { node: '>= 12.0.0' }
+  lightningcss-freebsd-x64@1.33.0:
+    resolution: {integrity: sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==}
+    engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [freebsd]
 
-  lightningcss-linux-arm-gnueabihf@1.26.0:
-    resolution:
-      {
-        integrity: sha512-Aag9kqXqkyPSW+dXMgyWk66C984Nay2pY8Nws+67gHlDzV3cWh7TvFlzuaTaVFMVqdDTzN484LSK3u39zFBnzg==,
-      }
-    engines: { node: '>= 12.0.0' }
+  lightningcss-linux-arm-gnueabihf@1.33.0:
+    resolution: {integrity: sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==}
+    engines: {node: '>= 12.0.0'}
     cpu: [arm]
     os: [linux]
 
-  lightningcss-linux-arm64-gnu@1.26.0:
-    resolution:
-      {
-        integrity: sha512-iJmZM7fUyVjH+POtdiCtExG+67TtPUTer7K/5A8DIfmPfrmeGvzfRyBltGhQz13Wi15K1lf2cPYoRaRh6vcwNA==,
-      }
-    engines: { node: '>= 12.0.0' }
+  lightningcss-linux-arm64-gnu@1.33.0:
+    resolution: {integrity: sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==}
+    engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
 
-  lightningcss-linux-arm64-musl@1.26.0:
-    resolution:
-      {
-        integrity: sha512-XxoEL++tTkyuvu+wq/QS8bwyTXZv2y5XYCMcWL45b8XwkiS8eEEEej9BkMGSRwxa5J4K+LDeIhLrS23CpQyfig==,
-      }
-    engines: { node: '>= 12.0.0' }
+  lightningcss-linux-arm64-musl@1.33.0:
+    resolution: {integrity: sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==}
+    engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
 
-  lightningcss-linux-x64-gnu@1.26.0:
-    resolution:
-      {
-        integrity: sha512-1dkTfZQAYLj8MUSkd6L/+TWTG8V6Kfrzfa0T1fSlXCXQHrt1HC1/UepXHtKHDt/9yFwyoeayivxXAsApVxn6zA==,
-      }
-    engines: { node: '>= 12.0.0' }
+  lightningcss-linux-x64-gnu@1.33.0:
+    resolution: {integrity: sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==}
+    engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
 
-  lightningcss-linux-x64-musl@1.26.0:
-    resolution:
-      {
-        integrity: sha512-yX3Rk9m00JGCUzuUhFEojY+jf/6zHs3XU8S8Vk+FRbnr4St7cjyMXdNjuA2LjiT8e7j8xHRCH8hyZ4H/btRE4A==,
-      }
-    engines: { node: '>= 12.0.0' }
+  lightningcss-linux-x64-musl@1.33.0:
+    resolution: {integrity: sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==}
+    engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
 
-  lightningcss-win32-arm64-msvc@1.26.0:
-    resolution:
-      {
-        integrity: sha512-X/597/cFnCogy9VItj/+7Tgu5VLbAtDF7KZDPdSw0MaL6FL940th1y3HiOzFIlziVvAtbo0RB3NAae1Oofr+Tw==,
-      }
-    engines: { node: '>= 12.0.0' }
+  lightningcss-win32-arm64-msvc@1.33.0:
+    resolution: {integrity: sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==}
+    engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [win32]
 
-  lightningcss-win32-x64-msvc@1.26.0:
-    resolution:
-      {
-        integrity: sha512-pYS3EyGP3JRhfqEFYmfFDiZ9/pVNfy8jVIYtrx9TVNusVyDK3gpW1w/rbvroQ4bDJi7grdUtyrYU6V2xkY/bBw==,
-      }
-    engines: { node: '>= 12.0.0' }
+  lightningcss-win32-x64-msvc@1.33.0:
+    resolution: {integrity: sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==}
+    engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [win32]
 
-  lightningcss@1.26.0:
-    resolution:
-      {
-        integrity: sha512-a/XZ5hdgifrofQJUArr5AiJjx26SwMam3SJUSMjgebZbESZ96i+6Qsl8tLi0kaUsdMzBWXh9sN1Oe6hp2/dkQw==,
-      }
-    engines: { node: '>= 12.0.0' }
+  lightningcss@1.33.0:
+    resolution: {integrity: sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==}
+    engines: {node: '>= 12.0.0'}
 
-  lilconfig@2.1.0:
-    resolution:
-      {
-        integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==,
-      }
-    engines: { node: '>=10' }
-
-  lilconfig@3.1.2:
-    resolution:
-      {
-        integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==,
-      }
-    engines: { node: '>=14' }
+  lilconfig@3.1.3:
+    resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}
+    engines: {node: '>=14'}
 
   lines-and-columns@1.2.4:
-    resolution:
-      {
-        integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==,
-      }
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+
+  listhen@1.10.1:
+    resolution: {integrity: sha512-6nt/86SkqUQSLW1ofz8MxC6RhRMqOl3ONISe6qqvJ3xj09aJWQx6DhgSZpugs3PX4PXdOas/WD6A9jx6J2N19A==}
+    hasBin: true
+    peerDependencies:
+      '@parcel/watcher': ^2.5.6
+    peerDependenciesMeta:
+      '@parcel/watcher':
+        optional: true
 
   load-tsconfig@0.2.5:
-    resolution:
-      {
-        integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==,
-      }
-    engines: { node: ^12.20.0 || ^14.13.1 || >=16.0.0 }
+    resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
-  locate-path@6.0.0:
-    resolution:
-      {
-        integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==,
-      }
-    engines: { node: '>=10' }
+  magic-string@0.30.21:
+    resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
 
-  lodash.castarray@4.4.0:
-    resolution:
-      {
-        integrity: sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==,
-      }
-
-  lodash.isplainobject@4.0.6:
-    resolution:
-      {
-        integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==,
-      }
-
-  lodash.merge@4.6.2:
-    resolution:
-      {
-        integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==,
-      }
-
-  lodash.sortby@4.7.0:
-    resolution:
-      {
-        integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==,
-      }
-
-  loose-envify@1.4.0:
-    resolution:
-      {
-        integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==,
-      }
-    hasBin: true
-
-  loupe@3.1.1:
-    resolution:
-      {
-        integrity: sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==,
-      }
-
-  lru-cache@10.4.3:
-    resolution:
-      {
-        integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==,
-      }
-
-  lru-cache@5.1.1:
-    resolution:
-      {
-        integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==,
-      }
-
-  magic-string@0.30.11:
-    resolution:
-      {
-        integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==,
-      }
+  magic-string@1.1.0:
+    resolution: {integrity: sha512-kS3VHe0nEPST2saQV4Rbkchcd3UBRkVTQHo1D3h/ZTwFDhai/mfKkmtPAtD129EOI7K3HlHIsFOt0WrI2/oU9g==}
 
   merge-stream@2.0.0:
-    resolution:
-      {
-        integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==,
-      }
+    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
 
   merge2@1.4.1:
-    resolution:
-      {
-        integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
+    engines: {node: '>= 8'}
 
-  micro-memoize@4.1.2:
-    resolution:
-      {
-        integrity: sha512-+HzcV2H+rbSJzApgkj0NdTakkC+bnyeiUxgT6/m7mjcz1CmM22KYFKp+EVj1sWe4UYcnriJr5uqHQD/gMHLD+g==,
-      }
+  micro-memoize@5.1.1:
+    resolution: {integrity: sha512-QDwluos8YeMijiKxZGwaV4f4tzj0soS6+xcsJhJ3+4wdEIHMyKbIKVUziebOgWX3e6yiijdoaHo+9tyhbnaWXA==}
 
-  micromatch@4.0.7:
-    resolution:
-      {
-        integrity: sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==,
-      }
-    engines: { node: '>=8.6' }
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
+    engines: {node: '>=8.6'}
 
-  mimic-fn@2.1.0:
-    resolution:
-      {
-        integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==,
-      }
-    engines: { node: '>=6' }
-
-  mimic-fn@4.0.0:
-    resolution:
-      {
-        integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==,
-      }
-    engines: { node: '>=12' }
+  mime-db@1.54.0:
+    resolution: {integrity: sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==}
+    engines: {node: '>= 0.6'}
 
   mini-svg-data-uri@1.4.4:
-    resolution:
-      {
-        integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==,
-      }
+    resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==}
     hasBin: true
 
-  minimatch@3.1.2:
-    resolution:
-      {
-        integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==,
-      }
+  minimizer-webpack-plugin@5.6.1:
+    resolution: {integrity: sha512-DoeAZz8Q1C1znwsUzej1fdoi4jCf7/+Em27ouLqfK/+3m8G+D7yDhUwrc3CNhjSzGUN1kn7Iv4sWmjflQHenpw==}
+    engines: {node: '>= 10.13.0'}
+    peerDependencies:
+      '@minify-html/node': '*'
+      '@swc/core': '*'
+      '@swc/css': '*'
+      '@swc/html': '*'
+      clean-css: '*'
+      cssnano: '*'
+      csso: '*'
+      esbuild: '*'
+      html-minifier-terser: '*'
+      lightningcss: '*'
+      postcss: '*'
+      uglify-js: '*'
+      webpack: ^5.1.0
+    peerDependenciesMeta:
+      '@minify-html/node':
+        optional: true
+      '@swc/core':
+        optional: true
+      '@swc/css':
+        optional: true
+      '@swc/html':
+        optional: true
+      clean-css:
+        optional: true
+      cssnano:
+        optional: true
+      csso:
+        optional: true
+      esbuild:
+        optional: true
+      html-minifier-terser:
+        optional: true
+      lightningcss:
+        optional: true
+      postcss:
+        optional: true
+      uglify-js:
+        optional: true
 
-  minimatch@9.0.5:
-    resolution:
-      {
-        integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==,
-      }
-    engines: { node: '>=16 || 14 >=14.17' }
-
-  minimist@1.2.8:
-    resolution:
-      {
-        integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==,
-      }
-
-  minipass@7.1.2:
-    resolution:
-      {
-        integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==,
-      }
-    engines: { node: '>=16 || 14 >=14.17' }
+  mlly@1.8.2:
+    resolution: {integrity: sha512-d+ObxMQFmbt10sretNDytwt85VrbkhhUA/JBGm1MPaWJ65Cl4wOgLaB1NYvJSZ0Ef03MMEU/0xpPMXUIQ29UfA==}
 
   mri@1.2.0:
-    resolution:
-      {
-        integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==,
-      }
-    engines: { node: '>=4' }
-
-  ms@2.1.2:
-    resolution:
-      {
-        integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==,
-      }
+    resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
+    engines: {node: '>=4'}
 
   ms@2.1.3:
-    resolution:
-      {
-        integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==,
-      }
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  mute-stream@3.0.0:
+    resolution: {integrity: sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==}
+    engines: {node: ^20.17.0 || >=22.9.0}
 
   mz@2.7.0:
-    resolution:
-      {
-        integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==,
-      }
+    resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
 
-  nanoid@3.3.7:
-    resolution:
-      {
-        integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==,
-      }
-    engines: { node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1 }
+  nanoid@3.3.12:
+    resolution: {integrity: sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
-  natural-compare@1.4.0:
-    resolution:
-      {
-        integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==,
-      }
+  nanoid@3.3.16:
+    resolution: {integrity: sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
 
-  next@15.0.3:
-    resolution:
-      {
-        integrity: sha512-ontCbCRKJUIoivAdGB34yCaOcPgYXr9AAkV/IwqFfWWTXEPUgLYkSkqBhIk9KK7gGmgjc64B+RdoeIDM13Irnw==,
-      }
-    engines: { node: ^18.18.0 || ^19.8.0 || >= 20.0.0 }
+  neo-async@2.6.2:
+    resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
+
+  next@16.2.7:
+    resolution: {integrity: sha512-eMJxgjRzBaj3olkP4cBamHDXL79A8FC6u1GcsO1D1Tsx8bw/LLXUJCaoajVxtnhD3A1IJqIT8IcRJjgBIPJq4w==}
+    engines: {node: '>=20.9.0'}
     hasBin: true
     peerDependencies:
       '@opentelemetry/api': ^1.1.0
-      '@playwright/test': ^1.41.2
+      '@playwright/test': ^1.51.1
       babel-plugin-react-compiler: '*'
-      react: ^18.2.0 || 19.0.0-rc-66855b96-20241106
-      react-dom: ^18.2.0 || 19.0.0-rc-66855b96-20241106
+      react: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
+      react-dom: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
       sass: ^1.3.0
     peerDependenciesMeta:
       '@opentelemetry/api':
@@ -4654,336 +2937,113 @@ packages:
         optional: true
 
   node-addon-api@7.1.1:
-    resolution:
-      {
-        integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==,
-      }
+    resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
 
-  node-addon-api@8.2.2:
-    resolution:
-      {
-        integrity: sha512-9emqXAKhVoNrQ792nLI/wpzPpJ/bj/YXxW0CvAau1+RdGBcCRF1Dmz7719zgVsQNrzHl9Tzn3ImZ4qWFarWL0A==,
-      }
-    engines: { node: ^18 || ^20 || >= 21 }
+  node-addon-api@8.7.0:
+    resolution: {integrity: sha512-9MdFxmkKaOYVTV+XVRG8ArDwwQ77XIgIPyKASB1k3JPq3M8fGQQQE3YpMOrKm6g//Ktx8ivZr8xo1Qmtqub+GA==}
+    engines: {node: ^18 || ^20 || >= 21}
 
-  node-gyp-build@4.8.2:
-    resolution:
-      {
-        integrity: sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==,
-      }
+  node-forge@1.4.0:
+    resolution: {integrity: sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==}
+    engines: {node: '>= 6.13.0'}
+
+  node-gyp-build@4.8.4:
+    resolution: {integrity: sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==}
     hasBin: true
 
-  node-releases@2.0.18:
-    resolution:
-      {
-        integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==,
-      }
+  node-mock-http@1.0.4:
+    resolution: {integrity: sha512-8DY+kFsDkNXy1sJglUfuODx1/opAGJGyrTuFqEoN90oRc2Vk0ZbD4K2qmKXBBEhZQzdKHIVfEJpDU8Ak2NJEvQ==}
+
+  node-releases@2.0.46:
+    resolution: {integrity: sha512-GYVXHE2KnrzAfsAjl4uP++evGFCrAU1jta4ubEjIG7YWt/64Gqv66a30yKwWczVjA6j3bM4nBwH7Pk1JmDHaxQ==}
+    engines: {node: '>=18'}
 
   normalize-path@3.0.0:
-    resolution:
-      {
-        integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==,
-      }
-    engines: { node: '>=0.10.0' }
-
-  normalize-range@0.1.2:
-    resolution:
-      {
-        integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==,
-      }
-    engines: { node: '>=0.10.0' }
-
-  npm-run-path@4.0.1:
-    resolution:
-      {
-        integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==,
-      }
-    engines: { node: '>=8' }
-
-  npm-run-path@5.3.0:
-    resolution:
-      {
-        integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==,
-      }
-    engines: { node: ^12.20.0 || ^14.13.1 || >=16.0.0 }
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
 
   object-assign@4.1.1:
-    resolution:
-      {
-        integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
 
   object-hash@3.0.0:
-    resolution:
-      {
-        integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
+    engines: {node: '>= 6'}
 
-  object-inspect@1.13.2:
-    resolution:
-      {
-        integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==,
-      }
-    engines: { node: '>= 0.4' }
+  obug@2.1.1:
+    resolution: {integrity: sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==}
 
-  object-keys@1.1.1:
-    resolution:
-      {
-        integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==,
-      }
-    engines: { node: '>= 0.4' }
-
-  object.assign@4.1.5:
-    resolution:
-      {
-        integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  object.entries@1.1.8:
-    resolution:
-      {
-        integrity: sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  object.fromentries@2.0.8:
-    resolution:
-      {
-        integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  object.groupby@1.0.3:
-    resolution:
-      {
-        integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  object.values@1.2.0:
-    resolution:
-      {
-        integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  onetime@5.1.2:
-    resolution:
-      {
-        integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==,
-      }
-    engines: { node: '>=6' }
-
-  onetime@6.0.0:
-    resolution:
-      {
-        integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==,
-      }
-    engines: { node: '>=12' }
-
-  optionator@0.9.4:
-    resolution:
-      {
-        integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==,
-      }
-    engines: { node: '>= 0.8.0' }
-
-  p-limit@3.1.0:
-    resolution:
-      {
-        integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==,
-      }
-    engines: { node: '>=10' }
-
-  p-locate@5.0.0:
-    resolution:
-      {
-        integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==,
-      }
-    engines: { node: '>=10' }
-
-  package-json-from-dist@1.0.1:
-    resolution:
-      {
-        integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==,
-      }
+  obug@2.1.4:
+    resolution: {integrity: sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==}
+    engines: {node: '>=12.20.0'}
 
   package-up@5.0.0:
-    resolution:
-      {
-        integrity: sha512-MQEgDUvXCa3sGvqHg3pzHO8e9gqTCMPVrWUko3vPQGntwegmFo52mZb2abIVTjFnUcW0BcPz0D93jV5Cas1DWA==,
-      }
-    engines: { node: '>=18' }
-
-  parent-module@1.0.1:
-    resolution:
-      {
-        integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==,
-      }
-    engines: { node: '>=6' }
-
-  path-exists@4.0.0:
-    resolution:
-      {
-        integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==,
-      }
-    engines: { node: '>=8' }
-
-  path-key@3.1.1:
-    resolution:
-      {
-        integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==,
-      }
-    engines: { node: '>=8' }
-
-  path-key@4.0.0:
-    resolution:
-      {
-        integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-MQEgDUvXCa3sGvqHg3pzHO8e9gqTCMPVrWUko3vPQGntwegmFo52mZb2abIVTjFnUcW0BcPz0D93jV5Cas1DWA==}
+    engines: {node: '>=18'}
 
   path-parse@1.0.7:
-    resolution:
-      {
-        integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==,
-      }
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
-  path-scurry@1.11.1:
-    resolution:
-      {
-        integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==,
-      }
-    engines: { node: '>=16 || 14 >=14.18' }
-
-  path-type@4.0.0:
-    resolution:
-      {
-        integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==,
-      }
-    engines: { node: '>=8' }
-
-  path-type@5.0.0:
-    resolution:
-      {
-        integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==,
-      }
-    engines: { node: '>=12' }
-
-  pathe@1.1.2:
-    resolution:
-      {
-        integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==,
-      }
-
-  pathval@2.0.0:
-    resolution:
-      {
-        integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==,
-      }
-    engines: { node: '>= 14.16' }
+  pathe@2.0.3:
+    resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
 
   picocolors@1.1.1:
-    resolution:
-      {
-        integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==,
-      }
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
-  picomatch@2.3.1:
-    resolution:
-      {
-        integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==,
-      }
-    engines: { node: '>=8.6' }
+  picomatch@2.3.2:
+    resolution: {integrity: sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==}
+    engines: {node: '>=8.6'}
+
+  picomatch@4.0.4:
+    resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
+    engines: {node: '>=12'}
+
+  picomatch@4.0.5:
+    resolution: {integrity: sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==}
+    engines: {node: '>=12'}
 
   pify@2.3.0:
-    resolution:
-      {
-        integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
+    engines: {node: '>=0.10.0'}
 
-  pirates@4.0.6:
-    resolution:
-      {
-        integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==,
-      }
-    engines: { node: '>= 6' }
+  pirates@4.0.7:
+    resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==}
+    engines: {node: '>= 6'}
 
-  playwright-core@1.49.0:
-    resolution:
-      {
-        integrity: sha512-R+3KKTQF3npy5GTiKH/T+kdhoJfJojjHESR1YEWhYuEKRVfVaxH3+4+GvXE5xyCngCxhxnykk0Vlah9v8fs3jA==,
-      }
-    engines: { node: '>=18' }
+  pkg-types@1.3.1:
+    resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==}
+
+  playwright-core@1.62.1:
+    resolution: {integrity: sha512-wPYSwEBJY9GHraISXqyqtx0na0LpO3XEX7jNDhntbex7tzUS7kLnZsOlFruFJB4Hi/rhDMjXGqHewDZ68nYZVw==}
+    engines: {node: '>=20'}
     hasBin: true
 
-  playwright@1.49.0:
-    resolution:
-      {
-        integrity: sha512-eKpmys0UFDnfNb3vfsf8Vx2LEOtflgRebl0Im2eQQnYMA4Aqd+Zw8bEOB+7ZKvN76901mRnqdsiOGKxzVTbi7A==,
-      }
-    engines: { node: '>=18' }
+  playwright@1.62.1:
+    resolution: {integrity: sha512-0M+L3LAD8/nm554LOla9Ayx0j0tmFZ0FBcoQ7F1VuVHpM/XpiC8RcDzBQB8W5+hA8L22THxELzeF+2WcUzvcLg==}
+    engines: {node: '>=20'}
     hasBin: true
 
-  possible-typed-array-names@1.0.0:
-    resolution:
-      {
-        integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==,
-      }
-    engines: { node: '>= 0.4' }
-
   postcss-import@15.1.0:
-    resolution:
-      {
-        integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       postcss: ^8.0.0
 
-  postcss-import@16.1.0:
-    resolution:
-      {
-        integrity: sha512-7hsAZ4xGXl4MW+OKEWCnF6T5jqBw80/EE9aXg1r2yyn1RsVEU8EtKXbijEODa+rg7iih4bKf7vlvTGYR4CnPNg==,
-      }
-    engines: { node: '>=18.0.0' }
+  postcss-import@16.1.1:
+    resolution: {integrity: sha512-2xVS1NCZAfjtVdvXiyegxzJ447GyqCeEI5V7ApgQVOWnros1p5lGNovJNapwPpMombyFBfqDwt7AD3n2l0KOfQ==}
+    engines: {node: '>=18.0.0'}
     peerDependencies:
       postcss: ^8.0.0
 
-  postcss-js@4.0.1:
-    resolution:
-      {
-        integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==,
-      }
-    engines: { node: ^12 || ^14 || >= 16 }
+  postcss-js@4.1.0:
+    resolution: {integrity: sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==}
+    engines: {node: ^12 || ^14 || >= 16}
     peerDependencies:
       postcss: ^8.4.21
 
-  postcss-load-config@4.0.2:
-    resolution:
-      {
-        integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==,
-      }
-    engines: { node: '>= 14' }
-    peerDependencies:
-      postcss: '>=8.0.9'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      postcss:
-        optional: true
-      ts-node:
-        optional: true
-
   postcss-load-config@6.0.1:
-    resolution:
-      {
-        integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==,
-      }
-    engines: { node: '>= 18' }
+    resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==}
+    engines: {node: '>= 18'}
     peerDependencies:
       jiti: '>=1.21.0'
       postcss: '>=8.0.9'
@@ -5000,514 +3060,178 @@ packages:
         optional: true
 
   postcss-nested@6.2.0:
-    resolution:
-      {
-        integrity: sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==,
-      }
-    engines: { node: '>=12.0' }
+    resolution: {integrity: sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==}
+    engines: {node: '>=12.0'}
     peerDependencies:
       postcss: ^8.2.14
 
   postcss-selector-parser@6.0.10:
-    resolution:
-      {
-        integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==}
+    engines: {node: '>=4'}
 
   postcss-selector-parser@6.1.2:
-    resolution:
-      {
-        integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==}
+    engines: {node: '>=4'}
 
-  postcss-selector-parser@7.0.0:
-    resolution:
-      {
-        integrity: sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==,
-      }
-    engines: { node: '>=4' }
+  postcss-selector-parser@7.1.4:
+    resolution: {integrity: sha512-HeP7D2wyhkR+XaK6v4W8oRF62Dsz4flyuczALJp61GckGm42u1saSSJ/0auvcBqxs3jMRFEcPK34At/0JBKdOg==}
+    engines: {node: '>=4'}
 
   postcss-value-parser@4.2.0:
-    resolution:
-      {
-        integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==,
-      }
+    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
   postcss@8.4.31:
-    resolution:
-      {
-        integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==,
-      }
-    engines: { node: ^10 || ^12 || >=14 }
+    resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
+    engines: {node: ^10 || ^12 || >=14}
 
-  postcss@8.4.41:
-    resolution:
-      {
-        integrity: sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==,
-      }
-    engines: { node: ^10 || ^12 || >=14 }
+  postcss@8.5.16:
+    resolution: {integrity: sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==}
+    engines: {node: ^10 || ^12 || >=14}
 
-  postcss@8.4.47:
-    resolution:
-      {
-        integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==,
-      }
-    engines: { node: ^10 || ^12 || >=14 }
+  postcss@8.5.25:
+    resolution: {integrity: sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw==}
+    engines: {node: ^10 || ^12 || >=14}
 
-  postcss@8.4.49:
-    resolution:
-      {
-        integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==,
-      }
-    engines: { node: ^10 || ^12 || >=14 }
+  prettier-plugin-embed@0.5.1:
+    resolution: {integrity: sha512-2Ege8gIlLNTvHElUeU5XcFsD7/dbDXkQA6H9TczHSJAGxB58nNjjifk/dlRMS5E29eqQx/z+ToA4ZVMWzjME/A==}
 
-  prelude-ls@1.2.1:
-    resolution:
-      {
-        integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==,
-      }
-    engines: { node: '>= 0.8.0' }
-
-  prettier-plugin-embed@0.4.15:
-    resolution:
-      {
-        integrity: sha512-9pZVIp3bw2jw+Ge+iAMZ4j+sIVC9cPruZ93H2tj5Wa/3YDFDJ/uYyVWdUGfcFUnv28drhW2Bmome9xSGXsPKOw==,
-      }
-
-  prettier-plugin-organize-imports@4.0.0:
-    resolution:
-      {
-        integrity: sha512-vnKSdgv9aOlqKeEFGhf9SCBsTyzDSyScy1k7E0R1Uo4L0cTcOV7c1XQaT7jfXIOc/p08WLBfN2QUQA9zDSZMxA==,
-      }
+  prettier-plugin-organize-imports@4.3.0:
+    resolution: {integrity: sha512-FxFz0qFhyBsGdIsb697f/EkvHzi5SZOhWAjxcx2dLt+Q532bAlhswcXGYB1yzjZ69kW8UoadFBw7TyNwlq96Iw==}
     peerDependencies:
-      '@vue/language-plugin-pug': ^2.0.24
       prettier: '>=2.0'
       typescript: '>=2.9'
-      vue-tsc: ^2.0.24
+      vue-tsc: ^2.1.0 || 3
     peerDependenciesMeta:
-      '@vue/language-plugin-pug':
-        optional: true
       vue-tsc:
         optional: true
 
-  prettier@3.3.3:
-    resolution:
-      {
-        integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==,
-      }
-    engines: { node: '>=14' }
+  prettier@3.9.6:
+    resolution: {integrity: sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==}
+    engines: {node: '>=14'}
     hasBin: true
 
-  prop-types@15.8.1:
-    resolution:
-      {
-        integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==,
-      }
-
-  punycode@2.3.1:
-    resolution:
-      {
-        integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==,
-      }
-    engines: { node: '>=6' }
-
   queue-microtask@1.2.3:
-    resolution:
-      {
-        integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==,
-      }
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
-  react-dom@18.3.1:
-    resolution:
-      {
-        integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==,
-      }
+  radix3@1.1.2:
+    resolution: {integrity: sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==}
+
+  react-dom@19.2.6:
+    resolution: {integrity: sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g==}
     peerDependencies:
-      react: ^18.3.1
+      react: ^19.2.6
 
-  react-is@16.13.1:
-    resolution:
-      {
-        integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==,
-      }
+  react-dom@19.2.7:
+    resolution: {integrity: sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==}
+    peerDependencies:
+      react: ^19.2.7
 
-  react-refresh@0.14.2:
-    resolution:
-      {
-        integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==,
-      }
-    engines: { node: '>=0.10.0' }
+  react@19.2.6:
+    resolution: {integrity: sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==}
+    engines: {node: '>=0.10.0'}
 
-  react@18.3.1:
-    resolution:
-      {
-        integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==,
-      }
-    engines: { node: '>=0.10.0' }
+  react@19.2.7:
+    resolution: {integrity: sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==}
+    engines: {node: '>=0.10.0'}
 
   read-cache@1.0.0:
-    resolution:
-      {
-        integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==,
-      }
+    resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
 
   readdirp@3.6.0:
-    resolution:
-      {
-        integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==,
-      }
-    engines: { node: '>=8.10.0' }
+    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
+    engines: {node: '>=8.10.0'}
 
-  reflect.getprototypeof@1.0.6:
-    resolution:
-      {
-        integrity: sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==,
-      }
-    engines: { node: '>= 0.4' }
+  readdirp@4.1.2:
+    resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
+    engines: {node: '>= 14.18.0'}
 
-  regexp.prototype.flags@1.5.2:
-    resolution:
-      {
-        integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==,
-      }
-    engines: { node: '>= 0.4' }
-
-  resolve-from@4.0.0:
-    resolution:
-      {
-        integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==,
-      }
-    engines: { node: '>=4' }
+  require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
 
   resolve-from@5.0.0:
-    resolution:
-      {
-        integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
+    engines: {node: '>=8'}
 
-  resolve-pkg-maps@1.0.0:
-    resolution:
-      {
-        integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==,
-      }
-
-  resolve@1.22.8:
-    resolution:
-      {
-        integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==,
-      }
+  resolve@1.22.12:
+    resolution: {integrity: sha512-TyeJ1zif53BPfHootBGwPRYT1RUt6oGWsaQr8UyZW/eAm9bKoijtvruSDEmZHm92CwS9nj7/fWttqPCgzep8CA==}
+    engines: {node: '>= 0.4'}
     hasBin: true
 
-  resolve@2.0.0-next.5:
-    resolution:
-      {
-        integrity: sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==,
-      }
+  reusify@1.1.0:
+    resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==}
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+
+  rolldown@1.2.1:
+    resolution: {integrity: sha512-4FKJhg8d3OiyQOA6Q1Q0hoFFpW9/OoX+VsHzpECsdsIZoOArrAK90gl59YK/Z+gnDel45bgJZK03ozH/9bCqEw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
-  reusify@1.0.4:
-    resolution:
-      {
-        integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==,
-      }
-    engines: { iojs: '>=1.0.0', node: '>=0.10.0' }
-
-  rollup@4.20.0:
-    resolution:
-      {
-        integrity: sha512-6rbWBChcnSGzIlXeIdNIZTopKYad8ZG8ajhl78lGRLsI2rX8IkaotQhVas2Ma+GPxJav19wrSzvRvuiv0YKzWw==,
-      }
-    engines: { node: '>=18.0.0', npm: '>=8.0.0' }
-    hasBin: true
-
-  rollup@4.27.4:
-    resolution:
-      {
-        integrity: sha512-RLKxqHEMjh/RGLsDxAEsaLO3mWgyoU6x9w6n1ikAzet4B3gI2/3yP6PWY2p9QzRTh6MfEIXB3MwsOY0Iv3vNrw==,
-      }
-    engines: { node: '>=18.0.0', npm: '>=8.0.0' }
+  rollup@4.60.4:
+    resolution: {integrity: sha512-WHeFSbZYsPu3+bLoNRUuAO+wavNlocOPf3wSHTP7hcFKVnJeWsYlCDbr3mTS14FCizf9ccIxXA8sGL8zKeQN3g==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
   run-parallel@1.2.0:
-    resolution:
-      {
-        integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==,
-      }
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
 
-  safe-array-concat@1.1.2:
-    resolution:
-      {
-        integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==,
-      }
-    engines: { node: '>=0.4' }
+  safer-buffer@2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
-  safe-regex-test@1.0.3:
-    resolution:
-      {
-        integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==,
-      }
-    engines: { node: '>= 0.4' }
+  scheduler@0.27.0:
+    resolution: {integrity: sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==}
 
-  scheduler@0.23.2:
-    resolution:
-      {
-        integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==,
-      }
+  schema-utils@4.3.3:
+    resolution: {integrity: sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==}
+    engines: {node: '>= 10.13.0'}
 
-  semver@6.3.1:
-    resolution:
-      {
-        integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==,
-      }
+  semver@7.8.5:
+    resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==}
+    engines: {node: '>=10'}
     hasBin: true
 
-  semver@7.6.3:
-    resolution:
-      {
-        integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==,
-      }
-    engines: { node: '>=10' }
-    hasBin: true
-
-  set-function-length@1.2.2:
-    resolution:
-      {
-        integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==,
-      }
-    engines: { node: '>= 0.4' }
-
-  set-function-name@2.0.2:
-    resolution:
-      {
-        integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  sharp@0.33.5:
-    resolution:
-      {
-        integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==,
-      }
-    engines: { node: ^18.17.0 || ^20.3.0 || >=21.0.0 }
-
-  shebang-command@2.0.0:
-    resolution:
-      {
-        integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==,
-      }
-    engines: { node: '>=8' }
-
-  shebang-regex@3.0.0:
-    resolution:
-      {
-        integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==,
-      }
-    engines: { node: '>=8' }
-
-  side-channel@1.0.6:
-    resolution:
-      {
-        integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==,
-      }
-    engines: { node: '>= 0.4' }
+  sharp@0.34.5:
+    resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
 
   siginfo@2.0.0:
-    resolution:
-      {
-        integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==,
-      }
-
-  signal-exit@3.0.7:
-    resolution:
-      {
-        integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==,
-      }
+    resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
 
   signal-exit@4.1.0:
-    resolution:
-      {
-        integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==,
-      }
-    engines: { node: '>=14' }
-
-  simple-swizzle@0.2.2:
-    resolution:
-      {
-        integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==,
-      }
-
-  slash@3.0.0:
-    resolution:
-      {
-        integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
+    engines: {node: '>=14'}
 
   slash@5.1.0:
-    resolution:
-      {
-        integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==,
-      }
-    engines: { node: '>=14.16' }
-
-  source-map-js@1.2.0:
-    resolution:
-      {
-        integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==}
+    engines: {node: '>=14.16'}
 
   source-map-js@1.2.1:
-    resolution:
-      {
-        integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
+    engines: {node: '>=0.10.0'}
 
   source-map-support@0.5.21:
-    resolution:
-      {
-        integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==,
-      }
+    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
 
   source-map@0.6.1:
-    resolution:
-      {
-        integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
 
-  source-map@0.8.0-beta.0:
-    resolution:
-      {
-        integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==,
-      }
-    engines: { node: '>= 8' }
+  source-map@0.7.6:
+    resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==}
+    engines: {node: '>= 12'}
 
   stackback@0.0.2:
-    resolution:
-      {
-        integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==,
-      }
+    resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
 
-  std-env@3.7.0:
-    resolution:
-      {
-        integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==,
-      }
+  std-env@4.1.0:
+    resolution: {integrity: sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==}
 
-  streamsearch@1.1.0:
-    resolution:
-      {
-        integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==,
-      }
-    engines: { node: '>=10.0.0' }
-
-  string-width@4.2.3:
-    resolution:
-      {
-        integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==,
-      }
-    engines: { node: '>=8' }
-
-  string-width@5.1.2:
-    resolution:
-      {
-        integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==,
-      }
-    engines: { node: '>=12' }
-
-  string.prototype.includes@2.0.1:
-    resolution:
-      {
-        integrity: sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==,
-      }
-    engines: { node: '>= 0.4' }
-
-  string.prototype.matchall@4.0.11:
-    resolution:
-      {
-        integrity: sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==,
-      }
-    engines: { node: '>= 0.4' }
-
-  string.prototype.repeat@1.0.0:
-    resolution:
-      {
-        integrity: sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==,
-      }
-
-  string.prototype.trim@1.2.9:
-    resolution:
-      {
-        integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==,
-      }
-    engines: { node: '>= 0.4' }
-
-  string.prototype.trimend@1.0.8:
-    resolution:
-      {
-        integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==,
-      }
-
-  string.prototype.trimstart@1.0.8:
-    resolution:
-      {
-        integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==,
-      }
-    engines: { node: '>= 0.4' }
-
-  strip-ansi@6.0.1:
-    resolution:
-      {
-        integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==,
-      }
-    engines: { node: '>=8' }
-
-  strip-ansi@7.1.0:
-    resolution:
-      {
-        integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==,
-      }
-    engines: { node: '>=12' }
-
-  strip-bom@3.0.0:
-    resolution:
-      {
-        integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==,
-      }
-    engines: { node: '>=4' }
-
-  strip-final-newline@2.0.0:
-    resolution:
-      {
-        integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==,
-      }
-    engines: { node: '>=6' }
-
-  strip-final-newline@3.0.0:
-    resolution:
-      {
-        integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==,
-      }
-    engines: { node: '>=12' }
-
-  strip-json-comments@3.1.1:
-    resolution:
-      {
-        integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==,
-      }
-    engines: { node: '>=8' }
+  std-env@4.2.0:
+    resolution: {integrity: sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==}
 
   styled-jsx@5.1.6:
-    resolution:
-      {
-        integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==,
-      }
-    engines: { node: '>= 12.0.0' }
+    resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==}
+    engines: {node: '>= 12.0.0'}
     peerDependencies:
       '@babel/core': '*'
       babel-plugin-macros: '*'
@@ -5518,136 +3242,83 @@ packages:
       babel-plugin-macros:
         optional: true
 
-  sucrase@3.35.0:
-    resolution:
-      {
-        integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==,
-      }
-    engines: { node: '>=16 || 14 >=14.17' }
+  sucrase@3.35.1:
+    resolution: {integrity: sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==}
+    engines: {node: '>=16 || 14 >=14.17'}
     hasBin: true
 
-  supports-color@5.5.0:
-    resolution:
-      {
-        integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==,
-      }
-    engines: { node: '>=4' }
-
-  supports-color@7.2.0:
-    resolution:
-      {
-        integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==,
-      }
-    engines: { node: '>=8' }
+  supports-color@8.1.1:
+    resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
+    engines: {node: '>=10'}
 
   supports-preserve-symlinks-flag@1.0.0:
-    resolution:
-      {
-        integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
+    engines: {node: '>= 0.4'}
 
-  tailwindcss@3.4.14:
-    resolution:
-      {
-        integrity: sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==,
-      }
-    engines: { node: '>=14.0.0' }
+  tagged-tag@1.0.0:
+    resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==}
+    engines: {node: '>=20'}
+
+  tailwindcss@3.4.19:
+    resolution: {integrity: sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==}
+    engines: {node: '>=14.0.0'}
     hasBin: true
 
-  tapable@2.2.1:
-    resolution:
-      {
-        integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==,
-      }
-    engines: { node: '>=6' }
+  tapable@2.3.3:
+    resolution: {integrity: sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==}
+    engines: {node: '>=6'}
 
-  terser@5.31.6:
-    resolution:
-      {
-        integrity: sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==,
-      }
-    engines: { node: '>=10' }
+  terser@5.48.0:
+    resolution: {integrity: sha512-J/9An6vs9Us6wKRriSFXBWdRZapREHqFzdNUKk0pmu804EMR6dr6winwo7e5JDxN4xahxQsuysyYFwlwj4XN/Q==}
+    engines: {node: '>=10'}
     hasBin: true
 
   thenify-all@1.6.0:
-    resolution:
-      {
-        integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==,
-      }
-    engines: { node: '>=0.8' }
+    resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
+    engines: {node: '>=0.8'}
 
   thenify@3.3.1:
-    resolution:
-      {
-        integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==,
-      }
+    resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
 
-  tiny-jsonc@1.0.1:
-    resolution:
-      {
-        integrity: sha512-ik6BCxzva9DoiEfDX/li0L2cWKPPENYvixUprFdl3YPi4bZZUhDnNI9YUkacrv+uIG90dnxR5mNqaoD6UhD6Bw==,
-      }
+  tiny-jsonc@1.0.2:
+    resolution: {integrity: sha512-f5QDAfLq6zIVSyCZQZhhyl0QS6MvAyTxgz4X4x3+EoCktNWEYJ6PeoEA97fyb98njpBNNi88ybpD7m+BDFXaCw==}
 
   tinybench@2.9.0:
-    resolution:
-      {
-        integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==,
-      }
+    resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
 
-  tinypool@1.0.0:
-    resolution:
-      {
-        integrity: sha512-KIKExllK7jp3uvrNtvRBYBWBOAXSX8ZvoaD8T+7KB/QHIuoJW3Pmr60zucywjAlMb5TeXUkcs/MWeWLu0qvuAQ==,
-      }
-    engines: { node: ^18.0.0 || >=20.0.0 }
+  tinyclip@0.1.15:
+    resolution: {integrity: sha512-uo33abH+Ays0xYaDysoBt494Hb3hsEczMpcC0MwFl773pazORx4fmvKhclhR1wonUbB6vvpRsvVMwnhfqeMc+A==}
+    engines: {node: ^16.14.0 || >= 17.3.0}
 
-  tinyrainbow@1.2.0:
-    resolution:
-      {
-        integrity: sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==,
-      }
-    engines: { node: '>=14.0.0' }
+  tinyexec@0.3.2:
+    resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==}
 
-  tinyspy@3.0.0:
-    resolution:
-      {
-        integrity: sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==,
-      }
-    engines: { node: '>=14.0.0' }
+  tinyexec@1.1.2:
+    resolution: {integrity: sha512-dAqSqE/RabpBKI8+h26GfLq6Vb3JVXs30XYQjdMjaj/c2tS8IYYMbIzP599KtRj7c57/wYApb3QjgRgXmrCukA==}
+    engines: {node: '>=18'}
 
-  to-fast-properties@2.0.0:
-    resolution:
-      {
-        integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==,
-      }
-    engines: { node: '>=4' }
+  tinyglobby@0.2.16:
+    resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==}
+    engines: {node: '>=12.0.0'}
+
+  tinyglobby@0.2.17:
+    resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==}
+    engines: {node: '>=12.0.0'}
+
+  tinyrainbow@3.1.0:
+    resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==}
+    engines: {node: '>=14.0.0'}
 
   to-regex-range@5.0.1:
-    resolution:
-      {
-        integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==,
-      }
-    engines: { node: '>=8.0' }
-
-  tr46@1.0.1:
-    resolution:
-      {
-        integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==,
-      }
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
 
   tree-kill@1.2.2:
-    resolution:
-      {
-        integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==,
-      }
+    resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
     hasBin: true
 
   tree-sitter-javascript@0.23.1:
-    resolution:
-      {
-        integrity: sha512-/bnhbrTD9frUYHQTiYnPcxyHORIw157ERBa6dqzaKxvR/x3PC4Yzd+D1pZIMS6zNg2v3a8BZ0oK7jHqsQo9fWA==,
-      }
+    resolution: {integrity: sha512-/bnhbrTD9frUYHQTiYnPcxyHORIw157ERBa6dqzaKxvR/x3PC4Yzd+D1pZIMS6zNg2v3a8BZ0oK7jHqsQo9fWA==}
     peerDependencies:
       tree-sitter: ^0.21.1
     peerDependenciesMeta:
@@ -5655,55 +3326,25 @@ packages:
         optional: true
 
   tree-sitter-typescript@0.23.2:
-    resolution:
-      {
-        integrity: sha512-e04JUUKxTT53/x3Uq1zIL45DoYKVfHH4CZqwgZhPg5qYROl5nQjV+85ruFzFGZxu+QeFVbRTPDRnqL9UbU4VeA==,
-      }
+    resolution: {integrity: sha512-e04JUUKxTT53/x3Uq1zIL45DoYKVfHH4CZqwgZhPg5qYROl5nQjV+85ruFzFGZxu+QeFVbRTPDRnqL9UbU4VeA==}
     peerDependencies:
       tree-sitter: ^0.21.0
     peerDependenciesMeta:
       tree-sitter:
         optional: true
 
-  tree-sitter@0.22.1:
-    resolution:
-      {
-        integrity: sha512-gRO+jk2ljxZlIn20QRskIvpLCMtzuLl5T0BY6L9uvPYD17uUrxlxWkvYCiVqED2q2q7CVtY52Uex4WcYo2FEXw==,
-      }
-
-  ts-api-utils@1.3.0:
-    resolution:
-      {
-        integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==,
-      }
-    engines: { node: '>=16' }
-    peerDependencies:
-      typescript: '>=4.2.0'
+  tree-sitter@0.25.1:
+    resolution: {integrity: sha512-mrcEdkYtHfrK1A6fs3O6FxkBo0Qig5XUXqHhxUOQu0bmPo00QF4XaSx4edpazdHwxnSCjlGKGgIqWdaN4dvTLA==}
 
   ts-interface-checker@0.1.13:
-    resolution:
-      {
-        integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==,
-      }
+    resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
 
-  tsconfig-paths@3.15.0:
-    resolution:
-      {
-        integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==,
-      }
+  tslib@2.8.1:
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
-  tslib@2.8.0:
-    resolution:
-      {
-        integrity: sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==,
-      }
-
-  tsup@8.2.4:
-    resolution:
-      {
-        integrity: sha512-akpCPePnBnC/CXgRrcy72ZSntgIEUa1jN0oJbbvpALWKNOz1B7aM+UVDWGRGIO/T/PZugAESWDJUAb5FD48o8Q==,
-      }
-    engines: { node: '>=18' }
+  tsup@8.5.1:
+    resolution: {integrity: sha512-xtgkqwdhpKWr3tKPmCkvYmS9xnQK3m3XgxZHwSUjvfTjp7YfXe5tT3GgWi0F2N+ZSMsOeWeZFh7ZZFg5iPhing==}
+    engines: {node: '>=18'}
     hasBin: true
     peerDependencies:
       '@microsoft/api-extractor': ^7.36.0
@@ -5720,246 +3361,90 @@ packages:
       typescript:
         optional: true
 
-  tsx@4.19.1:
-    resolution:
-      {
-        integrity: sha512-0flMz1lh74BR4wOvBjuh9olbnwqCPc35OOlfyzHba0Dc+QNUeWX/Gq2YTbnwcWPO3BMd8fkzRVrHcsR+a7z7rA==,
-      }
-    engines: { node: '>=18.0.0' }
+  turbo@2.10.8:
+    resolution: {integrity: sha512-9+8YX5QOkGXzZxcIykTHgaooRHGMWO+jfdyRK0o+rN0U7hBIig2MrJ8r/aNzIPDPhdA73SGb0O+tIztaModTMg==}
     hasBin: true
 
-  turbo-darwin-64@2.2.3:
-    resolution:
-      {
-        integrity: sha512-Rcm10CuMKQGcdIBS3R/9PMeuYnv6beYIHqfZFeKWVYEWH69sauj4INs83zKMTUiZJ3/hWGZ4jet9AOwhsssLyg==,
-      }
-    cpu: [x64]
-    os: [darwin]
+  typanion@3.14.0:
+    resolution: {integrity: sha512-ZW/lVMRabETuYCd9O9ZvMhAh8GslSqaUjxmK/JLPCh6l73CvLBiuXswj/+7LdnWOgYsQ130FqLzFz5aGT4I3Ug==}
 
-  turbo-darwin-arm64@2.2.3:
-    resolution:
-      {
-        integrity: sha512-+EIMHkuLFqUdJYsA3roj66t9+9IciCajgj+DVek+QezEdOJKcRxlvDOS2BUaeN8kEzVSsNiAGnoysFWYw4K0HA==,
-      }
-    cpu: [arm64]
-    os: [darwin]
+  type-fest@5.6.0:
+    resolution: {integrity: sha512-8ZiHFm91orbSAe2PSAiSVBVko18pbhbiB3U9GglSzF/zCGkR+rxpHx6sEMCUm4kxY4LjDIUGgCfUMtwfZfjfUA==}
+    engines: {node: '>=20'}
 
-  turbo-linux-64@2.2.3:
-    resolution:
-      {
-        integrity: sha512-UBhJCYnqtaeOBQLmLo8BAisWbc9v9daL9G8upLR+XGj6vuN/Nz6qUAhverN4Pyej1g4Nt1BhROnj6GLOPYyqxQ==,
-      }
-    cpu: [x64]
-    os: [linux]
-
-  turbo-linux-arm64@2.2.3:
-    resolution:
-      {
-        integrity: sha512-hJYT9dN06XCQ3jBka/EWvvAETnHRs3xuO/rb5bESmDfG+d9yQjeTMlhRXKrr4eyIMt6cLDt1LBfyi+6CQ+VAwQ==,
-      }
-    cpu: [arm64]
-    os: [linux]
-
-  turbo-windows-64@2.2.3:
-    resolution:
-      {
-        integrity: sha512-NPrjacrZypMBF31b4HE4ROg4P3nhMBPHKS5WTpMwf7wydZ8uvdEHpESVNMOtqhlp857zbnKYgP+yJF30H3N2dQ==,
-      }
-    cpu: [x64]
-    os: [win32]
-
-  turbo-windows-arm64@2.2.3:
-    resolution:
-      {
-        integrity: sha512-fnNrYBCqn6zgKPKLHu4sOkihBI/+0oYFr075duRxqUZ+1aLWTAGfHZLgjVeLh3zR37CVzuerGIPWAEkNhkWEIw==,
-      }
-    cpu: [arm64]
-    os: [win32]
-
-  turbo@2.2.3:
-    resolution:
-      {
-        integrity: sha512-5lDvSqIxCYJ/BAd6rQGK/AzFRhBkbu4JHVMLmGh/hCb7U3CqSnr5Tjwfy9vc+/5wG2DJ6wttgAaA7MoCgvBKZQ==,
-      }
+  typescript@5.9.3:
+    resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
+    engines: {node: '>=14.17'}
     hasBin: true
 
-  type-check@0.4.0:
-    resolution:
-      {
-        integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==,
-      }
-    engines: { node: '>= 0.8.0' }
-
-  type-fest@4.24.0:
-    resolution:
-      {
-        integrity: sha512-spAaHzc6qre0TlZQQ2aA/nGMe+2Z/wyGk5Z+Ru2VUfdNwT6kWO6TjevOlpebsATEG1EIQ2sOiDszud3lO5mt/Q==,
-      }
-    engines: { node: '>=16' }
-
-  typed-array-buffer@1.0.2:
-    resolution:
-      {
-        integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==,
-      }
-    engines: { node: '>= 0.4' }
-
-  typed-array-byte-length@1.0.1:
-    resolution:
-      {
-        integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==,
-      }
-    engines: { node: '>= 0.4' }
-
-  typed-array-byte-offset@1.0.2:
-    resolution:
-      {
-        integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==,
-      }
-    engines: { node: '>= 0.4' }
-
-  typed-array-length@1.0.6:
-    resolution:
-      {
-        integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==,
-      }
-    engines: { node: '>= 0.4' }
-
-  typescript@5.5.4:
-    resolution:
-      {
-        integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==,
-      }
-    engines: { node: '>=14.17' }
+  typescript@6.0.3:
+    resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==}
+    engines: {node: '>=14.17'}
     hasBin: true
 
-  typescript@5.6.3:
-    resolution:
-      {
-        integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==,
-      }
-    engines: { node: '>=14.17' }
+  ufo@1.6.4:
+    resolution: {integrity: sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==}
+
+  uncrypto@0.1.3:
+    resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==}
+
+  undici-types@6.21.0:
+    resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
+
+  undici-types@7.24.6:
+    resolution: {integrity: sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==}
+
+  unicorn-magic@0.4.0:
+    resolution: {integrity: sha512-wH590V9VNgYH9g3lH9wWjTrUoKsjLF6sGLjhR4sH1LWpLmCOH0Zf7PukhDA8BiS7KHe4oPNkcTHqYkj7SOGUOw==}
+    engines: {node: '>=20'}
+
+  universal-user-agent@7.0.3:
+    resolution: {integrity: sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==}
+
+  untun@0.2.2:
+    resolution: {integrity: sha512-+NnOJcSiEtYsVgJmXUzQbJeRAFXJC4yPJYuh6kF9B0Rm6zunXcs/3GZOTllyocSbUDIxD6Bj7e/4ATw7sph1Sw==}
     hasBin: true
 
-  unbox-primitive@1.0.2:
-    resolution:
-      {
-        integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==,
-      }
-
-  undici-types@5.26.5:
-    resolution:
-      {
-        integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==,
-      }
-
-  unicorn-magic@0.1.0:
-    resolution:
-      {
-        integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==,
-      }
-    engines: { node: '>=18' }
-
-  update-browserslist-db@1.1.0:
-    resolution:
-      {
-        integrity: sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==,
-      }
+  update-browserslist-db@1.2.3:
+    resolution: {integrity: sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==}
     hasBin: true
     peerDependencies:
       browserslist: '>= 4.21.0'
 
-  update-browserslist-db@1.1.1:
-    resolution:
-      {
-        integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==,
-      }
-    hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
-
-  uri-js@4.4.1:
-    resolution:
-      {
-        integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==,
-      }
+  uqr@0.1.3:
+    resolution: {integrity: sha512-0rjE8iEJe4YmT9TOhwsZtqCMRLc5DXZUI2UEYUUg63ikBkqqE5EYWaI0etFe/5KUcmcYwLih2RND1kq+hrUJXA==}
 
   util-deprecate@1.0.2:
-    resolution:
-      {
-        integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==,
-      }
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
-  vite-node@2.0.5:
-    resolution:
-      {
-        integrity: sha512-LdsW4pxj0Ot69FAoXZ1yTnA9bjGohr2yNBU7QKRxpz8ITSkhuDl6h3zS/tvgz4qrNjeRnvrWeXQ8ZF7Um4W00Q==,
-      }
-    engines: { node: ^18.0.0 || >=20.0.0 }
-    hasBin: true
-
-  vite@5.4.0:
-    resolution:
-      {
-        integrity: sha512-5xokfMX0PIiwCMCMb9ZJcMyh5wbBun0zUzKib+L65vAZ8GY9ePZMXxFrHbr/Kyll2+LSCY7xtERPpxkBDKngwg==,
-      }
-    engines: { node: ^18.0.0 || >=20.0.0 }
+  vite@8.2.0:
+    resolution: {integrity: sha512-pn+CFpM0lwDeKwmOq1ZaBK/9sjorZcgqxki6MbY/jPEVd9vichIlmlD4HmQ5wdP5EgqQCFRaACBxMC7uEGc6lQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
-      '@types/node': ^18.0.0 || >=20.0.0
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      sass-embedded: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      sass-embedded:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-
-  vite@6.0.0:
-    resolution:
-      {
-        integrity: sha512-Q2+5yQV79EdnpbNxjD3/QHVMCBaQ3Kpd4/uL51UGuh38bIIM+s4o3FqyCzRvTRwFb+cWIUeZvaWwS9y2LD2qeQ==,
-      }
-    engines: { node: ^18.0.0 || ^20.0.0 || >=22.0.0 }
-    hasBin: true
-    peerDependencies:
-      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
+      '@types/node': ^20.19.0 || >=22.12.0
+      '@vitejs/devtools': ^0.4.0
+      esbuild: ^0.27.0 || ^0.28.0
       jiti: '>=1.21.0'
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      sass-embedded: '*'
-      stylus: '*'
-      sugarss: '*'
+      less: ^4.0.0
+      sass: ^1.70.0
+      sass-embedded: ^1.70.0
+      stylus: '>=0.54.8'
+      sugarss: ^5.0.0
       terser: ^5.16.0
       tsx: ^4.8.1
       yaml: ^2.4.2
     peerDependenciesMeta:
       '@types/node':
         optional: true
+      '@vitejs/devtools':
+        optional: true
+      esbuild:
+        optional: true
       jiti:
         optional: true
       less:
         optional: true
-      lightningcss:
-        optional: true
       sass:
         optional: true
       sass-embedded:
@@ -5975,26 +3460,39 @@ packages:
       yaml:
         optional: true
 
-  vitest@2.0.5:
-    resolution:
-      {
-        integrity: sha512-8GUxONfauuIdeSl5f9GTgVEpg5BTOlplET4WEDaeY2QBiN8wSm68vxN/tb5z405OwppfoCavnwXafiaYBC/xOA==,
-      }
-    engines: { node: ^18.0.0 || >=20.0.0 }
+  vitest@4.1.10:
+    resolution: {integrity: sha512-R9jUTe5S4Qb0HCd4TNqpC7oGcrMssMRGXLW80ubjWsW9VH5GF8y1Y0SFLY9AbqSk6nt0PnOx4H4WNJYZ13GUPw==}
+    engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
-      '@types/node': ^18.0.0 || >=20.0.0
-      '@vitest/browser': 2.0.5
-      '@vitest/ui': 2.0.5
+      '@opentelemetry/api': ^1.9.0
+      '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
+      '@vitest/browser-playwright': 4.1.10
+      '@vitest/browser-preview': 4.1.10
+      '@vitest/browser-webdriverio': 4.1.10
+      '@vitest/coverage-istanbul': 4.1.10
+      '@vitest/coverage-v8': 4.1.10
+      '@vitest/ui': 4.1.10
       happy-dom: '*'
       jsdom: '*'
+      vite: ^6.0.0 || ^7.0.0 || ^8.0.0
     peerDependenciesMeta:
       '@edge-runtime/vm':
         optional: true
+      '@opentelemetry/api':
+        optional: true
       '@types/node':
         optional: true
-      '@vitest/browser':
+      '@vitest/browser-playwright':
+        optional: true
+      '@vitest/browser-preview':
+        optional: true
+      '@vitest/browser-webdriverio':
+        optional: true
+      '@vitest/coverage-istanbul':
+        optional: true
+      '@vitest/coverage-v8':
         optional: true
       '@vitest/ui':
         optional: true
@@ -6003,716 +3501,704 @@ packages:
       jsdom:
         optional: true
 
-  webidl-conversions@4.0.2:
-    resolution:
-      {
-        integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==,
-      }
+  watchpack@2.5.2:
+    resolution: {integrity: sha512-6i/00NBjP4yGPs+caKSyRfpTF/8Torsu0MOW3mMzIbhgISFder8i7xbqgHlLMwJrdiN8ndBV3UA1/AfzPSr+jg==}
+    engines: {node: '>=10.13.0'}
 
-  whatwg-url@7.1.0:
-    resolution:
-      {
-        integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==,
-      }
+  webpack-sources@3.5.1:
+    resolution: {integrity: sha512-jyuiGJdtvY434z5bUZrjz67v76/ePNvFZTp9Mdz29IlH4+GPsgyGjiv0fKI+M7BdkU6ADjulUcKAd3tUK3WlEw==}
+    engines: {node: '>=10.13.0'}
 
-  which-boxed-primitive@1.0.2:
-    resolution:
-      {
-        integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==,
-      }
-
-  which-builtin-type@1.1.4:
-    resolution:
-      {
-        integrity: sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==,
-      }
-    engines: { node: '>= 0.4' }
-
-  which-collection@1.0.2:
-    resolution:
-      {
-        integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==,
-      }
-    engines: { node: '>= 0.4' }
-
-  which-typed-array@1.1.15:
-    resolution:
-      {
-        integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==,
-      }
-    engines: { node: '>= 0.4' }
-
-  which@2.0.2:
-    resolution:
-      {
-        integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==,
-      }
-    engines: { node: '>= 8' }
+  webpack@5.109.2:
+    resolution: {integrity: sha512-U9/cvLzxObKNEZ9+TtdqrHM5/9z3lgl2c+c4BzbqGxFQvQvBAq87yql5A8pQ+rrMbS496MZJeF5enVBndIy2hw==}
+    engines: {node: '>=10.13.0'}
     hasBin: true
+    peerDependencies:
+      webpack-cli: '*'
+    peerDependenciesMeta:
+      webpack-cli:
+        optional: true
 
   why-is-node-running@2.3.0:
-    resolution:
-      {
-        integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
+    engines: {node: '>=8'}
     hasBin: true
 
-  word-wrap@1.2.5:
-    resolution:
-      {
-        integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==,
-      }
-    engines: { node: '>=0.10.0' }
-
-  wrap-ansi@7.0.0:
-    resolution:
-      {
-        integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==,
-      }
-    engines: { node: '>=10' }
-
-  wrap-ansi@8.1.0:
-    resolution:
-      {
-        integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==,
-      }
-    engines: { node: '>=12' }
-
-  yallist@3.1.1:
-    resolution:
-      {
-        integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==,
-      }
-
-  yaml@2.6.0:
-    resolution:
-      {
-        integrity: sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==,
-      }
-    engines: { node: '>= 14' }
+  yaml@2.9.0:
+    resolution: {integrity: sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==}
+    engines: {node: '>= 14.6'}
     hasBin: true
 
-  yocto-queue@0.1.0:
-    resolution:
-      {
-        integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==,
-      }
-    engines: { node: '>=10' }
-
 snapshots:
+
   '@alloc/quick-lru@5.2.0': {}
 
-  '@ampproject/remapping@2.3.0':
+  '@emnapi/core@1.10.0':
     dependencies:
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
+      '@emnapi/wasi-threads': 1.2.1
+      tslib: 2.8.1
+    optional: true
 
-  '@babel/code-frame@7.24.7':
+  '@emnapi/core@1.11.3':
     dependencies:
-      '@babel/highlight': 7.24.7
-      picocolors: 1.1.1
+      '@emnapi/wasi-threads': 1.2.3
+      tslib: 2.8.1
 
-  '@babel/compat-data@7.25.2': {}
-
-  '@babel/core@7.25.2':
+  '@emnapi/core@2.0.0-alpha.3':
     dependencies:
-      '@ampproject/remapping': 2.3.0
-      '@babel/code-frame': 7.24.7
-      '@babel/generator': 7.25.0
-      '@babel/helper-compilation-targets': 7.25.2
-      '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2)
-      '@babel/helpers': 7.25.0
-      '@babel/parser': 7.25.3
-      '@babel/template': 7.25.0
-      '@babel/traverse': 7.25.3
-      '@babel/types': 7.25.2
-      convert-source-map: 2.0.0
-      debug: 4.3.7
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      semver: 6.3.1
-    transitivePeerDependencies:
-      - supports-color
+      '@emnapi/wasi-threads': 2.0.1
+      tslib: 2.8.1
+    optional: true
 
-  '@babel/generator@7.25.0':
+  '@emnapi/runtime@1.10.0':
     dependencies:
-      '@babel/types': 7.25.2
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
-      jsesc: 2.5.2
+      tslib: 2.8.1
+    optional: true
 
-  '@babel/helper-compilation-targets@7.25.2':
+  '@emnapi/runtime@1.11.3':
     dependencies:
-      '@babel/compat-data': 7.25.2
-      '@babel/helper-validator-option': 7.24.8
-      browserslist: 4.23.2
-      lru-cache: 5.1.1
-      semver: 6.3.1
+      tslib: 2.8.1
 
-  '@babel/helper-module-imports@7.24.7':
+  '@emnapi/runtime@2.0.0-alpha.3':
     dependencies:
-      '@babel/traverse': 7.25.3
-      '@babel/types': 7.25.2
-    transitivePeerDependencies:
-      - supports-color
+      tslib: 2.8.1
+    optional: true
 
-  '@babel/helper-module-transforms@7.25.2(@babel/core@7.25.2)':
+  '@emnapi/wasi-threads@1.2.1':
     dependencies:
-      '@babel/core': 7.25.2
-      '@babel/helper-module-imports': 7.24.7
-      '@babel/helper-simple-access': 7.24.7
-      '@babel/helper-validator-identifier': 7.24.7
-      '@babel/traverse': 7.25.3
-    transitivePeerDependencies:
-      - supports-color
+      tslib: 2.8.1
+    optional: true
 
-  '@babel/helper-plugin-utils@7.24.8': {}
-
-  '@babel/helper-simple-access@7.24.7':
+  '@emnapi/wasi-threads@1.2.3':
     dependencies:
-      '@babel/traverse': 7.25.3
-      '@babel/types': 7.25.2
-    transitivePeerDependencies:
-      - supports-color
+      tslib: 2.8.1
 
-  '@babel/helper-string-parser@7.24.8': {}
-
-  '@babel/helper-validator-identifier@7.24.7': {}
-
-  '@babel/helper-validator-option@7.24.8': {}
-
-  '@babel/helpers@7.25.0':
+  '@emnapi/wasi-threads@2.0.1':
     dependencies:
-      '@babel/template': 7.25.0
-      '@babel/types': 7.25.2
-
-  '@babel/highlight@7.24.7':
-    dependencies:
-      '@babel/helper-validator-identifier': 7.24.7
-      chalk: 2.4.2
-      js-tokens: 4.0.0
-      picocolors: 1.1.1
-
-  '@babel/parser@7.25.3':
-    dependencies:
-      '@babel/types': 7.25.2
-
-  '@babel/plugin-transform-react-jsx-self@7.24.7(@babel/core@7.25.2)':
-    dependencies:
-      '@babel/core': 7.25.2
-      '@babel/helper-plugin-utils': 7.24.8
-
-  '@babel/plugin-transform-react-jsx-source@7.24.7(@babel/core@7.25.2)':
-    dependencies:
-      '@babel/core': 7.25.2
-      '@babel/helper-plugin-utils': 7.24.8
-
-  '@babel/template@7.25.0':
-    dependencies:
-      '@babel/code-frame': 7.24.7
-      '@babel/parser': 7.25.3
-      '@babel/types': 7.25.2
-
-  '@babel/traverse@7.25.3':
-    dependencies:
-      '@babel/code-frame': 7.24.7
-      '@babel/generator': 7.25.0
-      '@babel/parser': 7.25.3
-      '@babel/template': 7.25.0
-      '@babel/types': 7.25.2
-      debug: 4.3.7
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-
-  '@babel/types@7.25.2':
-    dependencies:
-      '@babel/helper-string-parser': 7.24.8
-      '@babel/helper-validator-identifier': 7.24.7
-      to-fast-properties: 2.0.0
-
-  '@emnapi/runtime@1.3.1':
-    dependencies:
-      tslib: 2.8.0
-    optional: true
-
-  '@esbuild/aix-ppc64@0.21.5':
-    optional: true
-
-  '@esbuild/aix-ppc64@0.23.0':
-    optional: true
-
-  '@esbuild/aix-ppc64@0.23.1':
-    optional: true
-
-  '@esbuild/aix-ppc64@0.24.0':
-    optional: true
-
-  '@esbuild/android-arm64@0.21.5':
-    optional: true
-
-  '@esbuild/android-arm64@0.23.0':
-    optional: true
-
-  '@esbuild/android-arm64@0.23.1':
-    optional: true
-
-  '@esbuild/android-arm64@0.24.0':
-    optional: true
-
-  '@esbuild/android-arm@0.21.5':
-    optional: true
-
-  '@esbuild/android-arm@0.23.0':
-    optional: true
-
-  '@esbuild/android-arm@0.23.1':
-    optional: true
-
-  '@esbuild/android-arm@0.24.0':
-    optional: true
-
-  '@esbuild/android-x64@0.21.5':
-    optional: true
-
-  '@esbuild/android-x64@0.23.0':
-    optional: true
-
-  '@esbuild/android-x64@0.23.1':
-    optional: true
-
-  '@esbuild/android-x64@0.24.0':
-    optional: true
-
-  '@esbuild/darwin-arm64@0.21.5':
-    optional: true
-
-  '@esbuild/darwin-arm64@0.23.0':
-    optional: true
-
-  '@esbuild/darwin-arm64@0.23.1':
-    optional: true
-
-  '@esbuild/darwin-arm64@0.24.0':
-    optional: true
-
-  '@esbuild/darwin-x64@0.21.5':
-    optional: true
-
-  '@esbuild/darwin-x64@0.23.0':
-    optional: true
-
-  '@esbuild/darwin-x64@0.23.1':
-    optional: true
-
-  '@esbuild/darwin-x64@0.24.0':
-    optional: true
-
-  '@esbuild/freebsd-arm64@0.21.5':
-    optional: true
-
-  '@esbuild/freebsd-arm64@0.23.0':
-    optional: true
-
-  '@esbuild/freebsd-arm64@0.23.1':
-    optional: true
-
-  '@esbuild/freebsd-arm64@0.24.0':
-    optional: true
-
-  '@esbuild/freebsd-x64@0.21.5':
-    optional: true
-
-  '@esbuild/freebsd-x64@0.23.0':
-    optional: true
-
-  '@esbuild/freebsd-x64@0.23.1':
-    optional: true
-
-  '@esbuild/freebsd-x64@0.24.0':
-    optional: true
-
-  '@esbuild/linux-arm64@0.21.5':
-    optional: true
-
-  '@esbuild/linux-arm64@0.23.0':
-    optional: true
-
-  '@esbuild/linux-arm64@0.23.1':
-    optional: true
-
-  '@esbuild/linux-arm64@0.24.0':
-    optional: true
-
-  '@esbuild/linux-arm@0.21.5':
-    optional: true
-
-  '@esbuild/linux-arm@0.23.0':
-    optional: true
-
-  '@esbuild/linux-arm@0.23.1':
-    optional: true
-
-  '@esbuild/linux-arm@0.24.0':
-    optional: true
-
-  '@esbuild/linux-ia32@0.21.5':
-    optional: true
-
-  '@esbuild/linux-ia32@0.23.0':
-    optional: true
-
-  '@esbuild/linux-ia32@0.23.1':
-    optional: true
-
-  '@esbuild/linux-ia32@0.24.0':
-    optional: true
-
-  '@esbuild/linux-loong64@0.21.5':
-    optional: true
-
-  '@esbuild/linux-loong64@0.23.0':
-    optional: true
-
-  '@esbuild/linux-loong64@0.23.1':
-    optional: true
-
-  '@esbuild/linux-loong64@0.24.0':
-    optional: true
-
-  '@esbuild/linux-mips64el@0.21.5':
-    optional: true
-
-  '@esbuild/linux-mips64el@0.23.0':
-    optional: true
-
-  '@esbuild/linux-mips64el@0.23.1':
-    optional: true
-
-  '@esbuild/linux-mips64el@0.24.0':
-    optional: true
-
-  '@esbuild/linux-ppc64@0.21.5':
+      tslib: 2.8.1
     optional: true
 
-  '@esbuild/linux-ppc64@0.23.0':
+  '@esbuild/aix-ppc64@0.27.7':
     optional: true
 
-  '@esbuild/linux-ppc64@0.23.1':
+  '@esbuild/android-arm64@0.27.7':
     optional: true
 
-  '@esbuild/linux-ppc64@0.24.0':
+  '@esbuild/android-arm@0.27.7':
     optional: true
 
-  '@esbuild/linux-riscv64@0.21.5':
+  '@esbuild/android-x64@0.27.7':
     optional: true
 
-  '@esbuild/linux-riscv64@0.23.0':
+  '@esbuild/darwin-arm64@0.27.7':
     optional: true
 
-  '@esbuild/linux-riscv64@0.23.1':
+  '@esbuild/darwin-x64@0.27.7':
     optional: true
 
-  '@esbuild/linux-riscv64@0.24.0':
+  '@esbuild/freebsd-arm64@0.27.7':
     optional: true
 
-  '@esbuild/linux-s390x@0.21.5':
+  '@esbuild/freebsd-x64@0.27.7':
     optional: true
 
-  '@esbuild/linux-s390x@0.23.0':
+  '@esbuild/linux-arm64@0.27.7':
     optional: true
 
-  '@esbuild/linux-s390x@0.23.1':
+  '@esbuild/linux-arm@0.27.7':
     optional: true
 
-  '@esbuild/linux-s390x@0.24.0':
+  '@esbuild/linux-ia32@0.27.7':
     optional: true
 
-  '@esbuild/linux-x64@0.21.5':
+  '@esbuild/linux-loong64@0.27.7':
     optional: true
 
-  '@esbuild/linux-x64@0.23.0':
+  '@esbuild/linux-mips64el@0.27.7':
     optional: true
 
-  '@esbuild/linux-x64@0.23.1':
+  '@esbuild/linux-ppc64@0.27.7':
     optional: true
 
-  '@esbuild/linux-x64@0.24.0':
+  '@esbuild/linux-riscv64@0.27.7':
     optional: true
 
-  '@esbuild/netbsd-x64@0.21.5':
+  '@esbuild/linux-s390x@0.27.7':
     optional: true
 
-  '@esbuild/netbsd-x64@0.23.0':
+  '@esbuild/linux-x64@0.27.7':
     optional: true
 
-  '@esbuild/netbsd-x64@0.23.1':
+  '@esbuild/netbsd-arm64@0.27.7':
     optional: true
 
-  '@esbuild/netbsd-x64@0.24.0':
+  '@esbuild/netbsd-x64@0.27.7':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.23.0':
+  '@esbuild/openbsd-arm64@0.27.7':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.23.1':
+  '@esbuild/openbsd-x64@0.27.7':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.24.0':
+  '@esbuild/openharmony-arm64@0.27.7':
     optional: true
 
-  '@esbuild/openbsd-x64@0.21.5':
+  '@esbuild/sunos-x64@0.27.7':
     optional: true
 
-  '@esbuild/openbsd-x64@0.23.0':
+  '@esbuild/win32-arm64@0.27.7':
     optional: true
 
-  '@esbuild/openbsd-x64@0.23.1':
+  '@esbuild/win32-ia32@0.27.7':
     optional: true
 
-  '@esbuild/openbsd-x64@0.24.0':
+  '@esbuild/win32-x64@0.27.7':
     optional: true
 
-  '@esbuild/sunos-x64@0.21.5':
+  '@img/colour@1.1.0':
     optional: true
 
-  '@esbuild/sunos-x64@0.23.0':
-    optional: true
-
-  '@esbuild/sunos-x64@0.23.1':
-    optional: true
-
-  '@esbuild/sunos-x64@0.24.0':
-    optional: true
-
-  '@esbuild/win32-arm64@0.21.5':
-    optional: true
-
-  '@esbuild/win32-arm64@0.23.0':
-    optional: true
-
-  '@esbuild/win32-arm64@0.23.1':
-    optional: true
-
-  '@esbuild/win32-arm64@0.24.0':
-    optional: true
-
-  '@esbuild/win32-ia32@0.21.5':
-    optional: true
-
-  '@esbuild/win32-ia32@0.23.0':
-    optional: true
-
-  '@esbuild/win32-ia32@0.23.1':
-    optional: true
-
-  '@esbuild/win32-ia32@0.24.0':
-    optional: true
-
-  '@esbuild/win32-x64@0.21.5':
-    optional: true
-
-  '@esbuild/win32-x64@0.23.0':
-    optional: true
-
-  '@esbuild/win32-x64@0.23.1':
-    optional: true
-
-  '@esbuild/win32-x64@0.24.0':
-    optional: true
-
-  '@eslint-community/eslint-utils@4.4.0(eslint@9.15.0(jiti@2.4.0))':
-    dependencies:
-      eslint: 9.15.0(jiti@2.4.0)
-      eslint-visitor-keys: 3.4.3
-
-  '@eslint-community/regexpp@4.11.1': {}
-
-  '@eslint-community/regexpp@4.12.1': {}
-
-  '@eslint/config-array@0.19.0':
-    dependencies:
-      '@eslint/object-schema': 2.1.4
-      debug: 4.3.7
-      minimatch: 3.1.2
-    transitivePeerDependencies:
-      - supports-color
-
-  '@eslint/core@0.9.0': {}
-
-  '@eslint/eslintrc@3.2.0':
-    dependencies:
-      ajv: 6.12.6
-      debug: 4.3.7
-      espree: 10.3.0
-      globals: 14.0.0
-      ignore: 5.3.2
-      import-fresh: 3.3.0
-      js-yaml: 4.1.0
-      minimatch: 3.1.2
-      strip-json-comments: 3.1.1
-    transitivePeerDependencies:
-      - supports-color
-
-  '@eslint/js@9.15.0': {}
-
-  '@eslint/object-schema@2.1.4': {}
-
-  '@eslint/plugin-kit@0.2.3':
-    dependencies:
-      levn: 0.4.1
-
-  '@humanfs/core@0.19.1': {}
-
-  '@humanfs/node@0.16.6':
-    dependencies:
-      '@humanfs/core': 0.19.1
-      '@humanwhocodes/retry': 0.3.1
-
-  '@humanwhocodes/module-importer@1.0.1': {}
-
-  '@humanwhocodes/retry@0.3.1': {}
-
-  '@humanwhocodes/retry@0.4.1': {}
-
-  '@img/sharp-darwin-arm64@0.33.5':
+  '@img/sharp-darwin-arm64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-darwin-arm64': 1.0.4
+      '@img/sharp-libvips-darwin-arm64': 1.2.4
     optional: true
 
-  '@img/sharp-darwin-x64@0.33.5':
+  '@img/sharp-darwin-x64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-darwin-x64': 1.0.4
+      '@img/sharp-libvips-darwin-x64': 1.2.4
     optional: true
 
-  '@img/sharp-libvips-darwin-arm64@1.0.4':
+  '@img/sharp-libvips-darwin-arm64@1.2.4':
     optional: true
 
-  '@img/sharp-libvips-darwin-x64@1.0.4':
+  '@img/sharp-libvips-darwin-x64@1.2.4':
     optional: true
 
-  '@img/sharp-libvips-linux-arm64@1.0.4':
+  '@img/sharp-libvips-linux-arm64@1.2.4':
     optional: true
 
-  '@img/sharp-libvips-linux-arm@1.0.5':
+  '@img/sharp-libvips-linux-arm@1.2.4':
     optional: true
 
-  '@img/sharp-libvips-linux-s390x@1.0.4':
+  '@img/sharp-libvips-linux-ppc64@1.2.4':
     optional: true
 
-  '@img/sharp-libvips-linux-x64@1.0.4':
+  '@img/sharp-libvips-linux-riscv64@1.2.4':
     optional: true
 
-  '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
+  '@img/sharp-libvips-linux-s390x@1.2.4':
     optional: true
 
-  '@img/sharp-libvips-linuxmusl-x64@1.0.4':
+  '@img/sharp-libvips-linux-x64@1.2.4':
     optional: true
 
-  '@img/sharp-linux-arm64@0.33.5':
+  '@img/sharp-libvips-linuxmusl-arm64@1.2.4':
+    optional: true
+
+  '@img/sharp-libvips-linuxmusl-x64@1.2.4':
+    optional: true
+
+  '@img/sharp-linux-arm64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linux-arm64': 1.0.4
+      '@img/sharp-libvips-linux-arm64': 1.2.4
     optional: true
 
-  '@img/sharp-linux-arm@0.33.5':
+  '@img/sharp-linux-arm@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linux-arm': 1.0.5
+      '@img/sharp-libvips-linux-arm': 1.2.4
     optional: true
 
-  '@img/sharp-linux-s390x@0.33.5':
+  '@img/sharp-linux-ppc64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linux-s390x': 1.0.4
+      '@img/sharp-libvips-linux-ppc64': 1.2.4
     optional: true
 
-  '@img/sharp-linux-x64@0.33.5':
+  '@img/sharp-linux-riscv64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linux-x64': 1.0.4
+      '@img/sharp-libvips-linux-riscv64': 1.2.4
     optional: true
 
-  '@img/sharp-linuxmusl-arm64@0.33.5':
+  '@img/sharp-linux-s390x@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linuxmusl-arm64': 1.0.4
+      '@img/sharp-libvips-linux-s390x': 1.2.4
     optional: true
 
-  '@img/sharp-linuxmusl-x64@0.33.5':
+  '@img/sharp-linux-x64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linuxmusl-x64': 1.0.4
+      '@img/sharp-libvips-linux-x64': 1.2.4
     optional: true
 
-  '@img/sharp-wasm32@0.33.5':
+  '@img/sharp-linuxmusl-arm64@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-arm64': 1.2.4
+    optional: true
+
+  '@img/sharp-linuxmusl-x64@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-x64': 1.2.4
+    optional: true
+
+  '@img/sharp-wasm32@0.34.5':
     dependencies:
-      '@emnapi/runtime': 1.3.1
+      '@emnapi/runtime': 1.11.3
     optional: true
 
-  '@img/sharp-win32-ia32@0.33.5':
+  '@img/sharp-win32-arm64@0.34.5':
     optional: true
 
-  '@img/sharp-win32-x64@0.33.5':
+  '@img/sharp-win32-ia32@0.34.5':
     optional: true
 
-  '@isaacs/cliui@8.0.2':
+  '@img/sharp-win32-x64@0.34.5':
+    optional: true
+
+  '@inquirer/ansi@2.0.7': {}
+
+  '@inquirer/checkbox@5.2.1(@types/node@25.9.1)':
     dependencies:
-      string-width: 5.1.2
-      string-width-cjs: string-width@4.2.3
-      strip-ansi: 7.1.0
-      strip-ansi-cjs: strip-ansi@6.0.1
-      wrap-ansi: 8.1.0
-      wrap-ansi-cjs: wrap-ansi@7.0.0
+      '@inquirer/ansi': 2.0.7
+      '@inquirer/core': 11.2.1(@types/node@25.9.1)
+      '@inquirer/figures': 2.0.7
+      '@inquirer/type': 4.0.7(@types/node@25.9.1)
+    optionalDependencies:
+      '@types/node': 25.9.1
 
-  '@jridgewell/gen-mapping@0.3.5':
+  '@inquirer/confirm@6.1.1(@types/node@25.9.1)':
     dependencies:
-      '@jridgewell/set-array': 1.2.1
-      '@jridgewell/sourcemap-codec': 1.5.0
-      '@jridgewell/trace-mapping': 0.3.25
+      '@inquirer/core': 11.2.1(@types/node@25.9.1)
+      '@inquirer/type': 4.0.7(@types/node@25.9.1)
+    optionalDependencies:
+      '@types/node': 25.9.1
+
+  '@inquirer/core@11.2.1(@types/node@25.9.1)':
+    dependencies:
+      '@inquirer/ansi': 2.0.7
+      '@inquirer/figures': 2.0.7
+      '@inquirer/type': 4.0.7(@types/node@25.9.1)
+      cli-width: 4.1.0
+      fast-wrap-ansi: 0.2.2
+      mute-stream: 3.0.0
+      signal-exit: 4.1.0
+    optionalDependencies:
+      '@types/node': 25.9.1
+
+  '@inquirer/editor@5.2.2(@types/node@25.9.1)':
+    dependencies:
+      '@inquirer/core': 11.2.1(@types/node@25.9.1)
+      '@inquirer/external-editor': 3.0.3(@types/node@25.9.1)
+      '@inquirer/type': 4.0.7(@types/node@25.9.1)
+    optionalDependencies:
+      '@types/node': 25.9.1
+
+  '@inquirer/expand@5.1.1(@types/node@25.9.1)':
+    dependencies:
+      '@inquirer/core': 11.2.1(@types/node@25.9.1)
+      '@inquirer/type': 4.0.7(@types/node@25.9.1)
+    optionalDependencies:
+      '@types/node': 25.9.1
+
+  '@inquirer/external-editor@3.0.3(@types/node@25.9.1)':
+    dependencies:
+      chardet: 2.1.1
+      iconv-lite: 0.7.2
+    optionalDependencies:
+      '@types/node': 25.9.1
+
+  '@inquirer/figures@2.0.7': {}
+
+  '@inquirer/input@5.1.2(@types/node@25.9.1)':
+    dependencies:
+      '@inquirer/core': 11.2.1(@types/node@25.9.1)
+      '@inquirer/type': 4.0.7(@types/node@25.9.1)
+    optionalDependencies:
+      '@types/node': 25.9.1
+
+  '@inquirer/number@4.1.1(@types/node@25.9.1)':
+    dependencies:
+      '@inquirer/core': 11.2.1(@types/node@25.9.1)
+      '@inquirer/type': 4.0.7(@types/node@25.9.1)
+    optionalDependencies:
+      '@types/node': 25.9.1
+
+  '@inquirer/password@5.1.1(@types/node@25.9.1)':
+    dependencies:
+      '@inquirer/ansi': 2.0.7
+      '@inquirer/core': 11.2.1(@types/node@25.9.1)
+      '@inquirer/type': 4.0.7(@types/node@25.9.1)
+    optionalDependencies:
+      '@types/node': 25.9.1
+
+  '@inquirer/prompts@8.5.2(@types/node@25.9.1)':
+    dependencies:
+      '@inquirer/checkbox': 5.2.1(@types/node@25.9.1)
+      '@inquirer/confirm': 6.1.1(@types/node@25.9.1)
+      '@inquirer/editor': 5.2.2(@types/node@25.9.1)
+      '@inquirer/expand': 5.1.1(@types/node@25.9.1)
+      '@inquirer/input': 5.1.2(@types/node@25.9.1)
+      '@inquirer/number': 4.1.1(@types/node@25.9.1)
+      '@inquirer/password': 5.1.1(@types/node@25.9.1)
+      '@inquirer/rawlist': 5.3.1(@types/node@25.9.1)
+      '@inquirer/search': 4.2.1(@types/node@25.9.1)
+      '@inquirer/select': 5.2.1(@types/node@25.9.1)
+    optionalDependencies:
+      '@types/node': 25.9.1
+
+  '@inquirer/rawlist@5.3.1(@types/node@25.9.1)':
+    dependencies:
+      '@inquirer/core': 11.2.1(@types/node@25.9.1)
+      '@inquirer/type': 4.0.7(@types/node@25.9.1)
+    optionalDependencies:
+      '@types/node': 25.9.1
+
+  '@inquirer/search@4.2.1(@types/node@25.9.1)':
+    dependencies:
+      '@inquirer/core': 11.2.1(@types/node@25.9.1)
+      '@inquirer/figures': 2.0.7
+      '@inquirer/type': 4.0.7(@types/node@25.9.1)
+    optionalDependencies:
+      '@types/node': 25.9.1
+
+  '@inquirer/select@5.2.1(@types/node@25.9.1)':
+    dependencies:
+      '@inquirer/ansi': 2.0.7
+      '@inquirer/core': 11.2.1(@types/node@25.9.1)
+      '@inquirer/figures': 2.0.7
+      '@inquirer/type': 4.0.7(@types/node@25.9.1)
+    optionalDependencies:
+      '@types/node': 25.9.1
+
+  '@inquirer/type@4.0.7(@types/node@25.9.1)':
+    optionalDependencies:
+      '@types/node': 25.9.1
+
+  '@jridgewell/gen-mapping@0.3.13':
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+      '@jridgewell/trace-mapping': 0.3.31
+
+  '@jridgewell/remapping@2.3.5':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
 
   '@jridgewell/resolve-uri@3.1.2': {}
 
-  '@jridgewell/set-array@1.2.1': {}
-
-  '@jridgewell/source-map@0.3.6':
+  '@jridgewell/source-map@0.3.11':
     dependencies:
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
-    optional: true
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
 
-  '@jridgewell/sourcemap-codec@1.5.0': {}
+  '@jridgewell/sourcemap-codec@1.5.5': {}
 
-  '@jridgewell/trace-mapping@0.3.25':
+  '@jridgewell/trace-mapping@0.3.31':
     dependencies:
       '@jridgewell/resolve-uri': 3.1.2
-      '@jridgewell/sourcemap-codec': 1.5.0
+      '@jridgewell/sourcemap-codec': 1.5.5
 
-  '@napi-rs/cli@2.18.4': {}
-
-  '@next/env@15.0.3': {}
-
-  '@next/eslint-plugin-next@15.0.3':
+  '@napi-rs/cli@3.7.4(patch_hash=9912bf0a9c2cef8329d11c41fbce4d33ce2bdcf660a630b258c962c0a3c44bed)(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)(@types/node@25.9.1)(node-addon-api@8.7.0)':
     dependencies:
-      fast-glob: 3.3.1
+      '@inquirer/prompts': 8.5.2(@types/node@25.9.1)
+      '@napi-rs/cross-toolchain': 1.0.3(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)
+      '@napi-rs/wasm-tools': 1.0.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)
+      '@octokit/rest': 22.0.1
+      clipanion: 4.0.0-rc.4(typanion@3.14.0)
+      colorette: 2.0.20
+      emnapi: 1.11.3(node-addon-api@8.7.0)
+      es-toolkit: 1.50.0
+      js-yaml: 4.3.1
+      obug: 2.1.4
+      semver: 7.8.5
+      typanion: 3.14.0
+    optionalDependencies:
+      '@emnapi/runtime': 1.11.3
+    transitivePeerDependencies:
+      - '@emnapi/core'
+      - '@napi-rs/cross-toolchain-arm64-target-aarch64'
+      - '@napi-rs/cross-toolchain-arm64-target-armv7'
+      - '@napi-rs/cross-toolchain-arm64-target-ppc64le'
+      - '@napi-rs/cross-toolchain-arm64-target-s390x'
+      - '@napi-rs/cross-toolchain-arm64-target-x86_64'
+      - '@napi-rs/cross-toolchain-x64-target-aarch64'
+      - '@napi-rs/cross-toolchain-x64-target-armv7'
+      - '@napi-rs/cross-toolchain-x64-target-ppc64le'
+      - '@napi-rs/cross-toolchain-x64-target-s390x'
+      - '@napi-rs/cross-toolchain-x64-target-x86_64'
+      - '@types/node'
+      - node-addon-api
+      - supports-color
 
-  '@next/swc-darwin-arm64@15.0.3':
+  '@napi-rs/cross-toolchain@1.0.3(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)':
+    dependencies:
+      '@napi-rs/lzma': 1.4.5(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)
+      '@napi-rs/tar': 1.1.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - '@emnapi/core'
+      - '@emnapi/runtime'
+      - supports-color
+
+  '@napi-rs/lzma-android-arm-eabi@1.4.5':
     optional: true
 
-  '@next/swc-darwin-x64@15.0.3':
+  '@napi-rs/lzma-android-arm64@1.4.5':
     optional: true
 
-  '@next/swc-linux-arm64-gnu@15.0.3':
+  '@napi-rs/lzma-darwin-arm64@1.4.5':
     optional: true
 
-  '@next/swc-linux-arm64-musl@15.0.3':
+  '@napi-rs/lzma-darwin-x64@1.4.5':
     optional: true
 
-  '@next/swc-linux-x64-gnu@15.0.3':
+  '@napi-rs/lzma-freebsd-x64@1.4.5':
     optional: true
 
-  '@next/swc-linux-x64-musl@15.0.3':
+  '@napi-rs/lzma-linux-arm-gnueabihf@1.4.5':
     optional: true
 
-  '@next/swc-win32-arm64-msvc@15.0.3':
+  '@napi-rs/lzma-linux-arm64-gnu@1.4.5':
     optional: true
 
-  '@next/swc-win32-x64-msvc@15.0.3':
+  '@napi-rs/lzma-linux-arm64-musl@1.4.5':
+    optional: true
+
+  '@napi-rs/lzma-linux-ppc64-gnu@1.4.5':
+    optional: true
+
+  '@napi-rs/lzma-linux-riscv64-gnu@1.4.5':
+    optional: true
+
+  '@napi-rs/lzma-linux-s390x-gnu@1.4.5':
+    optional: true
+
+  '@napi-rs/lzma-linux-x64-gnu@1.4.5':
+    optional: true
+
+  '@napi-rs/lzma-linux-x64-musl@1.4.5':
+    optional: true
+
+  '@napi-rs/lzma-wasm32-wasi@1.4.5(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)':
+    dependencies:
+      '@napi-rs/wasm-runtime': 1.2.2(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)
+    transitivePeerDependencies:
+      - '@emnapi/core'
+      - '@emnapi/runtime'
+    optional: true
+
+  '@napi-rs/lzma-win32-arm64-msvc@1.4.5':
+    optional: true
+
+  '@napi-rs/lzma-win32-ia32-msvc@1.4.5':
+    optional: true
+
+  '@napi-rs/lzma-win32-x64-msvc@1.4.5':
+    optional: true
+
+  '@napi-rs/lzma@1.4.5(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)':
+    optionalDependencies:
+      '@napi-rs/lzma-android-arm-eabi': 1.4.5
+      '@napi-rs/lzma-android-arm64': 1.4.5
+      '@napi-rs/lzma-darwin-arm64': 1.4.5
+      '@napi-rs/lzma-darwin-x64': 1.4.5
+      '@napi-rs/lzma-freebsd-x64': 1.4.5
+      '@napi-rs/lzma-linux-arm-gnueabihf': 1.4.5
+      '@napi-rs/lzma-linux-arm64-gnu': 1.4.5
+      '@napi-rs/lzma-linux-arm64-musl': 1.4.5
+      '@napi-rs/lzma-linux-ppc64-gnu': 1.4.5
+      '@napi-rs/lzma-linux-riscv64-gnu': 1.4.5
+      '@napi-rs/lzma-linux-s390x-gnu': 1.4.5
+      '@napi-rs/lzma-linux-x64-gnu': 1.4.5
+      '@napi-rs/lzma-linux-x64-musl': 1.4.5
+      '@napi-rs/lzma-wasm32-wasi': 1.4.5(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)
+      '@napi-rs/lzma-win32-arm64-msvc': 1.4.5
+      '@napi-rs/lzma-win32-ia32-msvc': 1.4.5
+      '@napi-rs/lzma-win32-x64-msvc': 1.4.5
+    transitivePeerDependencies:
+      - '@emnapi/core'
+      - '@emnapi/runtime'
+
+  '@napi-rs/tar-android-arm-eabi@1.1.0':
+    optional: true
+
+  '@napi-rs/tar-android-arm64@1.1.0':
+    optional: true
+
+  '@napi-rs/tar-darwin-arm64@1.1.0':
+    optional: true
+
+  '@napi-rs/tar-darwin-x64@1.1.0':
+    optional: true
+
+  '@napi-rs/tar-freebsd-x64@1.1.0':
+    optional: true
+
+  '@napi-rs/tar-linux-arm-gnueabihf@1.1.0':
+    optional: true
+
+  '@napi-rs/tar-linux-arm64-gnu@1.1.0':
+    optional: true
+
+  '@napi-rs/tar-linux-arm64-musl@1.1.0':
+    optional: true
+
+  '@napi-rs/tar-linux-ppc64-gnu@1.1.0':
+    optional: true
+
+  '@napi-rs/tar-linux-s390x-gnu@1.1.0':
+    optional: true
+
+  '@napi-rs/tar-linux-x64-gnu@1.1.0':
+    optional: true
+
+  '@napi-rs/tar-linux-x64-musl@1.1.0':
+    optional: true
+
+  '@napi-rs/tar-wasm32-wasi@1.1.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)':
+    dependencies:
+      '@napi-rs/wasm-runtime': 1.2.2(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)
+    transitivePeerDependencies:
+      - '@emnapi/core'
+      - '@emnapi/runtime'
+    optional: true
+
+  '@napi-rs/tar-win32-arm64-msvc@1.1.0':
+    optional: true
+
+  '@napi-rs/tar-win32-ia32-msvc@1.1.0':
+    optional: true
+
+  '@napi-rs/tar-win32-x64-msvc@1.1.0':
+    optional: true
+
+  '@napi-rs/tar@1.1.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)':
+    optionalDependencies:
+      '@napi-rs/tar-android-arm-eabi': 1.1.0
+      '@napi-rs/tar-android-arm64': 1.1.0
+      '@napi-rs/tar-darwin-arm64': 1.1.0
+      '@napi-rs/tar-darwin-x64': 1.1.0
+      '@napi-rs/tar-freebsd-x64': 1.1.0
+      '@napi-rs/tar-linux-arm-gnueabihf': 1.1.0
+      '@napi-rs/tar-linux-arm64-gnu': 1.1.0
+      '@napi-rs/tar-linux-arm64-musl': 1.1.0
+      '@napi-rs/tar-linux-ppc64-gnu': 1.1.0
+      '@napi-rs/tar-linux-s390x-gnu': 1.1.0
+      '@napi-rs/tar-linux-x64-gnu': 1.1.0
+      '@napi-rs/tar-linux-x64-musl': 1.1.0
+      '@napi-rs/tar-wasm32-wasi': 1.1.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)
+      '@napi-rs/tar-win32-arm64-msvc': 1.1.0
+      '@napi-rs/tar-win32-ia32-msvc': 1.1.0
+      '@napi-rs/tar-win32-x64-msvc': 1.1.0
+    transitivePeerDependencies:
+      - '@emnapi/core'
+      - '@emnapi/runtime'
+
+  '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)':
+    dependencies:
+      '@emnapi/core': 1.10.0
+      '@emnapi/runtime': 1.10.0
+      '@tybys/wasm-util': 0.10.3
+    optional: true
+
+  '@napi-rs/wasm-runtime@1.2.2(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)':
+    dependencies:
+      '@emnapi/core': 1.11.3
+      '@emnapi/runtime': 1.11.3
+      '@tybys/wasm-util': 0.10.3
+
+  '@napi-rs/wasm-runtime@1.2.2(@emnapi/core@2.0.0-alpha.3)(@emnapi/runtime@2.0.0-alpha.3)':
+    dependencies:
+      '@emnapi/core': 2.0.0-alpha.3
+      '@emnapi/runtime': 2.0.0-alpha.3
+      '@tybys/wasm-util': 0.10.3
+    optional: true
+
+  '@napi-rs/wasm-tools-android-arm-eabi@1.0.1':
+    optional: true
+
+  '@napi-rs/wasm-tools-android-arm64@1.0.1':
+    optional: true
+
+  '@napi-rs/wasm-tools-darwin-arm64@1.0.1':
+    optional: true
+
+  '@napi-rs/wasm-tools-darwin-x64@1.0.1':
+    optional: true
+
+  '@napi-rs/wasm-tools-freebsd-x64@1.0.1':
+    optional: true
+
+  '@napi-rs/wasm-tools-linux-arm64-gnu@1.0.1':
+    optional: true
+
+  '@napi-rs/wasm-tools-linux-arm64-musl@1.0.1':
+    optional: true
+
+  '@napi-rs/wasm-tools-linux-x64-gnu@1.0.1':
+    optional: true
+
+  '@napi-rs/wasm-tools-linux-x64-musl@1.0.1':
+    optional: true
+
+  '@napi-rs/wasm-tools-wasm32-wasi@1.0.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)':
+    dependencies:
+      '@napi-rs/wasm-runtime': 1.2.2(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)
+    transitivePeerDependencies:
+      - '@emnapi/core'
+      - '@emnapi/runtime'
+    optional: true
+
+  '@napi-rs/wasm-tools-win32-arm64-msvc@1.0.1':
+    optional: true
+
+  '@napi-rs/wasm-tools-win32-ia32-msvc@1.0.1':
+    optional: true
+
+  '@napi-rs/wasm-tools-win32-x64-msvc@1.0.1':
+    optional: true
+
+  '@napi-rs/wasm-tools@1.0.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)':
+    optionalDependencies:
+      '@napi-rs/wasm-tools-android-arm-eabi': 1.0.1
+      '@napi-rs/wasm-tools-android-arm64': 1.0.1
+      '@napi-rs/wasm-tools-darwin-arm64': 1.0.1
+      '@napi-rs/wasm-tools-darwin-x64': 1.0.1
+      '@napi-rs/wasm-tools-freebsd-x64': 1.0.1
+      '@napi-rs/wasm-tools-linux-arm64-gnu': 1.0.1
+      '@napi-rs/wasm-tools-linux-arm64-musl': 1.0.1
+      '@napi-rs/wasm-tools-linux-x64-gnu': 1.0.1
+      '@napi-rs/wasm-tools-linux-x64-musl': 1.0.1
+      '@napi-rs/wasm-tools-wasm32-wasi': 1.0.1(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)
+      '@napi-rs/wasm-tools-win32-arm64-msvc': 1.0.1
+      '@napi-rs/wasm-tools-win32-ia32-msvc': 1.0.1
+      '@napi-rs/wasm-tools-win32-x64-msvc': 1.0.1
+    transitivePeerDependencies:
+      - '@emnapi/core'
+      - '@emnapi/runtime'
+
+  '@next/env@16.2.7': {}
+
+  '@next/swc-darwin-arm64@16.2.7':
+    optional: true
+
+  '@next/swc-darwin-x64@16.2.7':
+    optional: true
+
+  '@next/swc-linux-arm64-gnu@16.2.7':
+    optional: true
+
+  '@next/swc-linux-arm64-musl@16.2.7':
+    optional: true
+
+  '@next/swc-linux-x64-gnu@16.2.7':
+    optional: true
+
+  '@next/swc-linux-x64-musl@16.2.7':
+    optional: true
+
+  '@next/swc-win32-arm64-msvc@16.2.7':
+    optional: true
+
+  '@next/swc-win32-x64-msvc@16.2.7':
     optional: true
 
   '@nodelib/fs.scandir@2.1.5':
@@ -6725,705 +4211,665 @@ snapshots:
   '@nodelib/fs.walk@1.2.8':
     dependencies:
       '@nodelib/fs.scandir': 2.1.5
-      fastq: 1.17.1
+      fastq: 1.20.1
 
-  '@nolyfill/is-core-module@1.0.39': {}
+  '@octokit/auth-token@6.0.0': {}
 
-  '@oven/bun-darwin-aarch64@1.1.29':
-    optional: true
-
-  '@oven/bun-darwin-x64-baseline@1.1.29':
-    optional: true
-
-  '@oven/bun-darwin-x64@1.1.29':
-    optional: true
-
-  '@oven/bun-linux-aarch64@1.1.29':
-    optional: true
-
-  '@oven/bun-linux-x64-baseline@1.1.29':
-    optional: true
-
-  '@oven/bun-linux-x64@1.1.29':
-    optional: true
-
-  '@oven/bun-windows-x64-baseline@1.1.29':
-    optional: true
-
-  '@oven/bun-windows-x64@1.1.29':
-    optional: true
-
-  '@parcel/watcher-android-arm64@2.5.0':
-    optional: true
-
-  '@parcel/watcher-darwin-arm64@2.5.0': {}
-
-  '@parcel/watcher-darwin-x64@2.5.0': {}
-
-  '@parcel/watcher-freebsd-x64@2.5.0':
-    optional: true
-
-  '@parcel/watcher-linux-arm-glibc@2.5.0':
-    optional: true
-
-  '@parcel/watcher-linux-arm-musl@2.5.0':
-    optional: true
-
-  '@parcel/watcher-linux-arm64-glibc@2.5.0': {}
-
-  '@parcel/watcher-linux-arm64-musl@2.5.0': {}
-
-  '@parcel/watcher-linux-x64-glibc@2.5.0': {}
-
-  '@parcel/watcher-linux-x64-musl@2.5.0': {}
-
-  '@parcel/watcher-win32-arm64@2.5.0':
-    optional: true
-
-  '@parcel/watcher-win32-ia32@2.5.0':
-    optional: true
-
-  '@parcel/watcher-win32-x64@2.5.0': {}
-
-  '@parcel/watcher@2.5.0(patch_hash=pyfayeoxwesjxsefsxp3jpev4q)':
+  '@octokit/core@7.0.6':
+    dependencies:
+      '@octokit/auth-token': 6.0.0
+      '@octokit/graphql': 9.0.3
+      '@octokit/request': 10.0.9
+      '@octokit/request-error': 7.1.0
+      '@octokit/types': 16.0.0
+      before-after-hook: 4.0.0
+      universal-user-agent: 7.0.3
+
+  '@octokit/endpoint@11.0.3':
+    dependencies:
+      '@octokit/types': 16.0.0
+      universal-user-agent: 7.0.3
+
+  '@octokit/graphql@9.0.3':
+    dependencies:
+      '@octokit/request': 10.0.9
+      '@octokit/types': 16.0.0
+      universal-user-agent: 7.0.3
+
+  '@octokit/openapi-types@27.0.0': {}
+
+  '@octokit/plugin-paginate-rest@14.0.0(@octokit/core@7.0.6)':
+    dependencies:
+      '@octokit/core': 7.0.6
+      '@octokit/types': 16.0.0
+
+  '@octokit/plugin-request-log@6.0.0(@octokit/core@7.0.6)':
+    dependencies:
+      '@octokit/core': 7.0.6
+
+  '@octokit/plugin-rest-endpoint-methods@17.0.0(@octokit/core@7.0.6)':
+    dependencies:
+      '@octokit/core': 7.0.6
+      '@octokit/types': 16.0.0
+
+  '@octokit/request-error@7.1.0':
+    dependencies:
+      '@octokit/types': 16.0.0
+
+  '@octokit/request@10.0.9':
+    dependencies:
+      '@octokit/endpoint': 11.0.3
+      '@octokit/request-error': 7.1.0
+      '@octokit/types': 16.0.0
+      content-type: 2.0.0
+      fast-content-type-parse: 3.0.0
+      json-with-bigint: 3.5.8
+      universal-user-agent: 7.0.3
+
+  '@octokit/rest@22.0.1':
+    dependencies:
+      '@octokit/core': 7.0.6
+      '@octokit/plugin-paginate-rest': 14.0.0(@octokit/core@7.0.6)
+      '@octokit/plugin-request-log': 6.0.0(@octokit/core@7.0.6)
+      '@octokit/plugin-rest-endpoint-methods': 17.0.0(@octokit/core@7.0.6)
+
+  '@octokit/types@16.0.0':
+    dependencies:
+      '@octokit/openapi-types': 27.0.0
+
+  '@oven/bun-darwin-aarch64@1.3.14':
+    optional: true
+
+  '@oven/bun-darwin-x64-baseline@1.3.14':
+    optional: true
+
+  '@oven/bun-darwin-x64@1.3.14':
+    optional: true
+
+  '@oven/bun-freebsd-aarch64@1.3.14':
+    optional: true
+
+  '@oven/bun-freebsd-x64@1.3.14':
+    optional: true
+
+  '@oven/bun-linux-aarch64-android@1.3.14':
+    optional: true
+
+  '@oven/bun-linux-aarch64-musl@1.3.14':
+    optional: true
+
+  '@oven/bun-linux-aarch64@1.3.14':
+    optional: true
+
+  '@oven/bun-linux-x64-android@1.3.14':
+    optional: true
+
+  '@oven/bun-linux-x64-baseline@1.3.14':
+    optional: true
+
+  '@oven/bun-linux-x64-musl-baseline@1.3.14':
+    optional: true
+
+  '@oven/bun-linux-x64-musl@1.3.14':
+    optional: true
+
+  '@oven/bun-linux-x64@1.3.14':
+    optional: true
+
+  '@oven/bun-windows-aarch64@1.3.14':
+    optional: true
+
+  '@oven/bun-windows-x64-baseline@1.3.14':
+    optional: true
+
+  '@oven/bun-windows-x64@1.3.14':
+    optional: true
+
+  '@oxc-project/types@0.142.0': {}
+
+  '@parcel/watcher-android-arm64@2.6.0':
+    optional: true
+
+  '@parcel/watcher-darwin-arm64@2.6.0': {}
+
+  '@parcel/watcher-darwin-x64@2.6.0': {}
+
+  '@parcel/watcher-freebsd-x64@2.6.0':
+    optional: true
+
+  '@parcel/watcher-linux-arm-glibc@2.6.0':
+    optional: true
+
+  '@parcel/watcher-linux-arm-musl@2.6.0':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-glibc@2.6.0': {}
+
+  '@parcel/watcher-linux-arm64-musl@2.6.0': {}
+
+  '@parcel/watcher-linux-x64-glibc@2.6.0': {}
+
+  '@parcel/watcher-linux-x64-musl@2.6.0': {}
+
+  '@parcel/watcher-wasm@2.5.6':
     dependencies:
-      detect-libc: 1.0.3
       is-glob: 4.0.3
-      micromatch: 4.0.7
+      picomatch: 4.0.5
+
+  '@parcel/watcher-win32-arm64@2.6.0':
+    optional: true
+
+  '@parcel/watcher-win32-x64@2.6.0': {}
+
+  '@parcel/watcher@2.6.0(patch_hash=705ce75ccea54337110c4d7fe0a8b421658ea0c23e1a77c1fa890a86041179da)':
+    dependencies:
+      detect-libc: 2.1.2
+      is-glob: 4.0.3
       node-addon-api: 7.1.1
+      picomatch: 4.0.5
     optionalDependencies:
-      '@parcel/watcher-android-arm64': 2.5.0
-      '@parcel/watcher-darwin-arm64': 2.5.0
-      '@parcel/watcher-darwin-x64': 2.5.0
-      '@parcel/watcher-freebsd-x64': 2.5.0
-      '@parcel/watcher-linux-arm-glibc': 2.5.0
-      '@parcel/watcher-linux-arm-musl': 2.5.0
-      '@parcel/watcher-linux-arm64-glibc': 2.5.0
-      '@parcel/watcher-linux-arm64-musl': 2.5.0
-      '@parcel/watcher-linux-x64-glibc': 2.5.0
-      '@parcel/watcher-linux-x64-musl': 2.5.0
-      '@parcel/watcher-win32-arm64': 2.5.0
-      '@parcel/watcher-win32-ia32': 2.5.0
-      '@parcel/watcher-win32-x64': 2.5.0
+      '@parcel/watcher-android-arm64': 2.6.0
+      '@parcel/watcher-darwin-arm64': 2.6.0
+      '@parcel/watcher-darwin-x64': 2.6.0
+      '@parcel/watcher-freebsd-x64': 2.6.0
+      '@parcel/watcher-linux-arm-glibc': 2.6.0
+      '@parcel/watcher-linux-arm-musl': 2.6.0
+      '@parcel/watcher-linux-arm64-glibc': 2.6.0
+      '@parcel/watcher-linux-arm64-musl': 2.6.0
+      '@parcel/watcher-linux-x64-glibc': 2.6.0
+      '@parcel/watcher-linux-x64-musl': 2.6.0
+      '@parcel/watcher-win32-arm64': 2.6.0
+      '@parcel/watcher-win32-x64': 2.6.0
 
-  '@pkgjs/parseargs@0.11.0':
-    optional: true
-
-  '@playwright/test@1.49.0':
+  '@playwright/test@1.62.1':
     dependencies:
-      playwright: 1.49.0
+      playwright: 1.62.1
 
-  '@rollup/rollup-android-arm-eabi@4.20.0':
+  '@rolldown/binding-android-arm64@1.2.1':
     optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.27.4':
+  '@rolldown/binding-darwin-arm64@1.2.1':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.20.0':
+  '@rolldown/binding-darwin-x64@1.2.1':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.27.4':
+  '@rolldown/binding-freebsd-x64@1.2.1':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.20.0':
+  '@rolldown/binding-linux-arm-gnueabihf@1.2.1':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.27.4':
+  '@rolldown/binding-linux-arm64-gnu@1.2.1':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.20.0':
+  '@rolldown/binding-linux-arm64-musl@1.2.1':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.27.4':
+  '@rolldown/binding-linux-ppc64-gnu@1.2.1':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.27.4':
+  '@rolldown/binding-linux-s390x-gnu@1.2.1':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.27.4':
+  '@rolldown/binding-linux-x64-gnu@1.2.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.20.0':
+  '@rolldown/binding-linux-x64-musl@1.2.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.27.4':
+  '@rolldown/binding-openharmony-arm64@1.2.1':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.20.0':
-    optional: true
-
-  '@rollup/rollup-linux-arm-musleabihf@4.27.4':
-    optional: true
-
-  '@rollup/rollup-linux-arm64-gnu@4.20.0':
-    optional: true
-
-  '@rollup/rollup-linux-arm64-gnu@4.27.4':
-    optional: true
-
-  '@rollup/rollup-linux-arm64-musl@4.20.0':
-    optional: true
-
-  '@rollup/rollup-linux-arm64-musl@4.27.4':
-    optional: true
-
-  '@rollup/rollup-linux-powerpc64le-gnu@4.20.0':
-    optional: true
-
-  '@rollup/rollup-linux-powerpc64le-gnu@4.27.4':
-    optional: true
-
-  '@rollup/rollup-linux-riscv64-gnu@4.20.0':
-    optional: true
-
-  '@rollup/rollup-linux-riscv64-gnu@4.27.4':
-    optional: true
-
-  '@rollup/rollup-linux-s390x-gnu@4.20.0':
-    optional: true
-
-  '@rollup/rollup-linux-s390x-gnu@4.27.4':
-    optional: true
-
-  '@rollup/rollup-linux-x64-gnu@4.20.0':
-    optional: true
-
-  '@rollup/rollup-linux-x64-gnu@4.27.4':
-    optional: true
-
-  '@rollup/rollup-linux-x64-musl@4.20.0':
-    optional: true
-
-  '@rollup/rollup-linux-x64-musl@4.27.4':
-    optional: true
-
-  '@rollup/rollup-win32-arm64-msvc@4.20.0':
-    optional: true
-
-  '@rollup/rollup-win32-arm64-msvc@4.27.4':
-    optional: true
-
-  '@rollup/rollup-win32-ia32-msvc@4.20.0':
-    optional: true
-
-  '@rollup/rollup-win32-ia32-msvc@4.27.4':
-    optional: true
-
-  '@rollup/rollup-win32-x64-msvc@4.20.0':
-    optional: true
-
-  '@rollup/rollup-win32-x64-msvc@4.27.4':
-    optional: true
-
-  '@rtsao/scc@1.1.0': {}
-
-  '@rushstack/eslint-patch@1.10.4': {}
-
-  '@sindresorhus/merge-streams@2.3.0': {}
-
-  '@swc/counter@0.1.3': {}
-
-  '@swc/helpers@0.5.13':
+  '@rolldown/binding-wasm32-wasi@1.2.1':
     dependencies:
-      tslib: 2.8.0
+      '@emnapi/core': 2.0.0-alpha.3
+      '@emnapi/runtime': 2.0.0-alpha.3
+      '@napi-rs/wasm-runtime': 1.2.2(@emnapi/core@2.0.0-alpha.3)(@emnapi/runtime@2.0.0-alpha.3)
+    optional: true
+
+  '@rolldown/binding-win32-arm64-msvc@1.2.1':
+    optional: true
+
+  '@rolldown/binding-win32-x64-msvc@1.2.1':
+    optional: true
+
+  '@rolldown/pluginutils@1.0.1': {}
+
+  '@rollup/rollup-android-arm-eabi@4.60.4':
+    optional: true
+
+  '@rollup/rollup-android-arm64@4.60.4':
+    optional: true
+
+  '@rollup/rollup-darwin-arm64@4.60.4':
+    optional: true
+
+  '@rollup/rollup-darwin-x64@4.60.4':
+    optional: true
+
+  '@rollup/rollup-freebsd-arm64@4.60.4':
+    optional: true
+
+  '@rollup/rollup-freebsd-x64@4.60.4':
+    optional: true
+
+  '@rollup/rollup-linux-arm-gnueabihf@4.60.4':
+    optional: true
+
+  '@rollup/rollup-linux-arm-musleabihf@4.60.4':
+    optional: true
+
+  '@rollup/rollup-linux-arm64-gnu@4.60.4':
+    optional: true
+
+  '@rollup/rollup-linux-arm64-musl@4.60.4':
+    optional: true
+
+  '@rollup/rollup-linux-loong64-gnu@4.60.4':
+    optional: true
+
+  '@rollup/rollup-linux-loong64-musl@4.60.4':
+    optional: true
+
+  '@rollup/rollup-linux-ppc64-gnu@4.60.4':
+    optional: true
+
+  '@rollup/rollup-linux-ppc64-musl@4.60.4':
+    optional: true
+
+  '@rollup/rollup-linux-riscv64-gnu@4.60.4':
+    optional: true
+
+  '@rollup/rollup-linux-riscv64-musl@4.60.4':
+    optional: true
+
+  '@rollup/rollup-linux-s390x-gnu@4.60.4':
+    optional: true
+
+  '@rollup/rollup-linux-x64-gnu@4.60.4':
+    optional: true
+
+  '@rollup/rollup-linux-x64-musl@4.60.4':
+    optional: true
+
+  '@rollup/rollup-openbsd-x64@4.60.4':
+    optional: true
+
+  '@rollup/rollup-openharmony-arm64@4.60.4':
+    optional: true
+
+  '@rollup/rollup-win32-arm64-msvc@4.60.4':
+    optional: true
+
+  '@rollup/rollup-win32-ia32-msvc@4.60.4':
+    optional: true
+
+  '@rollup/rollup-win32-x64-gnu@4.60.4':
+    optional: true
+
+  '@rollup/rollup-win32-x64-msvc@4.60.4':
+    optional: true
+
+  '@rspack/binding-darwin-arm64@2.0.2':
+    optional: true
+
+  '@rspack/binding-darwin-x64@2.0.2':
+    optional: true
+
+  '@rspack/binding-linux-arm64-gnu@2.0.2':
+    optional: true
+
+  '@rspack/binding-linux-arm64-musl@2.0.2':
+    optional: true
+
+  '@rspack/binding-linux-x64-gnu@2.0.2':
+    optional: true
+
+  '@rspack/binding-linux-x64-musl@2.0.2':
+    optional: true
+
+  '@rspack/binding-wasm32-wasi@2.0.2':
+    dependencies:
+      '@emnapi/core': 1.10.0
+      '@emnapi/runtime': 1.10.0
+      '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
+    optional: true
+
+  '@rspack/binding-win32-arm64-msvc@2.0.2':
+    optional: true
+
+  '@rspack/binding-win32-ia32-msvc@2.0.2':
+    optional: true
+
+  '@rspack/binding-win32-x64-msvc@2.0.2':
+    optional: true
+
+  '@rspack/binding@2.0.2':
+    optionalDependencies:
+      '@rspack/binding-darwin-arm64': 2.0.2
+      '@rspack/binding-darwin-x64': 2.0.2
+      '@rspack/binding-linux-arm64-gnu': 2.0.2
+      '@rspack/binding-linux-arm64-musl': 2.0.2
+      '@rspack/binding-linux-x64-gnu': 2.0.2
+      '@rspack/binding-linux-x64-musl': 2.0.2
+      '@rspack/binding-wasm32-wasi': 2.0.2
+      '@rspack/binding-win32-arm64-msvc': 2.0.2
+      '@rspack/binding-win32-ia32-msvc': 2.0.2
+      '@rspack/binding-win32-x64-msvc': 2.0.2
+
+  '@rspack/core@2.0.2(@swc/helpers@0.5.15)':
+    dependencies:
+      '@rspack/binding': 2.0.2
+    optionalDependencies:
+      '@swc/helpers': 0.5.15
+
+  '@sindresorhus/merge-streams@4.0.0': {}
+
+  '@standard-schema/spec@1.1.0': {}
+
+  '@swc/helpers@0.5.15':
+    dependencies:
+      tslib: 2.8.1
 
   '@tailwindcss/aspect-ratio@0.4.2(tailwindcss@packages+tailwindcss)':
     dependencies:
       tailwindcss: link:packages/tailwindcss
 
-  '@tailwindcss/forms@0.5.9(tailwindcss@packages+tailwindcss)':
+  '@tailwindcss/forms@0.5.11(tailwindcss@packages+tailwindcss)':
     dependencies:
       mini-svg-data-uri: 1.4.4
       tailwindcss: link:packages/tailwindcss
 
-  '@tailwindcss/typography@0.5.15(tailwindcss@packages+tailwindcss)':
+  '@tailwindcss/typography@0.5.20(tailwindcss@packages+tailwindcss)':
     dependencies:
-      lodash.castarray: 4.4.0
-      lodash.isplainobject: 4.0.6
-      lodash.merge: 4.6.2
       postcss-selector-parser: 6.0.10
       tailwindcss: link:packages/tailwindcss
 
-  '@types/babel__core@7.20.5':
+  '@turbo/darwin-64@2.10.8':
+    optional: true
+
+  '@turbo/darwin-arm64@2.10.8':
+    optional: true
+
+  '@turbo/linux-64@2.10.8':
+    optional: true
+
+  '@turbo/linux-arm64@2.10.8':
+    optional: true
+
+  '@turbo/windows-64@2.10.8':
+    optional: true
+
+  '@turbo/windows-arm64@2.10.8':
+    optional: true
+
+  '@tybys/wasm-util@0.10.3':
     dependencies:
-      '@babel/parser': 7.25.3
-      '@babel/types': 7.25.2
-      '@types/babel__generator': 7.6.8
-      '@types/babel__template': 7.4.4
-      '@types/babel__traverse': 7.20.6
+      tslib: 2.8.1
 
-  '@types/babel__generator@7.6.8':
+  '@types/bun@1.3.14':
     dependencies:
-      '@babel/types': 7.25.2
+      bun-types: 1.3.14
 
-  '@types/babel__template@7.4.4':
+  '@types/chai@5.2.3':
     dependencies:
-      '@babel/parser': 7.25.3
-      '@babel/types': 7.25.2
+      '@types/deep-eql': 4.0.2
+      assertion-error: 2.0.1
 
-  '@types/babel__traverse@7.20.6':
-    dependencies:
-      '@babel/types': 7.25.2
+  '@types/deep-eql@4.0.2': {}
 
-  '@types/braces@3.0.4': {}
+  '@types/estree@1.0.8': {}
 
-  '@types/bun@1.1.13':
-    dependencies:
-      bun-types: 1.1.34
-
-  '@types/estree@1.0.5': {}
-
-  '@types/estree@1.0.6': {}
+  '@types/estree@1.0.9': {}
 
   '@types/json-schema@7.0.15': {}
 
-  '@types/json5@0.0.29': {}
-
-  '@types/node@20.12.14':
+  '@types/node@22.20.1':
     dependencies:
-      undici-types: 5.26.5
+      undici-types: 6.21.0
 
-  '@types/node@20.14.13':
+  '@types/node@25.9.1':
     dependencies:
-      undici-types: 5.26.5
+      undici-types: 7.24.6
 
   '@types/postcss-import@14.0.3':
     dependencies:
-      postcss: 8.4.41
+      postcss: 8.5.25
 
-  '@types/prop-types@15.7.13': {}
-
-  '@types/react-dom@18.3.1':
+  '@types/react-dom@19.2.3(@types/react@19.2.15)':
     dependencies:
-      '@types/react': 18.3.12
+      '@types/react': 19.2.15
 
-  '@types/react@18.3.12':
+  '@types/react@19.2.15':
     dependencies:
-      '@types/prop-types': 15.7.13
-      csstype: 3.1.3
+      csstype: 3.2.3
 
-  '@types/ws@8.5.12':
+  '@types/semver@7.8.0': {}
+
+  '@vitejs/plugin-react@6.0.2(vite@8.2.0(@types/node@25.9.1)(esbuild@0.27.7)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0))':
     dependencies:
-      '@types/node': 20.14.13
+      '@rolldown/pluginutils': 1.0.1
+      vite: 8.2.0(@types/node@25.9.1)(esbuild@0.27.7)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0)
 
-  '@typescript-eslint/eslint-plugin@8.11.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4))(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4)':
+  '@vitest/expect@4.1.10':
     dependencies:
-      '@eslint-community/regexpp': 4.11.1
-      '@typescript-eslint/parser': 8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4)
-      '@typescript-eslint/scope-manager': 8.11.0
-      '@typescript-eslint/type-utils': 8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4)
-      '@typescript-eslint/visitor-keys': 8.11.0
-      eslint: 9.15.0(jiti@2.4.0)
-      graphemer: 1.4.0
-      ignore: 5.3.2
-      natural-compare: 1.4.0
-      ts-api-utils: 1.3.0(typescript@5.5.4)
-    optionalDependencies:
-      typescript: 5.5.4
-    transitivePeerDependencies:
-      - supports-color
+      '@standard-schema/spec': 1.1.0
+      '@types/chai': 5.2.3
+      '@vitest/spy': 4.1.10
+      '@vitest/utils': 4.1.10
+      chai: 6.2.2
+      tinyrainbow: 3.1.0
 
-  '@typescript-eslint/eslint-plugin@8.11.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3))(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3)':
+  '@vitest/mocker@4.1.10(vite@8.2.0(@types/node@22.20.1)(esbuild@0.27.7)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0))':
     dependencies:
-      '@eslint-community/regexpp': 4.11.1
-      '@typescript-eslint/parser': 8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3)
-      '@typescript-eslint/scope-manager': 8.11.0
-      '@typescript-eslint/type-utils': 8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3)
-      '@typescript-eslint/utils': 8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3)
-      '@typescript-eslint/visitor-keys': 8.11.0
-      eslint: 9.15.0(jiti@2.4.0)
-      graphemer: 1.4.0
-      ignore: 5.3.2
-      natural-compare: 1.4.0
-      ts-api-utils: 1.3.0(typescript@5.6.3)
-    optionalDependencies:
-      typescript: 5.6.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4)':
-    dependencies:
-      '@typescript-eslint/scope-manager': 8.11.0
-      '@typescript-eslint/types': 8.11.0
-      '@typescript-eslint/typescript-estree': 8.11.0(typescript@5.5.4)
-      '@typescript-eslint/visitor-keys': 8.11.0
-      debug: 4.3.7
-      eslint: 9.15.0(jiti@2.4.0)
-    optionalDependencies:
-      typescript: 5.5.4
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3)':
-    dependencies:
-      '@typescript-eslint/scope-manager': 8.11.0
-      '@typescript-eslint/types': 8.11.0
-      '@typescript-eslint/typescript-estree': 8.11.0(typescript@5.6.3)
-      '@typescript-eslint/visitor-keys': 8.11.0
-      debug: 4.3.7
-      eslint: 9.15.0(jiti@2.4.0)
-    optionalDependencies:
-      typescript: 5.6.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/scope-manager@8.11.0':
-    dependencies:
-      '@typescript-eslint/types': 8.11.0
-      '@typescript-eslint/visitor-keys': 8.11.0
-
-  '@typescript-eslint/type-utils@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4)':
-    dependencies:
-      '@typescript-eslint/typescript-estree': 8.11.0(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4)
-      debug: 4.3.7
-      ts-api-utils: 1.3.0(typescript@5.5.4)
-    optionalDependencies:
-      typescript: 5.5.4
-    transitivePeerDependencies:
-      - eslint
-      - supports-color
-
-  '@typescript-eslint/type-utils@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3)':
-    dependencies:
-      '@typescript-eslint/typescript-estree': 8.11.0(typescript@5.6.3)
-      '@typescript-eslint/utils': 8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3)
-      debug: 4.3.7
-      ts-api-utils: 1.3.0(typescript@5.6.3)
-    optionalDependencies:
-      typescript: 5.6.3
-    transitivePeerDependencies:
-      - eslint
-      - supports-color
-
-  '@typescript-eslint/types@8.11.0': {}
-
-  '@typescript-eslint/typescript-estree@8.11.0(typescript@5.5.4)':
-    dependencies:
-      '@typescript-eslint/types': 8.11.0
-      '@typescript-eslint/visitor-keys': 8.11.0
-      debug: 4.3.7
-      fast-glob: 3.3.2
-      is-glob: 4.0.3
-      minimatch: 9.0.5
-      semver: 7.6.3
-      ts-api-utils: 1.3.0(typescript@5.5.4)
-    optionalDependencies:
-      typescript: 5.5.4
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/typescript-estree@8.11.0(typescript@5.6.3)':
-    dependencies:
-      '@typescript-eslint/types': 8.11.0
-      '@typescript-eslint/visitor-keys': 8.11.0
-      debug: 4.3.7
-      fast-glob: 3.3.2
-      is-glob: 4.0.3
-      minimatch: 9.0.5
-      semver: 7.6.3
-      ts-api-utils: 1.3.0(typescript@5.6.3)
-    optionalDependencies:
-      typescript: 5.6.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/utils@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.15.0(jiti@2.4.0))
-      '@typescript-eslint/scope-manager': 8.11.0
-      '@typescript-eslint/types': 8.11.0
-      '@typescript-eslint/typescript-estree': 8.11.0(typescript@5.5.4)
-      eslint: 9.15.0(jiti@2.4.0)
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  '@typescript-eslint/utils@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.15.0(jiti@2.4.0))
-      '@typescript-eslint/scope-manager': 8.11.0
-      '@typescript-eslint/types': 8.11.0
-      '@typescript-eslint/typescript-estree': 8.11.0(typescript@5.6.3)
-      eslint: 9.15.0(jiti@2.4.0)
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  '@typescript-eslint/visitor-keys@8.11.0':
-    dependencies:
-      '@typescript-eslint/types': 8.11.0
-      eslint-visitor-keys: 3.4.3
-
-  '@vitejs/plugin-react@4.3.1(vite@6.0.0(@types/node@20.14.13)(jiti@2.4.0)(lightningcss@1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4))(terser@5.31.6)(tsx@4.19.1)(yaml@2.6.0))':
-    dependencies:
-      '@babel/core': 7.25.2
-      '@babel/plugin-transform-react-jsx-self': 7.24.7(@babel/core@7.25.2)
-      '@babel/plugin-transform-react-jsx-source': 7.24.7(@babel/core@7.25.2)
-      '@types/babel__core': 7.20.5
-      react-refresh: 0.14.2
-      vite: 6.0.0(@types/node@20.14.13)(jiti@2.4.0)(lightningcss@1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4))(terser@5.31.6)(tsx@4.19.1)(yaml@2.6.0)
-    transitivePeerDependencies:
-      - supports-color
-
-  '@vitest/expect@2.0.5':
-    dependencies:
-      '@vitest/spy': 2.0.5
-      '@vitest/utils': 2.0.5
-      chai: 5.1.1
-      tinyrainbow: 1.2.0
-
-  '@vitest/pretty-format@2.0.5':
-    dependencies:
-      tinyrainbow: 1.2.0
-
-  '@vitest/runner@2.0.5':
-    dependencies:
-      '@vitest/utils': 2.0.5
-      pathe: 1.1.2
-
-  '@vitest/snapshot@2.0.5':
-    dependencies:
-      '@vitest/pretty-format': 2.0.5
-      magic-string: 0.30.11
-      pathe: 1.1.2
-
-  '@vitest/spy@2.0.5':
-    dependencies:
-      tinyspy: 3.0.0
-
-  '@vitest/utils@2.0.5':
-    dependencies:
-      '@vitest/pretty-format': 2.0.5
+      '@vitest/spy': 4.1.10
       estree-walker: 3.0.3
-      loupe: 3.1.1
-      tinyrainbow: 1.2.0
+      magic-string: 0.30.21
+    optionalDependencies:
+      vite: 8.2.0(@types/node@22.20.1)(esbuild@0.27.7)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0)
 
-  acorn-jsx@5.3.2(acorn@8.14.0):
+  '@vitest/pretty-format@4.1.10':
     dependencies:
-      acorn: 8.14.0
+      tinyrainbow: 3.1.0
 
-  acorn@8.14.0: {}
+  '@vitest/runner@4.1.10':
+    dependencies:
+      '@vitest/utils': 4.1.10
+      pathe: 2.0.3
 
-  ajv@6.12.6:
+  '@vitest/snapshot@4.1.10':
+    dependencies:
+      '@vitest/pretty-format': 4.1.10
+      '@vitest/utils': 4.1.10
+      magic-string: 0.30.21
+      pathe: 2.0.3
+
+  '@vitest/spy@4.1.10': {}
+
+  '@vitest/utils@4.1.10':
+    dependencies:
+      '@vitest/pretty-format': 4.1.10
+      convert-source-map: 2.0.0
+      tinyrainbow: 3.1.0
+
+  '@webassemblyjs/ast@1.14.1':
+    dependencies:
+      '@webassemblyjs/helper-numbers': 1.13.2
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
+
+  '@webassemblyjs/floating-point-hex-parser@1.13.2': {}
+
+  '@webassemblyjs/helper-api-error@1.13.2': {}
+
+  '@webassemblyjs/helper-buffer@1.14.1': {}
+
+  '@webassemblyjs/helper-numbers@1.13.2':
+    dependencies:
+      '@webassemblyjs/floating-point-hex-parser': 1.13.2
+      '@webassemblyjs/helper-api-error': 1.13.2
+      '@xtuc/long': 4.2.2
+
+  '@webassemblyjs/helper-wasm-bytecode@1.13.2': {}
+
+  '@webassemblyjs/helper-wasm-section@1.14.1':
+    dependencies:
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-buffer': 1.14.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
+      '@webassemblyjs/wasm-gen': 1.14.1
+
+  '@webassemblyjs/ieee754@1.13.2':
+    dependencies:
+      '@xtuc/ieee754': 1.2.0
+
+  '@webassemblyjs/leb128@1.13.2':
+    dependencies:
+      '@xtuc/long': 4.2.2
+
+  '@webassemblyjs/utf8@1.13.2': {}
+
+  '@webassemblyjs/wasm-edit@1.14.1':
+    dependencies:
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-buffer': 1.14.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
+      '@webassemblyjs/helper-wasm-section': 1.14.1
+      '@webassemblyjs/wasm-gen': 1.14.1
+      '@webassemblyjs/wasm-opt': 1.14.1
+      '@webassemblyjs/wasm-parser': 1.14.1
+      '@webassemblyjs/wast-printer': 1.14.1
+
+  '@webassemblyjs/wasm-gen@1.14.1':
+    dependencies:
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
+      '@webassemblyjs/ieee754': 1.13.2
+      '@webassemblyjs/leb128': 1.13.2
+      '@webassemblyjs/utf8': 1.13.2
+
+  '@webassemblyjs/wasm-opt@1.14.1':
+    dependencies:
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-buffer': 1.14.1
+      '@webassemblyjs/wasm-gen': 1.14.1
+      '@webassemblyjs/wasm-parser': 1.14.1
+
+  '@webassemblyjs/wasm-parser@1.14.1':
+    dependencies:
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/helper-api-error': 1.13.2
+      '@webassemblyjs/helper-wasm-bytecode': 1.13.2
+      '@webassemblyjs/ieee754': 1.13.2
+      '@webassemblyjs/leb128': 1.13.2
+      '@webassemblyjs/utf8': 1.13.2
+
+  '@webassemblyjs/wast-printer@1.14.1':
+    dependencies:
+      '@webassemblyjs/ast': 1.14.1
+      '@xtuc/long': 4.2.2
+
+  '@xtuc/ieee754@1.2.0': {}
+
+  '@xtuc/long@4.2.2': {}
+
+  acorn@8.16.0: {}
+
+  ajv-formats@2.1.1(ajv@8.20.0):
+    optionalDependencies:
+      ajv: 8.20.0
+
+  ajv-keywords@5.1.0(ajv@8.20.0):
+    dependencies:
+      ajv: 8.20.0
+      fast-deep-equal: 3.1.3
+
+  ajv@8.20.0:
     dependencies:
       fast-deep-equal: 3.1.3
-      fast-json-stable-stringify: 2.1.0
-      json-schema-traverse: 0.4.1
-      uri-js: 4.4.1
-
-  ansi-regex@5.0.1: {}
-
-  ansi-regex@6.0.1: {}
-
-  ansi-styles@3.2.1:
-    dependencies:
-      color-convert: 1.9.3
-
-  ansi-styles@4.3.0:
-    dependencies:
-      color-convert: 2.0.1
-
-  ansi-styles@6.2.1: {}
+      fast-uri: 3.1.2
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
 
   any-promise@1.3.0: {}
 
   anymatch@3.1.3:
     dependencies:
       normalize-path: 3.0.0
-      picomatch: 2.3.1
+      picomatch: 2.3.2
 
   arg@5.0.2: {}
 
   argparse@2.0.1: {}
 
-  aria-query@5.3.2: {}
-
-  array-buffer-byte-length@1.0.1:
-    dependencies:
-      call-bind: 1.0.7
-      is-array-buffer: 3.0.4
-
-  array-includes@3.1.8:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-object-atoms: 1.0.0
-      get-intrinsic: 1.2.4
-      is-string: 1.0.7
-
-  array-union@2.1.0: {}
-
-  array.prototype.findlast@1.2.5:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      es-object-atoms: 1.0.0
-      es-shim-unscopables: 1.0.2
-
-  array.prototype.findlastindex@1.2.5:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      es-object-atoms: 1.0.0
-      es-shim-unscopables: 1.0.2
-
-  array.prototype.flat@1.3.2:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-shim-unscopables: 1.0.2
-
-  array.prototype.flatmap@1.3.2:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-shim-unscopables: 1.0.2
-
-  array.prototype.tosorted@1.1.4:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      es-shim-unscopables: 1.0.2
-
-  arraybuffer.prototype.slice@1.0.3:
-    dependencies:
-      array-buffer-byte-length: 1.0.1
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      is-array-buffer: 3.0.4
-      is-shared-array-buffer: 1.0.3
-
   assertion-error@2.0.1: {}
 
-  ast-types-flow@0.0.8: {}
-
-  autoprefixer@10.4.20(postcss@8.4.47):
+  autoprefixer@10.5.0(postcss@8.5.25):
     dependencies:
-      browserslist: 4.24.2
-      caniuse-lite: 1.0.30001669
-      fraction.js: 4.3.7
-      normalize-range: 0.1.2
+      browserslist: 4.28.2
+      caniuse-lite: 1.0.30001793
+      fraction.js: 5.3.4
       picocolors: 1.1.1
-      postcss: 8.4.47
+      postcss: 8.5.25
       postcss-value-parser: 4.2.0
 
-  available-typed-arrays@1.0.7:
-    dependencies:
-      possible-typed-array-names: 1.0.0
+  baseline-browser-mapping@2.10.31: {}
 
-  axe-core@4.10.2: {}
-
-  axobject-query@4.1.0: {}
-
-  balanced-match@1.0.2: {}
+  before-after-hook@4.0.0: {}
 
   binary-extensions@2.3.0: {}
 
-  brace-expansion@1.1.11:
-    dependencies:
-      balanced-match: 1.0.2
-      concat-map: 0.0.1
-
-  brace-expansion@2.0.1:
-    dependencies:
-      balanced-match: 1.0.2
-
   braces@3.0.3:
     dependencies:
       fill-range: 7.1.1
 
-  browserslist@4.23.2:
+  browserslist@4.28.2:
     dependencies:
-      caniuse-lite: 1.0.30001669
-      electron-to-chromium: 1.5.4
-      node-releases: 2.0.18
-      update-browserslist-db: 1.1.0(browserslist@4.23.2)
+      baseline-browser-mapping: 2.10.31
+      caniuse-lite: 1.0.30001793
+      electron-to-chromium: 1.5.361
+      node-releases: 2.0.46
+      update-browserslist-db: 1.2.3(browserslist@4.28.2)
 
-  browserslist@4.24.2:
+  buffer-from@1.1.2: {}
+
+  bun-types@1.3.14:
     dependencies:
-      caniuse-lite: 1.0.30001669
-      electron-to-chromium: 1.5.45
-      node-releases: 2.0.18
-      update-browserslist-db: 1.1.1(browserslist@4.24.2)
+      '@types/node': 25.9.1
 
-  buffer-from@1.1.2:
-    optional: true
-
-  bun-types@1.1.34:
-    dependencies:
-      '@types/node': 20.12.14
-      '@types/ws': 8.5.12
-
-  bun@1.1.29:
+  bun@1.3.14:
     optionalDependencies:
-      '@oven/bun-darwin-aarch64': 1.1.29
-      '@oven/bun-darwin-x64': 1.1.29
-      '@oven/bun-darwin-x64-baseline': 1.1.29
-      '@oven/bun-linux-aarch64': 1.1.29
-      '@oven/bun-linux-x64': 1.1.29
-      '@oven/bun-linux-x64-baseline': 1.1.29
-      '@oven/bun-windows-x64': 1.1.29
-      '@oven/bun-windows-x64-baseline': 1.1.29
+      '@oven/bun-darwin-aarch64': 1.3.14
+      '@oven/bun-darwin-x64': 1.3.14
+      '@oven/bun-darwin-x64-baseline': 1.3.14
+      '@oven/bun-freebsd-aarch64': 1.3.14
+      '@oven/bun-freebsd-x64': 1.3.14
+      '@oven/bun-linux-aarch64': 1.3.14
+      '@oven/bun-linux-aarch64-android': 1.3.14
+      '@oven/bun-linux-aarch64-musl': 1.3.14
+      '@oven/bun-linux-x64': 1.3.14
+      '@oven/bun-linux-x64-android': 1.3.14
+      '@oven/bun-linux-x64-baseline': 1.3.14
+      '@oven/bun-linux-x64-musl': 1.3.14
+      '@oven/bun-linux-x64-musl-baseline': 1.3.14
+      '@oven/bun-windows-aarch64': 1.3.14
+      '@oven/bun-windows-x64': 1.3.14
+      '@oven/bun-windows-x64-baseline': 1.3.14
 
-  bundle-require@5.0.0(esbuild@0.23.0):
+  bundle-require@5.1.0(esbuild@0.27.7):
     dependencies:
-      esbuild: 0.23.0
+      esbuild: 0.27.7
       load-tsconfig: 0.2.5
 
-  busboy@1.6.0:
-    dependencies:
-      streamsearch: 1.1.0
-
   cac@6.7.14: {}
 
-  call-bind@1.0.7:
-    dependencies:
-      es-define-property: 1.0.0
-      es-errors: 1.3.0
-      function-bind: 1.1.2
-      get-intrinsic: 1.2.4
-      set-function-length: 1.2.2
-
-  callsites@3.1.0: {}
-
   camelcase-css@2.0.1: {}
 
-  caniuse-lite@1.0.30001669: {}
+  caniuse-lite@1.0.30001793: {}
 
-  chai@5.1.1:
-    dependencies:
-      assertion-error: 2.0.1
-      check-error: 2.1.1
-      deep-eql: 5.0.2
-      loupe: 3.1.1
-      pathval: 2.0.0
+  chai@6.2.2: {}
 
-  chalk@2.4.2:
-    dependencies:
-      ansi-styles: 3.2.1
-      escape-string-regexp: 1.0.5
-      supports-color: 5.5.0
-
-  chalk@4.1.2:
-    dependencies:
-      ansi-styles: 4.3.0
-      supports-color: 7.2.0
-
-  check-error@2.1.1: {}
+  chardet@2.1.1: {}
 
   chokidar@3.6.0:
     dependencies:
@@ -7437,715 +4883,188 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.3
 
+  chokidar@4.0.3:
+    dependencies:
+      readdirp: 4.1.2
+
+  chrome-trace-event@1.0.4: {}
+
+  citty@0.2.2: {}
+
+  cli-width@4.1.0: {}
+
   client-only@0.0.1: {}
 
-  color-convert@1.9.3:
+  clipanion@4.0.0-rc.4(typanion@3.14.0):
     dependencies:
-      color-name: 1.1.3
+      typanion: 3.14.0
 
-  color-convert@2.0.1:
-    dependencies:
-      color-name: 1.1.4
+  colorette@2.0.20: {}
 
-  color-name@1.1.3: {}
-
-  color-name@1.1.4: {}
-
-  color-string@1.9.1:
-    dependencies:
-      color-name: 1.1.4
-      simple-swizzle: 0.2.2
-    optional: true
-
-  color@4.2.3:
-    dependencies:
-      color-convert: 2.0.1
-      color-string: 1.9.1
-    optional: true
-
-  commander@2.20.3:
-    optional: true
+  commander@2.20.3: {}
 
   commander@4.1.1: {}
 
-  concat-map@0.0.1: {}
+  confbox@0.1.8: {}
 
-  consola@3.2.3: {}
+  consola@3.4.2: {}
+
+  content-type@2.0.0: {}
 
   convert-source-map@2.0.0: {}
 
-  cross-spawn@7.0.3:
-    dependencies:
-      path-key: 3.1.1
-      shebang-command: 2.0.0
-      which: 2.0.2
+  cookie-es@1.2.3: {}
 
-  cross-spawn@7.0.6:
+  crossws@0.3.5:
     dependencies:
-      path-key: 3.1.1
-      shebang-command: 2.0.0
-      which: 2.0.2
+      uncrypto: 0.1.3
+
+  crossws@0.4.10: {}
 
   cssesc@3.0.0: {}
 
-  csstype@3.1.3: {}
+  csstype@3.2.3: {}
 
-  damerau-levenshtein@1.0.8: {}
-
-  data-view-buffer@1.0.1:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-data-view: 1.0.1
-
-  data-view-byte-length@1.0.1:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-data-view: 1.0.1
-
-  data-view-byte-offset@1.0.0:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-data-view: 1.0.1
-
-  debug@3.2.7:
+  debug@4.4.3:
     dependencies:
       ms: 2.1.3
 
-  debug@4.3.6:
-    dependencies:
-      ms: 2.1.2
+  dedent@1.7.2: {}
 
-  debug@4.3.7:
-    dependencies:
-      ms: 2.1.3
+  defu@6.1.7: {}
 
-  dedent@1.5.3: {}
-
-  deep-eql@5.0.2: {}
-
-  deep-is@0.1.4: {}
-
-  define-data-property@1.1.4:
-    dependencies:
-      es-define-property: 1.0.0
-      es-errors: 1.3.0
-      gopd: 1.0.1
-
-  define-properties@1.2.1:
-    dependencies:
-      define-data-property: 1.1.4
-      has-property-descriptors: 1.0.2
-      object-keys: 1.1.1
+  destr@2.0.5: {}
 
   detect-libc@1.0.3: {}
 
-  detect-libc@2.0.3:
-    optional: true
+  detect-libc@2.1.2: {}
 
   didyoumean@1.2.2: {}
 
-  dir-glob@3.0.1:
-    dependencies:
-      path-type: 4.0.0
-
   dlv@1.1.3: {}
 
-  doctrine@2.1.0:
-    dependencies:
-      esutils: 2.0.3
+  electron-to-chromium@1.5.361: {}
 
-  eastasianwidth@0.2.0: {}
+  emnapi@1.11.3(node-addon-api@8.7.0):
+    optionalDependencies:
+      node-addon-api: 8.7.0
 
-  electron-to-chromium@1.5.4: {}
-
-  electron-to-chromium@1.5.45: {}
-
-  emoji-regex@8.0.0: {}
-
-  emoji-regex@9.2.2: {}
-
-  enhanced-resolve@5.17.1:
+  enhanced-resolve@5.24.5:
     dependencies:
       graceful-fs: 4.2.11
-      tapable: 2.2.1
-
-  es-abstract@1.23.3:
-    dependencies:
-      array-buffer-byte-length: 1.0.1
-      arraybuffer.prototype.slice: 1.0.3
-      available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      data-view-buffer: 1.0.1
-      data-view-byte-length: 1.0.1
-      data-view-byte-offset: 1.0.0
-      es-define-property: 1.0.0
-      es-errors: 1.3.0
-      es-object-atoms: 1.0.0
-      es-set-tostringtag: 2.0.3
-      es-to-primitive: 1.2.1
-      function.prototype.name: 1.1.6
-      get-intrinsic: 1.2.4
-      get-symbol-description: 1.0.2
-      globalthis: 1.0.4
-      gopd: 1.0.1
-      has-property-descriptors: 1.0.2
-      has-proto: 1.0.3
-      has-symbols: 1.0.3
-      hasown: 2.0.2
-      internal-slot: 1.0.7
-      is-array-buffer: 3.0.4
-      is-callable: 1.2.7
-      is-data-view: 1.0.1
-      is-negative-zero: 2.0.3
-      is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.3
-      is-string: 1.0.7
-      is-typed-array: 1.1.13
-      is-weakref: 1.0.2
-      object-inspect: 1.13.2
-      object-keys: 1.1.1
-      object.assign: 4.1.5
-      regexp.prototype.flags: 1.5.2
-      safe-array-concat: 1.1.2
-      safe-regex-test: 1.0.3
-      string.prototype.trim: 1.2.9
-      string.prototype.trimend: 1.0.8
-      string.prototype.trimstart: 1.0.8
-      typed-array-buffer: 1.0.2
-      typed-array-byte-length: 1.0.1
-      typed-array-byte-offset: 1.0.2
-      typed-array-length: 1.0.6
-      unbox-primitive: 1.0.2
-      which-typed-array: 1.1.15
-
-  es-define-property@1.0.0:
-    dependencies:
-      get-intrinsic: 1.2.4
+      tapable: 2.3.3
 
   es-errors@1.3.0: {}
 
-  es-iterator-helpers@1.1.0:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      es-set-tostringtag: 2.0.3
-      function-bind: 1.1.2
-      get-intrinsic: 1.2.4
-      globalthis: 1.0.4
-      has-property-descriptors: 1.0.2
-      has-proto: 1.0.3
-      has-symbols: 1.0.3
-      internal-slot: 1.0.7
-      iterator.prototype: 1.1.3
-      safe-array-concat: 1.1.2
+  es-module-lexer@2.1.0: {}
 
-  es-object-atoms@1.0.0:
-    dependencies:
-      es-errors: 1.3.0
+  es-toolkit@1.50.0: {}
 
-  es-set-tostringtag@2.0.3:
-    dependencies:
-      get-intrinsic: 1.2.4
-      has-tostringtag: 1.0.2
-      hasown: 2.0.2
-
-  es-shim-unscopables@1.0.2:
-    dependencies:
-      hasown: 2.0.2
-
-  es-to-primitive@1.2.1:
-    dependencies:
-      is-callable: 1.2.7
-      is-date-object: 1.0.5
-      is-symbol: 1.0.4
-
-  esbuild@0.21.5:
+  esbuild@0.27.7:
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.21.5
-      '@esbuild/android-arm': 0.21.5
-      '@esbuild/android-arm64': 0.21.5
-      '@esbuild/android-x64': 0.21.5
-      '@esbuild/darwin-arm64': 0.21.5
-      '@esbuild/darwin-x64': 0.21.5
-      '@esbuild/freebsd-arm64': 0.21.5
-      '@esbuild/freebsd-x64': 0.21.5
-      '@esbuild/linux-arm': 0.21.5
-      '@esbuild/linux-arm64': 0.21.5
-      '@esbuild/linux-ia32': 0.21.5
-      '@esbuild/linux-loong64': 0.21.5
-      '@esbuild/linux-mips64el': 0.21.5
-      '@esbuild/linux-ppc64': 0.21.5
-      '@esbuild/linux-riscv64': 0.21.5
-      '@esbuild/linux-s390x': 0.21.5
-      '@esbuild/linux-x64': 0.21.5
-      '@esbuild/netbsd-x64': 0.21.5
-      '@esbuild/openbsd-x64': 0.21.5
-      '@esbuild/sunos-x64': 0.21.5
-      '@esbuild/win32-arm64': 0.21.5
-      '@esbuild/win32-ia32': 0.21.5
-      '@esbuild/win32-x64': 0.21.5
-
-  esbuild@0.23.0:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.23.0
-      '@esbuild/android-arm': 0.23.0
-      '@esbuild/android-arm64': 0.23.0
-      '@esbuild/android-x64': 0.23.0
-      '@esbuild/darwin-arm64': 0.23.0
-      '@esbuild/darwin-x64': 0.23.0
-      '@esbuild/freebsd-arm64': 0.23.0
-      '@esbuild/freebsd-x64': 0.23.0
-      '@esbuild/linux-arm': 0.23.0
-      '@esbuild/linux-arm64': 0.23.0
-      '@esbuild/linux-ia32': 0.23.0
-      '@esbuild/linux-loong64': 0.23.0
-      '@esbuild/linux-mips64el': 0.23.0
-      '@esbuild/linux-ppc64': 0.23.0
-      '@esbuild/linux-riscv64': 0.23.0
-      '@esbuild/linux-s390x': 0.23.0
-      '@esbuild/linux-x64': 0.23.0
-      '@esbuild/netbsd-x64': 0.23.0
-      '@esbuild/openbsd-arm64': 0.23.0
-      '@esbuild/openbsd-x64': 0.23.0
-      '@esbuild/sunos-x64': 0.23.0
-      '@esbuild/win32-arm64': 0.23.0
-      '@esbuild/win32-ia32': 0.23.0
-      '@esbuild/win32-x64': 0.23.0
-
-  esbuild@0.23.1:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.23.1
-      '@esbuild/android-arm': 0.23.1
-      '@esbuild/android-arm64': 0.23.1
-      '@esbuild/android-x64': 0.23.1
-      '@esbuild/darwin-arm64': 0.23.1
-      '@esbuild/darwin-x64': 0.23.1
-      '@esbuild/freebsd-arm64': 0.23.1
-      '@esbuild/freebsd-x64': 0.23.1
-      '@esbuild/linux-arm': 0.23.1
-      '@esbuild/linux-arm64': 0.23.1
-      '@esbuild/linux-ia32': 0.23.1
-      '@esbuild/linux-loong64': 0.23.1
-      '@esbuild/linux-mips64el': 0.23.1
-      '@esbuild/linux-ppc64': 0.23.1
-      '@esbuild/linux-riscv64': 0.23.1
-      '@esbuild/linux-s390x': 0.23.1
-      '@esbuild/linux-x64': 0.23.1
-      '@esbuild/netbsd-x64': 0.23.1
-      '@esbuild/openbsd-arm64': 0.23.1
-      '@esbuild/openbsd-x64': 0.23.1
-      '@esbuild/sunos-x64': 0.23.1
-      '@esbuild/win32-arm64': 0.23.1
-      '@esbuild/win32-ia32': 0.23.1
-      '@esbuild/win32-x64': 0.23.1
-    optional: true
-
-  esbuild@0.24.0:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.24.0
-      '@esbuild/android-arm': 0.24.0
-      '@esbuild/android-arm64': 0.24.0
-      '@esbuild/android-x64': 0.24.0
-      '@esbuild/darwin-arm64': 0.24.0
-      '@esbuild/darwin-x64': 0.24.0
-      '@esbuild/freebsd-arm64': 0.24.0
-      '@esbuild/freebsd-x64': 0.24.0
-      '@esbuild/linux-arm': 0.24.0
-      '@esbuild/linux-arm64': 0.24.0
-      '@esbuild/linux-ia32': 0.24.0
-      '@esbuild/linux-loong64': 0.24.0
-      '@esbuild/linux-mips64el': 0.24.0
-      '@esbuild/linux-ppc64': 0.24.0
-      '@esbuild/linux-riscv64': 0.24.0
-      '@esbuild/linux-s390x': 0.24.0
-      '@esbuild/linux-x64': 0.24.0
-      '@esbuild/netbsd-x64': 0.24.0
-      '@esbuild/openbsd-arm64': 0.24.0
-      '@esbuild/openbsd-x64': 0.24.0
-      '@esbuild/sunos-x64': 0.24.0
-      '@esbuild/win32-arm64': 0.24.0
-      '@esbuild/win32-ia32': 0.24.0
-      '@esbuild/win32-x64': 0.24.0
-
-  escalade@3.1.2: {}
+      '@esbuild/aix-ppc64': 0.27.7
+      '@esbuild/android-arm': 0.27.7
+      '@esbuild/android-arm64': 0.27.7
+      '@esbuild/android-x64': 0.27.7
+      '@esbuild/darwin-arm64': 0.27.7
+      '@esbuild/darwin-x64': 0.27.7
+      '@esbuild/freebsd-arm64': 0.27.7
+      '@esbuild/freebsd-x64': 0.27.7
+      '@esbuild/linux-arm': 0.27.7
+      '@esbuild/linux-arm64': 0.27.7
+      '@esbuild/linux-ia32': 0.27.7
+      '@esbuild/linux-loong64': 0.27.7
+      '@esbuild/linux-mips64el': 0.27.7
+      '@esbuild/linux-ppc64': 0.27.7
+      '@esbuild/linux-riscv64': 0.27.7
+      '@esbuild/linux-s390x': 0.27.7
+      '@esbuild/linux-x64': 0.27.7
+      '@esbuild/netbsd-arm64': 0.27.7
+      '@esbuild/netbsd-x64': 0.27.7
+      '@esbuild/openbsd-arm64': 0.27.7
+      '@esbuild/openbsd-x64': 0.27.7
+      '@esbuild/openharmony-arm64': 0.27.7
+      '@esbuild/sunos-x64': 0.27.7
+      '@esbuild/win32-arm64': 0.27.7
+      '@esbuild/win32-ia32': 0.27.7
+      '@esbuild/win32-x64': 0.27.7
 
   escalade@3.2.0: {}
 
-  escape-string-regexp@1.0.5: {}
-
-  escape-string-regexp@4.0.0: {}
-
-  eslint-config-next@15.0.3(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4):
-    dependencies:
-      '@next/eslint-plugin-next': 15.0.3
-      '@rushstack/eslint-patch': 1.10.4
-      '@typescript-eslint/eslint-plugin': 8.11.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4))(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4)
-      '@typescript-eslint/parser': 8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4)
-      eslint: 9.15.0(jiti@2.4.0)
-      eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.15.0(jiti@2.4.0))
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@9.15.0(jiti@2.4.0))
-      eslint-plugin-jsx-a11y: 6.10.1(eslint@9.15.0(jiti@2.4.0))
-      eslint-plugin-react: 7.37.2(eslint@9.15.0(jiti@2.4.0))
-      eslint-plugin-react-hooks: 5.0.0(eslint@9.15.0(jiti@2.4.0))
-    optionalDependencies:
-      typescript: 5.5.4
-    transitivePeerDependencies:
-      - eslint-import-resolver-webpack
-      - eslint-plugin-import-x
-      - supports-color
-
-  eslint-config-next@15.0.3(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3):
-    dependencies:
-      '@next/eslint-plugin-next': 15.0.3
-      '@rushstack/eslint-patch': 1.10.4
-      '@typescript-eslint/eslint-plugin': 8.11.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3))(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3)
-      '@typescript-eslint/parser': 8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3)
-      eslint: 9.15.0(jiti@2.4.0)
-      eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.15.0(jiti@2.4.0))
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3))(eslint@9.15.0(jiti@2.4.0))
-      eslint-plugin-jsx-a11y: 6.10.1(eslint@9.15.0(jiti@2.4.0))
-      eslint-plugin-react: 7.37.2(eslint@9.15.0(jiti@2.4.0))
-      eslint-plugin-react-hooks: 5.0.0(eslint@9.15.0(jiti@2.4.0))
-    optionalDependencies:
-      typescript: 5.6.3
-    transitivePeerDependencies:
-      - eslint-import-resolver-webpack
-      - eslint-plugin-import-x
-      - supports-color
-
-  eslint-import-resolver-node@0.3.9:
-    dependencies:
-      debug: 3.2.7
-      is-core-module: 2.15.1
-      resolve: 1.22.8
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.15.0(jiti@2.4.0)):
-    dependencies:
-      '@nolyfill/is-core-module': 1.0.39
-      debug: 4.3.7
-      enhanced-resolve: 5.17.1
-      eslint: 9.15.0(jiti@2.4.0)
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.15.0(jiti@2.4.0)))(eslint@9.15.0(jiti@2.4.0))
-      fast-glob: 3.3.2
-      get-tsconfig: 4.8.1
-      is-bun-module: 1.2.1
-      is-glob: 4.0.3
-    optionalDependencies:
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@9.15.0(jiti@2.4.0))
-    transitivePeerDependencies:
-      - '@typescript-eslint/parser'
-      - eslint-import-resolver-node
-      - eslint-import-resolver-webpack
-      - supports-color
-
-  eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.15.0(jiti@2.4.0)):
-    dependencies:
-      '@nolyfill/is-core-module': 1.0.39
-      debug: 4.3.7
-      enhanced-resolve: 5.17.1
-      eslint: 9.15.0(jiti@2.4.0)
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.15.0(jiti@2.4.0)))(eslint@9.15.0(jiti@2.4.0))
-      fast-glob: 3.3.2
-      get-tsconfig: 4.8.1
-      is-bun-module: 1.2.1
-      is-glob: 4.0.3
-    optionalDependencies:
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3))(eslint@9.15.0(jiti@2.4.0))
-    transitivePeerDependencies:
-      - '@typescript-eslint/parser'
-      - eslint-import-resolver-node
-      - eslint-import-resolver-webpack
-      - supports-color
-
-  eslint-module-utils@2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.15.0(jiti@2.4.0)))(eslint@9.15.0(jiti@2.4.0)):
-    dependencies:
-      debug: 3.2.7
-    optionalDependencies:
-      '@typescript-eslint/parser': 8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4)
-      eslint: 9.15.0(jiti@2.4.0)
-      eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.15.0(jiti@2.4.0))
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-module-utils@2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.15.0(jiti@2.4.0)))(eslint@9.15.0(jiti@2.4.0)):
-    dependencies:
-      debug: 3.2.7
-    optionalDependencies:
-      '@typescript-eslint/parser': 8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3)
-      eslint: 9.15.0(jiti@2.4.0)
-      eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.15.0(jiti@2.4.0))
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@9.15.0(jiti@2.4.0)):
-    dependencies:
-      '@rtsao/scc': 1.1.0
-      array-includes: 3.1.8
-      array.prototype.findlastindex: 1.2.5
-      array.prototype.flat: 1.3.2
-      array.prototype.flatmap: 1.3.2
-      debug: 3.2.7
-      doctrine: 2.1.0
-      eslint: 9.15.0(jiti@2.4.0)
-      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.15.0(jiti@2.4.0)))(eslint@9.15.0(jiti@2.4.0))
-      hasown: 2.0.2
-      is-core-module: 2.15.1
-      is-glob: 4.0.3
-      minimatch: 3.1.2
-      object.fromentries: 2.0.8
-      object.groupby: 1.0.3
-      object.values: 1.2.0
-      semver: 6.3.1
-      string.prototype.trimend: 1.0.8
-      tsconfig-paths: 3.15.0
-    optionalDependencies:
-      '@typescript-eslint/parser': 8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.5.4)
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-
-  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3))(eslint@9.15.0(jiti@2.4.0)):
-    dependencies:
-      '@rtsao/scc': 1.1.0
-      array-includes: 3.1.8
-      array.prototype.findlastindex: 1.2.5
-      array.prototype.flat: 1.3.2
-      array.prototype.flatmap: 1.3.2
-      debug: 3.2.7
-      doctrine: 2.1.0
-      eslint: 9.15.0(jiti@2.4.0)
-      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.15.0(jiti@2.4.0)))(eslint@9.15.0(jiti@2.4.0))
-      hasown: 2.0.2
-      is-core-module: 2.15.1
-      is-glob: 4.0.3
-      minimatch: 3.1.2
-      object.fromentries: 2.0.8
-      object.groupby: 1.0.3
-      object.values: 1.2.0
-      semver: 6.3.1
-      string.prototype.trimend: 1.0.8
-      tsconfig-paths: 3.15.0
-    optionalDependencies:
-      '@typescript-eslint/parser': 8.11.0(eslint@9.15.0(jiti@2.4.0))(typescript@5.6.3)
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-
-  eslint-plugin-jsx-a11y@6.10.1(eslint@9.15.0(jiti@2.4.0)):
-    dependencies:
-      aria-query: 5.3.2
-      array-includes: 3.1.8
-      array.prototype.flatmap: 1.3.2
-      ast-types-flow: 0.0.8
-      axe-core: 4.10.2
-      axobject-query: 4.1.0
-      damerau-levenshtein: 1.0.8
-      emoji-regex: 9.2.2
-      es-iterator-helpers: 1.1.0
-      eslint: 9.15.0(jiti@2.4.0)
-      hasown: 2.0.2
-      jsx-ast-utils: 3.3.5
-      language-tags: 1.0.9
-      minimatch: 3.1.2
-      object.fromentries: 2.0.8
-      safe-regex-test: 1.0.3
-      string.prototype.includes: 2.0.1
-
-  eslint-plugin-react-hooks@5.0.0(eslint@9.15.0(jiti@2.4.0)):
-    dependencies:
-      eslint: 9.15.0(jiti@2.4.0)
-
-  eslint-plugin-react@7.37.2(eslint@9.15.0(jiti@2.4.0)):
-    dependencies:
-      array-includes: 3.1.8
-      array.prototype.findlast: 1.2.5
-      array.prototype.flatmap: 1.3.2
-      array.prototype.tosorted: 1.1.4
-      doctrine: 2.1.0
-      es-iterator-helpers: 1.1.0
-      eslint: 9.15.0(jiti@2.4.0)
-      estraverse: 5.3.0
-      hasown: 2.0.2
-      jsx-ast-utils: 3.3.5
-      minimatch: 3.1.2
-      object.entries: 1.1.8
-      object.fromentries: 2.0.8
-      object.values: 1.2.0
-      prop-types: 15.8.1
-      resolve: 2.0.0-next.5
-      semver: 6.3.1
-      string.prototype.matchall: 4.0.11
-      string.prototype.repeat: 1.0.0
-
-  eslint-scope@8.2.0:
+  eslint-scope@5.1.1:
     dependencies:
       esrecurse: 4.3.0
-      estraverse: 5.3.0
-
-  eslint-visitor-keys@3.4.3: {}
-
-  eslint-visitor-keys@4.2.0: {}
-
-  eslint@9.15.0(jiti@2.4.0):
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.15.0(jiti@2.4.0))
-      '@eslint-community/regexpp': 4.12.1
-      '@eslint/config-array': 0.19.0
-      '@eslint/core': 0.9.0
-      '@eslint/eslintrc': 3.2.0
-      '@eslint/js': 9.15.0
-      '@eslint/plugin-kit': 0.2.3
-      '@humanfs/node': 0.16.6
-      '@humanwhocodes/module-importer': 1.0.1
-      '@humanwhocodes/retry': 0.4.1
-      '@types/estree': 1.0.6
-      '@types/json-schema': 7.0.15
-      ajv: 6.12.6
-      chalk: 4.1.2
-      cross-spawn: 7.0.6
-      debug: 4.3.7
-      escape-string-regexp: 4.0.0
-      eslint-scope: 8.2.0
-      eslint-visitor-keys: 4.2.0
-      espree: 10.3.0
-      esquery: 1.6.0
-      esutils: 2.0.3
-      fast-deep-equal: 3.1.3
-      file-entry-cache: 8.0.0
-      find-up: 5.0.0
-      glob-parent: 6.0.2
-      ignore: 5.3.2
-      imurmurhash: 0.1.4
-      is-glob: 4.0.3
-      json-stable-stringify-without-jsonify: 1.0.1
-      lodash.merge: 4.6.2
-      minimatch: 3.1.2
-      natural-compare: 1.4.0
-      optionator: 0.9.4
-    optionalDependencies:
-      jiti: 2.4.0
-    transitivePeerDependencies:
-      - supports-color
-
-  espree@10.3.0:
-    dependencies:
-      acorn: 8.14.0
-      acorn-jsx: 5.3.2(acorn@8.14.0)
-      eslint-visitor-keys: 4.2.0
-
-  esquery@1.6.0:
-    dependencies:
-      estraverse: 5.3.0
+      estraverse: 4.3.0
 
   esrecurse@4.3.0:
     dependencies:
       estraverse: 5.3.0
 
+  estraverse@4.3.0: {}
+
   estraverse@5.3.0: {}
 
   estree-walker@3.0.3:
     dependencies:
-      '@types/estree': 1.0.6
+      '@types/estree': 1.0.9
 
-  esutils@2.0.3: {}
+  events@3.3.0: {}
 
-  execa@5.1.1:
-    dependencies:
-      cross-spawn: 7.0.3
-      get-stream: 6.0.1
-      human-signals: 2.1.0
-      is-stream: 2.0.1
-      merge-stream: 2.0.0
-      npm-run-path: 4.0.1
-      onetime: 5.1.2
-      signal-exit: 3.0.7
-      strip-final-newline: 2.0.0
+  expect-type@1.3.0: {}
 
-  execa@8.0.1:
-    dependencies:
-      cross-spawn: 7.0.3
-      get-stream: 8.0.1
-      human-signals: 5.0.0
-      is-stream: 3.0.0
-      merge-stream: 2.0.0
-      npm-run-path: 5.3.0
-      onetime: 6.0.0
-      signal-exit: 4.1.0
-      strip-final-newline: 3.0.0
+  fast-content-type-parse@3.0.0: {}
 
   fast-deep-equal@3.1.3: {}
 
-  fast-glob@3.3.1:
+  fast-equals@5.4.0: {}
+
+  fast-glob@3.3.3:
     dependencies:
       '@nodelib/fs.stat': 2.0.5
       '@nodelib/fs.walk': 1.2.8
       glob-parent: 5.1.2
       merge2: 1.4.1
-      micromatch: 4.0.7
+      micromatch: 4.0.8
 
-  fast-glob@3.3.2:
+  fast-string-truncated-width@3.0.3: {}
+
+  fast-string-width@3.0.2:
     dependencies:
-      '@nodelib/fs.stat': 2.0.5
-      '@nodelib/fs.walk': 1.2.8
-      glob-parent: 5.1.2
-      merge2: 1.4.1
-      micromatch: 4.0.7
+      fast-string-truncated-width: 3.0.3
 
-  fast-json-stable-stringify@2.1.0: {}
+  fast-stringify@4.0.0: {}
 
-  fast-levenshtein@2.0.6: {}
+  fast-uri@3.1.2: {}
 
-  fastq@1.17.1:
+  fast-wrap-ansi@0.2.2:
     dependencies:
-      reusify: 1.0.4
+      fast-string-width: 3.0.2
 
-  file-entry-cache@8.0.0:
+  fastq@1.20.1:
     dependencies:
-      flat-cache: 4.0.1
+      reusify: 1.1.0
+
+  fdir@6.5.0(picomatch@4.0.4):
+    optionalDependencies:
+      picomatch: 4.0.4
+
+  fdir@6.5.0(picomatch@4.0.5):
+    optionalDependencies:
+      picomatch: 4.0.5
 
   fill-range@7.1.1:
     dependencies:
       to-regex-range: 5.0.1
 
-  find-up-simple@1.0.0: {}
+  find-up-simple@1.0.1: {}
 
-  find-up@5.0.0:
+  fix-dts-default-cjs-exports@1.0.1:
     dependencies:
-      locate-path: 6.0.0
-      path-exists: 4.0.0
+      magic-string: 0.30.21
+      mlly: 1.8.2
+      rollup: 4.60.4
 
-  flat-cache@4.0.1:
-    dependencies:
-      flatted: 3.3.1
-      keyv: 4.5.4
-
-  flatted@3.3.1: {}
-
-  for-each@0.3.3:
-    dependencies:
-      is-callable: 1.2.7
-
-  foreground-child@3.3.0:
-    dependencies:
-      cross-spawn: 7.0.3
-      signal-exit: 4.1.0
-
-  fraction.js@4.3.7: {}
+  fraction.js@5.3.4: {}
 
   fsevents@2.3.2:
     optional: true
@@ -8155,40 +5074,7 @@ snapshots:
 
   function-bind@1.1.2: {}
 
-  function.prototype.name@1.1.6:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      functions-have-names: 1.2.3
-
-  functions-have-names@1.2.3: {}
-
-  gensync@1.0.0-beta.2: {}
-
-  get-func-name@2.0.2: {}
-
-  get-intrinsic@1.2.4:
-    dependencies:
-      es-errors: 1.3.0
-      function-bind: 1.1.2
-      has-proto: 1.0.3
-      has-symbols: 1.0.3
-      hasown: 2.0.2
-
-  get-stream@6.0.1: {}
-
-  get-stream@8.0.1: {}
-
-  get-symbol-description@1.0.2:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-
-  get-tsconfig@4.8.1:
-    dependencies:
-      resolve-pkg-maps: 1.0.0
+  get-port-please@3.2.0: {}
 
   glob-parent@5.1.2:
     dependencies:
@@ -8198,596 +5084,335 @@ snapshots:
     dependencies:
       is-glob: 4.0.3
 
-  glob@10.4.5:
+  globby@16.2.2:
     dependencies:
-      foreground-child: 3.3.0
-      jackspeak: 3.4.3
-      minimatch: 9.0.5
-      minipass: 7.1.2
-      package-json-from-dist: 1.0.1
-      path-scurry: 1.11.1
-
-  globals@11.12.0: {}
-
-  globals@14.0.0: {}
-
-  globalthis@1.0.4:
-    dependencies:
-      define-properties: 1.2.1
-      gopd: 1.0.1
-
-  globby@11.1.0:
-    dependencies:
-      array-union: 2.1.0
-      dir-glob: 3.0.1
-      fast-glob: 3.3.2
-      ignore: 5.3.2
-      merge2: 1.4.1
-      slash: 3.0.0
-
-  globby@14.0.2:
-    dependencies:
-      '@sindresorhus/merge-streams': 2.3.0
-      fast-glob: 3.3.2
-      ignore: 5.3.1
-      path-type: 5.0.0
+      '@sindresorhus/merge-streams': 4.0.0
+      fast-glob: 3.3.3
+      ignore: 7.0.5
+      is-path-inside: 4.0.0
       slash: 5.1.0
-      unicorn-magic: 0.1.0
-
-  gopd@1.0.1:
-    dependencies:
-      get-intrinsic: 1.2.4
+      unicorn-magic: 0.4.0
 
   graceful-fs@4.2.11: {}
 
-  graphemer@1.4.0: {}
-
-  has-bigints@1.0.2: {}
-
-  has-flag@3.0.0: {}
+  h3@1.15.11:
+    dependencies:
+      cookie-es: 1.2.3
+      crossws: 0.3.5
+      defu: 6.1.7
+      destr: 2.0.5
+      iron-webcrypto: 1.2.1
+      node-mock-http: 1.0.4
+      radix3: 1.1.2
+      ufo: 1.6.4
+      uncrypto: 0.1.3
 
   has-flag@4.0.0: {}
 
-  has-property-descriptors@1.0.2:
-    dependencies:
-      es-define-property: 1.0.0
-
-  has-proto@1.0.3: {}
-
-  has-symbols@1.0.3: {}
-
-  has-tostringtag@1.0.2:
-    dependencies:
-      has-symbols: 1.0.3
-
-  hasown@2.0.2:
+  hasown@2.0.3:
     dependencies:
       function-bind: 1.1.2
 
-  human-signals@2.1.0: {}
+  http-shutdown@1.2.2: {}
 
-  human-signals@5.0.0: {}
-
-  ignore@5.3.1: {}
-
-  ignore@5.3.2: {}
-
-  import-fresh@3.3.0:
+  iconv-lite@0.7.2:
     dependencies:
-      parent-module: 1.0.1
-      resolve-from: 4.0.0
+      safer-buffer: 2.1.2
 
-  imurmurhash@0.1.4: {}
+  ignore@7.0.5: {}
 
-  internal-slot@1.0.7:
-    dependencies:
-      es-errors: 1.3.0
-      hasown: 2.0.2
-      side-channel: 1.0.6
-
-  is-array-buffer@3.0.4:
-    dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-
-  is-arrayish@0.3.2:
-    optional: true
-
-  is-async-function@2.0.0:
-    dependencies:
-      has-tostringtag: 1.0.2
-
-  is-bigint@1.0.4:
-    dependencies:
-      has-bigints: 1.0.2
+  iron-webcrypto@1.2.1: {}
 
   is-binary-path@2.1.0:
     dependencies:
       binary-extensions: 2.3.0
 
-  is-boolean-object@1.1.2:
+  is-core-module@2.16.2:
     dependencies:
-      call-bind: 1.0.7
-      has-tostringtag: 1.0.2
-
-  is-bun-module@1.2.1:
-    dependencies:
-      semver: 7.6.3
-
-  is-callable@1.2.7: {}
-
-  is-core-module@2.15.0:
-    dependencies:
-      hasown: 2.0.2
-
-  is-core-module@2.15.1:
-    dependencies:
-      hasown: 2.0.2
-
-  is-data-view@1.0.1:
-    dependencies:
-      is-typed-array: 1.1.13
-
-  is-date-object@1.0.5:
-    dependencies:
-      has-tostringtag: 1.0.2
+      hasown: 2.0.3
 
   is-extglob@2.1.1: {}
 
-  is-finalizationregistry@1.0.2:
-    dependencies:
-      call-bind: 1.0.7
-
-  is-fullwidth-code-point@3.0.0: {}
-
-  is-generator-function@1.0.10:
-    dependencies:
-      has-tostringtag: 1.0.2
-
   is-glob@4.0.3:
     dependencies:
       is-extglob: 2.1.1
 
-  is-map@2.0.3: {}
-
-  is-negative-zero@2.0.3: {}
-
-  is-number-object@1.0.7:
-    dependencies:
-      has-tostringtag: 1.0.2
-
   is-number@7.0.0: {}
 
-  is-regex@1.1.4:
+  is-path-inside@4.0.0: {}
+
+  jest-worker@27.5.1:
     dependencies:
-      call-bind: 1.0.7
-      has-tostringtag: 1.0.2
+      '@types/node': 25.9.1
+      merge-stream: 2.0.0
+      supports-color: 8.1.1
 
-  is-set@2.0.3: {}
+  jiti@1.21.7: {}
 
-  is-shared-array-buffer@1.0.3:
-    dependencies:
-      call-bind: 1.0.7
-
-  is-stream@2.0.1: {}
-
-  is-stream@3.0.0: {}
-
-  is-string@1.0.7:
-    dependencies:
-      has-tostringtag: 1.0.2
-
-  is-symbol@1.0.4:
-    dependencies:
-      has-symbols: 1.0.3
-
-  is-typed-array@1.1.13:
-    dependencies:
-      which-typed-array: 1.1.15
-
-  is-weakmap@2.0.2: {}
-
-  is-weakref@1.0.2:
-    dependencies:
-      call-bind: 1.0.7
-
-  is-weakset@2.0.3:
-    dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-
-  isarray@2.0.5: {}
-
-  isexe@2.0.0: {}
-
-  iterator.prototype@1.1.3:
-    dependencies:
-      define-properties: 1.2.1
-      get-intrinsic: 1.2.4
-      has-symbols: 1.0.3
-      reflect.getprototypeof: 1.0.6
-      set-function-name: 2.0.2
-
-  jackspeak@3.4.3:
-    dependencies:
-      '@isaacs/cliui': 8.0.2
-    optionalDependencies:
-      '@pkgjs/parseargs': 0.11.0
-
-  jiti@1.21.6: {}
-
-  jiti@2.4.0: {}
+  jiti@2.7.0: {}
 
   joycon@3.1.1: {}
 
-  js-tokens@4.0.0: {}
-
-  js-yaml@4.1.0:
+  js-yaml@4.3.1:
     dependencies:
       argparse: 2.0.1
 
-  jsesc@2.5.2: {}
+  json-schema-traverse@1.0.0: {}
 
-  json-buffer@3.0.1: {}
+  json-with-bigint@3.5.8: {}
 
-  json-schema-traverse@0.4.1: {}
-
-  json-stable-stringify-without-jsonify@1.0.1: {}
-
-  json5@1.0.2:
-    dependencies:
-      minimist: 1.2.8
-
-  json5@2.2.3: {}
-
-  jsx-ast-utils@3.3.5:
-    dependencies:
-      array-includes: 3.1.8
-      array.prototype.flat: 1.3.2
-      object.assign: 4.1.5
-      object.values: 1.2.0
-
-  keyv@4.5.4:
-    dependencies:
-      json-buffer: 3.0.1
-
-  language-subtag-registry@0.3.23: {}
-
-  language-tags@1.0.9:
-    dependencies:
-      language-subtag-registry: 0.3.23
-
-  levn@0.4.1:
-    dependencies:
-      prelude-ls: 1.2.1
-      type-check: 0.4.0
-
-  lightningcss-darwin-arm64@1.26.0: {}
-
-  lightningcss-darwin-x64@1.26.0: {}
-
-  lightningcss-freebsd-x64@1.26.0:
+  lightningcss-android-arm64@1.33.0:
     optional: true
 
-  lightningcss-linux-arm-gnueabihf@1.26.0:
+  lightningcss-darwin-arm64@1.33.0: {}
+
+  lightningcss-darwin-x64@1.33.0: {}
+
+  lightningcss-freebsd-x64@1.33.0:
     optional: true
 
-  lightningcss-linux-arm64-gnu@1.26.0: {}
-
-  lightningcss-linux-arm64-musl@1.26.0: {}
-
-  lightningcss-linux-x64-gnu@1.26.0: {}
-
-  lightningcss-linux-x64-musl@1.26.0: {}
-
-  lightningcss-win32-arm64-msvc@1.26.0:
+  lightningcss-linux-arm-gnueabihf@1.33.0:
     optional: true
 
-  lightningcss-win32-x64-msvc@1.26.0: {}
+  lightningcss-linux-arm64-gnu@1.33.0: {}
 
-  lightningcss@1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4):
+  lightningcss-linux-arm64-musl@1.33.0: {}
+
+  lightningcss-linux-x64-gnu@1.33.0: {}
+
+  lightningcss-linux-x64-musl@1.33.0: {}
+
+  lightningcss-win32-arm64-msvc@1.33.0:
+    optional: true
+
+  lightningcss-win32-x64-msvc@1.33.0: {}
+
+  lightningcss@1.33.0(patch_hash=1d4a8800d60d13d42887b88b3a86576df4b451670308145fb432ec8abbf40930):
     dependencies:
-      detect-libc: 1.0.3
+      detect-libc: 2.1.2
     optionalDependencies:
-      lightningcss-darwin-arm64: 1.26.0
-      lightningcss-darwin-x64: 1.26.0
-      lightningcss-freebsd-x64: 1.26.0
-      lightningcss-linux-arm-gnueabihf: 1.26.0
-      lightningcss-linux-arm64-gnu: 1.26.0
-      lightningcss-linux-arm64-musl: 1.26.0
-      lightningcss-linux-x64-gnu: 1.26.0
-      lightningcss-linux-x64-musl: 1.26.0
-      lightningcss-win32-arm64-msvc: 1.26.0
-      lightningcss-win32-x64-msvc: 1.26.0
+      lightningcss-android-arm64: 1.33.0
+      lightningcss-darwin-arm64: 1.33.0
+      lightningcss-darwin-x64: 1.33.0
+      lightningcss-freebsd-x64: 1.33.0
+      lightningcss-linux-arm-gnueabihf: 1.33.0
+      lightningcss-linux-arm64-gnu: 1.33.0
+      lightningcss-linux-arm64-musl: 1.33.0
+      lightningcss-linux-x64-gnu: 1.33.0
+      lightningcss-linux-x64-musl: 1.33.0
+      lightningcss-win32-arm64-msvc: 1.33.0
+      lightningcss-win32-x64-msvc: 1.33.0
 
-  lilconfig@2.1.0: {}
-
-  lilconfig@3.1.2: {}
+  lilconfig@3.1.3: {}
 
   lines-and-columns@1.2.4: {}
 
+  listhen@1.10.1(@parcel/watcher@2.6.0(patch_hash=705ce75ccea54337110c4d7fe0a8b421658ea0c23e1a77c1fa890a86041179da)):
+    dependencies:
+      '@parcel/watcher-wasm': 2.5.6
+      citty: 0.2.2
+      consola: 3.4.2
+      crossws: 0.4.10
+      defu: 6.1.7
+      get-port-please: 3.2.0
+      h3: 1.15.11
+      http-shutdown: 1.2.2
+      jiti: 2.7.0
+      node-forge: 1.4.0
+      pathe: 2.0.3
+      std-env: 4.2.0
+      tinyclip: 0.1.15
+      ufo: 1.6.4
+      untun: 0.2.2
+      uqr: 0.1.3
+    optionalDependencies:
+      '@parcel/watcher': 2.6.0(patch_hash=705ce75ccea54337110c4d7fe0a8b421658ea0c23e1a77c1fa890a86041179da)
+    transitivePeerDependencies:
+      - srvx
+
   load-tsconfig@0.2.5: {}
 
-  locate-path@6.0.0:
+  magic-string@0.30.21:
     dependencies:
-      p-locate: 5.0.0
+      '@jridgewell/sourcemap-codec': 1.5.5
 
-  lodash.castarray@4.4.0: {}
-
-  lodash.isplainobject@4.0.6: {}
-
-  lodash.merge@4.6.2: {}
-
-  lodash.sortby@4.7.0: {}
-
-  loose-envify@1.4.0:
+  magic-string@1.1.0:
     dependencies:
-      js-tokens: 4.0.0
-
-  loupe@3.1.1:
-    dependencies:
-      get-func-name: 2.0.2
-
-  lru-cache@10.4.3: {}
-
-  lru-cache@5.1.1:
-    dependencies:
-      yallist: 3.1.1
-
-  magic-string@0.30.11:
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.0
+      '@jridgewell/sourcemap-codec': 1.5.5
 
   merge-stream@2.0.0: {}
 
   merge2@1.4.1: {}
 
-  micro-memoize@4.1.2: {}
+  micro-memoize@5.1.1:
+    dependencies:
+      fast-equals: 5.4.0
+      fast-stringify: 4.0.0
 
-  micromatch@4.0.7:
+  micromatch@4.0.8:
     dependencies:
       braces: 3.0.3
-      picomatch: 2.3.1
+      picomatch: 2.3.2
 
-  mimic-fn@2.1.0: {}
-
-  mimic-fn@4.0.0: {}
+  mime-db@1.54.0: {}
 
   mini-svg-data-uri@1.4.4: {}
 
-  minimatch@3.1.2:
+  minimizer-webpack-plugin@5.6.1(esbuild@0.27.7)(postcss@8.5.25)(webpack@5.109.2(esbuild@0.27.7)(postcss@8.5.25)):
     dependencies:
-      brace-expansion: 1.1.11
+      '@jridgewell/trace-mapping': 0.3.31
+      jest-worker: 27.5.1
+      schema-utils: 4.3.3
+      terser: 5.48.0
+      webpack: 5.109.2(esbuild@0.27.7)(postcss@8.5.25)
+    optionalDependencies:
+      esbuild: 0.27.7
+      postcss: 8.5.25
 
-  minimatch@9.0.5:
+  mlly@1.8.2:
     dependencies:
-      brace-expansion: 2.0.1
-
-  minimist@1.2.8: {}
-
-  minipass@7.1.2: {}
+      acorn: 8.16.0
+      pathe: 2.0.3
+      pkg-types: 1.3.1
+      ufo: 1.6.4
 
   mri@1.2.0: {}
 
-  ms@2.1.2: {}
-
   ms@2.1.3: {}
 
+  mute-stream@3.0.0: {}
+
   mz@2.7.0:
     dependencies:
       any-promise: 1.3.0
       object-assign: 4.1.1
       thenify-all: 1.6.0
 
-  nanoid@3.3.7: {}
+  nanoid@3.3.12: {}
 
-  natural-compare@1.4.0: {}
+  nanoid@3.3.16: {}
 
-  next@15.0.3(@playwright/test@1.49.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  neo-async@2.6.2: {}
+
+  next@16.2.7(@playwright/test@1.62.1)(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
     dependencies:
-      '@next/env': 15.0.3
-      '@swc/counter': 0.1.3
-      '@swc/helpers': 0.5.13
-      busboy: 1.6.0
-      caniuse-lite: 1.0.30001669
+      '@next/env': 16.2.7
+      '@swc/helpers': 0.5.15
+      baseline-browser-mapping: 2.10.31
+      caniuse-lite: 1.0.30001793
       postcss: 8.4.31
-      react: 18.3.1
-      react-dom: 18.3.1(react@18.3.1)
-      styled-jsx: 5.1.6(react@18.3.1)
+      react: 19.2.7
+      react-dom: 19.2.7(react@19.2.7)
+      styled-jsx: 5.1.6(react@19.2.7)
     optionalDependencies:
-      '@next/swc-darwin-arm64': 15.0.3
-      '@next/swc-darwin-x64': 15.0.3
-      '@next/swc-linux-arm64-gnu': 15.0.3
-      '@next/swc-linux-arm64-musl': 15.0.3
-      '@next/swc-linux-x64-gnu': 15.0.3
-      '@next/swc-linux-x64-musl': 15.0.3
-      '@next/swc-win32-arm64-msvc': 15.0.3
-      '@next/swc-win32-x64-msvc': 15.0.3
-      '@playwright/test': 1.49.0
-      sharp: 0.33.5
+      '@next/swc-darwin-arm64': 16.2.7
+      '@next/swc-darwin-x64': 16.2.7
+      '@next/swc-linux-arm64-gnu': 16.2.7
+      '@next/swc-linux-arm64-musl': 16.2.7
+      '@next/swc-linux-x64-gnu': 16.2.7
+      '@next/swc-linux-x64-musl': 16.2.7
+      '@next/swc-win32-arm64-msvc': 16.2.7
+      '@next/swc-win32-x64-msvc': 16.2.7
+      '@playwright/test': 1.62.1
+      sharp: 0.34.5
     transitivePeerDependencies:
       - '@babel/core'
       - babel-plugin-macros
 
   node-addon-api@7.1.1: {}
 
-  node-addon-api@8.2.2: {}
+  node-addon-api@8.7.0: {}
 
-  node-gyp-build@4.8.2: {}
+  node-forge@1.4.0: {}
 
-  node-releases@2.0.18: {}
+  node-gyp-build@4.8.4: {}
+
+  node-mock-http@1.0.4: {}
+
+  node-releases@2.0.46: {}
 
   normalize-path@3.0.0: {}
 
-  normalize-range@0.1.2: {}
-
-  npm-run-path@4.0.1:
-    dependencies:
-      path-key: 3.1.1
-
-  npm-run-path@5.3.0:
-    dependencies:
-      path-key: 4.0.0
-
   object-assign@4.1.1: {}
 
   object-hash@3.0.0: {}
 
-  object-inspect@1.13.2: {}
+  obug@2.1.1: {}
 
-  object-keys@1.1.1: {}
-
-  object.assign@4.1.5:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      has-symbols: 1.0.3
-      object-keys: 1.1.1
-
-  object.entries@1.1.8:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-object-atoms: 1.0.0
-
-  object.fromentries@2.0.8:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-object-atoms: 1.0.0
-
-  object.groupby@1.0.3:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-
-  object.values@1.2.0:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-object-atoms: 1.0.0
-
-  onetime@5.1.2:
-    dependencies:
-      mimic-fn: 2.1.0
-
-  onetime@6.0.0:
-    dependencies:
-      mimic-fn: 4.0.0
-
-  optionator@0.9.4:
-    dependencies:
-      deep-is: 0.1.4
-      fast-levenshtein: 2.0.6
-      levn: 0.4.1
-      prelude-ls: 1.2.1
-      type-check: 0.4.0
-      word-wrap: 1.2.5
-
-  p-limit@3.1.0:
-    dependencies:
-      yocto-queue: 0.1.0
-
-  p-locate@5.0.0:
-    dependencies:
-      p-limit: 3.1.0
-
-  package-json-from-dist@1.0.1: {}
+  obug@2.1.4: {}
 
   package-up@5.0.0:
     dependencies:
-      find-up-simple: 1.0.0
-
-  parent-module@1.0.1:
-    dependencies:
-      callsites: 3.1.0
-
-  path-exists@4.0.0: {}
-
-  path-key@3.1.1: {}
-
-  path-key@4.0.0: {}
+      find-up-simple: 1.0.1
 
   path-parse@1.0.7: {}
 
-  path-scurry@1.11.1:
-    dependencies:
-      lru-cache: 10.4.3
-      minipass: 7.1.2
-
-  path-type@4.0.0: {}
-
-  path-type@5.0.0: {}
-
-  pathe@1.1.2: {}
-
-  pathval@2.0.0: {}
+  pathe@2.0.3: {}
 
   picocolors@1.1.1: {}
 
-  picomatch@2.3.1: {}
+  picomatch@2.3.2: {}
+
+  picomatch@4.0.4: {}
+
+  picomatch@4.0.5: {}
 
   pify@2.3.0: {}
 
-  pirates@4.0.6: {}
+  pirates@4.0.7: {}
 
-  playwright-core@1.49.0: {}
-
-  playwright@1.49.0:
+  pkg-types@1.3.1:
     dependencies:
-      playwright-core: 1.49.0
+      confbox: 0.1.8
+      mlly: 1.8.2
+      pathe: 2.0.3
+
+  playwright-core@1.62.1: {}
+
+  playwright@1.62.1:
+    dependencies:
+      playwright-core: 1.62.1
     optionalDependencies:
       fsevents: 2.3.2
 
-  possible-typed-array-names@1.0.0: {}
-
-  postcss-import@15.1.0(postcss@8.4.47):
+  postcss-import@15.1.0(postcss@8.5.16):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.5.16
       postcss-value-parser: 4.2.0
       read-cache: 1.0.0
-      resolve: 1.22.8
+      resolve: 1.22.12
 
-  postcss-import@16.1.0(postcss@8.4.41):
+  postcss-import@16.1.1(postcss@8.5.25):
     dependencies:
-      postcss: 8.4.41
+      postcss: 8.5.25
       postcss-value-parser: 4.2.0
       read-cache: 1.0.0
-      resolve: 1.22.8
+      resolve: 1.22.12
 
-  postcss-import@16.1.0(postcss@8.4.49):
-    dependencies:
-      postcss: 8.4.49
-      postcss-value-parser: 4.2.0
-      read-cache: 1.0.0
-      resolve: 1.22.8
-
-  postcss-js@4.0.1(postcss@8.4.47):
+  postcss-js@4.1.0(postcss@8.5.16):
     dependencies:
       camelcase-css: 2.0.1
-      postcss: 8.4.47
+      postcss: 8.5.16
 
-  postcss-load-config@4.0.2(postcss@8.4.47):
+  postcss-load-config@6.0.1(jiti@1.21.7)(postcss@8.5.16)(yaml@2.9.0):
     dependencies:
-      lilconfig: 3.1.2
-      yaml: 2.6.0
+      lilconfig: 3.1.3
     optionalDependencies:
-      postcss: 8.4.47
+      jiti: 1.21.7
+      postcss: 8.5.16
+      yaml: 2.9.0
 
-  postcss-load-config@6.0.1(jiti@2.4.0)(postcss@8.4.49)(tsx@4.19.1)(yaml@2.6.0):
+  postcss-load-config@6.0.1(jiti@2.7.0)(postcss@8.5.25)(yaml@2.9.0):
     dependencies:
-      lilconfig: 3.1.2
+      lilconfig: 3.1.3
     optionalDependencies:
-      jiti: 2.4.0
-      postcss: 8.4.49
-      tsx: 4.19.1
-      yaml: 2.6.0
+      jiti: 2.7.0
+      postcss: 8.5.25
+      yaml: 2.9.0
 
-  postcss-nested@6.2.0(postcss@8.4.47):
+  postcss-nested@6.2.0(postcss@8.5.16):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.5.16
       postcss-selector-parser: 6.1.2
 
   postcss-selector-parser@6.0.10:
@@ -8800,7 +5425,7 @@ snapshots:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
 
-  postcss-selector-parser@7.0.0:
+  postcss-selector-parser@7.1.4:
     dependencies:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
@@ -8809,71 +5434,57 @@ snapshots:
 
   postcss@8.4.31:
     dependencies:
-      nanoid: 3.3.7
+      nanoid: 3.3.12
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  postcss@8.4.41:
+  postcss@8.5.16:
     dependencies:
-      nanoid: 3.3.7
-      picocolors: 1.1.1
-      source-map-js: 1.2.0
-
-  postcss@8.4.47:
-    dependencies:
-      nanoid: 3.3.7
+      nanoid: 3.3.12
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  postcss@8.4.49:
+  postcss@8.5.25:
     dependencies:
-      nanoid: 3.3.7
+      nanoid: 3.3.16
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  prelude-ls@1.2.1: {}
-
-  prettier-plugin-embed@0.4.15:
+  prettier-plugin-embed@0.5.1:
     dependencies:
-      '@types/estree': 1.0.5
-      dedent: 1.5.3
-      micro-memoize: 4.1.2
+      '@types/estree': 1.0.9
+      dedent: 1.7.2
+      micro-memoize: 5.1.1
       package-up: 5.0.0
-      tiny-jsonc: 1.0.1
-      type-fest: 4.24.0
+      tiny-jsonc: 1.0.2
+      type-fest: 5.6.0
     transitivePeerDependencies:
       - babel-plugin-macros
 
-  prettier-plugin-organize-imports@4.0.0(prettier@3.3.3)(typescript@5.5.4):
+  prettier-plugin-organize-imports@4.3.0(prettier@3.9.6)(typescript@5.9.3):
     dependencies:
-      prettier: 3.3.3
-      typescript: 5.5.4
+      prettier: 3.9.6
+      typescript: 5.9.3
 
-  prettier@3.3.3: {}
-
-  prop-types@15.8.1:
-    dependencies:
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-      react-is: 16.13.1
-
-  punycode@2.3.1: {}
+  prettier@3.9.6: {}
 
   queue-microtask@1.2.3: {}
 
-  react-dom@18.3.1(react@18.3.1):
+  radix3@1.1.2: {}
+
+  react-dom@19.2.6(react@19.2.6):
     dependencies:
-      loose-envify: 1.4.0
-      react: 18.3.1
-      scheduler: 0.23.2
+      react: 19.2.6
+      scheduler: 0.27.0
 
-  react-is@16.13.1: {}
-
-  react-refresh@0.14.2: {}
-
-  react@18.3.1:
+  react-dom@19.2.7(react@19.2.7):
     dependencies:
-      loose-envify: 1.4.0
+      react: 19.2.7
+      scheduler: 0.27.0
+
+  react@19.2.6: {}
+
+  react@19.2.7: {}
 
   read-cache@1.0.0:
     dependencies:
@@ -8881,344 +5492,206 @@ snapshots:
 
   readdirp@3.6.0:
     dependencies:
-      picomatch: 2.3.1
+      picomatch: 2.3.2
 
-  reflect.getprototypeof@1.0.6:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      globalthis: 1.0.4
-      which-builtin-type: 1.1.4
+  readdirp@4.1.2: {}
 
-  regexp.prototype.flags@1.5.2:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-errors: 1.3.0
-      set-function-name: 2.0.2
-
-  resolve-from@4.0.0: {}
+  require-from-string@2.0.2: {}
 
   resolve-from@5.0.0: {}
 
-  resolve-pkg-maps@1.0.0: {}
-
-  resolve@1.22.8:
+  resolve@1.22.12:
     dependencies:
-      is-core-module: 2.15.0
+      es-errors: 1.3.0
+      is-core-module: 2.16.2
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
-  resolve@2.0.0-next.5:
-    dependencies:
-      is-core-module: 2.15.1
-      path-parse: 1.0.7
-      supports-preserve-symlinks-flag: 1.0.0
+  reusify@1.1.0: {}
 
-  reusify@1.0.4: {}
-
-  rollup@4.20.0:
+  rolldown@1.2.1:
     dependencies:
-      '@types/estree': 1.0.5
+      '@oxc-project/types': 0.142.0
+      '@rolldown/pluginutils': 1.0.1
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.20.0
-      '@rollup/rollup-android-arm64': 4.20.0
-      '@rollup/rollup-darwin-arm64': 4.20.0
-      '@rollup/rollup-darwin-x64': 4.20.0
-      '@rollup/rollup-linux-arm-gnueabihf': 4.20.0
-      '@rollup/rollup-linux-arm-musleabihf': 4.20.0
-      '@rollup/rollup-linux-arm64-gnu': 4.20.0
-      '@rollup/rollup-linux-arm64-musl': 4.20.0
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.20.0
-      '@rollup/rollup-linux-riscv64-gnu': 4.20.0
-      '@rollup/rollup-linux-s390x-gnu': 4.20.0
-      '@rollup/rollup-linux-x64-gnu': 4.20.0
-      '@rollup/rollup-linux-x64-musl': 4.20.0
-      '@rollup/rollup-win32-arm64-msvc': 4.20.0
-      '@rollup/rollup-win32-ia32-msvc': 4.20.0
-      '@rollup/rollup-win32-x64-msvc': 4.20.0
-      fsevents: 2.3.3
+      '@rolldown/binding-android-arm64': 1.2.1
+      '@rolldown/binding-darwin-arm64': 1.2.1
+      '@rolldown/binding-darwin-x64': 1.2.1
+      '@rolldown/binding-freebsd-x64': 1.2.1
+      '@rolldown/binding-linux-arm-gnueabihf': 1.2.1
+      '@rolldown/binding-linux-arm64-gnu': 1.2.1
+      '@rolldown/binding-linux-arm64-musl': 1.2.1
+      '@rolldown/binding-linux-ppc64-gnu': 1.2.1
+      '@rolldown/binding-linux-s390x-gnu': 1.2.1
+      '@rolldown/binding-linux-x64-gnu': 1.2.1
+      '@rolldown/binding-linux-x64-musl': 1.2.1
+      '@rolldown/binding-openharmony-arm64': 1.2.1
+      '@rolldown/binding-wasm32-wasi': 1.2.1
+      '@rolldown/binding-win32-arm64-msvc': 1.2.1
+      '@rolldown/binding-win32-x64-msvc': 1.2.1
 
-  rollup@4.27.4:
+  rollup@4.60.4:
     dependencies:
-      '@types/estree': 1.0.6
+      '@types/estree': 1.0.8
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.27.4
-      '@rollup/rollup-android-arm64': 4.27.4
-      '@rollup/rollup-darwin-arm64': 4.27.4
-      '@rollup/rollup-darwin-x64': 4.27.4
-      '@rollup/rollup-freebsd-arm64': 4.27.4
-      '@rollup/rollup-freebsd-x64': 4.27.4
-      '@rollup/rollup-linux-arm-gnueabihf': 4.27.4
-      '@rollup/rollup-linux-arm-musleabihf': 4.27.4
-      '@rollup/rollup-linux-arm64-gnu': 4.27.4
-      '@rollup/rollup-linux-arm64-musl': 4.27.4
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.27.4
-      '@rollup/rollup-linux-riscv64-gnu': 4.27.4
-      '@rollup/rollup-linux-s390x-gnu': 4.27.4
-      '@rollup/rollup-linux-x64-gnu': 4.27.4
-      '@rollup/rollup-linux-x64-musl': 4.27.4
-      '@rollup/rollup-win32-arm64-msvc': 4.27.4
-      '@rollup/rollup-win32-ia32-msvc': 4.27.4
-      '@rollup/rollup-win32-x64-msvc': 4.27.4
+      '@rollup/rollup-android-arm-eabi': 4.60.4
+      '@rollup/rollup-android-arm64': 4.60.4
+      '@rollup/rollup-darwin-arm64': 4.60.4
+      '@rollup/rollup-darwin-x64': 4.60.4
+      '@rollup/rollup-freebsd-arm64': 4.60.4
+      '@rollup/rollup-freebsd-x64': 4.60.4
+      '@rollup/rollup-linux-arm-gnueabihf': 4.60.4
+      '@rollup/rollup-linux-arm-musleabihf': 4.60.4
+      '@rollup/rollup-linux-arm64-gnu': 4.60.4
+      '@rollup/rollup-linux-arm64-musl': 4.60.4
+      '@rollup/rollup-linux-loong64-gnu': 4.60.4
+      '@rollup/rollup-linux-loong64-musl': 4.60.4
+      '@rollup/rollup-linux-ppc64-gnu': 4.60.4
+      '@rollup/rollup-linux-ppc64-musl': 4.60.4
+      '@rollup/rollup-linux-riscv64-gnu': 4.60.4
+      '@rollup/rollup-linux-riscv64-musl': 4.60.4
+      '@rollup/rollup-linux-s390x-gnu': 4.60.4
+      '@rollup/rollup-linux-x64-gnu': 4.60.4
+      '@rollup/rollup-linux-x64-musl': 4.60.4
+      '@rollup/rollup-openbsd-x64': 4.60.4
+      '@rollup/rollup-openharmony-arm64': 4.60.4
+      '@rollup/rollup-win32-arm64-msvc': 4.60.4
+      '@rollup/rollup-win32-ia32-msvc': 4.60.4
+      '@rollup/rollup-win32-x64-gnu': 4.60.4
+      '@rollup/rollup-win32-x64-msvc': 4.60.4
       fsevents: 2.3.3
 
   run-parallel@1.2.0:
     dependencies:
       queue-microtask: 1.2.3
 
-  safe-array-concat@1.1.2:
+  safer-buffer@2.1.2: {}
+
+  scheduler@0.27.0: {}
+
+  schema-utils@4.3.3:
     dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-      has-symbols: 1.0.3
-      isarray: 2.0.5
+      '@types/json-schema': 7.0.15
+      ajv: 8.20.0
+      ajv-formats: 2.1.1(ajv@8.20.0)
+      ajv-keywords: 5.1.0(ajv@8.20.0)
 
-  safe-regex-test@1.0.3:
+  semver@7.8.5: {}
+
+  sharp@0.34.5:
     dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-regex: 1.1.4
-
-  scheduler@0.23.2:
-    dependencies:
-      loose-envify: 1.4.0
-
-  semver@6.3.1: {}
-
-  semver@7.6.3: {}
-
-  set-function-length@1.2.2:
-    dependencies:
-      define-data-property: 1.1.4
-      es-errors: 1.3.0
-      function-bind: 1.1.2
-      get-intrinsic: 1.2.4
-      gopd: 1.0.1
-      has-property-descriptors: 1.0.2
-
-  set-function-name@2.0.2:
-    dependencies:
-      define-data-property: 1.1.4
-      es-errors: 1.3.0
-      functions-have-names: 1.2.3
-      has-property-descriptors: 1.0.2
-
-  sharp@0.33.5:
-    dependencies:
-      color: 4.2.3
-      detect-libc: 2.0.3
-      semver: 7.6.3
+      '@img/colour': 1.1.0
+      detect-libc: 2.1.2
+      semver: 7.8.5
     optionalDependencies:
-      '@img/sharp-darwin-arm64': 0.33.5
-      '@img/sharp-darwin-x64': 0.33.5
-      '@img/sharp-libvips-darwin-arm64': 1.0.4
-      '@img/sharp-libvips-darwin-x64': 1.0.4
-      '@img/sharp-libvips-linux-arm': 1.0.5
-      '@img/sharp-libvips-linux-arm64': 1.0.4
-      '@img/sharp-libvips-linux-s390x': 1.0.4
-      '@img/sharp-libvips-linux-x64': 1.0.4
-      '@img/sharp-libvips-linuxmusl-arm64': 1.0.4
-      '@img/sharp-libvips-linuxmusl-x64': 1.0.4
-      '@img/sharp-linux-arm': 0.33.5
-      '@img/sharp-linux-arm64': 0.33.5
-      '@img/sharp-linux-s390x': 0.33.5
-      '@img/sharp-linux-x64': 0.33.5
-      '@img/sharp-linuxmusl-arm64': 0.33.5
-      '@img/sharp-linuxmusl-x64': 0.33.5
-      '@img/sharp-wasm32': 0.33.5
-      '@img/sharp-win32-ia32': 0.33.5
-      '@img/sharp-win32-x64': 0.33.5
+      '@img/sharp-darwin-arm64': 0.34.5
+      '@img/sharp-darwin-x64': 0.34.5
+      '@img/sharp-libvips-darwin-arm64': 1.2.4
+      '@img/sharp-libvips-darwin-x64': 1.2.4
+      '@img/sharp-libvips-linux-arm': 1.2.4
+      '@img/sharp-libvips-linux-arm64': 1.2.4
+      '@img/sharp-libvips-linux-ppc64': 1.2.4
+      '@img/sharp-libvips-linux-riscv64': 1.2.4
+      '@img/sharp-libvips-linux-s390x': 1.2.4
+      '@img/sharp-libvips-linux-x64': 1.2.4
+      '@img/sharp-libvips-linuxmusl-arm64': 1.2.4
+      '@img/sharp-libvips-linuxmusl-x64': 1.2.4
+      '@img/sharp-linux-arm': 0.34.5
+      '@img/sharp-linux-arm64': 0.34.5
+      '@img/sharp-linux-ppc64': 0.34.5
+      '@img/sharp-linux-riscv64': 0.34.5
+      '@img/sharp-linux-s390x': 0.34.5
+      '@img/sharp-linux-x64': 0.34.5
+      '@img/sharp-linuxmusl-arm64': 0.34.5
+      '@img/sharp-linuxmusl-x64': 0.34.5
+      '@img/sharp-wasm32': 0.34.5
+      '@img/sharp-win32-arm64': 0.34.5
+      '@img/sharp-win32-ia32': 0.34.5
+      '@img/sharp-win32-x64': 0.34.5
     optional: true
 
-  shebang-command@2.0.0:
-    dependencies:
-      shebang-regex: 3.0.0
-
-  shebang-regex@3.0.0: {}
-
-  side-channel@1.0.6:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      object-inspect: 1.13.2
-
   siginfo@2.0.0: {}
 
-  signal-exit@3.0.7: {}
-
   signal-exit@4.1.0: {}
 
-  simple-swizzle@0.2.2:
-    dependencies:
-      is-arrayish: 0.3.2
-    optional: true
-
-  slash@3.0.0: {}
-
   slash@5.1.0: {}
 
-  source-map-js@1.2.0: {}
-
   source-map-js@1.2.1: {}
 
   source-map-support@0.5.21:
     dependencies:
       buffer-from: 1.1.2
       source-map: 0.6.1
-    optional: true
 
-  source-map@0.6.1:
-    optional: true
+  source-map@0.6.1: {}
 
-  source-map@0.8.0-beta.0:
-    dependencies:
-      whatwg-url: 7.1.0
+  source-map@0.7.6: {}
 
   stackback@0.0.2: {}
 
-  std-env@3.7.0: {}
+  std-env@4.1.0: {}
 
-  streamsearch@1.1.0: {}
+  std-env@4.2.0: {}
 
-  string-width@4.2.3:
-    dependencies:
-      emoji-regex: 8.0.0
-      is-fullwidth-code-point: 3.0.0
-      strip-ansi: 6.0.1
-
-  string-width@5.1.2:
-    dependencies:
-      eastasianwidth: 0.2.0
-      emoji-regex: 9.2.2
-      strip-ansi: 7.1.0
-
-  string.prototype.includes@2.0.1:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-
-  string.prototype.matchall@4.0.11:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      es-object-atoms: 1.0.0
-      get-intrinsic: 1.2.4
-      gopd: 1.0.1
-      has-symbols: 1.0.3
-      internal-slot: 1.0.7
-      regexp.prototype.flags: 1.5.2
-      set-function-name: 2.0.2
-      side-channel: 1.0.6
-
-  string.prototype.repeat@1.0.0:
-    dependencies:
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-
-  string.prototype.trim@1.2.9:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-object-atoms: 1.0.0
-
-  string.prototype.trimend@1.0.8:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-object-atoms: 1.0.0
-
-  string.prototype.trimstart@1.0.8:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-object-atoms: 1.0.0
-
-  strip-ansi@6.0.1:
-    dependencies:
-      ansi-regex: 5.0.1
-
-  strip-ansi@7.1.0:
-    dependencies:
-      ansi-regex: 6.0.1
-
-  strip-bom@3.0.0: {}
-
-  strip-final-newline@2.0.0: {}
-
-  strip-final-newline@3.0.0: {}
-
-  strip-json-comments@3.1.1: {}
-
-  styled-jsx@5.1.6(react@18.3.1):
+  styled-jsx@5.1.6(react@19.2.7):
     dependencies:
       client-only: 0.0.1
-      react: 18.3.1
+      react: 19.2.7
 
-  sucrase@3.35.0:
+  sucrase@3.35.1:
     dependencies:
-      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/gen-mapping': 0.3.13
       commander: 4.1.1
-      glob: 10.4.5
       lines-and-columns: 1.2.4
       mz: 2.7.0
-      pirates: 4.0.6
+      pirates: 4.0.7
+      tinyglobby: 0.2.16
       ts-interface-checker: 0.1.13
 
-  supports-color@5.5.0:
-    dependencies:
-      has-flag: 3.0.0
-
-  supports-color@7.2.0:
+  supports-color@8.1.1:
     dependencies:
       has-flag: 4.0.0
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
-  tailwindcss@3.4.14:
+  tagged-tag@1.0.0: {}
+
+  tailwindcss@3.4.19(yaml@2.9.0):
     dependencies:
       '@alloc/quick-lru': 5.2.0
       arg: 5.0.2
       chokidar: 3.6.0
       didyoumean: 1.2.2
       dlv: 1.1.3
-      fast-glob: 3.3.2
+      fast-glob: 3.3.3
       glob-parent: 6.0.2
       is-glob: 4.0.3
-      jiti: 1.21.6
-      lilconfig: 2.1.0
-      micromatch: 4.0.7
+      jiti: 1.21.7
+      lilconfig: 3.1.3
+      micromatch: 4.0.8
       normalize-path: 3.0.0
       object-hash: 3.0.0
       picocolors: 1.1.1
-      postcss: 8.4.47
-      postcss-import: 15.1.0(postcss@8.4.47)
-      postcss-js: 4.0.1(postcss@8.4.47)
-      postcss-load-config: 4.0.2(postcss@8.4.47)
-      postcss-nested: 6.2.0(postcss@8.4.47)
+      postcss: 8.5.16
+      postcss-import: 15.1.0(postcss@8.5.16)
+      postcss-js: 4.1.0(postcss@8.5.16)
+      postcss-load-config: 6.0.1(jiti@1.21.7)(postcss@8.5.16)(yaml@2.9.0)
+      postcss-nested: 6.2.0(postcss@8.5.16)
       postcss-selector-parser: 6.1.2
-      resolve: 1.22.8
-      sucrase: 3.35.0
+      resolve: 1.22.12
+      sucrase: 3.35.1
     transitivePeerDependencies:
-      - ts-node
+      - tsx
+      - yaml
 
-  tapable@2.2.1: {}
+  tapable@2.3.3: {}
 
-  terser@5.31.6:
+  terser@5.48.0:
     dependencies:
-      '@jridgewell/source-map': 0.3.6
-      acorn: 8.14.0
+      '@jridgewell/source-map': 0.3.11
+      acorn: 8.16.0
       commander: 2.20.3
       source-map-support: 0.5.21
-    optional: true
 
   thenify-all@1.6.0:
     dependencies:
@@ -9228,347 +5701,231 @@ snapshots:
     dependencies:
       any-promise: 1.3.0
 
-  tiny-jsonc@1.0.1: {}
+  tiny-jsonc@1.0.2: {}
 
   tinybench@2.9.0: {}
 
-  tinypool@1.0.0: {}
+  tinyclip@0.1.15: {}
 
-  tinyrainbow@1.2.0: {}
+  tinyexec@0.3.2: {}
 
-  tinyspy@3.0.0: {}
+  tinyexec@1.1.2: {}
 
-  to-fast-properties@2.0.0: {}
+  tinyglobby@0.2.16:
+    dependencies:
+      fdir: 6.5.0(picomatch@4.0.4)
+      picomatch: 4.0.4
+
+  tinyglobby@0.2.17:
+    dependencies:
+      fdir: 6.5.0(picomatch@4.0.5)
+      picomatch: 4.0.5
+
+  tinyrainbow@3.1.0: {}
 
   to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0
 
-  tr46@1.0.1:
-    dependencies:
-      punycode: 2.3.1
-
   tree-kill@1.2.2: {}
 
-  tree-sitter-javascript@0.23.1(tree-sitter@0.22.1):
+  tree-sitter-javascript@0.23.1(tree-sitter@0.25.1):
     dependencies:
-      node-addon-api: 8.2.2
-      node-gyp-build: 4.8.2
+      node-addon-api: 8.7.0
+      node-gyp-build: 4.8.4
     optionalDependencies:
-      tree-sitter: 0.22.1
+      tree-sitter: 0.25.1
 
-  tree-sitter-typescript@0.23.2(tree-sitter@0.22.1):
+  tree-sitter-typescript@0.23.2(tree-sitter@0.25.1):
     dependencies:
-      node-addon-api: 8.2.2
-      node-gyp-build: 4.8.2
-      tree-sitter-javascript: 0.23.1(tree-sitter@0.22.1)
+      node-addon-api: 8.7.0
+      node-gyp-build: 4.8.4
+      tree-sitter-javascript: 0.23.1(tree-sitter@0.25.1)
     optionalDependencies:
-      tree-sitter: 0.22.1
+      tree-sitter: 0.25.1
 
-  tree-sitter@0.22.1:
+  tree-sitter@0.25.1:
     dependencies:
-      node-addon-api: 8.2.2
-      node-gyp-build: 4.8.2
-
-  ts-api-utils@1.3.0(typescript@5.5.4):
-    dependencies:
-      typescript: 5.5.4
-
-  ts-api-utils@1.3.0(typescript@5.6.3):
-    dependencies:
-      typescript: 5.6.3
+      node-addon-api: 8.7.0
+      node-gyp-build: 4.8.4
 
   ts-interface-checker@0.1.13: {}
 
-  tsconfig-paths@3.15.0:
-    dependencies:
-      '@types/json5': 0.0.29
-      json5: 1.0.2
-      minimist: 1.2.8
-      strip-bom: 3.0.0
+  tslib@2.8.1: {}
 
-  tslib@2.8.0: {}
-
-  tsup@8.2.4(jiti@2.4.0)(postcss@8.4.49)(tsx@4.19.1)(typescript@5.5.4)(yaml@2.6.0):
+  tsup@8.5.1(jiti@2.7.0)(postcss@8.5.25)(typescript@5.9.3)(yaml@2.9.0):
     dependencies:
-      bundle-require: 5.0.0(esbuild@0.23.0)
+      bundle-require: 5.1.0(esbuild@0.27.7)
       cac: 6.7.14
-      chokidar: 3.6.0
-      consola: 3.2.3
-      debug: 4.3.6
-      esbuild: 0.23.0
-      execa: 5.1.1
-      globby: 11.1.0
+      chokidar: 4.0.3
+      consola: 3.4.2
+      debug: 4.4.3
+      esbuild: 0.27.7
+      fix-dts-default-cjs-exports: 1.0.1
       joycon: 3.1.1
       picocolors: 1.1.1
-      postcss-load-config: 6.0.1(jiti@2.4.0)(postcss@8.4.49)(tsx@4.19.1)(yaml@2.6.0)
+      postcss-load-config: 6.0.1(jiti@2.7.0)(postcss@8.5.25)(yaml@2.9.0)
       resolve-from: 5.0.0
-      rollup: 4.20.0
-      source-map: 0.8.0-beta.0
-      sucrase: 3.35.0
+      rollup: 4.60.4
+      source-map: 0.7.6
+      sucrase: 3.35.1
+      tinyexec: 0.3.2
+      tinyglobby: 0.2.16
       tree-kill: 1.2.2
     optionalDependencies:
-      postcss: 8.4.49
-      typescript: 5.5.4
+      postcss: 8.5.25
+      typescript: 5.9.3
     transitivePeerDependencies:
       - jiti
       - supports-color
       - tsx
       - yaml
 
-  tsx@4.19.1:
-    dependencies:
-      esbuild: 0.23.1
-      get-tsconfig: 4.8.1
+  turbo@2.10.8:
     optionalDependencies:
-      fsevents: 2.3.3
-    optional: true
+      '@turbo/darwin-64': 2.10.8
+      '@turbo/darwin-arm64': 2.10.8
+      '@turbo/linux-64': 2.10.8
+      '@turbo/linux-arm64': 2.10.8
+      '@turbo/windows-64': 2.10.8
+      '@turbo/windows-arm64': 2.10.8
 
-  turbo-darwin-64@2.2.3:
-    optional: true
+  typanion@3.14.0: {}
 
-  turbo-darwin-arm64@2.2.3:
-    optional: true
-
-  turbo-linux-64@2.2.3:
-    optional: true
-
-  turbo-linux-arm64@2.2.3:
-    optional: true
-
-  turbo-windows-64@2.2.3:
-    optional: true
-
-  turbo-windows-arm64@2.2.3:
-    optional: true
-
-  turbo@2.2.3:
-    optionalDependencies:
-      turbo-darwin-64: 2.2.3
-      turbo-darwin-arm64: 2.2.3
-      turbo-linux-64: 2.2.3
-      turbo-linux-arm64: 2.2.3
-      turbo-windows-64: 2.2.3
-      turbo-windows-arm64: 2.2.3
-
-  type-check@0.4.0:
+  type-fest@5.6.0:
     dependencies:
-      prelude-ls: 1.2.1
+      tagged-tag: 1.0.0
 
-  type-fest@4.24.0: {}
+  typescript@5.9.3: {}
 
-  typed-array-buffer@1.0.2:
+  typescript@6.0.3: {}
+
+  ufo@1.6.4: {}
+
+  uncrypto@0.1.3: {}
+
+  undici-types@6.21.0: {}
+
+  undici-types@7.24.6: {}
+
+  unicorn-magic@0.4.0: {}
+
+  universal-user-agent@7.0.3: {}
+
+  untun@0.2.2: {}
+
+  update-browserslist-db@1.2.3(browserslist@4.28.2):
     dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-typed-array: 1.1.13
-
-  typed-array-byte-length@1.0.1:
-    dependencies:
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
-
-  typed-array-byte-offset@1.0.2:
-    dependencies:
-      available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
-
-  typed-array-length@1.0.6:
-    dependencies:
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
-      possible-typed-array-names: 1.0.0
-
-  typescript@5.5.4: {}
-
-  typescript@5.6.3: {}
-
-  unbox-primitive@1.0.2:
-    dependencies:
-      call-bind: 1.0.7
-      has-bigints: 1.0.2
-      has-symbols: 1.0.3
-      which-boxed-primitive: 1.0.2
-
-  undici-types@5.26.5: {}
-
-  unicorn-magic@0.1.0: {}
-
-  update-browserslist-db@1.1.0(browserslist@4.23.2):
-    dependencies:
-      browserslist: 4.23.2
-      escalade: 3.1.2
-      picocolors: 1.1.1
-
-  update-browserslist-db@1.1.1(browserslist@4.24.2):
-    dependencies:
-      browserslist: 4.24.2
+      browserslist: 4.28.2
       escalade: 3.2.0
       picocolors: 1.1.1
 
-  uri-js@4.4.1:
-    dependencies:
-      punycode: 2.3.1
+  uqr@0.1.3: {}
 
   util-deprecate@1.0.2: {}
 
-  vite-node@2.0.5(@types/node@20.14.13)(lightningcss@1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4))(terser@5.31.6):
+  vite@8.2.0(@types/node@22.20.1)(esbuild@0.27.7)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0):
     dependencies:
-      cac: 6.7.14
-      debug: 4.3.6
-      pathe: 1.1.2
-      tinyrainbow: 1.2.0
-      vite: 5.4.0(@types/node@20.14.13)(lightningcss@1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4))(terser@5.31.6)
-    transitivePeerDependencies:
-      - '@types/node'
-      - less
-      - lightningcss
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-
-  vite@5.4.0(@types/node@20.14.13)(lightningcss@1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4))(terser@5.31.6):
-    dependencies:
-      esbuild: 0.21.5
-      postcss: 8.4.49
-      rollup: 4.27.4
+      lightningcss: 1.33.0(patch_hash=1d4a8800d60d13d42887b88b3a86576df4b451670308145fb432ec8abbf40930)
+      picomatch: 4.0.5
+      postcss: 8.5.25
+      rolldown: 1.2.1
+      tinyglobby: 0.2.17
     optionalDependencies:
-      '@types/node': 20.14.13
+      '@types/node': 22.20.1
+      esbuild: 0.27.7
       fsevents: 2.3.3
-      lightningcss: 1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4)
-      terser: 5.31.6
+      jiti: 2.7.0
+      terser: 5.48.0
+      yaml: 2.9.0
 
-  vite@6.0.0(@types/node@20.14.13)(jiti@2.4.0)(lightningcss@1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4))(terser@5.31.6)(tsx@4.19.1)(yaml@2.6.0):
+  vite@8.2.0(@types/node@25.9.1)(esbuild@0.27.7)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0):
     dependencies:
-      esbuild: 0.24.0
-      postcss: 8.4.49
-      rollup: 4.27.4
+      lightningcss: 1.33.0(patch_hash=1d4a8800d60d13d42887b88b3a86576df4b451670308145fb432ec8abbf40930)
+      picomatch: 4.0.5
+      postcss: 8.5.25
+      rolldown: 1.2.1
+      tinyglobby: 0.2.17
     optionalDependencies:
-      '@types/node': 20.14.13
+      '@types/node': 25.9.1
+      esbuild: 0.27.7
       fsevents: 2.3.3
-      jiti: 2.4.0
-      lightningcss: 1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4)
-      terser: 5.31.6
-      tsx: 4.19.1
-      yaml: 2.6.0
+      jiti: 2.7.0
+      terser: 5.48.0
+      yaml: 2.9.0
 
-  vitest@2.0.5(@types/node@20.14.13)(lightningcss@1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4))(terser@5.31.6):
+  vitest@4.1.10(@types/node@22.20.1)(vite@8.2.0(@types/node@22.20.1)(esbuild@0.27.7)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0)):
     dependencies:
-      '@ampproject/remapping': 2.3.0
-      '@vitest/expect': 2.0.5
-      '@vitest/pretty-format': 2.0.5
-      '@vitest/runner': 2.0.5
-      '@vitest/snapshot': 2.0.5
-      '@vitest/spy': 2.0.5
-      '@vitest/utils': 2.0.5
-      chai: 5.1.1
-      debug: 4.3.6
-      execa: 8.0.1
-      magic-string: 0.30.11
-      pathe: 1.1.2
-      std-env: 3.7.0
+      '@vitest/expect': 4.1.10
+      '@vitest/mocker': 4.1.10(vite@8.2.0(@types/node@22.20.1)(esbuild@0.27.7)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0))
+      '@vitest/pretty-format': 4.1.10
+      '@vitest/runner': 4.1.10
+      '@vitest/snapshot': 4.1.10
+      '@vitest/spy': 4.1.10
+      '@vitest/utils': 4.1.10
+      es-module-lexer: 2.1.0
+      expect-type: 1.3.0
+      magic-string: 0.30.21
+      obug: 2.1.1
+      pathe: 2.0.3
+      picomatch: 4.0.4
+      std-env: 4.1.0
       tinybench: 2.9.0
-      tinypool: 1.0.0
-      tinyrainbow: 1.2.0
-      vite: 5.4.0(@types/node@20.14.13)(lightningcss@1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4))(terser@5.31.6)
-      vite-node: 2.0.5(@types/node@20.14.13)(lightningcss@1.26.0(patch_hash=5hwfyehqvg5wjb7mwtdvubqbl4))(terser@5.31.6)
+      tinyexec: 1.1.2
+      tinyglobby: 0.2.17
+      tinyrainbow: 3.1.0
+      vite: 8.2.0(@types/node@22.20.1)(esbuild@0.27.7)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0)
       why-is-node-running: 2.3.0
     optionalDependencies:
-      '@types/node': 20.14.13
+      '@types/node': 22.20.1
     transitivePeerDependencies:
-      - less
+      - msw
+
+  watchpack@2.5.2:
+    dependencies:
+      graceful-fs: 4.2.11
+
+  webpack-sources@3.5.1: {}
+
+  webpack@5.109.2(esbuild@0.27.7)(postcss@8.5.25):
+    dependencies:
+      '@types/estree': 1.0.9
+      '@types/json-schema': 7.0.15
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/wasm-edit': 1.14.1
+      '@webassemblyjs/wasm-parser': 1.14.1
+      acorn: 8.16.0
+      browserslist: 4.28.2
+      chrome-trace-event: 1.0.4
+      enhanced-resolve: 5.24.5
+      es-module-lexer: 2.1.0
+      eslint-scope: 5.1.1
+      events: 3.3.0
+      graceful-fs: 4.2.11
+      mime-db: 1.54.0
+      minimizer-webpack-plugin: 5.6.1(esbuild@0.27.7)(postcss@8.5.25)(webpack@5.109.2(esbuild@0.27.7)(postcss@8.5.25))
+      neo-async: 2.6.2
+      schema-utils: 4.3.3
+      tapable: 2.3.3
+      watchpack: 2.5.2
+      webpack-sources: 3.5.1
+    transitivePeerDependencies:
+      - '@minify-html/node'
+      - '@swc/core'
+      - '@swc/css'
+      - '@swc/html'
+      - clean-css
+      - cssnano
+      - csso
+      - esbuild
+      - html-minifier-terser
       - lightningcss
-      - sass
-      - sass-embedded
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-
-  webidl-conversions@4.0.2: {}
-
-  whatwg-url@7.1.0:
-    dependencies:
-      lodash.sortby: 4.7.0
-      tr46: 1.0.1
-      webidl-conversions: 4.0.2
-
-  which-boxed-primitive@1.0.2:
-    dependencies:
-      is-bigint: 1.0.4
-      is-boolean-object: 1.1.2
-      is-number-object: 1.0.7
-      is-string: 1.0.7
-      is-symbol: 1.0.4
-
-  which-builtin-type@1.1.4:
-    dependencies:
-      function.prototype.name: 1.1.6
-      has-tostringtag: 1.0.2
-      is-async-function: 2.0.0
-      is-date-object: 1.0.5
-      is-finalizationregistry: 1.0.2
-      is-generator-function: 1.0.10
-      is-regex: 1.1.4
-      is-weakref: 1.0.2
-      isarray: 2.0.5
-      which-boxed-primitive: 1.0.2
-      which-collection: 1.0.2
-      which-typed-array: 1.1.15
-
-  which-collection@1.0.2:
-    dependencies:
-      is-map: 2.0.3
-      is-set: 2.0.3
-      is-weakmap: 2.0.2
-      is-weakset: 2.0.3
-
-  which-typed-array@1.1.15:
-    dependencies:
-      available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-tostringtag: 1.0.2
-
-  which@2.0.2:
-    dependencies:
-      isexe: 2.0.0
+      - postcss
+      - uglify-js
 
   why-is-node-running@2.3.0:
     dependencies:
       siginfo: 2.0.0
       stackback: 0.0.2
 
-  word-wrap@1.2.5: {}
-
-  wrap-ansi@7.0.0:
-    dependencies:
-      ansi-styles: 4.3.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-
-  wrap-ansi@8.1.0:
-    dependencies:
-      ansi-styles: 6.2.1
-      string-width: 5.1.2
-      strip-ansi: 7.1.0
-
-  yallist@3.1.1: {}
-
-  yaml@2.6.0: {}
-
-  yocto-queue@0.1.0: {}
+  yaml@2.9.0: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 4573bf90d..bcddef126 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -5,7 +5,50 @@ packages:
   - 'playgrounds/*'
   - 'integrations'
 
+patchedDependencies:
+  '@napi-rs/cli@3.7.4': patches/@napi-rs__cli@3.7.4.patch
+  '@parcel/watcher@2.6.0': patches/@parcel__watcher@2.6.0.patch
+  lightningcss@1.33.0: patches/lightningcss@1.33.0.patch
+
 catalog:
-  '@types/node': ^20.14.8
-  lightningcss: ^1.26.0
-  vite: ^6.0.0
+  '@types/node': 22.20.1
+  dedent: 1.7.2
+  enhanced-resolve: ^5.24.5
+  lightningcss-darwin-arm64: 1.33.0
+  lightningcss-darwin-x64: 1.33.0
+  lightningcss-linux-arm64-gnu: 1.33.0
+  lightningcss-linux-arm64-musl: 1.33.0
+  lightningcss-linux-x64-gnu: 1.33.0
+  lightningcss-linux-x64-musl: 1.33.0
+  lightningcss-win32-x64-msvc: 1.33.0
+  lightningcss: 1.33.0
+  '@parcel/watcher-darwin-arm64': 2.6.0
+  '@parcel/watcher-darwin-x64': 2.6.0
+  '@parcel/watcher-linux-arm64-glibc': 2.6.0
+  '@parcel/watcher-linux-arm64-musl': 2.6.0
+  '@parcel/watcher-linux-x64-glibc': 2.6.0
+  '@parcel/watcher-linux-x64-musl': 2.6.0
+  '@parcel/watcher-win32-x64': 2.6.0
+  '@parcel/watcher': 2.6.0
+  postcss: ^8.5.25
+  prettier: 3.9.6
+  vite: ^8.2.0
+  webpack: ^5.109.2
+
+onlyBuiltDependencies:
+  - '@parcel/watcher'
+  - bun
+  - esbuild
+  - sharp
+  - tree-sitter
+  - tree-sitter-javascript
+  - tree-sitter-typescript
+
+allowBuilds:
+  '@parcel/watcher': true
+  bun: true
+  esbuild: true
+  sharp: true
+  tree-sitter: true
+  tree-sitter-javascript: true
+  tree-sitter-typescript: true
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 7f466bd2d..f92020c65 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.80.1"
+channel = "1.95.0"
 profile = "default"
diff --git a/scripts/pack-packages.mjs b/scripts/pack-packages.mjs
index 3bcf23bec..2b0b9f15d 100644
--- a/scripts/pack-packages.mjs
+++ b/scripts/pack-packages.mjs
@@ -21,30 +21,25 @@ let workspaces = new Map()
 for (let path of paths) {
   let pkg = await fs.readFile(path, 'utf8').then(JSON.parse)
   if (pkg.private) continue
-  workspaces.set(pkg.name, { version: pkg.version ?? '', dir: dirname(path) })
-}
-
-// Move napi artifacts into sub packages
-const tailwindcssOxideRoot = path.join(root, 'crates', 'node')
-for (let file of await fs.readdir(tailwindcssOxideRoot)) {
-  if (file.startsWith('tailwindcss-oxide.') && file.endsWith('.node')) {
-    let target = file.split('.')[1]
-    await fs.cp(
-      path.join(tailwindcssOxideRoot, file),
-      path.join(tailwindcssOxideRoot, 'npm', target, file),
-    )
-  }
+  workspaces.set(pkg.name, {
+    version: pkg.version ?? '',
+    dir: dirname(path),
+    hasBundledDependencies: pkg.bundledDependencies?.length > 0 ?? false,
+  })
 }
 
 // Clean dist folder
 await fs.rm(path.join(root, 'dist'), { recursive: true, force: true })
 
 Promise.all(
-  [...workspaces.entries()].map(async ([name, { version, dir }]) => {
+  [...workspaces.entries()].map(async ([name, { dir, hasBundledDependencies }]) => {
     function pack() {
       return new Promise((resolve) => {
+        // `bundledDependencies` can only be packed with the hoisted node linker
+        // since pnpm v10. We opt into it for those packages only, instead of
+        // changing the node linker for the entire workspace.
         exec(
-          `pnpm pack --pack-gzip-level=0 --pack-destination="${path.join(root, 'dist').replace(/\\/g, '\\\\')}"`,
+          `pnpm pack --pack-gzip-level=0 --pack-destination="${path.join(root, 'dist').replace(/\\/g, '\\\\')}"${hasBundledDependencies ? ' --config.node-linker=hoisted' : ''}`,
           { cwd: dir },
           (err, stdout, stderr) => {
             if (err) {
diff --git a/scripts/release-channel.js b/scripts/release-channel.js
new file mode 100644
index 000000000..15dc7df82
--- /dev/null
+++ b/scripts/release-channel.js
@@ -0,0 +1,20 @@
+// Given a version, figure out what the release channel is so that we can publish to the correct
+// channel on npm.
+//
+// E.g.:
+//
+//   1.2.3                  -> latest (default)
+//   0.0.0-insiders.ffaa88  -> insiders
+//   4.1.0-alpha.4          -> alpha
+
+let version =
+  process.argv[2] ||
+  process.env.npm_package_version ||
+  require('../packages/tailwindcss/package.json').version
+
+let match = /\d+\.\d+\.\d+-(.*)\.\d+/g.exec(version)
+if (match) {
+  console.log(match[1])
+} else {
+  console.log('latest')
+}
diff --git a/scripts/release-notes.mjs b/scripts/release-notes.mjs
index 289cb1d96..bb703c07b 100644
--- a/scripts/release-notes.mjs
+++ b/scripts/release-notes.mjs
@@ -1,5 +1,5 @@
 // Given a version, figure out what the release notes are so that we can use this to pre-fill the
-// relase notes on a GitHub release for the current version.
+// release notes on a GitHub release for the current version.
 
 import * as fs from 'node:fs/promises'
 import * as path from 'node:path'
diff --git a/scripts/version-packages.mjs b/scripts/version-packages.mjs
index 2e3d93a3e..1641d5404 100644
--- a/scripts/version-packages.mjs
+++ b/scripts/version-packages.mjs
@@ -8,6 +8,7 @@ import prettier from 'prettier'
 
 const __dirname = path.dirname(url.fileURLToPath(import.meta.url))
 const root = path.resolve(__dirname, '..')
+const version = process.argv[2] || null
 
 // The known workspace is: @tailwindcss/oxide
 // All the workspaces in `crates/node/npm/*` should always be in sync with
@@ -27,8 +28,9 @@ const syncedWorkspaces = new Map([
       'crates/node/npm/linux-arm64-musl',
       'crates/node/npm/linux-x64-gnu',
       'crates/node/npm/linux-x64-musl',
-      'crates/node/npm/win32-x64-msvc',
+      'crates/node/npm/wasm32-wasi',
       'crates/node/npm/win32-arm64-msvc',
+      'crates/node/npm/win32-x64-msvc',
     ],
   ],
   ['@tailwindcss/cli', ['packages/@tailwindcss-standalone']],
@@ -46,80 +48,19 @@ for (let [name, paths] of syncedWorkspaces) {
   }
 }
 
-exec('pnpm --silent --filter=!./playgrounds/* -r exec pwd', async (err, stdout) => {
-  if (err) {
-    console.error(err)
-    process.exit(1)
-  }
+exec(
+  "pnpm --silent --filter='!./playgrounds/*' --filter='!./integrations' --filter='!./packages/internal-example-plugin' -r exec pwd",
+  async (err, stdout) => {
+    if (err) {
+      console.error(err)
+      process.exit(1)
+    }
 
-  let paths = stdout
-    .trim()
-    .split('\n')
-    .map((x) => path.resolve(x, 'package.json'))
-    // Workspaces that are in sync with another workspace should not be updated
-    // manually, they should be updated by updating the main workspace.
-    .filter((x) => !inverseSyncedWorkspaces.has(x))
-
-  let workspaces = new Map()
-
-  // Track all the workspaces
-  for (let path of paths) {
-    let pkg = await fs.readFile(path, 'utf8').then(JSON.parse)
-    if (pkg.private) continue
-    workspaces.set(pkg.name, { version: pkg.version ?? '', path })
-  }
-
-  // Build the editable output
-  let lines = ['# Update the versions of the packages you want to change', '']
-  for (let [name, info] of workspaces) {
-    lines.push(`${name}: ${info.version}`)
-  }
-  let output = lines.join('\n')
-
-  // Edit the file
-  {
-    // Figure out which editor to use.
-    //
-    // In this case we still split on whitespace, because it can happen that the
-    // EDITOR env variable is configured as `code --wait`. This means that we
-    // want `code` as the editor, but `--wait` is one of the arguments.
-    let args = process.env.EDITOR.split(' ')
-    let editor = args.shift()
-
-    // Create a temporary file which will be edited
-    let filepath = path.resolve(tmpdir(), `version-${randomUUID()}.txt`)
-    await fs.writeFile(filepath, output)
-
-    // Edit the file, once the editor is closed, the file will be saved and we
-    // can read the changes
-    spawnSync(editor, [...args, filepath], {
-      stdio: 'inherit',
-    })
-
-    let newOutput = await fs.readFile(filepath, 'utf8').then((x) => x.trim().split('\n'))
-
-    // Cleanup temporary file
-    await fs.unlink(filepath)
-
-    // Update the package.json files
-    for (let line of newOutput) {
-      if (line[0] === '#') continue // Skip comment lines
-      if (line.trim() === '') continue // Skip empty lines
-
-      let [name, version = ''] = line.split(':').map((x) => x.trim())
-
-      // Figure out all the paths to the package.json files that need to be
-      // updated with the new version
-      let paths = [
-        // The package.json file of the main workspace
-        workspaces.get(name).path,
-
-        // The package.json files of the workspaces that are in sync with the
-        // main workspace
-        ...(syncedWorkspaces.get(name) ?? []),
-      ]
-
-      for (let pkgPath of paths) {
+    if (version !== null) {
+      for (let pkgPath of stdout
+        .trim()
+        .split('\n')
+        .map((x) => path.resolve(x, 'package.json'))) {
         let pkg = await fs.readFile(pkgPath, 'utf8').then(JSON.parse)
         let name = pkg.name
         if (version !== '') {
@@ -138,8 +79,100 @@ exec('pnpm --silent --filter=!./playgrounds/* -r exec pwd', async (err, stdout)
             .then((x) => `${x.trim()}\n`),
         )
       }
-    }
-  }
 
-  console.log('Done.')
-})
+      console.log('Done.')
+      return
+    }
+
+    let paths = stdout
+      .trim()
+      .split('\n')
+      .map((x) => path.resolve(x, 'package.json'))
+      // Workspaces that are in sync with another workspace should not be updated
+      // manually, they should be updated by updating the main workspace.
+      .filter((x) => !inverseSyncedWorkspaces.has(x))
+
+    let workspaces = new Map()
+
+    // Track all the workspaces
+    for (let path of paths) {
+      let pkg = await fs.readFile(path, 'utf8').then(JSON.parse)
+      if (pkg.private) continue
+      workspaces.set(pkg.name, { version: pkg.version ?? '', path })
+    }
+
+    // Build the editable output
+    let lines = ['# Update the versions of the packages you want to change', '']
+    for (let [name, info] of workspaces) {
+      lines.push(`${name}: ${info.version}`)
+    }
+    let output = lines.join('\n')
+
+    // Edit the file
+    {
+      // Figure out which editor to use.
+      //
+      // In this case we still split on whitespace, because it can happen that the
+      // EDITOR env variable is configured as `code --wait`. This means that we
+      // want `code` as the editor, but `--wait` is one of the arguments.
+      let args = process.env.EDITOR.split(' ')
+      let editor = args.shift()
+
+      // Create a temporary file which will be edited
+      let filepath = path.resolve(tmpdir(), `version-${randomUUID()}.txt`)
+      await fs.writeFile(filepath, output)
+
+      // Edit the file, once the editor is closed, the file will be saved and we
+      // can read the changes
+      spawnSync(editor, [...args, filepath], {
+        stdio: 'inherit',
+      })
+
+      let newOutput = await fs.readFile(filepath, 'utf8').then((x) => x.trim().split('\n'))
+
+      // Cleanup temporary file
+      await fs.unlink(filepath)
+
+      // Update the package.json files
+      for (let line of newOutput) {
+        if (line[0] === '#') continue // Skip comment lines
+        if (line.trim() === '') continue // Skip empty lines
+
+        let [name, version = ''] = line.split(':').map((x) => x.trim())
+
+        // Figure out all the paths to the package.json files that need to be
+        // updated with the new version
+        let paths = [
+          // The package.json file of the main workspace
+          workspaces.get(name).path,
+
+          // The package.json files of the workspaces that are in sync with the
+          // main workspace
+          ...(syncedWorkspaces.get(name) ?? []),
+        ]
+
+        for (let pkgPath of paths) {
+          let pkg = await fs.readFile(pkgPath, 'utf8').then(JSON.parse)
+          let name = pkg.name
+          if (version !== '') {
+            // Ensure the version is set after the name and before everything else
+            delete pkg.name
+            delete pkg.version
+
+            // This allows us to keep the order of the keys in the package.json
+            pkg = { name, version, ...pkg }
+          }
+
+          await fs.writeFile(
+            pkgPath,
+            await prettier
+              .format(JSON.stringify(pkg, null, 2), { filepath: pkgPath })
+              .then((x) => `${x.trim()}\n`),
+          )
+        }
+      }
+    }
+
+    console.log('Done.')
+  },
+)
diff --git a/turbo.json b/turbo.json
index 35a3e63a7..c48410b29 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://turbo.build/schema.json",
+  "$schema": "https://v2-10-8.turborepo.dev/schema.json",
   "ui": "tui",
   "tasks": {
     "@tailwindcss/oxide#build": {
@@ -10,6 +10,7 @@
         "./build.rs",
         "./package.json",
         "./Cargo.toml",
+        "./.cargo/config.toml",
         "../oxide/src/**/*",
         "../oxide/Cargo.toml",
         "../Cargo.toml",
@@ -24,6 +25,7 @@
         "./build.rs",
         "./package.json",
         "./Cargo.toml",
+        "./.cargo/config.toml",
         "../oxide/src/**/*",
         "../oxide/Cargo.toml",
         "../Cargo.toml",
@@ -34,7 +36,8 @@
     },
     "build": {
       "dependsOn": ["^build"],
-      "outputs": ["dist/**"]
+      "outputs": ["dist/**"],
+      "env": ["FEATURES_ENV"]
     },
     "lint": {},
     "dev": {
diff --git a/vitest.config.mts b/vitest.config.mts
new file mode 100644
index 000000000..3ef999be2
--- /dev/null
+++ b/vitest.config.mts
@@ -0,0 +1,8 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    projects: ['./packages/*', '!./packages/tsconfig.base.json'],
+    exclude: ['**/*.spec.?(c|m)[jt]s?(x)', 'integrations/**/*'],
+  },
+})
diff --git a/vitest.workspace.ts b/vitest.workspace.ts
deleted file mode 100644
index 4ccde0667..000000000
--- a/vitest.workspace.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['packages/*']