diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 42645aa49..63f79fa10 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -50,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/main/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 @@ -76,7 +76,7 @@ To run the integration tests, use: 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: +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 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ee9d3f9ab..aa0793aa3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,7 +8,7 @@ It's never a fun experience to have your pull request declined after investing a For more info, check out the contributing guide: -https://github.com/tailwindcss/tailwindcss/blob/main/.github/CONTRIBUTING.md +https://github.com/tailwindlabs/tailwindcss/blob/main/.github/CONTRIBUTING.md --> diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0c8f483e..5ae59e80f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,12 +8,18 @@ on: 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,12 +27,14 @@ 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 run-all: - - ${{ github.ref == 'refs/heads/main' || contains(github.event.pull_request.body, '[ci-all]') }} + - ${{ github.ref == 'refs/heads/main' || contains(github.event.pull_request.body, '[ci-all]') || github.event.pull_request.user.login == 'depfu[bot]' }} exclude: - run-all: false runner: @@ -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,7 +72,7 @@ jobs: # Cache the `oxide` Rust build - name: Cache oxide build - uses: actions/cache@v4 + uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5 with: path: | ./crates/node/*.node @@ -82,7 +90,7 @@ jobs: run: rustup target add wasm32-wasip1-threads - name: Install dependencies - run: pnpm install + run: pnpm install --frozen-lockfile - name: Build run: pnpm run build @@ -104,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/main' - 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 `main` 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 0148dd983..457c38424 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -8,13 +8,18 @@ on: 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 @@ -50,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/ @@ -73,7 +82,7 @@ jobs: # Cache the `oxide` Rust build - name: Cache oxide build - uses: actions/cache@v4 + uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5 with: path: | ./crates/node/*.node @@ -99,24 +108,18 @@ jobs: CARGO_PROFILE_RELEASE_LTO: 'off' CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER: 'lld-link' - - name: Test ${{ matrix.integration }} 1/3 - run: pnpm run test:integrations ./integrations/${{ matrix.integration }} --shard 1/3 - env: - GITHUB_WORKSPACE: ${{ github.workspace }} - - - name: Test ${{ matrix.integration }} 2/3 - run: pnpm run test:integrations ./integrations/${{ matrix.integration }} --shard 2/3 - env: - GITHUB_WORKSPACE: ${{ github.workspace }} - - - name: Test ${{ matrix.integration }} 3/3 - run: pnpm run test:integrations ./integrations/${{ matrix.integration }} --shard 3/3 + - name: Test ${{ matrix.integration }} + run: pnpm run test:integrations ./integrations/${{ matrix.integration }} 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/main' - 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 `main` 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 be1050b03..24e829afd 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -2,18 +2,29 @@ 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: APP_NAME: tailwindcss-oxide - NODE_VERSION: 20 + 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: strategy: @@ -43,44 +54,40 @@ 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) 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 - name: Install gcc-arm-linux-gnueabihf if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }} @@ -88,62 +95,56 @@ jobs: sudo apt-get update sudo apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y - # 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: | - ./crates/node/*.node - ./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 }}-${{ 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 binutils-aarch64-linux-gnu + if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }} run: | - rustup default stable + 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:platform --target=${{ matrix.target }} + 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 @@ -153,9 +154,11 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + with: + persist-credentials: false - name: Build FreeBSD - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@cdc9ee69ef84a5f2e59c9058335d9c57bcb4ac86 # v0.25.0 env: DEBUG: napi:* RUSTUP_HOME: /usr/local/rustup @@ -171,12 +174,12 @@ jobs: shell: bash run: | sudo pkg install -y -f curl node libnghttp2 npm - sudo npm install -g pnpm@9.6.0 --unsafe-perm=true + 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 --filter=!./playgrounds/* || true + pnpm install --ignore-scripts --frozen-lockfile --filter=!./playgrounds/* || true echo "~~~~ rustc --version ~~~~" rustc --version echo "~~~~ node -v ~~~~" @@ -187,7 +190,7 @@ jobs: strip -x ${{ env.OXIDE_LOCATION }}/*.node ls -la ${{ env.OXIDE_LOCATION }} - name: Upload artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6 with: name: bindings-x86_64-unknown-freebsd path: ${{ env.OXIDE_LOCATION }}/*.node @@ -198,18 +201,17 @@ jobs: name: Build and release Tailwind CSS permissions: - contents: write # for softprops/action-gh-release to create GitHub release - # https://docs.npmjs.com/generating-provenance-statements#publishing-packages-with-provenance-via-github-actions - id-token: write + contents: write # Required for creating releases needs: - build - build-freebsd steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: fetch-depth: 20 + persist-credentials: false - run: git fetch --tags -f @@ -218,51 +220,25 @@ jobs: 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' - - # 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: | - ./crates/node/*.node - ./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 }}-${{ matrix.target }}-oxide-${{ hashFiles('./crates/**/*') }} + package-manager-cache: false - 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 }} @@ -301,30 +277,31 @@ jobs: echo "EOF" >> $GITHUB_ENV - name: Upload standalone artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6 with: name: tailwindcss-standalone path: packages/@tailwindcss-standalone/dist/ - name: Upload npm package tarballs - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6 with: name: npm-package-tarballs path: dist/*.tgz - name: Prepare GitHub Release - uses: softprops/action-gh-release@v2 - 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-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 + 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-insiders.yml b/.github/workflows/release-insiders.yml deleted file mode 100644 index 53478a227..000000000 --- a/.github/workflows/release-insiders.yml +++ /dev/null @@ -1,318 +0,0 @@ -name: Release Insiders - -on: - push: - branches: [main] - -permissions: - contents: read - -env: - APP_NAME: tailwindcss-oxide - NODE_VERSION: 20 - OXIDE_LOCATION: ./crates/node - RELEASE_CHANNEL: insiders - -jobs: - build: - strategy: - matrix: - 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 - container: - image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian - - os: ubuntu-latest - target: aarch64-unknown-linux-gnu - strip: llvm-strip - container: - image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 - - os: ubuntu-latest - target: armv7-unknown-linux-gnueabihf - strip: llvm-strip - container: - image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-zig - - 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 - - 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 - - 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 - - - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v4 - with: - node-version: ${{ env.NODE_VERSION }} - cache: 'pnpm' - - - 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 - - # 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: | - ./crates/node/*.node - ./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 }}-${{ 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 }} - run: | - rustup default stable - - - name: Setup rust target - run: rustup target add ${{ matrix.target }} - - - name: Install dependencies - run: pnpm install --ignore-scripts --filter=!./playgrounds/* - - - name: Build release - run: pnpm run --filter ${{ env.OXIDE_LOCATION }} build:platform --target=${{ matrix.target }} - 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 - - - name: Upload artifacts - uses: actions/upload-artifact@v4 - 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@v4 - - name: Build FreeBSD - uses: cross-platform-actions/action@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@9.6.0 --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 --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@v4 - 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 insiders - - permissions: - contents: write # for softprops/action-gh-release to create GitHub release - # 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 - with: - fetch-depth: 20 - - - name: Resolve version - id: vars - run: | - echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - - - uses: pnpm/action-setup@v4 - - - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v4 - with: - node-version: ${{ env.NODE_VERSION }} - cache: 'pnpm' - registry-url: 'https://registry.npmjs.org' - - # 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: | - ./crates/node/*.node - ./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 }}-${{ matrix.target }}-oxide-${{ hashFiles('./crates/**/*') }} - - - name: Setup WASM target - run: rustup target add wasm32-wasip1-threads - - - name: Install dependencies - run: pnpm --filter=!./playgrounds/* install - - - name: Download artifacts - uses: actions/download-artifact@v4 - 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: 'Version based on commit: 0.0.0-${{ env.RELEASE_CHANNEL }}.${{ env.SHA_SHORT }}' - run: pnpm run version-packages 0.0.0-${{ env.RELEASE_CHANNEL }}.${{ env.SHA_SHORT }} - - - name: Build Tailwind CSS - run: pnpm run build - - - 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: Upload npm package tarballs - uses: actions/upload-artifact@v4 - with: - name: npm-package-tarballs - path: dist/*.tgz - - - name: Publish - run: | - pnpm --recursive --filter="!@tailwindcss/oxide-wasm32-wasi" publish --tag ${{ env.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 ${{ env.RELEASE_CHANNEL }} --no-git-checks; popd; - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - - - name: Trigger Tailwind Play update - uses: actions/github-script@v7 - with: - github-token: ${{ secrets.TAILWIND_PLAY_TOKEN }} - script: | - await github.rest.actions.createWorkflowDispatch({ - owner: 'tailwindlabs', - repo: 'upgrades', - ref: 'main', - workflow_id: 'upgrade-tailwindcss.yml' - }) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8b27773b3..2c957d3af 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,18 +1,34 @@ name: Release on: + push: + branches: [main] release: types: [published] workflow_dispatch: + inputs: + 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: @@ -42,44 +58,40 @@ 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) 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 - name: Install gcc-arm-linux-gnueabihf if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }} @@ -87,62 +99,56 @@ jobs: sudo apt-get update sudo apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y - # 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: | - ./crates/node/*.node - ./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 }}-${{ 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 binutils-aarch64-linux-gnu + if: ${{ matrix.target == 'aarch64-unknown-linux-gnu' }} run: | - rustup default stable + 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:platform --target=${{ matrix.target }} + 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 @@ -152,9 +158,11 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + with: + persist-credentials: false - name: Build FreeBSD - uses: cross-platform-actions/action@v0.25.0 + uses: cross-platform-actions/action@cdc9ee69ef84a5f2e59c9058335d9c57bcb4ac86 # v0.25.0 env: DEBUG: napi:* RUSTUP_HOME: /usr/local/rustup @@ -170,7 +178,7 @@ jobs: shell: bash run: | sudo pkg install -y -f curl node libnghttp2 npm - sudo npm install -g pnpm@9.6.0 --unsafe-perm=true + 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 @@ -181,12 +189,12 @@ jobs: node -v echo "~~~~ pnpm --version ~~~~" pnpm --version - pnpm install --ignore-scripts --filter=!./playgrounds/* || true + 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@v4 + uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6 with: name: bindings-x86_64-unknown-freebsd path: ${{ env.OXIDE_LOCATION }}/*.node @@ -194,10 +202,10 @@ jobs: 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 @@ -206,55 +214,51 @@ jobs: - build-freebsd steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: fetch-depth: 20 + persist-credentials: false - - 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: | - ./crates/node/*.node - ./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 }}-${{ 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 }} @@ -274,10 +278,19 @@ jobs: 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: stable + FEATURES_ENV: ${{ env.FEATURES_ENV }} - name: Run pre-publish optimizations scripts run: node ./scripts/pre-publish-optimizations.mjs @@ -285,22 +298,20 @@ jobs: - name: Lock pre-release versions run: node ./scripts/lock-pre-release-versions.mjs - - name: Calculate environment variables - run: | - echo "RELEASE_CHANNEL=$(node ./scripts/release-channel.js)" >> $GITHUB_ENV - echo "TAILWINDCSS_VERSION=$(node -e 'console.log(require(`./packages/tailwindcss/package.json`).version);')" >> $GITHUB_ENV + - name: Upload npm package tarballs + uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6 + with: + name: npm-package-tarballs + path: dist/*.tgz - name: Publish run: | - pnpm --recursive --filter="!@tailwindcss/oxide-wasm32-wasi" publish --tag ${{ env.RELEASE_CHANNEL }} --no-git-checks + 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 ${{ env.RELEASE_CHANNEL }} --no-git-checks; popd; - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + pushd crates/node/npm/wasm32-wasi; pnpm publish --tag ${RELEASE_CHANNEL} --no-git-checks --config.node-linker=hoisted; popd; - name: Trigger Tailwind Play update - if: env.RELEASE_CHANNEL == 'latest' - uses: actions/github-script@v7 + uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8 with: github-token: ${{ secrets.TAILWIND_PLAY_TOKEN }} script: | @@ -310,3 +321,38 @@ jobs: 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/.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 e8c3ce090..e5e6f6f89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,289 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- _Experimental_: Add `@container-size` utility ([#18901](https://github.com/tailwindlabs/tailwindcss/pull/18901)) +- 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`, `%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 `` 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-` → `inset-s-` 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-` → `inset-e-` 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 @@ -20,13 +302,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - 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)) -- Do not migrate `variant = 'outline'` during upgrades ([#18922](https://github.com/tailwindlabs/tailwindcss/pull/18922)) - 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 @@ -3828,7 +4123,23 @@ No release notes - Everything! -[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v4.1.13...HEAD +[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 diff --git a/Cargo.lock b/Cargo.lock index aaf0b476e..73fd9e995 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -40,7 +40,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0" dependencies = [ "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.18", "serde", ] @@ -60,32 +60,30 @@ dependencies = [ ] [[package]] -name = "convert_case" -version = "0.8.0" +name = "console" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f" +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", ] @@ -109,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" @@ -126,19 +115,9 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "ctor" -version = "0.5.0" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67773048316103656a637612c4a62477603b777d91d9c62ff2290f9cde178fdb" -dependencies = [ - "ctor-proc-macro", - "dtor", -] - -[[package]] -name = "ctor-proc-macro" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2931af7e13dc045d8e9d26afccc6fa115d64e115c9c84b1166288b46f6782c2" +checksum = "2d83cb7e7a873830708d6b02a78cd36a592c6fa14bf267b68725103b85c0d77f" [[package]] name = "diff" @@ -146,21 +125,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "dtor" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58a0764cddb55ab28955347b45be00ade43d4d6f3ba4bf3dc354e4ec9432934" -dependencies = [ - "dtor-proc-macro", -] - -[[package]] -name = "dtor-proc-macro" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5" - [[package]] name = "dunce" version = "1.0.5" @@ -173,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" @@ -199,15 +169,103 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] -name = "globset" -version = "0.4.16" +name = "futures" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5" +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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07c34a9410465b45bd9787443bc7370f37735bad04b0f0cd57ff1a3186c98988" dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.8", + "regex-automata 0.4.18", "regex-syntax 0.8.5", ] @@ -218,27 +276,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" dependencies = [ "bitflags", - "ignore 0.4.23 (registry+https://github.com/rust-lang/crates.io-index)", + "ignore 0.4.23", "walkdir", ] -[[package]] -name = "ignore" -version = "0.4.23" -dependencies = [ - "bstr", - "crossbeam-channel", - "crossbeam-deque", - "dunce", - "globset", - "log", - "memchr", - "regex-automata 0.4.8", - "same-file", - "walkdir", - "winapi-util", -] - [[package]] name = "ignore" version = "0.4.23" @@ -249,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" @@ -278,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]] @@ -321,12 +391,13 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "napi" -version = "3.3.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b74e3dce5230795bb4d2821b941706dee733c7308752507254b0497f39cad7" +checksum = "de33522036981030a75c231829566bc63414e08101a6f5ff4ac6cef19c8e0941" dependencies = [ "bitflags", "ctor", + "futures", "napi-build", "napi-sys", "nohash-hasher", @@ -335,15 +406,15 @@ dependencies = [ [[package]] name = "napi-build" -version = "2.2.3" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcae8ad5609d14afb3a3b91dee88c757016261b151e9dcecabf1b2a31a6cab14" +checksum = "c9c366d2c8c60b86fa632df75f745509b52f9128f91a6bad4c796e44abb505e1" [[package]] name = "napi-derive" -version = "3.2.5" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7552d5a579b834614bbd496db5109f1b9f1c758f08224b0dee1e408333adf0d0" +checksum = "a49c513341a61a16a10af6efcce46b30d0822ba2d4fb197d24d33dfc199c78d5" dependencies = [ "convert_case", "ctor", @@ -355,9 +426,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "2.2.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6a81ac7486b70f2532a289603340862c06eea5a1e650c1ffeda2ce1238516a" +checksum = "d60b5d773ad46c698c8cc2cd9fde0b283d39cbb7f71c04bee633c7bdba4423bd" dependencies = [ "convert_case", "proc-macro2", @@ -368,9 +439,9 @@ dependencies = [ [[package]] name = "napi-sys" -version = "3.0.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4e7135a8f97aa0f1509cce21a8a1f9dcec1b50d8dee006b48a5adb69a9d64d" +checksum = "85fbf1fa9f1babfe396d74bbbf52b3643770243e8f5b0b46715d4caf7f0dfc9a" dependencies = [ "libloading", ] @@ -403,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" @@ -440,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", @@ -459,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", @@ -475,7 +546,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.18", "regex-syntax 0.8.5", ] @@ -490,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", @@ -560,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" @@ -568,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", @@ -595,11 +678,11 @@ dependencies = [ "bexpand", "bstr", "classification-macros", - "crossbeam", "dunce", "fast-glob", "globwalk", - "ignore 0.4.23", + "ignore 0.4.33", + "insta", "log", "pretty_assertions", "rayon", @@ -761,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" @@ -779,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" diff --git a/README.md b/README.md index 7d21bd883..5f532607d 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@

- Build Status + Build Status Total Downloads - Latest Release - License + Latest Release + License

--- @@ -29,8 +29,8 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com). For help, discussion about best practices, or feature ideas: -[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions) +[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/ignore/Cargo.toml b/crates/ignore/Cargo.toml index b8ae1b1bf..d0af38ba9 100644 --- a/crates/ignore/Cargo.toml +++ b/crates/ignore/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ignore" -version = "0.4.23" #:version +version = "0.4.33" #:version authors = ["Andrew Gallant "] description = """ A fast library for efficiently matching ignore files such as `.gitignore` @@ -12,7 +12,10 @@ repository = "https://github.com/BurntSushi/ripgrep/tree/master/crates/ignore" readme = "README.md" keywords = ["glob", "ignore", "gitignore", "pattern", "file"] license = "Unlicense OR MIT" -edition = "2021" +# 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" @@ -20,15 +23,17 @@ bench = false [dependencies] crossbeam-deque = "0.8.3" -globset = "0.4.16" +# 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.0" +version = "0.4.18" default-features = false features = ["std", "perf", "syntax", "meta", "nfa", "hybrid", "dfa-onepass"] @@ -37,7 +42,7 @@ version = "0.1.2" [dev-dependencies] bstr = { version = "1.6.2", default-features = false, features = ["std"] } -crossbeam-channel = "0.5.8" +crossbeam-channel = "0.5.15" [features] # DEPRECATED. It is a no-op. SIMD is done automatically through runtime diff --git a/crates/ignore/README.md b/crates/ignore/README.md index a4c34e505..72258e6b5 100644 --- a/crates/ignore/README.md +++ b/crates/ignore/README.md @@ -1,5 +1,5 @@ -# ignore - +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. @@ -29,6 +29,7 @@ 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; diff --git a/crates/ignore/examples/walk.rs b/crates/ignore/examples/walk.rs index 5bbd10f2b..c61d0515e 100644 --- a/crates/ignore/examples/walk.rs +++ b/crates/ignore/examples/walk.rs @@ -18,8 +18,8 @@ fn main() { let stdout_thread = std::thread::spawn(move || { let mut stdout = std::io::BufWriter::new(std::io::stdout()); for dent in rx { - stdout.write(&*Vec::from_path_lossy(dent.path())).unwrap(); - stdout.write(b"\n").unwrap(); + stdout.write_all(&Vec::from_path_lossy(dent.path())).unwrap(); + stdout.write_all(b"\n").unwrap(); } }); diff --git a/crates/ignore/src/default_types.rs b/crates/ignore/src/default_types.rs index 2cf8ad807..6b5bba0f0 100644 --- a/crates/ignore/src/default_types.rs +++ b/crates/ignore/src/default_types.rs @@ -27,9 +27,10 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ (&["bat", "batch"], &["*.bat"]), (&["bazel"], &[ "*.bazel", "*.bzl", "*.BUILD", "*.bazelrc", "BUILD", "MODULE.bazel", - "WORKSPACE", "WORKSPACE.bazel", + "WORKSPACE", "WORKSPACE.bazel", "WORKSPACE.bzlmod", ]), (&["bitbake"], &["*.bb", "*.bbappend", "*.bbclass", "*.conf", "*.inc"]), + (&["boxlang"], &["*.bx", "*.bxm", "*.bxs"]), (&["brotli"], &["*.br"]), (&["buildstream"], &["*.bst"]), (&["bzip2"], &["*.bz2", "*.tbz2"]), @@ -39,12 +40,14 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ (&["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", @@ -62,7 +65,7 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ (&["cython"], &["*.pyx", "*.pxi", "*.pxd"]), (&["d"], &["*.d"]), (&["dart"], &["*.dart"]), - (&["devicetree"], &["*.dts", "*.dtsi"]), + (&["devicetree"], &["*.dts", "*.dtsi", "*.dtso"]), (&["dhall"], &["*.dhall"]), (&["diff"], &["*.patch", "*.diff"]), (&["dita"], &["*.dita", "*.ditamap", "*.ditaval"]), @@ -88,6 +91,8 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ (&["fsharp"], &["*.fs", "*.fsx", "*.fsi"]), (&["fut"], &["*.fut"]), (&["gap"], &["*.g", "*.gap", "*.gi", "*.gd", "*.tst"]), + (&["gdscript"], &["*.gd"]), + (&["gleam"], &["*.gleam"]), (&["gn"], &["*.gn", "*.gni"]), (&["go"], &["*.go"]), (&["gprbuild"], &["*.gpr"]), @@ -105,6 +110,7 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ (&["hbs"], &["*.hbs"]), (&["hs"], &["*.hs", "*.lhs"]), (&["html"], &["*.htm", "*.html", "*.ejs"]), + (&["hurl"], &["*.hurl"]), (&["hy"], &["*.hy"]), (&["idris"], &["*.idr", "*.lidr"]), (&["janet"], &["*.janet"]), @@ -117,6 +123,7 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ (&["julia"], &["*.jl"]), (&["jupyter"], &["*.ipynb", "*.jpynb"]), (&["k"], &["*.k"]), + (&["kconfig"], &["Kconfig", "Kconfig.*"]), (&["kotlin"], &["*.kt", "*.kts"]), (&["lean"], &["*.lean"]), (&["less"], &["*.less"]), @@ -149,6 +156,7 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ ]), (&["lilypond"], &["*.ly", "*.ily"]), (&["lisp"], &["*.el", "*.jl", "*.lisp", "*.lsp", "*.sc", "*.scm"]), + (&["llvm"], &["*.ll"]), (&["lock"], &["*.lock", "package-lock.json"]), (&["log"], &["*.log"]), (&["lua"], &["*.lua"]), @@ -159,6 +167,7 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ "[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"]), @@ -178,10 +187,11 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ (&["mint"], &["*.mint"]), (&["mk"], &["mkfile"]), (&["ml"], &["*.ml"]), + (&["mojo"], &["*.mojo"]), (&["motoko"], &["*.mo"]), (&["msbuild"], &[ "*.csproj", "*.fsproj", "*.vcxproj", "*.proj", "*.props", "*.targets", - "*.sln", + "*.sln", "*.slnf" ]), (&["nim"], &["*.nim", "*.nimf", "*.nimble", "*.nims"]), (&["nix"], &["*.nix"]), @@ -199,18 +209,21 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ "*.php", "*.php3", "*.php4", "*.php5", "*.php7", "*.php8", "*.pht", "*.phtml" ]), + (&["pkgbuild"], &["PKGBUILD"]), (&["po"], &["*.po"]), (&["pod"], &["*.pod"]), (&["postscript"], &["*.eps", "*.ps"]), (&["prolog"], &["*.pl", "*.pro", "*.prolog", "*.P"]), - (&["protobuf"], &["*.proto"]), + (&["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"]), - (&["r"], &["*.R", "*.r", "*.Rmd", "*.Rnw"]), + (&["qrc"], &["*.qrc"]), + (&["qui"], &["*.ui"]), + (&["r"], &["*.R", "*.r", "*.Rmd", "*.rmd", "*.Rnw", "*.rnw"]), (&["racket"], &["*.rkt"]), (&["raku"], &[ "*.raku", "*.rakumod", "*.rakudoc", "*.rakutest", @@ -222,19 +235,22 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ (&["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" + "*.gemspec", "*.rb", "*.rbw", "*.rake" ]), (&["rust"], &["*.rs"]), (&["sass"], &["*.sass", "*.scss"]), (&["scala"], &["*.scala", "*.sbt"]), + (&["scdoc"], &["*.scd", "*.scdoc"]), + (&["seed7"], &["*.sd7", "*.s7i"]), (&["sh"], &[ // Portable/misc. init files - ".login", ".logout", ".profile", "profile", + ".env", ".login", ".logout", ".profile", "profile", // bash-specific init files ".bash_login", "bash_login", ".bash_logout", "bash_logout", @@ -253,7 +269,7 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ ".zprofile", "zprofile", ".zshrc", "zshrc", // Extensions - "*.bash", "*.csh", "*.ksh", "*.sh", "*.tcsh", "*.zsh", + "*.bash", "*.csh", "*.env", "*.ksh", "*.sh", "*.tcsh", "*.zsh", ]), (&["slim"], &["*.skim", "*.slim", "*.slime"]), (&["smarty"], &["*.tpl"]), @@ -263,9 +279,10 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ (&["spark"], &["*.spark"]), (&["spec"], &["*.spec"]), (&["sql"], &["*.sql", "*.psql"]), + (&["ssa"], &["*.ssa"]), (&["stylus"], &["*.styl"]), (&["sv"], &["*.v", "*.vg", "*.sv", "*.svh", "*.h"]), - (&["svelte"], &["*.svelte"]), + (&["svelte"], &["*.svelte", "*.svelte.ts"]), (&["svg"], &["*.svg"]), (&["swift"], &["*.swift"]), (&["swig"], &["*.def", "*.i"]), @@ -280,9 +297,8 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ (&["texinfo"], &["*.texi"]), (&["textile"], &["*.textile"]), (&["tf"], &[ - "*.tf", "*.auto.tfvars", "terraform.tfvars", "*.tf.json", - "*.auto.tfvars.json", "terraform.tfvars.json", "*.terraformrc", - "terraform.rc", "*.tfrc", "*.terraform.lock.hcl", + "*.tf", "*.tf.json", "*.tfvars", "*.tfvars.json", + "*.terraformrc", "terraform.rc", "*.tfrc", "*.terraform.lock.hcl", ]), (&["thrift"], &["*.thrift"]), (&["toml"], &["*.toml", "Cargo.lock"]), @@ -290,6 +306,7 @@ pub(crate) const DEFAULT_TYPES: &[(&[&str], &[&str])] = &[ (&["twig"], &["*.twig"]), (&["txt"], &["*.txt"]), (&["typoscript"], &["*.typoscript", "*.ts"]), + (&["typst"], &["*.typ"]), (&["usd"], &["*.usd", "*.usda", "*.usdc"]), (&["v"], &["*.v", "*.vsh"]), (&["vala"], &["*.vala"]), @@ -348,4 +365,14 @@ mod tests { 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 index 9bbf1442b..6bee724c8 100644 --- a/crates/ignore/src/dir.rs +++ b/crates/ignore/src/dir.rs @@ -16,7 +16,7 @@ use std::{ collections::HashMap, ffi::{OsStr, OsString}, - fs::{File, FileType}, + fs::{self, File, FileType}, io::{self, BufRead}, path::{Path, PathBuf}, sync::{Arc, RwLock, Weak}, @@ -25,7 +25,7 @@ use std::{ use crate::{ gitignore::{self, Gitignore, GitignoreBuilder}, overrides::{self, Override}, - pathutil::{is_hidden, strip_prefix}, + pathutil::{is_hidden_entry, strip_prefix}, types::{self, Types}, walk::DirEntry, {Error, Match, PartialErrorBuilder}, @@ -91,7 +91,25 @@ struct IgnoreOptions { /// Ignore is a matcher useful for recursively walking one or more directories. #[derive(Clone, Debug)] -pub(crate) struct Ignore(Arc); +pub(crate) struct Ignore { + inner: Arc, + // 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>, +} #[derive(Clone, Debug)] struct IgnoreInner { @@ -112,12 +130,21 @@ struct IgnoreInner { /// /// If this is the root directory or there are otherwise no more /// directories to match, then `parent` is `None`. - parent: Option, + parent: Option>, /// Whether this is an absolute parent matcher, as added by add_parent. is_absolute_parent: bool, - /// The absolute base path of this matcher. Populated only if parent - /// directories are added. - absolute_base: Option>, + /// 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, /// Explicit global ignore matchers specified by the caller. explicit_ignores: Arc>, /// Ignore files used in addition to `.ignore` @@ -140,34 +167,36 @@ struct IgnoreInner { impl Ignore { /// Return the directory path of this matcher. + #[cfg(test)] pub(crate) fn path(&self) -> &Path { - &self.0.dir + &self.inner.dir } /// Return true if this matcher has no parent. pub(crate) fn is_root(&self) -> bool { - self.0.parent.is_none() - } - - /// Returns true if this matcher was added via the `add_parents` method. - pub(crate) fn is_absolute_parent(&self) -> bool { - self.0.is_absolute_parent + self.inner.parent.is_none() } /// Return this matcher's parent, if one exists. pub(crate) fn parent(&self) -> Option { - self.0.parent.clone() + 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>(&self, path: P) -> (Ignore, Option) { - if !self.0.opts.parents - && !self.0.opts.git_ignore - && !self.0.opts.git_exclude - && !self.0.opts.git_global + pub(crate) fn add_parents>( + &self, + path: P, + ) -> (Ignore, Option) { + 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. @@ -197,25 +226,34 @@ impl Ignore { let mut errs = PartialErrorBuilder::default(); let mut ig = self.clone(); for parent in parents.into_iter().rev() { - let mut compiled = self.0.compiled.write().unwrap(); + 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(prebuilt); + 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.absolute_base = Some(absolute_base.clone()); - igtmp.has_git = if self.0.opts.require_git && self.0.opts.git_ignore { - parent.join(".git").exists() - } else { - false - }; + 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(ig_arc.clone()); - compiled.insert(parent.as_os_str().to_os_string(), Arc::downgrade(&ig_arc)); + 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()) } @@ -228,59 +266,161 @@ impl Ignore { /// returned if it exists. /// /// Note that all I/O errors are completely ignored. - pub(crate) fn add_child>(&self, dir: P) -> (Ignore, Option) { + pub(crate) fn add_child>( + &self, + dir: P, + ) -> (Ignore, Option) { let (ig, err) = self.add_child_path(dir.as_ref()); - (Ignore(Arc::new(ig)), err) + ( + 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>( + &self, + dir: P, + entries: &[fs::DirEntry], + ) -> (Ignore, Option) { + 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) { - let git_type = - if self.0.opts.require_git && (self.0.opts.git_ignore || self.0.opts.git_exclude) { - dir.join(".git").metadata().ok().map(|md| md.file_type()) - } else { - None - }; - let has_git = git_type.map(|_| true).unwrap_or(false); + 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) { + 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.0.custom_ignore_filenames.is_empty() { + let custom_ig_matcher = if self + .inner + .custom_ignore_filenames + .is_empty() + { Gitignore::empty() } else { - let (m, err) = create_gitignore( - &dir, - &dir, - &self.0.custom_ignore_filenames, - self.0.opts.ignore_case_insensitive, - ); - errs.maybe_push(err); - m + 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.0.opts.ignore { + 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.0.opts.ignore_case_insensitive, + self.inner.opts.ignore_case_insensitive, ); errs.maybe_push(err); m }; - let gi_matcher = if !self.0.opts.git_ignore { + 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.0.opts.ignore_case_insensitive, + self.inner.opts.ignore_case_insensitive, ); errs.maybe_push(err); m }; - let gi_exclude_matcher = if !self.0.opts.git_exclude { + + 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) { @@ -289,7 +429,7 @@ impl Ignore { &dir, &git_dir, &["info/exclude"], - self.0.opts.ignore_case_insensitive, + self.inner.opts.ignore_case_insensitive, ); errs.maybe_push(err); m @@ -301,31 +441,38 @@ impl Ignore { } }; let ig = IgnoreInner { - compiled: self.0.compiled.clone(), + compiled: self.inner.compiled.clone(), dir: dir.to_path_buf(), - overrides: self.0.overrides.clone(), - types: self.0.types.clone(), - parent: Some(self.clone()), + overrides: self.inner.overrides.clone(), + types: self.inner.types.clone(), + parent: Some(self.inner.clone()), is_absolute_parent: false, - absolute_base: self.0.absolute_base.clone(), - explicit_ignores: self.0.explicit_ignores.clone(), - custom_ignore_filenames: self.0.custom_ignore_filenames.clone(), + 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.0.git_global_matcher.clone(), + git_global_matcher: self.inner.git_global_matcher.clone(), git_ignore_matcher: gi_matcher, git_exclude_matcher: gi_exclude_matcher, has_git, - opts: self.0.opts, + 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.0.opts; - let has_custom_ignore_files = !self.0.custom_ignore_filenames.is_empty(); - let has_explicit_ignores = !self.0.explicit_ignores.is_empty(); + 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 @@ -336,9 +483,12 @@ impl Ignore { } /// Like `matched`, but works with a directory entry instead. - pub(crate) fn matched_dir_entry<'a>(&'a self, dent: &DirEntry) -> Match> { + pub(crate) fn matched_dir_entry<'a>( + &'a self, + dent: &DirEntry, + ) -> Match> { let m = self.matched(dent.path(), dent.is_dir()); - if m.is_none() && self.0.opts.hidden && is_hidden(dent) { + if m.is_none() && self.inner.opts.hidden && is_hidden_entry(dent) { return Match::Ignore(IgnoreMatch::hidden()); } m @@ -348,7 +498,11 @@ impl Ignore { /// ignored or not. /// /// The match contains information about its origin. - fn matched<'a, P: AsRef>(&'a self, path: P, is_dir: bool) -> Match> { + pub(crate) fn matched<'a, P: AsRef>( + &'a self, + path: P, + is_dir: bool, + ) -> Match> { // 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(); @@ -359,9 +513,9 @@ impl Ignore { // regardless of whether it's whitelist/ignore, then we quit and // return that result immediately. Overrides have the highest // precedence. - if !self.0.overrides.is_empty() { + if !self.inner.overrides.is_empty() { let mat = self - .0 + .inner .overrides .matched(path, is_dir) .map(IgnoreMatch::overrides); @@ -378,8 +532,9 @@ impl Ignore { whitelisted = mat; } } - if !self.0.types.is_empty() { - let mat = self.0.types.matched(path, is_dir).map(IgnoreMatch::types); + 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() { @@ -391,96 +546,143 @@ impl Ignore { /// Performs matching only on the ignore files for this directory and /// all parent directories. - fn matched_ignore<'a>(&'a self, path: &Path, is_dir: bool) -> Match> { - 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.0.opts.require_git || self.parents().any(|ig| ig.0.has_git); + pub(crate) fn matched_ignore<'a>( + &'a self, + path: &Path, + is_dir: bool, + ) -> Match> { + 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.0.is_absolute_parent) { + for ig in self.parents().take_while(|ig| !ig.inner.is_absolute_parent) + { if m_custom_ignore.is_none() { - m_custom_ignore = - ig.0.custom_ignore_matcher - .matched(path, is_dir) - .map(IgnoreMatch::gitignore); + m_custom_ignore = ig + .inner + .custom_ignore_matcher + .matched(path, is_dir) + .map(IgnoreMatch::gitignore); } if m_ignore.is_none() { - m_ignore = - ig.0.ignore_matcher - .matched(path, is_dir) - .map(IgnoreMatch::gitignore); + 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.0.git_ignore_matcher - .matched(path, is_dir) - .map(IgnoreMatch::gitignore); + 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.0.git_exclude_matcher - .matched(path, is_dir) - .map(IgnoreMatch::gitignore); + m_gi_exclude = ig + .inner + .git_exclude_matcher + .matched(path, is_dir) + .map(IgnoreMatch::gitignore); } - saw_git = saw_git || ig.0.has_git; + saw_git = saw_git || ig.inner.has_git; } - if self.0.opts.parents { - // CHANGED: We removed a code path that rewrote the `path` to be relative to - // `self.absolute_base()` because it assumed that the every path is inside the base - // which is not the case for us as we use `WalkBuilder#add` to add roots outside of the - // base. - for ig in self.parents().skip_while(|ig| !ig.0.is_absolute_parent) { - if m_custom_ignore.is_none() { - m_custom_ignore = - ig.0.custom_ignore_matcher + 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.0.ignore_matcher + } + 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.0.git_ignore_matcher + } + 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.0.git_exclude_matcher + } + 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; } - saw_git = saw_git || ig.0.has_git; } } - for gi in self.0.explicit_ignores.iter().rev() { - // 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; - } + 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.0 + self.inner .git_global_matcher .matched(&path, is_dir) .map(IgnoreMatch::gitignore) @@ -488,53 +690,90 @@ impl Ignore { Match::None }; - // CHANGED: We added logic to configure an order in which the ignore files are respected and - // allowed a whitelist in a later file to overrule a block on an earlier file. + // 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, + m_explicit, // .custom-ignore - &m_custom_ignore, + m_custom_ignore, // .ignore - &m_ignore, + m_ignore, // .gitignore - &m_gi, + m_gi, // .git/info/exclude - &m_gi_exclude, + m_gi_exclude, // Global gitignore - &m_global, + m_global, ]; - for check in order.into_iter() { - if check.is_none() { - continue; + if !check.is_none() { + return check; } - - return check.clone(); } - - m_explicit + Match::None } /// Returns an iterator over parent ignore matchers, including this one. pub(crate) fn parents(&self) -> Parents<'_> { - Parents(Some(self)) + 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, +} + +#[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. -/// -/// The lifetime `'a` refers to the lifetime of the initial `Ignore` matcher. -pub(crate) struct Parents<'a>(Option<&'a Ignore>); +pub(crate) struct Parents<'a>(Option>); impl<'a> Iterator for Parents<'a> { - type Item = &'a Ignore; + type Item = IgnoreRef<'a>; - fn next(&mut self) -> Option<&'a Ignore> { + fn next(&mut self) -> Option> { match self.0.take() { None => None, Some(ig) => { - self.0 = ig.0.parent.as_ref(); + self.0 = ig + .inner + .parent + .as_deref() + .map(|inner| IgnoreRef { inner }); Some(ig) } } @@ -554,6 +793,16 @@ pub(crate) struct IgnoreBuilder { explicit_ignores: Vec, /// Ignore files in addition to .ignore. custom_ignore_filenames: Vec, + /// 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, /// Ignore config. opts: IgnoreOptions, } @@ -561,8 +810,9 @@ pub(crate) struct IgnoreBuilder { impl IgnoreBuilder { /// Create a new builder for an `Ignore` matcher. /// - /// All relative file paths are resolved with respect to the current - /// working directory. + /// 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(), @@ -570,6 +820,7 @@ impl IgnoreBuilder { types: Arc::new(Types::empty()), explicit_ignores: vec![], custom_ignore_filenames: vec![], + global_gitignores_relative_to: None, opts: IgnoreOptions { hidden: true, ignore: true, @@ -588,10 +839,20 @@ impl IgnoreBuilder { /// 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) -> 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 { - let mut builder = GitignoreBuilder::new(""); + } 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(); @@ -600,26 +861,45 @@ impl IgnoreBuilder { log::debug!("{}", err); } gi + } else { + log::debug!( + "ignoring global gitignore file because CWD is not known" + ); + Gitignore::empty() }; - Ignore(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, + 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, - 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, - })) + } + } + + /// Set the current directory used for matching global gitignores. + pub(crate) fn current_dir( + &mut self, + cwd: impl Into, + ) -> &mut IgnoreBuilder { + self.global_gitignores_relative_to = Some(cwd.into()); + self } /// Add an override matcher. @@ -627,7 +907,10 @@ impl IgnoreBuilder { /// By default, no override matcher is used. /// /// This overrides any previous setting. - pub(crate) fn overrides(&mut self, overrides: Override) -> &mut IgnoreBuilder { + pub(crate) fn overrides( + &mut self, + overrides: Override, + ) -> &mut IgnoreBuilder { self.overrides = Arc::new(overrides); self } @@ -658,8 +941,7 @@ impl IgnoreBuilder { &mut self, file_name: S, ) -> &mut IgnoreBuilder { - self.custom_ignore_filenames - .push(file_name.as_ref().to_os_string()); + self.custom_ignore_filenames.push(file_name.as_ref().to_os_string()); self } @@ -671,6 +953,11 @@ impl IgnoreBuilder { 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 @@ -741,7 +1028,10 @@ impl IgnoreBuilder { /// Process ignore files case insensitively /// /// This is disabled by default. - pub(crate) fn ignore_case_insensitive(&mut self, yes: bool) -> &mut IgnoreBuilder { + pub(crate) fn ignore_case_insensitive( + &mut self, + yes: bool, + ) -> &mut IgnoreBuilder { self.opts.ignore_case_insensitive = yes; self } @@ -800,7 +1090,10 @@ pub(crate) fn create_gitignore>( /// them when multiple repositories are searched. /// /// Some I/O errors are ignored. -fn resolve_git_commondir(dir: &Path, git_type: Option) -> Result> { +fn resolve_git_commondir( + dir: &Path, + git_type: Option, +) -> Result> { let git_dir_path = || dir.join(".git"); let git_dir = git_dir_path(); if !git_type.map_or(false, |ft| ft.is_file()) { @@ -843,11 +1136,22 @@ fn resolve_git_commondir(dir: &Path, git_type: Option) -> Result + ?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}; + use std::{io::Write, path::Path, sync::Arc}; - use crate::{dir::IgnoreBuilder, gitignore::Gitignore, tests::TempDir, Error}; + use crate::{ + Error, dir::IgnoreBuilder, gitignore::Gitignore, tests::TempDir, + }; fn wfile>(path: P, contents: &str) { let mut file = std::fs::File::create(path).unwrap(); @@ -876,11 +1180,11 @@ mod tests { 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()); + 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()); @@ -913,6 +1217,19 @@ mod tests { 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(); @@ -1138,15 +1455,152 @@ mod tests { let (ig2, err) = ig1.add_child("src"); assert!(err.is_none()); - // CHANGED: These test cases do not make sense for us as we never call the Ignore with - // relative paths. - assert!(ig1.matched("llvm", true).is_ignore()); - assert!(ig2.matched("llvm", true).is_ignore()); + 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(); @@ -1154,16 +1608,14 @@ mod tests { 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"); + 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, - ); + wfile(td.path().join("linked-worktree/.git"), &worktree_git_dir_abs); // relative commondir wfile(commondir_path(), "../.."); diff --git a/crates/ignore/src/gitignore.rs b/crates/ignore/src/gitignore.rs index 7da86153c..8824139b5 100644 --- a/crates/ignore/src/gitignore.rs +++ b/crates/ignore/src/gitignore.rs @@ -20,8 +20,8 @@ use { }; use crate::{ - pathutil::{is_file_name, strip_prefix}, Error, Match, PartialErrorBuilder, + pathutil::{is_file_name, strip_prefix}, }; /// Glob represents a single glob in a gitignore file. @@ -102,7 +102,9 @@ impl Gitignore { /// /// Note that I/O errors are ignored. For more granular control over /// errors, use `GitignoreBuilder`. - pub fn new>(gitignore_path: P) -> (Gitignore, Option) { + pub fn new>( + gitignore_path: P, + ) -> (Gitignore, Option) { let path = gitignore_path.as_ref(); let parent = path.parent().unwrap_or(Path::new("/")); let mut builder = GitignoreBuilder::new(parent); @@ -123,12 +125,26 @@ impl Gitignore { /// 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) { - GitignoreBuilder::new("").build_global() + 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. @@ -142,7 +158,8 @@ impl Gitignore { num_ignores: 0, num_whitelists: 0, matches: None, - // CHANGED: Add a flag to have Gitignore rules that apply only to files. + // CHANGED: Add a flag to have Gitignore rules that apply only to + // files. only_on_files: false, } } @@ -187,7 +204,11 @@ impl Gitignore { /// 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>(&self, path: P, is_dir: bool) -> Match<&Glob> { + pub fn matched>( + &self, + path: P, + is_dir: bool, + ) -> Match<&Glob> { if self.is_empty() { return Match::None; } @@ -240,11 +261,16 @@ impl Gitignore { } /// Like matched, but takes a path that has already been stripped. - fn matched_stripped>(&self, path: P, is_dir: bool) -> Match<&Glob> { + fn matched_stripped>( + &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. + // CHANGED: Rules marked as only_on_files can not match against + // directories. if self.only_on_files && is_dir { return Match::None; } @@ -267,7 +293,10 @@ impl Gitignore { /// Strips the given path such that it's suitable for matching with this /// gitignore matcher. - fn strip<'a, P: 'a + AsRef + ?Sized>(&'a self, path: &'a P) -> &'a Path { + fn strip<'a, P: 'a + AsRef + ?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 @@ -303,6 +332,7 @@ pub struct GitignoreBuilder { root: PathBuf, globs: Vec, case_insensitive: bool, + allow_unclosed_class: bool, // CHANGED: Add a flag to have Gitignore rules that apply only to files. only_on_files: bool, } @@ -321,7 +351,9 @@ impl GitignoreBuilder { root: strip_prefix("./", root).unwrap_or(root).to_path_buf(), globs: vec![], case_insensitive: false, - // CHANGED: Add a flag to have Gitignore rules that apply only to files. + allow_unclosed_class: true, + // CHANGED: Add a flag to have Gitignore rules that apply only to + // files. only_on_files: false, } } @@ -332,18 +364,21 @@ impl GitignoreBuilder { pub fn build(&self) -> Result { 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(), - })?; + 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::new(|| vec![]))), - // CHANGED: Add a flag to have Gitignore rules that apply only to files. + 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, }) } @@ -403,6 +438,12 @@ impl GitignoreBuilder { 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)); } @@ -506,6 +547,7 @@ impl GitignoreBuilder { .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()), @@ -522,13 +564,36 @@ impl GitignoreBuilder { /// affected. /// /// This is disabled by default. - pub fn case_insensitive(&mut self, yes: bool) -> Result<&mut GitignoreBuilder, Error> { + 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. @@ -544,32 +609,56 @@ impl GitignoreBuilder { /// /// Note that the file path returned may not exist. pub fn gitconfig_excludes_path() -> Option { - // git supports $HOME/.gitconfig and $XDG_CONFIG_HOME/git/config. Notably, - // both can be active at the same time, where $HOME/.gitconfig takes - // precedent. So if $HOME/.gitconfig defines a `core.excludesFile`, then - // we're done. - match gitconfig_home_contents().and_then(|x| parse_excludes_file(&x)) { - Some(path) => return Some(path), - None => {} + // 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> { + let path = std::env::var_os("GIT_CONFIG_GLOBAL").map(PathBuf::from)?; + if path.as_os_str().is_empty() { + return None; } - match gitconfig_xdg_contents().and_then(|x| parse_excludes_file(&x)) { - Some(path) => return Some(path), - None => {} - } - excludes_file_default() + 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> { + 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> { - let home = match home_dir() { - None => return None, - Some(home) => home, - }; - let mut file = match File::open(home.join(".gitconfig")) { - Err(_) => return None, - Ok(file) => BufReader::new(file), - }; + 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) } @@ -578,19 +667,11 @@ fn gitconfig_home_contents() -> Option> { /// the user's XDG_CONFIG_HOME directory. fn gitconfig_xdg_contents() -> Option> { let path = std::env::var_os("XDG_CONFIG_HOME") - .and_then(|x| { - if x.is_empty() { - None - } else { - Some(PathBuf::from(x)) - } - }) + .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 = match path.and_then(|p| File::open(p).ok()) { - None => return None, - Some(file) => BufReader::new(file), - }; + .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) } @@ -600,13 +681,8 @@ fn gitconfig_xdg_contents() -> Option> { /// Specifically, this respects XDG_CONFIG_HOME. fn excludes_file_default() -> Option { std::env::var_os("XDG_CONFIG_HOME") - .and_then(|x| { - if x.is_empty() { - None - } else { - Some(PathBuf::from(x)) - } - }) + .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")) } @@ -635,9 +711,7 @@ fn parse_excludes_file(data: &[u8]) -> Option { 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))) + std::str::from_utf8(candidate).ok().map(|s| PathBuf::from(expand_tilde(s))) } /// Expands ~ in file paths to the value of $HOME. @@ -799,7 +873,10 @@ mod tests { 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")); + assert_eq!( + path_string(got.unwrap()), + super::expand_tilde("~/foo/bar") + ); } #[test] 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>, + /// The matcher for the configured root directory, loaded on first use. + ignore: RootIgnore, + /// Directory paths relative to `root`, excluding the root itself. + dirs: HashMap, + /// 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, + pub(crate) max_depth: Option, + pub(crate) max_filesize: Option, + 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>(&self, path: P) -> Option { + 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>( + &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>( + &mut self, + path: P, + is_dir: bool, + ) -> (IncrementalMatch, Option) { + 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 { + 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 { + 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 { + 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>(path: P, contents: &str) { + let mut file = File::create(path).unwrap(); + file.write_all(contents.as_bytes()).unwrap(); + } + + fn mkdirp>(path: P) { + fs::create_dir_all(path).unwrap(); + } + + fn tmpdir() -> TempDir { + TempDir::new().unwrap() + } + + fn builder>(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, P: AsRef>( + paths: I, + ) -> WalkBuilder { + let mut builder = WalkBuilder::from_iter(paths); + builder.git_global(false); + builder + } + + fn matchers(builder: &WalkBuilder) -> Vec { + builder.build_matchers() + } + + fn matchedf>( + 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>( + 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 index cd0af7ad1..b9c9a3ece 100644 --- a/crates/ignore/src/lib.rs +++ b/crates/ignore/src/lib.rs @@ -48,13 +48,16 @@ See the documentation for `WalkBuilder` for many other options. use std::path::{Path, PathBuf}; +pub use crate::incremental::{IncrementalIgnore, IncrementalMatch}; pub use crate::walk::{ - DirEntry, ParallelVisitor, ParallelVisitorBuilder, Walk, WalkBuilder, WalkParallel, WalkState, + 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; @@ -120,34 +123,31 @@ 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 { + 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())), + 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::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, } } @@ -269,19 +269,14 @@ impl Error { /// 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), - } + 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>(self, path: P, lineno: u64) -> Error { - let errline = Error::WithLineNumber { - line: lineno, - err: Box::new(self), - }; + let errline = + Error::WithLineNumber { line: lineno, err: Box::new(self) }; if path.as_ref().as_os_str().is_empty() { return errline; } @@ -301,12 +296,12 @@ impl Error { }; } let path = err.path().map(|p| p.to_path_buf()); - let mut ig_err = Error::Io(std::io::Error::from(err)); + 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 = Error::WithPath { path, err: Box::new(ig_err) }; } ig_err } @@ -333,7 +328,8 @@ 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 = errs.iter().map(|err| err.to_string()).collect(); + let msgs: Vec = + errs.iter().map(|err| err.to_string()).collect(); write!(f, "{}", msgs.join("\n")) } Error::WithLineNumber { line, ref err } => { @@ -343,10 +339,7 @@ impl std::fmt::Display for Error { write!(f, "{}: {}", path.display(), err) } Error::WithDepth { ref err, .. } => err.fmt(f), - Error::Loop { - ref ancestor, - ref child, - } => write!( + Error::Loop { ref ancestor, ref child } => write!( f, "File system loop found: \ {} points to an ancestor {}", @@ -354,14 +347,8 @@ impl std::fmt::Display for Error { 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, - } => { + 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) => { @@ -495,11 +482,7 @@ impl Match { /// 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 - } + if self.is_none() { other } else { self } } } @@ -511,7 +494,8 @@ mod tests { }; /// A convenient result type alias. - pub(crate) type Result = std::result::Result>; + pub(crate) type Result = + std::result::Result>; macro_rules! err { ($($tt:tt)*) => { @@ -544,13 +528,14 @@ mod tests { let tmpdir = env::temp_dir(); for _ in 0..TRIES { - let count = COUNTER.fetch_add(1, Ordering::SeqCst); + 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))?; + 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)) diff --git a/crates/ignore/src/overrides.rs b/crates/ignore/src/overrides.rs index 693c7dd0a..005cae8f2 100644 --- a/crates/ignore/src/overrides.rs +++ b/crates/ignore/src/overrides.rs @@ -1,5 +1,6 @@ /*! 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. */ @@ -7,8 +8,8 @@ line tools. use std::path::Path; use crate::{ - gitignore::{self, Gitignore, GitignoreBuilder}, Error, Match, + gitignore::{self, Gitignore, GitignoreBuilder}, }; /// Glob represents a single glob in an override matcher. @@ -93,7 +94,11 @@ impl Override { /// 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>(&'a self, path: P, is_dir: bool) -> Match> { + pub fn matched<'a, P: AsRef>( + &'a self, + path: P, + is_dir: bool, + ) -> Match> { if self.is_empty() { return Match::None; } @@ -116,9 +121,9 @@ impl OverrideBuilder { /// /// Matching is done relative to the directory path provided. pub fn new>(path: P) -> OverrideBuilder { - OverrideBuilder { - builder: GitignoreBuilder::new(path), - } + let mut builder = GitignoreBuilder::new(path); + builder.allow_unclosed_class(false); + OverrideBuilder { builder } } /// Builds a new override matcher from the globs added so far. @@ -141,15 +146,41 @@ impl OverrideBuilder { /// 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. + /// 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> { + 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)] @@ -252,11 +283,8 @@ mod tests { #[test] fn default_case_sensitive() { - let ov = OverrideBuilder::new(ROOT) - .add("*.html") - .unwrap() - .build() - .unwrap(); + 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()); diff --git a/crates/ignore/src/pathutil.rs b/crates/ignore/src/pathutil.rs index 0ceb5a356..5de8c106c 100644 --- a/crates/ignore/src/pathutil.rs +++ b/crates/ignore/src/pathutil.rs @@ -2,55 +2,89 @@ use std::{ffi::OsStr, path::Path}; use crate::walk::DirEntry; -/// Returns true if and only if this entry is considered to be hidden. +/// Returns true if and only if this path is considered to be hidden. /// -/// This only returns true if the base name of the path starts with a `.`. +/// # Platform behavior /// -/// On Unix, this implements a more optimized check. -#[cfg(unix)] -pub(crate) fn is_hidden(dent: &DirEntry) -> bool { - use std::os::unix::ffi::OsStrExt; - - if let Some(name) = file_name(dent.path()) { - name.as_bytes().get(0) == Some(&b'.') - } else { - false - } -} - -/// Returns true if and only if this entry is considered to be hidden. +/// ## Windows /// -/// On Windows, this returns true if one of the following is true: +/// 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. -#[cfg(windows)] -pub(crate) fn is_hidden(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; - } - } - if let Some(name) = file_name(dent.path()) { - name.to_str().map(|s| s.starts_with(".")).unwrap_or(false) - } else { - false - } -} - -/// Returns true if and only if this entry is considered to be hidden. +/// +/// ## All other platforms /// /// This only returns true if the base name of the path starts with a `.`. -#[cfg(not(any(unix, windows)))] -pub(crate) fn is_hidden(dent: &DirEntry) -> bool { - if let Some(name) = file_name(dent.path()) { - name.to_str().map(|s| s.starts_with(".")).unwrap_or(false) +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 } @@ -59,83 +93,79 @@ pub(crate) fn is_hidden(dent: &DirEntry) -> bool { /// Strip `prefix` from the `path` and return the remainder. /// /// If `path` doesn't have a prefix `prefix`, then return `None`. -#[cfg(unix)] pub(crate) fn strip_prefix<'a, P: AsRef + ?Sized>( prefix: &'a P, path: &'a Path, ) -> Option<&'a Path> { - use std::os::unix::ffi::OsStrExt; + #[cfg(unix)] + fn imp<'a>(prefix: &'a Path, path: &'a Path) -> Option<&'a Path> { + use std::os::unix::ffi::OsStrExt; - let prefix = prefix.as_ref().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()..]))) + 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()..]))) + } } -} -/// Strip `prefix` from the `path` and return the remainder. -/// -/// If `path` doesn't have a prefix `prefix`, then return `None`. -#[cfg(not(unix))] -pub(crate) fn strip_prefix<'a, P: AsRef + ?Sized>( - prefix: &'a P, - path: &'a Path, -) -> Option<&'a Path> { - path.strip_prefix(prefix).ok() + #[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. -#[cfg(unix)] pub(crate) fn is_file_name>(path: P) -> bool { - use std::os::unix::ffi::OsStrExt; - - use memchr::memchr; - - let path = path.as_ref().as_os_str().as_bytes(); - memchr(b'/', path).is_none() -} - -/// Returns true if this file path is just a file name. i.e., Its parent is -/// the empty string. -#[cfg(not(unix))] -pub(crate) fn is_file_name>(path: P) -> bool { - 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, -/// file_name will return None. -#[cfg(unix)] -pub(crate) fn file_name<'a, P: AsRef + ?Sized>(path: &'a P) -> Option<&'a OsStr> { - use memchr::memrchr; - use std::os::unix::ffi::OsStrExt; - - let path = path.as_ref().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; + #[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) } - let last_slash = memrchr(b'/', path).map(|i| i + 1).unwrap_or(0); - Some(OsStr::from_bytes(&path[last_slash..])) } /// 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, -/// file_name will return None. -#[cfg(not(unix))] -pub(crate) fn file_name<'a, P: AsRef + ?Sized>(path: &'a P) -> Option<&'a OsStr> { - path.as_ref().file_name() +/// 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 + ?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 index 814ee4a0a..313cf5c0e 100644 --- a/crates/ignore/src/types.rs +++ b/crates/ignore/src/types.rs @@ -91,7 +91,7 @@ use { regex_automata::util::pool::Pool, }; -use crate::{default_types::DEFAULT_TYPES, pathutil::file_name, Error, Match}; +use crate::{Error, Match, default_types::DEFAULT_TYPES, pathutil::file_name}; /// Glob represents a single glob in a set of file type definitions. /// @@ -204,8 +204,12 @@ impl Selection { fn map U>(self, f: F) -> Selection { match self { - Selection::Select(name, inner) => Selection::Select(name, f(inner)), - Selection::Negate(name, inner) => Selection::Negate(name, f(inner)), + Selection::Select(name, inner) => { + Selection::Select(name, f(inner)) + } + Selection::Negate(name, inner) => { + Selection::Negate(name, f(inner)) + } } } @@ -227,7 +231,9 @@ impl Types { has_selected: false, glob_to_selection: vec![], set: GlobSetBuilder::new().build().unwrap(), - matches: Arc::new(Pool::new(|| vec![])), + matches: Arc::new(Pool::with_available_parallelism_capacity( + || vec![], + )), } } @@ -254,7 +260,11 @@ impl Types { /// 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>(&'a self, path: P, is_dir: bool) -> Match> { + pub fn matched<'a, P: AsRef>( + &'a self, + path: P, + is_dir: bool, + ) -> Match> { // 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() { @@ -306,10 +316,7 @@ impl TypesBuilder { /// 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![], - } + TypesBuilder { types: HashMap::new(), selections: vec![] } } /// Build the current set of file type definitions *and* selections into @@ -343,17 +350,18 @@ impl TypesBuilder { } selections.push(selection.clone().map(move |_| def)); } - let set = build_set.build().map_err(|err| Error::Glob { - glob: None, - err: err.to_string(), - })?; + 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::new(|| vec![])), + matches: Arc::new(Pool::with_available_parallelism_capacity( + || vec![], + )), }) } @@ -377,12 +385,10 @@ impl TypesBuilder { 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(), ())); + self.selections.push(Selection::Select(name.to_string(), ())); } } else { - self.selections - .push(Selection::Select(name.to_string(), ())); + self.selections.push(Selection::Select(name.to_string(), ())); } self } @@ -393,12 +399,10 @@ impl TypesBuilder { 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(), ())); + self.selections.push(Selection::Negate(name.to_string(), ())); } } else { - self.selections - .push(Selection::Negate(name.to_string(), ())); + self.selections.push(Selection::Negate(name.to_string(), ())); } self } @@ -453,7 +457,10 @@ impl TypesBuilder { 3 => { let name = parts[0]; let types_string = parts[2]; - if name.is_empty() || parts[1] != "include" || types_string.is_empty() { + if name.is_empty() + || parts[1] != "include" + || types_string.is_empty() + { return Err(Error::InvalidDefinition); } let types = types_string.split(','); @@ -463,7 +470,8 @@ impl TypesBuilder { return Err(Error::InvalidDefinition); } for type_name in types { - let globs = self.types.get(type_name).unwrap().globs.clone(); + let globs = + self.types.get(type_name).unwrap().globs.clone(); for glob in globs { self.add(name, &glob)?; } @@ -549,30 +557,9 @@ mod tests { 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, 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"); diff --git a/crates/ignore/src/walk.rs b/crates/ignore/src/walk.rs index 9c1f7413d..2dff78852 100644 --- a/crates/ignore/src/walk.rs +++ b/crates/ignore/src/walk.rs @@ -5,7 +5,7 @@ use std::{ io, path::{Path, PathBuf}, sync::atomic::{AtomicBool, AtomicUsize, Ordering as AtomicOrdering}, - sync::Arc, + sync::{Arc, OnceLock}, }; use { @@ -15,11 +15,13 @@ use { }; 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, - Error, PartialErrorBuilder, }; /// A directory entry with a possible error attached. @@ -104,24 +106,15 @@ impl DirEntry { } fn new_stdin() -> DirEntry { - DirEntry { - dent: DirEntryInner::Stdin, - err: None, - } + DirEntry { dent: DirEntryInner::Stdin, err: None } } fn new_walkdir(dent: walkdir::DirEntry, err: Option) -> DirEntry { - DirEntry { - dent: DirEntryInner::Walkdir(dent), - err, - } + DirEntry { dent: DirEntryInner::Walkdir(dent), err } } fn new_raw(dent: DirEntryRaw, err: Option) -> DirEntry { - DirEntry { - dent: DirEntryInner::Raw(dent), - err, - } + DirEntry { dent: DirEntryInner::Raw(dent), err } } } @@ -187,9 +180,11 @@ impl DirEntryInner { )); Err(err.with_path("")) } - Walkdir(ref x) => x - .metadata() - .map_err(|err| Error::Io(io::Error::from(err)).with_path(x.path())), + 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(), } } @@ -308,7 +303,9 @@ impl DirEntryRaw { } else { fs::symlink_metadata(&self.path) } - .map_err(|err| Error::Io(io::Error::from(err)).with_path(&self.path)) + .map_err(|err| { + Error::Io(err).with_depth(self.depth).with_path(&self.path) + }) } fn file_type(&self) -> FileType { @@ -316,9 +313,7 @@ impl DirEntryRaw { } fn file_name(&self) -> &OsStr { - self.path - .file_name() - .unwrap_or_else(|| self.path.as_os_str()) + self.path.file_name().unwrap_or_else(|| self.path.as_os_str()) } fn depth(&self) -> usize { @@ -330,13 +325,13 @@ impl DirEntryRaw { self.ino } - fn from_entry(depth: usize, ent: &fs::DirEntry) -> Result { + fn from_entry( + depth: usize, + ent: &fs::DirEntry, + ) -> Result { let ty = ent.file_type().map_err(|err| { - let err = Error::Io(io::Error::from(err)).with_path(ent.path()); - Error::WithDepth { - depth, - err: Box::new(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) } @@ -348,11 +343,8 @@ impl DirEntryRaw { ty: fs::FileType, ) -> Result { let md = ent.metadata().map_err(|err| { - let err = Error::Io(io::Error::from(err)).with_path(ent.path()); - Error::WithDepth { - depth, - err: Box::new(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(), @@ -395,8 +387,13 @@ impl DirEntryRaw { } #[cfg(windows)] - fn from_path(depth: usize, pb: PathBuf, link: bool) -> Result { - let md = fs::metadata(&pb).map_err(|err| Error::Io(err).with_path(&pb))?; + fn from_path( + depth: usize, + pb: PathBuf, + link: bool, + ) -> Result { + 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(), @@ -407,10 +404,15 @@ impl DirEntryRaw { } #[cfg(unix)] - fn from_path(depth: usize, pb: PathBuf, link: bool) -> Result { + fn from_path( + depth: usize, + pb: PathBuf, + link: bool, + ) -> Result { use std::os::unix::fs::MetadataExt; - let md = fs::metadata(&pb).map_err(|err| Error::Io(err).with_path(&pb))?; + 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(), @@ -423,7 +425,11 @@ impl DirEntryRaw { // 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 { + fn from_path( + depth: usize, + pb: PathBuf, + link: bool, + ) -> Result { Err(Error::Io(io::Error::new( io::ErrorKind::Other, "unsupported platform", @@ -484,6 +490,7 @@ pub struct WalkBuilder { paths: Vec, ig_builder: IgnoreBuilder, max_depth: Option, + min_depth: Option, max_filesize: Option, follow_links: bool, same_file_system: bool, @@ -491,6 +498,18 @@ pub struct WalkBuilder { threads: usize, skip: Option>, filter: Option, + /// 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>>, } #[derive(Clone)] @@ -508,10 +527,18 @@ impl std::fmt::Debug for 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() } } @@ -524,10 +551,19 @@ impl WalkBuilder { /// is better to call `add` on this builder than to create multiple /// `Walk` values. pub fn new>(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![path.as_ref().to_path_buf()], + paths: vec![], ig_builder: IgnoreBuilder::new(), max_depth: None, + min_depth: None, max_filesize: None, follow_links: false, same_file_system: false, @@ -535,13 +571,30 @@ impl WalkBuilder { 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, I: IntoIterator>( + 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 @@ -556,13 +609,20 @@ impl WalkBuilder { 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())); + 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())); + wd = wd.sort_by(move |a, b| { + cmp(a.path(), b.path()) + }); } } } @@ -571,28 +631,81 @@ impl WalkBuilder { }) .collect::>() .into_iter(); - let ig_root = self.ig_builder.build(); + 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 { + 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: self.ig_builder.build(), + 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, @@ -617,6 +730,26 @@ impl WalkBuilder { /// The default, `None`, imposes no depth restriction. pub fn max_depth(&mut self, depth: Option) -> &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) -> &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 } @@ -647,11 +780,31 @@ impl WalkBuilder { /// /// 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>(&mut self, path: P) -> Option { + // 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)); @@ -666,7 +819,11 @@ impl WalkBuilder { errs.into_error_option() } - /// CHANGED: Add a Gitignore to the builder. + /// 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); } @@ -799,6 +956,10 @@ impl WalkBuilder { /// /// 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 @@ -895,6 +1056,10 @@ impl WalkBuilder { /// /// 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

(&mut self, filter: P) -> &mut WalkBuilder where P: Fn(&DirEntry) -> bool + Send + Sync + 'static, @@ -902,6 +1067,62 @@ impl WalkBuilder { 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, + ) -> &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 @@ -915,6 +1136,7 @@ pub struct Walk { it: Option, ig_root: Ignore, ig: Ignore, + max_depth: Option, max_filesize: Option, skip: Option>, filter: Option, @@ -930,6 +1152,17 @@ impl 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, I: IntoIterator>( + paths: I, + ) -> Walk { + WalkBuilder::from_iter(paths).build() + } + fn skip_entry(&self, ent: &DirEntry) -> Result { if ent.depth() == 0 { return Ok(false); @@ -1014,12 +1247,17 @@ impl Iterator for Walk { 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. - // We don't care if it errors though. - let (igtmp, _) = self.ig.add_child(ent.path()); + // 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) = self.ig.add_child(ent.path()); + 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)); @@ -1061,11 +1299,7 @@ enum WalkEvent { impl From for WalkEventIter { fn from(it: WalkDir) -> WalkEventIter { - WalkEventIter { - depth: 0, - it: it.into_iter(), - next: None, - } + WalkEventIter { depth: 0, it: it.into_iter(), next: None } } } @@ -1138,7 +1372,9 @@ pub trait ParallelVisitorBuilder<'s> { fn build(&mut self) -> Box; } -impl<'a, 's, P: ParallelVisitorBuilder<'s>> ParallelVisitorBuilder<'s> for &'a mut P { +impl<'a, 's, P: ParallelVisitorBuilder<'s>> ParallelVisitorBuilder<'s> + for &'a mut P +{ fn build(&mut self) -> Box { (**self).build() } @@ -1159,14 +1395,17 @@ struct FnBuilder { builder: F, } -impl<'s, F: FnMut() -> FnVisitor<'s>> ParallelVisitorBuilder<'s> for FnBuilder { +impl<'s, F: FnMut() -> FnVisitor<'s>> ParallelVisitorBuilder<'s> + for FnBuilder +{ fn build(&mut self) -> Box { let visitor = (self.builder)(); Box::new(FnVisitorImp { visitor }) } } -type FnVisitor<'s> = Box) -> WalkState + Send + 's>; +type FnVisitor<'s> = + Box) -> WalkState + Send + 's>; struct FnVisitorImp<'s> { visitor: FnVisitor<'s>, @@ -1191,6 +1430,7 @@ pub struct WalkParallel { ig_root: Ignore, max_filesize: Option, max_depth: Option, + min_depth: Option, follow_links: bool, same_file_system: bool, threads: usize, @@ -1255,7 +1495,9 @@ impl WalkParallel { } }; match DirEntryRaw::from_path(0, path, false) { - Ok(dent) => (DirEntry::new_raw(dent, None), root_device), + Ok(dent) => { + (DirEntry::new_raw(dent, None), root_device) + } Err(err) => { if visitor.visit(Err(err)).is_quit() { return; @@ -1279,20 +1521,28 @@ impl WalkParallel { 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<_> = stacks + let handles: Vec<_> = workers .into_iter() - .map(|stack| Worker { - visitor: builder.build(), - stack, - quit_now: quit_now.clone(), - active_workers: active_workers.clone(), - max_depth: self.max_depth, - max_filesize: self.max_filesize, - follow_links: self.follow_links, - skip: self.skip.clone(), - filter: self.filter.clone(), - }) .map(|worker| s.spawn(|| worker.run())) .collect(); for handle in handles { @@ -1303,7 +1553,7 @@ impl WalkParallel { fn threads(&self) -> usize { if self.threads == 0 { - 2 + std::thread::available_parallelism().map_or(1, |n| n.get()).min(12) } else { self.threads } @@ -1334,6 +1584,12 @@ struct Work { root_device: Option, } +#[derive(Default)] +struct ReadDirResult { + entries: Vec, + errors: Vec, +} + impl Work { /// Returns true if and only if this work item is a directory. fn is_dir(&self) -> bool { @@ -1360,6 +1616,13 @@ impl Work { 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. /// @@ -1367,7 +1630,7 @@ impl Work { /// 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 { + fn read_dir(&mut self) -> Result { let readdir = match fs::read_dir(self.dent.path()) { Ok(readdir) => readdir, Err(err) => { @@ -1377,10 +1640,24 @@ impl Work { return Err(err); } }; - let (ig, err) = self.ignore.add_child(self.dent.path()); + // 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(readdir) + Ok(result) } } @@ -1404,11 +1681,11 @@ impl Stack { // 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> = std::iter::repeat_with(Deque::new_lifo) - .take(threads) - .collect(); - let stealers = - Arc::<[Stealer]>::from(deques.iter().map(Deque::stealer).collect::>()); + let deques: Vec> = + std::iter::repeat_with(Deque::new_lifo).take(threads).collect(); + let stealers = Arc::<[Stealer]>::from( + deques.iter().map(Deque::stealer).collect::>(), + ); let stacks: Vec = deques .into_iter() .enumerate() @@ -1418,8 +1695,11 @@ impl Stack { stealers: stealers.clone(), }) .collect(); - // Distribute the initial messages. + // 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 @@ -1474,6 +1754,8 @@ struct Worker<'s> { /// The maximum depth of directories to descend. A value of `0` means no /// descension at all. max_depth: Option, + /// The minimum depth of directories to descend. + min_depth: Option, /// The maximum size a searched file can be (in bytes). If a file exceeds /// this size it will be skipped. max_filesize: Option, @@ -1502,10 +1784,19 @@ impl<'s> Worker<'s> { } 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 self.visitor.visit(Ok(work.dent)); + 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)); @@ -1536,16 +1827,27 @@ impl<'s> Worker<'s> { // 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 readdir = work.read_dir(); let depth = work.dent.depth(); - let state = self.visitor.visit(Ok(work.dent)); - if !state.is_continue() { - return state; + 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) => { @@ -1553,11 +1855,19 @@ impl<'s> Worker<'s> { } }; - if self.max_depth.map_or(false, |max| depth >= max) { - return WalkState::Skip; + 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 result in readdir { - let state = self.generate_work(&work.ignore, depth + 1, work.root_device, result); + for err in readdir.errors { + let state = self.visitor.visit(Err(err)); if state.is_quit() { return state; } @@ -1583,14 +1893,8 @@ impl<'s> Worker<'s> { ig: &Ignore, depth: usize, root_device: Option, - result: Result, + fs_dent: fs::DirEntry, ) -> WalkState { - let fs_dent = match result { - Ok(fs_dent) => fs_dent, - Err(err) => { - return self.visitor.visit(Err(Error::from(err).with_depth(depth))); - } - }; let mut dent = match DirEntryRaw::from_entry(depth, &fs_dent) { Ok(dent) => DirEntry::new_raw(dent, None), Err(err) => { @@ -1626,26 +1930,24 @@ impl<'s> Worker<'s> { 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 - }; + 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, - }); + self.send(Work { dent, ignore: ig.clone(), root_device }); } WalkState::Continue } @@ -1686,6 +1988,9 @@ impl<'s> Worker<'s> { } // 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); @@ -1739,24 +2044,25 @@ impl<'s> Worker<'s> { } } +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) + Error::from(err).with_path(child_path).with_depth(child_depth) })?; - for ig in ig_parent - .parents() - .take_while(|ig| !ig.is_absolute_parent()) - { + 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) + Error::from(err).with_path(child_path).with_depth(child_depth) })?; if hchild == h { return Err(Error::Loop { @@ -1771,7 +2077,11 @@ fn check_symlink_loop( // 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) -> bool { +fn skip_filesize( + max_filesize: u64, + path: &Path, + ent: &Option, +) -> bool { let filesize = match *ent { Some(ref md) => Some(md.len()), None => None, @@ -1843,9 +2153,9 @@ fn path_equals(dent: &DirEntry, handle: &Handle) -> Result { 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_path(dent.path())) + 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. @@ -1863,16 +2173,14 @@ fn walkdir_is_dir(dent: &walkdir::DirEntry) -> bool { if !dent.file_type().is_symlink() || dent.depth() > 0 { return false; } - dent.path() - .metadata() - .ok() - .map_or(false, |md| md.file_type().is_dir()) + 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 { - let dent_device = device_num(path).map_err(|err| Error::Io(err).with_path(path))?; + let dent_device = + device_num(path).map_err(|err| Error::Io(err).with_path(path))?; Ok(root_device == dent_device) } @@ -1885,7 +2193,7 @@ fn device_num>(path: P) -> io::Result { #[cfg(windows)] fn device_num>(path: P) -> io::Result { - use winapi_util::{file, Handle}; + use winapi_util::{Handle, file}; let h = Handle::from_path_any(path)?; file::information(h).map(|info| info.volume_serial_number()) @@ -1931,11 +2239,7 @@ mod tests { } fn normal_path(unix: &str) -> String { - if cfg!(windows) { - unix.replace("\\", "/") - } else { - unix.to_string() - } + if cfg!(windows) { unix.replace("\\", "/") } else { unix.to_string() } } fn walk_collect(prefix: &Path, builder: &WalkBuilder) -> Vec { @@ -1955,7 +2259,10 @@ mod tests { paths } - fn walk_collect_parallel(prefix: &Path, builder: &WalkBuilder) -> Vec { + fn walk_collect_parallel( + prefix: &Path, + builder: &WalkBuilder, + ) -> Vec { let mut paths = vec![]; for dent in walk_collect_entries_parallel(builder) { let path = dent.path().strip_prefix(prefix).unwrap(); @@ -2144,6 +2451,72 @@ mod tests { ); } + #[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(); @@ -2209,7 +2582,9 @@ mod tests { assert_eq!(1, dents.len()); assert!(!dents[0].path_is_symlink()); - let dents = walk_collect_entries_parallel(&WalkBuilder::new(td.path().join("foo"))); + let dents = walk_collect_entries_parallel(&WalkBuilder::new( + td.path().join("foo"), + )); assert_eq!(1, dents.len()); assert!(!dents[0].path_is_symlink()); } @@ -2295,8 +2670,88 @@ mod tests { assert_paths( td.path(), - &WalkBuilder::new(td.path()).filter_entry(|entry| entry.file_name() != OsStr::new("a")), + &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.rs b/crates/ignore/tests/gitignore_matched_path_or_any_parents_tests.rs index b7b7c6f95..ecb7b47e3 100644 --- a/crates/ignore/tests/gitignore_matched_path_or_any_parents_tests.rs +++ b/crates/ignore/tests/gitignore_matched_path_or_any_parents_tests.rs @@ -2,7 +2,8 @@ use std::path::Path; use ignore::gitignore::{Gitignore, GitignoreBuilder}; -const IGNORE_FILE: &'static str = "tests/gitignore_matched_path_or_any_parents_tests.gitignore"; +const IGNORE_FILE: &'static str = + "tests/gitignore_matched_path_or_any_parents_tests.gitignore"; fn get_gitignore() -> Gitignore { let mut builder = GitignoreBuilder::new("ROOT"); @@ -23,7 +24,9 @@ fn test_path_should_be_under_root() { #[test] fn test_files_in_root() { let gitignore = get_gitignore(); - let m = |path: &str| gitignore.matched_path_or_any_parents(Path::new(path), false); + let m = |path: &str| { + gitignore.matched_path_or_any_parents(Path::new(path), false) + }; // 0x assert!(m("ROOT/file_root_00").is_ignore()); @@ -53,7 +56,9 @@ fn test_files_in_root() { #[test] fn test_files_in_deep() { let gitignore = get_gitignore(); - let m = |path: &str| gitignore.matched_path_or_any_parents(Path::new(path), false); + 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()); @@ -83,8 +88,9 @@ fn test_files_in_deep() { #[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); + 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()); @@ -186,20 +192,25 @@ fn test_dirs_in_root() { #[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); + 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()); + 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()); + 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()); @@ -241,51 +252,67 @@ fn test_dirs_in_deep() { 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()); + 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()); + 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()); + 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()); + 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()); + 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()); + 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()); + 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()); + 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: +#[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/.gitignore b/crates/node/.gitignore index d2200a62e..c3f2ec696 100644 --- a/crates/node/.gitignore +++ b/crates/node/.gitignore @@ -202,5 +202,6 @@ 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 d4ddcdfd1..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 = "3.3.0", default-features = false, features = ["napi4"] } -napi-derive = "3.2.5" +napi = { version = "3.11.0", default-features = false, features = ["napi4"] } +napi-derive = "3.6.0" tailwindcss-oxide = { path = "../oxide" } -rayon = "1.10.0" +rayon = "1.12.0" [build-dependencies] -napi-build = "2.2.3" +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 86a9bc4be..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.1.13", + "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 8f2dbc7ab..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.1.13", + "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 6f2f5efe8..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.1.13", + "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 1a088a0e0..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.1.13", + "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 c36e6ebe4..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.1.13", + "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 049fb3708..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.1.13", + "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 04b060dcf..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.1.13", + "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 18d23a646..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.1.13", + "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 151af9aca..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.1.13", + "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 737bf9142..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.1.13", + "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/.npmrc b/crates/node/npm/wasm32-wasi/.npmrc deleted file mode 100644 index d67f37488..000000000 --- a/crates/node/npm/wasm32-wasi/.npmrc +++ /dev/null @@ -1 +0,0 @@ -node-linker=hoisted diff --git a/crates/node/npm/wasm32-wasi/README.md b/crates/node/npm/wasm32-wasi/README.md index 9ec3a7b3f..2a5368149 100644 --- a/crates/node/npm/wasm32-wasi/README.md +++ b/crates/node/npm/wasm32-wasi/README.md @@ -1,3 +1,3 @@ # `@tailwindcss/oxide-wasm32-wasi` -This is the **wasm32-wasip1-threads** binary for `@tailwindcss/oxide` +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 index 7d59ed217..cee9fb05a 100644 --- a/crates/node/npm/wasm32-wasi/package.json +++ b/crates/node/npm/wasm32-wasi/package.json @@ -1,9 +1,6 @@ { "name": "@tailwindcss/oxide-wasm32-wasi", - "version": "4.1.13", - "cpu": [ - "wasm32" - ], + "version": "4.3.3", "main": "tailwindcss-oxide.wasi.cjs", "files": [ "tailwindcss-oxide.wasm32-wasi.wasm", @@ -14,7 +11,7 @@ ], "license": "MIT", "engines": { - "node": ">=14.0.0" + "node": "^20.19.0 || ^22.13.0 || >=23.5.0" }, "publishConfig": { "provenance": true, @@ -27,12 +24,12 @@ }, "browser": "tailwindcss-oxide.wasi-browser.js", "dependencies": { - "@napi-rs/wasm-runtime": "^1.0.5", - "@emnapi/core": "^1.5.0", - "@emnapi/runtime": "^1.5.0", - "@tybys/wasm-util": "^0.10.1", - "@emnapi/wasi-threads": "^1.1.0", - "tslib": "^2.4.0" + "@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", diff --git a/crates/node/npm/wasm32-wasi/pnpm-lock.yaml b/crates/node/npm/wasm32-wasi/pnpm-lock.yaml deleted file mode 100644 index 5cd70ea37..000000000 --- a/crates/node/npm/wasm32-wasi/pnpm-lock.yaml +++ /dev/null @@ -1,75 +0,0 @@ -lockfileVersion: '9.0' - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - -importers: - - .: - dependencies: - '@emnapi/core': - specifier: ^1.5.0 - version: 1.5.0 - '@emnapi/runtime': - specifier: ^1.5.0 - version: 1.5.0 - '@emnapi/wasi-threads': - specifier: ^1.1.0 - version: 1.1.0 - '@napi-rs/wasm-runtime': - specifier: ^1.0.5 - version: 1.0.5 - '@tybys/wasm-util': - specifier: ^0.10.1 - version: 0.10.1 - tslib: - specifier: ^2.4.0 - version: 2.8.1 - -packages: - - '@emnapi/core@1.5.0': - resolution: {integrity: sha512-sbP8GzB1WDzacS8fgNPpHlp6C9VZe+SJP3F90W9rLemaQj2PzIuTEl1qDOYQf58YIpyjViI24y9aPWCjEzY2cg==} - - '@emnapi/runtime@1.5.0': - resolution: {integrity: sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==} - - '@emnapi/wasi-threads@1.1.0': - resolution: {integrity: sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==} - - '@napi-rs/wasm-runtime@1.0.5': - resolution: {integrity: sha512-TBr9Cf9onSAS2LQ2+QHx6XcC6h9+RIzJgbqG3++9TUZSH204AwEy5jg3BTQ0VATsyoGj4ee49tN/y6rvaOOtcg==} - - '@tybys/wasm-util@0.10.1': - resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==} - - tslib@2.8.1: - resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} - -snapshots: - - '@emnapi/core@1.5.0': - dependencies: - '@emnapi/wasi-threads': 1.1.0 - tslib: 2.8.1 - - '@emnapi/runtime@1.5.0': - dependencies: - tslib: 2.8.1 - - '@emnapi/wasi-threads@1.1.0': - dependencies: - tslib: 2.8.1 - - '@napi-rs/wasm-runtime@1.0.5': - dependencies: - '@emnapi/core': 1.5.0 - '@emnapi/runtime': 1.5.0 - '@tybys/wasm-util': 0.10.1 - - '@tybys/wasm-util@0.10.1': - dependencies: - tslib: 2.8.1 - - tslib@2.8.1: {} diff --git a/crates/node/npm/win32-arm64-msvc/package.json b/crates/node/npm/win32-arm64-msvc/package.json index a4c459f53..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.1.13", + "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 b9ca23614..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.1.13", + "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 728011eba..be09427fb 100644 --- a/crates/node/package.json +++ b/crates/node/package.json @@ -1,6 +1,6 @@ { "name": "@tailwindcss/oxide", - "version": "4.1.13", + "version": "4.3.3", "repository": { "type": "git", "url": "git+https://github.com/tailwindlabs/tailwindcss.git", @@ -32,22 +32,19 @@ } }, "license": "MIT", - "dependencies": { - "tar": "^7.4.3", - "detect-libc": "^2.0.4" - }, "devDependencies": { - "@napi-rs/cli": "^3.2.0", - "@napi-rs/wasm-runtime": "^1.0.5", - "emnapi": "1.5.0" + "@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", - "index.d.ts", - "scripts/install.js" + "index.d.ts" ], "publishConfig": { "provenance": true, @@ -61,8 +58,7 @@ "postbuild:wasm": "node ./scripts/move-artifacts.mjs", "dev": "cargo watch --quiet --shell 'npm run build'", "build:debug": "napi build --platform", - "version": "napi version", - "postinstall": "node ./scripts/install.js" + "version": "napi version" }, "optionalDependencies": { "@tailwindcss/oxide-android-arm64": "workspace:*", diff --git a/crates/node/scripts/install.js b/crates/node/scripts/install.js deleted file mode 100644 index f9cefe01c..000000000 --- a/crates/node/scripts/install.js +++ /dev/null @@ -1,143 +0,0 @@ -#!/usr/bin/env node - -/** - * @tailwindcss/oxide postinstall script - * - * This script ensures that the correct binary for the current platform and - * architecture is downloaded and available. - */ - -const fs = require('fs') -const path = require('path') -const https = require('https') -const { extract } = require('tar') -const packageJson = require('../package.json') -const detectLibc = require('detect-libc') - -const version = packageJson.version - -function getPlatformPackageName() { - let platform = process.platform - let arch = process.arch - - let libc = '' - if (platform === 'linux') { - libc = detectLibc.isNonGlibcLinuxSync() ? 'musl' : 'gnu' - } - - // Map to our package naming conventions - switch (platform) { - case 'darwin': - return arch === 'arm64' ? '@tailwindcss/oxide-darwin-arm64' : '@tailwindcss/oxide-darwin-x64' - case 'win32': - if (arch === 'arm64') return '@tailwindcss/oxide-win32-arm64-msvc' - if (arch === 'ia32') return '@tailwindcss/oxide-win32-ia32-msvc' - return '@tailwindcss/oxide-win32-x64-msvc' - case 'linux': - if (arch === 'x64') { - return libc === 'musl' - ? '@tailwindcss/oxide-linux-x64-musl' - : '@tailwindcss/oxide-linux-x64-gnu' - } else if (arch === 'arm64') { - return libc === 'musl' - ? '@tailwindcss/oxide-linux-arm64-musl' - : '@tailwindcss/oxide-linux-arm64-gnu' - } else if (arch === 'arm') { - return '@tailwindcss/oxide-linux-arm-gnueabihf' - } - break - case 'freebsd': - return '@tailwindcss/oxide-freebsd-x64' - case 'android': - return '@tailwindcss/oxide-android-arm64' - default: - return '@tailwindcss/oxide-wasm32-wasi' - } -} - -function isPackageAvailable(packageName) { - try { - require.resolve(packageName) - return true - } catch (e) { - return false - } -} - -// Extract all files from a tarball to a destination directory -async function extractTarball(tarballStream, destDir) { - if (!fs.existsSync(destDir)) { - fs.mkdirSync(destDir, { recursive: true }) - } - - return new Promise((resolve, reject) => { - tarballStream - .pipe(extract({ cwd: destDir, strip: 1 })) - .on('error', (err) => reject(err)) - .on('end', () => resolve()) - }) -} - -async function downloadAndExtractBinary(packageName) { - let tarballUrl = `https://registry.npmjs.org/${packageName}/-/${packageName.replace('@tailwindcss/', '')}-${version}.tgz` - console.log(`Downloading ${tarballUrl}...`) - - return new Promise((resolve) => { - https - .get(tarballUrl, (response) => { - if (response.statusCode === 302 || response.statusCode === 301) { - // Handle redirects - https.get(response.headers.location, handleResponse).on('error', (err) => { - console.error('Download error:', err) - resolve() - }) - return - } - - handleResponse(response) - - async function handleResponse(response) { - try { - if (response.statusCode !== 200) { - throw new Error(`Download failed with status code: ${response.statusCode}`) - } - - await extractTarball( - response, - path.join(__dirname, '..', 'node_modules', ...packageName.split('/')), - ) - console.log(`Successfully downloaded and installed ${packageName}`) - } catch (error) { - console.error('Error during extraction:', error) - resolve() - } finally { - resolve() - } - } - }) - .on('error', (err) => { - console.error('Download error:', err) - resolve() - }) - }) -} - -async function main() { - // Don't run this script in the package source - try { - if (fs.existsSync(path.join(__dirname, '..', 'build.rs'))) { - return - } - - let packageName = getPlatformPackageName() - if (!packageName) return - if (isPackageAvailable(packageName)) return - - await downloadAndExtractBinary(packageName) - } catch (error) { - console.error(error) - return - } -} - -main() diff --git a/crates/node/scripts/move-artifacts.mjs b/crates/node/scripts/move-artifacts.mjs index 10a87cc15..faf4728ef 100644 --- a/crates/node/scripts/move-artifacts.mjs +++ b/crates/node/scripts/move-artifacts.mjs @@ -35,4 +35,3 @@ for (let file of await fs.readdir(tailwindcssOxideRoot)) { ) console.log(`Moved ${file} to npm/wasm32-wasi`) } - diff --git a/crates/node/src/lib.rs b/crates/node/src/lib.rs index 11ff25b0a..fb32a818c 100644 --- a/crates/node/src/lib.rs +++ b/crates/node/src/lib.rs @@ -165,6 +165,11 @@ impl Scanner { self.scanner.get_files() } + #[napi(getter)] + pub fn scanned_files(&self) -> Vec { + self.scanner.get_scanned_files() + } + #[napi(getter)] pub fn globs(&mut self) -> Vec { self diff --git a/crates/oxide/Cargo.toml b/crates/oxide/Cargo.toml index 9b800b049..f8a5f6137 100644 --- a/crates/oxide/Cargo.toml +++ b/crates/oxide/Cargo.toml @@ -9,7 +9,6 @@ globwalk = "0.9.1" log = "0.4.22" rayon = "1.10.0" fxhash = { package = "rustc-hash", version = "2.1.1" } -crossbeam = "0.8.4" tracing = { version = "0.1.40", features = [] } tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } walkdir = "2.5.0" @@ -21,6 +20,7 @@ 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 818a0ef1b..71cdccdf6 100644 --- a/crates/oxide/src/cursor.rs +++ b/crates/oxide/src/cursor.rs @@ -1,44 +1,49 @@ 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 } + } + + /// 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) { @@ -48,38 +53,15 @@ impl<'a> Cursor<'a> { #[inline(always)] pub fn advance(&mut self) { self.pos += 1; - - self.prev = self.curr; - self.curr = self.next; - self.next = *self - .input - .get(self.pos.saturating_add(1)) - .unwrap_or(&0x00u8); } #[inline(always)] pub fn advance_twice(&mut self) { self.pos += 2; - - self.prev = self.next; - self.curr = *self.input.get(self.pos).unwrap_or(&0x00u8); - self.next = *self - .input - .get(self.pos.saturating_add(1)) - .unwrap_or(&0x00u8); } 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 = *self.input.get(pos.wrapping_sub(1)).unwrap_or(&0x00u8); - self.curr = *self.input.get(pos).unwrap_or(&0x00u8); - self.next = *self.input.get(pos.saturating_add(1)).unwrap_or(&0x00u8); + self.pos = pos.min(self.input.len()); } } @@ -90,9 +72,9 @@ impl Display for Cursor<'_> { 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 ")?; @@ -109,9 +91,9 @@ impl Display for Cursor<'_> { 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()) ) } } @@ -125,36 +107,28 @@ mod 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); + 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 index 8ed3f1763..a43253339 100644 --- a/crates/oxide/src/extractor/arbitrary_property_machine.rs +++ b/crates/oxide/src/extractor/arbitrary_property_machine.rs @@ -74,7 +74,7 @@ impl Machine for ArbitraryPropertyMachine { #[inline] fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState { - match cursor.curr.into() { + match cursor.curr().into() { // Start of an arbitrary property Class::OpenBracket => { self.start_pos = cursor.pos; @@ -97,8 +97,8 @@ impl Machine for ArbitraryPropertyMachine { let len = cursor.input.len(); while cursor.pos < len { - match cursor.curr.into() { - Class::Dash => match cursor.next.into() { + match cursor.curr().into() { + Class::Dash => match cursor.next().into() { // Start of a CSS variable // // E.g.: `[--my-color:red]` @@ -137,7 +137,7 @@ impl ArbitraryPropertyMachine { 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() { + MachineState::Done(_) => match cursor.next().into() { // End of the CSS variable, must be followed by a `:` // // E.g.: `[--my-color:red]` @@ -165,8 +165,8 @@ impl Machine for ArbitraryPropertyMachine { 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() { + match cursor.curr().into() { + Class::Escape => match cursor.next().into() { // An escaped whitespace character is not allowed // // E.g.: `[color:var(--my-\ color)]` @@ -181,7 +181,7 @@ impl Machine for ArbitraryPropertyMachine { }, Class::OpenParen | Class::OpenBracket | Class::OpenCurly => { - if !self.bracket_stack.push(cursor.curr) { + if !self.bracket_stack.push(cursor.curr()) { return self.restart(); } cursor.advance(); @@ -190,7 +190,7 @@ impl Machine for ArbitraryPropertyMachine { Class::CloseParen | Class::CloseBracket | Class::CloseCurly if !self.bracket_stack.is_empty() => { - if !self.bracket_stack.pop(cursor.curr) { + if !self.bracket_stack.pop(cursor.curr()) { return self.restart(); } cursor.advance(); @@ -227,10 +227,16 @@ impl Machine for ArbitraryPropertyMachine { 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) => { + 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(), }; @@ -293,6 +299,9 @@ enum Class { #[bytes(b'/')] Slash, + #[bytes(b'!')] + Exclamation, + #[bytes(b' ', b'\t', b'\n', b'\r', b'\x0C')] Whitespace, @@ -369,6 +378,9 @@ mod tests { "[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 diff --git a/crates/oxide/src/extractor/arbitrary_value_machine.rs b/crates/oxide/src/extractor/arbitrary_value_machine.rs index f5a612df1..cbef62c42 100644 --- a/crates/oxide/src/extractor/arbitrary_value_machine.rs +++ b/crates/oxide/src/extractor/arbitrary_value_machine.rs @@ -32,7 +32,7 @@ impl Machine for ArbitraryValueMachine { #[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() { + if Class::OpenBracket != cursor.curr().into() { return MachineState::Idle; } @@ -42,8 +42,8 @@ impl Machine for ArbitraryValueMachine { let len = cursor.input.len(); while cursor.pos < len { - match cursor.curr.into() { - Class::Escape => match cursor.next.into() { + match cursor.curr().into() { + Class::Escape => match cursor.next().into() { // An escaped whitespace character is not allowed // // E.g.: `[color:var(--my-\ color)]` @@ -61,7 +61,7 @@ impl Machine for ArbitraryValueMachine { }, Class::OpenParen | Class::OpenBracket | Class::OpenCurly => { - if !self.bracket_stack.push(cursor.curr) { + if !self.bracket_stack.push(cursor.curr()) { return self.restart(); } cursor.advance(); @@ -70,7 +70,7 @@ impl Machine for ArbitraryValueMachine { Class::CloseParen | Class::CloseBracket | Class::CloseCurly if !self.bracket_stack.is_empty() => { - if !self.bracket_stack.pop(cursor.curr) { + if !self.bracket_stack.pop(cursor.curr()) { return self.restart(); } cursor.advance(); @@ -96,7 +96,7 @@ impl Machine for ArbitraryValueMachine { Class::Whitespace => return self.restart(), // String interpolation-like syntax is not allowed. E.g.: `[${x}]` - Class::Dollar if matches!(cursor.next.into(), Class::OpenCurly) => { + Class::Dollar if matches!(cursor.next().into(), Class::OpenCurly) => { return self.restart() } diff --git a/crates/oxide/src/extractor/arbitrary_variable_machine.rs b/crates/oxide/src/extractor/arbitrary_variable_machine.rs index 6990e110b..e8d475557 100644 --- a/crates/oxide/src/extractor/arbitrary_variable_machine.rs +++ b/crates/oxide/src/extractor/arbitrary_variable_machine.rs @@ -80,13 +80,13 @@ impl Machine for ArbitraryVariableMachine { #[inline(always)] fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState { - match cursor.curr.into() { + match cursor.curr().into() { // Arbitrary variables start with `(` followed by a CSS variable // // E.g.: `(--my-variable)` // ^^ // - Class::OpenParen => match cursor.next.into() { + Class::OpenParen => match cursor.next().into() { Class::Dash => { self.start_pos = cursor.pos; cursor.advance(); @@ -117,7 +117,7 @@ impl Machine for ArbitraryVariableMachine { 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() { + MachineState::Done(_) => match cursor.next().into() { // A CSS variable followed by a `,` means that there is a fallback // // E.g.: `(--my-color,red)` @@ -134,7 +134,7 @@ impl Machine for ArbitraryVariableMachine { _ => { cursor.advance(); - match cursor.curr.into() { + match cursor.curr().into() { // End of an arbitrary variable, must be followed by `)` Class::CloseParen => self.done(self.start_pos, cursor), @@ -156,7 +156,7 @@ impl Machine for ArbitraryVariableMachine { let len = cursor.input.len(); while cursor.pos < len { - match cursor.curr.into() { + match cursor.curr().into() { // Valid data type characters // // E.g.: `(length:--my-length)` @@ -169,7 +169,7 @@ impl Machine for ArbitraryVariableMachine { // // E.g.: `(length:--my-length)` // ^ - Class::Colon => match cursor.next.into() { + Class::Colon => match cursor.next().into() { Class::Dash => { cursor.advance(); return self.transition::().next(cursor); @@ -196,8 +196,8 @@ impl Machine for ArbitraryVariableMachine { 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() { + match cursor.curr().into() { + Class::Escape => match cursor.next().into() { // An escaped whitespace character is not allowed // // E.g.: `(--my-\ color)` @@ -212,7 +212,7 @@ impl Machine for ArbitraryVariableMachine { }, Class::OpenParen | Class::OpenBracket | Class::OpenCurly => { - if !self.bracket_stack.push(cursor.curr) { + if !self.bracket_stack.push(cursor.curr()) { return self.restart(); } cursor.advance(); @@ -221,7 +221,7 @@ impl Machine for ArbitraryVariableMachine { Class::CloseParen | Class::CloseBracket | Class::CloseCurly if !self.bracket_stack.is_empty() => { - if !self.bracket_stack.pop(cursor.curr) { + if !self.bracket_stack.pop(cursor.curr()) { return self.restart(); } cursor.advance(); @@ -253,7 +253,7 @@ impl Machine for ArbitraryVariableMachine { Class::Whitespace => return self.restart(), // String interpolation-like syntax is not allowed. E.g.: `[${x}]` - Class::Dollar if matches!(cursor.next.into(), Class::OpenCurly) => { + Class::Dollar if matches!(cursor.next().into(), Class::OpenCurly) => { return self.restart() } diff --git a/crates/oxide/src/extractor/bracket_stack.rs b/crates/oxide/src/extractor/bracket_stack.rs index f34e56ed3..2b8d3a13f 100644 --- a/crates/oxide/src/extractor/bracket_stack.rs +++ b/crates/oxide/src/extractor/bracket_stack.rs @@ -25,6 +25,7 @@ impl BracketStack { b'(' => b')', b'[' => b']', b'{' => b'}', + b'<' => b'>', _ => std::hint::unreachable_unchecked(), }; } diff --git a/crates/oxide/src/extractor/candidate_machine.rs b/crates/oxide/src/extractor/candidate_machine.rs index c82cc3707..a755cf02a 100644 --- a/crates/oxide/src/extractor/candidate_machine.rs +++ b/crates/oxide/src/extractor/candidate_machine.rs @@ -32,14 +32,14 @@ impl Machine for CandidateMachine { 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() { + 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'`') { + if matches!(cursor.curr(), b':' | b'"' | b'\'' | b'`') { self.reset(); cursor.advance(); continue; @@ -56,7 +56,7 @@ impl Machine for CandidateMachine { // E.g.: `Some Class` // ^ ^ Invalid, we can jump ahead to the next boundary // - if matches!(cursor.curr, b'<' | b'A'..=b'Z') { + 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)) diff --git a/crates/oxide/src/extractor/css_variable_machine.rs b/crates/oxide/src/extractor/css_variable_machine.rs index 4e19c7111..7beb827ee 100644 --- a/crates/oxide/src/extractor/css_variable_machine.rs +++ b/crates/oxide/src/extractor/css_variable_machine.rs @@ -20,7 +20,7 @@ impl Machine for CssVariableMachine { #[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() { + if Class::Dash != cursor.curr().into() || Class::Dash != cursor.next().into() { return MachineState::Idle; } @@ -30,11 +30,11 @@ impl Machine for CssVariableMachine { cursor.advance_twice(); while cursor.pos < len { - match cursor.curr.into() { + match cursor.curr().into() { // https://drafts.csswg.org/css-syntax-3/#ident-token-diagram // Class::AllowedCharacter | Class::Dash => { - match cursor.next.into() { + match cursor.next().into() { // Valid character followed by a valid character or an escape character // // E.g.: `--my-variable` @@ -58,7 +58,7 @@ impl Machine for CssVariableMachine { } } - Class::Escape => match cursor.next.into() { + 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 diff --git a/crates/oxide/src/extractor/mod.rs b/crates/oxide/src/extractor/mod.rs index add0de4ac..a3d806a27 100644 --- a/crates/oxide/src/extractor/mod.rs +++ b/crates/oxide/src/extractor/mod.rs @@ -86,7 +86,7 @@ impl<'a> Extractor<'a> { { let cursor = &mut self.cursor.clone(); while cursor.pos < len { - if cursor.curr.is_ascii_whitespace() { + if cursor.curr().is_ascii_whitespace() { cursor.advance(); continue; } @@ -104,7 +104,7 @@ impl<'a> Extractor<'a> { let cursor = &mut self.cursor.clone(); while cursor.pos < len { - if cursor.curr.is_ascii_whitespace() { + if cursor.curr().is_ascii_whitespace() { cursor.advance(); continue; } @@ -147,7 +147,7 @@ impl<'a> Extractor<'a> { let cursor = &mut self.cursor.clone(); while cursor.pos < len { - if cursor.curr.is_ascii_whitespace() { + if cursor.curr().is_ascii_whitespace() { cursor.advance(); continue; } @@ -238,7 +238,7 @@ mod tests { use std::hint::black_box; fn pre_process_input(input: &str, extension: &str) -> String { - let input = crate::scanner::pre_process_input(input.as_bytes(), extension); + let input = crate::scanner::pre_process_input(input.as_bytes().to_vec(), extension); String::from_utf8(input).unwrap() } @@ -908,6 +908,18 @@ mod tests { ); } + // https://github.com/tailwindlabs/tailwindcss/issues/20233 + #[test] + fn test_template_toolkit_syntax() { + assert_extract_candidates_contains( + &pre_process_input( + r#"

"#, + "tx", + ), + vec!["bg-white/40", "bg-white/10"], + ); + } + // https://github.com/tailwindlabs/tailwindcss/issues/17050 #[test] fn test_haml_syntax() { diff --git a/crates/oxide/src/extractor/modifier_machine.rs b/crates/oxide/src/extractor/modifier_machine.rs index 22668a828..811bc9ded 100644 --- a/crates/oxide/src/extractor/modifier_machine.rs +++ b/crates/oxide/src/extractor/modifier_machine.rs @@ -31,14 +31,14 @@ impl Machine for ModifierMachine { #[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() { + if Class::Slash != cursor.curr().into() { return MachineState::Idle; } let start_pos = cursor.pos; cursor.advance(); - match cursor.curr.into() { + match cursor.curr().into() { // Start of an arbitrary value: // // ``` @@ -70,9 +70,9 @@ impl Machine for ModifierMachine { Class::ValidStart => { let len = cursor.input.len(); while cursor.pos < len { - match cursor.curr.into() { + match cursor.curr().into() { Class::ValidStart | Class::ValidInside => { - match cursor.next.into() { + match cursor.next().into() { // Only valid characters are allowed, if followed by another valid character Class::ValidStart | Class::ValidInside => cursor.advance(), diff --git a/crates/oxide/src/extractor/named_utility_machine.rs b/crates/oxide/src/extractor/named_utility_machine.rs index 7c847a2e2..24dc027b2 100644 --- a/crates/oxide/src/extractor/named_utility_machine.rs +++ b/crates/oxide/src/extractor/named_utility_machine.rs @@ -52,8 +52,8 @@ impl Machine for NamedUtilityMachine { #[inline] fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState { - match cursor.curr.into() { - Class::AlphaLower => match cursor.next.into() { + match cursor.curr().into() { + Class::AlphaLower => match cursor.next().into() { // Valid single character utility in between quotes // // E.g.: `
` @@ -90,7 +90,7 @@ impl Machine for NamedUtilityMachine { // // E.g.: `-mx-2.5` // ^^ - Class::Dash => match cursor.next.into() { + Class::Dash => match cursor.next().into() { Class::AlphaLower => { self.start_pos = cursor.pos; cursor.advance(); @@ -118,7 +118,7 @@ impl Machine for NamedUtilityMachine { let len = cursor.input.len(); while cursor.pos < len { - match cursor.curr.into() { + match cursor.curr().into() { // Followed by a boundary character, we are at the end of the utility. // // E.g.: `'flex'` @@ -132,14 +132,14 @@ impl Machine for NamedUtilityMachine { // E.g.: `:div="{ flex: true }"` (JavaScript object syntax) // ^ Class::AlphaLower | Class::AlphaUpper => { - if is_valid_after_boundary(&cursor.next) || { + 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(), + cursor.next().into(), Class::Colon | Class::Slash | Class::Exclamation ) } { @@ -150,7 +150,7 @@ impl Machine for NamedUtilityMachine { cursor.advance() } - Class::Dash => match cursor.next.into() { + Class::Dash => match cursor.next().into() { // Start of an arbitrary value // // E.g.: `bg-[#0088cc]` @@ -196,7 +196,7 @@ impl Machine for NamedUtilityMachine { _ => return self.restart(), }, - Class::Underscore => match cursor.next.into() { + 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. // @@ -225,14 +225,14 @@ impl Machine for NamedUtilityMachine { // ^ // E.g.: `:div="{ flex: true }"` (JavaScript object syntax) // ^ - _ if is_valid_after_boundary(&cursor.next) || { + _ 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(), + cursor.next().into(), Class::Colon | Class::Slash | Class::Exclamation ) } => @@ -249,11 +249,11 @@ impl Machine for NamedUtilityMachine { // E.g.: `px-2.5` // ^^^ Class::Dot => { - if !matches!(cursor.prev.into(), Class::Number) { + if !matches!(cursor.prev().into(), Class::Number) { return self.restart(); } - if !matches!(cursor.next.into(), Class::Number) { + if !matches!(cursor.next().into(), Class::Number) { return self.restart(); } @@ -278,18 +278,19 @@ impl Machine for NamedUtilityMachine { // Class::Number => { if !matches!( - cursor.prev.into(), + cursor.prev().into(), Class::Dash | Class::Underscore | Class::Dot | Class::Number | Class::AlphaLower + | Class::AlphaUpper ) { return self.restart(); } if !matches!( - cursor.next.into(), + cursor.next().into(), Class::Dot | Class::Number | Class::AlphaLower @@ -313,7 +314,7 @@ impl Machine for NamedUtilityMachine { // ^^ // ``` Class::Percent => { - if !matches!(cursor.prev.into(), Class::Number) { + if !matches!(cursor.prev().into(), Class::Number) { return self.restart(); } @@ -425,6 +426,8 @@ mod tests { // 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 diff --git a/crates/oxide/src/extractor/named_variant_machine.rs b/crates/oxide/src/extractor/named_variant_machine.rs index b6de8220b..285fe6ab5 100644 --- a/crates/oxide/src/extractor/named_variant_machine.rs +++ b/crates/oxide/src/extractor/named_variant_machine.rs @@ -81,8 +81,8 @@ impl Machine for NamedVariantMachine { #[inline(always)] fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState { - match cursor.curr.into() { - Class::AlphaLower | Class::Star => match cursor.next.into() { + match cursor.curr().into() { + Class::AlphaLower | Class::Star => match cursor.next().into() { // Valid single character variant, must be followed by a `:` // // E.g.: `
` @@ -134,8 +134,8 @@ impl Machine for NamedVariantMachine { let len = cursor.input.len(); while cursor.pos < len { - match cursor.curr.into() { - Class::Dash => match cursor.next.into() { + match cursor.curr().into() { + Class::Dash => match cursor.next().into() { // Start of an arbitrary value // // E.g.: `data-[state=pending]:`. @@ -192,7 +192,7 @@ impl Machine for NamedVariantMachine { }; } - Class::Underscore => match cursor.next.into() { + 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. // @@ -240,11 +240,11 @@ impl Machine for NamedVariantMachine { // E.g.: `2.5xl:flex` // ^^^ Class::Dot => { - if !matches!(cursor.prev.into(), Class::Number) { + if !matches!(cursor.prev().into(), Class::Number) { return self.restart(); } - if !matches!(cursor.next.into(), Class::Number) { + if !matches!(cursor.next().into(), Class::Number) { return self.restart(); } @@ -263,7 +263,7 @@ impl Machine for NamedVariantMachine { impl NamedVariantMachine { #[inline(always)] fn parse_arbitrary_end(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState { - match cursor.next.into() { + match cursor.next().into() { Class::Slash => { cursor.advance(); self.transition::().next(cursor) @@ -285,7 +285,7 @@ impl Machine for NamedVariantMachine { 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() { + MachineState::Done(_) => match cursor.next().into() { // Modifier must be followed by a `:` // // E.g.: `group-hover/name:` @@ -308,7 +308,7 @@ impl Machine for NamedVariantMachine { #[inline(always)] fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState { - match cursor.curr.into() { + match cursor.curr().into() { // The end of a variant must be the `:` // // E.g.: `hover:` diff --git a/crates/oxide/src/extractor/pre_processors/clojure.rs b/crates/oxide/src/extractor/pre_processors/clojure.rs index ecf02b4ff..3fb4ce601 100644 --- a/crates/oxide/src/extractor/pre_processors/clojure.rs +++ b/crates/oxide/src/extractor/pre_processors/clojure.rs @@ -32,14 +32,14 @@ impl PreProcessor for Clojure { let mut cursor = cursor::Cursor::new(&content); while cursor.pos < len { - match cursor.curr { + match cursor.curr() { // Consume strings as-is b'"' => { result[cursor.pos] = b' '; cursor.advance(); while cursor.pos < len { - match cursor.curr { + match cursor.curr() { // Escaped character, skip ahead to the next character b'\\' => cursor.advance_twice(), @@ -57,8 +57,8 @@ impl PreProcessor for Clojure { // 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' { + b';' if matches!(cursor.next(), b';') => { + while cursor.pos < len && cursor.curr() != b'\n' { result[cursor.pos] = b' '; cursor.advance(); } @@ -70,7 +70,7 @@ impl PreProcessor for Clojure { cursor.advance(); while cursor.pos < len { - match cursor.curr { + match cursor.curr() { // A `.` surrounded by digits is a decimal number, so we don't want to replace it. // // E.g.: @@ -78,8 +78,8 @@ impl PreProcessor for Clojure { // gap-1.5 // ^ // ``` - b'.' if cursor.prev.is_ascii_digit() - && cursor.next.is_ascii_digit() => + b'.' if cursor.prev().is_ascii_digit() + && cursor.next().is_ascii_digit() => { // Keep the `.` as-is } @@ -95,7 +95,7 @@ impl PreProcessor for Clojure { result[cursor.pos] = b' '; } // End of keyword. - _ if !is_keyword_character(cursor.curr) => { + _ if !is_keyword_character(cursor.curr()) => { result[cursor.pos] = b' '; break; } @@ -110,11 +110,11 @@ impl PreProcessor for Clojure { // Handle quote with a list, e.g.: `'(…)` // and with a vector, e.g.: `'[…]` - b'\'' if matches!(cursor.next, b'[' | b'(') => { + b'\'' if matches!(cursor.next(), b'[' | b'(') => { result[cursor.pos] = b' '; cursor.advance(); result[cursor.pos] = b' '; - let end = match cursor.curr { + let end = match cursor.curr() { b'[' => b']', b'(' => b')', _ => unreachable!(), @@ -122,7 +122,7 @@ impl PreProcessor for Clojure { // Consume until the closing `]` while cursor.pos < len { - match cursor.curr { + match cursor.curr() { x if x == end => { result[cursor.pos] = b' '; break; @@ -134,7 +134,7 @@ impl PreProcessor for Clojure { cursor.advance(); while cursor.pos < len { - match cursor.curr { + match cursor.curr() { // Escaped character, skip ahead to the next character b'\\' => cursor.advance_twice(), @@ -157,14 +157,14 @@ impl PreProcessor for Clojure { } // Handle quote with a keyword, e.g.: `'bg-white` - b'\'' if !cursor.next.is_ascii_whitespace() => { + b'\'' if !cursor.next().is_ascii_whitespace() => { result[cursor.pos] = b' '; cursor.advance(); while cursor.pos < len { - match cursor.curr { + match cursor.curr() { // End of keyword. - _ if !is_keyword_character(cursor.curr) => { + _ if !is_keyword_character(cursor.curr()) => { result[cursor.pos] = b' '; break; } diff --git a/crates/oxide/src/extractor/pre_processors/elixir.rs b/crates/oxide/src/extractor/pre_processors/elixir.rs index 87b89a2a9..7737a6b2d 100644 --- a/crates/oxide/src/extractor/pre_processors/elixir.rs +++ b/crates/oxide/src/extractor/pre_processors/elixir.rs @@ -13,13 +13,13 @@ impl PreProcessor for Elixir { while cursor.pos < content.len() { // Look for a sigil marker - if cursor.curr != b'~' { + 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') { + if !matches!(cursor.next(), b'c' | b'C' | b's' | b'S' | b'w' | b'W') { cursor.advance(); continue; } @@ -27,7 +27,7 @@ impl PreProcessor for Elixir { cursor.advance_twice(); // Match the opening for a sigil - if !matches!(cursor.curr, b'(' | b'[' | b'{') { + if !matches!(cursor.curr(), b'(' | b'[' | b'{') { continue; } @@ -35,19 +35,19 @@ impl PreProcessor for Elixir { result[cursor.pos] = b' '; // Scan until we find a balanced closing one and replace it too - bracket_stack.push(cursor.curr); + bracket_stack.push(cursor.curr()); while cursor.pos < content.len() { cursor.advance(); - match cursor.curr { + match cursor.curr() { // Escaped character, skip ahead to the next character b'\\' => cursor.advance_twice(), b'(' | b'[' | b'{' => { - bracket_stack.push(cursor.curr); + bracket_stack.push(cursor.curr()); } b')' | b']' | b'}' if !bracket_stack.is_empty() => { - bracket_stack.pop(cursor.curr); + bracket_stack.pop(cursor.curr()); if bracket_stack.is_empty() { // Replace the closing bracket with a space diff --git a/crates/oxide/src/extractor/pre_processors/haml.rs b/crates/oxide/src/extractor/pre_processors/haml.rs index a131618ab..ec8be0817 100644 --- a/crates/oxide/src/extractor/pre_processors/haml.rs +++ b/crates/oxide/src/extractor/pre_processors/haml.rs @@ -101,7 +101,7 @@ impl PreProcessor for Haml { let mut last_newline_position = 0; while cursor.pos < len { - match cursor.curr { + match cursor.curr() { // Escape the next character b'\\' => { cursor.advance_twice(); @@ -119,7 +119,7 @@ impl PreProcessor for Haml { b'-' if cursor.input[last_newline_position..cursor.pos] .iter() .all(u8::is_ascii_whitespace) - && matches!(cursor.next, b'#') => + && matches!(cursor.next(), b'#') => { // Just consume the comment let updated_last_newline_position = @@ -159,7 +159,7 @@ impl PreProcessor for Haml { // Override the last known newline position last_newline_position = end; - let replaced = pre_process_input(ruby_code, "rb"); + let replaced = pre_process_input(ruby_code.to_vec(), "rb"); result.replace_range(start..end, replaced); } @@ -190,7 +190,7 @@ impl PreProcessor for Haml { // digit. // E.g.: `bg-red-500.2xl:flex` // ^^^ - if cursor.prev.is_ascii_digit() && cursor.next.is_ascii_digit() { + if cursor.prev().is_ascii_digit() && cursor.next().is_ascii_digit() { let mut next_cursor = cursor.clone(); next_cursor.advance(); @@ -203,6 +203,81 @@ impl PreProcessor for Haml { } } + // 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' '; @@ -213,11 +288,11 @@ impl PreProcessor for Haml { if bracket_stack.is_empty() { result[cursor.pos] = b' '; } - bracket_stack.push(cursor.curr); + bracket_stack.push(cursor.curr()); } b')' | b']' | b'}' if !bracket_stack.is_empty() => { - bracket_stack.pop(cursor.curr); + bracket_stack.pop(cursor.curr()); // Replace closing bracket with a space if bracket_stack.is_empty() { @@ -257,7 +332,7 @@ impl Haml { // :url => { :action => "add", :id => product.id }, // :update => { :success => "cart", :failure => "error" } // ``` - let evaluation_type = cursor.curr; + let evaluation_type = cursor.curr(); let block_indentation_level = cursor .pos @@ -267,17 +342,17 @@ impl Haml { 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' { + 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',' { + if evaluation_type == b'=' && cursor.prev() != b',' { return cursor.pos; } 'outer: while cursor.pos < len { - match cursor.curr { + match cursor.curr() { // Escape the next character b'\\' => { cursor.advance_twice(); @@ -289,7 +364,7 @@ impl Haml { last_newline_position = cursor.pos; // We are done with this block - if evaluation_type == b'=' && cursor.prev != b',' { + if evaluation_type == b'=' && cursor.prev() != b',' { break; } @@ -300,11 +375,11 @@ impl Haml { // 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' { + 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',' { + if evaluation_type == b'=' && cursor.prev() != b',' { // We are done with this block break 'outer; } @@ -424,6 +499,81 @@ mod tests { ); } + // 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}", + "%div class: flex px-2.5 ", + ), + // Nested `<…>` does not end the literal + ( + "%div{class: %w px-2.5>}", + "%div class: flex 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} + %div{class: %w|underline font-bold|} + - classes = %w + "#; + + 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() { diff --git a/crates/oxide/src/extractor/pre_processors/json.rs b/crates/oxide/src/extractor/pre_processors/json.rs index 809eb501e..cd457050c 100644 --- a/crates/oxide/src/extractor/pre_processors/json.rs +++ b/crates/oxide/src/extractor/pre_processors/json.rs @@ -11,13 +11,13 @@ impl PreProcessor for Json { let mut cursor = cursor::Cursor::new(content); while cursor.pos < len { - match cursor.curr { + match cursor.curr() { // Consume strings as-is b'"' => { cursor.advance(); while cursor.pos < len { - match cursor.curr { + match cursor.curr() { // Escaped character, skip ahead to the next character b'\\' => cursor.advance_twice(), diff --git a/crates/oxide/src/extractor/pre_processors/markdown.rs b/crates/oxide/src/extractor/pre_processors/markdown.rs index 63dc37d1e..488614ee5 100644 --- a/crates/oxide/src/extractor/pre_processors/markdown.rs +++ b/crates/oxide/src/extractor/pre_processors/markdown.rs @@ -9,20 +9,27 @@ impl PreProcessor for Markdown { 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) { + 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'.') => { + (true, b'.') if bracket_stack.is_empty() => { result[cursor.pos] = b' '; } _ => {} @@ -60,4 +67,17 @@ mod tests { Markdown::test(input, expected); } } + + #[test] + fn test_nested_classes_keep_the_dots() { + for (input, expected) in [ + ( + r#"{
}"#, + r#"
"#, + ), + (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 index efcbc53d8..1a04af5c9 100644 --- a/crates/oxide/src/extractor/pre_processors/mod.rs +++ b/crates/oxide/src/extractor/pre_processors/mod.rs @@ -10,6 +10,8 @@ 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::*; @@ -24,4 +26,6 @@ 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 index 8d42e744a..8e02b8f69 100644 --- a/crates/oxide/src/extractor/pre_processors/pre_processor.rs +++ b/crates/oxide/src/extractor/pre_processors/pre_processor.rs @@ -25,7 +25,33 @@ pub trait PreProcessor: Sized + Default { } #[cfg(test)] - fn test_extract_contains(input: &str, items: Vec<&str>) { + 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::>(); + + 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(); @@ -46,7 +72,7 @@ pub trait PreProcessor: Sized + Default { // Ensure all items are present in the candidates. let mut missing = vec![]; - for item in &items { + for item in &expected { if !candidates.contains(item) { missing.push(item); } diff --git a/crates/oxide/src/extractor/pre_processors/pug.rs b/crates/oxide/src/extractor/pre_processors/pug.rs index 7b44fcf5b..70dfe5683 100644 --- a/crates/oxide/src/extractor/pre_processors/pug.rs +++ b/crates/oxide/src/extractor/pre_processors/pug.rs @@ -15,7 +15,7 @@ impl PreProcessor for Pug { let mut bracket_stack = BracketStack::default(); while cursor.pos < len { - match cursor.curr { + match cursor.curr() { // Only replace `.` with a space if it's not surrounded by numbers. E.g.: // // ```diff @@ -43,7 +43,7 @@ impl PreProcessor for Pug { // digit. // E.g.: `bg-red-500.2xl:flex` // ^^^ - if cursor.prev.is_ascii_digit() && cursor.next.is_ascii_digit() { + if cursor.prev().is_ascii_digit() && cursor.next().is_ascii_digit() { let mut next_cursor = cursor.clone(); next_cursor.advance(); @@ -68,17 +68,17 @@ impl PreProcessor for Pug { // // 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'/') => { + b'(' if bracket_stack.is_empty() && !matches!(cursor.prev(), b'-' | b'/') => { result[cursor.pos] = b' '; - bracket_stack.push(cursor.curr); + bracket_stack.push(cursor.curr()); } b'(' | b'[' | b'{' => { - bracket_stack.push(cursor.curr); + bracket_stack.push(cursor.curr()); } b')' | b']' | b'}' if !bracket_stack.is_empty() => { - bracket_stack.pop(cursor.curr); + bracket_stack.pop(cursor.curr()); } // Consume everything else diff --git a/crates/oxide/src/extractor/pre_processors/ruby.rs b/crates/oxide/src/extractor/pre_processors/ruby.rs index 6bb1d4923..d9a57ab77 100644 --- a/crates/oxide/src/extractor/pre_processors/ruby.rs +++ b/crates/oxide/src/extractor/pre_processors/ruby.rs @@ -34,51 +34,135 @@ impl PreProcessor for Ruby { // Extract embedded template languages // https://viewcomponent.org/guide/templates.html#interpolations - let content_as_str = std::str::from_utf8(content).unwrap(); + // 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::>(); + let ends = TEMPLATE_END_REGEX + .captures_iter(content_as_str) + .collect::>(); - let starts = TEMPLATE_START_REGEX - .captures_iter(content_as_str) - .collect::>(); - let ends = TEMPLATE_END_REGEX - .captures_iter(content_as_str) - .collect::>(); + for start in starts.iter() { + // The language for this block + let lang = start.get(1).unwrap().as_str(); - 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(); - // 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(); - // 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; + } - // 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; } - - // 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(), &lang.to_ascii_lowercase()); - - result.replace_range(body_start..body_end, replaced); - break; } } // Ruby extraction while cursor.pos < len { - // Looking for `%w` or `%W` - if cursor.curr != b'%' && !matches!(cursor.next, b'w' | b'W') { + 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; } @@ -86,10 +170,17 @@ impl PreProcessor for Ruby { cursor.advance_twice(); // Boundary character - let boundary = match cursor.curr { + 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; @@ -105,11 +196,11 @@ impl PreProcessor for Ruby { cursor.advance(); while cursor.pos < len { - match cursor.curr { - // Skip escaped characters - b'\\' => { + 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' ' { + if cursor.next() == b' ' { result[cursor.pos] = b' '; } @@ -118,20 +209,36 @@ impl PreProcessor for Ruby { // Start of a nested bracket b'[' | b'(' | b'{' => { - bracket_stack.push(cursor.curr); + 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) { + 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 => { - result[cursor.pos] = b' '; + _ if cursor.curr() == boundary => { + if boundary != b'\n' { + result[cursor.pos] = b' '; + } + break; } @@ -173,12 +280,69 @@ mod tests { "%w(flex data-[state=pending]:bg-(--my-color) flex-col)", "%w flex data-[state=pending]:bg-(--my-color) flex-col ", ), + // %w<…> + ("%w", "%w flex px-2.5 "), + ( + "%w", + "%w flex data-[state=pending]:bg-(--my-color) flex-col ", + ), + // Nested `<…>` does not end the literal + ("%w px-2.5>", "%w flex 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); } @@ -211,6 +375,30 @@ mod tests { "%w(flex data-[state=pending]:bg-(--my-color) flex-col)", vec!["flex", "data-[state=pending]:bg-(--my-color)", "flex-col"], ), + // %w<…> + ("%w", vec!["flex", "px-2.5"]), + ("%w", vec!["flex", "px-2.5"]), + ("%w<2xl:flex>", vec!["2xl:flex"]), + ( + "%w", + vec!["flex", "data-[state=pending]:bg-(--my-color)", "flex-col"], + ), + // Nested `<…>` does not end the literal + ("%w 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); } @@ -262,4 +450,79 @@ mod tests { "#; 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" %> + +

+ In a partial +

+ +

+ In a partial using explicit local variables +

+ +

+ In a partial using explicit local variables +

+ "#; + + 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 index 6404fffb5..4fa53f793 100644 --- a/crates/oxide/src/extractor/pre_processors/rust.rs +++ b/crates/oxide/src/extractor/pre_processors/rust.rs @@ -33,7 +33,7 @@ impl Rust { let mut bracket_stack = bracket_stack::BracketStack::default(); while cursor.pos < len { - match cursor.curr { + match cursor.curr() { // Escaped character, skip ahead to the next character b'\\' => { cursor.advance_twice(); @@ -46,7 +46,7 @@ impl Rust { cursor.advance(); while cursor.pos < len { - match cursor.curr { + match cursor.curr() { // Escaped character, skip ahead to the next character b'\\' => cursor.advance_twice(), @@ -89,7 +89,7 @@ impl Rust { // digit. // E.g.: `bg-red-500.2xl:flex` // ^^^ - if cursor.prev.is_ascii_digit() && cursor.next.is_ascii_digit() { + if cursor.prev().is_ascii_digit() && cursor.next().is_ascii_digit() { let mut next_cursor = cursor.clone(); next_cursor.advance(); @@ -103,11 +103,17 @@ impl Rust { } b'[' => { - bracket_stack.push(cursor.curr); + 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); + bracket_stack.pop(cursor.curr()); } // Consume everything else @@ -213,4 +219,20 @@ mod tests { 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 index 6d41e5a09..5683858d5 100644 --- a/crates/oxide/src/extractor/pre_processors/slim.rs +++ b/crates/oxide/src/extractor/pre_processors/slim.rs @@ -15,7 +15,7 @@ impl PreProcessor for Slim { let mut bracket_stack = BracketStack::default(); while cursor.pos < len { - match cursor.curr { + match cursor.curr() { // Only replace `.` with a space if it's not surrounded by numbers. E.g.: // // ```diff @@ -43,7 +43,7 @@ impl PreProcessor for Slim { // digit. // E.g.: `bg-red-500.2xl:flex` // ^^^ - if cursor.prev.is_ascii_digit() && cursor.next.is_ascii_digit() { + if cursor.prev().is_ascii_digit() && cursor.next().is_ascii_digit() { let mut next_cursor = cursor.clone(); next_cursor.advance(); @@ -65,17 +65,74 @@ impl PreProcessor for Slim { // class=%w[bg-blue-500 w-10 h-10] // ] // ``` - b'%' if matches!(cursor.next, b'w' | b'W') - && matches!(cursor.input.get(cursor.pos + 2), Some(b'[' | b'(' | b'{')) => + // + // 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 `[` or `(` or `{` - bracket_stack.push(cursor.curr); - cursor.advance(); // Move past the bracket - continue; + 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. @@ -96,10 +153,10 @@ impl PreProcessor for Slim { // 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') => + && matches!(cursor.prev(), b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9') => { result[cursor.pos] = b' '; - bracket_stack.push(cursor.curr); + bracket_stack.push(cursor.curr()); } // In Slim the class name shorthand can be followed by a parenthesis. E.g.: @@ -114,17 +171,17 @@ impl PreProcessor for Slim { // // 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'/') => { + b'(' if bracket_stack.is_empty() && !matches!(cursor.prev(), b'-' | b'/') => { result[cursor.pos] = b' '; - bracket_stack.push(cursor.curr); + bracket_stack.push(cursor.curr()); } b'(' | b'[' | b'{' => { - bracket_stack.push(cursor.curr); + bracket_stack.push(cursor.curr()); } b')' | b']' | b'}' if !bracket_stack.is_empty() => { - bracket_stack.pop(cursor.curr); + bracket_stack.pop(cursor.curr()); } // Consume everything else @@ -316,16 +373,77 @@ mod tests { ] "#; - let expected = r#" - div - class= bg-blue-500 w-10 h-10] - ] - div - class= 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)", + "div class= bg-blue-500 w-10 h-10 )", + ), + // Nested `<…>` does not end the literal + ( + "div class=(%w px-2.5>)", + "div class= flex 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", "- 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) + ] + - 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/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 { + 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#"
"#, + 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 index b233f3b8b..56a38cbe3 100644 --- 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 @@ -7,7 +7,6 @@ .relative ^^^^^^^^ - # Blurred background star - ^^^^^^^^^^ ^^^^ .absolute.left-0.z-0{ class: "-top-[400px] -right-[400px]" } ^^^^^^^^ ^^^^^^ ^^^ ^^^^^ ^^^^^^^^^^^^ ^^^^^^^^^^^^^^ .flex.justify-end.blur-3xl @@ -75,8 +74,8 @@ ^^^^^^^^^^ ^^^^^^ libraries, our components are designed to be fast, flexible, and easy to ^^^ ^^^^^^^^^^ ^^^ ^^^^^^^^ ^^ ^^ ^^^ ^^^^ ^^ - use directy in Ruby on Rails! - ^^^ ^^^^^^^ ^^ ^^ + use directly in Ruby on Rails! + ^^^ ^^^^^^^^ ^^ ^^ = doc_example(css: "mt-8 lg:mt-0 lg:basis-3/5 h-44") do ^^^ ^^^^ ^^^^^^^ ^^^^^^^^^^^^ ^^^^ ^^ @@ -102,7 +101,7 @@ %p.mt-2 ^^^^ - Utlize + Utilize = daisy_link("HAML", "https://haml.info/", target: "_blank") ^^^^^^ so your views are simple, concise, and easy to understand. @@ -120,8 +119,8 @@ %p.mt-2 ^^^^ :markdown - **PLUS!** You can utlize filters like _Markdown_, CoffeeScript, - ^^^ ^^^^^^ ^^^^^^^ ^^^^ + **PLUS!** You can utilize filters like _Markdown_, CoffeeScript, + ^^^ ^^^^^^^ ^^^^^^^ ^^^^ Textile, and many more! ^^^ ^^^^ ^^^^^ @@ -196,7 +195,6 @@ ^^^^^^^^ ^^^^ ^^^ ^^^^ ^^ :escaped - # app/components/character_component.html.haml - ^^^^ = part(:component) do ^^ = part(:head) 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 index 38e17b134..8f9b61941 100644 --- 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 @@ -42,7 +42,7 @@ = 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 directy in Ruby on Rails! + use directly 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 @@ -58,7 +58,7 @@ Simple, Concise Views %p.mt-2 - Utlize + Utilize = daisy_link("HAML", "https://haml.info/", target: "_blank") so your views are simple, concise, and easy to understand. @@ -69,7 +69,7 @@ %p.mt-2 :markdown - **PLUS!** You can utlize filters like _Markdown_, CoffeeScript, + **PLUS!** You can utilize filters like _Markdown_, CoffeeScript, Textile, and many more! .mt-8.xl:mt-0 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 { + 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#" +
+ +
+ "#; + + let expected = r#" +
+ +
+ "#; + + Twig::test(input, expected); + Twig::test_extract_contains(input, vec!["opacity-50"]); + + // Inside a component + let input = r#" + + "#; + + let expected = r#" + + "#; + + 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 index 119e2a3d2..ae037435c 100644 --- a/crates/oxide/src/extractor/pre_processors/vue.rs +++ b/crates/oxide/src/extractor/pre_processors/vue.rs @@ -15,13 +15,15 @@ impl PreProcessor for Vue { fn process(&self, content: &[u8]) -> Vec { let mut result = content.to_vec(); - let content_as_str = std::str::from_utf8(content).unwrap(); - for (_, [lang, body]) in TEMPLATE_REGEX - .captures_iter(content_as_str) - .map(|c| c.extract()) - { - let replaced = pre_process_input(body.as_bytes(), lang); - result = result.replace(body, replaced); + // 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 @@ -43,4 +45,16 @@ mod tests { 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 index 9148a1fbf..4fad49faa 100644 --- a/crates/oxide/src/extractor/string_machine.rs +++ b/crates/oxide/src/extractor/string_machine.rs @@ -30,20 +30,20 @@ impl Machine for StringMachine { #[inline] fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState { - if Class::Quote != cursor.curr.into() { + 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; + let end_char = cursor.curr(); cursor.advance(); while cursor.pos < len { - match cursor.curr.into() { - Class::Escape => match cursor.next.into() { + match cursor.curr().into() { + Class::Escape => match cursor.next().into() { // An escaped whitespace character is not allowed Class::Whitespace => return MachineState::Idle, @@ -52,7 +52,7 @@ impl Machine for StringMachine { }, // End of the string - Class::Quote if cursor.curr == end_char => return self.done(start_pos, cursor), + 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, diff --git a/crates/oxide/src/extractor/utility_machine.rs b/crates/oxide/src/extractor/utility_machine.rs index b9b1038cd..c116ec4e4 100644 --- a/crates/oxide/src/extractor/utility_machine.rs +++ b/crates/oxide/src/extractor/utility_machine.rs @@ -27,12 +27,12 @@ impl Machine for UtilityMachine { #[inline] fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState { - match cursor.curr.into() { + match cursor.curr().into() { // LEGACY: Important marker Class::Exclamation => { self.legacy_important = true; - match cursor.next.into() { + match cursor.next().into() { // Start of an arbitrary property // // E.g.: `![color:red]` @@ -78,7 +78,7 @@ 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() { + MachineState::Done(_) => match cursor.next().into() { // End of arbitrary property, but there is a potential modifier. // // E.g.: `[color:#0088cc]/` @@ -109,7 +109,7 @@ impl UtilityMachine { 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() { + MachineState::Done(_) => match cursor.next().into() { // End of a named utility, but there is a potential modifier. // // E.g.: `bg-red-500/` @@ -140,7 +140,7 @@ impl UtilityMachine { 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() { + MachineState::Done(_) => match cursor.next().into() { // A modifier followed by a modifier is invalid Class::Slash => self.restart(), diff --git a/crates/oxide/src/extractor/variant_machine.rs b/crates/oxide/src/extractor/variant_machine.rs index 23aa61798..9ec2adc09 100644 --- a/crates/oxide/src/extractor/variant_machine.rs +++ b/crates/oxide/src/extractor/variant_machine.rs @@ -16,7 +16,7 @@ impl Machine for VariantMachine { #[inline] fn next(&mut self, cursor: &mut cursor::Cursor<'_>) -> MachineState { - match cursor.curr.into() { + match cursor.curr().into() { // Start of an arbitrary variant // // E.g.: `[&:hover]:` @@ -48,7 +48,7 @@ impl VariantMachine { start_pos: usize, cursor: &mut cursor::Cursor<'_>, ) -> MachineState { - match cursor.next.into() { + match cursor.next().into() { // End of an arbitrary value, must be followed by a `:` // // E.g.: `[&:hover]:` 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 { return None; } - if !cursor.curr.is_ascii_whitespace() { + if !cursor.curr().is_ascii_whitespace() { return None; } diff --git a/crates/oxide/src/scanner/detect_sources.rs b/crates/oxide/src/scanner/detect_sources.rs index 9dc340fba..6cfdd49cc 100644 --- a/crates/oxide/src/scanner/detect_sources.rs +++ b/crates/oxide/src/scanner/detect_sources.rs @@ -30,11 +30,9 @@ fn sort_by_dir_and_name(a: &DirEntry, z: &DirEntry) -> Ordering { pub fn resolve_globs( base: PathBuf, - dirs: &[PathBuf], + dirs: &FxHashSet, extensions: &FxHashSet, ) -> Vec { - let allowed_paths: FxHashSet = FxHashSet::from_iter(dirs.iter().cloned()); - // A list of known extensions + a list of extensions we found in the project. let mut found_extensions: FxHashSet = FxHashSet::from_iter(KNOWN_EXTENSIONS.iter().map(|x| x.to_string())); @@ -72,7 +70,7 @@ pub fn resolve_globs( continue; } - if !allowed_paths.contains(path) { + if !dirs.contains(path) { let mut path = path; while let Some(parent) = path.parent() { if parent == base { @@ -113,7 +111,8 @@ pub fn resolve_globs( continue; } - if !allowed_paths.contains(path) { + if !dirs.contains(path) { + it.skip_current_dir(); continue; } diff --git a/crates/oxide/src/scanner/fixtures/ignored-content-dirs.txt b/crates/oxide/src/scanner/fixtures/ignored-content-dirs.txt index 0921d2ff8..79f01ecc1 100644 --- a/crates/oxide/src/scanner/fixtures/ignored-content-dirs.txt +++ b/crates/oxide/src/scanner/fixtures/ignored-content-dirs.txt @@ -1,14 +1,15 @@ .git .hg -.svn -node_modules -.yarn -.venv -venv +.jj .next -.turbo .parcel-cache -__pycache__ -.svelte-kit .pnpm-store +.svelte-kit +.svn +.turbo +.venv .vercel +.yarn +__pycache__ +node_modules +venv diff --git a/crates/oxide/src/scanner/fixtures/ignored-files.txt b/crates/oxide/src/scanner/fixtures/ignored-files.txt index d2d231ec7..1e8f1029f 100644 --- a/crates/oxide/src/scanner/fixtures/ignored-files.txt +++ b/crates/oxide/src/scanner/fixtures/ignored-files.txt @@ -2,3 +2,5 @@ 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 = 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>); + +impl Write for MutexWriter { + fn write(&mut self, buf: &[u8]) -> io::Result { + 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 + }); + + _ = 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 ec6aea642..b7da9aa17 100644 --- a/crates/oxide/src/scanner/mod.rs +++ b/crates/oxide/src/scanner/mod.rs @@ -1,5 +1,6 @@ pub mod auto_source_detection; pub mod detect_sources; +pub mod init_tracing; pub mod sources; use crate::extractor::{Extracted, Extractor}; @@ -14,15 +15,12 @@ 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::collections::{BTreeMap, BTreeSet}; -use std::fs::OpenOptions; -use std::io::{self, Write}; use std::path::{Path, PathBuf}; -use std::sync::{self, Arc, Mutex}; +use std::sync::{Arc, Mutex}; use std::time::SystemTime; use tracing::event; -use tracing_subscriber::fmt::writer::BoxMakeWriter; // @source "some/folder"; // This is auto source detection // @source "some/folder/**/*"; // This is auto source detection @@ -34,70 +32,6 @@ use tracing_subscriber::fmt::writer::BoxMakeWriter; // // @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 -static SHOULD_TRACE: sync::LazyLock = 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("`"))) -} - -fn init_tracing() { - if !*SHOULD_TRACE { - return; - } - - let file_path = format!("tailwindcss-{}.log", std::process::id()); - let file = OpenOptions::new() - .create(true) - .append(true) - .open(&file_path) - .unwrap_or_else(|_| panic!("Failed to open {file_path}")); - - let file_path = Path::new(&file_path); - let absolute_file_path = dunce::canonicalize(file_path) - .unwrap_or_else(|_| panic!("Failed to canonicalize {file_path:?}")); - eprintln!( - "{} Writing debug info to: {}\n", - dim("[DEBUG]"), - highlight(absolute_file_path.as_path().to_str().unwrap()) - ); - - let file = Arc::new(Mutex::new(file)); - - let writer: BoxMakeWriter = BoxMakeWriter::new({ - let file = file.clone(); - move || Box::new(MutexWriter(file.clone())) as Box - }); - - _ = 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(); -} - -struct MutexWriter(Arc>); - -impl Write for MutexWriter { - fn write(&mut self, buf: &[u8]) -> io::Result { - self.0.lock().unwrap().write(buf) - } - - fn flush(&mut self) -> io::Result<()> { - self.0.lock().unwrap().flush() - } -} #[derive(Debug, Clone)] pub enum ChangedContent { @@ -129,26 +63,33 @@ pub struct Scanner { /// The walker to detect all files that we have to scan walker: Option, - /// All changed content that we have to parse - changed_content: Vec, - /// All found extensions extensions: FxHashSet, - /// All CSS files we want to scan for CSS variable usage - css_files: Vec, - /// All files that we have to scan - files: Vec, + files: FxHashSet, /// All directories, sub-directories, etc… we saw during source detection - dirs: Vec, + dirs: FxHashSet, /// All generated globs, used for setting up watchers globs: Option>, /// Track unique set of candidates candidates: FxHashSet, + + /// Track mtimes for files so incremental scans can skip unchanged files. + mtimes: FxHashMap, + + /// Files that were scanned during the last `scan()` call. + scanned_files: Vec, + + /// 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 { @@ -163,7 +104,6 @@ impl Scanner { } 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() { @@ -171,29 +111,27 @@ impl Scanner { } } + let walker = create_walker(&sources); + Self { - sources: sources.clone(), - walker: create_walker(sources), + sources, + walker, ..Default::default() } } pub fn scan(&mut self) -> Vec { - self.scan_sources(); + self.sources_scanned = false; - // TODO: performance improvement, bail early if we don't have any changed content - // if self.changed_content.is_empty() { - // return vec![]; - // } + let (scanned_blobs, css_files, files) = self.discover_sources(); - let _new_candidates = self.extract_candidates(); + self.extract_candidates(scanned_blobs, css_files); + self.scanned_files = files; - // Make sure we have a sorted list of candidates - let mut candidates = self.candidates.iter().cloned().collect::>(); - candidates.par_sort_unstable(); - - // Return all candidates instead of only the new ones - candidates + // Return all candidates sorted + let mut result = self.candidates.iter().cloned().collect::>(); + result.par_sort_unstable(); + result } #[tracing::instrument(skip_all)] @@ -208,7 +146,7 @@ impl Scanner { // Raw content can be parsed directly, no need to verify if the file exists and is allowed // to be scanned. - self.changed_content.extend(changed_contents); + let mut content_to_scan: Vec = changed_contents; // Fully resolve all files let changed_files = changed_files @@ -232,7 +170,7 @@ impl Scanner { }); // All known files are allowed to be scanned - self.changed_content.extend(known_files); + content_to_scan.extend(known_files); // Figure out if the new unknown files are allowed to be scanned if !new_unknown_files.is_empty() { @@ -243,6 +181,11 @@ impl Scanner { 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 = 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 { @@ -251,9 +194,17 @@ impl Scanner { // 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. - if file == path { - self.files.push(path.to_path_buf()); // Track for future use - self.changed_content.push(changed_file.clone()); // Track for parsing + 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); } } @@ -274,18 +225,17 @@ impl Scanner { } } - self.extract_candidates() + // 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) -> Vec { - let changed_content = self.changed_content.drain(..).collect::>(); - - // Extract all candidates from the changed content - let mut new_candidates = parse_all_blobs(read_all_files(changed_content)); + fn extract_candidates(&mut self, blobs: Vec>, css_files: Vec) -> Vec { + // Extract all candidates from the pre-read blobs + let mut new_candidates = parse_all_blobs(blobs); // Extract all CSS variables from the CSS files - let css_files = self.css_files.drain(..).collect::>(); if !css_files.is_empty() { let css_variables = extract_css_variables(read_all_files( css_files @@ -297,63 +247,23 @@ impl Scanner { new_candidates.extend(css_variables); } - // Only compute the new candidates and ignore the ones we already have. This is for - // subsequent calls to prevent serializing the entire set of candidates every time. - let mut new_candidates = new_candidates - .into_par_iter() - .filter(|candidate| !self.candidates.contains(candidate)) - .collect::>(); - - new_candidates.par_sort_unstable(); + // 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.par_extend(new_candidates.clone()); + self.candidates.extend(new_candidates.iter().cloned()); - new_candidates - } + let mut result: Vec = new_candidates.into_iter().collect(); + result.par_sort_unstable(); - #[tracing::instrument(skip_all)] - fn scan_sources(&mut self) { - let Some(walker) = &mut self.walker else { - return; - }; - - for entry in walker.build().filter_map(Result::ok) { - let path = entry.into_path(); - let Ok(metadata) = path.metadata() else { - continue; - }; - if metadata.is_dir() { - self.dirs.push(path); - } else if metadata.is_file() { - let extension = path - .extension() - .and_then(|x| x.to_str()) - .unwrap_or_default(); // In case the file has no extension - - match extension { - // 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" => { - self.css_files.push(path.clone()); - } - _ => { - self.changed_content.push(ChangedContent::File( - path.to_path_buf(), - extension.to_owned(), - )); - } - } - - self.extensions.insert(extension.to_owned()); - self.files.push(path); - } - } + result } #[tracing::instrument(skip_all)] pub fn get_files(&mut self) -> Vec { - self.scan_sources(); + let _ = self.discover_sources(); self.files .par_iter() @@ -361,13 +271,18 @@ impl Scanner { .collect() } + #[tracing::instrument(skip_all)] + pub fn get_scanned_files(&self) -> Vec { + self.scanned_files.clone() + } + #[tracing::instrument(skip_all)] pub fn get_globs(&mut self) -> Vec { if let Some(globs) = &self.globs { return globs.clone(); } - self.scan_sources(); + let _ = self.discover_sources(); let mut globs = vec![]; for source in self.sources.iter() { @@ -441,21 +356,167 @@ impl Scanner { let i = s.as_ptr() as usize - offset; let original = &original_content[i..i + s.len()]; if original.contains_str("-[]") { - return Some(unsafe { - (String::from_utf8_unchecked(original.to_vec()), i) - }); + return String::from_utf8(original.to_vec()) + .ok() + .map(|candidate| (candidate, 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. - Some(unsafe { (String::from_utf8_unchecked(s.to_vec()), 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, Vec) { + 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 = 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 = 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> = 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> { @@ -474,26 +535,28 @@ fn read_changed_content(c: ChangedContent) -> Option> { ChangedContent::Content(contents, extension) => (contents.into_bytes(), extension), }; - Some(pre_process_input(&content, &extension)) + Some(pre_process_input(content, &extension)) } -pub fn pre_process_input(content: &[u8], extension: &str) -> Vec { +pub fn pre_process_input(content: Vec, extension: &str) -> Vec { 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" => 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), - "vue" => Vue.process(content), - _ => content.to_vec(), + "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, } } @@ -512,23 +575,23 @@ fn read_all_files(changed_content: Vec) -> Vec> { } #[tracing::instrument(skip_all)] -fn extract_css_variables(blobs: Vec>) -> Vec { +fn extract_css_variables(blobs: Vec>) -> FxHashSet { extract(blobs, |mut extractor| { extractor.extract_variables_from_css() }) } #[tracing::instrument(skip_all)] -fn parse_all_blobs(blobs: Vec>) -> Vec { +fn parse_all_blobs(blobs: Vec>) -> FxHashSet { extract(blobs, |mut extractor| extractor.extract()) } #[tracing::instrument(skip_all)] -fn extract(blobs: Vec>, handle: H) -> Vec +fn extract(blobs: Vec>, handle: H) -> FxHashSet where H: Fn(Extractor) -> Vec + std::marker::Sync, { - let mut result: Vec<_> = blobs + blobs .par_iter() .flat_map(|blob| blob.par_split(|x| *x == b'\n')) .filter_map(|blob| { @@ -553,26 +616,113 @@ where a }) .into_iter() - .map(|s| unsafe { String::from_utf8_unchecked(s.to_vec()) }) - .collect(); - - // SAFETY: Unstable sort is faster and in this scenario it's also safe because we are - // guaranteed to have unique candidates. - result.par_sort_unstable(); - - result + .filter_map(|s| String::from_utf8(s.to_vec()).ok()) + .collect() } -/// Create a walker for the given sources to detect all the files that we have to scan. +#[derive(Debug)] +enum WalkEntry { + Dir(PathBuf), + File { + path: PathBuf, + mtime: Option, + + /// Whether the path itself is a symlink + is_symlink: bool, + }, +} + +impl From 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 { + 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 { + struct FlushOnDrop { + local: Vec, + shared: Arc>>, + } + + impl Drop for FlushOnDrop { + fn drop(&mut self) { + if !self.local.is_empty() { + self.shared.lock().unwrap().append(&mut self.local); + } + } + } + + let collected: Arc>> = 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. /// -/// The `mtimes` map is used to keep track of the last modified time of each file. This is used to -/// determine if a file or folder has changed since the last scan and we can skip folders that -/// haven't changed. -fn create_walker(sources: Sources) -> Option { - let mtimes: Arc>> = Default::default(); +/// 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 { let mut other_roots: FxHashSet<&PathBuf> = FxHashSet::default(); let mut first_root: Option<&PathBuf> = None; - let mut ignores: BTreeMap<&PathBuf, BTreeSet> = Default::default(); + + let mut ignores: Vec<(&PathBuf, Vec)> = 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 { @@ -584,7 +734,7 @@ fn create_walker(sources: Sources) -> Option { } } SourceEntry::Pattern { base, pattern } => { - let mut pattern = pattern.to_string(); + let pattern = pattern.to_owned(); if first_root.is_none() { first_root = Some(base); @@ -593,35 +743,19 @@ fn create_walker(sources: Sources) -> Option { } if !pattern.contains("**") { - // Ensure that the pattern is pinned to the base path. - if !pattern.starts_with("/") { - pattern = format!("/{pattern}"); - } - // Specific patterns should take precedence even over git-ignored files: - ignores - .entry(base) - .or_default() - .insert(format!("!{}", pattern)); + 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 - ignores - .entry(base) - .or_default() - .insert(format!("!*.{}", extension.to_string_lossy())); + emit(base, format!("!*.{}", extension.to_string_lossy())); } } } SourceEntry::Ignored { base, pattern } => { - let mut pattern = pattern.to_string(); - // Ensure that the pattern is pinned to the base path. - if !pattern.starts_with("/") { - pattern = format!("/{pattern}"); - } - ignores.entry(base).or_default().insert(pattern); + emit(base, pattern.to_owned()); } SourceEntry::External { base } => { if first_root.is_none() { @@ -631,16 +765,10 @@ fn create_walker(sources: Sources) -> Option { } // External sources should take precedence even over git-ignored files: - ignores - .entry(base) - .or_default() - .insert(format!("!{}", "/**/*")); + emit(base, "!/**/*".to_owned()); // External sources should still disallow binary extensions: - ignores - .entry(base) - .or_default() - .insert(BINARY_EXTENSIONS_GLOB.clone()); + emit(base, BINARY_EXTENSIONS_GLOB.clone()); } } } @@ -717,75 +845,61 @@ fn create_walker(sources: Sources) -> Option { builder.add_gitignore(ignore); } - builder.filter_entry({ - move |entry| { - let path = entry.path(); + // Pre-compute source matching data to avoid allocations in the hot filter_entry path + let auto_bases: Vec = sources + .iter() + .filter_map(|source| match source { + SourceEntry::Auto { base } | SourceEntry::External { base } => Some(base.clone()), + _ => None, + }) + .collect(); - // 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 source in sources.iter() { - match source { - SourceEntry::Auto { base } | SourceEntry::External { base } => { - if path.starts_with(base) { - matches = true; - break; - } - } - SourceEntry::Pattern { base, pattern } => { - let mut pattern = pattern.to_string(); - // Ensure that the pattern is pinned to the base path. - if !pattern.starts_with("/") { - pattern = format!("/{pattern}"); - } + let pattern_sources: Vec<(PathBuf, String)> = sources + .iter() + .filter_map(|source| match source { + SourceEntry::Pattern { base, pattern } => Some((base.into(), pattern.into())), + _ => None, + }) + .collect(); - // Check if path starts with base, if so, remove the prefix and check the remainder against the pattern - 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; - } - } - _ => {} - } - } + // Source pattern matching filter (lock-free, safe for parallel walking) + builder.filter_entry(move |entry| { + let path = entry.path(); - if !matches { - return false; + // 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; } } - let mut mtimes = mtimes.lock().unwrap(); - let current_time = match entry.metadata() { - Ok(metadata) if metadata.is_file() => { - if let Ok(time) = metadata.modified() { - Some(time) - } else { - None + 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; } } - _ => None, - }; + } - let previous_time = - current_time.and_then(|time| mtimes.insert(entry.clone().into_path(), time)); - - match (current_time, previous_time) { - (Some(current), Some(prev)) if prev == current => false, - _ => { - event!(tracing::Level::INFO, "Discovering {:?}", path); - - true - } + if !matches { + return false; } } + + true }); Some(builder) diff --git a/crates/oxide/src/scanner/sources.rs b/crates/oxide/src/scanner/sources.rs index f28b16a49..53c09387f 100644 --- a/crates/oxide/src/scanner/sources.rs +++ b/crates/oxide/src/scanner/sources.rs @@ -1,7 +1,8 @@ -use crate::glob::split_pattern; use crate::GlobEntry; use bexpand::Expression; -use std::path::PathBuf; +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; @@ -49,13 +50,14 @@ pub enum SourceEntry { /// ``` Ignored { base: PathBuf, pattern: String }, - /// External sources are sources outside of your git root which should not - /// follow gitignore rules. + /// 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 }, } @@ -75,6 +77,164 @@ impl Sources { } } +/// 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) -> Vec { + 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::>(); + + // Bases of restricted patterns. Each of these becomes its own walk root with its own + // `*` + `!` 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::>(); + + let mut restricted_roots: FxHashSet = 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. @@ -102,72 +262,456 @@ impl PublicSourceEntry { /// resolved path. pub fn optimize(&mut self) { // Resolve base path immediately - let Ok(base) = dunce::canonicalize(&self.base) else { + let Ok(mut base) = dunce::canonicalize(&self.base) else { event!(Level::ERROR, "Failed to resolve base: {:?}", self.base); return; }; - self.base = base.to_string_lossy().to_string(); - // No dynamic part, figure out if we are dealing with a file or a directory. - if !self.pattern.contains('*') { - let combined_path = if self.pattern.starts_with("/") { - PathBuf::from(&self.pattern) - } else { - PathBuf::from(&self.base).join(&self.pattern) - }; - - match dunce::canonicalize(combined_path) { - Ok(resolved_path) if resolved_path.is_dir() => { - self.base = resolved_path.to_string_lossy().to_string(); - self.pattern = "**/*".to_owned(); - } - Ok(resolved_path) if resolved_path.is_file() => { - self.base = resolved_path - .parent() - .unwrap() - .to_string_lossy() - .to_string(); - // Ensure leading slash, otherwise it will match against all files in all folders/ - self.pattern = - format!("/{}", resolved_path.file_name().unwrap().to_string_lossy()); - } - _ => {} - } - return; + let mut new_pattern = PathBuf::new(); + enum ComponentStage { + Base, + Pattern, } + let mut stage = ComponentStage::Base; - // Contains dynamic part - let (static_part, dynamic_part) = split_pattern(&self.pattern); + 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 => {} - let base: PathBuf = self.base.clone().into(); - let base = match static_part { - Some(static_part) => { - // TODO: If the base does not exist on disk, try removing the last slash and try - // again. - match dunce::canonicalize(base.join(static_part)) { - Ok(base) => base, - Err(err) => { - event!(tracing::Level::ERROR, "Failed to resolve glob: {:?}", err); - return; + // 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); + } } } - } - None => base, - }; - - let pattern = match dynamic_part { - Some(dynamic_part) => dynamic_part, - None => { - if base.is_dir() { - "**/*".to_owned() - } else { - "".to_owned() + ComponentStage::Pattern => { + new_pattern.push(component); } } - }; + } self.base = base.to_string_lossy().to_string(); - self.pattern = pattern; + 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 }); } } @@ -218,18 +762,111 @@ pub fn public_source_entries_to_private_source_entries( }) .collect::>(); + // 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> = 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 - expanded_globs + let sources = expanded_globs .into_iter() - .map(Into::into) - .collect::>() + .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::>(); + + expand_restricted_patterns(sources) } /// Convert a public source entry to a source entry impl From for SourceEntry { fn from(value: PublicSourceEntry) -> Self { - let auto = value.pattern.ends_with("**/*") - || PathBuf::from(&value.base).join(&value.pattern).is_dir(); + 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!( @@ -239,24 +876,16 @@ impl From for SourceEntry { std::path::MAIN_SEPARATOR )) || value .base - .ends_with(&format!("{}{}", std::path::MAIN_SEPARATOR, dir,)) + .ends_with(&format!("{}{}", std::path::MAIN_SEPARATOR, dir)) }); - match (value.negated, auto, inside_ignored_content_dir) { - (false, true, false) => SourceEntry::Auto { + match inside_ignored_content_dir { + false => SourceEntry::Auto { base: value.base.into(), }, - (false, true, true) => SourceEntry::External { + true => SourceEntry::External { base: value.base.into(), }, - (false, false, _) => SourceEntry::Pattern { - base: value.base.into(), - pattern: value.pattern, - }, - (true, _, _) => SourceEntry::Ignored { - base: value.base.into(), - pattern: value.pattern, - }, } } } diff --git a/crates/oxide/tests/scanner.rs b/crates/oxide/tests/scanner.rs index 4003ff253..fb5354a87 100644 --- a/crates/oxide/tests/scanner.rs +++ b/crates/oxide/tests/scanner.rs @@ -1,5 +1,6 @@ #[cfg(test)] mod scanner { + use insta::assert_snapshot; use pretty_assertions::assert_eq; use std::path::{Path, PathBuf}; use std::process::Command; @@ -20,6 +21,16 @@ mod scanner { result } + fn symlink_file, Q: AsRef>(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(); @@ -45,6 +56,157 @@ mod scanner { globs: Vec, normalized_sources: Vec, candidates: Vec, + 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::>(); + let parent = parent.components().collect::>(); + + 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, + out: &mut String, + ) { + let mut entries = fs::read_dir(dir) + .unwrap() + .filter_map(Result::ok) + .filter(|entry| entry.file_name() != ".git") + .collect::>(); + 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)]) { @@ -61,6 +223,53 @@ mod scanner { } } + fn scanned_files(scanner: &mut Scanner, base: &Path) -> Vec { + 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::>(); + files.sort(); + files + } + + fn scanned_globs(scanner: &mut Scanner, base: &Path) -> Vec { + 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::>(); + globs.sort(); + globs + } + + fn normalize_files(files: Vec, base: &Path) -> Vec { + let base_dir = + format!("{}{}", dunce::canonicalize(base).unwrap().display(), "/").replace('\\', "/"); + + let mut files = files + .iter() + .map(|file| file.replace('\\', "/").replace(&base_dir, "")) + .collect::>(); + files.sort(); + files + } + fn scan_with_globs( paths_with_content: &[(&str, &str)], source_directives: Vec<&str>, @@ -85,34 +294,14 @@ mod scanner { let mut scanner = Scanner::new(sources); let candidates = scanner.scan(); - let base_dir = format!("{}{}", dunce::canonicalize(&base).unwrap().display(), "/").replace('\\', "/"); // Get all scanned files as strings relative to the base directory - let mut files = scanner - .get_files() - .iter() - // Normalize paths to use unix style separators - .map(|file| file.replace('\\', "/").replace(&base_dir, "")) - .collect::>(); - files.sort(); + let files = scanned_files(&mut scanner, Path::new(&base)); // Get all scanned globs as strings relative to the base directory - 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::>(); - globs.sort(); + 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 @@ -130,11 +319,14 @@ mod scanner { .collect::>(); normalized_sources.sort(); + let tree = fs_tree(&dir, &files); + ScanResult { files, globs, normalized_sources, candidates, + tree, } } @@ -148,6 +340,7 @@ mod scanner { files, globs, normalized_sources, + tree, .. } = scan(&[ ("index.html", ""), @@ -155,6 +348,14 @@ mod scanner { ("b.html", ""), ("c.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!["**/*"]); @@ -166,6 +367,7 @@ mod scanner { files, globs, normalized_sources, + tree, .. } = scan(&[ (".gitignore", "b.html"), @@ -174,6 +376,17 @@ mod scanner { ("b.html", ""), ("c.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!["**/*"]); @@ -185,6 +398,7 @@ mod scanner { files, globs, normalized_sources, + tree, .. } = scan(&[ ("index.html", ""), @@ -195,6 +409,20 @@ mod scanner { ("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!( files, vec![ @@ -216,6 +444,7 @@ mod scanner { files, globs, normalized_sources, + tree, .. } = scan(&[ ("index.html", ""), @@ -229,6 +458,25 @@ mod scanner { ("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!( files, vec![ @@ -253,6 +501,7 @@ mod scanner { files, globs, normalized_sources, + tree, .. } = scan(&[ (".gitignore", "public/b.html\na.html"), @@ -262,6 +511,18 @@ mod scanner { ("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!["**/*"]); @@ -273,6 +534,7 @@ mod scanner { files, globs, normalized_sources, + tree, .. } = scan(&[ ("index.html", ""), @@ -281,6 +543,15 @@ mod scanner { ("src/c.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"] @@ -298,6 +569,7 @@ mod scanner { files, globs, normalized_sources, + tree, .. } = scan(&[ ("index.html", ""), @@ -306,6 +578,14 @@ mod scanner { ("c.lock", ""), ]); + 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!["**/*"]); @@ -318,6 +598,7 @@ mod scanner { files, globs, normalized_sources, + tree, .. } = scan(&[ // Looks like `.pages` binary extension, but it's a folder @@ -331,6 +612,16 @@ mod scanner { ), ]); + 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!["**/*"]); @@ -342,6 +633,7 @@ mod scanner { files, globs, normalized_sources, + tree, .. } = scan(&[ ("index.html", ""), @@ -350,6 +642,14 @@ mod scanner { ("c.less", ""), ]); + 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!["**/*"]); @@ -361,9 +661,16 @@ mod scanner { 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!["**/*"]); @@ -375,6 +682,7 @@ mod scanner { files, globs, normalized_sources, + tree, .. } = scan(&[ ("index.html", ""), @@ -382,6 +690,13 @@ mod scanner { ("yarn.lock", ""), ]); + 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!["**/*"]); @@ -393,6 +708,7 @@ mod scanner { files, globs, normalized_sources, + tree, .. } = scan(&[ // Explicitly listed root files @@ -437,6 +753,58 @@ 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!( files, vec![ @@ -491,6 +859,7 @@ mod scanner { let ScanResult { candidates, normalized_sources, + tree, .. } = scan(&[ // The gitignore file is used to filter out files but not scanned for candidates @@ -513,6 +882,21 @@ mod scanner { ("index4.svelte", ""), ]); + 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![ @@ -536,28 +920,86 @@ mod scanner { let ScanResult { candidates, normalized_sources, + tree, .. } = scan_with_globs( &[("foo/bar/baz/foo.html", "content-['foo.html']")], 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 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"]); } @@ -568,6 +1010,7 @@ mod scanner { let ScanResult { candidates, normalized_sources, + tree, .. } = scan_with_globs( &[ @@ -587,6 +1030,14 @@ mod scanner { ], ); + assert_snapshot!(tree, @" + . (git) + ├── ✓ my-folder.bin + │ └── ✓ foo.html + └── ✓ my-folder.templates + └── ✓ foo.html + "); + assert_eq!( candidates, vec![ @@ -605,6 +1056,7 @@ mod scanner { let ScanResult { candidates, normalized_sources, + tree, .. } = scan_with_globs( &[ @@ -615,15 +1067,161 @@ mod scanner { 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::>(); + + 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::>(); + 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::>(); + 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::>(); + + 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( &[ @@ -637,6 +1235,19 @@ mod scanner { 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![ @@ -678,6 +1289,14 @@ mod scanner { 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, @@ -693,6 +1312,7 @@ mod scanner { let ScanResult { candidates, normalized_sources, + tree, .. } = scan_with_globs( &[ @@ -705,6 +1325,13 @@ mod scanner { 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"]); } @@ -734,6 +1361,14 @@ mod scanner { 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, @@ -838,6 +1473,238 @@ mod scanner { "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::::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] @@ -847,6 +1714,8 @@ mod scanner { files, globs, normalized_sources, + tree, + .. } = scan_with_globs( &[ ("src/index.ts", "content-['src/index.ts']"), @@ -874,6 +1743,25 @@ mod scanner { ], ); + 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![ @@ -919,6 +1807,8 @@ mod scanner { files, globs, normalized_sources, + tree, + .. } = scan_with_globs( // Typically skipped &[ @@ -930,6 +1820,15 @@ mod scanner { 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']",] @@ -957,6 +1856,8 @@ mod scanner { files, globs, normalized_sources, + tree, + .. } = scan_with_globs( &[ ("index.html", "content-['index.html']"), @@ -981,6 +1882,21 @@ mod scanner { ], ); + 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![ @@ -997,6 +1913,409 @@ mod scanner { 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 { @@ -1004,6 +2323,8 @@ mod scanner { files, globs, normalized_sources, + tree, + .. } = scan_with_globs( &[ (".gitignore", "ignore-1.html\nweb/ignore-2.html"), @@ -1015,6 +2336,19 @@ mod scanner { 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']",] @@ -1032,6 +2366,8 @@ mod scanner { files, globs, normalized_sources, + tree, + .. } = scan_with_globs( &[ ("src/logo.jpg", "content-['/src/logo.jpg']"), @@ -1040,6 +2376,13 @@ mod scanner { 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']"] @@ -1056,6 +2399,8 @@ mod scanner { files, globs, normalized_sources, + tree, + .. } = scan_with_globs( &[ (".gitignore", "ignore-1.html\n/web/ignore-2.html"), @@ -1065,6 +2410,17 @@ mod scanner { ], 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![ @@ -1078,6 +2434,201 @@ mod scanner { 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 @@ -1148,7 +2699,33 @@ mod scanner { ), ]; - let candidates = Scanner::new(sources.clone()).scan(); + 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!( @@ -1166,7 +2743,33 @@ mod scanner { .arg("init") .current_dir(dir.join("home")) .output(); - let candidates = Scanner::new(sources.clone()).scan(); + 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, @@ -1185,7 +2788,33 @@ mod scanner { .arg("init") .current_dir(dir.join("home/project")) .output(); - let candidates = Scanner::new(sources.clone()).scan(); + 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, @@ -1205,7 +2834,33 @@ mod scanner { .arg("init") .current_dir(dir.join("home/project/apps")) .output(); - let candidates = Scanner::new(sources.clone()).scan(); + 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, @@ -1227,7 +2882,33 @@ mod scanner { .current_dir(dir.join("home/project/apps/web")) .output(); - let candidates = Scanner::new(sources.clone()).scan(); + 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, @@ -1261,7 +2942,15 @@ mod scanner { public_source_entry_from_pattern(dir.clone(), "@source not 'src/ignore-me.html'"), ]; - let candidates = Scanner::new(sources.clone()).scan(); + 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']"]); } @@ -1288,7 +2977,17 @@ mod scanner { ), ]; - let candidates = Scanner::new(sources.clone()).scan(); + 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']"]); } @@ -1315,6 +3014,12 @@ mod scanner { 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, @@ -1342,6 +3047,18 @@ mod scanner { 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![ @@ -1371,6 +3088,11 @@ mod scanner { 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 '**/*'"), @@ -1379,6 +3101,11 @@ mod scanner { let candidates = scanner.scan(); assert_eq!(candidates, vec!["content-['foo.styl']"]); + + assert_snapshot!(fs_tree(&dir, &scanned_files(&mut scanner, &dir)), @" + . + └── ✓ foo.styl + "); } #[test] @@ -1403,6 +3130,13 @@ mod scanner { 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'"), @@ -1410,6 +3144,13 @@ mod scanner { 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] @@ -1444,6 +3185,17 @@ mod scanner { 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( @@ -1455,6 +3207,17 @@ mod scanner { 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` // @@ -1472,6 +3235,64 @@ mod scanner { "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] @@ -1481,6 +3302,8 @@ mod scanner { files, globs, normalized_sources, + tree, + .. } = scan_with_globs( &[ ( @@ -1499,6 +3322,17 @@ mod scanner { 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",]); @@ -1513,6 +3347,8 @@ mod scanner { files, globs, normalized_sources, + tree, + .. } = scan_with_globs( &[ (".gitignore", "node_modules\ndist"), @@ -1528,6 +3364,18 @@ mod scanner { 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']"] @@ -1569,6 +3417,17 @@ mod scanner { 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( @@ -1629,6 +3488,8 @@ mod scanner { files, globs, normalized_sources, + tree, + .. } = scan_with_globs( &[ ("src/💩.js", "content-['src/💩.js']"), @@ -1638,6 +3499,15 @@ mod scanner { vec!["@source '**/*'", "@source not 'src/🤦‍♂️'"], ); + assert_snapshot!(tree, @" + . (git) + └── ✓ src + ├── ✓ 💩.js + ├── ✗ 🤦‍♂️ + │ └── ✗ foo.tsx + └── ✓ 🤦‍♂️.tsx + "); + assert_eq!( candidates, vec!["content-['src/💩.js']", "content-['src/🤦‍♂️.tsx']"] @@ -1674,6 +3544,23 @@ mod scanner { )]); 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']"] @@ -1685,6 +3572,23 @@ mod scanner { )]); 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']"] @@ -1696,6 +3600,23 @@ mod scanner { )]); 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']"] @@ -1713,11 +3634,14 @@ mod scanner { ], ); - // Create recursive symlinks - let _ = symlink(dir.join("a"), dir.join("b")); - let _ = symlink(dir.join("b/c"), dir.join("c")); - let _ = symlink(dir.join("b/root"), &dir); - let _ = symlink(dir.join("c"), dir.join("a")); + // 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(), @@ -1725,6 +3649,24 @@ mod scanner { )]); 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']"] @@ -1749,6 +3691,14 @@ mod scanner { )]); 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 @@ -1761,6 +3711,333 @@ mod scanner { 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(); @@ -1786,6 +4063,11 @@ mod scanner { ("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(), 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` +
+ `, + '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 be48a2ac4..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()) { @@ -372,6 +375,120 @@ describe.each([ }, ) + 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` +
+ `, + }, + }, + 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` +
+ `) + + 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` +
+ `, + '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` +
+ `, + '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`]) + }, + ) + test( 'production build (stdin)', { @@ -556,6 +673,15 @@ describe.each([ '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': '*', @@ -593,7 +719,7 @@ describe.each([ installDependencies: false, }, async ({ fs, root, exec }) => { - await exec(`pnpm install --ignore-workspace`, { + await exec(`pnpm install`, { cwd: path.join(root, 'home/project'), }) @@ -641,7 +767,7 @@ describe.each([ } } `, - 'ssrc/index.html': html` + 'src/index.html': html`
`, 'src/index.css': css` @@ -702,7 +828,7 @@ describe.each([ } } `, - 'ssrc/index.html': html` + 'src/index.html': html`
`, 'src/index.css': css` @@ -749,7 +875,7 @@ describe.each([ expect(map.at(4, 0)).toMatchObject({ source: null, original: '(none)', - generated: '}...', + generated: '}\n\n/*# sou...', }) }, ) @@ -768,7 +894,7 @@ describe.each([ } } `, - 'ssrc/index.html': html` + 'src/index.html': html`
`, 'src/index.css': css` @@ -809,11 +935,566 @@ describe.each([ 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` +
+ `, + '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` +
+ `) + + // 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` +
+ `, + '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` +
+ `) + + // 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` +
+ `, + '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; + } + " + `) }, ) }) @@ -1332,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` +
+ `, + + // 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` +
+ `, + + // Project C should apply auto source detection, therefore known + // extensions and folders should be included in the output. + 'project-c/src/index.html': html` +
+ `, + }, + }, + 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`
`, + 'project-b/ignored/ignored.html': html`
`, + 'project-b/ignored/except.html': html`
`, + }, + }, + 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`
`, + 'project-c/ignored/ignored.html': html`
`, + 'project-c/ignored/except.html': html`
`, + + // 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` +
+ `, + // 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` +
+ `, + }, + }, + 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` +
+ `, + // Included by the `!/public` pattern in `.gitignore` + // + // → Should be included + 'public/index.html': html` +
+ `, + // Ignored by the `/*` in `.gitignore` + // + // → Should be ignored + 'build/index.html': html` +
+ `, + // Ignored by the `/*` in `.gitignore` and the default `node_modules` rules + // + // → Should be ignored + 'node_modules/my-ui-lib/index.html': html` +
+ `, + }, + }, + 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`
`, + 'vendor/ignored/ignored.html': html`
`, + 'vendor/ignored/except.html': html`
`, + + // 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', { @@ -1680,6 +2749,49 @@ test( }, ) +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`
`, + }, + }, + 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)', { @@ -1783,8 +2895,8 @@ test( @layer theme, base, components, utilities; @layer theme { :root, :host { - --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-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace; --color-red-500: oklch(63.7% 0.237 25.331); @@ -1803,7 +2915,7 @@ test( line-height: 1.5; -webkit-text-size-adjust: 100%; tab-size: 4; - 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; @@ -1855,7 +2967,7 @@ test( border-color: inherit; border-collapse: collapse; } - :-moz-focusring { + :-moz-focusring:where(:not(iframe)) { outline: auto; } progress { @@ -2042,6 +3154,33 @@ test( }, ) +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 0597e247b..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', @@ -42,12 +42,86 @@ test( 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` +
+

Headline

+

+ 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. +

+
+ `, + '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', { @@ -117,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 @@ -207,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` +
+ `, + '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 07b8ebfee..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, js, 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', { @@ -122,7 +158,7 @@ test( }) }) `, - 'src/plugin.ts': js` + 'src/plugin.ts': ts` import plugin from 'tailwindcss/plugin' // Make sure all available JS APIs can be imported and used @@ -132,8 +168,7 @@ test( import defaultTheme from 'tailwindcss/defaultTheme' import * as pkg from 'tailwindcss/package.json' - export interface PluginOptions { - } + export interface PluginOptions {} export default plugin(function ({ addUtilities }) { addUtilities({ diff --git a/integrations/oxide/postinstall.test.ts b/integrations/oxide/postinstall.test.ts deleted file mode 100644 index 70683c82e..000000000 --- a/integrations/oxide/postinstall.test.ts +++ /dev/null @@ -1,73 +0,0 @@ -import fs from 'node:fs/promises' -import path from 'node:path' -import { js, json, test } from '../utils' - -test( - '@tailwindcss/oxide will fail when architecture-specific packages are missing', - { - fs: { - 'package.json': json` - { - "dependencies": { - "@tailwindcss/oxide": "workspace:^" - } - } - `, - 'test.js': js` - try { - let Scanner = require('@tailwindcss/oxide') - console.log('SUCCESS: @tailwindcss/oxide loaded successfully', Scanner) - } catch (error) { - console.log('FAILURE: Failed to load @tailwindcss/oxide:', error.message) - } - `, - }, - }, - async ({ exec, root, expect, fs }) => { - await removePlatformSpecificExtensions(path.join(root, 'node_modules')) - - // Get last published version - let version = (await exec('npm show @tailwindcss/oxide version')).trim() - // Ensure that we don't depend on a specific version number in the download - // script in case we bump the version number in the repository and CI is run - // before a release - let packageJson = JSON.parse(await fs.read('node_modules/@tailwindcss/oxide/package.json')) - packageJson.version = version - await fs.write( - 'node_modules/@tailwindcss/oxide/package.json', - JSON.stringify(packageJson, null, 2), - ) - - let opts = { - // Ensure that we don't include any node paths from the test runner - env: { NODE_PATH: '' }, - } - - expect(await exec('node test.js', opts)).toMatch(/FAILURE/) - - // Now run the post-install script - await exec('node node_modules/@tailwindcss/oxide/scripts/install.js', opts) - - expect(await exec('node test.js', opts)).toMatch(/SUCCESS/) - }, -) - -async function removePlatformSpecificExtensions(directory: string) { - let entries = await fs.readdir(directory, { withFileTypes: true }) - - for (let entry of entries) { - let fullPath = path.join(directory, entry.name) - - if (entry.name.startsWith('oxide-')) { - if (entry.isSymbolicLink()) { - await fs.unlink(fullPath) - } else if (entry.isFile()) { - await fs.unlink(fullPath) - } else if (entry.isDirectory()) { - await fs.rm(fullPath, { recursive: true, force: true }) - } - } else if (entry.isDirectory()) { - await removePlatformSpecificExtensions(fullPath) - } - } -} diff --git a/integrations/oxide/wasm.test.ts b/integrations/oxide/wasm.test.ts index 1cbdfce6e..2d63c707a 100644 --- a/integrations/oxide/wasm.test.ts +++ b/integrations/oxide/wasm.test.ts @@ -1,6 +1,6 @@ -import { css, js, json, test } from '../utils' +import { css, js, json, test, yaml } from '../utils' -// This test runs the wasm build using the `node:wasi` runtine. +// 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 @@ -57,3 +57,187 @@ testFn( `) }, ) + +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/package.json b/integrations/package.json index 6245abe3e..ae337b5e4 100644 --- a/integrations/package.json +++ b/integrations/package.json @@ -3,8 +3,9 @@ "version": "0.0.0", "private": true, "devDependencies": { - "dedent": "1.6.0", + "dedent": "catalog:", "fast-glob": "^3.3.3", - "source-map-js": "^1.2.1" + "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 dd07fd90e..80025f945 100644 --- a/integrations/postcss/index.test.ts +++ b/integrations/postcss/index.test.ts @@ -698,9 +698,7 @@ test(
`) - await process.onStderr((message) => - message.includes('does-not-exist is not exported from package'), - ) + await process.onStderr((message) => message.includes('"./does-not-exist" is not exported')) expect(await fs.dumpFiles('dist/*.css')).toMatchInlineSnapshot(` " @@ -743,9 +741,7 @@ test( `, ) - await process.onStderr((message) => - message.includes('does-not-exist is not exported from package'), - ) + await process.onStderr((message) => message.includes('"./does-not-exist" is not exported')) expect(await fs.dumpFiles('dist/*.css')).toMatchInlineSnapshot(` " @@ -825,3 +821,73 @@ test( }) }, ) + +test( + 'source(…) and `@source` are relative to the file they are in', + { + 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 './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` +
+ `, + + // 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` +
+ `, + + // Project C should apply auto source detection, therefore known + // extensions and folders should be included in the output. + 'project-c/src/index.html': html` +
+ `, + }, + }, + async ({ fs, exec, root, expect }) => { + await exec('pnpm postcss ./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']`) + }, +) diff --git a/integrations/postcss/next.test.ts b/integrations/postcss/next.test.ts index 969254a75..7fc0ccdcf 100644 --- a/integrations/postcss/next.test.ts +++ b/integrations/postcss/next.test.ts @@ -468,7 +468,7 @@ test( // the CSS await fetchStyles(url) - // At this point, no changes should triger a compile step. If we see any + // 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. // 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 ( + + {children} + + ) + } + `, + 'app/page.js': jsx` + export default function Page() { + return
Hello, Next.js!
+ } + `, + '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
Hello, Next.js!
+ } + `, + ) + + 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 75e21c590..efac411db 100644 --- a/integrations/upgrade/index.test.ts +++ b/integrations/upgrade/index.test.ts @@ -1,6 +1,6 @@ import path from 'node:path' import { isRepoDirty } from '../../packages/@tailwindcss-upgrade/src/utils/git' -import { candidate, css, html, js, json, test, ts, yaml } from '../utils' +import { candidate, css, html, js, json, test, ts, txt, yaml } from '../utils' test( 'error when no CSS file with @tailwind is used', @@ -28,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 @@ -100,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(` " @@ -158,7 +158,7 @@ test( }) // 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!`, @@ -171,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` +
+ `, + 'src/input.css': css` + @tailwind base; + @tailwind components; + @tailwind utilities; + `, + 'templates/email.php': html` +
+ `, + '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 --- +
+ + --- templates/email.php --- +
+ " + `) + }, +) + 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` { @@ -210,7 +263,7 @@ test( }, }, async ({ exec, fs, expect }) => { - await exec('npx @tailwindcss/upgrade') + await exec('pnpm exec upgrade') expect(await fs.dumpFiles('./src/**/*.{css,html}')).toMatchInlineSnapshot(` " @@ -282,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(` " @@ -354,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(` " @@ -431,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(` " @@ -534,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(` " @@ -601,6 +654,7 @@ test( test( 'migrates a simple postcss setup', { + timeout: 120_000, fs: { 'package.json': json` { @@ -641,7 +695,7 @@ test( }, }, async ({ exec, fs, expect }) => { - await exec('npx @tailwindcss/upgrade') + await exec('pnpm exec upgrade') await fs.expectFileToContain( 'postcss.config.js', @@ -712,7 +766,7 @@ 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) @@ -759,7 +813,7 @@ 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) @@ -772,6 +826,7 @@ test( test( 'migrates a postcss setup using package.json config', { + timeout: 120_000, fs: { 'package.json': json` { @@ -810,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( @@ -845,6 +900,7 @@ test( test( 'migrates a postcss setup using a json based config file', { + timeout: 120_000, fs: { 'package.json': json` { @@ -885,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( @@ -952,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(` " @@ -999,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(` " @@ -1043,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(` " @@ -1113,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(` " @@ -1224,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(` " @@ -1359,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./, @@ -1483,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(` " @@ -1708,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:') @@ -1780,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(` " @@ -1916,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(` " @@ -2036,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(` " @@ -2116,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(` " @@ -2198,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(` " @@ -2254,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')) @@ -2333,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(` @@ -2345,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); @@ -2432,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(` @@ -2499,7 +2557,7 @@ test( @import './utilities.css'; @import './generated/ignore-me.css'; `, - 'src/generated/.gitignore': ` + 'src/generated/.gitignore': txt` * !.gitignore `, @@ -2539,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(` " @@ -2665,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(` " @@ -2678,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%" @@ -2751,7 +2809,7 @@ test( }, }, async ({ exec, fs, expect }) => { - await exec('npx @tailwindcss/upgrade') + await exec('pnpm exec upgrade') expect(await fs.dumpFiles('./src/**/*.{css,html}')).toMatchInlineSnapshot(` " @@ -2759,7 +2817,7 @@ test( 
--- ./src/input.css --- - @import 'tailwindcss'; + @import 'tailwindcss'; /* The default border color has changed to \`currentcolor\` in Tailwind CSS v4, @@ -2818,8 +2876,8 @@ test( `, }, }, - async ({ exec, fs, expect }) => { - await exec('npx @tailwindcss/upgrade') + async ({ exec, root, fs, expect }) => { + await exec('pnpm exec upgrade') let before = await fs.dumpFiles('./src/**/*.{css,html}') expect(before).toMatchInlineSnapshot(` @@ -2855,13 +2913,13 @@ test( `) // Commit the changes - if (isRepoDirty()) { + if (isRepoDirty(root)) { await exec('git add .') await exec('git commit -m "upgrade"') } // Run the upgrade again - let output = await exec('npx @tailwindcss/upgrade') + 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}') @@ -2940,7 +2998,7 @@ test( }, }, async ({ exec, fs, expect }) => { - await exec('npx @tailwindcss/upgrade') + await exec('pnpm exec upgrade') expect(await fs.dumpFiles('./src/**/*.{css,html}')).toMatchInlineSnapshot(` " @@ -2968,6 +3026,202 @@ test( }, ) +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` +
+ `, + '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 --- +
+ + --- ./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` +
+ `, + + // Should be picked up by auto-content detection + 'templates/migrate-me.php': html` +
+ `, + + // 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` +
+ `, + }, + }, + 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 --- +
+ + --- ./src/migrate-me.less --- +
+ + --- ./templates/migrate-me.php --- +
+ " + `) + }, +) + +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` +
+ `, + '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': ` + 'this file should never be truncated', + ]; + `, + }, + }, + async ({ spawn, fs, expect }) => { + let repeatedCandidates = Array.from( + { length: 250 }, + () => '
', + ).join('\n') + + for (let i = 0; i < 100; i++) { + await fs.write( + `src/templates/template-${i}.php`, + ` ${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', { @@ -3011,7 +3265,7 @@ test( }, }, async ({ root, exec, fs, expect }) => { - let stdout = await exec('npx @tailwindcss/upgrade', { + let stdout = await exec('pnpm exec upgrade', { cwd: path.join(root, 'project-a'), }) @@ -3085,7 +3339,7 @@ test( }, }, async ({ exec, fs, expect }) => { - let stdout = await exec('npx @tailwindcss/upgrade') + let stdout = await exec('pnpm exec upgrade') expect(stdout).not.toContain( 'Running this command will add the dependency to the workspace root', @@ -3117,6 +3371,61 @@ test( }, ) +// 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`
Hi
`, + + // 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 + + +

Astro

+ + + `, + '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` + + + + +
Hello, world!
+ + `, + 'project-a/src/index.css': css` + @reference 'tailwindcss/theme'; + @import 'tailwindcss/utilities'; + @source '../../project-b/src/**/*.html'; + `, + 'project-b/src/index.html': html` +
+ `, + }, + }, + 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 { + 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(/]*\ssrc="([^"]+)"/g), + ...html.matchAll(/]*\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` + + + + +
Hello, world!
+ + `, + ) + + await fs.write('project-b/src/index.html', html` +
+ `) + + 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/index.test.ts b/integrations/vite/index.test.ts index 3afb057c5..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, @@ -293,6 +294,113 @@ describe.each(['postcss', 'lightningcss'])('%s', (transformer) => { }, ) + // 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` + + + + +
Hello, world!
+ + `, + + // 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` +
+ Hello, world! +
+ `, + }, + }, + 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` +
+ Hello, world! +
+ `, + ) + + let styles = await fetchStyles(url) + expect(styles).toContain(candidate`underline`) + expect(styles).toContain(candidate`content-['v1']`) + expect(styles).toContain(candidate`content-['v2']`) + }) + }, + ) + test( 'watch mode', { @@ -472,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` + + + + + +
+ + + + `, + '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` +
+ `, + }, + }, + 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`
`, + ) + + // 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` + + + + + +
+ + + + `, + '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` +
+ `, + 'project-a/src/comp-a.custom': html` +
+ `, + 'project-a/src/comp-b.custom': html` +
+ `, + 'project-a/src/lazy.tsx': jsx` + export default function Lazy() { + return
+ } + `, + '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` +
+ `, + }, + }, + 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
+ } + `, + ) + + 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`
`, + ) + + 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`
`, + ) + + 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`, { @@ -724,12 +1178,92 @@ 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` + + + + + `, + '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` +
+ `, + + // 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` +
+ `, + + // Project C should apply auto source detection, therefore known + // extensions and folders should be included in the output. + 'project-c/src/index.html': html` +
+ `, + }, + }, + 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( @@ -898,6 +1432,14 @@ test( `, '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 }) => { @@ -914,3 +1456,271 @@ test( 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` + + + + +
Hello, world!
+ + `, + '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, '-.css')) + .toMatchInlineSnapshot(` + " + --- dist/assets/index-.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` + + + + +
Hello, world!
+ + `, + '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, '-.css')) + .toMatchInlineSnapshot(` + " + --- dist/assets/index-.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` +
+ `, + '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` + +
+ + + `, + '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` + + + + `, + }, + }, + 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/nuxt.test.ts b/integrations/vite/nuxt.test.ts index 084e319d7..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,13 +18,18 @@ const SETUP = { "type": "module", "dependencies": { "@tailwindcss/vite": "workspace:^", - "nuxt": "3.14.0", + "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' @@ -79,7 +95,8 @@ test('build', SETUP, async ({ spawn, exec, expect }) => { await exec('pnpm nuxt build') // The Nuxt preview server does not automatically assign a free port if 3000 // is taken, so we use a random port instead. - let process = await spawn(`pnpm nuxt preview --port 8724`, { + let port = await getRandomPort() + let process = await spawn(`pnpm nuxt preview --port ${port}`, { env: { TEST: 'false', NODE_ENV: 'development', 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` + + + + + +
+ + + + `, + 'src/main.tsx': ts` + import { render } from 'preact' + import { App } from './app' + + render(, document.getElementById('app')!) + `, + 'src/app.tsx': ts` + import { useState } from 'preact/hooks' + + export function App() { + const [count, setCount] = useState(0) + return ( + + ) + } + `, + '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 ( + + ) + } + `, + ) + + 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/react-router.test.ts b/integrations/vite/react-router.test.ts index 5b9574fd6..98b0c928d 100644 --- a/integrations/vite/react-router.test.ts +++ b/integrations/vite/react-router.test.ts @@ -102,13 +102,101 @@ test('dev mode', { fs: WORKSPACE }, async ({ fs, spawn, expect }) => { }) }) +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 ( +
+

{loaderData.message}

+ +
+ ) + } + `, + '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) + let match = /\[react-router-serve\]\s*(http.*) \/?/.exec(m) if (match) url = match[1] return url != '' }) diff --git a/integrations/vite/resolvers.test.ts b/integrations/vite/resolvers.test.ts index f8e389a7e..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` + + + + +
Hello, world!
+ + `, + '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` + + + + +
Hello, world!
+ + `, + '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` + + + + +
Hello, world!
+ + `, + '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` + + + + +
Hello, world!
+ + `, + '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` + + + + + +
Hello, world!
+ + + `, + '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` + + + + + +
Hello, world!
+ + + `, + '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` + + + + + + + + + `, + '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` + + + + + + + `, + '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, '-.css'), + ).toMatchInlineSnapshot(` + " + --- ./dist/assets/index-.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` + + + + + + + `, + '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, '-.css'), + ).toMatchInlineSnapshot(` + " + --- ./dist/assets/index-.css --- + @layer base { + .do-include-me { + color: green; + } + } + " + `) + }, +) describe.each(['postcss', 'lightningcss'])('%s', (transformer) => { test( diff --git a/integrations/vite/source-maps.test.ts b/integrations/vite/source-maps.test.ts index 0e2594690..fe26d9a7c 100644 --- a/integrations/vite/source-maps.test.ts +++ b/integrations/vite/source-maps.test.ts @@ -91,3 +91,67 @@ test( }) }, ) + +// 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` + + +
Hello, world!
+ + `, + '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 75442cfa2..a1d660816 100644 --- a/integrations/vite/ssr.test.ts +++ b/integrations/vite/ssr.test.ts @@ -1,168 +1,72 @@ +import { describe } from 'vitest' import { candidate, css, html, json, test, ts } from '../utils' -const WORKSPACE = { - 'index.html': html` - -
- - - `, - 'src/index.css': css`@import 'tailwindcss';`, - 'src/index.ts': ts` - import './index.css' - - document.querySelector('#app').innerHTML = \` -
Hello, world!
- \` - `, - 'server.ts': ts` - import css from './src/index.css?url' - - document.querySelector('#app').innerHTML = \` - -
Hello, world!
- \` - `, -} - -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()], - }) - `, - ...WORKSPACE, + export default defineConfig({ + build: { + cssMinify: false, + ssrEmitAssets: true, + }, + plugins: [tailwindcss()], + }) + `, + 'index.html': html` + +
+ + + `, + 'src/index.css': css`@import 'tailwindcss';`, + 'src/index.ts': ts` + import './index.css' + + document.querySelector('#app').innerHTML = \` +
Hello, world!
+ \` + `, + 'server.ts': ts` + import css from './src/index.css?url' + + document.querySelector('#app').innerHTML = \` + +
Hello, world!
+ \` + `, + }, }, - }, - 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`, - candidate`overline`, - candidate`m-3`, - ]) - }, -) - -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()], - }) - `, - ...WORKSPACE, + 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`, - candidate`overline`, - candidate`m-3`, - ]) - }, -) - -test( - `Vite 7`, - { - 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, - ssrEmitAssets: true, - }, - plugins: [tailwindcss()], - }) - `, - ...WORKSPACE, - }, - }, - 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`, - candidate`overline`, - candidate`m-3`, - ]) - }, -) + ) +}) diff --git a/integrations/vite/svelte.test.ts b/integrations/vite/svelte.test.ts index 107494207..e186c3f85 100644 --- a/integrations/vite/svelte.test.ts +++ b/integrations/vite/svelte.test.ts @@ -101,7 +101,7 @@ test( await fs.expectFileToContain(files[0][0], [ candidate`underline`, '.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\}/, + /\.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\{/, ]) 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` + + + + %sveltekit.head% + + +
%sveltekit.body%
+ + + `, + 'src/routes/+layout.svelte': html` + + + + `, + 'src/routes/+page.svelte': html` +
Hello, world!
+ `, + '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/vue.test.ts b/integrations/vite/vue.test.ts index 3fea0db9a..b04f57c6b 100644 --- a/integrations/vite/vue.test.ts +++ b/integrations/vite/vue.test.ts @@ -1,5 +1,5 @@ import { stripVTControlCharacters } from 'node:util' -import { candidate, html, json, test, ts } from '../utils' +import { candidate, css, fetchStyles, html, json, retryAssertion, test, ts } from '../utils' test( 'production build', @@ -73,6 +73,110 @@ test( }, ) +{ + const VUE_COMPONENT_COUNT = 1_000 + + let vueComponentsWithReferences = Object.fromEntries( + Array.from({ length: VUE_COMPONENT_COUNT }, (_, idx) => [ + `src/components/Component${idx}.vue`, + html` + + + + `, + ]), + ) + + 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) => ``, + ).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` + + + +
+ + + + `, + '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` + + + + `, + ...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`', { @@ -132,7 +236,7 @@ test( expect.assertions(1) try { - await exec('pnpm vite build') + await exec('pnpm vite build', {}, { ignoreStdErr: true }) } catch (error) { let [, message] = /error during build:([\s\S]*?)file:/g.exec( @@ -144,3 +248,133 @@ test( } }, ) + +// 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` + + + + + + +
+ + + + `, + '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` + + `, + + // 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` + + `, + }, + }, + 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` + + `, + ) + + 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/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` +
+ `, + '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` +
+ `, + '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` +
+ `) + 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` +
+ `, + '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` +
+ `, + '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` +
+ `, + '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 9d8653eff..7d41a469e 100644 --- a/package.json +++ b/package.json @@ -48,23 +48,17 @@ }, "license": "MIT", "devDependencies": { - "@playwright/test": "^1.55.0", + "@playwright/test": "^1.62.1", "@types/node": "catalog:", - "postcss": "8.5.6", + "postcss": "catalog:", "postcss-import": "^16.1.1", "prettier": "catalog:", - "prettier-plugin-embed": "^0.5.0", - "prettier-plugin-organize-imports": "^4.2.0", - "tsup": "^8.5.0", - "turbo": "^2.5.4", - "typescript": "^5.5.4", - "vitest": "^2.0.5" + "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.30.1": "patches/lightningcss@1.30.1.patch", - "@parcel/watcher@2.5.1": "patches/@parcel__watcher@2.5.1.patch" - } - } + "packageManager": "pnpm@11.9.0" } diff --git a/packages/@tailwindcss-browser/README.md b/packages/@tailwindcss-browser/README.md index 7d21bd883..5f532607d 100644 --- a/packages/@tailwindcss-browser/README.md +++ b/packages/@tailwindcss-browser/README.md @@ -13,10 +13,10 @@

- Build Status + Build Status Total Downloads - Latest Release - License + Latest Release + License

--- @@ -29,8 +29,8 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com). For help, discussion about best practices, or feature ideas: -[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions) +[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-browser/package.json b/packages/@tailwindcss-browser/package.json index 07f9ff67a..70af78c1e 100644 --- a/packages/@tailwindcss-browser/package.json +++ b/packages/@tailwindcss-browser/package.json @@ -1,6 +1,6 @@ { "name": "@tailwindcss/browser", - "version": "4.1.13", + "version": "4.3.3", "description": "A utility-first CSS framework for rapidly building custom user interfaces.", "license": "MIT", "main": "./dist/index.global.js", @@ -30,8 +30,8 @@ "access": "public" }, "devDependencies": { - "h3": "^1.15.4", - "listhen": "^1.9.0", + "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 index c3ad05b91..c6059dd82 100644 --- a/packages/@tailwindcss-browser/playwright.config.ts +++ b/packages/@tailwindcss-browser/playwright.config.ts @@ -14,7 +14,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('/')`. */ @@ -30,10 +30,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-browser/tests/ui.spec.ts b/packages/@tailwindcss-browser/tests/ui.spec.ts index 0b4484c6f..241322daa 100644 --- a/packages/@tailwindcss-browser/tests/ui.spec.ts +++ b/packages/@tailwindcss-browser/tests/ui.spec.ts @@ -9,6 +9,10 @@ test.beforeAll(async ({}, info) => { server = await createServer() }) +test.afterAll(async () => { + await server.close() +}) + test('basic', async ({ page }) => { await server.render({ page, @@ -166,6 +170,7 @@ async function createServer() { return { app, url: listener.url, + close: listener.close, render, } } diff --git a/packages/@tailwindcss-browser/tsup.config.ts b/packages/@tailwindcss-browser/tsup.config.ts index bb0ddc39c..10a73f2b7 100644 --- a/packages/@tailwindcss-browser/tsup.config.ts +++ b/packages/@tailwindcss-browser/tsup.config.ts @@ -13,4 +13,20 @@ export default defineConfig({ '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.ts b/packages/@tailwindcss-browser/vitest.config.mts similarity index 100% rename from packages/@tailwindcss-browser/vitest.config.ts rename to packages/@tailwindcss-browser/vitest.config.mts diff --git a/packages/@tailwindcss-cli/README.md b/packages/@tailwindcss-cli/README.md index 7d21bd883..5f532607d 100644 --- a/packages/@tailwindcss-cli/README.md +++ b/packages/@tailwindcss-cli/README.md @@ -13,10 +13,10 @@

- Build Status + Build Status Total Downloads - Latest Release - License + Latest Release + License

--- @@ -29,8 +29,8 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com). For help, discussion about best practices, or feature ideas: -[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions) +[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 9c56c758f..7fa5b5500 100644 --- a/packages/@tailwindcss-cli/package.json +++ b/packages/@tailwindcss-cli/package.json @@ -1,6 +1,6 @@ { "name": "@tailwindcss/cli", - "version": "4.1.13", + "version": "4.3.3", "description": "A utility-first CSS framework for rapidly building custom user interfaces.", "license": "MIT", "repository": { @@ -29,10 +29,10 @@ "access": "public" }, "dependencies": { - "@parcel/watcher": "^2.5.1", + "@parcel/watcher": "catalog:", "@tailwindcss/node": "workspace:*", "@tailwindcss/oxide": "workspace:*", - "enhanced-resolve": "^5.18.3", + "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 794b54ae3..ffef2ae8b 100644 --- a/packages/@tailwindcss-cli/src/commands/build/index.ts +++ b/packages/@tailwindcss-cli/src/commands/build/index.ts @@ -1,4 +1,3 @@ -import watcher from '@parcel/watcher' import { compile, env, @@ -21,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 { @@ -47,6 +48,12 @@ export function options() { alias: '-w', values: ['always'], }, + '--poll': { + type: 'boolean | number', + description: 'Use polling instead of filesystem events when watching', + default: false, + values: ['ms'], + }, '--minify': { type: 'boolean', description: 'Optimize and minify the output', @@ -66,23 +73,58 @@ export function options() { 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(fn: () => T): Promise { 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>) { - eprintln(header()) - eprintln() + if (!args['--silent']) eprintln(header()) + if (!args['--silent']) eprintln() using I = new Instrumentation() DEBUG && I.start('[@tailwindcss/cli] (initial build)') @@ -121,7 +163,17 @@ export async function handle(args: Result>) { // 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`) + 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) } @@ -144,6 +196,7 @@ export async function handle(args: Result>) { let previous = { css: '', optimizedCss: '', + output: null as string | null, } async function write( @@ -182,19 +235,36 @@ export async function handle(args: Result>) { 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'] && 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 = @@ -203,6 +273,7 @@ export async function handle(args: Result>) { 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') @@ -229,6 +300,24 @@ export async function handle(args: Result>) { 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') @@ -236,12 +325,16 @@ export async function handle(args: Result>) { } let [compiler, scanner] = await handleError(() => createCompiler(input, I)) + let cleanupWatchers: (() => Promise)[] = [] // Watch for changes - if (args['--watch']) { - let cleanupWatchers: (() => Promise)[] = [] + 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(watchDirectories(scanner), async function handle(files) { + 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. @@ -253,36 +346,15 @@ export async function handle(args: Result>) { // 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'] === '-' @@ -292,11 +364,23 @@ export async function handle(args: Result>) { @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() @@ -304,7 +388,7 @@ export async function handle(args: Result>) { // Setup new watchers DEBUG && I.start('Setup new watchers') - let newCleanupFunction = await createWatchers(watchDirectories(scanner), handle) + let newCleanupFunction = await createWatchers(await watchDirectories(scanner), handle) DEBUG && I.end('Setup new watchers') // Clear old watchers @@ -321,22 +405,22 @@ export async function handle(args: Result>) { if (args['--map']) { DEBUG && I.start('Build Source Map') - compiledMap = compiler.buildSourceMap() as any + 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 } @@ -346,7 +430,7 @@ export async function handle(args: Result>) { if (args['--map']) { DEBUG && I.start('Build Source Map') - compiledMap = compiler.buildSourceMap() as any + compiledMap = toSourceMap(compiler.buildSourceMap()) DEBUG && I.end('Build Source Map') } } @@ -354,13 +438,48 @@ export async function handle(args: Result>) { 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)}`) } }), ) @@ -398,10 +517,185 @@ export async function handle(args: Result>) { await write(output, map, args, I) let end = process.hrtime.bigint() - 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…`)}`) + } + } +} + +// 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 { + 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. @@ -463,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 @@ -497,6 +797,78 @@ async function createWatchers(dirs: string[], cb: (files: string[]) => void) { } } -function watchDirectories(scanner: Scanner) { - return [...new Set(scanner.normalizedSources.flatMap((globEntry) => globEntry.base))] +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) + } + + return { kind: 'incremental', changedFiles } +} + +function createPollingWatcher(cb: () => Promise, pollInterval: number) { + let disposed = false + let timer: ReturnType | 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 { + 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 { + 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((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 { + 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>, + input: string, +) { + let candidates = splitCandidates(input) + candidates = designSystem.canonicalizeCandidates(candidates, { + collapse: true, + logicalToPhysical: true, + }) + return defaultSort(designSystem.getClassOrder(candidates)).join(' ') +} + +function createCandidateGroupResult( + designSystem: Awaited>, + 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 a28132062..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)) } } } @@ -131,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 @@ -160,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 41807f174..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 && process.argv[2] === undefined) || 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 1306aa2f2..88b306b05 100644 --- a/packages/@tailwindcss-cli/src/utils/args.ts +++ b/packages/@tailwindcss-cli/src/utils/args.ts @@ -77,9 +77,17 @@ export function args(options: T, argv = process.argv.slice( let parsed = parse(argv) for (let key in parsed) { - if (parsed[key] === '__IO_DEFAULT_VALUE__') { - parsed[key] = '-' + 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 } = { 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 7d21bd883..5f532607d 100644 --- a/packages/@tailwindcss-node/README.md +++ b/packages/@tailwindcss-node/README.md @@ -13,10 +13,10 @@

- Build Status + Build Status Total Downloads - Latest Release - License + Latest Release + License

--- @@ -29,8 +29,8 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com). For help, discussion about best practices, or feature ideas: -[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions) +[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 8f9c2f44e..0eced7366 100644 --- a/packages/@tailwindcss-node/package.json +++ b/packages/@tailwindcss-node/package.json @@ -1,6 +1,6 @@ { "name": "@tailwindcss/node", - "version": "4.1.13", + "version": "4.3.3", "description": "A utility-first CSS framework for rapidly building custom user interfaces.", "license": "MIT", "repository": { @@ -19,29 +19,45 @@ ], "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": { - "@jridgewell/remapping": "^2.3.4", - "enhanced-resolve": "^5.18.3", - "jiti": "^2.5.1", + "@jridgewell/remapping": "^2.3.5", + "enhanced-resolve": "catalog:", + "jiti": "^2.7.0", "lightningcss": "catalog:", - "magic-string": "^0.30.18", + "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 5ce6299af..e5f8782c8 100644 --- a/packages/@tailwindcss-node/src/compile.ts +++ b/packages/@tailwindcss-node/src/compile.ts @@ -63,10 +63,9 @@ function createCompileOptions({ } } -async function ensureSourceDetectionRootExists( - compiler: { root: Awaited>['root'] }, - base: string, -) { +async function ensureSourceDetectionRootExists(compiler: { + root: Awaited>['root'] +}) { // Verify if the `source(…)` path exists (until the glob pattern starts) if (compiler.root && compiler.root !== 'none') { let globSymbols = /[*{]/ @@ -80,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 } @@ -165,17 +166,6 @@ async function loadStylesheet( onDependency(resolvedPath) - if (typeof globalThis.__tw_readFile === 'function') { - let file = await globalThis.__tw_readFile(resolvedPath, 'utf-8') - if (file) { - return { - path: resolvedPath, - base: path.dirname(resolvedPath), - content: file, - } - } - } - let file = await fsPromises.readFile(resolvedPath, 'utf-8') return { path: resolvedPath, @@ -204,7 +194,10 @@ async function importModule(path: string): Promise { } } -const modules = ['node_modules', ...(process.env.NODE_PATH ? [process.env.NODE_PATH] : [])] +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), 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 4bca0a5e1..9f2788933 100644 --- a/packages/@tailwindcss-node/src/index.cts +++ b/packages/@tailwindcss-node/src/index.cts @@ -1,6 +1,7 @@ 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' @@ -12,8 +13,14 @@ export { env } // 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 a5e7bf5b4..8eff1466a 100644 --- a/packages/@tailwindcss-node/src/index.ts +++ b/packages/@tailwindcss-node/src/index.ts @@ -1,6 +1,7 @@ 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' @@ -11,11 +12,16 @@ 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 d27858d88..e454e6744 100644 --- a/packages/@tailwindcss-node/src/instrumentation.ts +++ b/packages/@tailwindcss-node/src/instrumentation.ts @@ -13,6 +13,7 @@ export class Instrumentation implements Disposable { #timerStack: { id: string; label: string; namespace: string; value: bigint }[] = [] constructor( + private shouldReport = env.DEBUG, private defaultFlush = (message: string) => void process.stderr.write(`${message}\n`), ) {} @@ -48,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(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() @@ -100,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 index 0fc752102..2f0d39589 100644 --- a/packages/@tailwindcss-node/src/optimize.ts +++ b/packages/@tailwindcss-node/src/optimize.ts @@ -60,6 +60,21 @@ export function optimize( 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) { 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 index 3f02efb24..58b79cb25 100644 --- a/packages/@tailwindcss-node/src/source-maps.ts +++ b/packages/@tailwindcss-node/src/source-maps.ts @@ -6,6 +6,7 @@ export type { DecodedSource, DecodedSourceMap } export interface SourceMap { readonly raw: string readonly inline: string + comment(url: string): string } function serializeSourceMap(map: DecodedSourceMap): string { @@ -44,16 +45,16 @@ function serializeSourceMap(map: DecodedSourceMap): string { 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 tmp = '' - - tmp += '/*# sourceMappingURL=data:application/json;base64,' - tmp += Buffer.from(raw, 'utf-8').toString('base64') - tmp += ' */\n' - - return tmp + 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.ts b/packages/@tailwindcss-node/src/urls.ts index e35b9d280..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 = @@ -153,7 +154,7 @@ function skipUrlReplacer(rawUrl: string, aliases?: string[]) { return ( isExternalUrl(rawUrl) || isDataUrl(rawUrl) || - !rawUrl[0].match(/[\.a-zA-Z0-9_]/) || + !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-postcss/README.md b/packages/@tailwindcss-postcss/README.md index 1d0900f4a..3facf2887 100644 --- a/packages/@tailwindcss-postcss/README.md +++ b/packages/@tailwindcss-postcss/README.md @@ -13,10 +13,10 @@

- Build Status + Build Status Total Downloads - Latest Release - License + Latest Release + License

--- @@ -29,11 +29,11 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com). For help, discussion about best practices, or feature ideas: -[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions) +[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**. --- @@ -44,14 +44,14 @@ If you're interested in contributing to Tailwind CSS, please read our [contribut 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" +import tailwindcss from '@tailwindcss/postcss' export default { - plugins: [ - tailwindcss({ - base: path.resolve(__dirname, "./path) - }) - ] + plugins: [ + tailwindcss({ + base: path.resolve(__dirname, './path'), + }), + ], } ``` @@ -62,29 +62,29 @@ By default, this plugin detects whether or not the CSS is being built for produc If you want to always enable or disable Lightning CSS the `optimize` option may be used: ```js -import tailwindcss from "@tailwindcss/postcss" +import tailwindcss from '@tailwindcss/postcss' export default { - plugins: [ - tailwindcss({ - // Enable or disable Lightning CSS - optimize: false, - }) - ] + 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" +import tailwindcss from '@tailwindcss/postcss' export default { - plugins: [ - tailwindcss({ - optimize: { minify: false }, - }) - ] + plugins: [ + tailwindcss({ + optimize: { minify: false }, + }), + ], } ``` @@ -95,32 +95,17 @@ Our PostCSS plugin can rewrite `url(…)`s for you since it also handles `@impor 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" +import tailwindcss from '@tailwindcss/postcss' export default { - plugins: [ - tailwindcss({ - // Disable `url(…)` rewriting - transformAssetUrls: false, + plugins: [ + tailwindcss({ + // Disable `url(…)` rewriting + transformAssetUrls: false, - // Enable `url(…)` rewriting (the default) - transformAssetUrls: true, - }) - ] -} -``` - -You may also pass options to `optimize` to enable Lighting CSS but prevent minification: - -```js -import tailwindcss from "@tailwindcss/postcss" - -export default { - plugins: [ - tailwindcss({ - // Enables Lightning CSS but disables minification - optimize: { minify: false }, - }) - ] + // Enable `url(…)` rewriting (the default) + transformAssetUrls: true, + }), + ], } ``` diff --git a/packages/@tailwindcss-postcss/package.json b/packages/@tailwindcss-postcss/package.json index 21f69b7fd..891578509 100644 --- a/packages/@tailwindcss-postcss/package.json +++ b/packages/@tailwindcss-postcss/package.json @@ -1,6 +1,6 @@ { "name": "@tailwindcss/postcss", - "version": "4.1.13", + "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,22 +24,27 @@ }, "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:*", - "postcss": "^8.4.41", + "postcss": "catalog:", "tailwindcss": "workspace:*" }, "devDependencies": { "@types/node": "catalog:", "@types/postcss-import": "14.0.3", - "dedent": "1.6.0", + "dedent": "catalog:", "internal-example-plugin": "workspace:*", "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 8fdc0dbf7..05087fa39 100644 --- a/packages/@tailwindcss-postcss/src/__snapshots__/index.test.ts.snap +++ b/packages/@tailwindcss-postcss/src/__snapshots__/index.test.ts.snap @@ -1,7 +1,8 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = ` -"@layer properties { +" +@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; @@ -11,8 +12,10 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = ` @layer theme { :root, :host { - --font-sans: ui-sans-serif, system-ui, 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; + --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; --text-2xl: 1.5rem; --text-2xl--line-height: calc(2 / 1.5); @@ -41,7 +44,7 @@ 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; @@ -107,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; } @@ -302,5 +305,6 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = ` @property --tw-font-weight { syntax: "*"; inherits: false -}" +} +" `; diff --git a/packages/@tailwindcss-postcss/src/index.test.ts b/packages/@tailwindcss-postcss/src/index.test.ts index 593ef70cf..b393cc382 100644 --- a/packages/@tailwindcss-postcss/src/index.test.ts +++ b/packages/@tailwindcss-postcss/src/index.test.ts @@ -4,6 +4,7 @@ import { tmpdir } from 'node:os' import path from 'path' import postcss from 'postcss' 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. @@ -19,6 +20,16 @@ function inputCssFilePath() { const css = dedent +async function run(plugin: any, from: string, input: string): Promise { + 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 } }), @@ -26,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({ @@ -43,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), @@ -72,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; } @@ -81,7 +93,8 @@ test('output is optimized by Lightning CSS', async () => { .bar { color: red; } - }" + } + " `) }) @@ -100,10 +113,12 @@ test('@apply can be used without emitting the theme in the CSS file', async () = { from: inputCssFilePath() }, ) - expect(result.css.trim()).toMatchInlineSnapshot(` - ".foo { + expect(pretty(result.css)).toMatchInlineSnapshot(` + " + .foo { color: var(--color-red-500, oklch(63.7% .237 25.331)); - }" + } + " `) }) @@ -120,7 +135,7 @@ describe('processing without specifying a base path', () => { afterEach(() => unlink(filepath)) test('the current working directory is used by default', async () => { - const spy = vi.spyOn(process, 'cwd') + using spy = vi.spyOn(process, 'cwd') spy.mockReturnValue(dir) let processor = postcss([tailwindcss({ optimize: { minify: false } })]) @@ -140,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([ @@ -154,8 +181,9 @@ describe('plugins', () => { { from: inputCssFilePath() }, ) - expect(result.css.trim()).toMatchInlineSnapshot(` - ".underline { + expect(pretty(result.css)).toMatchInlineSnapshot(` + " + .underline { text-decoration-line: underline; } @@ -167,7 +195,8 @@ describe('plugins', () => { .hocus\\:underline:focus, .hocus\\:underline:hover { text-decoration-line: underline; - }" + } + " `) }) @@ -184,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; } @@ -197,7 +227,8 @@ describe('plugins', () => { .hocus\\:underline:focus, .hocus\\:underline:hover { text-decoration-line: underline; - }" + } + " `) }) @@ -214,8 +245,9 @@ describe('plugins', () => { { from: inputCssFilePath() }, ) - expect(result.css.trim()).toMatchInlineSnapshot(` - ".underline { + expect(pretty(result.css)).toMatchInlineSnapshot(` + " + .underline { text-decoration-line: underline; } @@ -227,7 +259,8 @@ describe('plugins', () => { .hocus\\:underline:focus, .hocus\\:underline:hover { text-decoration-line: underline; - }" + } + " `) }) }) @@ -250,10 +283,12 @@ 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; - }" + } + " `) }) @@ -275,12 +310,14 @@ test('handle CSS when only using a `@reference` (we should not bail early)', asy { from: inputCssFilePath() }, ) - expect(result.css.trim()).toMatchInlineSnapshot(` - "@media (min-width: 48rem) { + expect(pretty(result.css)).toMatchInlineSnapshot(` + " + @media (min-width: 48rem) { .foo { bar: baz; } - }" + } + " `) }) @@ -300,10 +337,12 @@ test('handle CSS when using a `@variant` using variants that do not rely on the { from: inputCssFilePath() }, ) - expect(result.css.trim()).toMatchInlineSnapshot(` - ".foo[data-is-hoverable] { + expect(pretty(result.css)).toMatchInlineSnapshot(` + " + .foo[data-is-hoverable] { bar: baz; - }" + } + " `) }) @@ -338,23 +377,29 @@ test('runs `Once` plugins in the right order', async () => { { from: inputCssFilePath() }, ) - expect(result.css.trim()).toMatchInlineSnapshot(` - ".custom-css { + 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(` - ".custom-css { + expect(pretty(after)).toMatchInlineSnapshot(` + " + .custom-css { color: red; - }" + } + " `) }) @@ -379,7 +424,7 @@ describe('concurrent builds', () => { afterEach(() => rm(dir, { recursive: true, force: true })) test('does experience a race-condition when calling the plugin two times for the same change', async () => { - const spy = vi.spyOn(process, 'cwd') + using spy = vi.spyOn(process, 'cwd') spy.mockReturnValue(dir) let from = path.join(dir, 'index.css') @@ -387,17 +432,7 @@ describe('concurrent builds', () => { let plugin = tailwindcss({ optimize: { minify: false } }) - async function run(input: string): Promise { - let ast = postcss.parse(input) - for (let runner of (plugin as any).plugins) { - if (runner.Once) { - await runner.Once(ast, { postcss, result: { opts: { from }, messages: [] } }) - } - } - return ast.toString() - } - - let result = await run(input) + let result = await run(plugin, from, input) expect(result).toContain('.underline') @@ -413,14 +448,51 @@ describe('concurrent builds', () => { `, ) - let promise1 = run(input) - let promise2 = run(input) + 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 } }), @@ -428,10 +500,12 @@ test('does not register the input file as a dependency, even if it is passed in let result = await processor.process(`@tailwind utilities`, { from: './input.css' }) - expect(result.css.trim()).toMatchInlineSnapshot(` - ".underline { + expect(pretty(result.css)).toMatchInlineSnapshot(` + " + .underline { text-decoration-line: underline; - }" + } + " `) // Check for dependency messages diff --git a/packages/@tailwindcss-postcss/src/index.ts b/packages/@tailwindcss-postcss/src/index.ts index 2ff4405b6..a4a8d9326 100644 --- a/packages/@tailwindcss-postcss/src/index.ts +++ b/packages/@tailwindcss-postcss/src/index.ts @@ -20,6 +20,7 @@ const DEBUG = env.DEBUG interface CacheEntry { mtimes: Map + inputCss: string compiler: null | ReturnType scanner: null | Scanner tailwindCssAst: AstNode[] @@ -34,6 +35,7 @@ function getContextFromCache(postcss: Postcss, inputFile: string, opts: PluginOp if (cache.has(key)) return cache.get(key)! let entry = { mtimes: new Map(), + inputCss: '', compiler: null, scanner: null, @@ -115,7 +117,7 @@ function tailwindcss(opts: PluginOptions = {}): AcceptedPlugin { } let context = getContextFromCache(postcss, inputFile, opts) - let inputBasePath = path.dirname(path.resolve(inputFile)) + 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. @@ -194,12 +196,22 @@ function tailwindcss(opts: PluginOptions = {}): AcceptedPlugin { 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 re-use the compiler if it was created during the + // 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 ) { 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 229a42a9e..24f8c93c7 100644 --- a/packages/@tailwindcss-standalone/package.json +++ b/packages/@tailwindcss-standalone/package.json @@ -1,6 +1,6 @@ { "name": "@tailwindcss/standalone", - "version": "4.1.13", + "version": "4.3.3", "private": true, "description": "Standalone CLI for Tailwind CSS", "license": "MIT", @@ -27,23 +27,23 @@ "dependencies": { "@tailwindcss/aspect-ratio": "^0.4.2", "@tailwindcss/cli": "workspace:*", - "@tailwindcss/forms": "^0.5.10", - "@tailwindcss/typography": "^0.5.16", + "@tailwindcss/forms": "^0.5.11", + "@tailwindcss/typography": "^0.5.20", "detect-libc": "1.0.3", - "enhanced-resolve": "^5.18.3", + "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.1", - "@parcel/watcher-darwin-x64": "^2.5.1", - "@parcel/watcher-linux-arm64-glibc": "^2.5.1", - "@parcel/watcher-linux-arm64-musl": "^2.5.1", - "@parcel/watcher-linux-x64-glibc": "^2.5.1", - "@parcel/watcher-linux-x64-musl": "^2.5.1", - "@parcel/watcher-win32-x64": "^2.5.1", - "@types/bun": "^1.2.20", - "bun": "^1.2.20", + "@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:", diff --git a/packages/@tailwindcss-standalone/scripts/build.ts b/packages/@tailwindcss-standalone/scripts/build.ts index f37bdfd20..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,76 +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 { - let cmd = $`bun build --compile --target=${triple} ./src/index.ts --outfile=${outfile} --env inline` +// 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', + }) - // This env var is used by our patched versions of Lightning CSS and Parcel Watcher to - // statically bundle the proper binaries for musl vs glibc - cmd = cmd.env({ - PLATFORM_LIBC: triple.includes('-musl') ? 'musl' : 'glibc', - }) - - return await cmd - } catch (err) { - if (i < 5) continue - - 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. We use baseline builds for all x64 platforms to ensure -// compatibility with older hardware. -let results = await Promise.all([ - build('bun-linux-arm64', './tailwindcss-linux-arm64'), - build('bun-linux-arm64-musl', './tailwindcss-linux-arm64-musl'), - - build('bun-linux-x64-baseline', './tailwindcss-linux-x64'), - build('bun-linux-x64-musl-baseline', './tailwindcss-linux-x64-musl'), - - build('bun-darwin-arm64', './tailwindcss-macos-arm64'), - build('bun-darwin-x64-baseline', './tailwindcss-macos-x64'), - - build('bun-windows-x64-baseline', './tailwindcss-windows-x64.exe'), -]) - // 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 be85729bb..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,15 +60,6 @@ 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 @@ -85,12 +75,10 @@ Bun.plugin({ '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/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'), } 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) + undefined | ((path: string, encoding: BufferEncoding) => Promise) declare var __tw_load: undefined | ((path: string) => Promise) 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 @@ +

+ + + + + Tailwind CSS + + +

+ +

+ A utility-first CSS framework for rapidly building custom user interfaces. +

+ +

+ Build Status + Total Downloads + Latest Release + License +

+ +--- + +## 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 + compiler: null | Awaited> + scanner: null | Scanner + candidates: Set + fullRebuildPaths: string[] +} + +const cache = new QuickLRU({ 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(), + compiler: null, + scanner: null, + candidates: new Set(), + fullRebuildPaths: [], + } + cache.set(key, entry) + return entry +} + +export default async function tailwindLoader( + this: LoaderContext, + source: string, +): Promise { + 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 7d21bd883..5f532607d 100644 --- a/packages/@tailwindcss-upgrade/README.md +++ b/packages/@tailwindcss-upgrade/README.md @@ -13,10 +13,10 @@

- Build Status + Build Status Total Downloads - Latest Release - License + Latest Release + License

--- @@ -29,8 +29,8 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com). For help, discussion about best practices, or feature ideas: -[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions) +[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 600c90ee4..e960d7677 100644 --- a/packages/@tailwindcss-upgrade/package.json +++ b/packages/@tailwindcss-upgrade/package.json @@ -1,6 +1,6 @@ { "name": "@tailwindcss/upgrade", - "version": "4.1.13", + "version": "4.3.3", "description": "A utility-first CSS framework for rapidly building custom user interfaces.", "license": "MIT", "repository": { @@ -29,26 +29,24 @@ "dependencies": { "@tailwindcss/node": "workspace:*", "@tailwindcss/oxide": "workspace:*", - "braces": "^3.0.3", - "dedent": "1.6.0", - "enhanced-resolve": "^5.18.3", - "globby": "^14.1.0", - "jiti": "^2.0.0-beta.3", + "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": "catalog:", "postcss-import": "^16.1.1", - "postcss-selector-parser": "^7.1.0", + "postcss-selector-parser": "^7.1.4", "prettier": "catalog:", - "semver": "^7.7.2", + "semver": "^7.8.5", "tailwindcss": "workspace:*", - "tree-sitter": "^0.22.4", + "tree-sitter": "^0.25.1", "tree-sitter-typescript": "^0.23.2" }, "devDependencies": { - "@types/braces": "^3.0.5", "@types/node": "catalog:", "@types/postcss-import": "^14.0.3", - "@types/semver": "^7.7.0" + "@types/semver": "^7.8.0" } } diff --git a/packages/@tailwindcss-upgrade/src/codemods/config/migrate-js-config.ts b/packages/@tailwindcss-upgrade/src/codemods/config/migrate-js-config.ts index 24afe56b8..6a451333e 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/config/migrate-js-config.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/config/migrate-js-config.ts @@ -237,16 +237,21 @@ async function migrateTheme( 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) { - themeSection.push(` ${escape(`--${property}`)}-*: initial;`) - } - } - 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};`) } } @@ -411,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))) { @@ -425,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') { diff --git a/packages/@tailwindcss-upgrade/src/codemods/config/migrate-postcss.ts b/packages/@tailwindcss-upgrade/src/codemods/config/migrate-postcss.ts index b44d1ea61..e16f52287 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/config/migrate-postcss.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/config/migrate-postcss.ts @@ -2,6 +2,7 @@ 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 { 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: @@ -50,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), ) @@ -76,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 @@ -136,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…') @@ -206,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 index c9af6a7a3..c7058df54 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/css/analyze.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/css/analyze.ts @@ -4,11 +4,14 @@ 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[]) { - let isIgnored = await isGitIgnored() +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)[] = [] let stylesheetsByFile = new DefaultMap((file) => { // We don't want to process ignored files (like node_modules) diff --git a/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-apply.test.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-apply.test.ts index d0b722c9c..9f6a92008 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-apply.test.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-apply.test.ts @@ -13,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 }, ) @@ -56,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` @@ -85,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:text-(--my-color) tw:bg-linear-to-t; }" `) -}) + }, +) diff --git a/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-layer-utilities.test.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-layer-utilities.test.ts index ba1d06947..e115951d3 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-layer-utilities.test.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-layer-utilities.test.ts @@ -39,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 () => { @@ -52,9 +52,11 @@ it('should migrate simple `@layer utilities` to `@utility`', async () => { } `), ).toMatchInlineSnapshot(` - "@utility foo { + " + @utility foo { color: red; - }" + } + " `) }) @@ -69,13 +71,15 @@ it('should split multiple selectors in separate utilities', async () => { } `), ).toMatchInlineSnapshot(` - "@utility foo { + " + @utility foo { color: red; } @utility bar { color: red; - }" + } + " `) }) @@ -99,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; - }" + } + " `) }) @@ -149,7 +155,8 @@ it('should leave non-class utilities alone', async () => { } `), ).toMatchInlineSnapshot(` - "@utility foo { + " + @utility foo { /* 2. */ /* 2.1. */ color: red; @@ -182,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 */ + } + " `) }) @@ -204,7 +262,8 @@ it('should migrate simple `@layer utilities` with nesting to `@utility`', async } `), ).toMatchInlineSnapshot(` - "@utility foo { + " + @utility foo { color: red; &:hover { @@ -214,7 +273,8 @@ it('should migrate simple `@layer utilities` with nesting to `@utility`', async &:focus { color: green; } - }" + } + " `) }) @@ -232,13 +292,15 @@ it('should migrate multiple simple `@layer utilities` to `@utility`', async () = } `), ).toMatchInlineSnapshot(` - "@utility foo { + " + @utility foo { color: red; } @utility bar { color: blue; - }" + } + " `) }) @@ -260,7 +322,8 @@ it('should not migrate Rules inside of Rules to a `@utility`', async () => { } `), ).toMatchInlineSnapshot(` - "@utility foo { + " + @utility foo { color: red; } @@ -270,7 +333,8 @@ it('should not migrate Rules inside of Rules to a `@utility`', async () => { .baz { color: green; } - }" + } + " `) }) @@ -286,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; } - }" + } + " `) }) @@ -314,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; } @@ -324,7 +391,8 @@ it('should migrate at-rules with multiple utilities and invert them', async () = @media (min-width: 640px) { color: blue; } - }" + } + " `) }) @@ -356,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; } @@ -384,7 +453,8 @@ it('should migrate deeply nested at-rules with multiple utilities and invert the } } } - }" + } + " `) }) @@ -398,11 +468,13 @@ it('should migrate classes with pseudo elements', async () => { } `), ).toMatchInlineSnapshot(` - "@utility no-scrollbar { + " + @utility no-scrollbar { &::-webkit-scrollbar { display: none; } - }" + } + " `) }) @@ -416,11 +488,13 @@ it('should migrate classes with attribute selectors', async () => { } `), ).toMatchInlineSnapshot(` - "@utility no-scrollbar { + " + @utility no-scrollbar { &[data-checked=''] { display: none; } - }" + } + " `) }) @@ -434,11 +508,13 @@ it('should migrate classes with element selectors', async () => { } `), ).toMatchInlineSnapshot(` - "@utility no-scrollbar { + " + @utility no-scrollbar { & main { display: none; } - }" + } + " `) }) @@ -452,11 +528,13 @@ it('should migrate classes attached to an element selector', async () => { } `), ).toMatchInlineSnapshot(` - "@utility no-scrollbar { + " + @utility no-scrollbar { &main { display: none; } - }" + } + " `) }) @@ -470,11 +548,13 @@ it('should migrate classes with id selectors', async () => { } `), ).toMatchInlineSnapshot(` - "@utility no-scrollbar { + " + @utility no-scrollbar { &#main { display: none; } - }" + } + " `) }) @@ -488,7 +568,8 @@ it('should migrate classes with another attached class', async () => { } `), ).toMatchInlineSnapshot(` - "@utility no-scrollbar { + " + @utility no-scrollbar { &.main { display: none; } @@ -498,7 +579,8 @@ it('should migrate classes with another attached class', async () => { &.no-scrollbar { display: none; } - }" + } + " `) }) @@ -512,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; } @@ -528,7 +611,8 @@ it('should migrate a selector with multiple classes to multiple @utility definit .foo .bar:hover &:focus { display: none; } - }" + } + " `) }) @@ -548,7 +632,8 @@ it('should merge `@utility` definitions with the same name', async () => { } `), ).toMatchInlineSnapshot(` - "@utility step { + " + @utility step { counter-increment: step; &:before { @@ -556,7 +641,8 @@ it('should merge `@utility` definitions with the same name', async () => { @apply ml-[-41px]; content: counter(step); } - }" + } + " `) }) @@ -570,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; } @@ -586,7 +673,8 @@ it('should not migrate nested classes inside a `:not(…)`', async () => { .foo .bar:not(.qux):has(&) { display: none; } - }" + } + " `) }) @@ -620,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) { @@ -659,7 +748,8 @@ it('should migrate advanced combinations', async () => { } } } - }" + } + " `) }) @@ -677,12 +767,15 @@ describe('comments', () => { } `), ).toMatchInlineSnapshot(` - "/* Start of utilities: */ + " + /* Start of utilities: */ + @utility foo { /* Utility #1 */ /* Declarations: */ color: red; - }" + } + " `) }) @@ -699,7 +792,9 @@ describe('comments', () => { } `), ).toMatchInlineSnapshot(` - "/* Start of utilities: */ + " + /* Start of utilities: */ + @utility foo { /* Foo & Bar */ & .bar { @@ -707,13 +802,15 @@ describe('comments', () => { color: red; } } + @utility bar { /* Foo & Bar */ .foo & { /* Declarations: */ color: red; } - }" + } + " `) }) @@ -733,7 +830,9 @@ describe('comments', () => { } `), ).toMatchInlineSnapshot(` - "/* Start of utilities: */ + " + /* Start of utilities: */ + @utility foo { /* Mobile only */ @media (width <= 640px) { @@ -741,7 +840,8 @@ describe('comments', () => { /* Declarations: */ color: red; } - }" + } + " `) }) @@ -780,7 +880,9 @@ describe('comments', () => { /* After */ `), ).toMatchInlineSnapshot(` - "/* Tailwind Utilities: */ + " + /* Tailwind Utilities: */ + @utility no-scrollbar { /* Chrome, Safari and Opera */ /* Second comment */ @@ -807,7 +909,8 @@ describe('comments', () => { .after { /* Inside */ } - /* After */" + /* After */ + " `) }) }) @@ -832,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; @@ -845,7 +949,8 @@ it('should not lose attribute selectors', async () => { } } } - }" + } + " `) }) @@ -863,11 +968,13 @@ describe('layered stylesheets', () => { layers: ['utilities'], }), ).toMatchInlineSnapshot(` - "@utility foo { + " + @utility foo { /* Utility #1 */ /* Declarations: */ color: red; - }" + } + " `) }) @@ -884,11 +991,13 @@ describe('layered stylesheets', () => { layers: ['components'], }), ).toMatchInlineSnapshot(` - "@utility foo { + " + @utility foo { /* Utility #1 */ /* Declarations: */ color: red; - }" + } + " `) }) @@ -905,11 +1014,13 @@ describe('layered stylesheets', () => { layers: ['foo'], }), ).toMatchInlineSnapshot(` - "/* Utility #1 */ + " + /* Utility #1 */ .foo { /* Declarations: */ color: red; - }" + } + " `) }) @@ -929,7 +1040,8 @@ describe('layered stylesheets', () => { layers: ['utilities'], }), ).toMatchInlineSnapshot(` - "@utility foo { + " + @utility foo { /* Utility #1 */ /* Declarations: */ color: red; @@ -937,7 +1049,8 @@ describe('layered stylesheets', () => { #main { color: red; - }" + } + " `) }) @@ -978,7 +1091,8 @@ describe('layered stylesheets', () => { layers: ['utilities'], }), ).toMatchInlineSnapshot(` - "@utility foo { + " + @utility foo { @layer utilities { @layer utilities { /* Utility #1 */ @@ -1011,7 +1125,8 @@ describe('layered stylesheets', () => { #secondary { color: red; - }" + } + " `) }) @@ -1028,11 +1143,13 @@ describe('layered stylesheets', () => { layers: ['utilities'], }), ).toMatchInlineSnapshot(` - "@import 'thing'; + " + @import 'thing'; @utility foo { color: red; - }" + } + " `) }) @@ -1049,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/css/migrate-at-layer-utilities.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-layer-utilities.ts index 9b03e9d16..6bcb72d47 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-layer-utilities.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-at-layer-utilities.ts @@ -1,4 +1,4 @@ -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' @@ -43,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) => { @@ -184,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() @@ -231,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() } @@ -261,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') + } } } @@ -316,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/css/migrate-media-screen.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-media-screen.ts index f4526209d..c10e9ee99 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/css/migrate-media-screen.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-media-screen.ts @@ -16,7 +16,7 @@ export function migrateMediaScreen({ if (!designSystem || !userConfig) return let { resolvedConfig } = resolveConfig(designSystem, [ - { base: '', config: userConfig, reference: false }, + { base: '', config: userConfig, reference: false, src: undefined }, ]) let screens = resolvedConfig?.theme?.screens || {} diff --git a/packages/@tailwindcss-upgrade/src/codemods/css/migrate-preflight.ts b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-preflight.ts index 0085a2fd9..d32d96979 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/css/migrate-preflight.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/css/migrate-preflight.ts @@ -5,6 +5,7 @@ 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 @@ -117,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 @@ -155,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/template/candidates.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/candidates.test.ts index 1054b56ec..2e4d150aa 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/template/candidates.test.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/template/candidates.test.ts @@ -1,5 +1,5 @@ import { __unstable__loadDesignSystem } from '@tailwindcss/node' -import { describe, expect, test } from 'vitest' +import { expect, test } from 'vitest' import { spliceChangesIntoString } from '../../utils/splice-changes-into-string' import { extractRawCandidates } from './candidates' @@ -82,116 +82,3 @@ test('replaces the right positions for a candidate', async () => { " `) }) - -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-[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))', - ], -] - -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]:'], -] - -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) => designSystem.printCandidate(c))) - - expect([...cleaned]).toEqual([result]) - }) -}) diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/candidates.ts b/packages/@tailwindcss-upgrade/src/codemods/template/candidates.ts index f873c1e10..88b1e4e03 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/template/candidates.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/template/candidates.ts @@ -1,5 +1,5 @@ import { Scanner } from '@tailwindcss/oxide' -import type { Candidate } from '../../../../tailwindcss/src/candidate' +import { cloneCandidate, type Candidate } from '../../../../tailwindcss/src/candidate' import type { DesignSystem } from '../../../../tailwindcss/src/design-system' export async function extractRawCandidates( @@ -18,7 +18,7 @@ export async function extractRawCandidates( // Create a basic stripped candidate without variants or important flag export function baseCandidate(candidate: T) { - let base = structuredClone(candidate) + let base = cloneCandidate(candidate) base.important = false base.variants = [] 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 index 8bcaf52f4..7cfb16c75 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/template/is-safe-migration.test.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/template/is-safe-migration.test.ts @@ -4,10 +4,22 @@ 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('@import "tailwindcss";', { - base: __dirname, - }) + 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'], @@ -36,6 +48,10 @@ describe('is-safe-migration', async () => { [`
\n`, 'shadow'], [`
\n`, 'shadow'], [`
\n`, 'shadow'], + [`
\n`, 'flex-grow'], + [`
\n`, 'flex-shrink'], + [`
\n`, 'flex-shrink'], + [`
\n`, 'flex-shrink'], // Next.js Image placeholder cases [``, 'blur'], @@ -79,7 +95,7 @@ describe('is-safe-migration', async () => { 'outline', ], [ - // As the last argument, but there is techinically another `"` on the same line + // As the last argument, but there is technically another `"` on the same line `function foo({ size = "1.25rem", digit, outline }): { return "foo" }`, 'outline', ], @@ -112,4 +128,27 @@ describe('is-safe-migration', async () => { }), ).toEqual(candidate) }) + + test.each([ + // Vue classes + [`
`, 'shadow', 'shadow-sm'], + [`
`, 'shadow', 'shadow-sm'], + [`
`, 'shadow', 'shadow-sm'], + [`
`, 'shadow', 'shadow-sm'], + + // React classes + [`
`, 'shadow', 'shadow-sm'], + [`
`, 'shadow', 'shadow-sm'], + + // Preact-style + [`
`, '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 index 7851db650..2c09f299f 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/template/is-safe-migration.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/template/is-safe-migration.ts @@ -5,18 +5,16 @@ import * as version from '../../utils/version' const LOGICAL_OPERATORS = ['&&', '||', '?', '===', '==', '!=', '!==', '>', '>=', '<', '<='] const CONDITIONAL_TEMPLATE_SYNTAX = [ - // Vue - /v-else-if=['"]$/, - /v-if=['"]$/, - /v-show=['"]$/, - /(?= 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, @@ -125,23 +155,6 @@ export function isSafeMigration( } } - 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: Require the candidate to be inside quotes let isQuoteBeforeCandidate = isMiddleOfString(currentLineBeforeCandidate) let isQuoteAfterCandidate = isMiddleOfString(currentLineAfterCandidate) @@ -220,6 +233,14 @@ 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 @@ -250,3 +271,97 @@ function isMiddleOfString(line: string): boolean { 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-utilities.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-utilities.test.ts deleted file mode 100644 index c0dbc7a07..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-utilities.test.ts +++ /dev/null @@ -1,349 +0,0 @@ -import { __unstable__loadDesignSystem } from '@tailwindcss/node' -import { describe, expect, test } from 'vitest' -import type { UserConfig } from '../../../../tailwindcss/src/compat/config/types' -import type { DesignSystem } from '../../../../tailwindcss/src/design-system' -import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map' -import { migrateArbitraryUtilities } from './migrate-arbitrary-utilities' -import { migrateArbitraryValueToBareValue } from './migrate-arbitrary-value-to-bare-value' -import { migrateDropUnnecessaryDataTypes } from './migrate-drop-unnecessary-data-types' -import { migrateOptimizeModifier } from './migrate-optimize-modifier' - -const designSystems = new DefaultMap((base: string) => { - return new DefaultMap((input: string) => { - return __unstable__loadDesignSystem(input, { base }) - }) -}) - -function migrate(designSystem: DesignSystem, userConfig: UserConfig | null, rawCandidate: string) { - for (let migration of [ - migrateArbitraryUtilities, - migrateDropUnnecessaryDataTypes, - migrateArbitraryValueToBareValue, - migrateOptimizeModifier, - ]) { - rawCandidate = migration(designSystem, userConfig, rawCandidate) - } - return rawCandidate -} - -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 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 static utility - // Map number to keyword-like value - ['leading-[1]', 'leading-none'], - - // 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 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'], - // 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:20px]', 'max-h-[20px]'], - - // Arbitrary property to bare value - ['[grid-column:2]', 'col-2'], - ['[grid-column:1234]', 'col-1234'], - - // 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'], - - // 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'], - - // 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%]'], - ])(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 = migrate(designSystem, {}, candidate) - expect(migrated).toEqual(result) - }) -}) - -const css = String.raw -test('migrate with custom static utility `@utility custom {…}`', async () => { - let candidate = '[--key:value]' - let result = 'custom' - - let input = css` - @import 'tailwindcss'; - @theme { - --*: initial; - } - @utility custom { - --key: value; - } - ` - let designSystem = await __unstable__loadDesignSystem(input, { - base: __dirname, - }) - - let migrated = migrate(designSystem, {}, candidate) - expect(migrated).toEqual(result) -}) - -test('migrate with custom functional utility `@utility custom-* {…}`', async () => { - let candidate = '[--key:value]' - let result = 'custom-value' - - let input = css` - @import 'tailwindcss'; - @theme { - --*: initial; - } - @utility custom-* { - --key: --value('value'); - } - ` - let designSystem = await __unstable__loadDesignSystem(input, { - base: __dirname, - }) - - let migrated = migrate(designSystem, {}, candidate) - expect(migrated).toEqual(result) -}) - -test('migrate with custom functional utility `@utility custom-* {…}` that supports bare values', async () => { - let candidate = '[tab-size:4]' - let result = 'tab-4' - - let input = css` - @import 'tailwindcss'; - @theme { - --*: initial; - } - @utility tab-* { - tab-size: --value(integer); - } - ` - let designSystem = await __unstable__loadDesignSystem(input, { - base: __dirname, - }) - - let migrated = migrate(designSystem, {}, candidate) - expect(migrated).toEqual(result) -}) - -test.each([ - ['[tab-size:0]', 'tab-0'], - ['[tab-size:4]', 'tab-4'], - ['[tab-size:8]', 'tab-github'], - ['tab-[0]', 'tab-0'], - ['tab-[4]', 'tab-4'], - ['tab-[8]', 'tab-github'], -])( - '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; - --tab-size-github: 8; - } - - @utility tab-* { - tab-size: --value(--tab-size, integer, [integer]); - } - ` - let designSystem = await __unstable__loadDesignSystem(input, { - base: __dirname, - }) - - let migrated = migrate(designSystem, {}, candidate) - expect(migrated).toEqual(expected) - }, -) - -describe.each([['@theme'], ['@theme inline']])('%s', (theme) => { - test.each([ - ['[color:CanvasText]', 'text-canvas'], - ['text-[CanvasText]', 'text-canvas'], - ])('migrate arbitrary value to theme value %s => %s', async (candidate, result) => { - let input = css` - @import 'tailwindcss'; - ${theme} { - --*: initial; - --color-canvas: CanvasText; - } - ` - let designSystem = await __unstable__loadDesignSystem(input, { - base: __dirname, - }) - - let migrated = migrate(designSystem, {}, candidate) - expect(migrated).toEqual(result) - }) - - // 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 %s => %s', async (candidate, result) => { - let input = css` - @import 'tailwindcss'; - ${theme} { - --*: initial; - --breakpoint-md: 48rem; - --container-3xl: 48rem; - } - ` - let designSystem = await __unstable__loadDesignSystem(input, { - base: __dirname, - }) - - let migrated = migrate(designSystem, {}, candidate) - expect(migrated).toEqual(result) - }) -}) - -test('migrate an arbitrary property without spaces, to a theme value with spaces (canonicalization)', async () => { - let candidate = 'font-[foo,bar,baz]' - let expected = 'font-example' - let input = css` - @import 'tailwindcss'; - @theme { - --*: initial; - --font-example: foo, bar, baz; - } - ` - let designSystem = await __unstable__loadDesignSystem(input, { - base: __dirname, - }) - - let migrated = migrate(designSystem, {}, candidate) - expect(migrated).toEqual(expected) -}) - -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') - } - test.each([ - // Default spacing scale - ['w-[64rem]', 'w-256', '0.25rem'], - - // Keep arbitrary value if units are different - ['w-[124px]', 'w-[124px]', '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, async (candidate, expected, spacing) => { - if (strategy === 'with-variant') { - candidate = `focus:${candidate}` - expected = `focus:${expected}` - } else if (strategy === 'important') { - candidate = `${candidate}!` - expected = `${expected}!` - } 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-')}` - expected = `tw:${expected.replaceAll('var(--', 'var(--tw-')}` - } - - let input = css` - @import 'tailwindcss' ${strategy === 'prefix' ? 'prefix(tw)' : ''}; - - @theme { - --*: initial; - --spacing: ${spacing}; - } - ` - let designSystem = await __unstable__loadDesignSystem(input, { - base: __dirname, - }) - - let migrated = migrate(designSystem, {}, candidate) - expect(migrated).toEqual(expected) - }) -}) diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-utilities.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-utilities.ts deleted file mode 100644 index 3007e18de..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-utilities.ts +++ /dev/null @@ -1,286 +0,0 @@ -import { printModifier, 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 * as ValueParser from '../../../../tailwindcss/src/value-parser' -import { dimensions } from '../../utils/dimension' -import type { Writable } from '../../utils/types' -import { baseCandidate, parseCandidate } from './candidates' -import { computeUtilitySignature, preComputedUtilities } from './signatures' - -const baseReplacementsCache = new DefaultMap>( - () => new Map(), -) - -const spacing = new DefaultMap | null>((ds) => { - let spacingMultiplier = ds.resolveThemeValue('--spacing') - if (spacingMultiplier === undefined) return null - - let parsed = dimensions.get(spacingMultiplier) - if (!parsed) return null - - let [value, unit] = parsed - - return new DefaultMap((input) => { - let parsed = dimensions.get(input) - if (!parsed) return null - - let [myValue, myUnit] = parsed - if (myUnit !== unit) return null - - return myValue / value - }) -}) - -export function migrateArbitraryUtilities( - designSystem: DesignSystem, - _userConfig: Config | null, - rawCandidate: string, -): string { - let utilities = preComputedUtilities.get(designSystem) - let signatures = computeUtilitySignature.get(designSystem) - - for (let readonlyCandidate of designSystem.parseCandidate(rawCandidate)) { - // We are only interested in arbitrary properties and arbitrary values - if ( - // Arbitrary property - readonlyCandidate.kind !== 'arbitrary' && - // Arbitrary value - !(readonlyCandidate.kind === 'functional' && readonlyCandidate.value?.kind === 'arbitrary') - ) { - continue - } - - // The below logic makes use of mutation. Since candidates in the - // DesignSystem are cached, we can't mutate them directly. - let candidate = structuredClone(readonlyCandidate) as Writable - - // Create a basic stripped candidate without variants or important flag. We - // will re-add those later but they are irrelevant for what we are trying to - // do here (and will increase cache hits because we only have to deal with - // the base utility, nothing more). - let targetCandidate = baseCandidate(candidate) - - let targetCandidateString = designSystem.printCandidate(targetCandidate) - if (baseReplacementsCache.get(designSystem).has(targetCandidateString)) { - let target = structuredClone( - baseReplacementsCache.get(designSystem).get(targetCandidateString)!, - ) - // Re-add the variants and important flag from the original candidate - target.variants = candidate.variants - target.important = candidate.important - - return designSystem.printCandidate(target) - } - - // Compute the signature for the target candidate - let targetSignature = signatures.get(targetCandidateString) - if (typeof targetSignature !== 'string') continue - - // Try a few options to find a suitable replacement utility - for (let replacementCandidate of tryReplacements(targetSignature, targetCandidate)) { - let replacementString = designSystem.printCandidate(replacementCandidate) - let replacementSignature = signatures.get(replacementString) - if (replacementSignature !== targetSignature) { - continue - } - - // Ensure that if CSS variables were used, that they are still used - if (!allVariablesAreUsed(designSystem, candidate, replacementCandidate)) { - continue - } - - replacementCandidate = structuredClone(replacementCandidate) - - // Cache the result so we can re-use this work later - baseReplacementsCache.get(designSystem).set(targetCandidateString, replacementCandidate) - - // Re-add the variants and important flag from the original candidate - replacementCandidate.variants = candidate.variants - replacementCandidate.important = candidate.important - - // Update the candidate with the new value - Object.assign(candidate, replacementCandidate) - - // We will re-print the candidate to get the migrated candidate out - return designSystem.printCandidate(candidate) - } - } - - return rawCandidate - - function* tryReplacements( - targetSignature: string, - candidate: Extract, - ): Generator { - // Find a corresponding utility for the same signature - let replacements = utilities.get(targetSignature) - - // Multiple utilities can map to the same signature. Not sure how to migrate - // this one so let's just skip it for now. - // - // TODO: Do we just migrate to the first one? - if (replacements.length > 1) 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 - - let spacingMultiplier = spacing.get(designSystem)?.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) { - 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 - ValueParser.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 ValueParser.ValueWalkAction.Stop - } - } - }) - - return isSafeMigration -} diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-value-to-bare-value.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-value-to-bare-value.test.ts deleted file mode 100644 index 45ab8bd2a..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-value-to-bare-value.test.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { __unstable__loadDesignSystem } from '@tailwindcss/node' -import { expect, test } from 'vitest' -import { migrateArbitraryValueToBareValue } from './migrate-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]'], - - // 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', - ], -])('%s => %s (%#)', async (candidate, result) => { - let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', { - base: __dirname, - }) - - expect(migrateArbitraryValueToBareValue(designSystem, {}, candidate)).toEqual(result) -}) diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-value-to-bare-value.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-value-to-bare-value.ts deleted file mode 100644 index 116888ca3..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-value-to-bare-value.ts +++ /dev/null @@ -1,180 +0,0 @@ -import { - parseCandidate, - type Candidate, - type NamedUtilityValue, -} from '../../../../tailwindcss/src/candidate' -import type { Config } from '../../../../tailwindcss/src/compat/plugin-api' -import type { DesignSystem } from '../../../../tailwindcss/src/design-system' -import { - isPositiveInteger, - isValidSpacingMultiplier, -} from '../../../../tailwindcss/src/utils/infer-data-type' -import { segment } from '../../../../tailwindcss/src/utils/segment' -import { walkVariants } from '../../utils/walk-variants' -import { computeUtilitySignature } from './signatures' - -export function migrateArbitraryValueToBareValue( - designSystem: DesignSystem, - _userConfig: Config | null, - rawCandidate: string, -): string { - let signatures = computeUtilitySignature.get(designSystem) - - for (let candidate of parseCandidate(rawCandidate, designSystem)) { - let clone = structuredClone(candidate) - let changed = false - - // Migrate arbitrary values to bare values - if (clone.kind === 'functional' && clone.value?.kind === 'arbitrary') { - let expectedSignature = signatures.get(rawCandidate) - if (expectedSignature !== null) { - for (let value of tryValueReplacements(clone)) { - let newSignature = signatures.get(designSystem.printCandidate({ ...clone, value })) - if (newSignature === expectedSignature) { - changed = true - clone.value = value - break - } - } - } - } - - for (let [variant] of walkVariants(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 ? designSystem.printCandidate(clone) : rawCandidate - } - - return rawCandidate -} - -// 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, - value: string = candidate.value?.value ?? '', - seen: Set = new Set(), -): Generator { - 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() - - // 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) - } -} diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-variants.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-variants.test.ts deleted file mode 100644 index 439082570..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-variants.test.ts +++ /dev/null @@ -1,158 +0,0 @@ -import { __unstable__loadDesignSystem } from '@tailwindcss/node' -import { describe, expect, test } from 'vitest' -import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map' -import { migrateArbitraryVariants } from './migrate-arbitrary-variants' - -const css = String.raw -const designSystems = new DefaultMap((base: string) => { - return new DefaultMap((input: string) => { - return __unstable__loadDesignSystem(input, { base }) - }) -}) - -describe.each([['default'], ['important'], ['prefix']].slice(0, 1))('%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; - } - ` - - 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'], - - // 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, async (candidate, result) => { - 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 = migrateArbitraryVariants(designSystem, {}, candidate) - expect(migrated).toEqual(result) - }) -}) - -test('unsafe migrations keep the candidate as-is', 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 result = '[&:hover]:flex' - let input = css` - @import 'tailwindcss'; - @theme { - --*: initial; - } - ` - - let designSystem = await designSystems.get(__dirname).get(input) - let migrated = migrateArbitraryVariants(designSystem, {}, candidate) - expect(migrated).toEqual(result) -}) - -test('make unsafe migration safe (1)', async () => { - // Overriding the `hover:` variant to only use a selector will make the - // migration safe. - let candidate = '[&:hover]:flex' - let result = 'hover:flex' - let input = css` - @import 'tailwindcss'; - @theme { - --*: initial; - } - @variant hover (&:hover); - ` - - let designSystem = await designSystems.get(__dirname).get(input) - let migrated = migrateArbitraryVariants(designSystem, {}, candidate) - expect(migrated).toEqual(result) -}) - -test('make unsafe migration safe (2)', 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 result = 'hover:flex' - let input = css` - @import 'tailwindcss'; - @theme { - --*: initial; - } - @variant hover { - &:hover { - @slot; - } - } - ` - - let designSystem = await designSystems.get(__dirname).get(input) - let migrated = migrateArbitraryVariants(designSystem, {}, candidate) - expect(migrated).toEqual(result) -}) - -test('custom selector-based variants', async () => { - let candidate = '[&.macos]:flex' - let result = 'is-macos:flex' - let input = css` - @import 'tailwindcss'; - @theme { - --*: initial; - } - @variant is-macos (&.macos); - ` - - let designSystem = await designSystems.get(__dirname).get(input) - let migrated = migrateArbitraryVariants(designSystem, {}, candidate) - expect(migrated).toEqual(result) -}) - -test('custom @media-based variants', async () => { - let candidate = '[@media(prefers-reduced-transparency:reduce)]:flex' - let result = 'transparency-safe:flex' - let input = css` - @import 'tailwindcss'; - @theme { - --*: initial; - } - @variant transparency-safe { - @media (prefers-reduced-transparency: reduce) { - @slot; - } - } - ` - - let designSystem = await designSystems.get(__dirname).get(input) - let migrated = migrateArbitraryVariants(designSystem, {}, candidate) - expect(migrated).toEqual(result) -}) diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-variants.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-variants.ts index a210b03d4..258ba1b33 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-variants.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-arbitrary-variants.ts @@ -1,17 +1,23 @@ +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 { replaceObject } from '../../utils/replace-object' -import type { Writable } from '../../utils/types' +import type { Writable } from '../../../../tailwindcss/src/types' +import { replaceObject } from '../../../../tailwindcss/src/utils/replace-object' import { walkVariants } from '../../utils/walk-variants' -import { computeVariantSignature, preComputedVariants } from './signatures' export function migrateArbitraryVariants( - designSystem: DesignSystem, + baseDesignSystem: DesignSystem, _userConfig: Config | null, rawCandidate: string, ): string { - let signatures = computeVariantSignature.get(designSystem) - let variants = preComputedVariants.get(designSystem) + 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 @@ -19,7 +25,7 @@ export function migrateArbitraryVariants( // The below logic makes use of mutation. Since candidates in the // DesignSystem are cached, we can't mutate them directly. - let candidate = structuredClone(readonlyCandidate) as Writable + let candidate = cloneCandidate(readonlyCandidate) as Writable for (let [variant] of walkVariants(candidate)) { if (variant.kind === 'compound') continue @@ -29,7 +35,11 @@ export function migrateArbitraryVariants( if (typeof targetSignature !== 'string') continue let foundVariants = variants.get(targetSignature) - if (foundVariants.length !== 1) continue + 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) diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-automatic-var-injection.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-automatic-var-injection.ts index 586d8091d..0ea3bd691 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-automatic-var-injection.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-automatic-var-injection.ts @@ -1,8 +1,9 @@ -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 type { Writable } from '../../../../tailwindcss/src/types' import * as ValueParser from '../../../../tailwindcss/src/value-parser' +import { walk, WalkAction } from '../../../../tailwindcss/src/walk' export function migrateAutomaticVarInjection( designSystem: DesignSystem, @@ -12,7 +13,7 @@ export function migrateAutomaticVarInjection( 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 let didChange = false diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-bare-utilities.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-bare-utilities.test.ts deleted file mode 100644 index 2a75b9208..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-bare-utilities.test.ts +++ /dev/null @@ -1,72 +0,0 @@ -import { __unstable__loadDesignSystem } from '@tailwindcss/node' -import { describe, expect, test } from 'vitest' -import type { UserConfig } from '../../../../tailwindcss/src/compat/config/types' -import type { DesignSystem } from '../../../../tailwindcss/src/design-system' -import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map' -import { migrateBareValueUtilities } from './migrate-bare-utilities' - -const css = String.raw - -const designSystems = new DefaultMap((base: string) => { - return new DefaultMap((input: string) => { - return __unstable__loadDesignSystem(input, { base }) - }) -}) - -function migrate(designSystem: DesignSystem, userConfig: UserConfig | null, rawCandidate: string) { - for (let migration of [migrateBareValueUtilities]) { - rawCandidate = migration(designSystem, userConfig, rawCandidate) - } - return rawCandidate -} - -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; - --aspect-video: 16 / 9; - --tab-size-github: 8; - } - - @utility tab-* { - tab-size: --value(--tab-size, integer); - } - ` - - test.each([ - // Built-in utility with bare value fraction - ['aspect-16/9', 'aspect-video'], - - // Custom utility with bare value integer - ['tab-8', 'tab-github'], - ])(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 = migrate(designSystem, {}, candidate) - expect(migrated).toEqual(result) - }) -}) diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-bare-utilities.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-bare-utilities.ts deleted file mode 100644 index 475720191..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-bare-utilities.ts +++ /dev/null @@ -1,122 +0,0 @@ -import { 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 type { Writable } from '../../utils/types' -import { baseCandidate, parseCandidate } from './candidates' -import { computeUtilitySignature, preComputedUtilities } from './signatures' - -const baseReplacementsCache = new DefaultMap>( - () => new Map(), -) - -export function migrateBareValueUtilities( - designSystem: DesignSystem, - _userConfig: Config | null, - rawCandidate: string, -): string { - let utilities = preComputedUtilities.get(designSystem) - let signatures = computeUtilitySignature.get(designSystem) - - for (let readonlyCandidate of designSystem.parseCandidate(rawCandidate)) { - // We are only interested in bare value utilities - if (readonlyCandidate.kind !== 'functional' || readonlyCandidate.value?.kind !== 'named') { - continue - } - - // The below logic makes use of mutation. Since candidates in the - // DesignSystem are cached, we can't mutate them directly. - let candidate = structuredClone(readonlyCandidate) as Writable - - // Create a basic stripped candidate without variants or important flag. We - // will re-add those later but they are irrelevant for what we are trying to - // do here (and will increase cache hits because we only have to deal with - // the base utility, nothing more). - let targetCandidate = baseCandidate(candidate) - - let targetCandidateString = designSystem.printCandidate(targetCandidate) - if (baseReplacementsCache.get(designSystem).has(targetCandidateString)) { - let target = structuredClone( - baseReplacementsCache.get(designSystem).get(targetCandidateString)!, - ) - // Re-add the variants and important flag from the original candidate - target.variants = candidate.variants - target.important = candidate.important - - return designSystem.printCandidate(target) - } - - // Compute the signature for the target candidate - let targetSignature = signatures.get(targetCandidateString) - if (typeof targetSignature !== 'string') continue - - // Try a few options to find a suitable replacement utility - for (let replacementCandidate of tryReplacements(targetSignature, targetCandidate)) { - let replacementString = designSystem.printCandidate(replacementCandidate) - let replacementSignature = signatures.get(replacementString) - if (replacementSignature !== targetSignature) { - continue - } - - replacementCandidate = structuredClone(replacementCandidate) - - // Cache the result so we can re-use this work later - baseReplacementsCache.get(designSystem).set(targetCandidateString, replacementCandidate) - - // Re-add the variants and important flag from the original candidate - replacementCandidate.variants = candidate.variants - replacementCandidate.important = candidate.important - - // Update the candidate with the new value - Object.assign(candidate, replacementCandidate) - - // We will re-print the candidate to get the migrated candidate out - return designSystem.printCandidate(candidate) - } - } - - return rawCandidate - - function* tryReplacements( - targetSignature: string, - candidate: Extract, - ): Generator { - // Find a corresponding utility for the same signature - let replacements = utilities.get(targetSignature) - - // Multiple utilities can map to the same signature. Not sure how to migrate - // this one so let's just skip it for now. - // - // TODO: Do we just migrate to the first one? - if (replacements.length > 1) 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 - } - } - } -} diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-bg-gradient.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-bg-gradient.test.ts deleted file mode 100644 index df0ca747b..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-bg-gradient.test.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { __unstable__loadDesignSystem } from '@tailwindcss/node' -import { expect, test } from 'vitest' -import { migrateBgGradient } from './migrate-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(migrateBgGradient(designSystem, {}, candidate)).toEqual(result) -}) diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-bg-gradient.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-bg-gradient.ts deleted file mode 100644 index ca81d4f4d..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-bg-gradient.ts +++ /dev/null @@ -1,26 +0,0 @@ -import type { Config } from '../../../../tailwindcss/src/compat/plugin-api' -import type { DesignSystem } from '../../../../tailwindcss/src/design-system' - -const DIRECTIONS = ['t', 'tr', 'r', 'br', 'b', 'bl', 'l', 'tl'] - -export function migrateBgGradient( - designSystem: DesignSystem, - _userConfig: Config | null, - 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 designSystem.printCandidate({ - ...candidate, - root: `bg-linear-to-${direction}`, - }) - } - } - return rawCandidate -} 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 index 2214a8366..9cfbc7de0 100644 --- 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 @@ -1,3 +1,4 @@ +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' @@ -15,7 +16,7 @@ export function migrateCamelcaseInNamedValue( for (let candidate of designSystem.parseCandidate(rawCandidate)) { if (candidate.kind !== 'functional') continue - let clone = structuredClone(candidate) + let clone = cloneCandidate(candidate) let didChange = false if ( diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-deprecated-utilities.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-deprecated-utilities.ts deleted file mode 100644 index 41fc3697b..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-deprecated-utilities.ts +++ /dev/null @@ -1,52 +0,0 @@ -import type { Config } from '../../../../tailwindcss/src/compat/plugin-api' -import type { DesignSystem } from '../../../../tailwindcss/src/design-system' -import type { Writable } from '../../utils/types' -import { baseCandidate, parseCandidate, printUnprefixedCandidate } from './candidates' -import { computeUtilitySignature } from './signatures' - -const DEPRECATION_MAP = new Map([['order-none', 'order-0']]) - -export async function migrateDeprecatedUtilities( - designSystem: DesignSystem, - _userConfig: Config | null, - rawCandidate: string, -): Promise { - let signatures = computeUtilitySignature.get(designSystem) - - for (let readonlyCandidate of designSystem.parseCandidate(rawCandidate)) { - // The below logic makes use of mutation. Since candidates in the - // DesignSystem are cached, we can't mutate them directly. - let candidate = structuredClone(readonlyCandidate) as Writable - - // Create a basic stripped candidate without variants or important flag. We - // will re-add those later but they are irrelevant for what we are trying to - // do here (and will increase cache hits because we only have to deal with - // the base utility, nothing more). - let targetCandidate = baseCandidate(candidate) - let targetCandidateString = printUnprefixedCandidate(designSystem, targetCandidate) - - let replacementString = DEPRECATION_MAP.get(targetCandidateString) ?? null - if (replacementString === null) return rawCandidate - - let legacySignature = signatures.get(targetCandidateString) - if (typeof legacySignature !== 'string') return rawCandidate - - let replacementSignature = signatures.get(replacementString) - if (typeof replacementSignature !== 'string') return rawCandidate - - // Not the same signature, not safe to migrate - if (legacySignature !== replacementSignature) return rawCandidate - - let [replacement] = parseCandidate(designSystem, replacementString) - - // Re-add the variants and important flag from the original candidate - return designSystem.printCandidate( - Object.assign(structuredClone(replacement), { - variants: candidate.variants, - important: candidate.important, - }), - ) - } - - return rawCandidate -} diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-drop-unnecessary-data-types.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-drop-unnecessary-data-types.test.ts deleted file mode 100644 index c0a8bda8f..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-drop-unnecessary-data-types.test.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { __unstable__loadDesignSystem } from '@tailwindcss/node' -import { describe, expect, test } from 'vitest' -import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map' -import { migrateDropUnnecessaryDataTypes } from './migrate-drop-unnecessary-data-types' - -const css = String.raw - -const designSystems = new DefaultMap((base: string) => { - return new DefaultMap((input: string) => { - return __unstable__loadDesignSystem(input, { base }) - }) -}) - -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; - } - ` - - test.each([ - // A color value can be inferred from the value - ['bg-[color:#008cc]', 'bg-[#008cc]'], - - // A position can be inferred from the value - ['bg-[position:123px]', 'bg-[123px]'], - - // A color is the default for `bg-*` - ['bg-(color:--my-value)', 'bg-(--my-value)'], - - // A position is not the default, so the `position` data type is kept - ['bg-(position:--my-value)', 'bg-(position:--my-value)'], - ])(testName, async (candidate, expected) => { - if (strategy === 'with-variant') { - candidate = `focus:${candidate}` - expected = `focus:${expected}` - } else if (strategy === 'important') { - candidate = `${candidate}!` - expected = `${expected}!` - } 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-')}` - expected = `tw:${expected.replaceAll('var(--', 'var(--tw-')}` - } - - let designSystem = await designSystems.get(__dirname).get(input) - - let migrated = migrateDropUnnecessaryDataTypes(designSystem, {}, candidate) - expect(migrated).toEqual(expected) - }) -}) diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-drop-unnecessary-data-types.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-drop-unnecessary-data-types.ts deleted file mode 100644 index ae32458ef..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-drop-unnecessary-data-types.ts +++ /dev/null @@ -1,30 +0,0 @@ -import type { Config } from '../../../../tailwindcss/src/compat/plugin-api' -import type { DesignSystem } from '../../../../tailwindcss/src/design-system' -import { computeUtilitySignature } from './signatures' - -export function migrateDropUnnecessaryDataTypes( - designSystem: DesignSystem, - _userConfig: Config | null, - rawCandidate: string, -): string { - let signatures = computeUtilitySignature.get(designSystem) - - for (let candidate of designSystem.parseCandidate(rawCandidate)) { - 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(rawCandidate) === signatures.get(replacement)) { - return replacement - } - } - } - - return rawCandidate -} diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-arbitrary-values.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-arbitrary-values.ts index 89afbb21e..2bd7d2fd5 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-arbitrary-values.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-arbitrary-values.ts @@ -1,4 +1,4 @@ -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' @@ -9,7 +9,7 @@ export function migrateLegacyArbitraryValues( 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] diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-classes.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-classes.ts index fa425574c..2b088aa2e 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-classes.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-legacy-classes.ts @@ -1,7 +1,7 @@ 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' @@ -59,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'], ]) @@ -100,7 +100,7 @@ export async function migrateLegacyClasses( // 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 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 index a4fda26ea..b1887ae0b 100644 --- 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 @@ -9,12 +9,17 @@ import { migrateModernizeArbitraryValues } from './migrate-modernize-arbitrary-v 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) } @@ -22,29 +27,6 @@ function migrate(designSystem: DesignSystem, userConfig: UserConfig | null, rawC } 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'], @@ -59,75 +41,16 @@ test.each([ ['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'], - - // 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'], ])('%s => %s (%#)', async (candidate, result) => { - let designSystem = await __unstable__loadDesignSystem('@import "tailwindcss";', { - base: __dirname, - }) + let designSystem = await __unstable__loadDesignSystem( + css` + @import 'tailwindcss'; + @theme { + --*: initial; + } + `, + { base: __dirname }, + ) expect(migrate(designSystem, {}, candidate)).toEqual(result) }) @@ -154,9 +77,15 @@ test.each([ ['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, - }) + 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 index 8c75587cd..91718b323 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-modernize-arbitrary-values.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-modernize-arbitrary-values.ts @@ -1,25 +1,19 @@ -import SelectorParser from 'postcss-selector-parser' -import { parseCandidate, type Variant } 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 { isPositiveInteger } from '../../../../tailwindcss/src/utils/infer-data-type' -import * as ValueParser from '../../../../tailwindcss/src/value-parser' -import { replaceObject } from '../../utils/replace-object' +import { replaceObject } from '../../../../tailwindcss/src/utils/replace-object' import { walkVariants } from '../../utils/walk-variants' -import { computeVariantSignature } from './signatures' export function migrateModernizeArbitraryValues( designSystem: DesignSystem, _userConfig: Config | null, rawCandidate: string, ): string { - let signatures = computeVariantSignature.get(designSystem) - for (let candidate of parseCandidate(rawCandidate, designSystem)) { - let clone = structuredClone(candidate) + let clone = cloneCandidate(candidate) let changed = false - for (let [variant, parent] of walkVariants(clone)) { + for (let [variant] of walkVariants(clone)) { // Forward modifier from the root to the compound variant if ( variant.kind === 'compound' && @@ -69,324 +63,6 @@ export function migrateModernizeArbitraryValues( } 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 - replaceObject(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 - replaceObject(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`. - replaceObject(variant, designSystem.parseVariant(`in-[${ast.toString()}]`)) - 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.nodes[0].nodes[0].type === 'tag' && - (ast.nodes[0].nodes[0].value.startsWith('@media') || - ast.nodes[0].nodes[0].value.startsWith('@supports')) - ) { - let targetSignature = signatures.get(designSystem.printVariant(variant)) - let parsed = ValueParser.parse(ast.nodes[0].toString().trim()) - let containsNot = false - ValueParser.walk(parsed, (node, { replaceWith }) => { - if (node.kind === 'word' && node.value === 'not') { - containsNot = true - replaceWith([]) - } - }) - - // Remove unnecessary whitespace - parsed = ValueParser.parse(ValueParser.toCss(parsed)) - ValueParser.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) { - changed = true - 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.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 === ':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()}]` - } - } - - // 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) continue - - // Add `not-` prefix - if (compoundNot) newVariant = `not-${newVariant}` - - let parsed = designSystem.parseVariant(newVariant) - if (parsed === null) continue - - // Update original variant - changed = true - replaceObject(variant, structuredClone(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-` - replaceObject(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-` - replaceObject(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 ? designSystem.printCandidate(clone) : rawCandidate diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-optimize-modifier.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-optimize-modifier.test.ts deleted file mode 100644 index 3b1459af8..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-optimize-modifier.test.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { __unstable__loadDesignSystem } from '@tailwindcss/node' -import { describe, expect, test } from 'vitest' -import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map' -import { migrateOptimizeModifier } from './migrate-optimize-modifier' - -const css = String.raw - -const designSystems = new DefaultMap((base: string) => { - return new DefaultMap((input: string) => { - return __unstable__loadDesignSystem(input, { base }) - }) -}) - -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; - --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, async (candidate, expected) => { - if (strategy === 'with-variant') { - candidate = `focus:${candidate}` - expected = `focus:${expected}` - } else if (strategy === 'important') { - candidate = `${candidate}!` - expected = `${expected}!` - } 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-')}` - expected = `tw:${expected.replaceAll('var(--', 'var(--tw-')}` - } - - let designSystem = await designSystems.get(__dirname).get(input) - - let migrated = migrateOptimizeModifier(designSystem, {}, candidate) - expect(migrated).toEqual(expected) - }) -}) diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-optimize-modifier.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-optimize-modifier.ts deleted file mode 100644 index f07b6680c..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-optimize-modifier.ts +++ /dev/null @@ -1,80 +0,0 @@ -import type { NamedUtilityValue } from '../../../../tailwindcss/src/candidate' -import type { Config } from '../../../../tailwindcss/src/compat/plugin-api' -import type { DesignSystem } from '../../../../tailwindcss/src/design-system' -import type { Writable } from '../../utils/types' -import { computeUtilitySignature } from './signatures' - -// Optimize the modifier -// -// E.g.: -// -// - `/[25%]` → `/25` -// - `/[100%]` → `/100` → -// - `/100` → -// -export function migrateOptimizeModifier( - designSystem: DesignSystem, - _userConfig: Config | null, - rawCandidate: string, -): string { - let signatures = computeUtilitySignature.get(designSystem) - - for (let readonlyCandidate of designSystem.parseCandidate(rawCandidate)) { - let candidate = structuredClone(readonlyCandidate) as Writable - if ( - (candidate.kind === 'functional' && candidate.modifier !== null) || - (candidate.kind === 'arbitrary' && candidate.modifier !== null) - ) { - let targetSignature = signatures.get(rawCandidate) - let modifier = candidate.modifier - let changed = false - - // 1. Try to drop the modifier entirely - if ( - targetSignature === - signatures.get(designSystem.printCandidate({ ...candidate, modifier: null })) - ) { - changed = true - candidate.modifier = null - } - - // 2. Try to remove the square brackets and the `%` sign - if (!changed) { - let newModifier: NamedUtilityValue = { - kind: 'named', - value: modifier.value.endsWith('%') ? modifier.value.slice(0, -1) : modifier.value, - fraction: null, - } - - if ( - targetSignature === - signatures.get(designSystem.printCandidate({ ...candidate, modifier: newModifier })) - ) { - changed = true - candidate.modifier = newModifier - } - } - - // 3. Try to remove the square brackets, but multiply by 100. E.g.: `[0.16]` -> `16` - if (!changed) { - let newModifier: NamedUtilityValue = { - kind: 'named', - value: `${parseFloat(modifier.value) * 100}`, - fraction: null, - } - - if ( - targetSignature === - signatures.get(designSystem.printCandidate({ ...candidate, modifier: newModifier })) - ) { - changed = true - candidate.modifier = newModifier - } - } - - return changed ? designSystem.printCandidate(candidate) : rawCandidate - } - } - - return rawCandidate -} diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-theme-to-var.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-theme-to-var.test.ts deleted file mode 100644 index e30109429..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-theme-to-var.test.ts +++ /dev/null @@ -1,195 +0,0 @@ -import { __unstable__loadDesignSystem } from '@tailwindcss/node' -import { expect, test } from 'vitest' -import { migrateThemeToVar } from './migrate-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:--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)]', '[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:--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-[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%,--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(migrateThemeToVar(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(migrateThemeToVar(designSystem, {}, '[--value:theme(spacing.1)]')).toEqual( - '[--value:--spacing(1)]', - ) - expect(migrateThemeToVar(designSystem, {}, '[--value:theme(spacing.2)]')).toEqual( - '[--value:var(--spacing-2)]', - ) - expect(migrateThemeToVar(designSystem, {}, '[--value:theme(spacing.miami)]')).toEqual( - '[--value:var(--spacing-miami)]', - ) - expect(migrateThemeToVar(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(migrateThemeToVar(designSystem, {}, '[--value:theme(spacing.1)]')).toEqual( - '[--value:var(--spacing-1)]', - ) - expect(migrateThemeToVar(designSystem, {}, '[--value:theme(spacing.2)]')).toEqual( - '[--value:var(--spacing-2)]', - ) - expect(migrateThemeToVar(designSystem, {}, '[--value:theme(spacing.3)]')).toEqual( - '[--value:theme(spacing.3)]', - ) -}) diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-theme-to-var.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-theme-to-var.ts index d6d862d62..e566e7d6e 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-theme-to-var.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-theme-to-var.ts @@ -1,12 +1,11 @@ -import { parseCandidate, type CandidateModifier } 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 { walkVariants } from '../../utils/walk-variants' +import { walk, WalkAction } from '../../../../tailwindcss/src/walk' export const enum Convert { All = 0, @@ -14,68 +13,6 @@ export const enum Convert { MigrateThemeOnly = 1 << 1, } -export function migrateThemeToVar( - designSystem: DesignSystem, - _userConfig: Config | null, - 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 walkVariants(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 ? designSystem.printCandidate(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) @@ -91,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 @@ -99,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 }) }) @@ -236,7 +173,7 @@ function substituteFunctionsInValue( ast: ValueParser.ValueAstNode[], handle: (value: string, fallback?: string) => string | null, ) { - ValueParser.walk(ast, (node, { parent, replaceWith }) => { + walk(ast, (node, ctx) => { if (node.kind === 'function' && node.value === 'theme') { if (node.nodes.length < 1) return @@ -274,10 +211,10 @@ function substituteFunctionsInValue( fallbackValues.length > 0 ? handle(path, ValueParser.toCss(fallbackValues)) : handle(path) if (replacement === null) return - if (parent) { - let idx = parent.nodes.indexOf(node) - 1 + { + let idx = ctx.index - 1 while (idx !== -1) { - let previous = parent.nodes[idx] + let previous = ctx.siblings[idx] // Skip the space separator if (previous.kind === 'separator' && previous.value.trim() === '') { idx -= 1 @@ -305,7 +242,7 @@ function substituteFunctionsInValue( } } - replaceWith(ValueParser.parse(replacement)) + return WalkAction.Replace(ValueParser.parse(replacement)) } }) diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-variant-order.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-variant-order.ts index fb5306caa..3fd84af7c 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate-variant-order.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate-variant-order.ts @@ -1,7 +1,8 @@ -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 { walk } from '../../../../tailwindcss/src/walk' import * as version from '../../utils/version' export function migrateVariantOrder( diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate.test.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate.test.ts index 1d81f9c6b..24bb3d5ef 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate.test.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate.test.ts @@ -61,9 +61,9 @@ describe.each([['default'], ['with-variant'], ['important'], ['prefix']])('%s', // 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-[0px]`. - ['mt-[0px]', 'mt-[0px]'], - ['-mt-[0px]', 'mt-[0px]'], + // 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 diff --git a/packages/@tailwindcss-upgrade/src/codemods/template/migrate.ts b/packages/@tailwindcss-upgrade/src/codemods/template/migrate.ts index 4763577c7..976c63a83 100644 --- a/packages/@tailwindcss-upgrade/src/codemods/template/migrate.ts +++ b/packages/@tailwindcss-upgrade/src/codemods/template/migrate.ts @@ -1,32 +1,28 @@ 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 { migrateArbitraryUtilities } from './migrate-arbitrary-utilities' -import { migrateArbitraryValueToBareValue } from './migrate-arbitrary-value-to-bare-value' -import { migrateArbitraryVariants } from './migrate-arbitrary-variants' import { migrateAutomaticVarInjection } from './migrate-automatic-var-injection' -import { migrateBareValueUtilities } from './migrate-bare-utilities' -import { migrateBgGradient } from './migrate-bg-gradient' import { migrateCamelcaseInNamedValue } from './migrate-camelcase-in-named-value' import { migrateCanonicalizeCandidate } from './migrate-canonicalize-candidate' -import { migrateDeprecatedUtilities } from './migrate-deprecated-utilities' -import { migrateDropUnnecessaryDataTypes } from './migrate-drop-unnecessary-data-types' 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 { migrateOptimizeModifier } from './migrate-optimize-modifier' import { migratePrefix } from './migrate-prefix' import { migrateSimpleLegacyClasses } from './migrate-simple-legacy-classes' -import { migrateThemeToVar } from './migrate-theme-to-var' import { migrateVariantOrder } from './migrate-variant-order' -import { computeUtilitySignature } from './signatures' export type Migration = ( designSystem: DesignSystem, @@ -38,30 +34,21 @@ export const DEFAULT_MIGRATIONS: Migration[] = [ migrateEmptyArbitraryValues, migratePrefix, migrateCanonicalizeCandidate, - migrateBgGradient, migrateSimpleLegacyClasses, migrateCamelcaseInNamedValue, migrateLegacyClasses, migrateMaxWidthScreen, - migrateThemeToVar, migrateVariantOrder, // Has to happen before migrations that modify variants migrateAutomaticVarInjection, migrateLegacyArbitraryValues, - migrateArbitraryUtilities, - migrateBareValueUtilities, - migrateDeprecatedUtilities, migrateModernizeArbitraryValues, - migrateArbitraryVariants, - migrateDropUnnecessaryDataTypes, - migrateArbitraryValueToBareValue, - migrateOptimizeModifier, ] -let migrateCached = new DefaultMap< - DesignSystem, - DefaultMap>> ->((designSystem) => { - return new DefaultMap((userConfig) => { +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 @@ -69,10 +56,13 @@ let migrateCached = new DefaultMap< 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-` // exists. - let signature = computeUtilitySignature.get(designSystem).get(rawCandidate) + let signature = designSystem.storage[UTILITY_SIGNATURE_KEY].get(options).get(rawCandidate) if (typeof signature !== 'string') return original return rawCandidate @@ -130,12 +120,18 @@ export default async function migrateContents( return spliceChangesIntoString(contents, changes) } -export async function migrate(designSystem: DesignSystem, userConfig: Config | null, file: string) { +export async function migrate( + designSystem: DesignSystem, + userConfig: Config | null, + file: string, +): Promise { 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)), - ) + 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/codemods/template/signatures.ts b/packages/@tailwindcss-upgrade/src/codemods/template/signatures.ts deleted file mode 100644 index 4c857fdf5..000000000 --- a/packages/@tailwindcss-upgrade/src/codemods/template/signatures.ts +++ /dev/null @@ -1,468 +0,0 @@ -import { substituteAtApply } from '../../../../tailwindcss/src/apply' -import { atRule, styleRule, toCss, walk, type AstNode } from '../../../../tailwindcss/src/ast' -import { printArbitraryValue } from '../../../../tailwindcss/src/candidate' -import * as SelectorParser from '../../../../tailwindcss/src/compat/selector-parser' -import { CompileAstFlags, type DesignSystem } from '../../../../tailwindcss/src/design-system' -import { ThemeOptions } from '../../../../tailwindcss/src/theme' -import { DefaultMap } from '../../../../tailwindcss/src/utils/default-map' -import { isValidSpacingMultiplier } from '../../../../tailwindcss/src/utils/infer-data-type' -import * as ValueParser from '../../../../tailwindcss/src/value-parser' -import { dimensions } from '../../utils/dimension' - -// 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 computeUtilitySignature = new DefaultMap< - DesignSystem, - DefaultMap ->((designSystem) => { - return new DefaultMap((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.None) - designSystem.compileAstNodes(candidate, CompileAstFlags.RespectImportant) - } - - substituteAtApply(ast, designSystem) - }) - - // We will be mutating the AST, so we need to clone it first to not affect - // the original AST - ast = structuredClone(ast) - - // 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. - walk(ast, (node, { replaceWith }) => { - // Optimize declarations - if (node.kind === 'declaration') { - if (node.value === undefined || node.property === '--tw-sort') { - replaceWith([]) - } - } - - // Replace special nodes with its children - else if (node.kind === 'context' || node.kind === 'at-root') { - replaceWith(node.nodes) - } - - // Remove comments - else if (node.kind === 'comment') { - replaceWith([]) - } - }) - - // 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. - walk(ast, (node) => { - // Handle declarations - if (node.kind === 'declaration' && node.value !== undefined) { - if (node.value.includes('var(')) { - let valueAst = ValueParser.parse(node.value) - - let seen = new Set() - ValueParser.walk(valueAst, (valueNode, { replaceWith }) => { - 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 - - // 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 - 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) { - replaceWith(ValueParser.parse(variableValue)) - } - } - } - }) - - // Replace the value with the new value - node.value = ValueParser.toCss(valueAst) - } - - // 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` - if (node.value.includes('calc')) { - let folded = false - let valueAst = ValueParser.parse(node.value) - ValueParser.walk(valueAst, (valueNode, { replaceWith }) => { - if (valueNode.kind !== 'function') return - if (valueNode.value !== 'calc') return - - // [ - // { 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' && valueNode.nodes[2].value !== '*') return - - let parsed = dimensions.get(valueNode.nodes[0].value) - if (parsed === null) return - - let [value, unit] = parsed - - let multiplier = Number(valueNode.nodes[4].value) - if (Number.isNaN(multiplier)) return - - folded = true - replaceWith(ValueParser.parse(`${value * multiplier}${unit}`)) - }) - - if (folded) { - node.value = ValueParser.toCss(valueAst) - } - } - - // 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) - } - }) - - // 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() - } - }) -}) - -// 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. -export const preComputedUtilities = new DefaultMap>( - (ds) => { - let signatures = computeUtilitySignature.get(ds) - let lookup = new DefaultMap(() => []) - - for (let [className, meta] of ds.getClassList()) { - let signature = signatures.get(className) - if (typeof signature !== 'string') continue - lookup.get(signature).push(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) - } - } - - 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 computeVariantSignature = new DefaultMap< - DesignSystem, - DefaultMap ->((designSystem) => { - return new DefaultMap((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' && node.params.includes(' ')) { - node.params = node.params.replaceAll(' ', '') - } - - // Style rules - else if (node.kind === 'rule') { - let selectorAst = SelectorParser.parse(node.selector) - let changed = false - SelectorParser.walk(selectorAst, (node, { replaceWith }) => { - if (node.kind === 'separator' && node.value !== ' ') { - node.value = node.value.trim() - 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 - replaceWith(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 - replaceWith(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) - } - } - }) - - // 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 preComputedVariants = new DefaultMap>( - (designSystem) => { - let signatures = computeVariantSignature.get(designSystem) - let lookup = new DefaultMap(() => []) - - // Actual static variants - for (let [root, variant] of designSystem.variants.entries()) { - if (variant.kind === 'static') { - let signature = signatures.get(root) - if (typeof signature !== 'string') continue - lookup.get(signature).push(root) - } - } - - return lookup - }, -) - -function temporarilyDisableThemeInline(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 - } - } -} diff --git a/packages/@tailwindcss-upgrade/src/index.ts b/packages/@tailwindcss-upgrade/src/index.ts index bab07bf16..d304bbe1f 100644 --- a/packages/@tailwindcss-upgrade/src/index.ts +++ b/packages/@tailwindcss-upgrade/src/index.ts @@ -1,9 +1,10 @@ #!/usr/bin/env node import { Scanner } from '@tailwindcss/oxide' -import { globby } from 'globby' +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 { migrateJsConfig } from './codemods/config/migrate-js-config' import { migratePostCSSConfig } from './codemods/config/migrate-postcss' @@ -18,10 +19,11 @@ import { prepareConfig } from './codemods/template/prepare-config' import { help } from './commands/help' import { Stylesheet } from './stylesheet' import { args, type Arg } from './utils/args' -import { isRepoDirty } from './utils/git' +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' }, @@ -41,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() @@ -58,6 +63,31 @@ async function run() { } } + 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( + [ + '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) + } + { // Stylesheet migrations @@ -69,6 +99,7 @@ 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 @@ -96,7 +127,7 @@ async function run() { // Analyze the stylesheets try { - await analyzeStylesheets(stylesheets) + await analyzeStylesheets(stylesheets, { base }) } catch (e: any) { error(`${e?.message ?? e}`, { prefix: '↳ ' }) } @@ -170,6 +201,13 @@ async function run() { } } + // 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()), @@ -224,7 +262,7 @@ 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: '↳ ' }) @@ -267,6 +305,8 @@ async function run() { 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 @@ -274,43 +314,123 @@ async function run() { return [] } - // No root specified, use the base directory + // 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 config = configBySheet.get(sheet) let scanner = new Scanner({ sources }) let filesToMigrate = [] + + let ignoredPaths = new Set() + 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((file) => - migrateTemplate(designSystem, config?.userConfig ?? null, file), - ), + 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))}`, + `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 ?? '', base))}`, - { - prefix: '↳ ', - }, + `Migrated templates for: ${highlight(relative(sheet.file ?? '', base))} (${changes} file${changes === 1 ? '' : 's'} changed)`, + { prefix: '↳ ' }, ) } } diff --git a/packages/@tailwindcss-upgrade/src/stylesheet.ts b/packages/@tailwindcss-upgrade/src/stylesheet.ts index 42cd1f3c6..573413262 100644 --- a/packages/@tailwindcss-upgrade/src/stylesheet.ts +++ b/packages/@tailwindcss-upgrade/src/stylesheet.ts @@ -265,23 +265,26 @@ export class Stylesheet { return false } + #compiler?: Promise> | null> + #designSystem?: Promise> | null> + async compiler(): Promise> | null> { if (!this.isTailwindRoot) return null if (!this.file) return null - return compileAst(postCssAstToCssAst(this.root), { + return (this.#compiler ??= compileAst(postCssAstToCssAst(this.root), { base: path.dirname(this.file), onDependency() {}, - }) + })) } async designSystem(): Promise> | null> { if (!this.isTailwindRoot) return null if (!this.file) return null - return __unstable__loadDesignSystem(this.root.toString(), { + return (this.#designSystem ??= __unstable__loadDesignSystem(this.root.toString(), { base: path.dirname(this.file), - }) + })) } [util.inspect.custom]() { 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/packages.ts b/packages/@tailwindcss-upgrade/src/utils/packages.ts index 65f823bec..461a6983a 100644 --- a/packages/@tailwindcss-upgrade/src/utils/packages.ts +++ b/packages/@tailwindcss-upgrade/src/utils/packages.ts @@ -24,6 +24,9 @@ const manifests = new DefaultMap((base) => { 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() 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/utils/version.ts b/packages/@tailwindcss-upgrade/src/utils/version.ts index 6794b1a81..27bc44f2b 100644 --- a/packages/@tailwindcss-upgrade/src/utils/version.ts +++ b/packages/@tailwindcss-upgrade/src/utils/version.ts @@ -1,3 +1,4 @@ +import { execSync } from 'node:child_process' import semver from 'semver' import { DefaultMap } from '../../../tailwindcss/src/utils/default-map' import { getPackageVersionSync } from './package-version' @@ -26,6 +27,37 @@ let cache = new DefaultMap((base) => { return tailwindVersion }) -function installedTailwindVersion(base = process.cwd()): string { +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/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 7d21bd883..1a5d25c73 100644 --- a/packages/@tailwindcss-vite/README.md +++ b/packages/@tailwindcss-vite/README.md @@ -13,10 +13,10 @@

- Build Status + Build Status Total Downloads - Latest Release - License + Latest Release + License

--- @@ -29,8 +29,48 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com). For help, discussion about best practices, or feature ideas: -[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions) +[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 fc0dc49be..821704a1d 100644 --- a/packages/@tailwindcss-vite/package.json +++ b/packages/@tailwindcss-vite/package.json @@ -1,6 +1,6 @@ { "name": "@tailwindcss/vite", - "version": "4.1.13", + "version": "4.3.3", "description": "A utility-first CSS framework for rapidly building custom user interfaces.", "license": "MIT", "repository": { @@ -37,6 +37,6 @@ "vite": "catalog:" }, "peerDependencies": { - "vite": "^5.2.0 || ^6 || ^7" + "vite": "^5.2.0 || ^6 || ^7 || ^8" } } diff --git a/packages/@tailwindcss-vite/src/index.ts b/packages/@tailwindcss-vite/src/index.ts index 00ba92db4..8fc660eaa 100644 --- a/packages/@tailwindcss-vite/src/index.ts +++ b/packages/@tailwindcss-vite/src/index.ts @@ -11,37 +11,158 @@ import { clearRequireCache } from '@tailwindcss/node/require-cache' import { Scanner } from '@tailwindcss/oxide' import fs from 'node:fs/promises' import path from 'node:path' -import type { Plugin, ResolvedConfig, ViteDevServer } from 'vite' +import type { Environment, InternalResolveOptions, Plugin, ResolvedConfig } from 'vite' +import * as vite from 'vite' const DEBUG = env.DEBUG const SPECIAL_QUERY_RE = /[?&](?:worker|sharedworker|raw|url)\b/ const COMMON_JS_PROXY_RE = /\?commonjs-proxy/ -const INLINE_STYLE_ID_RE = /[?&]index\=\d+\.css$/ +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)[], + 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>((env: string) => new Map()) let isSSR = false - let minify = false + let shouldOptimize = true + let minify = true - let roots: DefaultMap = 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) + function createRoot(env: Environment | null, id: string) { + type ResolveFn = (id: string, base: string) => Promise + + 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 + + // 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, + ): 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, config!.root, @@ -51,7 +172,7 @@ export default function tailwindcss(): Plugin[] { customCssResolver, customJsResolver, ) - }) + } return [ { @@ -59,14 +180,24 @@ export default function tailwindcss(): Plugin[] { 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 + + // 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 + } }, }, @@ -75,23 +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() - DEBUG && 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 + } - let result = await root.generate(src, (file) => this.addWatchFile(file), I) - if (!result) { - roots.delete(id) - return src - } - - DEBUG && I.end('[@tailwindcss/vite] Generate CSS (serve)') - return result + DEBUG && I.end('[@tailwindcss/vite] Generate CSS (serve)') + return result + }, }, }, @@ -100,30 +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() - DEBUG && I.start('[@tailwindcss/vite] Generate CSS (build)') + 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 + } + DEBUG && I.end('[@tailwindcss/vite] Generate CSS (build)') - let result = await root.generate(src, (file) => this.addWatchFile(file), I) - if (!result) { - roots.delete(id) - return src - } - 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') + } - DEBUG && I.start('[@tailwindcss/vite] Optimize CSS') - result = optimize(result.code, { - minify, - map: result.map, - }) - DEBUG && I.end('[@tailwindcss/vite] Optimize CSS') - - return result + return result + }, }, }, ] satisfies Plugin[] @@ -135,13 +292,15 @@ 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' || id.includes('&lang.css') || id.match(INLINE_STYLE_ID_RE)) && - // Don't intercept special static asset resources - !SPECIAL_QUERY_RE.test(id) && - !COMMON_JS_PROXY_RE.test(id) + let isCssFile = extension === 'css' || id.includes('&lang.css') || id.match(INLINE_STYLE_ID_RE) + return isCssFile } @@ -213,7 +372,7 @@ class Root { let inputPath = idToPath(this.id) function addWatchFile(file: string) { - // Don't watch the input file since it's already a dependency anc causes + // 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 @@ -223,7 +382,7 @@ class Root { // crash Vite. We work around this for now by ignoring updates to them. // // https://github.com/tailwindlabs/tailwindcss/issues/16877 - if (/[\#\?].*\.svg$/.test(file)) { + if (/[#?].*\.svg$/.test(file)) { return } _addWatchFile(file) @@ -283,7 +442,11 @@ class Root { if ( !( this.compiler.features & - (Features.AtApply | Features.JsPluginCompat | Features.ThemeFunction | Features.Utilities) + (Features.AtApply | + Features.JsPluginCompat | + Features.ThemeFunction | + Features.Utilities | + Features.Variants) ) ) { return false @@ -301,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) @@ -337,6 +501,7 @@ class Root { } } } + DEBUG && I.end('Register dependency messages') } DEBUG && I.start('Build CSS') 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 @@ +

+ + + + + Tailwind CSS + + +

+ +

+ A utility-first CSS framework for rapidly building custom user interfaces. +

+ +

+ Build Status + Total Downloads + Latest Release + License +

+ +--- + +## 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 + compiler: null | Awaited> + scanner: null | Scanner + candidates: Set + fullRebuildPaths: string[] +} + +const cache = new QuickLRU({ 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(), + compiler: null, + scanner: null, + candidates: new Set(), + fullRebuildPaths: [], + } + cache.set(key, entry) + return entry +} + +export default async function tailwindLoader( + this: LoaderContext, + source: string, +): Promise { + 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 7d21bd883..5f532607d 100644 --- a/packages/tailwindcss/README.md +++ b/packages/tailwindcss/README.md @@ -13,10 +13,10 @@

- Build Status + Build Status Total Downloads - Latest Release - License + Latest Release + License

--- @@ -29,8 +29,8 @@ For full documentation, visit [tailwindcss.com](https://tailwindcss.com). For help, discussion about best practices, or feature ideas: -[Discuss Tailwind CSS on GitHub](https://github.com/tailwindcss/tailwindcss/discussions) +[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 9ba48c6cb..d1288d6fa 100644 --- a/packages/tailwindcss/package.json +++ b/packages/tailwindcss/package.json @@ -1,6 +1,6 @@ { "name": "tailwindcss", - "version": "4.1.13", + "version": "4.3.3", "description": "A utility-first CSS framework for rapidly building custom user interfaces.", "license": "MIT", "repository": { @@ -127,12 +127,12 @@ "utilities.css" ], "devDependencies": { - "@jridgewell/remapping": "^2.3.4", + "@jridgewell/remapping": "^2.3.5", "@tailwindcss/oxide": "workspace:^", "@types/node": "catalog:", - "dedent": "1.6.0", + "dedent": "catalog:", "lightningcss": "catalog:", - "magic-string": "^0.30.18", + "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 753e79ef0..04e87905c 100644 --- a/packages/tailwindcss/preflight.css +++ b/packages/tailwindcss/preflight.css @@ -32,8 +32,13 @@ html, tab-size: 4; /* 3 */ 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', @@ -170,7 +175,7 @@ table { Use the modern Firefox focus style for all focusable elements. */ -:-moz-focusring { +:-moz-focusring:where(:not(iframe)) { outline: auto; } diff --git a/packages/tailwindcss/src/__snapshots__/index.test.ts.snap b/packages/tailwindcss/src/__snapshots__/index.test.ts.snap index 70060e1e1..9921709d7 100644 --- a/packages/tailwindcss/src/__snapshots__/index.test.ts.snap +++ b/packages/tailwindcss/src/__snapshots__/index.test.ts.snap @@ -1,7 +1,8 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[`compiling CSS > \`@tailwind utilities\` is replaced by utilities using the default theme 1`] = ` -"@layer properties { +" +@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; @@ -123,14 +124,18 @@ 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 { +" +@layer theme { :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-font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + --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); } @@ -155,7 +160,7 @@ exports[`compiling CSS > prefix all CSS variables inside preflight 1`] = ` -webkit-text-size-adjust: 100%; tab-size: 4; line-height: 1.5; - font-family: var(--tw-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(--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; @@ -221,7 +226,7 @@ exports[`compiling CSS > prefix all CSS variables inside preflight 1`] = ` border-collapse: collapse; } - :-moz-focusring { + :-moz-focusring:where(:not(iframe)) { outline: auto; } @@ -383,5 +388,6 @@ exports[`compiling CSS > prefix all CSS variables inside preflight 1`] = ` } } -@layer components, utilities;" +@layer components, utilities; +" `; diff --git a/packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap b/packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap index 86f96852c..d595e8c01 100644 --- a/packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap +++ b/packages/tailwindcss/src/__snapshots__/intellisense.test.ts.snap @@ -306,66 +306,6 @@ exports[`getClassList 1`] = ` "-col-start-11", "-col-start-12", "-col-start-13", - "-end-0", - "-end-0.5", - "-end-1", - "-end-1.5", - "-end-2", - "-end-2.5", - "-end-3", - "-end-3.5", - "-end-4", - "-end-5", - "-end-6", - "-end-7", - "-end-8", - "-end-9", - "-end-10", - "-end-11", - "-end-12", - "-end-14", - "-end-16", - "-end-20", - "-end-24", - "-end-28", - "-end-32", - "-end-36", - "-end-40", - "-end-44", - "-end-48", - "-end-52", - "-end-56", - "-end-60", - "-end-64", - "-end-72", - "-end-80", - "-end-96", - "-end-1/2", - "-end-1/3", - "-end-1/4", - "-end-1/5", - "-end-1/6", - "-end-1/12", - "-end-2/3", - "-end-2/4", - "-end-2/5", - "-end-2/6", - "-end-2/12", - "-end-3/4", - "-end-3/5", - "-end-3/6", - "-end-3/12", - "-end-4/5", - "-end-4/6", - "-end-4/12", - "-end-5/6", - "-end-5/12", - "-end-6/12", - "-end-7/12", - "-end-8/12", - "-end-9/12", - "-end-10/12", - "-end-11/12", "-end-full", "-end-px", "-indent-0", @@ -463,8 +403,256 @@ exports[`getClassList 1`] = ` "-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", @@ -739,6 +927,76 @@ exports[`getClassList 1`] = ` "-mb-80", "-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", @@ -1239,6 +1497,76 @@ exports[`getClassList 1`] = ` "-scroll-mb-80", "-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", @@ -1572,66 +1900,6 @@ exports[`getClassList 1`] = ` "-space-y-80", "-space-y-96", "-space-y-px", - "-start-0", - "-start-0.5", - "-start-1", - "-start-1.5", - "-start-2", - "-start-2.5", - "-start-3", - "-start-3.5", - "-start-4", - "-start-5", - "-start-6", - "-start-7", - "-start-8", - "-start-9", - "-start-10", - "-start-11", - "-start-12", - "-start-14", - "-start-16", - "-start-20", - "-start-24", - "-start-28", - "-start-32", - "-start-36", - "-start-40", - "-start-44", - "-start-48", - "-start-52", - "-start-56", - "-start-60", - "-start-64", - "-start-72", - "-start-80", - "-start-96", - "-start-1/2", - "-start-1/3", - "-start-1/4", - "-start-1/5", - "-start-1/6", - "-start-1/12", - "-start-2/3", - "-start-2/4", - "-start-2/5", - "-start-2/6", - "-start-2/12", - "-start-3/4", - "-start-3/5", - "-start-3/6", - "-start-3/12", - "-start-4/5", - "-start-4/6", - "-start-4/12", - "-start-5/6", - "-start-5/12", - "-start-6/12", - "-start-7/12", - "-start-8/12", - "-start-9/12", - "-start-10/12", - "-start-11/12", "-start-full", "-start-px", "-top-0", @@ -1954,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", @@ -1976,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", @@ -1998,6 +2268,7 @@ exports[`getClassList 1`] = ` "accent-transparent/90", "accent-transparent/95", "accent-transparent/100", + "accent-transparent/background", "align-baseline", "align-bottom", "align-middle", @@ -2322,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", @@ -2345,6 +2617,7 @@ exports[`getClassList 1`] = ` "bg-inherit/90", "bg-inherit/95", "bg-inherit/100", + "bg-inherit/background", "bg-left", "bg-linear-0", "bg-linear-0/oklab", @@ -2573,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", @@ -2597,6 +2942,7 @@ exports[`getClassList 1`] = ` "border/90", "border/95", "border/100", + "border/background", "border-0", "border-2", "border-4", @@ -2623,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", @@ -2649,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", @@ -2671,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", @@ -2693,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", @@ -2716,6 +3258,7 @@ exports[`getClassList 1`] = ` "border-current/90", "border-current/95", "border-current/100", + "border-current/background", "border-dashed", "border-dotted", "border-double", @@ -2741,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", @@ -2767,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", @@ -2789,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", @@ -2811,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", @@ -2834,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", @@ -2856,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", @@ -2882,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", @@ -2904,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", @@ -2926,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", @@ -2949,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", @@ -2975,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", @@ -2997,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", @@ -3019,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", @@ -3041,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", @@ -3067,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", @@ -3089,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", @@ -3111,6 +3670,7 @@ 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", @@ -3240,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", @@ -3266,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", @@ -3288,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", @@ -3310,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", @@ -3332,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", @@ -3354,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", @@ -3380,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", @@ -3402,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", @@ -3424,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", @@ -3446,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", @@ -3472,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", @@ -3494,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", @@ -3516,6 +4088,7 @@ 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", @@ -3606,7 +4179,6 @@ exports[`getClassList 1`] = ` "break-inside-avoid-page", "break-keep", "break-normal", - "break-words", "brightness-0", "brightness-50", "brightness-75", @@ -3643,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", @@ -3665,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", @@ -3687,6 +4261,7 @@ exports[`getClassList 1`] = ` "caret-transparent/90", "caret-transparent/95", "caret-transparent/100", + "caret-transparent/background", "clear-both", "clear-end", "clear-left", @@ -3842,6 +4417,7 @@ exports[`getClassList 1`] = ` "decoration-current/90", "decoration-current/95", "decoration-current/100", + "decoration-current/background", "decoration-dashed", "decoration-dotted", "decoration-double", @@ -3868,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", @@ -3891,6 +4468,7 @@ exports[`getClassList 1`] = ` "decoration-transparent/90", "decoration-transparent/95", "decoration-transparent/100", + "decoration-transparent/background", "decoration-wavy", "delay-75", "delay-100", @@ -3923,6 +4501,7 @@ exports[`getClassList 1`] = ` "divide-current/90", "divide-current/95", "divide-current/100", + "divide-current/background", "divide-dashed", "divide-dotted", "divide-double", @@ -3948,6 +4527,7 @@ exports[`getClassList 1`] = ` "divide-inherit/90", "divide-inherit/95", "divide-inherit/100", + "divide-inherit/background", "divide-none", "divide-solid", "divide-transparent", @@ -3972,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", @@ -4006,6 +4587,7 @@ exports[`getClassList 1`] = ` "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", @@ -4028,6 +4610,7 @@ exports[`getClassList 1`] = ` "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", @@ -4052,6 +4635,7 @@ exports[`getClassList 1`] = ` "drop-shadow-transparent/90", "drop-shadow-transparent/95", "drop-shadow-transparent/100", + "drop-shadow-transparent/background", "duration-75", "duration-100", "duration-150", @@ -4063,66 +4647,6 @@ exports[`getClassList 1`] = ` "duration-initial", "ease-initial", "ease-linear", - "end-0", - "end-0.5", - "end-1", - "end-1.5", - "end-2", - "end-2.5", - "end-3", - "end-3.5", - "end-4", - "end-5", - "end-6", - "end-7", - "end-8", - "end-9", - "end-10", - "end-11", - "end-12", - "end-14", - "end-16", - "end-20", - "end-24", - "end-28", - "end-32", - "end-36", - "end-40", - "end-44", - "end-48", - "end-52", - "end-56", - "end-60", - "end-64", - "end-72", - "end-80", - "end-96", - "end-1/2", - "end-1/3", - "end-1/4", - "end-1/5", - "end-1/6", - "end-1/12", - "end-2/3", - "end-2/4", - "end-2/5", - "end-2/6", - "end-2/12", - "end-3/4", - "end-3/5", - "end-3/6", - "end-3/12", - "end-4/5", - "end-4/6", - "end-4/12", - "end-5/6", - "end-5/12", - "end-6/12", - "end-7/12", - "end-8/12", - "end-9/12", - "end-10/12", - "end-11/12", "end-auto", "end-full", "end-px", @@ -4150,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", @@ -4172,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", @@ -4195,6 +4721,7 @@ exports[`getClassList 1`] = ` "fill-transparent/90", "fill-transparent/95", "fill-transparent/100", + "fill-transparent/background", "fixed", "flex", "flex-1", @@ -4318,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", @@ -4340,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", @@ -4362,6 +4891,7 @@ exports[`getClassList 1`] = ` "from-transparent/90", "from-transparent/95", "from-transparent/100", + "from-transparent/background", "gap-0", "gap-0.5", "gap-1", @@ -4629,9 +5159,81 @@ exports[`getClassList 1`] = ` "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", @@ -4694,6 +5296,195 @@ exports[`getClassList 1`] = ` "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", @@ -4724,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", @@ -4746,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", @@ -4768,6 +5561,70 @@ exports[`getClassList 1`] = ` "inset-ring-transparent/90", "inset-ring-transparent/95", "inset-ring-transparent/100", + "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", @@ -4790,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", @@ -4812,6 +5670,7 @@ 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", @@ -4858,6 +5717,7 @@ 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", @@ -5259,6 +6119,7 @@ exports[`getClassList 1`] = ` "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", @@ -5281,6 +6142,7 @@ exports[`getClassList 1`] = ` "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", @@ -5303,6 +6165,7 @@ exports[`getClassList 1`] = ` "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", @@ -5380,6 +6243,7 @@ exports[`getClassList 1`] = ` "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", @@ -5402,6 +6266,7 @@ exports[`getClassList 1`] = ` "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", @@ -5424,6 +6289,7 @@ exports[`getClassList 1`] = ` "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", @@ -5521,6 +6387,7 @@ exports[`getClassList 1`] = ` "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", @@ -5543,6 +6410,7 @@ exports[`getClassList 1`] = ` "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", @@ -5565,6 +6433,7 @@ exports[`getClassList 1`] = ` "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", @@ -5642,6 +6511,7 @@ exports[`getClassList 1`] = ` "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", @@ -5664,6 +6534,7 @@ exports[`getClassList 1`] = ` "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", @@ -5686,6 +6557,7 @@ exports[`getClassList 1`] = ` "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", @@ -5768,6 +6640,7 @@ exports[`getClassList 1`] = ` "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", @@ -5790,6 +6663,7 @@ exports[`getClassList 1`] = ` "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", @@ -5812,6 +6686,7 @@ exports[`getClassList 1`] = ` "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", @@ -5889,6 +6764,7 @@ exports[`getClassList 1`] = ` "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", @@ -5911,6 +6787,7 @@ exports[`getClassList 1`] = ` "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", @@ -5933,6 +6810,7 @@ exports[`getClassList 1`] = ` "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", @@ -6020,6 +6898,7 @@ exports[`getClassList 1`] = ` "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", @@ -6042,6 +6921,7 @@ exports[`getClassList 1`] = ` "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", @@ -6064,6 +6944,7 @@ exports[`getClassList 1`] = ` "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", @@ -6141,6 +7022,7 @@ exports[`getClassList 1`] = ` "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", @@ -6163,6 +7045,7 @@ exports[`getClassList 1`] = ` "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", @@ -6185,6 +7068,7 @@ exports[`getClassList 1`] = ` "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", @@ -6273,6 +7157,7 @@ exports[`getClassList 1`] = ` "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", @@ -6295,6 +7180,7 @@ exports[`getClassList 1`] = ` "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", @@ -6317,6 +7203,7 @@ exports[`getClassList 1`] = ` "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", @@ -6394,6 +7281,7 @@ exports[`getClassList 1`] = ` "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", @@ -6416,6 +7304,7 @@ exports[`getClassList 1`] = ` "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", @@ -6438,6 +7327,7 @@ exports[`getClassList 1`] = ` "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", @@ -6528,6 +7418,7 @@ exports[`getClassList 1`] = ` "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", @@ -6550,6 +7441,7 @@ exports[`getClassList 1`] = ` "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", @@ -6572,6 +7464,7 @@ exports[`getClassList 1`] = ` "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", @@ -6649,6 +7542,7 @@ exports[`getClassList 1`] = ` "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", @@ -6671,6 +7565,7 @@ exports[`getClassList 1`] = ` "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", @@ -6693,6 +7588,7 @@ exports[`getClassList 1`] = ` "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", @@ -6777,6 +7673,7 @@ exports[`getClassList 1`] = ` "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", @@ -6799,6 +7696,7 @@ exports[`getClassList 1`] = ` "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", @@ -6821,6 +7719,7 @@ exports[`getClassList 1`] = ` "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", @@ -6898,6 +7797,7 @@ exports[`getClassList 1`] = ` "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", @@ -6920,6 +7820,7 @@ exports[`getClassList 1`] = ` "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", @@ -6942,6 +7843,7 @@ exports[`getClassList 1`] = ` "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", @@ -7024,6 +7926,7 @@ exports[`getClassList 1`] = ` "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", @@ -7046,6 +7949,7 @@ exports[`getClassList 1`] = ` "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", @@ -7068,6 +7972,7 @@ exports[`getClassList 1`] = ` "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", @@ -7145,6 +8050,7 @@ exports[`getClassList 1`] = ` "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", @@ -7167,6 +8073,7 @@ exports[`getClassList 1`] = ` "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", @@ -7189,6 +8096,7 @@ exports[`getClassList 1`] = ` "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", @@ -7266,6 +8174,7 @@ exports[`getClassList 1`] = ` "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", @@ -7288,6 +8197,7 @@ exports[`getClassList 1`] = ` "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", @@ -7310,6 +8220,7 @@ exports[`getClassList 1`] = ` "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", @@ -7387,6 +8298,7 @@ exports[`getClassList 1`] = ` "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", @@ -7409,6 +8321,7 @@ exports[`getClassList 1`] = ` "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", @@ -7431,6 +8344,78 @@ exports[`getClassList 1`] = ` "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", @@ -7505,6 +8490,78 @@ 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", @@ -7577,7 +8634,6 @@ exports[`getClassList 1`] = ` "max-w-min", "max-w-none", "max-w-px", - "max-w-screen", "max-w-svh", "max-w-svw", "mb-0", @@ -7616,6 +8672,78 @@ exports[`getClassList 1`] = ` "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", @@ -7652,6 +8780,77 @@ exports[`getClassList 1`] = ` "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", @@ -7726,6 +8925,78 @@ exports[`getClassList 1`] = ` "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", @@ -8123,6 +9394,7 @@ exports[`getClassList 1`] = ` "outline/90", "outline/95", "outline/100", + "outline/background", "outline-0", "outline-1", "outline-2", @@ -8150,6 +9422,7 @@ exports[`getClassList 1`] = ` "outline-current/90", "outline-current/95", "outline-current/100", + "outline-current/background", "outline-dashed", "outline-dotted", "outline-double", @@ -8176,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", @@ -8205,6 +9479,7 @@ exports[`getClassList 1`] = ` "outline-transparent/90", "outline-transparent/95", "outline-transparent/100", + "outline-transparent/background", "overflow-auto", "overflow-clip", "overflow-hidden", @@ -8300,6 +9575,76 @@ exports[`getClassList 1`] = ` "pb-80", "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", @@ -8428,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", @@ -8450,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", @@ -8472,6 +9819,7 @@ exports[`getClassList 1`] = ` "placeholder-transparent/90", "placeholder-transparent/95", "placeholder-transparent/100", + "placeholder-transparent/background", "pointer-events-auto", "pointer-events-none", "pr-0", @@ -8746,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", @@ -8768,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", @@ -8796,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", @@ -8818,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", @@ -8840,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", @@ -8862,6 +10215,7 @@ exports[`getClassList 1`] = ` "ring-transparent/90", "ring-transparent/95", "ring-transparent/100", + "ring-transparent/background", "rotate-0", "rotate-1", "rotate-2", @@ -9099,6 +10453,76 @@ exports[`getClassList 1`] = ` "scroll-mb-80", "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", @@ -9414,6 +10838,76 @@ exports[`getClassList 1`] = ` "scroll-pb-80", "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", @@ -9660,6 +11154,150 @@ exports[`getClassList 1`] = ` "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", @@ -9699,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", @@ -9721,6 +11360,7 @@ exports[`getClassList 1`] = ` "shadow-inherit/90", "shadow-inherit/95", "shadow-inherit/100", + "shadow-inherit/background", "shadow-initial", "shadow-none", "shadow-transparent", @@ -9745,6 +11385,7 @@ exports[`getClassList 1`] = ` "shadow-transparent/90", "shadow-transparent/95", "shadow-transparent/100", + "shadow-transparent/background", "shrink", "shrink-0", "size-0", @@ -9924,66 +11565,6 @@ exports[`getClassList 1`] = ` "space-y-reverse", "sr-only", "stacked-fractions", - "start-0", - "start-0.5", - "start-1", - "start-1.5", - "start-2", - "start-2.5", - "start-3", - "start-3.5", - "start-4", - "start-5", - "start-6", - "start-7", - "start-8", - "start-9", - "start-10", - "start-11", - "start-12", - "start-14", - "start-16", - "start-20", - "start-24", - "start-28", - "start-32", - "start-36", - "start-40", - "start-44", - "start-48", - "start-52", - "start-56", - "start-60", - "start-64", - "start-72", - "start-80", - "start-96", - "start-1/2", - "start-1/3", - "start-1/4", - "start-1/5", - "start-1/6", - "start-1/12", - "start-2/3", - "start-2/4", - "start-2/5", - "start-2/6", - "start-2/12", - "start-3/4", - "start-3/5", - "start-3/6", - "start-3/12", - "start-4/5", - "start-4/6", - "start-4/12", - "start-5/6", - "start-5/12", - "start-6/12", - "start-7/12", - "start-8/12", - "start-9/12", - "start-10/12", - "start-11/12", "start-auto", "start-full", "start-px", @@ -10015,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", @@ -10037,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", @@ -10060,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", @@ -10098,6 +11685,7 @@ exports[`getClassList 1`] = ` "text-current/90", "text-current/95", "text-current/100", + "text-current/background", "text-ellipsis", "text-end", "text-inherit", @@ -10122,6 +11710,7 @@ exports[`getClassList 1`] = ` "text-inherit/90", "text-inherit/95", "text-inherit/100", + "text-inherit/background", "text-justify", "text-left", "text-nowrap", @@ -10149,6 +11738,7 @@ exports[`getClassList 1`] = ` "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", @@ -10171,6 +11761,7 @@ exports[`getClassList 1`] = ` "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", @@ -10195,6 +11786,7 @@ exports[`getClassList 1`] = ` "text-shadow-transparent/90", "text-shadow-transparent/95", "text-shadow-transparent/100", + "text-shadow-transparent/background", "text-start", "text-transparent", "text-transparent/0", @@ -10218,6 +11810,7 @@ exports[`getClassList 1`] = ` "text-transparent/90", "text-transparent/95", "text-transparent/100", + "text-transparent/background", "text-wrap", "text-xs", "to-0%", @@ -10263,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", @@ -10285,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", @@ -10307,6 +11902,7 @@ exports[`getClassList 1`] = ` "to-transparent/90", "to-transparent/95", "to-transparent/100", + "to-transparent/background", "top-0", "top-0.5", "top-1", @@ -10675,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", @@ -10697,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", @@ -10720,6 +12318,7 @@ exports[`getClassList 1`] = ` "via-transparent/90", "via-transparent/95", "via-transparent/100", + "via-transparent/background", "visible", "w-0", "w-0.5", @@ -10816,6 +12415,16 @@ 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", ] `; diff --git a/packages/tailwindcss/src/__snapshots__/utilities.test.ts.snap b/packages/tailwindcss/src/__snapshots__/utilities.test.ts.snap index 6adc96113..43e8fdf6f 100644 --- a/packages/tailwindcss/src/__snapshots__/utilities.test.ts.snap +++ b/packages/tailwindcss/src/__snapshots__/utilities.test.ts.snap @@ -1,7 +1,8 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html exports[`border-* 1`] = ` -"@layer properties { +" +@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; @@ -182,11 +183,13 @@ exports[`border-* 1`] = ` syntax: "*"; inherits: false; initial-value: solid; -}" +} +" `; exports[`border-b-* 1`] = ` -"@layer properties { +" +@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; @@ -367,11 +370,387 @@ exports[`border-b-* 1`] = ` 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`] = ` -"@layer properties { +" +@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; @@ -552,11 +931,13 @@ exports[`border-e-* 1`] = ` syntax: "*"; inherits: false; initial-value: solid; -}" +} +" `; exports[`border-l-* 1`] = ` -"@layer properties { +" +@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; @@ -737,11 +1118,13 @@ exports[`border-l-* 1`] = ` syntax: "*"; inherits: false; initial-value: solid; -}" +} +" `; exports[`border-r-* 1`] = ` -"@layer properties { +" +@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; @@ -922,11 +1305,13 @@ exports[`border-r-* 1`] = ` syntax: "*"; inherits: false; initial-value: solid; -}" +} +" `; exports[`border-s-* 1`] = ` -"@layer properties { +" +@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; @@ -1107,11 +1492,13 @@ exports[`border-s-* 1`] = ` syntax: "*"; inherits: false; initial-value: solid; -}" +} +" `; exports[`border-t-* 1`] = ` -"@layer properties { +" +@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; @@ -1292,11 +1679,13 @@ exports[`border-t-* 1`] = ` syntax: "*"; inherits: false; initial-value: solid; -}" +} +" `; exports[`border-x-* 1`] = ` -"@layer properties { +" +@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; @@ -1477,11 +1866,13 @@ exports[`border-x-* 1`] = ` syntax: "*"; inherits: false; initial-value: solid; -}" +} +" `; exports[`border-y-* 1`] = ` -"@layer properties { +" +@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; @@ -1662,5 +2053,6 @@ exports[`border-y-* 1`] = ` syntax: "*"; inherits: false; initial-value: solid; -}" +} +" `; diff --git a/packages/tailwindcss/src/apply.ts b/packages/tailwindcss/src/apply.ts index 526a5e000..2d5e5b847 100644 --- a/packages/tailwindcss/src/apply.ts +++ b/packages/tailwindcss/src/apply.ts @@ -1,10 +1,11 @@ import { Features } from '.' -import { rule, toCss, 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 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 @@ -25,7 +26,7 @@ export function substituteAtApply(ast: AstNode[], designSystem: DesignSystem) { let definitions = new DefaultMap(() => new Set()) // Collect all new `@utility` definitions and all `@apply` rules first - walk([root], (node, { parent, path }) => { + walk([root], (node, ctx) => { if (node.kind !== 'at-rule') return // Do not allow `@apply` rules inside `@keyframes` rules. @@ -61,16 +62,15 @@ export function substituteAtApply(ast: AstNode[], designSystem: DesignSystem) { 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 (parent === null) return + if (ctx.parent === null) return features |= Features.AtApply - parents.add(parent) + 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 path) { - if (parent === node) continue + for (let parent of ctx.path()) { if (!parents.has(parent)) continue dependencies.get(parent).add(dependency) } @@ -158,18 +158,57 @@ export function substituteAtApply(ast: AstNode[], designSystem: DesignSystem) { for (let parent of sorted) { if (!('nodes' in parent)) continue - walk(parent.nodes, (child, { replaceWith }) => { + walk(parent.nodes, (child) => { if (child.kind !== 'at-rule' || child.name !== '@apply') return let parts = child.params.split(/(\s+)/g) let candidateOffsets: Record = {} + let normalIdents: string[] = [] + let dashedIdents: string[] = [] let offset = 0 for (let [idx, part] of parts.entries()) { - if (idx % 2 === 0) candidateOffsets[part] = offset + 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 @@ -249,7 +288,7 @@ export function substituteAtApply(ast: AstNode[], designSystem: DesignSystem) { let candidate = compiled.nodeSorting.get(node)?.candidate let candidateOffset = candidate ? candidateOffsets[candidate] : undefined - node = structuredClone(node) + node = cloneAstNode(node) if (!src || !candidate || candidateOffset === undefined) { // While the original nodes may have come from an `@utility` we still @@ -291,7 +330,7 @@ export function substituteAtApply(ast: AstNode[], designSystem: DesignSystem) { } } - replaceWith(newNodes) + return WalkAction.Replace(newNodes) } }) } diff --git a/packages/tailwindcss/src/ast.bench.ts b/packages/tailwindcss/src/ast.bench.ts index a2d8b2892..034faee27 100644 --- a/packages/tailwindcss/src/ast.bench.ts +++ b/packages/tailwindcss/src/ast.bench.ts @@ -1,5 +1,5 @@ -import { bench } from 'vitest' -import { toCss } from './ast' +import { bench, describe } from 'vitest' +import { cloneAstNode, toCss, type AstNode } from './ast' import * as CSS from './css-parser' const css = String.raw @@ -19,10 +19,46 @@ const input = css` ` const ast = CSS.parse(input) -bench('toCss', () => { - toCss(ast) +describe('AST to CSS', () => { + bench('toCss', () => { + toCss(ast) + }) + + bench('toCss with source maps', () => { + toCss(ast, true) + }) }) -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(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 72c67230b..14092c9f5 100644 --- a/packages/tailwindcss/src/ast.test.ts +++ b/packages/tailwindcss/src/ast.test.ts @@ -1,26 +1,28 @@ -import { expect, it } from 'vitest' +import { describe, expect, it, test } from 'vitest' import { - atRule, context, + cssContext, decl, + handleNesting, optimizeAst, + rule, styleRule, toCss, - walk, - WalkAction, 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;}}'), defaultDesignSystem))) - .toMatchInlineSnapshot(` - ".foo { + expect(pretty(toCss(CSS.parse('.foo{color:red;&:hover{color:blue;}}')))).toMatchInlineSnapshot(` + " + .foo { color: red; &:hover { color: blue; @@ -31,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', [ @@ -48,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 } }) @@ -67,8 +70,9 @@ it('allows the placement of context nodes', () => { expect(blueContext).toEqual({ context: 'a' }) expect(greenContext).toEqual({ context: 'b' }) - expect(toCss(optimizeAst(ast, defaultDesignSystem))).toMatchInlineSnapshot(` - ".foo { + expect(pretty(toCss(optimizeAst(ast, defaultDesignSystem)))).toMatchInlineSnapshot(` + " + .foo { color: red; } .bar { @@ -81,36 +85,6 @@ 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) - } - - if (node.kind === 'rule' && node.selector === '.bail') { - return WalkAction.Stop - } - }) - - // We do not want to see `.bar`, `.baz`, or `.qux` because we bailed early - expect(seen).toMatchInlineSnapshot(` - Set { - ".foo", - ".nested", - ".bail", - } - `) -}) - it('should not emit empty rules once optimized', () => { let ast = CSS.parse(css` /* Empty rule */ @@ -153,13 +127,15 @@ it('should not emit empty rules once optimized', () => { /* 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(toCss(ast)).toMatchInlineSnapshot(` - ".foo { + expect(pretty(toCss(ast))).toMatchInlineSnapshot(` + " + .foo { } .foo { .bar { @@ -186,14 +162,16 @@ it('should not emit empty rules once optimized', () => { } @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(toCss(optimizeAst(ast, defaultDesignSystem))).toMatchInlineSnapshot(` - "@charset "UTF-8"; + 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'; @@ -234,8 +212,9 @@ it('should not emit exact duplicate declarations in the same rule', () => { } `) - expect(toCss(ast)).toMatchInlineSnapshot(` - ".foo { + expect(pretty(toCss(ast))).toMatchInlineSnapshot(` + " + .foo { color: red; .bar { color: green; @@ -266,20 +245,27 @@ it('should not emit exact duplicate declarations in the same rule', () => { " `) - expect(toCss(optimizeAst(ast, defaultDesignSystem))).toMatchInlineSnapshot(` - ".foo { + expect(pretty(toCss(optimizeAst(ast, defaultDesignSystem)))).toMatchInlineSnapshot(` + " + .foo { .bar { + color: green; color: blue; color: green; } color: red; - } - .foo { - color: green; - color: blue; - color: red; + & { + color: green; + & { + color: red; + color: green; + color: blue; + } + color: red; + } background: blue; .bar { + color: green; color: blue; color: green; } @@ -289,309 +275,1390 @@ it('should not emit exact duplicate declarations in the same rule', () => { `) }) -it('should only visit children once when calling `replaceWith` with single element array', () => { - let visited = new Set() - - let ast = [ - atRule('@media', '', [styleRule('.foo', [decl('color', 'blue')])]), - styleRule('.bar', [decl('color', 'blue')]), - ] - - walk(ast, (node, { replaceWith }) => { - if (visited.has(node)) { - throw new Error('Visited node twice') +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); + } } - visited.add(node) + `) - if (node.kind === 'at-rule') replaceWith(node.nodes) - }) -}) + let theme = new Theme() + theme.add('--color-emerald-600', 'oklch(59.6% 0.145 163.225)') -it('should only visit children once when calling `replaceWith` with multi-element array', () => { - let visited = new Set() + let design = buildDesignSystem(theme) - let ast = [ - atRule('@media', '', [ - context({}, [ - styleRule('.foo', [decl('color', 'red')]), - styleRule('.baz', [decl('color', 'blue')]), - ]), - ]), - styleRule('.bar', [decl('color', 'green')]), - ] - - walk(ast, (node, { replaceWith }) => { - let key = id(node) - if (visited.has(key)) { - throw new Error('Visited node twice') - } - visited.add(key) - - if (node.kind === 'at-rule') replaceWith(node.nodes) - }) - - expect(visited).toMatchInlineSnapshot(` - Set { - "@media ", - ".foo", - "color: red", - ".baz", - "color: blue", - ".bar", - "color: green", + 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); + } } + " `) }) -it('should never visit children when calling `replaceWith` with `WalkAction.Skip`', () => { - let visited = new Set() +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))) + } - let inner = styleRule('.foo', [decl('color', 'blue')]) + // 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; + } + " + `) + }) - let ast = [atRule('@media', '', [inner]), styleRule('.bar', [decl('color', 'blue')])] + 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; + } + " + `) + }) - walk(ast, (node, { replaceWith }) => { - visited.add(node) + it('should replace the first rule, that contains `&` with `:scope`', async () => { + expect( + optimize(css` + /* Standalone */ + & { + --x: 1; + } - if (node.kind === 'at-rule') { - replaceWith(node.nodes) - return WalkAction.Skip - } + /* 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 `` selector refers to the elements matched by + // the nearest ancestor style rule, while `&` in the `` + // 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 `` selector is optional, so the first group in the + // prelude is not necessarily the `` 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 `` + // 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 `` 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 `` 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: ''; + 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: ''; + 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); + } + } + " + `) + }) }) - - expect(visited).not.toContain(inner) - expect(visited).toMatchInlineSnapshot(` - Set { - { - "kind": "at-rule", - "name": "@media", - "nodes": [ - { - "kind": "rule", - "nodes": [ - { - "important": false, - "kind": "declaration", - "property": "color", - "value": "blue", - }, - ], - "selector": ".foo", - }, - ], - "params": "", - }, - { - "kind": "rule", - "nodes": [ - { - "important": false, - "kind": "declaration", - "property": "color", - "value": "blue", - }, - ], - "selector": ".bar", - }, - { - "important": false, - "kind": "declaration", - "property": "color", - "value": "blue", - }, - } - `) }) - -it('should skip the correct number of children based on the replaced children nodes', () => { - { - let ast = [ - decl('--index', '0'), - decl('--index', '1'), - decl('--index', '2'), - decl('--index', '3'), - decl('--index', '4'), - ] - let visited: string[] = [] - walk(ast, (node, { replaceWith }) => { - visited.push(id(node)) - if (node.kind === 'declaration' && node.value === '2') { - replaceWith([]) - return WalkAction.Skip - } - }) - - expect(visited).toMatchInlineSnapshot(` - [ - "--index: 0", - "--index: 1", - "--index: 2", - "--index: 3", - "--index: 4", - ] - `) - } - - { - let ast = [ - decl('--index', '0'), - decl('--index', '1'), - decl('--index', '2'), - decl('--index', '3'), - decl('--index', '4'), - ] - let visited: string[] = [] - walk(ast, (node, { replaceWith }) => { - visited.push(id(node)) - if (node.kind === 'declaration' && node.value === '2') { - replaceWith([]) - return WalkAction.Continue - } - }) - - expect(visited).toMatchInlineSnapshot(` - [ - "--index: 0", - "--index: 1", - "--index: 2", - "--index: 3", - "--index: 4", - ] - `) - } - - { - let ast = [ - decl('--index', '0'), - decl('--index', '1'), - decl('--index', '2'), - decl('--index', '3'), - decl('--index', '4'), - ] - let visited: string[] = [] - walk(ast, (node, { replaceWith }) => { - visited.push(id(node)) - if (node.kind === 'declaration' && node.value === '2') { - replaceWith([decl('--index', '2.1')]) - return WalkAction.Skip - } - }) - - expect(visited).toMatchInlineSnapshot(` - [ - "--index: 0", - "--index: 1", - "--index: 2", - "--index: 3", - "--index: 4", - ] - `) - } - - { - let ast = [ - decl('--index', '0'), - decl('--index', '1'), - decl('--index', '2'), - decl('--index', '3'), - decl('--index', '4'), - ] - let visited: string[] = [] - walk(ast, (node, { replaceWith }) => { - visited.push(id(node)) - if (node.kind === 'declaration' && node.value === '2') { - replaceWith([decl('--index', '2.1')]) - return WalkAction.Continue - } - }) - - expect(visited).toMatchInlineSnapshot(` - [ - "--index: 0", - "--index: 1", - "--index: 2", - "--index: 2.1", - "--index: 3", - "--index: 4", - ] - `) - } - - { - let ast = [ - decl('--index', '0'), - decl('--index', '1'), - decl('--index', '2'), - decl('--index', '3'), - decl('--index', '4'), - ] - let visited: string[] = [] - walk(ast, (node, { replaceWith }) => { - visited.push(id(node)) - if (node.kind === 'declaration' && node.value === '2') { - replaceWith([decl('--index', '2.1'), decl('--index', '2.2')]) - return WalkAction.Skip - } - }) - - expect(visited).toMatchInlineSnapshot(` - [ - "--index: 0", - "--index: 1", - "--index: 2", - "--index: 3", - "--index: 4", - ] - `) - } - - { - let ast = [ - decl('--index', '0'), - decl('--index', '1'), - decl('--index', '2'), - decl('--index', '3'), - decl('--index', '4'), - ] - let visited: string[] = [] - walk(ast, (node, { replaceWith }) => { - visited.push(id(node)) - if (node.kind === 'declaration' && node.value === '2') { - replaceWith([decl('--index', '2.1'), decl('--index', '2.2')]) - return WalkAction.Continue - } - }) - - expect(visited).toMatchInlineSnapshot(` - [ - "--index: 0", - "--index: 1", - "--index: 2", - "--index: 2.1", - "--index: 2.2", - "--index: 3", - "--index: 4", - ] - `) - } -}) - -function id(node: AstNode) { - switch (node.kind) { - case 'at-rule': - return `${node.name} ${node.params}` - case 'rule': - return node.selector - case 'context': - return '' - case 'at-root': - return '' - case 'declaration': - return `${node.property}: ${node.value}` - case 'comment': - return `// ${node.value}` - default: - node satisfies never - throw new Error('Unknown node kind') - } -} diff --git a/packages/tailwindcss/src/ast.ts b/packages/tailwindcss/src/ast.ts index a473b9193..09c3ea051 100644 --- a/packages/tailwindcss/src/ast.ts +++ b/packages/tailwindcss/src/ast.ts @@ -1,13 +1,17 @@ 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' @@ -122,157 +126,97 @@ export function atRoot(nodes: AstNode[]): AtRoot { } } -export const enum WalkAction { - /** Continue walking, which is the default */ - Continue, +export function cloneAstNode(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 - path: AstNode[] - }, - ) => void | WalkAction, - path: AstNode[] = [], - context: Record = {}, -) { - for (let i = 0; i < ast.length; i++) { - let node = ast[i] - let parent = path[path.length - 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, path, { ...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 - path.push(node) - let replacedNode = false - let replacedNodeOffset = 0 - let status = - visit(node, { - parent, - context, - path, - replaceWith(newNode) { - if (replacedNode) return - replacedNode = true + case 'comment': + return { + kind: node.kind, + value: node.value, + src: node.src, + dst: node.dst, + } satisfies Comment as T - if (Array.isArray(newNode)) { - if (newNode.length === 0) { - ast.splice(i, 1) - replacedNodeOffset = 0 - } else if (newNode.length === 1) { - ast[i] = newNode[0] - replacedNodeOffset = 1 - } else { - ast.splice(i, 1, ...newNode) - replacedNodeOffset = newNode.length - } - } else { - ast[i] = newNode - replacedNodeOffset = 1 - } - }, - }) ?? WalkAction.Continue - path.pop() - - // We want to visit or skip 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. - if (replacedNode) { - if (status === WalkAction.Continue) { - i-- - } else { - i += replacedNodeOffset - 1 - } - continue - } - - // Stop the walk entirely - if (status === WalkAction.Stop) return WalkAction.Stop - - // Skip visiting the children of this node - if (status === WalkAction.Skip) continue - - if ('nodes' in node) { - path.push(node) - let result = walk(node.nodes, visit, path, context) - path.pop() - - if (result === 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 - replaceWith(newNode: AstNode[]): void - }, - ) => void, - path: AstNode[] = [], - context: Record = {}, -) { - for (let i = 0; i < ast.length; i++) { - let node = ast[i] - let parent = path[path.length - 1] ?? null - - if (node.kind === 'rule' || node.kind === 'at-rule') { - path.push(node) - walkDepth(node.nodes, visit, path, context) - path.pop() - } else if (node.kind === 'context') { - walkDepth(node.nodes, visit, path, { ...context, ...node.context }) - continue - } - - path.push(node) - visit(node, { - parent, - context, - path, - replaceWith(newNode) { - if (Array.isArray(newNode)) { - if (newNode.length === 0) { - ast.splice(i, 1) - } else if (newNode.length === 1) { - ast[i] = newNode[0] - } else { - ast.splice(i, 1, ...newNode) - } - } else { - ast[i] = newNode +export function cssContext( + ctx: VisitContext, +): VisitContext & { context: Record } { + return { + depth: ctx.depth, + index: ctx.index, + siblings: ctx.siblings, + get context() { + let context: Record = {} + for (let child of ctx.path()) { + if (child.kind === 'context') { + Object.assign(context, child.context) } + } - // Skip over the newly inserted nodes (being depth-first it doesn't make sense to visit them) - i += newNode.length - 1 - }, - }) - path.pop() + // Once computed, we never need to compute this again + Object.defineProperty(this, 'context', { value: context }) + return context + }, + get parent() { + let parent = (this.path().pop() as Extract) ?? null + + // 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') + }, } } @@ -336,13 +280,19 @@ export function optimizeAst( // Track used animation names if (node.property === 'animation') { - for (let keyframeName of extractKeyframeNames(node.value)) + 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 && node.value.includes('color-mix(')) { + // found in the theme config. + if ( + polyfills & Polyfills.ColorMix && + !context.supportsColorMix && + !context.keyframes && + node.value.includes('color-mix(') + ) { colorMixDeclarations.get(parent).add(node) } @@ -357,37 +307,7 @@ export function optimizeAst( transform(child, nodes, context, depth + 1) } - // Keep the last decl when there are exact duplicates. Keeping the *first* one might - // not be correct when given nested rules where a rule sits between declarations. - let seen: Record = {} - let toRemove = new Set() - - // Keep track of all nodes that produce a given declaration - for (let child of nodes) { - if (child.kind !== 'declaration') continue - - let key = `${child.property}:${child.value}:${child.important}` - seen[key] ??= [] - seen[key].push(child) - } - - // And remove all but the last of each - for (let key in seen) { - for (let i = 0; i < seen[key].length - 1; ++i) { - toRemove.add(seen[key][i]) - } - } - - if (toRemove.size > 0) { - nodes = nodes.filter((node) => !toRemove.has(node)) - } - - if (nodes.length === 0) return - - // Rules with `&` as the selector should be flattened - if (node.selector === '&') { - parent.push(...nodes) - } else { + if (nodes.length > 0) { parent.push({ ...node, nodes }) } } @@ -438,6 +358,8 @@ export function optimizeAst( 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: [] } @@ -456,7 +378,8 @@ export function optimizeAst( copy.name === '@charset' || copy.name === '@custom-media' || copy.name === '@namespace' || - copy.name === '@import' + copy.name === '@import' || + copy.name === '@apply' ) { parent.push(copy) } @@ -478,6 +401,21 @@ export function optimizeAst( // 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) @@ -580,12 +518,12 @@ export function optimizeAst( let ast = ValueParser.parse(declaration.value) let requiresPolyfill = false - ValueParser.walk(ast, (node, { replaceWith }) => { + walk(ast, (node) => { if (node.kind !== 'function' || node.value !== 'color-mix') return let containsUnresolvableVars = false let containsCurrentcolor = false - ValueParser.walk(node.nodes, (node, { replaceWith }) => { + walk(node.nodes, (node) => { if (node.kind == 'word' && node.value.toLowerCase() === 'currentcolor') { containsCurrentcolor = true requiresPolyfill = true @@ -629,7 +567,7 @@ export function optimizeAst( } } while (varNode) - replaceWith({ kind: 'word', value: inlinedColor }) + return WalkAction.Replace({ kind: 'word', value: inlinedColor } as const) }) if (containsUnresolvableVars || containsCurrentcolor) { @@ -640,7 +578,7 @@ export function optimizeAst( let firstColorValue = node.nodes.length > separatorIndex ? node.nodes[separatorIndex + 1] : null if (!firstColorValue) return - replaceWith(firstColorValue) + 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. @@ -729,9 +667,975 @@ export function optimizeAst( } } - return newAst + return handleNesting(newAst) } +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() + { + 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() + + // Track nodes lists where we want to dedupe declarations + let dedupeDeclarationsInNodes = new Set() + + // The final, new AST + let result: AstNode[] = [] + + // Track whether we should skip a node in the `exit` phase + let skipExit = new Set() + + // 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 + // `` selector consumed the parent selector via `&`. + // + // Once the parent selector is part of the `` 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() + + 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 `` 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 `` + // 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 `` selector. + // + // ```css + // @scope (.from) to (.to) + // ^^^^^^^ scope-start (optional) + // ^^^^^ scope-end + // + // @scope to (.to) + // ^^^^^ scope-end + // ``` + let isScopeEnd = false + + // Whether the `` 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 `` 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 + // `` selector, `&` refers to the elements + // matched by the nearest ancestor style rule (or `:scope` + // when there is none). In the `` 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 @@ -941,9 +1845,10 @@ export function toCss(ast: AstNode[], track?: boolean) { function findNode(ast: AstNode[], fn: (node: AstNode) => boolean): AstNode[] | null { let foundPath: AstNode[] = [] - walk(ast, (node, { path }) => { + walk(ast, (node, ctx) => { if (fn(node)) { - foundPath = [...path] + foundPath = ctx.path() + foundPath.push(node) return WalkAction.Stop } }) diff --git a/packages/tailwindcss/src/at-import.test.ts b/packages/tailwindcss/src/at-import.test.ts index 3beed9789..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,15 +324,16 @@ 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) { + ).toMatchInlineSnapshot(` + " + @supports (display: grid) { @media screen and (max-width: 400px) { a { color: red; @@ -327,16 +343,17 @@ 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) { + ).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; } @@ -400,13 +420,15 @@ test('@layer', async () => { }) test('supports theme(reference) imports', async () => { - await expect( - run( + expect( + await run( + ['text-red-500'], css` @tailwind utilities; @import 'example.css' theme(reference); `, { + base: '/root', loadStylesheet: () => Promise.resolve({ content: css` @@ -415,12 +437,13 @@ test('supports theme(reference) imports', async () => { } `, base: '', + path: '', }), - candidates: ['text-red-500'], }, ), - ).resolves.toMatchInlineSnapshot(` - ".text-red-500 { + ).toMatchInlineSnapshot(` + " + .text-red-500 { color: var(--color-red-500, red); } " @@ -428,27 +451,27 @@ test('supports theme(reference) imports', async () => { }) 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` @@ -481,15 +506,18 @@ test('emits the right base for @source directives inside nested files', async () }) 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: '', } } }) @@ -534,28 +564,25 @@ test('emits the right base for @source found inside JS configs and plugins from }) 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'; + ` - await 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 () => { - 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 { @@ -568,19 +595,22 @@ test('resolves @reference as `@import "…" reference`', async () => { } `, base: '/root/foo', + path: '', } } - await expect( - run( + expect( + await run( + ['text-red-500'], css` @reference './foo/bar.css'; @tailwind utilities; `, - { loadStylesheet, candidates: ['text-red-500'] }, + { base: '/root', loadStylesheet }, ), - ).resolves.toMatchInlineSnapshot(` - ".text-red-500 { + ).toMatchInlineSnapshot(` + " + .text-red-500 { color: var(--color-red-500, red); } " @@ -588,7 +618,7 @@ test('resolves @reference as `@import "…" reference`', async () => { }) test('resolves `@variant` used as `@custom-variant` inside `@reference`', 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 { @@ -600,19 +630,22 @@ test('resolves `@variant` used as `@custom-variant` inside `@reference`', async } `, base: '/root/foo', + path: '', } } - await expect( - run( + expect( + await run( + ['dark:flex'], css` @reference './foo/bar.css'; @tailwind utilities; `, - { loadStylesheet, candidates: ['dark:flex'] }, + { base: '/root', loadStylesheet }, ), - ).resolves.toMatchInlineSnapshot(` - ".dark\\:flex:where([data-theme="dark"] *) { + ).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 5f13cce99..ba7172f8e 100644 --- a/packages/tailwindcss/src/at-import.ts +++ b/packages/tailwindcss/src/at-import.ts @@ -1,7 +1,8 @@ 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, @@ -22,7 +23,7 @@ export async function substituteAtImports( let features = Features.None let promises: Promise[] = [] - walk(ast, (node, { replaceWith }) => { + 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 @@ -66,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) } }) 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*(?[a-zA-Z_-][a-zA-Z0-9_-]*)\s*((?[*|~^$]?=)\s*(?['"])?\s*(?.*?)\4\s*(?[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 4355071f2..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', () => { @@ -1415,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', () => []) @@ -1775,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', () => []) @@ -1988,7 +2012,12 @@ it.each([ // Arbitrary variant values that end the block 'data-[a]{color:red}foo[a]:flex', -])('should not parse invalid arbitrary values: %s', (rawCandidate) => { + + // 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', () => []) @@ -1999,3 +2028,129 @@ it.each([ 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 d169ba758..a389af365 100644 --- a/packages/tailwindcss/src/candidate.ts +++ b/packages/tailwindcss/src/candidate.ts @@ -3,12 +3,15 @@ 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_.%-]+$/ export type ArbitraryUtilityValue = { kind: 'arbitrary' @@ -215,6 +218,102 @@ export type Candidate = raw: string } +export function cloneCandidate(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 as T + + case 'static': + return { + kind: candidate.kind, + root: candidate.root, + variants: candidate.variants.map(cloneVariant), + important: candidate.important, + raw: candidate.raw, + } satisfies Extract 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 as T + + default: + candidate satisfies never + throw new Error('Unknown candidate kind') + } +} + +export function cloneVariant(variant: T): T { + switch (variant.kind) { + case 'arbitrary': + return { + kind: variant.kind, + selector: variant.selector, + relative: variant.relative, + } satisfies Extract 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 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 as T + + default: + variant satisfies never + throw new Error('Unknown variant kind') + } +} + export function* parseCandidate(input: string, designSystem: DesignSystem): Iterable { // hover:focus:underline // ^^^^^ ^^^^^^ -> Variants @@ -273,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.: @@ -282,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) @@ -457,7 +557,7 @@ export function* parseCandidate(input: string, designSystem: DesignSystem): Iter 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) @@ -483,6 +583,8 @@ export function* parseCandidate(input: string, designSystem: DesignSystem): Iter continue } + if (typehint === '') continue + candidate.value = { kind: 'arbitrary', dataType: typehint || null, @@ -497,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, @@ -548,6 +652,8 @@ function parseModifier(modifier: string): CandidateModifier | null { } } + if (!IS_VALID_NAMED_VALUE.test(modifier)) return null + return { kind: 'named', value: modifier, @@ -602,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) @@ -699,6 +806,8 @@ export function parseVariant(variant: string, designSystem: DesignSystem): Varia } } + if (!IS_VALID_NAMED_VALUE.test(value)) continue + return { kind: 'functional', root, @@ -710,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 @@ -922,40 +1038,56 @@ const printArbitraryValueCache = new DefaultMap((input) => { let drop = new Set() - ValueParser.walk(ast, (node, { parent }) => { - let parentArray = parent === null ? ast : (parent.nodes ?? []) + 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' && - // Operators - (node.value === '+' || node.value === '-' || node.value === '*' || node.value === '/') - ) { - let idx = parentArray.indexOf(node) ?? -1 + if (node.kind === 'word' && symbols.has(node.value)) { + let idx = ctx.index // This should not be possible if (idx === -1) return - let previous = parentArray[idx - 1] + // a + b + // ^ node + // ^ previous (whitespace) + let previous = ctx.siblings[idx - 1] if (previous?.kind !== 'separator' || previous.value !== ' ') return - let next = parentArray[idx + 1] + // 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) } - // 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) { + if (ctx.siblings[0] === node || ctx.siblings[ctx.siblings.length - 1] === node) { drop.add(node) } } @@ -965,13 +1097,48 @@ const printArbitraryValueCache = new DefaultMap((input) => { 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) { - ValueParser.walk(ast, (node, { replaceWith }) => { + walk(ast, (node) => { if (drop.has(node)) { drop.delete(node) - replaceWith([]) + return WalkAction.ReplaceSkip([]) } }) } 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` 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 { + 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> + [COMPARE_CANDIDATES_KEY]: DefaultMap< + SignatureOptions, + (a: Candidate | string, b: Candidate | string) => boolean + > + [INTERNAL_OPTIONS_KEY]: DefaultMap< + SignatureOptions, + DefaultMap + > + [CANONICALIZE_CANDIDATE_KEY]: DefaultMap< + InternalCanonicalizeOptions, + DefaultMap + > + [CANONICALIZE_VARIANT_KEY]: DefaultMap< + InternalCanonicalizeOptions, + DefaultMap + > + [CANONICALIZE_UTILITY_KEY]: DefaultMap> + [CONVERTER_KEY]: (input: string, options?: Convert) => [string, CandidateModifier | null] + [SPACING_KEY]: DefaultMap | null + [UTILITY_SIGNATURE_KEY]: DefaultMap> + [STATIC_UTILITIES_KEY]: DefaultMap< + SignatureOptions, + DefaultMap>> + > + [UTILITY_PROPERTIES_KEY]: DefaultMap< + SignatureOptions, + DefaultMap>> + > + [PRE_COMPUTED_UTILITIES_KEY]: DefaultMap> + [VARIANT_SIGNATURE_KEY]: DefaultMap> + [PRE_COMPUTED_VARIANTS_KEY]: DefaultMap> + } +} + +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() + 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() + }) + }) + + 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() + 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() + let seenLineHeights = new Set() + 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() + 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()), + ) + + 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 | null = null + for (let property of propertyValues.keys()) { + let otherUtilities = new Set() + 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() + }) + + // 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>((key) => new Set([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(candidates) + let drop = new Set() + + 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((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 + + 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 | null = null, + ): Iterable<[Variant, Extract | 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((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, + ): Generator { + // 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, + ): Generator { + // 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, + value: string = candidate.value?.value ?? '', + seen: Set = new Set(), +): Generator { + 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() + + // 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` → +// - `/100` → +// +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((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() + 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() + 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() + }) + }) + }) +} + +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()) + + 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(() => []) + + // 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((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(() => []) + + 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(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(arr: T[]): Generator { + 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(a: Set, b: Set): Set { + // @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() + + let result = new Set(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 [ + infer Head extends unknown[], + ...infer Tail extends CartesianInput, +] + ? [Head[number], ...CartesianResult] + : [] + +export function* cartesian(...sets: T): Generator> { + 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 + 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 78c7d7078..036b9d88e 100644 --- a/packages/tailwindcss/src/compat/apply-compat-hooks.ts +++ b/packages/tailwindcss/src/compat/apply-compat-hooks.ts @@ -1,8 +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' @@ -50,12 +51,13 @@ export async function applyCompatibilityHooks({ 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.') } @@ -110,16 +112,15 @@ export async function applyCompatibilityHooks({ pluginPaths.push([ { id: pluginPath, - base: context.base as string, - reference: !!context.reference, + 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 @@ -128,19 +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([]) } }) @@ -309,15 +309,32 @@ function upgradeToFullPluginSupport({ 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) { - // 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 + } + + // Arrays get serialized into a comma-separated lists + else if (Array.isArray(resolvedValue)) { 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. + } + + // 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 } } @@ -339,7 +356,7 @@ function upgradeToFullPluginSupport({ // 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) @@ -372,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])) }) } 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 3a748fd8b..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', }, @@ -57,6 +67,10 @@ test('config values can be merged into the theme', () => { '2xl': ['2rem'], }, + ringColor: { + DEFAULT: '#fff', + }, + letterSpacing: { superWide: '0.25em', }, @@ -77,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) @@ -117,13 +136,30 @@ test('config values can be merged into the theme', () => { ]) expect(theme.resolve('2xl', ['--text'])).toEqual('2rem') expect(theme.resolveWith('2xl', ['--text'], ['--line-height'])).toEqual(['2rem', {}]) - expect(theme.resolve('super-wide', ['--tracking'])).toEqual('0.25em') - expect(theme.resolve('super-loose', ['--leading'])).toEqual('3') + 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', () => { @@ -160,6 +196,8 @@ test('will reset default theme values with overwriting theme values', () => { }, }, base: '/root', + reference: false, + src: undefined, }, ]) applyConfigToTheme(design, resolvedConfig, replacedThemeKeys) @@ -189,6 +227,8 @@ test('invalid keys are not merged into the theme', () => { }, }, base: '/root', + reference: false, + src: undefined, }, ]) @@ -227,6 +267,8 @@ test('converts opacity modifiers from decimal to percentage values', () => { }, }, base: '/root', + reference: false, + src: undefined, }, ]) applyConfigToTheme(design, resolvedConfig, replacedThemeKeys) @@ -261,6 +303,7 @@ test('handles setting theme keys to null', async () => { }, base: '/root', reference: false, + src: undefined, }, ]) applyConfigToTheme(design, resolvedConfig, replacedThemeKeys) diff --git a/packages/tailwindcss/src/compat/apply-config-to-theme.ts b/packages/tailwindcss/src/compat/apply-config-to-theme.ts index c957d3209..8757520ee 100644 --- a/packages/tailwindcss/src/compat/apply-config-to-theme.ts +++ b/packages/tailwindcss/src/compat/apply-config-to-theme.ts @@ -147,32 +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 = { + 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 = { + 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] === 'containers') path[0] = 'container' - 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 @@ -185,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, - replacedThemeKeys: Set, ) { 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 2f443b4b6..64e3bc9c7 100644 --- a/packages/tailwindcss/src/compat/colors.ts +++ b/packages/tailwindcss/src/compat/colors.ts @@ -31,7 +31,7 @@ export default { '950': 'oklch(13% 0.028 261.692)', }, zinc: { - '50': 'oklch(98.5% 0 0)', + '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)', @@ -44,17 +44,17 @@ export default { '950': 'oklch(14.1% 0.005 285.823)', }, neutral: { - '50': 'oklch(98.5% 0 0)', - '100': 'oklch(97% 0 0)', - '200': 'oklch(92.2% 0 0)', - '300': 'oklch(87% 0 0)', - '400': 'oklch(70.8% 0 0)', - '500': 'oklch(55.6% 0 0)', - '600': 'oklch(43.9% 0 0)', - '700': 'oklch(37.1% 0 0)', - '800': 'oklch(26.9% 0 0)', - '900': 'oklch(20.5% 0 0)', - '950': 'oklch(14.5% 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(98.5% 0.001 106.423)', @@ -69,6 +69,58 @@ export default { '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(97.1% 0.013 17.38)', '100': 'oklch(93.6% 0.032 17.717)', diff --git a/packages/tailwindcss/src/compat/config.test.ts b/packages/tailwindcss/src/compat/config.test.ts index 196115d63..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.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"; - @custom-variant dark (&:is(.my-dark)); - @custom-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,154 +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(` - "@layer properties; - .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; - } - @property --tw-leading { - syntax: "*"; - inherits: false; - } - @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; - } - } - } - " - `) + .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, :host { + ), + ).toMatchInlineSnapshot(` + " + :root, :host { --color-blue: blue; } + .bg-blue { background-color: var(--color-blue); } + .bg-red { background-color: very-red; } @@ -409,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, :host { + " + :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; } " `) @@ -542,31 +613,35 @@ 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(` - ".font-sans { + ), + ).toMatchInlineSnapshot(` + " + .font-sans { font-family: Potato Sans; } " @@ -576,33 +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(` - ".font-sans { - font-family: Potato Sans; + ), + ).toMatchInlineSnapshot(` + " + .font-sans { font-feature-settings: "cv06"; + font-family: Potato Sans; } " `) @@ -611,33 +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(` - ".font-sans { + ), + ).toMatchInlineSnapshot(` + " + .font-sans { + font-variation-settings: "XHGT" .7; font-family: Potato Sans; - font-variation-settings: "XHGT" 0.7; } " `) @@ -646,37 +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(` - ".font-sans { - font-family: Potato Sans; + ), + ).toMatchInlineSnapshot(` + " + .font-sans { font-feature-settings: "cv06"; - font-variation-settings: "XHGT" 0.7; + font-variation-settings: "XHGT" .7; + font-family: Potato Sans; } " `) @@ -685,36 +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, :host { + ), + ).toMatchInlineSnapshot(` + " + :root, :host { --font-sans: Sandwich Sans; } + .font-sans { font-family: var(--font-sans); } @@ -725,31 +817,35 @@ 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(` - ".font-sans { + ), + ).toMatchInlineSnapshot(` + " + .font-sans { font-family: Inter, system-ui, sans-serif; } " @@ -759,58 +855,67 @@ 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(`""`) + ), + ).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(` - ".font-mono { + ), + ).toMatchInlineSnapshot(` + " + .font-mono { font-family: Potato Mono; } " @@ -820,33 +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(` - ".font-mono { - font-family: Potato Mono; + ), + ).toMatchInlineSnapshot(` + " + .font-mono { font-feature-settings: "cv06"; + font-family: Potato Mono; } " `) @@ -855,33 +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(` - ".font-mono { + ), + ).toMatchInlineSnapshot(` + " + .font-mono { + font-variation-settings: "XHGT" .7; font-family: Potato Mono; - font-variation-settings: "XHGT" 0.7; } " `) @@ -890,37 +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(` - ".font-mono { - font-family: Potato Mono; + ), + ).toMatchInlineSnapshot(` + " + .font-mono { font-feature-settings: "cv06"; - font-variation-settings: "XHGT" 0.7; + font-variation-settings: "XHGT" .7; + font-family: Potato Mono; } " `) @@ -929,36 +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, :host { + ), + ).toMatchInlineSnapshot(` + " + :root, :host { --font-mono: Sandwich Mono; } + .font-mono { font-family: var(--font-mono); } @@ -969,115 +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(`""`) + ), + ).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; } } @@ -1086,62 +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', - }), - }) + ), + ).toMatchInlineSnapshot(` + " + @media (min-width: 44rem) { + .sm\\:flex { + display: flex; + } - expect(compiler.build(['sm:flex', 'md:flex', 'lg:flex', 'min-sm:max-md:underline'])) - .toMatchInlineSnapshot(` - ".sm\\:flex { - @media (width >= 44rem) { - display: flex; - } - } - .min-sm\\:max-md\\:underline { - @media (width >= 44rem) { - @media (width < 50rem) { - text-decoration-line: underline; - } + @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 () => { @@ -1154,66 +1286,60 @@ test('utilities must be prefixed', async () => { } ` - let compiler = await compile(input, { - loadModule: async (id, base) => ({ + let options: Partial[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 { + " + .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, { - loadModule: async (id, base) => ({ - path: '', - 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) => ({ - path: '', - 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; } " @@ -1231,7 +1357,7 @@ test('utilities used in @apply must be prefixed', async () => { } `, { - loadModule: async (id, base) => ({ + loadModule: async (_id, base) => ({ path: '', base, module: { prefix: 'tw' }, @@ -1244,35 +1370,37 @@ test('utilities used in @apply must be prefixed', async () => { }) 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 { - path: '', - 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(` - ".wat\\:custom { + @config "./plugin.js"; + + @tailwind utilities; + + @utility custom { + color: red; + } + `, + { + async loadModule(_id, base) { + return { + path: '', + base, + module: { prefix: 'tw' }, + } + }, + }, + ), + ).toMatchInlineSnapshot(` + " + .wat\\:custom { color: red; } " @@ -1286,7 +1414,7 @@ test('a prefix must be letters only', async () => { @config "./plugin.js"; `, { - async loadModule(id, base) { + async loadModule(_id, base) { return { path: '', base, @@ -1301,37 +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) => ({ - path: '', - 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; } } " @@ -1339,35 +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) => ({ - path: '', - 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; } } " @@ -1375,43 +1507,45 @@ 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[1]> = { + async loadModule(_id, base) { + return { + path: '', + base, + module: { + blocklist: ['bg-white'], + }, } - @tailwind utilities; - @config "./config.js"; - `, - { - async loadModule(id, base) { - return { - path: '', - 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, #fff); + 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 () => { @@ -1429,7 +1563,7 @@ test('blocklisted candidates cannot be used with `@apply`', async () => { } `, { - async loadModule(id, base) { + async loadModule(_id, base) { return { path: '', base, @@ -1446,7 +1580,7 @@ test('blocklisted candidates cannot be used with `@apply`', async () => { }) 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` @@ -1482,7 +1616,7 @@ 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, @@ -1570,52 +1704,146 @@ test('old theme values are merged with their renamed counterparts in the CSS the }) test('handles setting theme keys to null', async () => { - let compiler = await compile( - 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, + 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', - } + base: '/root', + path: '', + } + }, }, - }, - ) - - expect(compiler.build(['bg-red-50', 'bg-red-100', 'bg-red-200'])).toMatchInlineSnapshot(` - ":root, :host { - --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); + ), + ).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) { + 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/resolve-config.test.ts b/packages/tailwindcss/src/compat/config/resolve-config.test.ts index e47fa4eda..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, }, ]) @@ -274,6 +292,7 @@ test('handles null as theme values', () => { }, base: '/root', reference: false, + src: undefined, }, { config: { @@ -287,6 +306,7 @@ test('handles null as theme values', () => { }, base: '/root', reference: false, + src: undefined, }, ]) diff --git a/packages/tailwindcss/src/compat/config/resolve-config.ts b/packages/tailwindcss/src/compat/config/resolve-config.ts index 3fdc1f454..858f4bbbe 100644 --- a/packages/tailwindcss/src/compat/config/resolve-config.ts +++ b/packages/tailwindcss/src/compat/config/resolve-config.ts @@ -33,6 +33,7 @@ interface ResolutionContext { let minimal: ResolvedConfig = { blocklist: [], future: {}, + experimental: {}, prefix: '', important: false, darkMode: null, diff --git a/packages/tailwindcss/src/compat/config/types.ts b/packages/tailwindcss/src/compat/config/types.ts index f70afa2cb..76851a397 100644 --- a/packages/tailwindcss/src/compat/config/types.ts +++ b/packages/tailwindcss/src/compat/config/types.ts @@ -105,3 +105,12 @@ export interface UserConfig { export interface ResolvedConfig { future: Record } + +// `experimental` key support +export interface UserConfig { + experimental?: 'all' | Record +} + +export interface ResolvedConfig { + experimental: Record +} diff --git a/packages/tailwindcss/src/compat/container-config.test.ts b/packages/tailwindcss/src/compat/container-config.test.ts index b5618de84..39a12557c 100644 --- a/packages/tailwindcss/src/compat/container-config.test.ts +++ b/packages/tailwindcss/src/compat/container-config.test.ts @@ -1,54 +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(` - ".container { + ), + ).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; @@ -58,61 +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(` - ".container { + ), + ).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; } } @@ -121,61 +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(` - ".container { + ), + ).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; } } @@ -184,61 +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(` - ".container { + ), + ).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; } @@ -248,58 +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(` - ".container { + ), + ).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; } } @@ -308,45 +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, :host { + ), + ).toMatchInlineSnapshot(` + " + :root, :host { --container-sm: 24rem; } + .max-w-sm { max-width: var(--container-sm); } @@ -355,107 +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(` - ".\\!container { + ), + ).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; } @@ -465,74 +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(` - ".container { + ), + ).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 266d101b0..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( diff --git a/packages/tailwindcss/src/compat/default-theme.ts b/packages/tailwindcss/src/compat/default-theme.ts index f540e63a2..90e699c1c 100644 --- a/packages/tailwindcss/src/compat/default-theme.ts +++ b/packages/tailwindcss/src/compat/default-theme.ts @@ -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"', diff --git a/packages/tailwindcss/src/compat/legacy-utilities.test.ts b/packages/tailwindcss/src/compat/legacy-utilities.test.ts index 9a828d673..c90eae845 100644 --- a/packages/tailwindcss/src/compat/legacy-utilities.test.ts +++ b/packages/tailwindcss/src/compat/legacy-utilities.test.ts @@ -1,27 +1,23 @@ 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 { + " + .bg-gradient-to-b { --tw-gradient-position: to bottom in oklab; background-image: linear-gradient(var(--tw-gradient-stops)); } @@ -59,13 +55,21 @@ test('bg-gradient-*', async () => { .bg-gradient-to-tr { --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, :host { + " + :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 8667816a1..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,6 +14,7 @@ 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('background-image', `linear-gradient(var(--tw-gradient-stops))`), @@ -20,25 +22,34 @@ export function registerLegacyUtilities(designSystem: DesignSystem) { } // 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 @@ -47,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 @@ -75,6 +90,7 @@ export function registerLegacyUtilities(designSystem: DesignSystem) { } }) + designSystem.utilities.suggest('flex-grow', () => []) designSystem.utilities.functional('flex-grow', (candidate) => { if (candidate.modifier) return @@ -91,5 +107,68 @@ export function registerLegacyUtilities(designSystem: DesignSystem) { } }) + 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) => { + 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 4e35afa5a..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,58 +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 { - 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( + 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); @@ -73,31 +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 { - path: '', - 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); } @@ -107,48 +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 { - path: '', - 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; } @@ -159,46 +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 { - path: '', - 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; } " `) @@ -207,98 +197,92 @@ 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 { - path: '', - 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'), - }), }, - }, - }, - ), - } - }, - }) + ), + } + }, + }, + ), + ).toMatchInlineSnapshot(` + " + .animate-duration-316 { + animation-duration: .316s; + } - expect(compiler.build(['animate-duration-316', 'animate-duration-slow'])) - .toMatchInlineSnapshot(` - ".animate-duration-316 { - animation-duration: 316ms; - } - .animate-duration-slow { - animation-duration: 800ms; - } - " - `) + .animate-duration-slow { + 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 { - 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)'), - }, - }) - }), - } - }, - }) - - 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: #ef4444; - @supports (color: color-mix(in lab, red, red)) { + } + + @supports (color: color-mix(in lab, red, red)) { + .variable { color: color-mix(in oklab, #ef4444 var(--opacity), transparent); } } @@ -307,89 +291,81 @@ describe('theme', async () => { }) test('plugin theme colors can use ', async () => { - let input = css` - @tailwind utilities; - @theme { - /* This should not work */ - --color-custom-css: rgba(255 0 0 / ); - } - @plugin "my-plugin"; - ` - - let compiler = await compile(input, { - 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 / )', - }, - }, - }, - ), - } - }, - }) - 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 / ); + } + @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 / )', + }, + }, + }, + ), + } + }, + }, + ), ).toMatchInlineSnapshot(` - ".css-fraction { - color: color-mix(in oklab, rgba(255 0 0 / ) 50%, transparent); - } - .css-percentage { + " + .css-fraction, .css-percentage { color: color-mix(in oklab, rgba(255 0 0 / ) 50%, transparent); } + .css-variable { color: rgba(255 0 0 / ); - @supports (color: color-mix(in lab, red, red)) { + } + + @supports (color: color-mix(in lab, red, red)) { + .css-variable { color: color-mix(in oklab, rgba(255 0 0 / ) var(--opacity), transparent); } } - .js-fraction { - color: color-mix(in oklab, rgb(255 0 0 / 1) 50%, 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: rgb(255 0 0 / 1); - @supports (color: color-mix(in lab, red, red)) { - color: color-mix(in oklab, rgb(255 0 0 / 1) var(--opacity), transparent); + color: red; + } + + @supports (color: color-mix(in lab, red, red)) { + .js-variable { + color: color-mix(in oklab, red var(--opacity), transparent); } } " @@ -397,260 +373,226 @@ describe('theme', async () => { }) 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 { - path: '', - 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 { - path: '', - 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 { - path: '', - 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 { - path: '', - 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 { - path: '', - 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; } " @@ -667,10 +609,10 @@ 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, @@ -679,13 +621,7 @@ describe('theme', async () => { fn(theme('animation.simple')) }, { - theme: { - extend: { - animation: { - simple: 'simple 1s linear', - }, - }, - }, + theme: { extend: { animation: { simple: 'simple 1s linear' } } }, }, ), } @@ -699,241 +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 { - path: '', - 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; } @@ -951,10 +905,10 @@ 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, @@ -994,10 +948,10 @@ 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, @@ -1026,10 +980,10 @@ 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, @@ -1055,10 +1009,10 @@ 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, @@ -1079,273 +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 { - 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', - }, - }) - }), - } - }, - }) - - 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 { - path: '', - 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; } @@ -1354,196 +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 { - 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', + 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 { - path: '', - 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; - } - " - `) + .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 { - path: '', - 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; - } - " - `) + .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 { - 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"; - `, - } - }, - }) - - 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; } @@ -1553,28 +1491,24 @@ describe('addBase', () => { }) test('does not modify CSS variables', async () => { - let input = css` - @plugin "my-plugin"; - ` - - let compiler = await compile(input, { - loadModule: async () => ({ - path: '', - base: '/root', - module: plugin(function ({ addBase }) { - addBase({ - ':root': { - '--PascalCase': '1', - '--camelCase': '1', - '--UPPERCASE': '1', - }, - }) - }), - }), - }) - - expect(compiler.build([])).toMatchInlineSnapshot(` - "@layer base { + 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; @@ -1584,154 +1518,321 @@ describe('addBase', () => { " `) }) + + 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 { - path: '', - 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 { - path: '', - 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 { - path: '', - 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 { - path: '', - 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; } @@ -1744,37 +1845,39 @@ 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 { - path: '', - 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 { + ), + ).toMatchInlineSnapshot(` + " + @layer utilities { @media (max-width: 400px) { @supports (font: bold) { .potato\\:flex:large-potato { @@ -1786,40 +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 { - path: '', - 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; } @@ -1827,74 +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 () => { - let { build } = await compile( - 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' } }) - }, + 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' } }) + }, + } + }, }, - }, - ) - let compiled = build([ - 'optional:flex', - 'group-optional:flex', - 'peer-optional:flex', - 'group-optional/foo:flex', - ]) - - expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(` - "@layer utilities { - .group-optional\\:flex:is(:where(.group):optional *), .group-optional\\/foo\\:flex:is(:where(.group\\/foo):optional *), .peer-optional\\:flex:is(:where(.peer):optional ~ *), .optional\\:flex:optional { + ), + ).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 { - path: '', - 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; } @@ -1902,34 +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 { - path: '', - 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; @@ -1941,38 +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 { - path: '', - 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 { @@ -1988,39 +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 { - path: '', - 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; } @@ -2028,118 +2136,120 @@ 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 { - 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"]', - }, - }) - }, + 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 { - path: '', - 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 { - path: '', - 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 { + ), + ).toMatchInlineSnapshot(` + " + @layer utilities { @media (min-width: 500px) { .testmin-\\[500px\\]\\:underline { text-decoration-line: underline; @@ -2157,45 +2267,41 @@ describe('matchVariant', () => { 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 { - 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) - }, - }) - }, + 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 { + ), + ).toMatchInlineSnapshot(` + " + @layer utilities { @media (min-width: 500px) { .testmin-\\[500px\\]\\:italic { font-style: italic; @@ -2213,50 +2319,51 @@ describe('matchVariant', () => { 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 { - 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) - }, - }) - }, + 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 { + ), + ).toMatchInlineSnapshot(` + " + @layer utilities { @media (min-width: 100px) { @media (max-width: 400px) { .testmin-\\[100px\\]\\:testmax-\\[400px\\]\\:order-1 { @@ -2286,48 +2393,50 @@ describe('matchVariant', () => { } } } - }" + } + " `) }) 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 { - 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-[100px]:testmax-[200px]:focus:underline', - 'testmin-[100px]:testmax-[200px]:hover:underline', - ]) - // Expect :focus to come after :hover - expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(` - "@layer utilities { + 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) { @@ -2341,48 +2450,50 @@ 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 { - 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) - }, - }) - }, + 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 { + ), + ).toMatchInlineSnapshot(` + " + @layer utilities { @media (min-width: 100px) { @media (max-width: 400px) { .testmin-\\[100px\\]\\:testmax-\\[400px\\]\\:order-1 { @@ -2414,48 +2525,50 @@ describe('matchVariant', () => { } } } - }" + } + " `) }) 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 { - 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) - }, - }) - }, + 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 { + ), + ).toMatchInlineSnapshot(` + " + @layer utilities { @media (max-width: 400px) { @media (min-width: 100px) { .testmax-\\[400px\\]\\:testmin-\\[100px\\]\\:underline { @@ -2483,56 +2596,58 @@ describe('matchVariant', () => { } } } - }" + } + " `) }) 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 { - 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) - }, - }) - }, + 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 { + ), + ).toMatchInlineSnapshot(` + " + @layer utilities { @media (min-width: 100px) { @media (max-width: 400px) { .testmin-\\[100px\\]\\:testmax-\\[400px\\]\\:order-1 { @@ -2564,170 +2679,178 @@ describe('matchVariant', () => { } } } - }" + } + " `) }) 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 { - path: '', - 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 { - path: '', - 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 { - path: '', - 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 { - path: '', - 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 { - 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 + 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 (min-width: 250px) { + ), + ).toMatchInlineSnapshot(` + " + @container (min-width: 250px) { .my-container-\\[250px\\]\\:underline { text-decoration-line: underline; } @@ -2737,347 +2860,372 @@ describe('matchVariant', () => { .my-container-\\[250px\\]\\/placement\\:underline { text-decoration-line: underline; } - }" + } + " `) }) test('ignores variants that use :merge(…)', async () => { - let { build } = await compile( - 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}) ~ &`) - }, + 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}) ~ &`, + ) + }, + } + }, }, - }, - ) - let compiled = build([ - 'optional-[test]:flex', - 'group-optional-[test]:flex', - 'peer-optional-[test]:flex', - 'group-optional-[test]/foo:flex', - ]) - - expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(` - "@layer utilities { - .group-optional-\\[test\\]\\:flex:is(:where(.group):optional:has(test) :where(.group) *), .group-optional-\\[test\\]\\/foo\\:flex:is(:where(.group\\/foo):optional:has(test) :where(.group\\/foo) *), .peer-optional-\\[test\\]\\:flex:is(:where(.peer):optional:has(test) :where(.peer) ~ *), .optional-\\[test\\]\\:flex:optional:has(test) .optional-\\[test\\]\\:flex { + ), + ).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 () => { - let { build } = await compile( - 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', - }, - }) - }, + 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' }, + }) + }, + } + }, }, - }, - ) - - let compiled = build(['foo-[test]:flex', 'foo-known:flex', 'foo-unknown:flex']) - - expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(` - "@layer utilities { + ), + ).toMatchInlineSnapshot(` + " + @layer utilities { .foo-known\\:flex:is(known), .foo-\\[test\\]\\:flex:is(test) { display: flex; } - }" + } + " `) }) test('ignores variants that produce non-string values', async () => { - let { build } = await compile( - 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' }, - }, - }) - }, + 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' }, + }, + }) + }, + } + }, }, - }, - ) - - let compiled = build(['foo-[test]:flex', 'foo-string:flex', 'foo-object:flex']) - - expect(optimizeCss(compiled).trim()).toMatchInlineSnapshot(` - "@layer utilities { + ), + ).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 { - path: '', - base, - module: ({ addUtilities }: PluginAPI) => { - addUtilities({ - '.text-trim': { - 'text-box-trim': 'both', - 'text-box-edge': 'cap alphabetic', - }, - }) - }, - } - }, - }, - ) - - expect(optimizeCss(compiled.build(['text-trim', 'lg:text-trim'])).trim()) - .toMatchInlineSnapshot(` - "@layer utilities { - .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; } - @media (min-width: 1024px) { - .lg\\:text-trim { - text-box-trim: both; - text-box-edge: cap alphabetic; - } + @theme reference { + --breakpoint-lg: 1024px; } - }" - `) - }) - - 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 { - 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 { - 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 { - path: '', - base, - module: ({ addUtilities }: PluginAPI) => { - addUtilities([ - { + `, + { + 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', - }, - }, - ]) - }, - } + }) + }, + } + }, }, - }, - ) + ), + ).toMatchInlineSnapshot(` + " + @layer utilities { + .text-trim { + 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 { + @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 () => { + 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' }, + ], + }, + ]) + }, + } + }, + }, + ), + ).toMatchInlineSnapshot(` + " + .text-trim { text-box-trim: both; text-box-edge: cap alphabetic; - }" + } + " + `) + }) + + test('define multiple utilities with array syntax', async () => { + 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', + }, + }, + ]) + }, + } + }, + }, + ), + ).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 { - path: '', - 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 { - path: '', - 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 { - path: '', - 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; } @@ -3099,7 +3247,8 @@ describe('addUtilities()', () => { } } } - }" + } + " `) }) @@ -3117,7 +3266,7 @@ describe('addUtilities()', () => { } `, { - async loadModule(id, base) { + async loadModule(_id, base) { return { path: '', base, @@ -3133,399 +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 { - path: '', - 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 (min-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 { - path: '', - 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 { - 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', - }, - }) - }, - } - }, - }, - ) - expect( - compiled.build(['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j']).trim(), - ).toMatchInlineSnapshot( - ` - "@layer utilities { - .j { - &.j { - color: red; - } - .j& { - color: red; - } - } - .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; - } - } - }" - `, - ) - }) - - 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 { - path: '', - 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; - } - } - }" - `, - ) - }) - - test('replaces the class name with variants in nested selectors', async () => { - let compiled = await compile( - 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', - }, - }, - }) - }, - } - }, - }, - ) - - expect(compiled.build(['foo', 'md:foo', 'not-hover:md:foo']).trim()).toMatchInlineSnapshot(` - ".foo { - :where(.foo > :first-child) { - color: red; - } - } - .md\\:foo { - @media (width >= 768px) { - :where(.md\\:foo > :first-child) { - color: red; - } - } - } - .not-hover\\:md\\:foo { - &:not(*:hover) { - @media (width >= 768px) { - :where(.not-hover\\:md\\:foo > :first-child) { - color: red; - } - } - } - @media not (hover: hover) { - @media (width >= 768px) { - :where(.not-hover\\:md\\:foo > :first-child) { - color: red; - } - } - } - }" - `) - }) - - test('values that are `false`, `null`, or `undefined` are discarded from CSS object ASTs', async () => { - let compiled = await compile( - 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, - }, - }) - }, - } - }, - }, - ) - - expect(compiled.build(['foo']).trim()).toMatchInlineSnapshot(` - ".foo { - a: red; - z-index: 0; - }" - `) - }) -}) - -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; } @@ -3545,55 +3631,61 @@ describe('matchUtilities()', () => { .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(), - ).toEqual('') - }) - - test('custom functional utilities can start with @', async () => { - async function run(candidates: string[]) { - let compiled = await compile( - css` - @plugin "my-plugin"; - @tailwind utilities; - `, - + ], + input, { - async loadModule(id, base) { + async loadModule(_id, base) { return { path: '', base, module: ({ matchUtilities }: PluginAPI) => { matchUtilities( - { '@w': (value) => ({ width: value }) }, - { - values: { - 1: '1px', - }, - }, + { 'border-block': (value) => ({ 'border-block-width': value }) }, + { values: { DEFAULT: '1px', '2': '2px' } }, ) }, } }, }, - ) + ), + ).toEqual('') + }) - return compiled.build(candidates) - } - - expect(optimizeCss(await run(['@w-1', 'hover:@w-1'])).trim()).toMatchInlineSnapshot(` - ".\\@w-1 { + test('custom functional utilities can start with @', async () => { + expect( + await run( + ['@w-1', 'hover:@w-1'], + css` + @plugin "my-plugin"; + @tailwind utilities; + `, + { + async loadModule(_id, base) { + return { + path: '', + base, + module: ({ matchUtilities }: PluginAPI) => { + matchUtilities({ '@w': (value) => ({ width: value }) }, { values: { 1: '1px' } }) + }, + } + }, + }, + ), + ).toMatchInlineSnapshot(` + " + .\\@w-1 { width: 1px; } @@ -3601,198 +3693,195 @@ describe('matchUtilities()', () => { .hover\\:\\@w-1:hover { 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( + ['all-but-order-bottom-left-radius'], + css` + @plugin "my-plugin"; + @tailwind utilities; + `, + { + 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[], + }, + { 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; + } + + .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( + 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 { - 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', - }, - ) - }, - } - }, - }, - ) - - 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 { - 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', - }, - }, - ) - }, - } - }, - }, - ) - - 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('') }) @@ -3800,194 +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 { - path: '', - base, - module: ({ matchUtilities }: PluginAPI) => { - matchUtilities( - { - scrollbar: (value) => ({ 'scrollbar-color': value }), - }, - { type: ['color', 'any'] }, - ) - - matchUtilities( - { - scrollbar: (value) => ({ 'scrollbar-width': value }), - }, - { type: ['length'] }, - ) - }, - } + let options: Partial[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% -.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 { - 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', - }, - }, - ) - }, - } - }, - }, - ) - - return compiled.build(candidates) - } + @theme reference { + --breakpoint-lg: 1024px; + } + ` expect( - optimizeCss( - await run([ + await run( + [ 'scrollbar-black', 'scrollbar-black/50', 'scrollbar-2', @@ -3999,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; } @@ -4014,10 +4061,6 @@ 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\\)\\]\\/50 { scrollbar-color: var(--my-color); } @@ -4028,10 +4071,6 @@ describe('matchUtilities()', () => { } } - .scrollbar-\\[length\\:var\\(--my-width\\)\\] { - scrollbar-width: var(--my-width); - } - .scrollbar-\\[var\\(--my-color\\)\\], .scrollbar-\\[var\\(--my-color\\)\\]\\/50 { scrollbar-color: var(--my-color); } @@ -4048,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"; @@ -4074,46 +4138,24 @@ 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-\\[var\\(--my-color\\)\\]\\/\\[25\\%\\] { scrollbar-color: var(--my-color); } @@ -4143,13 +4185,15 @@ describe('matchUtilities()', () => { .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"; @@ -4160,9 +4204,8 @@ describe('matchUtilities()', () => { --opacity-my-opacity: 0.5; } `, - { - async loadModule(id, base) { + async loadModule(_id, base) { return { path: '', base, @@ -4174,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; } @@ -4204,51 +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 { - path: '', - 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; @@ -4270,7 +4292,8 @@ describe('matchUtilities()', () => { display: flex; } } - }" + } + " `) }) @@ -4289,7 +4312,7 @@ describe('matchUtilities()', () => { `, { - async loadModule(id, base) { + async loadModule(_id, base) { return { path: '', base, @@ -4305,202 +4328,179 @@ describe('matchUtilities()', () => { }, }, ) - }).rejects.toThrowError(/invalid utility name/) + }).rejects.toThrow(/invalid utility name/) }) test('replaces the class name with variants in nested selectors', async () => { - let compiled = await compile( - 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', - }, - }, - ) - }, + 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; + } - expect(compiled.build(['foo-red', 'md:foo-red', 'not-hover:md:foo-red']).trim()) - .toMatchInlineSnapshot(` - ".foo-red { - :where(.foo-red > :first-child) { + @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; } } - .md\\:foo-red { - @media (width >= 768px) { - :where(.md\\:foo-red > :first-child) { - color: red; - } - } - } - .not-hover\\:md\\:foo-red { - &:not(*:hover) { - @media (width >= 768px) { - :where(.not-hover\\:md\\:foo-red > :first-child) { - color: red; - } - } - } - @media not (hover: hover) { - @media (width >= 768px) { - :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 { - path: '', - 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', + }, + }, + }) + }, + } + }, }, - }, - ) + ), + ).toMatchInlineSnapshot(` + " + .btn { + border-radius: .25rem; + padding: .5rem 1rem; + font-weight: 600; + } - expect(optimizeCss(compiled.build(['btn', 'btn-blue', 'btn-red'])).trim()) - .toMatchInlineSnapshot(` - ".btn { - border-radius: .25rem; - padding: .5rem 1rem; - font-weight: 600; - } + .btn-blue { + color: #fff; + background-color: #3490dc; + } - .btn-blue { - color: #fff; - background-color: #3490dc; - } + .btn-blue:hover { + background-color: #2779bd; + } - .btn-blue:hover { - background-color: #2779bd; - } + .btn-red { + color: #fff; + background-color: #e3342f; + } - .btn-red { - color: #fff; - background-color: #e3342f; - } - - .btn-red:hover { - background-color: #cc1f1a; - }" - `) + .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 { - path: '', - 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' } }, + ) + }, + } + }, }, - }, - ) + ), + ).toMatchInlineSnapshot(` + " + .prose { + --container-size: normal; + } - expect(optimizeCss(compiled.build(['prose', 'sm:prose-sm', 'hover:prose-lg'])).trim()) - .toMatchInlineSnapshot(` - ".prose { - --container-size: normal; + @media (hover: hover) { + .hover\\:prose-lg:hover { + --container-size: lg; } - - @media (hover: hover) { - .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, @@ -4518,13 +4518,13 @@ 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, @@ -4546,13 +4546,13 @@ 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, @@ -4572,13 +4572,13 @@ 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, @@ -4592,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 3b2f0712c..11878fb30 100644 --- a/packages/tailwindcss/src/compat/plugin-api.ts +++ b/packages/tailwindcss/src/compat/plugin-api.ts @@ -1,10 +1,11 @@ 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' @@ -13,9 +14,9 @@ import { inferDataType } from '../utils/infer-data-type' import { segment } from '../utils/segment' import { toKeyPath } from '../utils/to-key-path' 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 @@ -201,6 +202,9 @@ 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 null @@ -222,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( @@ -281,7 +291,7 @@ export function buildPluginApi({ let selectorAst = SelectorParser.parse(name) let foundValidUtility = false - SelectorParser.walk(selectorAst, (node) => { + walk(selectorAst, (node) => { if ( node.kind === 'selector' && node.value[0] === '.' && @@ -300,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 )` is part of the + // condition, not a utility being defined. + node.value === ':nth-child' || + node.value === ':nth-last-child') + ) { + return WalkAction.Skip } }) @@ -318,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)}` } @@ -329,7 +346,7 @@ export function buildPluginApi({ } designSystem.utilities.static(className, (candidate) => { - let clonedAst = structuredClone(ast) + let clonedAst = ast.map(cloneAstNode) replaceNestedClassNameReferences(clonedAst, className, candidate.raw) featuresRef.current |= substituteAtApply(clonedAst, designSystem) return clonedAst @@ -405,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 @@ -429,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}%` @@ -588,14 +608,28 @@ 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 } }) } @@ -612,7 +646,7 @@ function replaceNestedClassNameReferences( 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 === `.${utilityName}`) { node.value = `.${escape(rawCandidate)}` } diff --git a/packages/tailwindcss/src/compat/plugin-functions.ts b/packages/tailwindcss/src/compat/plugin-functions.ts index 339bd11c6..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 ac73d8216..d81cd8de6 100644 --- a/packages/tailwindcss/src/compat/screens-config.test.ts +++ b/packages/tailwindcss/src/compat/screens-config.test.ts @@ -1,85 +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(` - ".max-w-screen-sm { + " + .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; } } @@ -88,100 +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(` - ".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; } } @@ -190,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; } } @@ -262,106 +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(` - ".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; } } @@ -375,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; } } @@ -453,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; } } @@ -531,70 +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(` - ".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; } } @@ -604,37 +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(`""`) + 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 f995c9de7..000000000 --- a/packages/tailwindcss/src/compat/selector-parser.test.ts +++ /dev/null @@ -1,176 +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', - }, - ], - }, - ]) - }) - - it('parses &:has(.child:nth-child(2))', () => { - expect(parse('&:has(.child:nth-child(2))')).toEqual([ - { - kind: 'selector', - value: '&', - }, - { - kind: 'function', - value: ':has', - 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: 'selector', - value: '&', - }, - { - kind: 'function', - value: ':has', - nodes: [ - { - kind: 'function', - value: ':nth-child', - nodes: [ - { - kind: 'value', - value: '2', - }, - ], - }, - ], - }, - ]) - }) -}) - -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 77a1ce4d4..000000000 --- a/packages/tailwindcss/src/compat/selector-parser.ts +++ /dev/null @@ -1,467 +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 replacedNode = false - let replacedNodeOffset = 0 - let status = - visit(node, { - parent, - replaceWith(newNode) { - if (replacedNode) return - replacedNode = true - - if (Array.isArray(newNode)) { - if (newNode.length === 0) { - ast.splice(i, 1) - replacedNodeOffset = 0 - } else if (newNode.length === 1) { - ast[i] = newNode[0] - replacedNodeOffset = 1 - } else { - ast.splice(i, 1, ...newNode) - replacedNodeOffset = newNode.length - } - } else { - ast[i] = newNode - replacedNodeOffset = 1 - } - }, - }) ?? SelectorWalkAction.Continue - - // We want to visit or skip 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. - if (replacedNode) { - if (status === SelectorWalkAction.Continue) { - i-- - } else { - i += replacedNodeOffset - 1 - } - 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 - - if (parent) { - parent.nodes.push(node) - } else { - 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 1331f5d3a..46f562918 100644 --- a/packages/tailwindcss/src/compile.ts +++ b/packages/tailwindcss/src/compile.ts @@ -1,13 +1,4 @@ -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 { CompileAstFlags, type DesignSystem } from './design-system' import GLOBAL_PROPERTY_ORDER from './property-order' @@ -15,6 +6,7 @@ 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, @@ -195,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 } @@ -295,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) } @@ -307,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) } 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`. 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` + // - 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` can only be + // converted to `0` if we're dealing with a `` 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 * something-without-unit` to just `0`, 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` to just `0`, 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` 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()) { + // 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) + + // 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 + + //
`, ) - 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 }) => { @@ -2177,6 +2177,330 @@ test('shadow DOM has access to variables', async ({ page }) => { expect(gap).toBe('8px') }) +// @scope related tests +{ + test('custom variant using `@scope`', async ({ page }) => { + let { getPropertyValue } = await render( + page, + html` +
+
In scope
+
+
Beyond the limit
+
+
+
Not in scope
+ `, + 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` +
+
In scope
+
+
Beyond the limit
+
+
+
Not in scope
+ ` + } + + 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` +
+
+ in scope +
+ beyond the limit +
+
+
+
+ scope not inside parent +
+ ` + } + + 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 `` 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` + +
+
+
ctrl
+
+
+ + +
+
+
ancestor
+
+
+ + +
+
+
+
beyond
+
+
+
+ ` + } + + 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` +
+
+ ` + + let { getPropertyValue } = await render( + page, + kind === 'group' + ? html`
${targets}
` + : html`
+
+ ${targets} +
`, + 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` +
+
+
+ `, + 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` +
+
+
+
+
+ `, + ) + + 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` +
+
+
+
+
+
+ `, + ) + + 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') @@ -2249,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) @@ -2257,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 52d447f7f..05364f5c2 100644 --- a/packages/tailwindcss/theme.css +++ b/packages/tailwindcss/theme.css @@ -1,7 +1,7 @@ @theme default { --font-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'; --font-serif: ui-serif, Georgia, Cambria, 'Times New Roman', Times, serif; --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', @@ -235,7 +235,7 @@ --color-gray-900: oklch(21% 0.034 264.665); --color-gray-950: oklch(13% 0.028 261.692); - --color-zinc-50: oklch(98.5% 0 0); + --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); @@ -247,17 +247,17 @@ --color-zinc-900: oklch(21% 0.006 285.885); --color-zinc-950: oklch(14.1% 0.005 285.823); - --color-neutral-50: oklch(98.5% 0 0); - --color-neutral-100: oklch(97% 0 0); - --color-neutral-200: oklch(92.2% 0 0); - --color-neutral-300: oklch(87% 0 0); - --color-neutral-400: oklch(70.8% 0 0); - --color-neutral-500: oklch(55.6% 0 0); - --color-neutral-600: oklch(43.9% 0 0); - --color-neutral-700: oklch(37.1% 0 0); - --color-neutral-800: oklch(26.9% 0 0); - --color-neutral-900: oklch(20.5% 0 0); - --color-neutral-950: oklch(14.5% 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(98.5% 0.001 106.423); --color-stone-100: oklch(97% 0.001 106.424); @@ -271,6 +271,54 @@ --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; 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/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.1.patch b/patches/@parcel__watcher@2.6.0.patch similarity index 52% rename from patches/@parcel__watcher@2.5.1.patch rename to patches/@parcel__watcher@2.6.0.patch index ed9fa9040..37ff83f04 100644 --- a/patches/@parcel__watcher@2.5.1.patch +++ b/patches/@parcel__watcher@2.6.0.patch @@ -1,20 +1,22 @@ diff --git a/index.js b/index.js -index 8afb2b1126dcc687b7ff9b631589da252c1f9c22..398af238a439912d150b3573367873d2a9a311e3 100644 +index 78ee744d74900c39a839cafa46b295258fc86307..f28fd092644ccfb8aff2618b966cb5219a181a02 100644 --- a/index.js +++ b/index.js -@@ -1,41 +1,34 @@ --const {createWrapper} = require('./wrapper'); -+const { createWrapper } = require('./wrapper') +@@ -1,43 +1,32 @@ + const {createWrapper} = require('./wrapper'); -let name = `@parcel/watcher-${process.platform}-${process.arch}`; -if (process.platform === 'linux') { -- const { MUSL, family } = require('detect-libc'); +- 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") { @@ -22,7 +24,8 @@ index 8afb2b1126dcc687b7ff9b631589da252c1f9c22..398af238a439912d150b3573367873d2 + } else if (process.env.PLATFORM_LIBC === "glibc") { + return require(`@parcel/watcher-${process.platform}-${process.arch}-glibc`) + } else { -+ let { MUSL, GLIBC, family, familySync } = require('detect-libc') ++ let { MUSL, GLIBC, familySync } = require('detect-libc') ++ let family = familySync() -let binding; -try { @@ -37,14 +40,12 @@ index 8afb2b1126dcc687b7ff9b631589da252c1f9c22..398af238a439912d150b3573367873d2 - 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.`); +- 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.`, +- ); - } - } -} -+ // 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() -function handleError(err) { - if (err?.code !== 'MODULE_NOT_FOUND') { @@ -63,12 +64,7 @@ index 8afb2b1126dcc687b7ff9b631589da252c1f9c22..398af238a439912d150b3573367873d2 } -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 ++const wrapper = createWrapper(loadPackage()); + exports.writeSnapshot = wrapper.writeSnapshot; + exports.getEventsSince = wrapper.getEventsSince; + exports.subscribe = wrapper.subscribe; diff --git a/patches/lightningcss@1.30.1.patch b/patches/lightningcss@1.33.0.patch similarity index 58% rename from patches/lightningcss@1.30.1.patch rename to patches/lightningcss@1.33.0.patch index 204f06ab3..e70be2315 100644 --- a/patches/lightningcss@1.30.1.patch +++ b/patches/lightningcss@1.33.0.patch @@ -1,8 +1,8 @@ diff --git a/node/index.js b/node/index.js -index 011d04b450687083e7a0ec9023c41ee79104831c..ef26db49d98c60b5b31f3601f6ad045f0b0e8f4f 100644 +index 6fe25aef457aa5448f9ee6204da1e253f5534800..742be0229b94450b631b6e069ffc372d2b35df47 100644 --- a/node/index.js +++ b/node/index.js -@@ -1,28 +1,41 @@ +@@ -1,25 +1,40 @@ -let parts = [process.platform, process.arch]; -if (process.platform === 'linux') { - const { MUSL, familySync } = require('detect-libc'); @@ -11,12 +11,8 @@ index 011d04b450687083e7a0ec9023c41ee79104831c..ef26db49d98c60b5b31f3601f6ad045f - parts.push('musl'); - } else if (process.arch === 'arm') { - parts.push('gnueabihf'); -- } else { -- parts.push('gnu'); -- } --} else if (process.platform === 'win32') { -- parts.push('msvc'); --} ++// 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') { @@ -28,19 +24,8 @@ index 011d04b450687083e7a0ec9023c41ee79104831c..ef26db49d98c60b5b31f3601f6ad045f + return require(`lightningcss-${process.platform}-${process.arch}-gnu`) + } + } else { -+ let { MUSL, GLIBC, family, familySync } = require('detect-libc') - --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`); -+ // 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 { MUSL, GLIBC, familySync } = require('detect-libc') ++ let family = familySync() + + if (family === MUSL) { + return require(`lightningcss-${process.platform}-${process.arch}-musl`) @@ -56,15 +41,22 @@ index 011d04b450687083e7a0ec9023c41ee79104831c..ef26db49d98c60b5b31f3601f6ad045f + } + } else if (process.platform === 'win32') { + return require(`lightningcss-${process.platform}-${process.arch}-msvc`) -+ } else { + } else { +- parts.push('gnu'); + return require(`lightningcss-${process.platform}-${process.arch}`) } +-} else if (process.platform === 'win32') { +- parts.push('msvc'); } - --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 + +-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/page.module.css b/playgrounds/nextjs/app/page.module.css index 4c5bdd253..b0117f44c 100644 --- a/playgrounds/nextjs/app/page.module.css +++ b/playgrounds/nextjs/app/page.module.css @@ -1,5 +1,5 @@ @reference "./globals.css"; .heading { - @apply skew-7; + @apply text-red-500; } diff --git a/playgrounds/nextjs/package.json b/playgrounds/nextjs/package.json index 6d2d3236c..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.3", - "next": "15.4.7", - "react": "^19.1.1", - "react-dom": "^19.1.1", + "next": "16.2.7", + "react": "19.2.7", + "react-dom": "19.2.7", "tailwindcss": "workspace:^" }, "devDependencies": { "@types/node": "catalog:", - "@types/react": "^19.1.9", - "@types/react-dom": "^19.1.7", - "eslint": "^9.33.0", - "eslint-config-next": "^15.4.7", - "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 62f33e670..8c08310db 100644 --- a/playgrounds/v3/package.json +++ b/playgrounds/v3/package.json @@ -9,18 +9,16 @@ "upgrade": "node scripts/upgrade.mjs" }, "dependencies": { - "next": "15.4.7", - "react": "^19.1.1", - "react-dom": "^19.1.1", + "next": "16.2.7", + "react": "19.2.7", + "react-dom": "19.2.7", "tailwindcss": "^3" }, "devDependencies": { - "@types/node": "^20.14.8", - "@types/react": "^19.1.9", - "@types/react-dom": "^19.1.7", - "autoprefixer": "^10.4.21", - "eslint": "^9.33.0", - "eslint-config-next": "^15.4.7", - "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 774d135e7..25ab1a33b 100644 --- a/playgrounds/vite/package.json +++ b/playgrounds/vite/package.json @@ -10,15 +10,15 @@ }, "dependencies": { "@tailwindcss/vite": "workspace:^", - "@vitejs/plugin-react": "^5.0.0", - "react": "^19.1.1", - "react-dom": "^19.1.1", + "@vitejs/plugin-react": "^6.0.2", + "react": "^19.2.6", + "react-dom": "^19.2.6", "tailwindcss": "workspace:^" }, "devDependencies": { - "@types/react": "^19.1.9", - "@types/react-dom": "^19.1.7", - "bun": "^1.2.20", + "@types/react": "^19.2.15", + "@types/react-dom": "^19.2.3", + "bun": "^1.3.14", "vite": "catalog:" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 55527b9ec..8382b2ba5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,94 +6,136 @@ settings: 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: ^20.19.0 - version: 20.19.1 + 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.30.1 - version: 1.30.1 + specifier: 1.33.0 + version: 1.33.0 lightningcss-darwin-arm64: - specifier: 1.30.1 - version: 1.30.1 + specifier: 1.33.0 + version: 1.33.0 lightningcss-darwin-x64: - specifier: 1.30.1 - version: 1.30.1 + specifier: 1.33.0 + version: 1.33.0 lightningcss-linux-arm64-gnu: - specifier: 1.30.1 - version: 1.30.1 + specifier: 1.33.0 + version: 1.33.0 lightningcss-linux-arm64-musl: - specifier: 1.30.1 - version: 1.30.1 + specifier: 1.33.0 + version: 1.33.0 lightningcss-linux-x64-gnu: - specifier: 1.30.1 - version: 1.30.1 + specifier: 1.33.0 + version: 1.33.0 lightningcss-linux-x64-musl: - specifier: 1.30.1 - version: 1.30.1 + specifier: 1.33.0 + version: 1.33.0 lightningcss-win32-x64-msvc: - specifier: 1.30.1 - version: 1.30.1 + specifier: 1.33.0 + version: 1.33.0 + postcss: + specifier: ^8.5.25 + version: 8.5.25 prettier: - specifier: 3.6.2 - version: 3.6.2 + specifier: 3.9.6 + version: 3.9.6 vite: - specifier: ^7.0.0 - version: 7.0.0 + specifier: ^8.2.0 + version: 8.2.0 + webpack: + specifier: ^5.109.2 + version: 5.109.2 patchedDependencies: - '@parcel/watcher@2.5.1': - hash: zs2vvlrje3h42xp5ed2v44fep4 - path: patches/@parcel__watcher@2.5.1.patch - lightningcss@1.30.1: - hash: tzyxy3asfxcqc7ihrooumyi5fm - path: patches/lightningcss@1.30.1.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.55.0 - version: 1.55.0 + specifier: ^1.62.1 + version: 1.62.1 '@types/node': specifier: 'catalog:' - version: 20.19.1 + version: 22.20.1 postcss: - specifier: 8.5.6 - version: 8.5.6 + specifier: 'catalog:' + version: 8.5.25 postcss-import: specifier: ^16.1.1 - version: 16.1.1(postcss@8.5.6) + version: 16.1.1(postcss@8.5.25) prettier: specifier: 'catalog:' - version: 3.6.2 + version: 3.9.6 prettier-plugin-embed: - specifier: ^0.5.0 - version: 0.5.0 + specifier: ^0.5.1 + version: 0.5.1 prettier-plugin-organize-imports: - specifier: ^4.2.0 - version: 4.2.0(prettier@3.6.2)(typescript@5.5.4) + specifier: ^4.3.0 + version: 4.3.0(prettier@3.9.6)(typescript@5.9.3) tsup: - specifier: ^8.5.0 - version: 8.5.0(jiti@2.5.1)(postcss@8.5.6)(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.5.4 - version: 2.5.4 + 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.19.1)(lightningcss@1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm))(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: - dependencies: - detect-libc: - specifier: ^2.0.4 - version: 2.0.4 - tar: - specifier: ^7.4.3 - version: 7.4.3 + 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:* @@ -131,16 +173,6 @@ importers: '@tailwindcss/oxide-win32-x64-msvc': specifier: workspace:* version: link:npm/win32-x64-msvc - devDependencies: - '@napi-rs/cli': - specifier: ^3.2.0 - version: 3.2.0(@emnapi/runtime@1.5.0)(@types/node@20.19.1)(emnapi@1.5.0(node-addon-api@8.3.0)) - '@napi-rs/wasm-runtime': - specifier: ^1.0.5 - version: 1.0.5 - emnapi: - specifier: 1.5.0 - version: 1.5.0(node-addon-api@8.3.0) crates/node/npm/android-arm-eabi: {} @@ -165,22 +197,22 @@ importers: crates/node/npm/wasm32-wasi: dependencies: '@emnapi/core': - specifier: ^1.5.0 - version: 1.5.0 + specifier: ^1.11.3 + version: 1.11.3 '@emnapi/runtime': - specifier: ^1.5.0 - version: 1.5.0 + specifier: ^1.11.3 + version: 1.11.3 '@emnapi/wasi-threads': - specifier: ^1.1.0 - version: 1.1.0 + specifier: ^1.2.3 + version: 1.2.3 '@napi-rs/wasm-runtime': - specifier: ^1.0.5 - version: 1.0.5 + specifier: ^1.2.2 + version: 1.2.2(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) '@tybys/wasm-util': - specifier: ^0.10.1 - version: 0.10.1 + specifier: ^0.10.3 + version: 0.10.3 tslib: - specifier: ^2.4.0 + specifier: ^2.8.1 version: 2.8.1 crates/node/npm/win32-arm64-msvc: {} @@ -190,23 +222,26 @@ importers: integrations: devDependencies: dedent: - specifier: 1.6.0 - version: 1.6.0 + specifier: 'catalog:' + version: 1.7.2 fast-glob: 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.4 - version: 1.15.4 + specifier: ^1.15.11 + version: 1.15.11 listhen: - specifier: ^1.9.0 - version: 1.9.0 + specifier: ^1.10.1 + version: 1.10.1(@parcel/watcher@2.6.0(patch_hash=705ce75ccea54337110c4d7fe0a8b421658ea0c23e1a77c1fa890a86041179da)) tailwindcss: specifier: workspace:* version: link:../tailwindcss @@ -214,8 +249,8 @@ importers: packages/@tailwindcss-cli: dependencies: '@parcel/watcher': - specifier: ^2.5.1 - version: 2.5.1(patch_hash=zs2vvlrje3h42xp5ed2v44fep4) + specifier: 'catalog:' + version: 2.6.0(patch_hash=705ce75ccea54337110c4d7fe0a8b421658ea0c23e1a77c1fa890a86041179da) '@tailwindcss/node': specifier: workspace:* version: link:../@tailwindcss-node @@ -223,8 +258,8 @@ importers: specifier: workspace:* version: link:../../crates/node enhanced-resolve: - specifier: ^5.18.3 - version: 5.18.3 + specifier: 'catalog:' + version: 5.24.5 mri: specifier: ^1.2.0 version: 1.2.0 @@ -238,20 +273,20 @@ importers: packages/@tailwindcss-node: dependencies: '@jridgewell/remapping': - specifier: ^2.3.4 + specifier: ^2.3.5 version: 2.3.5 enhanced-resolve: - specifier: ^5.18.3 - version: 5.18.3 + specifier: 'catalog:' + version: 5.24.5 jiti: - specifier: ^2.5.1 - version: 2.5.1 + specifier: ^2.7.0 + version: 2.7.0 lightningcss: specifier: 'catalog:' - version: 1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm) + version: 1.33.0(patch_hash=1d4a8800d60d13d42887b88b3a86576df4b451670308145fb432ec8abbf40930) magic-string: - specifier: ^0.30.18 - version: 0.30.18 + specifier: ^1.1.0 + version: 1.1.0 source-map-js: specifier: ^1.2.1 version: 1.2.1 @@ -271,27 +306,27 @@ importers: specifier: workspace:* version: link:../../crates/node 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.19.1 + version: 22.20.1 '@types/postcss-import': specifier: 14.0.3 version: 14.0.3 dedent: - specifier: 1.6.0 - version: 1.6.0 + specifier: 'catalog:' + version: 1.7.2 internal-example-plugin: specifier: workspace:* version: link:../internal-example-plugin postcss-import: specifier: ^16.1.1 - version: 16.1.1(postcss@8.4.41) + version: 16.1.1(postcss@8.5.25) packages/@tailwindcss-standalone: dependencies: @@ -302,69 +337,91 @@ importers: specifier: workspace:* version: link:../@tailwindcss-cli '@tailwindcss/forms': - specifier: ^0.5.10 - version: 0.5.10(tailwindcss@packages+tailwindcss) + specifier: ^0.5.11 + version: 0.5.11(tailwindcss@packages+tailwindcss) '@tailwindcss/typography': - specifier: ^0.5.16 - version: 0.5.16(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.18.3 - version: 5.18.3 + specifier: 'catalog:' + version: 5.24.5 tailwindcss: specifier: workspace:* version: link:../tailwindcss devDependencies: '@parcel/watcher-darwin-arm64': - specifier: ^2.5.1 - version: 2.5.1 + specifier: 'catalog:' + version: 2.6.0 '@parcel/watcher-darwin-x64': - specifier: ^2.5.1 - version: 2.5.1 + specifier: 'catalog:' + version: 2.6.0 '@parcel/watcher-linux-arm64-glibc': - specifier: ^2.5.1 - version: 2.5.1 + specifier: 'catalog:' + version: 2.6.0 '@parcel/watcher-linux-arm64-musl': - specifier: ^2.5.1 - version: 2.5.1 + specifier: 'catalog:' + version: 2.6.0 '@parcel/watcher-linux-x64-glibc': - specifier: ^2.5.1 - version: 2.5.1 + specifier: 'catalog:' + version: 2.6.0 '@parcel/watcher-linux-x64-musl': - specifier: ^2.5.1 - version: 2.5.1 + specifier: 'catalog:' + version: 2.6.0 '@parcel/watcher-win32-x64': - specifier: ^2.5.1 - version: 2.5.1 + specifier: 'catalog:' + version: 2.6.0 '@types/bun': - specifier: ^1.2.20 - version: 1.2.20(@types/react@19.1.9) + specifier: ^1.3.14 + version: 1.3.14 bun: - specifier: ^1.2.20 - version: 1.2.20 + specifier: ^1.3.14 + version: 1.3.14 lightningcss-darwin-arm64: specifier: 'catalog:' - version: 1.30.1 + version: 1.33.0 lightningcss-darwin-x64: specifier: 'catalog:' - version: 1.30.1 + version: 1.33.0 lightningcss-linux-arm64-gnu: specifier: 'catalog:' - version: 1.30.1 + version: 1.33.0 lightningcss-linux-arm64-musl: specifier: 'catalog:' - version: 1.30.1 + version: 1.33.0 lightningcss-linux-x64-gnu: specifier: 'catalog:' - version: 1.30.1 + version: 1.33.0 lightningcss-linux-x64-musl: specifier: 'catalog:' - version: 1.30.1 + version: 1.33.0 lightningcss-win32-x64-msvc: specifier: 'catalog:' - version: 1.30.1 + 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: @@ -374,21 +431,18 @@ importers: '@tailwindcss/oxide': specifier: workspace:* version: link:../../crates/node - braces: - specifier: ^3.0.3 - version: 3.0.3 dedent: - specifier: 1.6.0 - version: 1.6.0 + specifier: 'catalog:' + version: 1.7.2 enhanced-resolve: - specifier: ^5.18.3 - version: 5.18.3 + specifier: 'catalog:' + version: 5.24.5 globby: - specifier: ^14.1.0 - version: 14.1.0 + specifier: ^16.2.2 + version: 16.2.2 jiti: - specifier: ^2.0.0-beta.3 - version: 2.5.1 + specifier: ^2.7.0 + version: 2.7.0 mri: specifier: ^1.2.0 version: 1.2.0 @@ -396,42 +450,39 @@ 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.1 - version: 16.1.1(postcss@8.4.41) + version: 16.1.1(postcss@8.5.25) postcss-selector-parser: - specifier: ^7.1.0 - version: 7.1.0 + specifier: ^7.1.4 + version: 7.1.4 prettier: specifier: 'catalog:' - version: 3.6.2 + version: 3.9.6 semver: - specifier: ^7.7.2 - version: 7.7.2 + specifier: ^7.8.5 + version: 7.8.5 tailwindcss: specifier: workspace:* version: link:../tailwindcss tree-sitter: - specifier: ^0.22.4 - version: 0.22.4 + specifier: ^0.25.1 + version: 0.25.1 tree-sitter-typescript: specifier: ^0.23.2 - version: 0.23.2(tree-sitter@0.22.4) + version: 0.23.2(tree-sitter@0.25.1) devDependencies: - '@types/braces': - specifier: ^3.0.5 - version: 3.0.5 '@types/node': specifier: 'catalog:' - version: 20.19.1 + version: 22.20.1 '@types/postcss-import': specifier: ^14.0.3 version: 14.0.3 '@types/semver': - specifier: ^7.7.0 - version: 7.7.0 + specifier: ^7.8.0 + version: 7.8.0 packages/@tailwindcss-vite: dependencies: @@ -447,33 +498,58 @@ importers: devDependencies: '@types/node': specifier: 'catalog:' - version: 20.19.1 + version: 22.20.1 vite: specifier: 'catalog:' - version: 7.0.0(@types/node@20.19.1)(jiti@2.5.1)(lightningcss@1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm))(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.4 + specifier: ^2.3.5 version: 2.3.5 '@tailwindcss/oxide': specifier: workspace:^ version: link:../../crates/node '@types/node': specifier: 'catalog:' - version: 20.19.1 + version: 22.20.1 dedent: - specifier: 1.6.0 - version: 1.6.0 + specifier: 'catalog:' + version: 1.7.2 lightningcss: specifier: 'catalog:' - version: 1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm) + version: 1.33.0(patch_hash=1d4a8800d60d13d42887b88b3a86576df4b451670308145fb432ec8abbf40930) magic-string: - specifier: ^0.30.18 - version: 0.30.18 + specifier: ^1.1.0 + version: 1.1.0 source-map-js: specifier: ^1.2.1 version: 1.2.1 @@ -487,73 +563,61 @@ importers: specifier: ^3.3.3 version: 3.3.3 next: - specifier: 15.4.7 - version: 15.4.7(@playwright/test@1.55.0)(react-dom@19.1.1(react@19.1.1))(react@19.1.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: ^19.1.1 - version: 19.1.1 + specifier: 19.2.7 + version: 19.2.7 react-dom: - specifier: ^19.1.1 - version: 19.1.1(react@19.1.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.19.1 + version: 22.20.1 '@types/react': - specifier: ^19.1.9 - version: 19.1.9 + specifier: 19.2.15 + version: 19.2.15 '@types/react-dom': - specifier: ^19.1.7 - version: 19.1.7(@types/react@19.1.9) - eslint: - specifier: ^9.33.0 - version: 9.33.0(jiti@2.5.1) - eslint-config-next: - specifier: ^15.4.7 - version: 15.4.7(eslint@9.33.0(jiti@2.5.1))(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.4.7 - version: 15.4.7(@playwright/test@1.55.0)(react-dom@19.1.1(react@19.1.1))(react@19.1.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: ^19.1.1 - version: 19.1.1 + specifier: 19.2.7 + version: 19.2.7 react-dom: - specifier: ^19.1.1 - version: 19.1.1(react@19.1.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: ^19.1.9 - version: 19.1.9 + specifier: 19.2.15 + version: 19.2.15 '@types/react-dom': - specifier: ^19.1.7 - version: 19.1.7(@types/react@19.1.9) + specifier: 19.2.3 + version: 19.2.3(@types/react@19.2.15) autoprefixer: - specifier: ^10.4.21 - version: 10.4.21(postcss@8.4.47) - eslint: - specifier: ^9.33.0 - version: 9.33.0(jiti@2.5.1) - eslint-config-next: - specifier: ^15.4.7 - version: 15.4.7(eslint@9.33.0(jiti@2.5.1))(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: @@ -561,30 +625,30 @@ importers: specifier: workspace:^ version: link:../../packages/@tailwindcss-vite '@vitejs/plugin-react': - specifier: ^5.0.0 - version: 5.0.0(vite@7.0.0(@types/node@20.19.1)(jiti@2.5.1)(lightningcss@1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm))(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: ^19.1.1 - version: 19.1.1 + specifier: ^19.2.6 + version: 19.2.6 react-dom: - specifier: ^19.1.1 - version: 19.1.1(react@19.1.1) + specifier: ^19.2.6 + version: 19.2.6(react@19.2.6) tailwindcss: specifier: workspace:^ version: link:../../packages/tailwindcss devDependencies: '@types/react': - specifier: ^19.1.9 - version: 19.1.9 + specifier: ^19.2.15 + version: 19.2.15 '@types/react-dom': - specifier: ^19.1.7 - version: 19.1.7(@types/react@19.1.9) + specifier: ^19.2.3 + version: 19.2.3(@types/react@19.2.15) bun: - specifier: ^1.2.20 - version: 1.2.20 + specifier: ^1.3.14 + version: 1.3.14 vite: specifier: 'catalog:' - version: 7.0.0(@types/node@20.19.1)(jiti@2.5.1)(lightningcss@1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm))(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: @@ -592,862 +656,478 @@ packages: 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.27.1': - resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==} - engines: {node: '>=6.9.0'} + '@emnapi/core@1.11.3': + resolution: {integrity: sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==} - '@babel/compat-data@7.27.5': - resolution: {integrity: sha512-KiRAp/VoJaWkkte84TvUd9qjdbZAdiqyvMxrGl1N6vzFogKmaLgoM3L1kgtLicp2HP5fBJS8JrZKLVIZGVJAVg==} - engines: {node: '>=6.9.0'} + '@emnapi/core@2.0.0-alpha.3': + resolution: {integrity: sha512-AZypUeJ/yByuxyS7BlSNRDOMLMlROYtjYdIAuBmJssVz1UJDSeYxLrdizhXCFYhedC5bqd/ASy8EuNXbVVXp9g==} - '@babel/core@7.28.0': - resolution: {integrity: sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==} - engines: {node: '>=6.9.0'} + '@emnapi/runtime@1.10.0': + resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==} - '@babel/generator@7.28.0': - resolution: {integrity: sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==} - engines: {node: '>=6.9.0'} + '@emnapi/runtime@1.11.3': + resolution: {integrity: sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==} - '@babel/helper-compilation-targets@7.27.2': - resolution: {integrity: sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==} - engines: {node: '>=6.9.0'} + '@emnapi/runtime@2.0.0-alpha.3': + resolution: {integrity: sha512-hFPAhMUjJD9BSyCANEISPOogeXC9Zo9ZQl7L6vKnaVsMkCtzznaW/naYypeyl0Gv5rYfWYsZbpixTMpjDJzQeA==} - '@babel/helper-globals@7.28.0': - resolution: {integrity: sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==} - engines: {node: '>=6.9.0'} + '@emnapi/wasi-threads@1.2.1': + resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==} - '@babel/helper-module-imports@7.27.1': - resolution: {integrity: sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==} - engines: {node: '>=6.9.0'} + '@emnapi/wasi-threads@1.2.3': + resolution: {integrity: sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==} - '@babel/helper-module-transforms@7.27.3': - resolution: {integrity: sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 + '@emnapi/wasi-threads@2.0.1': + resolution: {integrity: sha512-9DsSk+o5NBX0CCJT8s0EROGSGxjR/tKu6aBTaVyq+SjAEQH4XcdcRxPBRzsBLizTTJ49MJjF+jgu3qnO9GLQcQ==} - '@babel/helper-plugin-utils@7.27.1': - resolution: {integrity: sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==} - engines: {node: '>=6.9.0'} - - '@babel/helper-string-parser@7.27.1': - resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==} - engines: {node: '>=6.9.0'} - - '@babel/helper-validator-identifier@7.27.1': - resolution: {integrity: sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==} - engines: {node: '>=6.9.0'} - - '@babel/helper-validator-option@7.27.1': - resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==} - engines: {node: '>=6.9.0'} - - '@babel/helpers@7.27.6': - resolution: {integrity: sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==} - engines: {node: '>=6.9.0'} - - '@babel/parser@7.28.0': - resolution: {integrity: sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==} - engines: {node: '>=6.0.0'} - hasBin: true - - '@babel/plugin-transform-react-jsx-self@7.27.1': - resolution: {integrity: sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-react-jsx-source@7.27.1': - resolution: {integrity: sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/template@7.27.2': - resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==} - engines: {node: '>=6.9.0'} - - '@babel/traverse@7.28.0': - resolution: {integrity: sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==} - engines: {node: '>=6.9.0'} - - '@babel/types@7.28.2': - resolution: {integrity: sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==} - engines: {node: '>=6.9.0'} - - '@emnapi/core@1.5.0': - resolution: {integrity: sha512-sbP8GzB1WDzacS8fgNPpHlp6C9VZe+SJP3F90W9rLemaQj2PzIuTEl1qDOYQf58YIpyjViI24y9aPWCjEzY2cg==} - - '@emnapi/runtime@1.5.0': - resolution: {integrity: sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==} - - '@emnapi/wasi-threads@1.1.0': - resolution: {integrity: sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==} - - '@esbuild/aix-ppc64@0.21.5': - resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [aix] - - '@esbuild/aix-ppc64@0.23.1': - resolution: {integrity: sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==} + '@esbuild/aix-ppc64@0.27.7': + resolution: {integrity: sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] - '@esbuild/aix-ppc64@0.25.0': - resolution: {integrity: sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==} - 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'} - cpu: [arm64] - os: [android] - - '@esbuild/android-arm64@0.23.1': - resolution: {integrity: sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==} + '@esbuild/android-arm64@0.27.7': + resolution: {integrity: sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==} engines: {node: '>=18'} cpu: [arm64] os: [android] - '@esbuild/android-arm64@0.25.0': - resolution: {integrity: sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==} - engines: {node: '>=18'} - cpu: [arm64] - os: [android] - - '@esbuild/android-arm@0.21.5': - resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - - '@esbuild/android-arm@0.23.1': - resolution: {integrity: sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==} + '@esbuild/android-arm@0.27.7': + resolution: {integrity: sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==} engines: {node: '>=18'} cpu: [arm] os: [android] - '@esbuild/android-arm@0.25.0': - resolution: {integrity: sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==} - engines: {node: '>=18'} - cpu: [arm] - os: [android] - - '@esbuild/android-x64@0.21.5': - resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - - '@esbuild/android-x64@0.23.1': - resolution: {integrity: sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==} + '@esbuild/android-x64@0.27.7': + resolution: {integrity: sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==} engines: {node: '>=18'} cpu: [x64] os: [android] - '@esbuild/android-x64@0.25.0': - resolution: {integrity: sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==} - engines: {node: '>=18'} - cpu: [x64] - os: [android] - - '@esbuild/darwin-arm64@0.21.5': - resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - - '@esbuild/darwin-arm64@0.23.1': - resolution: {integrity: sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==} + '@esbuild/darwin-arm64@0.27.7': + resolution: {integrity: sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] - '@esbuild/darwin-arm64@0.25.0': - resolution: {integrity: sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==} - engines: {node: '>=18'} - cpu: [arm64] - os: [darwin] - - '@esbuild/darwin-x64@0.21.5': - resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - - '@esbuild/darwin-x64@0.23.1': - resolution: {integrity: sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==} + '@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.25.0': - resolution: {integrity: sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==} - engines: {node: '>=18'} - cpu: [x64] - os: [darwin] - - '@esbuild/freebsd-arm64@0.21.5': - resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - - '@esbuild/freebsd-arm64@0.23.1': - resolution: {integrity: sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==} + '@esbuild/freebsd-arm64@0.27.7': + resolution: {integrity: sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-arm64@0.25.0': - resolution: {integrity: sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==} - 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'} - cpu: [x64] - os: [freebsd] - - '@esbuild/freebsd-x64@0.23.1': - resolution: {integrity: sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==} + '@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.25.0': - resolution: {integrity: sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==} - engines: {node: '>=18'} - cpu: [x64] - os: [freebsd] - - '@esbuild/linux-arm64@0.21.5': - resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - - '@esbuild/linux-arm64@0.23.1': - resolution: {integrity: sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==} + '@esbuild/linux-arm64@0.27.7': + resolution: {integrity: sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==} engines: {node: '>=18'} cpu: [arm64] os: [linux] - '@esbuild/linux-arm64@0.25.0': - resolution: {integrity: sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==} - engines: {node: '>=18'} - cpu: [arm64] - os: [linux] - - '@esbuild/linux-arm@0.21.5': - resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - - '@esbuild/linux-arm@0.23.1': - resolution: {integrity: sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==} + '@esbuild/linux-arm@0.27.7': + resolution: {integrity: sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==} engines: {node: '>=18'} cpu: [arm] os: [linux] - '@esbuild/linux-arm@0.25.0': - resolution: {integrity: sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==} - engines: {node: '>=18'} - cpu: [arm] - os: [linux] - - '@esbuild/linux-ia32@0.21.5': - resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - - '@esbuild/linux-ia32@0.23.1': - resolution: {integrity: sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==} + '@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.25.0': - resolution: {integrity: sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==} - engines: {node: '>=18'} - cpu: [ia32] - os: [linux] - - '@esbuild/linux-loong64@0.21.5': - resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - - '@esbuild/linux-loong64@0.23.1': - resolution: {integrity: sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==} + '@esbuild/linux-loong64@0.27.7': + resolution: {integrity: sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==} engines: {node: '>=18'} cpu: [loong64] os: [linux] - '@esbuild/linux-loong64@0.25.0': - resolution: {integrity: sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==} - engines: {node: '>=18'} - cpu: [loong64] - os: [linux] - - '@esbuild/linux-mips64el@0.21.5': - resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - - '@esbuild/linux-mips64el@0.23.1': - resolution: {integrity: sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==} + '@esbuild/linux-mips64el@0.27.7': + resolution: {integrity: sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] - '@esbuild/linux-mips64el@0.25.0': - resolution: {integrity: sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==} - 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'} - cpu: [ppc64] - os: [linux] - - '@esbuild/linux-ppc64@0.23.1': - resolution: {integrity: sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==} + '@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.25.0': - resolution: {integrity: sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==} - engines: {node: '>=18'} - cpu: [ppc64] - os: [linux] - - '@esbuild/linux-riscv64@0.21.5': - resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - - '@esbuild/linux-riscv64@0.23.1': - resolution: {integrity: sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==} + '@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.25.0': - resolution: {integrity: sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==} - engines: {node: '>=18'} - cpu: [riscv64] - os: [linux] - - '@esbuild/linux-s390x@0.21.5': - resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - - '@esbuild/linux-s390x@0.23.1': - resolution: {integrity: sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==} + '@esbuild/linux-s390x@0.27.7': + resolution: {integrity: sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==} engines: {node: '>=18'} cpu: [s390x] os: [linux] - '@esbuild/linux-s390x@0.25.0': - resolution: {integrity: sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==} - engines: {node: '>=18'} - cpu: [s390x] - os: [linux] - - '@esbuild/linux-x64@0.21.5': - resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - - '@esbuild/linux-x64@0.23.1': - resolution: {integrity: sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==} + '@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.25.0': - resolution: {integrity: sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==} - engines: {node: '>=18'} - cpu: [x64] - os: [linux] - - '@esbuild/netbsd-arm64@0.25.0': - resolution: {integrity: sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==} + '@esbuild/netbsd-arm64@0.27.7': + resolution: {integrity: sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==} engines: {node: '>=18'} cpu: [arm64] os: [netbsd] - '@esbuild/netbsd-x64@0.21.5': - resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - - '@esbuild/netbsd-x64@0.23.1': - resolution: {integrity: sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==} + '@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.25.0': - resolution: {integrity: sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==} - engines: {node: '>=18'} - cpu: [x64] - os: [netbsd] - - '@esbuild/openbsd-arm64@0.23.1': - resolution: {integrity: sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==} + '@esbuild/openbsd-arm64@0.27.7': + resolution: {integrity: sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-arm64@0.25.0': - resolution: {integrity: sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==} + '@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-x64@0.21.5': - resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==} - engines: {node: '>=12'} - 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.25.0': - resolution: {integrity: sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==} - engines: {node: '>=18'} - cpu: [x64] - os: [openbsd] - - '@esbuild/sunos-x64@0.21.5': - resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - - '@esbuild/sunos-x64@0.23.1': - resolution: {integrity: sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==} + '@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.25.0': - resolution: {integrity: sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==} - engines: {node: '>=18'} - cpu: [x64] - os: [sunos] - - '@esbuild/win32-arm64@0.21.5': - resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - - '@esbuild/win32-arm64@0.23.1': - resolution: {integrity: sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==} + '@esbuild/win32-arm64@0.27.7': + resolution: {integrity: sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==} engines: {node: '>=18'} cpu: [arm64] os: [win32] - '@esbuild/win32-arm64@0.25.0': - resolution: {integrity: sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==} - engines: {node: '>=18'} - cpu: [arm64] - os: [win32] - - '@esbuild/win32-ia32@0.21.5': - resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - - '@esbuild/win32-ia32@0.23.1': - resolution: {integrity: sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==} + '@esbuild/win32-ia32@0.27.7': + resolution: {integrity: sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==} engines: {node: '>=18'} cpu: [ia32] os: [win32] - '@esbuild/win32-ia32@0.25.0': - resolution: {integrity: sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==} - engines: {node: '>=18'} - cpu: [ia32] - os: [win32] - - '@esbuild/win32-x64@0.21.5': - resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - - '@esbuild/win32-x64@0.23.1': - resolution: {integrity: sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==} + '@esbuild/win32-x64@0.27.7': + resolution: {integrity: sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==} engines: {node: '>=18'} cpu: [x64] os: [win32] - '@esbuild/win32-x64@0.25.0': - resolution: {integrity: sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==} + '@img/colour@1.1.0': + resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==} 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.12.1': - resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} - engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - - '@eslint/config-array@0.21.0': - resolution: {integrity: sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@eslint/config-helpers@0.3.1': - resolution: {integrity: sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@eslint/core@0.15.2': - resolution: {integrity: sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@eslint/eslintrc@3.3.1': - resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@eslint/js@9.33.0': - resolution: {integrity: sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@eslint/object-schema@2.1.6': - resolution: {integrity: sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@eslint/plugin-kit@0.3.5': - resolution: {integrity: sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==} - 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.2': - resolution: {integrity: sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==} - engines: {node: '>=18.18'} - - '@img/sharp-darwin-arm64@0.34.3': - resolution: {integrity: sha512-ryFMfvxxpQRsgZJqBd4wsttYQbCxsJksrv9Lw/v798JcQ8+w84mBWuXwl+TT0WJ/WrYOLaYpwQXi3sA9nTIaIg==} + '@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.34.3': - resolution: {integrity: sha512-yHpJYynROAj12TA6qil58hmPmAwxKKC7reUqtGLzsOHfP7/rniNGTL8tjWX6L3CTV4+5P4ypcS7Pp+7OB+8ihA==} + '@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.2.0': - resolution: {integrity: sha512-sBZmpwmxqwlqG9ueWFXtockhsxefaV6O84BMOrhtg/YqbTaRdqDE7hxraVE3y6gVM4eExmfzW4a8el9ArLeEiQ==} + '@img/sharp-libvips-darwin-arm64@1.2.4': + resolution: {integrity: sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==} cpu: [arm64] os: [darwin] - '@img/sharp-libvips-darwin-x64@1.2.0': - resolution: {integrity: sha512-M64XVuL94OgiNHa5/m2YvEQI5q2cl9d/wk0qFTDVXcYzi43lxuiFTftMR1tOnFQovVXNZJ5TURSDK2pNe9Yzqg==} + '@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.2.0': - resolution: {integrity: sha512-RXwd0CgG+uPRX5YYrkzKyalt2OJYRiJQ8ED/fi1tq9WQW2jsQIn0tqrlR5l5dr/rjqq6AHAxURhj2DVjyQWSOA==} + '@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.2.0': - resolution: {integrity: sha512-mWd2uWvDtL/nvIzThLq3fr2nnGfyr/XMXlq8ZJ9WMR6PXijHlC3ksp0IpuhK6bougvQrchUAfzRLnbsen0Cqvw==} + '@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-ppc64@1.2.0': - resolution: {integrity: sha512-Xod/7KaDDHkYu2phxxfeEPXfVXFKx70EAFZ0qyUdOjCcxbjqyJOEUpDe6RIyaunGxT34Anf9ue/wuWOqBW2WcQ==} + '@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-s390x@1.2.0': - resolution: {integrity: sha512-eMKfzDxLGT8mnmPJTNMcjfO33fLiTDsrMlUVcp6b96ETbnJmd4uvZxVJSKPQfS+odwfVaGifhsB07J1LynFehw==} + '@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.2.0': - resolution: {integrity: sha512-ZW3FPWIc7K1sH9E3nxIGB3y3dZkpJlMnkk7z5tu1nSkBoCgw2nSRTFHI5pB/3CQaJM0pdzMF3paf9ckKMSE9Tg==} + '@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.2.0': - resolution: {integrity: sha512-UG+LqQJbf5VJ8NWJ5Z3tdIe/HXjuIdo4JeVNADXBFuG7z9zjoegpzzGIyV5zQKi4zaJjnAd2+g2nna8TZvuW9Q==} + '@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.2.0': - resolution: {integrity: sha512-SRYOLR7CXPgNze8akZwjoGBoN1ThNZoqpOgfnOxmWsklTGVfJiGJoC/Lod7aNMGA1jSsKWM1+HRX43OP6p9+6Q==} + '@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.34.3': - resolution: {integrity: sha512-QdrKe3EvQrqwkDrtuTIjI0bu6YEJHTgEeqdzI3uWJOH6G1O8Nl1iEeVYRGdj1h5I21CqxSvQp1Yv7xeU3ZewbA==} + '@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.34.3': - resolution: {integrity: sha512-oBK9l+h6KBN0i3dC8rYntLiVfW8D8wH+NPNT3O/WBHeW0OQWCjfWksLUaPidsrDKpJgXp3G3/hkmhptAW0I3+A==} + '@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-ppc64@0.34.3': - resolution: {integrity: sha512-GLtbLQMCNC5nxuImPR2+RgrviwKwVql28FWZIW1zWruy6zLgA5/x2ZXk3mxj58X/tszVF69KK0Is83V8YgWhLA==} + '@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-s390x@0.34.3': - resolution: {integrity: sha512-3gahT+A6c4cdc2edhsLHmIOXMb17ltffJlxR0aC2VPZfwKoTGZec6u5GrFgdR7ciJSsHT27BD3TIuGcuRT0KmQ==} + '@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.34.3': - resolution: {integrity: sha512-8kYso8d806ypnSq3/Ly0QEw90V5ZoHh10yH0HnrzOCr6DKAPI6QVHvwleqMkVQ0m+fc7EH8ah0BB0QPuWY6zJQ==} + '@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.34.3': - resolution: {integrity: sha512-vAjbHDlr4izEiXM1OTggpCcPg9tn4YriK5vAjowJsHwdBIdx0fYRsURkxLG2RLm9gyBq66gwtWI8Gx0/ov+JKQ==} + '@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.34.3': - resolution: {integrity: sha512-gCWUn9547K5bwvOn9l5XGAEjVTTRji4aPTqLzGXHvIr6bIDZKNTA34seMPgM0WmSf+RYBH411VavCejp3PkOeQ==} + '@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.34.3': - resolution: {integrity: sha512-+CyRcpagHMGteySaWos8IbnXcHgfDn7pO2fiC2slJxvNq9gDipYBN42/RagzctVRKgxATmfqOSulgZv5e1RdMg==} + '@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-arm64@0.34.3': - resolution: {integrity: sha512-MjnHPnbqMXNC2UgeLJtX4XqoVHHlZNd+nPt1kRPmj63wURegwBhZlApELdtxM2OIZDRv/DFtLcNhVbd1z8GYXQ==} + '@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.3': - resolution: {integrity: sha512-xuCdhH44WxuXgOM714hn4amodJMZl3OEvf0GVTm0BEyMeA2to+8HEdRPShH0SLYptJY1uBw+SCFP9WVQi1Q/cw==} + '@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.34.3': - resolution: {integrity: sha512-OWwz05d++TxzLEv4VnsTz5CmZ6mI6S05sfQGEMrNrQcOEERbX46332IvE7pO/EUiw7jUrrS40z/M7kPyjfl04g==} + '@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] - '@inquirer/ansi@1.0.0': - resolution: {integrity: sha512-JWaTfCxI1eTmJ1BIv86vUfjVatOdxwD0DAVKYevY8SazeUUZtW+tNbsdejVO1GYE0GXJW1N1ahmiC3TFd+7wZA==} - engines: {node: '>=18'} + '@inquirer/ansi@2.0.7': + resolution: {integrity: sha512-3eTuUO1vH2cZm2ZKHeQxnOqlTi9EfZDGgIe3BL3I4u+rJHocr9Fz86M4fjYABPvFnQG/gGK551HqDiIcETwU6Q==} + engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - '@inquirer/checkbox@4.2.4': - resolution: {integrity: sha512-2n9Vgf4HSciFq8ttKXk+qy+GsyTXPV1An6QAwe/8bkbbqvG4VW1I/ZY1pNu2rf+h9bdzMLPbRSfcNxkHBy/Ydw==} - engines: {node: '>=18'} + '@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@5.1.18': - resolution: {integrity: sha512-MilmWOzHa3Ks11tzvuAmFoAd/wRuaP3SwlT1IZhyMke31FKLxPiuDWcGXhU+PKveNOpAc4axzAgrgxuIJJRmLw==} - engines: {node: '>=18'} + '@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@10.2.2': - resolution: {integrity: sha512-yXq/4QUnk4sHMtmbd7irwiepjB8jXU0kkFRL4nr/aDBA2mDz13cMakEWdDwX3eSCTkk03kwcndD1zfRAIlELxA==} - engines: {node: '>=18'} + '@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@4.2.20': - resolution: {integrity: sha512-7omh5y5bK672Q+Brk4HBbnHNowOZwrb/78IFXdrEB9PfdxL3GudQyDk8O9vQ188wj3xrEebS2M9n18BjJoI83g==} - engines: {node: '>=18'} + '@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@4.0.20': - resolution: {integrity: sha512-Dt9S+6qUg94fEvgn54F2Syf0Z3U8xmnBI9ATq2f5h9xt09fs2IJXSCIXyyVHwvggKWFXEY/7jATRo2K6Dkn6Ow==} - engines: {node: '>=18'} + '@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@1.0.2': - resolution: {integrity: sha512-yy9cOoBnx58TlsPrIxauKIFQTiyH+0MK4e97y4sV9ERbI+zDxw7i2hxHLCIEGIE/8PPvDxGhgzIOTSOWcs6/MQ==} - engines: {node: '>=18'} + '@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@1.0.13': - resolution: {integrity: sha512-lGPVU3yO9ZNqA7vTYz26jny41lE7yoQansmqdMLBEfqaGsmdg7V3W9mK9Pvb5IL4EVZ9GnSDGMO/cJXud5dMaw==} - engines: {node: '>=18'} + '@inquirer/figures@2.0.7': + resolution: {integrity: sha512-aJ8TBPOGB6f/2qziPfElISTCEd5XOYTFckA2SGjhNmiKzfK/u4ot3v0DUzGVdUnKjN10EqnnEPck36BkyfLnJw==} + engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'} - '@inquirer/input@4.2.4': - resolution: {integrity: sha512-cwSGpLBMwpwcZZsc6s1gThm0J+it/KIJ+1qFL2euLmSKUMGumJ5TcbMgxEjMjNHRGadouIYbiIgruKoDZk7klw==} - engines: {node: '>=18'} + '@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@3.0.20': - resolution: {integrity: sha512-bbooay64VD1Z6uMfNehED2A2YOPHSJnQLs9/4WNiV/EK+vXczf/R988itL2XLDGTgmhMF2KkiWZo+iEZmc4jqg==} - engines: {node: '>=18'} + '@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@4.0.20': - resolution: {integrity: sha512-nxSaPV2cPvvoOmRygQR+h0B+Av73B01cqYLcr7NXcGXhbmsYfUb8fDdw2Us1bI2YsX+VvY7I7upgFYsyf8+Nug==} - engines: {node: '>=18'} + '@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@7.8.6': - resolution: {integrity: sha512-68JhkiojicX9SBUD8FE/pSKbOKtwoyaVj1kwqLfvjlVXZvOy3iaSWX4dCLsZyYx/5Ur07Fq+yuDNOen+5ce6ig==} - engines: {node: '>=18'} + '@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@4.1.8': - resolution: {integrity: sha512-CQ2VkIASbgI2PxdzlkeeieLRmniaUU1Aoi5ggEdm6BIyqopE9GuDXdDOj9XiwOqK5qm72oI2i6J+Gnjaa26ejg==} - engines: {node: '>=18'} + '@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@3.1.3': - resolution: {integrity: sha512-D5T6ioybJJH0IiSUK/JXcoRrrm8sXwzrVMjibuPs+AgxmogKslaafy1oxFiorNI4s3ElSkeQZbhYQgLqiL8h6Q==} - engines: {node: '>=18'} + '@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@4.3.4': - resolution: {integrity: sha512-Qp20nySRmfbuJBBsgPU7E/cL62Hf250vMZRzYDcBHty2zdD1kKCnoDFWRr0WO2ZzaXp3R7a4esaVGJUx0E6zvA==} - engines: {node: '>=18'} + '@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@3.0.8': - resolution: {integrity: sha512-lg9Whz8onIHRthWaN1Q9EGLa/0LFJjyM8mEUbL1eTi6yMGvBf8gvyDLtxSXztQsxMvhxxNpJYrwa1YHdq+w4Jw==} - engines: {node: '>=18'} + '@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 - '@isaacs/cliui@8.0.2': - resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} - engines: {node: '>=12'} - - '@isaacs/fs-minipass@4.0.1': - resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==} - engines: {node: '>=18.0.0'} - - '@jridgewell/gen-mapping@0.3.12': - resolution: {integrity: sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==} - - '@jridgewell/gen-mapping@0.3.5': - resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} - engines: {node: '>=6.0.0'} + '@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==} @@ -1456,37 +1136,24 @@ packages: 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.6': - resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==} - - '@jridgewell/sourcemap-codec@1.5.0': - resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} + '@jridgewell/source-map@0.3.11': + resolution: {integrity: sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==} '@jridgewell/sourcemap-codec@1.5.5': resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} - '@jridgewell/trace-mapping@0.3.25': - resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} + '@jridgewell/trace-mapping@0.3.31': + resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} - '@jridgewell/trace-mapping@0.3.29': - resolution: {integrity: sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==} - - '@napi-rs/cli@3.2.0': - resolution: {integrity: sha512-heyXt/9OBPv/WrTFW2+PxIMzH6MCeqP9ZsvOg0LN6pLngBnszcxFsdhCAh5I6sddzQsvru53zj59GUzvmpWk8Q==} + '@napi-rs/cli@3.7.4': + resolution: {integrity: sha512-idELIUceJ9zPgx/shcMt1fSSsteFG68v56RIXi4qUm7OYuJOt7CoMj2KnHVmbOqXgUHWQU1lCULrtQdZDG4F5A==} engines: {node: '>= 16'} hasBin: true peerDependencies: - '@emnapi/runtime': ^1.1.0 - emnapi: ^1.1.0 + '@emnapi/runtime': ^1.7.1 peerDependenciesMeta: '@emnapi/runtime': optional: true - emnapi: - optional: true '@napi-rs/cross-toolchain@1.0.3': resolution: {integrity: sha512-ENPfLe4937bsKVTDA6zdABx4pq9w0tHqRrJHyaGxgaPq03a2Bd1unD5XSKjXJjebsABJ+MjAv1A2OvCgK9yehg==} @@ -1564,42 +1231,49 @@ packages: engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [glibc] '@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] '@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] '@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] '@napi-rs/lzma-wasm32-wasi@1.4.5': resolution: {integrity: sha512-+VyHHlr68dvey6fXc2hehw9gHVFIW3TtGF1XkcbAu65qVXsA9D/T+uuoRVqhE+JCyFHFrO0ixRbZDRK1XJt1sA==} @@ -1669,36 +1343,42 @@ packages: 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==} @@ -1727,8 +1407,18 @@ packages: resolution: {integrity: sha512-7cmzIu+Vbupriudo7UudoMRH2OA3cTw67vva8MxeoAe5S7vPFI7z0vp0pMXiA25S8IUJefImQ90FeJjl8fjEaQ==} engines: {node: '>= 10'} - '@napi-rs/wasm-runtime@1.0.5': - resolution: {integrity: sha512-TBr9Cf9onSAS2LQ2+QHx6XcC6h9+RIzJgbqG3++9TUZSH204AwEy5jg3BTQ0VATsyoGj4ee49tN/y6rvaOOtcg==} + '@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==} @@ -1765,24 +1455,28 @@ packages: 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==} @@ -1811,56 +1505,57 @@ packages: resolution: {integrity: sha512-enkZYyuCdo+9jneCPE/0fjIta4wWnvVN9hBo2HuiMpRF0q3lzv1J6b/cl7i0mxZUKhBrV3aCKDBQnCOhwKbPmQ==} engines: {node: '>= 10'} - '@next/env@15.4.7': - resolution: {integrity: sha512-PrBIpO8oljZGTOe9HH0miix1w5MUiGJ/q83Jge03mHEE0E3pyqzAy2+l5G6aJDbXoobmxPJTVhbCuwlLtjSHwg==} + '@next/env@16.2.7': + resolution: {integrity: sha512-tMJizPlj6ZYpBMMdK8S0LJufrP4QTdR6pcv9KQ/bVETPAmg0j1mlHE9G2c38UyGHxoBapgwuj7XjbGJ2RcDFOg==} - '@next/eslint-plugin-next@15.4.7': - resolution: {integrity: sha512-asj3RRiEruRLVr+k2ZC4hll9/XBzegMpFMr8IIRpNUYypG86m/a76339X2WETl1C53A512w2INOc2KZV769KPA==} - - '@next/swc-darwin-arm64@15.4.7': - resolution: {integrity: sha512-2Dkb+VUTp9kHHkSqtws4fDl2Oxms29HcZBwFIda1X7Ztudzy7M6XF9HDS2dq85TmdN47VpuhjE+i6wgnIboVzQ==} + '@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@15.4.7': - resolution: {integrity: sha512-qaMnEozKdWezlmh1OGDVFueFv2z9lWTcLvt7e39QA3YOvZHNpN2rLs/IQLwZaUiw2jSvxW07LxMCWtOqsWFNQg==} + '@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@15.4.7': - resolution: {integrity: sha512-ny7lODPE7a15Qms8LZiN9wjNWIeI+iAZOFDOnv2pcHStncUr7cr9lD5XF81mdhrBXLUP9yT9RzlmSWKIazWoDw==} + '@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@15.4.7': - resolution: {integrity: sha512-4SaCjlFR/2hGJqZLLWycccy1t+wBrE/vyJWnYaZJhUVHccpGLG5q0C+Xkw4iRzUIkE+/dr90MJRUym3s1+vO8A==} + '@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@15.4.7': - resolution: {integrity: sha512-2uNXjxvONyRidg00VwvlTYDwC9EgCGNzPAPYbttIATZRxmOZ3hllk/YYESzHZb65eyZfBR5g9xgCZjRAl9YYGg==} + '@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@15.4.7': - resolution: {integrity: sha512-ceNbPjsFgLscYNGKSu4I6LYaadq2B8tcK116nVuInpHHdAWLWSwVK6CHNvCi0wVS9+TTArIFKJGsEyVD1H+4Kg==} + '@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@15.4.7': - resolution: {integrity: sha512-pZyxmY1iHlZJ04LUL7Css8bNvsYAMYOY9JRwFA3HZgpaNKsJSowD09Vg2R9734GxAcLJc2KDQHSCR91uD6/AAw==} + '@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@15.4.7': - resolution: {integrity: sha512-HjuwPJ7BeRzgl3KrjKqD2iDng0eQIpIReyhpF5r4yeAHFwWRuAhfW92rWv/r3qeQHEwHsLRzFDvMqRjyM5DI6A==} + '@next/swc-win32-x64-msvc@16.2.7': + resolution: {integrity: sha512-J4WlM72NMk076Qsg0jTdK3SNXatlSdnjW7L7oNGLst1tAGjHrJh/FYi+pw9wyIjEtGRKDNzD0zuiY16oWYWVaw==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -1877,34 +1572,27 @@ packages: 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'} - '@octokit/core@7.0.4': - resolution: {integrity: sha512-jOT8V1Ba5BdC79sKrRWDdMT5l1R+XNHTPR6CPWzUP2EcfAcvIHZWF0eAbmRcpOOP5gVIwnqNg0C4nvh6Abc3OA==} + '@octokit/core@7.0.6': + resolution: {integrity: sha512-DhGl4xMVFGVIyMwswXeyzdL4uXD5OGILGX5N8Y+f6W7LhC1Ze2poSNrkF/fedpVDHEEZ+PHFW0vL14I+mm8K3Q==} engines: {node: '>= 20'} - '@octokit/endpoint@11.0.0': - resolution: {integrity: sha512-hoYicJZaqISMAI3JfaDr1qMNi48OctWuOih1m80bkYow/ayPw6Jj52tqWJ6GEoFTk1gBqfanSoI1iY99Z5+ekQ==} + '@octokit/endpoint@11.0.3': + resolution: {integrity: sha512-FWFlNxghg4HrXkD3ifYbS/IdL/mDHjh9QcsNyhQjN8dplUoZbejsdpmuqdA76nxj2xoWPs7p8uX2SNr9rYu0Ag==} engines: {node: '>= 20'} - '@octokit/graphql@9.0.1': - resolution: {integrity: sha512-j1nQNU1ZxNFx2ZtKmL4sMrs4egy5h65OMDmSbVyuCzjOcwsHq6EaYjOTGXPQxgfiN8dJ4CriYHk6zF050WEULg==} + '@octokit/graphql@9.0.3': + resolution: {integrity: sha512-grAEuupr/C1rALFnXTv6ZQhFuL1D8G5y8CN04RgrO4FIPMrtm+mcZzFG7dcBm+nq+1ppNixu+Jd78aeJOYxlGA==} engines: {node: '>= 20'} - '@octokit/openapi-types@25.1.0': - resolution: {integrity: sha512-idsIggNXUKkk0+BExUn1dQ92sfysJrje03Q0bv0e+KPLrvyqZF8MnBpFz8UNfYDwB3Ie7Z0TByjWfzxt7vseaA==} + '@octokit/openapi-types@27.0.0': + resolution: {integrity: sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==} - '@octokit/openapi-types@26.0.0': - resolution: {integrity: sha512-7AtcfKtpo77j7Ts73b4OWhOZHTKo/gGY8bB3bNBQz4H+GRSWqx2yvj8TXRsbdTE0eRmYmXOEY66jM7mJ7LzfsA==} - - '@octokit/plugin-paginate-rest@13.1.1': - resolution: {integrity: sha512-q9iQGlZlxAVNRN2jDNskJW/Cafy7/XE52wjZ5TTvyhyOD904Cvx//DNyoO3J/MXJ0ve3rPoNWKEg5iZrisQSuw==} + '@octokit/plugin-paginate-rest@14.0.0': + resolution: {integrity: sha512-fNVRE7ufJiAA3XUrha2omTA39M6IXIc6GIZLvlbsm8QOQCYvpq/LkMNGyFlB1d8hTDzsAXa3OKtybdMAYsV/fw==} engines: {node: '>= 20'} peerDependencies: '@octokit/core': '>=6' @@ -1915,465 +1603,509 @@ packages: peerDependencies: '@octokit/core': '>=6' - '@octokit/plugin-rest-endpoint-methods@16.1.0': - resolution: {integrity: sha512-nCsyiKoGRnhH5LkH8hJEZb9swpqOcsW+VXv1QoyUNQXJeVODG4+xM6UICEqyqe9XFr6LkL8BIiFCPev8zMDXPw==} + '@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.0.0': - resolution: {integrity: sha512-KRA7VTGdVyJlh0cP5Tf94hTiYVVqmt2f3I6mnimmaVz4UG3gQV/k4mDJlJv3X67iX6rmN7gSHCF8ssqeMnmhZg==} + '@octokit/request-error@7.1.0': + resolution: {integrity: sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==} engines: {node: '>= 20'} - '@octokit/request@10.0.3': - resolution: {integrity: sha512-V6jhKokg35vk098iBqp2FBKunk3kMTXlmq+PtbV9Gl3TfskWlebSofU9uunVKhUN7xl+0+i5vt0TGTG8/p/7HA==} + '@octokit/request@10.0.9': + resolution: {integrity: sha512-o8Bi3f608eyM+7BmBiUWxFsdjLb3/ym1cQek5LZOv9KkZcxRrHCPhhRzm6xjO6HVZ85ItD6+sTsjxo821SVa/A==} engines: {node: '>= 20'} - '@octokit/rest@22.0.0': - resolution: {integrity: sha512-z6tmTu9BTnw51jYGulxrlernpsQYXpui1RK21vmXn8yF5bp6iX16yfTtJYGK5Mh1qDkvDOmp2n8sRMcQmR8jiA==} + '@octokit/rest@22.0.1': + resolution: {integrity: sha512-Jzbhzl3CEexhnivb1iQ0KJ7s5vvjMWcmRtq5aUsKmKDrRW6z3r84ngmiFKFvpZjpiU/9/S6ITPFRpn5s/3uQJw==} engines: {node: '>= 20'} - '@octokit/types@14.1.0': - resolution: {integrity: sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==} + '@octokit/types@16.0.0': + resolution: {integrity: sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==} - '@octokit/types@15.0.0': - resolution: {integrity: sha512-8o6yDfmoGJUIeR9OfYU0/TUJTnMPG2r68+1yEdUeG2Fdqpj8Qetg0ziKIgcBm0RW/j29H41WP37CYCEhp6GoHQ==} - - '@oven/bun-darwin-aarch64@1.2.20': - resolution: {integrity: sha512-zygk+yeaww9kBw2JBWwA13KyOKySxbnetms/WyRFaUYhxiuJHkzv1c6/Ou7sIHa9Gbq4fYQEhx88Ywy1wu2oTQ==} + '@oven/bun-darwin-aarch64@1.3.14': + resolution: {integrity: sha512-Omj20SuiHBOUjUBIyqtkNjSUIjOtEOJwmbix/ZyFH4BaQ6OZTaaRWIR4TjHVz0yadHgli6lLTiAh1uarnvD49A==} cpu: [arm64] os: [darwin] - '@oven/bun-darwin-x64-baseline@1.2.20': - resolution: {integrity: sha512-bxXZlLD6DJ8rc/Ht0Cgm0BH1AJVO/axOElXJP42LUUKQ/U4t3OKkFDbFiTPGphcy5teMLkoYl+a2Cz8P9q2gVQ==} + '@oven/bun-darwin-x64-baseline@1.3.14': + resolution: {integrity: sha512-OSfsTZstc898HHElhU4NccaBGOSSDn5VfahiVTnidZ9B/+wb7WTyfZJaBeJcfjwJ9H2W9uTh2TGtl3UfcXgV9g==} cpu: [x64] os: [darwin] - '@oven/bun-darwin-x64@1.2.20': - resolution: {integrity: sha512-k2akVmSvJHuzpwgwIU8ltary7EQbqlbvxgtYlVqYvnqUpRdRbkuJXAZhN5zuDNTftaG4l22Q/bX04tBB8Txmjg==} + '@oven/bun-darwin-x64@1.3.14': + resolution: {integrity: sha512-FFj3QdU/OhlDyZOJ8CWfN5eWLpRlT4qjZg7lMQi7jA6GuoY5ajlO1zWLP/MuHYRSbXQUvV52RejNi8DVnAp13w==} cpu: [x64] os: [darwin] - '@oven/bun-linux-aarch64-musl@1.2.20': - resolution: {integrity: sha512-zB3aKckyUdKENLP+lm/PoXQPBTthJsY7dhYih+qVT95N29acLO2eWeSHgRkS7Pl2FV+mLJo9LvjRhC8oaSSoOw==} - cpu: [aarch64] - os: [linux] + '@oven/bun-freebsd-aarch64@1.3.14': + resolution: {integrity: sha512-LIKrXaFxAHybVO5Pf+9XP2FHUj/5APvXTUKk9dqHm5iFz4oH+W24cmhjkJirNujh9hKeTyrpWSe3no9JZKowIw==} + cpu: [arm64] + os: [freebsd] - '@oven/bun-linux-aarch64@1.2.20': - resolution: {integrity: sha512-g+CzF02RzKgSmuEHNLoDTtiiQR33cEZWcd/tWR+24h92xe5wXuqQsV7vQJLR6e44BWkDOACpTIrfW4UAaHw4Cw==} + '@oven/bun-freebsd-x64@1.3.14': + resolution: {integrity: sha512-uwD+fGUH1ADpIF3B1U2jWzzb20QwRLZfj5QZ28GUCGrAJ/nTmWrD6YYGsblCY1wuhldRez3lU40AyuvSCyLYmw==} + cpu: [x64] + os: [freebsd] + + '@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-x64-baseline@1.2.20': - resolution: {integrity: sha512-xtYPn84ur9U7YaS0+rwjs6YMgSv5Z4gMnqPQ1QTLw92nt1v9Cw17YypVab4zUk222o5Y6kS3DRkDdSHBh8uQfA==} + '@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.2.20': - resolution: {integrity: sha512-rANapFZRrgOTeotaf556iIxguyjQbensL6gT3cXZDnXG+aVhv65hSnjqzM7vfHxlzoXbAmoUkJOpce0qEg/HlA==} + '@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.2.20': - resolution: {integrity: sha512-XPtQITGbJXgUrMXOJo3IShwQd3awB93ZIh5+4S3DF9Ek/lwXVSuueIIAfnveR/r9JRgEA5+g/1ZHVf1/3qaElg==} + '@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.2.20': - resolution: {integrity: sha512-KJZ0zJKadKCD6EI/mBv/0PUysMpd1r4o3WhQ73PjCZx2w95Ka2fSBAIsy9e/rxc07D4LHr26nGyMmC1K8IcS6Q==} + '@oven/bun-linux-x64@1.3.14': + resolution: {integrity: sha512-7OVTAKvwfPmSbIV1HpdOoVVx5VRc427GuPPne93N6vk4eQBPId9nXmZDh9/zGaKPdbVjVtQSZafWQoUjx38Utw==} cpu: [x64] os: [linux] - '@oven/bun-windows-x64-baseline@1.2.20': - resolution: {integrity: sha512-2291+pyVQ771zd8jgCNJ/jpPBaLJg/X7BWX06M9GpBNmC1tu3Rfr3LaWP8C/XTi80PZJnzNZGeMlcDhRY57y/A==} + '@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.2.20': - resolution: {integrity: sha512-Jt4bAf30qG4SvnL6tO4QzZNbMjg5sLZHif22rZLwX7W6rWPAvgqyYdwDSGHN8Kkbe6KqV4DceyKQgRr83sU66Q==} + '@oven/bun-windows-x64@1.3.14': + resolution: {integrity: sha512-mUFWL3BoYkNpjd8e9PqROiFF/1Xeotq20mABJsiQH62jM1g5zqWh4khw1RZ6bX8Q8fWvlPaxG1PjofkmjUi3vg==} cpu: [x64] os: [win32] - '@parcel/watcher-android-arm64@2.5.0': - resolution: {integrity: sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==} + '@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-android-arm64@2.5.1': - resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==} - engines: {node: '>= 10.0.0'} - cpu: [arm64] - os: [android] - - '@parcel/watcher-darwin-arm64@2.5.0': - resolution: {integrity: sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==} + '@parcel/watcher-darwin-arm64@2.6.0': + resolution: {integrity: sha512-Y3QV0gl7Q1zbfueunkWIERICbEojQFCgpyG7YqOGNFLsckXyI1xu9mAIUpKY9QBYzBtSkN8dBPwd3yiAO9ovMw==} engines: {node: '>= 10.0.0'} cpu: [arm64] os: [darwin] - '@parcel/watcher-darwin-arm64@2.5.1': - resolution: {integrity: sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==} - engines: {node: '>= 10.0.0'} - os: [darwin] - - '@parcel/watcher-darwin-x64@2.5.0': - resolution: {integrity: sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==} + '@parcel/watcher-darwin-x64@2.6.0': + resolution: {integrity: sha512-Ohv6OpzhUfKYD7Beb8kDvG0jbIxORCYY1JRdZnaBtnjjkJxgD7ZVL0nw2sCYd0yTMKTvz3nnTnOF3cDifK+kvw==} engines: {node: '>= 10.0.0'} cpu: [x64] os: [darwin] - '@parcel/watcher-darwin-x64@2.5.1': - resolution: {integrity: sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==} - engines: {node: '>= 10.0.0'} - os: [darwin] - - '@parcel/watcher-freebsd-x64@2.5.0': - resolution: {integrity: sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==} + '@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-freebsd-x64@2.5.1': - resolution: {integrity: sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==} - engines: {node: '>= 10.0.0'} - cpu: [x64] - os: [freebsd] - - '@parcel/watcher-linux-arm-glibc@2.5.0': - resolution: {integrity: sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==} + '@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-glibc@2.5.1': - resolution: {integrity: sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==} + '@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-arm-musl@2.5.0': - resolution: {integrity: sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==} - engines: {node: '>= 10.0.0'} - cpu: [arm] - os: [linux] - - '@parcel/watcher-linux-arm-musl@2.5.1': - resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==} - engines: {node: '>= 10.0.0'} - cpu: [arm] - os: [linux] - - '@parcel/watcher-linux-arm64-glibc@2.5.0': - resolution: {integrity: sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==} + '@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-glibc@2.5.1': - resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==} - engines: {node: '>= 10.0.0'} - os: [linux] - - '@parcel/watcher-linux-arm64-musl@2.5.0': - resolution: {integrity: sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==} + '@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-arm64-musl@2.5.1': - resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==} - engines: {node: '>= 10.0.0'} - os: [linux] - - '@parcel/watcher-linux-x64-glibc@2.5.0': - resolution: {integrity: sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==} + '@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-glibc@2.5.1': - resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==} - engines: {node: '>= 10.0.0'} - os: [linux] - - '@parcel/watcher-linux-x64-musl@2.5.0': - resolution: {integrity: sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==} + '@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-linux-x64-musl@2.5.1': - resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==} - engines: {node: '>= 10.0.0'} - os: [linux] - - '@parcel/watcher-wasm@2.5.0': - resolution: {integrity: sha512-Z4ouuR8Pfggk1EYYbTaIoxc+Yv4o7cGQnH0Xy8+pQ+HbiW+ZnwhcD2LPf/prfq1nIWpAxjOkQ8uSMFWMtBLiVQ==} + '@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.5.0': - resolution: {integrity: sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==} + '@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-arm64@2.5.1': - resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==} - 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-ia32@2.5.1': - resolution: {integrity: sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==} - engines: {node: '>= 10.0.0'} - cpu: [ia32] - os: [win32] - - '@parcel/watcher-win32-x64@2.5.0': - resolution: {integrity: sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==} + '@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-win32-x64@2.5.1': - resolution: {integrity: sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==} - engines: {node: '>= 10.0.0'} - os: [win32] - - '@parcel/watcher@2.5.0': - resolution: {integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==} + '@parcel/watcher@2.6.0': + resolution: {integrity: sha512-7FNeNl8NCE7aINx7WXiKQrPYZWC/hvrTsmk6zmxbI7LTXE7hVek/n8AfVgpe2y82zl3w0HvCHN0bVKMBoJcC0w==} engines: {node: '>= 10.0.0'} - '@parcel/watcher@2.5.1': - resolution: {integrity: sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==} - engines: {node: '>= 10.0.0'} - - '@pkgjs/parseargs@0.11.0': - resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} - engines: {node: '>=14'} - - '@playwright/test@1.55.0': - resolution: {integrity: sha512-04IXzPwHrW69XusN/SIdDdKZBzMfOT9UNT/YiJit/xpy2VuAoB8NHc8Aplb96zsWDddLnbkPL3TsmrS04ZU2xQ==} - engines: {node: '>=18'} + '@playwright/test@1.62.1': + resolution: {integrity: sha512-DTcUc8qii+cpHvtOwggMtBRMjKZHXYWdw8syRYu2vtzuq4Wxphqq4NfCs5Zt44L6mA8rfDfj+PHnxFc/FeK6mQ==} + engines: {node: '>=20'} hasBin: true - '@rolldown/pluginutils@1.0.0-beta.30': - resolution: {integrity: sha512-whXaSoNUFiyDAjkUF8OBpOm77Szdbk5lGNqFe6CbVbJFrhCCPinCbRA3NjawwlNHla1No7xvXXh+CpSxnPfUEw==} - - '@rollup/rollup-android-arm-eabi@4.34.9': - resolution: {integrity: sha512-qZdlImWXur0CFakn2BJ2znJOdqYZKiedEPEVNTBrpfPjc/YuTGcaYZcdmNFTkUj3DU0ZM/AElcM8Ybww3xVLzA==} - cpu: [arm] - os: [android] - - '@rollup/rollup-android-arm-eabi@4.44.0': - resolution: {integrity: sha512-xEiEE5oDW6tK4jXCAyliuntGR+amEMO7HLtdSshVuhFnKTYoeYMyXQK7pLouAJJj5KHdwdn87bfHAR2nSdNAUA==} - cpu: [arm] - os: [android] - - '@rollup/rollup-android-arm64@4.34.9': - resolution: {integrity: sha512-4KW7P53h6HtJf5Y608T1ISKvNIYLWRKMvfnG0c44M6In4DQVU58HZFEVhWINDZKp7FZps98G3gxwC1sb0wXUUg==} + '@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.44.0': - resolution: {integrity: sha512-uNSk/TgvMbskcHxXYHzqwiyBlJ/lGcv8DaUfcnNwict8ba9GTTNxfn3/FAoFZYgkaXXAdrAA+SLyKplyi349Jw==} - cpu: [arm64] - os: [android] - - '@rollup/rollup-darwin-arm64@4.34.9': - resolution: {integrity: sha512-0CY3/K54slrzLDjOA7TOjN1NuLKERBgk9nY5V34mhmuu673YNb+7ghaDUs6N0ujXR7fz5XaS5Aa6d2TNxZd0OQ==} + '@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.44.0': - resolution: {integrity: sha512-VGF3wy0Eq1gcEIkSCr8Ke03CWT+Pm2yveKLaDvq51pPpZza3JX/ClxXOCmTYYq3us5MvEuNRTaeyFThCKRQhOA==} - cpu: [arm64] - os: [darwin] - - '@rollup/rollup-darwin-x64@4.34.9': - resolution: {integrity: sha512-eOojSEAi/acnsJVYRxnMkPFqcxSMFfrw7r2iD9Q32SGkb/Q9FpUY1UlAu1DH9T7j++gZ0lHjnm4OyH2vCI7l7Q==} + '@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.44.0': - resolution: {integrity: sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==} - cpu: [x64] - os: [darwin] - - '@rollup/rollup-freebsd-arm64@4.34.9': - resolution: {integrity: sha512-2lzjQPJbN5UnHm7bHIUKFMulGTQwdvOkouJDpPysJS+QFBGDJqcfh+CxxtG23Ik/9tEvnebQiylYoazFMAgrYw==} - cpu: [arm64] - os: [freebsd] - - '@rollup/rollup-freebsd-arm64@4.44.0': - resolution: {integrity: sha512-u5AZzdQJYJXByB8giQ+r4VyfZP+walV+xHWdaFx/1VxsOn6eWJhK2Vl2eElvDJFKQBo/hcYIBg/jaKS8ZmKeNQ==} - cpu: [arm64] - os: [freebsd] - - '@rollup/rollup-freebsd-x64@4.34.9': - resolution: {integrity: sha512-SLl0hi2Ah2H7xQYd6Qaiu01kFPzQ+hqvdYSoOtHYg/zCIFs6t8sV95kaoqjzjFwuYQLtOI0RZre/Ke0nPaQV+g==} + '@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-freebsd-x64@4.44.0': - resolution: {integrity: sha512-qC0kS48c/s3EtdArkimctY7h3nHicQeEUdjJzYVJYR3ct3kWSafmn6jkNCA8InbUdge6PVx6keqjk5lVGJf99g==} - cpu: [x64] - os: [freebsd] - - '@rollup/rollup-linux-arm-gnueabihf@4.34.9': - resolution: {integrity: sha512-88I+D3TeKItrw+Y/2ud4Tw0+3CxQ2kLgu3QvrogZ0OfkmX/DEppehus7L3TS2Q4lpB+hYyxhkQiYPJ6Mf5/dPg==} + '@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.44.0': - resolution: {integrity: sha512-x+e/Z9H0RAWckn4V2OZZl6EmV0L2diuX3QB0uM1r6BvhUIv6xBPL5mrAX2E3e8N8rEHVPwFfz/ETUbV4oW9+lQ==} - cpu: [arm] - os: [linux] - - '@rollup/rollup-linux-arm-musleabihf@4.34.9': - resolution: {integrity: sha512-3qyfWljSFHi9zH0KgtEPG4cBXHDFhwD8kwg6xLfHQ0IWuH9crp005GfoUUh/6w9/FWGBwEHg3lxK1iHRN1MFlA==} - cpu: [arm] - os: [linux] - - '@rollup/rollup-linux-arm-musleabihf@4.44.0': - resolution: {integrity: sha512-1exwiBFf4PU/8HvI8s80icyCcnAIB86MCBdst51fwFmH5dyeoWVPVgmQPcKrMtBQ0W5pAs7jBCWuRXgEpRzSCg==} - cpu: [arm] - os: [linux] - - '@rollup/rollup-linux-arm64-gnu@4.34.9': - resolution: {integrity: sha512-6TZjPHjKZUQKmVKMUowF3ewHxctrRR09eYyvT5eFv8w/fXarEra83A2mHTVJLA5xU91aCNOUnM+DWFMSbQ0Nxw==} + '@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.44.0': - resolution: {integrity: sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==} + '@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.34.9': - resolution: {integrity: sha512-LD2fytxZJZ6xzOKnMbIpgzFOuIKlxVOpiMAXawsAZ2mHBPEYOnLRK5TTEsID6z4eM23DuO88X0Tq1mErHMVq0A==} - cpu: [arm64] - os: [linux] - - '@rollup/rollup-linux-arm64-musl@4.44.0': - resolution: {integrity: sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==} - cpu: [arm64] - os: [linux] - - '@rollup/rollup-linux-loongarch64-gnu@4.34.9': - resolution: {integrity: sha512-dRAgTfDsn0TE0HI6cmo13hemKpVHOEyeciGtvlBTkpx/F65kTvShtY/EVyZEIfxFkV5JJTuQ9tP5HGBS0hfxIg==} - cpu: [loong64] - os: [linux] - - '@rollup/rollup-linux-loongarch64-gnu@4.44.0': - resolution: {integrity: sha512-xw+FTGcov/ejdusVOqKgMGW3c4+AgqrfvzWEVXcNP6zq2ue+lsYUgJ+5Rtn/OTJf7e2CbgTFvzLW2j0YAtj0Gg==} - cpu: [loong64] - os: [linux] - - '@rollup/rollup-linux-powerpc64le-gnu@4.34.9': - resolution: {integrity: sha512-PHcNOAEhkoMSQtMf+rJofwisZqaU8iQ8EaSps58f5HYll9EAY5BSErCZ8qBDMVbq88h4UxaNPlbrKqfWP8RfJA==} + '@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.44.0': - resolution: {integrity: sha512-bKGibTr9IdF0zr21kMvkZT4K6NV+jjRnBoVMt2uNMG0BYWm3qOVmYnXKzx7UhwrviKnmK46IKMByMgvpdQlyJQ==} - cpu: [ppc64] - os: [linux] - - '@rollup/rollup-linux-riscv64-gnu@4.34.9': - resolution: {integrity: sha512-Z2i0Uy5G96KBYKjeQFKbbsB54xFOL5/y1P5wNBsbXB8yE+At3oh0DVMjQVzCJRJSfReiB2tX8T6HUFZ2k8iaKg==} - cpu: [riscv64] - os: [linux] - - '@rollup/rollup-linux-riscv64-gnu@4.44.0': - resolution: {integrity: sha512-vV3cL48U5kDaKZtXrti12YRa7TyxgKAIDoYdqSIOMOFBXqFj2XbChHAtXquEn2+n78ciFgr4KIqEbydEGPxXgA==} - cpu: [riscv64] - os: [linux] - - '@rollup/rollup-linux-riscv64-musl@4.44.0': - resolution: {integrity: sha512-TDKO8KlHJuvTEdfw5YYFBjhFts2TR0VpZsnLLSYmB7AaohJhM8ctDSdDnUGq77hUh4m/djRafw+9zQpkOanE2Q==} - cpu: [riscv64] - os: [linux] - - '@rollup/rollup-linux-s390x-gnu@4.34.9': - resolution: {integrity: sha512-U+5SwTMoeYXoDzJX5dhDTxRltSrIax8KWwfaaYcynuJw8mT33W7oOgz0a+AaXtGuvhzTr2tVKh5UO8GVANTxyQ==} + '@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.44.0': - resolution: {integrity: sha512-8541GEyktXaw4lvnGp9m84KENcxInhAt6vPWJ9RodsB/iGjHoMB2Pp5MVBCiKIRxrxzJhGCxmNzdu+oDQ7kwRA==} - cpu: [s390x] - os: [linux] - - '@rollup/rollup-linux-x64-gnu@4.34.9': - resolution: {integrity: sha512-FwBHNSOjUTQLP4MG7y6rR6qbGw4MFeQnIBrMe161QGaQoBQLqSUEKlHIiVgF3g/mb3lxlxzJOpIBhaP+C+KP2A==} + '@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.44.0': - resolution: {integrity: sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==} + '@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.34.9': - resolution: {integrity: sha512-cYRpV4650z2I3/s6+5/LONkjIz8MBeqrk+vPXV10ORBnshpn8S32bPqQ2Utv39jCiDcO2eJTuSlPXpnvmaIgRA==} - 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.44.0': - resolution: {integrity: sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==} - 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.34.9': - resolution: {integrity: sha512-z4mQK9dAN6byRA/vsSgQiPeuO63wdiDxZ9yg9iyX2QTzKuQM7T4xlBoeUP/J8uiFkqxkcWndWi+W7bXdPbt27Q==} + '@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.44.0': - resolution: {integrity: sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==} + '@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.34.9': - resolution: {integrity: sha512-KB48mPtaoHy1AwDNkAJfHXvHp24H0ryZog28spEs0V48l3H1fr4i37tiyHsgKZJnCmvxsbATdZGBpbmxTE3a9w==} + '@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.44.0': - resolution: {integrity: sha512-3XJ0NQtMAXTWFW8FqZKcw3gOQwBtVWP/u8TpHP3CRPXD7Pd6s8lLdH3sHWh8vqKCyyiI8xW5ltJScQmBU9j7WA==} + '@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.34.9': - resolution: {integrity: sha512-AyleYRPU7+rgkMWbEh71fQlrzRfeP6SyMnRf9XX4fCdDPAJumdSBqYEcWPMzVQ4ScAl7E4oFfK0GUVn77xSwbw==} + '@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.44.0': - resolution: {integrity: sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==} - 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@2.3.0': - resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==} + '@sindresorhus/merge-streams@4.0.0': + resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==} engines: {node: '>=18'} + '@standard-schema/spec@1.1.0': + resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==} + '@swc/helpers@0.5.15': resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==} @@ -2382,183 +2114,200 @@ packages: peerDependencies: tailwindcss: '>=2.0.0 || >=3.0.0 || >=3.0.0-alpha.1' - '@tailwindcss/forms@0.5.10': - resolution: {integrity: sha512-utI1ONF6uf/pPNO68kmN1b8rEwNXv3czukalo8VtJH8ksIkZXr3Q3VYudZLkCsDd4Wku120uF02hYK25XGPorw==} + '@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 || >= 4.0.0-beta.1' - '@tailwindcss/typography@0.5.16': - resolution: {integrity: sha512-0wDLwCVF5V3x3b1SGXPCDcdsbDHMBe+lkFzBRaHeLvNi+nrrnZ1lA18u+OTWO8iSWU2GxUOCvlXtDuqftc1oiA==} + '@tailwindcss/typography@0.5.20': + resolution: {integrity: sha512-hwbzQuNUfcPvbegQFatVPl/MY/tcM9KLl963hQ5laJKPh81TEZ1+dNG9PirGvcaDBkp+BCshExAyKVPW91dozw==} peerDependencies: - tailwindcss: '>=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1' + tailwindcss: '>=3.0.0 || >=4.0.0 || insiders' - '@tybys/wasm-util@0.10.1': - resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==} + '@turbo/darwin-64@2.10.8': + resolution: {integrity: sha512-po+7rfJfUnFXjWlcoN2RwhErgzCdRtBc1T26vYPcywHlggmCQiQe1uWaE4j+BibI2uY9/2pDoFzMN0rmSaPFOw==} + cpu: [x64] + os: [darwin] - '@types/babel__core@7.20.5': - resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==} + '@turbo/darwin-arm64@2.10.8': + resolution: {integrity: sha512-+zB2btDJ00lnPRuqOvpVvgl4x34k/djZQGZTTCfjn7JgNCl8QFY5Njo5+dqkY1g/+9gbbsnAvWm9CmJg9ebcXA==} + cpu: [arm64] + os: [darwin] - '@types/babel__generator@7.6.8': - resolution: {integrity: sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==} + '@turbo/linux-64@2.10.8': + resolution: {integrity: sha512-K1dxqiVisyN7cViVsfQLs6xscQbYuI8aO2nbUhFURDACgEDfZRdP/b4CCxeosBJpcMfhYyiibWqJorCnvz9kKg==} + cpu: [x64] + os: [android, linux] - '@types/babel__template@7.4.4': - resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==} + '@turbo/linux-arm64@2.10.8': + resolution: {integrity: sha512-Gi77ibVnrE1fEmvr+/wBD/yvRqhwp/RQuCp2+//lv1U1wNFFyVg0V7Wj8FG9FXPFAw5QHReo8rxc9+wBSDZjzA==} + cpu: [arm64] + os: [android, linux] - '@types/babel__traverse@7.20.6': - resolution: {integrity: sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==} + '@turbo/windows-64@2.10.8': + resolution: {integrity: sha512-znnLO1haJPYTHoKMKwlAvlkjRiYbbhBzME6wIGaMd+fwir23U6jVd1ecaTWWi1fbnRVqxMfgDBKseQ/hLKb83g==} + cpu: [x64] + os: [win32] - '@types/braces@3.0.5': - resolution: {integrity: sha512-SQFof9H+LXeWNz8wDe7oN5zu7ket0qwMu5vZubW4GCJ8Kkeh6nBWUz87+KTz/G3Kqsrp0j/W253XJb3KMEeg3w==} + '@turbo/windows-arm64@2.10.8': + resolution: {integrity: sha512-VN30vh3b3Czh2WzYHNTfF1FE0YMZ5aHsLO8dBMGHJewA6792wX6iJR8ZxlzFW6WdOu0gEAKIvlYhfyT81Wkm4Q==} + cpu: [arm64] + os: [win32] - '@types/bun@1.2.20': - resolution: {integrity: sha512-dX3RGzQ8+KgmMw7CsW4xT5ITBSCrSbfHc36SNT31EOUg/LA9JWq0VDdEXDRSe1InVWpd2yLUM1FUF/kEOyTzYA==} + '@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==} - '@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.14.13': - resolution: {integrity: sha512-+bHoGiZb8UiQ0+WEtmph2IWQCjIqg8MDZMAV+ppRRhUZnquF5mQkP/9vpSwJClEiSM/C7fZZExPzfU0vJTyp8w==} - - '@types/node@20.19.1': - resolution: {integrity: sha512-jJD50LtlD2dodAEO653i3YF04NWak6jN3ky+Ri3Em3mGR39/glWiboM/IePaRbgwSfqM1TpGXfAg8ohn/4dTgA==} + '@types/node@25.9.1': + resolution: {integrity: sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==} '@types/postcss-import@14.0.3': resolution: {integrity: sha512-raZhRVTf6Vw5+QbmQ7LOHSDML71A5rj4+EqDzAbrZPfxfoGzFxMHRCq16VlddGIZpHELw0BG4G0YE2ANkdZiIQ==} - '@types/react-dom@19.1.7': - resolution: {integrity: sha512-i5ZzwYpqjmrKenzkoLM2Ibzt6mAsM7pxB6BCIouEVVmgiqaMj1TjaK7hnA36hbW5aZv20kx7Lw6hWzPWg0Rurw==} + '@types/react-dom@19.2.3': + resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==} peerDependencies: - '@types/react': ^19.0.0 + '@types/react': ^19.2.0 - '@types/react@19.1.9': - resolution: {integrity: sha512-WmdoynAX8Stew/36uTSVMcLJJ1KRh6L3IZRx1PZ7qJtBqT3dYTgyDTx8H1qoRghErydW7xw9mSJ3wS//tCRpFA==} + '@types/react@19.2.15': + resolution: {integrity: sha512-eRwcGNHve+E8qtEQSSRl6urh+rFop4v8gm6O8rGv25CodbvFdLjA1vVQ1KkiFE0w0UPOnb8tDiFKL5lp0rtY5Q==} - '@types/semver@7.7.0': - resolution: {integrity: sha512-k107IF4+Xr7UHjwDc7Cfd6PRQfbdkiRabXGRjo07b4WyPahFBZCZ1sE+BNxYIJPPg73UkfOsVOLwqVc/6ETrIA==} + '@types/semver@7.8.0': + resolution: {integrity: sha512-1mAINjtQCXXeLkJ9ehXkwOcBpqtLxiVtKhpUf83DdRNdQKV0iXZpaHYqRr7nj+wvxuJzoAmAwXI+sCNMv1CzLQ==} - '@typescript-eslint/eslint-plugin@8.11.0': - resolution: {integrity: sha512-KhGn2LjW1PJT2A/GfDpiyOfS4a8xHQv2myUagTM5+zsormOmBlYsnQ6pobJ8XxJmh6hnHwa2Mbe3fPrDJoDhbA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 - eslint: ^8.57.0 || ^9.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - 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} - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - 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} - - '@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 - - '@typescript-eslint/types@8.11.0': - resolution: {integrity: sha512-tn6sNMHf6EBAYMvmPUaKaVeYvhUsrE6x+bXQTxjQRp360h1giATU0WvgeEys1spbvb5R+VpNOZ+XJmjD8wOUHw==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@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 - - '@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 - - '@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} - - '@vitejs/plugin-react@5.0.0': - resolution: {integrity: sha512-Jx9JfsTa05bYkS9xo0hkofp2dCmp1blrKjw9JONs5BTHOvJCgLbaPSuZLGSVJW6u2qe0tc4eevY0+gSNNi0YCw==} + '@vitejs/plugin-react@6.0.2': + resolution: {integrity: sha512-DlSMqo4WhThw4vB8Mpn0Woe9J+Jfq1geJ61AKW0QEgLzGMNwtIMdxbDUzLxcun8W7NbJO0e2Jg/Nxm3cCSVzzg==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: - vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 + '@rolldown/plugin-babel': ^0.1.7 || ^0.2.0 + babel-plugin-react-compiler: ^1.0.0 + vite: ^8.0.0 + peerDependenciesMeta: + '@rolldown/plugin-babel': + optional: true + babel-plugin-react-compiler: + optional: true - '@vitest/expect@2.0.5': - resolution: {integrity: sha512-yHZtwuP7JZivj65Gxoi8upUN2OzHTi3zVfjwdpu2WrvCZPLwsJ2Ey5ILIPccoW23dd/zQBlJ4/dhi7DWNyXCpA==} + '@vitest/expect@4.1.10': + resolution: {integrity: sha512-YsCn+qAk1GWjQOWFEsEcL2gNQ0zmVmQu3T03qP6UyjhtmdtwtbuI+DASn/7iQB3HGTXkdBwGddzxPlmiql5vlA==} - '@vitest/pretty-format@2.0.5': - resolution: {integrity: sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==} - - '@vitest/runner@2.0.5': - resolution: {integrity: sha512-TfRfZa6Bkk9ky4tW0z20WKXFEwwvWhRY+84CnSEtq4+3ZvDlJyY32oNTJtM7AW9ihW90tX/1Q78cb6FjoAs+ig==} - - '@vitest/snapshot@2.0.5': - resolution: {integrity: sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==} - - '@vitest/spy@2.0.5': - resolution: {integrity: sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==} - - '@vitest/utils@2.0.5': - resolution: {integrity: sha512-d8HKbqIcya+GR67mkZbrzhS5kKhtp8dQLcmRZLGTscGVg7yImT82cIrhtn2L8+VujWcy6KZweApgNmPsTAO/UQ==} - - acorn-jsx@5.3.2: - resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} + '@vitest/mocker@4.1.10': + resolution: {integrity: sha512-v0xaezt+DKEmKfaxg133ldzADrwLGd7Ze1MfQQTYfvs8OqZIwbxyxaYURivwV7sWy5fqn3rH5uOrSp07bp44Ow==} peerDependencies: - acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 + msw: ^2.4.9 + vite: ^6.0.0 || ^7.0.0 || ^8.0.0 + peerDependenciesMeta: + msw: + optional: true + vite: + optional: true - acorn@8.14.0: - resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==} + '@vitest/pretty-format@4.1.10': + resolution: {integrity: sha512-W1HsjSH4MXQ9YfmmhLAoIYf1HRfekQCGngeIgcei6MP5QQGWUe0gkopdZQaVCFO+JDJMrAJGwa5pRpNpvy4P8Q==} + + '@vitest/runner@4.1.10': + resolution: {integrity: sha512-IKI6kpIH+LmpROplyLwBBaCfMgOZOMsygVa6BARD6ahA04VRuJSa6OaVG7kRvSEMD870Vd91rSSw0eegtWyLGg==} + + '@vitest/snapshot@4.1.10': + resolution: {integrity: sha512-xRkfOT1qpTAi/Ti4Y1LtfRc3kEuqxGw59eN2jN9pRWMtS/XDevekhcFSqvQqjUNGksfjMJu3Y+oJ+4Ypn2OaJw==} + + '@vitest/spy@4.1.10': + resolution: {integrity: sha512-PLf/Ugvoq5wO/b4rwYCR1h2PSIdXz7wnkQFMiUpLdtM7l6pqVFcQIBEHyT1+l+cj7mNwAfZHzqXqDyjvOuwbDw==} + + '@vitest/utils@4.1.10': + resolution: {integrity: sha512-fy9am/HWxbaGt/Sawrp90vt6Y6jQwf1RX77cz3uwoJwJVMli/e1IEwRPnMNJ7vKfPTwo0diXifkpPvwH9v7nGA==} + + '@webassemblyjs/ast@1.14.1': + resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==} + + '@webassemblyjs/floating-point-hex-parser@1.13.2': + resolution: {integrity: sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==} + + '@webassemblyjs/helper-api-error@1.13.2': + resolution: {integrity: sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==} + + '@webassemblyjs/helper-buffer@1.14.1': + resolution: {integrity: sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==} + + '@webassemblyjs/helper-numbers@1.13.2': + resolution: {integrity: sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==} + + '@webassemblyjs/helper-wasm-bytecode@1.13.2': + resolution: {integrity: sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==} + + '@webassemblyjs/helper-wasm-section@1.14.1': + resolution: {integrity: sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==} + + '@webassemblyjs/ieee754@1.13.2': + resolution: {integrity: sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==} + + '@webassemblyjs/leb128@1.13.2': + resolution: {integrity: sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==} + + '@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 - acorn@8.15.0: - resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==} - engines: {node: '>=0.4.0'} - hasBin: true + ajv-formats@2.1.1: + resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} + peerDependencies: + ajv: ^8.0.0 + peerDependenciesMeta: + ajv: + optional: true - ajv@6.12.6: - resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} + ajv-keywords@5.1.0: + resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==} + peerDependencies: + ajv: ^8.8.2 - ansi-regex@5.0.1: - resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} - engines: {node: '>=8'} - - ansi-regex@6.0.1: - resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} - engines: {node: '>=12'} - - 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==} @@ -2573,70 +2322,21 @@ packages: 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.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'} - assertion-error@2.0.1: resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==} engines: {node: '>=12'} - ast-types-flow@0.0.8: - resolution: {integrity: sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==} - - autoprefixer@10.4.21: - resolution: {integrity: sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==} + 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==} + baseline-browser-mapping@2.10.31: + resolution: {integrity: sha512-MujYO3eP72uvmSE0i4wltsodRfIpZATP3jvzRNRGGxgzId7aVocVJJV3nf01qnzzKFGxQVC9bpWxl5cjxTr/7Q==} + engines: {node: '>=6.0.0'} + hasBin: true before-after-hook@4.0.0: resolution: {integrity: sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ==} @@ -2645,32 +2345,25 @@ packages: 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.24.4: - resolution: {integrity: sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==} + 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==} - bun-types@1.2.20: - resolution: {integrity: sha512-pxTnQYOrKvdOwyiyd/7sMt9yFOenN004Y6O4lCcCUoKVej48FS5cvTw9geRaEcB9TsDZaJKAxPTVvi8tFsVuXA==} - peerDependencies: - '@types/react': ^19 + bun-types@1.3.14: + resolution: {integrity: sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ==} - bun@1.2.20: - resolution: {integrity: sha512-1ZGQynT+jPOHLY4IfzSubjbWcXsY2Z+irhW5D8RKC0wQ6KG4MvtgniAYQbSFYINGg8Wb2ydx+WgAG2BdhngAfw==} - os: [darwin, linux, win32] + bun@1.3.14: + resolution: {integrity: sha512-aB6GVd42x1Y5ie1K16SF+oLGtgSkwX9hgoDdIW88pjvfTccU8F1vfpoOt34QLv0dZ1v3XimtaxPlZUG81Gx9Zg==} + cpu: [arm64, x64] + os: [darwin, linux, android, freebsd, win32] hasBin: true bundle-require@5.1.0: @@ -2683,35 +2376,19 @@ packages: 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'} - camelcase-css@2.0.1: resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==} engines: {node: '>= 6'} - caniuse-lite@1.0.30001705: - resolution: {integrity: sha512-S0uyMMiYvA7CxNgomYBwwwPUnWzFD83f3B1ce5jHUfHTH//QL6hHsreI8RVC5606R4ssqravelYO5TU6t8sEyg==} + 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@4.1.2: - resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} - engines: {node: '>=10'} - - chardet@2.1.0: - resolution: {integrity: sha512-bNFETTG/pM5ryzQ9Ad0lJOTa6HWD/YsScAR3EnCPZRPlQh77JocYktSHOUHelyhm8IARL+o4c4F1bP5KVOjiRA==} - - 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==} @@ -2721,12 +2398,12 @@ packages: resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} engines: {node: '>= 14.16.0'} - chownr@3.0.0: - resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} - engines: {node: '>=18'} + chrome-trace-event@1.0.4: + resolution: {integrity: sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==} + engines: {node: '>=6.0'} - citty@0.1.6: - resolution: {integrity: sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==} + citty@0.2.2: + resolution: {integrity: sha512-+6vJA3L98yv+IdfKGZHBNiGW5KHn22e/JwID0Strsz8h4S/csAu/OuICwxrg44k5MRiZHWIo8XXuJgQTriRP4w==} cli-width@4.1.0: resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==} @@ -2740,24 +2417,6 @@ packages: peerDependencies: typanion: '*' - clipboardy@4.0.0: - resolution: {integrity: sha512-5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w==} - engines: {node: '>=18'} - - color-convert@2.0.1: - resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} - engines: {node: '>=7.0.0'} - - 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==} @@ -2768,84 +2427,41 @@ packages: 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==} + consola@3.4.2: + resolution: {integrity: sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==} engines: {node: ^14.18.0 || >=16.10.0} - consola@3.4.0: - resolution: {integrity: sha512-EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA==} - 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==} - cookie-es@1.2.2: - resolution: {integrity: sha512-+W7VmiVINB+ywl1HGXJXmrqkOhpKrIiVZV6tQuV54ZyQC7MMuBt81Vc336GMLoHBq5hV/F9eXgt5Mnx0Rha5Fg==} - - cross-spawn@7.0.6: - resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} - engines: {node: '>= 8'} - - crossws@0.3.1: - resolution: {integrity: sha512-HsZgeVYaG+b5zA+9PbIPGq4+J/CJynJuearykPsXx4V/eMhyQ5EDVg3Ak2FBZtVXCiOLu/U7IiwDHTr9MA+IKw==} + cookie-es@1.2.3: + resolution: {integrity: sha512-lXVyvUvrNXblMqzIRrxHb57UUVmqsSWlxqt3XIjCkUP0wDAf6uicO6KMbEgYrMNtEvWgWHwe42CKxPu9MYAnWw==} 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'} hasBin: true - csstype@3.1.3: - resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} - - 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==} - 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.4.0: - resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true + csstype@3.2.3: + resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==} debug@4.4.3: resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==} @@ -2856,31 +2472,16 @@ packages: supports-color: optional: true - dedent@1.6.0: - resolution: {integrity: sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==} + 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'} - - 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'} - - defu@6.1.4: - resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==} + defu@6.1.7: + resolution: {integrity: sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==} destr@2.0.5: resolution: {integrity: sha512-ugFTXCtDZunbzasqBxrK93Ik/DRYsO6S/fedkWEMKqt04xZ4csmnmwGDBAb07QWNaGMAmnTIemsYZCksjATwsA==} @@ -2890,8 +2491,8 @@ packages: engines: {node: '>=0.10'} hasBin: true - detect-libc@2.0.4: - resolution: {integrity: sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==} + detect-libc@2.1.2: + resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==} engines: {node: '>=8'} didyoumean@1.2.2: @@ -2900,80 +2501,33 @@ packages: dlv@1.1.3: 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==} - - electron-to-chromium@1.5.119: - resolution: {integrity: sha512-Ku4NMzUjz3e3Vweh7PhApPrZSS4fyiCIbcIrG9eKrriYVLmbMepETR/v6SU7xPm98QTqMSYiCwfO89QNjXLkbQ==} - - emnapi@1.5.0: - resolution: {integrity: sha512-adAaiwTxMnHbq1u2LUf+AfDR5MYrxDVBtezGspxwk5e/Zb6KHkGNdfuMU4JBIVm6ASY06K8KalhOPUht92MsnA==} + 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 - 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.18.3: - resolution: {integrity: sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==} + enhanced-resolve@5.24.5: + resolution: {integrity: sha512-L1l8TNvomm6UVW5B253AGxQagSQr+vGwhMlrrfRS2qmhx46AMpMVJKQYLvWYbysTMY8VoicOvzHzoHMbyzB+4A==} 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'} - es-errors@1.3.0: 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'} - - es-toolkit@1.39.10: - resolution: {integrity: sha512-E0iGnTtbDhkeczB0T+mxmoVlT4YNweEKBLq7oaU4p11mecdsZpNWOglI4895Vh4usbQ+LsJiuLuI2L0Vdmfm2w==} - - esbuild@0.21.5: - resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==} - engines: {node: '>=12'} - hasBin: true - - esbuild@0.23.1: - resolution: {integrity: sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==} - engines: {node: '>=18'} - hasBin: true - - esbuild@0.25.0: - resolution: {integrity: sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==} + esbuild@0.27.7: + resolution: {integrity: sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==} engines: {node: '>=18'} hasBin: true @@ -2981,118 +2535,18 @@ packages: resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==} engines: {node: '>=6'} - escape-string-regexp@4.0.0: - resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} - engines: {node: '>=10'} - - eslint-config-next@15.4.7: - resolution: {integrity: sha512-tkKKNVJKI4zMIgTpvG2x6mmdhuOdgXUL3AaSPHwxLQkvzi4Yryqvk6B0R5Z4gkpe7FKopz3ZmlpePH3NTHy3gA==} - 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.4.0: - resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==} - 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.1: - resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - eslint@9.33.0: - resolution: {integrity: sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - hasBin: true - peerDependencies: - jiti: '*' - peerDependenciesMeta: - jiti: - optional: true - - espree@10.4.0: - resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==} - 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'} + 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'} @@ -3100,13 +2554,13 @@ packages: estree-walker@3.0.3: 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@8.0.1: - resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} - engines: {node: '>=16.17'} + expect-type@1.3.0: + resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==} + engines: {node: '>=12.0.0'} fast-content-type-parse@3.0.0: resolution: {integrity: sha512-ZvLdcY8P+N8mGQJahJV5G4U88CSvT1rP8ApL6uETe88MBXrBHAkZlSEySdUlyztF7ccb+Znos3TFqaepHxdhBg==} @@ -3114,70 +2568,54 @@ packages: fast-deep-equal@3.1.3: 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.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==} - fdir@6.4.6: - resolution: {integrity: sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==} + 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 - file-entry-cache@8.0.0: - resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} - engines: {node: '>=16.0.0'} - fill-range@7.1.1: 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@5.0.0: - resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} - engines: {node: '>=10'} - - find-up@7.0.0: - resolution: {integrity: sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==} + find-up-simple@1.0.1: + resolution: {integrity: sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==} engines: {node: '>=18'} 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==} @@ -3192,37 +2630,8 @@ packages: function-bind@1.1.2: 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-port-please@3.1.2: - resolution: {integrity: sha512-Gxc29eLs1fbn6LQ4jSU4vXjlwyZhF5HsGuMAa7gqBP4Rw4yxxltyDUuF5MBclFzDTXO+ACchGQoeela4DSfzdQ==} - - 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.10.0: - resolution: {integrity: sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==} + get-port-please@3.2.0: + resolution: {integrity: sha512-I9QVvBw5U/hw3RmWpYKRumUeaDgxTPd401x364rLmWBJcOQ753eov1eTgzDqRG9bqFIfDc7gfzcQEWrUri3o1A==} glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} @@ -3232,416 +2641,184 @@ packages: 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@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@14.1.0: - resolution: {integrity: sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==} - 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==} - graphemer@1.4.0: - resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} - - h3@1.15.4: - resolution: {integrity: sha512-z5cFQWDffyOe4vQ9xIqNfCZdV4p//vy6fBnr8Q1AWnVZ0teurKMG66rLj++TKwKPUP3u7iMUvrvKaEUiQw2QWQ==} - - has-bigints@1.0.2: - resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==} + h3@1.15.11: + resolution: {integrity: sha512-L3THSe2MPeBwgIZVSH5zLdBBU90TOxarvhK9d04IDY2AmVS8j2Jz2LIWtwsGOU3lu2I5jCN7FNvVfY2+XyF+mg==} has-flag@4.0.0: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} - has-property-descriptors@1.0.2: - resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} - - has-proto@1.0.3: - resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} - engines: {node: '>= 0.4'} - - has-symbols@1.0.3: - resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} - engines: {node: '>= 0.4'} - - has-tostringtag@1.0.2: - resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==} - engines: {node: '>= 0.4'} - - hasown@2.0.2: - resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} + hasown@2.0.3: + resolution: {integrity: sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==} 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'} - human-signals@5.0.0: - resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} - engines: {node: '>=16.17.0'} - - iconv-lite@0.7.0: - resolution: {integrity: sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==} + iconv-lite@0.7.2: + resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==} engines: {node: '>=0.10.0'} - ignore@5.3.2: - resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} + ignore@7.0.5: + resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==} engines: {node: '>= 4'} - ignore@7.0.3: - resolution: {integrity: sha512-bAH5jbK/F3T3Jls4I0SO1hmPR0dKU0a7+SY6n1yzRtG54FLO8d6w/nxLFX2Nb7dBu6cCWXPaAME6cYqFUMmuCA==} - 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'} - iron-webcrypto@1.2.1: resolution: {integrity: sha512-feOM6FaSr6rEABp/eDfVseKyTMDt+KGpeB35SkVn9Tyn0CqvVsY3EwI0v5i8nMHyJnzCIQf7nsy3p41TPkJZhg==} - 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==} - is-binary-path@2.1.0: resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} engines: {node: '>=8'} - is-boolean-object@1.1.2: - resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} + is-core-module@2.16.2: + resolution: {integrity: sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==} 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.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-docker@3.0.0: - resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - hasBin: true - 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'} - is-glob@4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} engines: {node: '>=0.10.0'} - is-inside-container@1.0.0: - resolution: {integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==} - engines: {node: '>=14.16'} - hasBin: true - - 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'} - is-number@7.0.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@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'} - - is-wsl@3.1.0: - resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==} - engines: {node: '>=16'} - - is64bit@2.0.0: - resolution: {integrity: sha512-jv+8jaWCl0g2lSBkNSVXdzfBA0npK1HGC2KtWM9FumFRoGS94g3NbCCLVnCYHLjp4GrW2KZeeSTMo5ddtznmGw==} - engines: {node: '>=18'} - - 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.2: - resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==} - hasBin: true - - jiti@2.5.1: - resolution: {integrity: sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==} + 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'} - 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@3.1.0: - resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==} - engines: {node: '>=6'} - 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==} - - 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.30.1: - resolution: {integrity: sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==} + lightningcss-android-arm64@1.33.0: + resolution: {integrity: sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==} engines: {node: '>= 12.0.0'} + cpu: [arm64] + os: [android] + + 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.30.1: - resolution: {integrity: sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA==} + 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.30.1: - resolution: {integrity: sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig==} + 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.30.1: - resolution: {integrity: sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q==} + 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.30.1: - resolution: {integrity: sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw==} + 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.30.1: - resolution: {integrity: sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==} + 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.30.1: - resolution: {integrity: sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==} + 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.30.1: - resolution: {integrity: sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==} + 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.30.1: - resolution: {integrity: sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==} + 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.30.1: - resolution: {integrity: sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg==} + 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.30.1: - resolution: {integrity: sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==} + 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==} + 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==} - listhen@1.9.0: - resolution: {integrity: sha512-I8oW2+QL5KJo8zXNWX046M134WchxsXC7SawLPvRQpogCbkyQIaFxPE89A2HiwR7vAK2Dm2ERBAmyjTYGYEpBg==} + 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} - 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==} - locate-path@7.2.0: - resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - - 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.18: - resolution: {integrity: sha512-yi8swmWbO17qHhwIBNeeZxTceJMeBvWJaId6dyvTSOwTipqeHhMhOrz6513r1sOKnpvQ7zkhlG8tPrpilwTxHQ==} + 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==} @@ -3650,87 +2827,97 @@ packages: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} - micro-memoize@4.1.3: - resolution: {integrity: sha512-DzRMi8smUZXT7rCGikRwldEh6eO6qzKiPPopcr1+2EY3AYKpy5fu159PKWwIS9A6IWnrvPKDMcuFtyrroZa8Bw==} - - micromatch@4.0.7: - resolution: {integrity: sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==} - engines: {node: '>=8.6'} + micro-memoize@5.1.1: + resolution: {integrity: sha512-QDwluos8YeMijiKxZGwaV4f4tzj0soS6+xcsJhJ3+4wdEIHMyKbIKVUziebOgWX3e6yiijdoaHo+9tyhbnaWXA==} micromatch@4.0.8: resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} engines: {node: '>=8.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==} 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'} - - minizlib@3.0.2: - resolution: {integrity: sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==} - engines: {node: '>= 18'} - - mkdirp@3.0.1: - resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==} - engines: {node: '>=10'} - hasBin: true - - mlly@1.7.3: - resolution: {integrity: sha512-xUsx5n/mN0uQf4V548PKQ+YShA4/IW0KI1dZhrNrPCLG+xizETbHTkOa1f8/xut9JRPp8kQuMnz0oqwkTiLo/A==} - - mlly@1.7.4: - resolution: {integrity: sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==} + 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==} - ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - mute-stream@2.0.0: - resolution: {integrity: sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==} - engines: {node: ^18.17.0 || >=20.5.0} + 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==} - nanoid@3.3.11: - resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==} + nanoid@3.3.12: + resolution: {integrity: sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - nanoid@3.3.7: - resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} + nanoid@3.3.16: + resolution: {integrity: sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - natural-compare@1.4.0: - resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} + neo-async@2.6.2: + resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} - next@15.4.7: - resolution: {integrity: sha512-OcqRugwF7n7mC8OSYjvsZhhG1AYSvulor1EIUsIkbbEbf1qoE5EbH36Swj8WhF4cHqmDgkiam3z1c1W0J1Wifg==} - engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0} + next@16.2.7: + resolution: {integrity: sha512-eMJxgjRzBaj3olkP4cBamHDXL79A8FC6u1GcsO1D1Tsx8bw/LLXUJCaoajVxtnhD3A1IJqIT8IcRJjgBIPJq4w==} + engines: {node: '>=20.9.0'} hasBin: true peerDependencies: '@opentelemetry/api': ^1.1.0 @@ -3752,44 +2939,29 @@ packages: node-addon-api@7.1.1: resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==} - node-addon-api@8.2.2: - resolution: {integrity: sha512-9emqXAKhVoNrQ792nLI/wpzPpJ/bj/YXxW0CvAau1+RdGBcCRF1Dmz7719zgVsQNrzHl9Tzn3ImZ4qWFarWL0A==} + node-addon-api@8.7.0: + resolution: {integrity: sha512-9MdFxmkKaOYVTV+XVRG8ArDwwQ77XIgIPyKASB1k3JPq3M8fGQQQE3YpMOrKm6g//Ktx8ivZr8xo1Qmtqub+GA==} engines: {node: ^18 || ^20 || >= 21} - node-addon-api@8.3.0: - resolution: {integrity: sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg==} - engines: {node: ^18 || ^20 || >= 21} - - node-forge@1.3.1: - resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==} + node-forge@1.4.0: + resolution: {integrity: sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==} engines: {node: '>= 6.13.0'} - node-gyp-build@4.8.2: - resolution: {integrity: sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==} - hasBin: true - node-gyp-build@4.8.4: resolution: {integrity: sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==} hasBin: true - node-mock-http@1.0.2: - resolution: {integrity: sha512-zWaamgDUdo9SSLw47we78+zYw/bDr5gH8pH7oRRs8V3KmBtu8GLgGIbV2p/gRPd3LWpEOpjQj7X1FOU3VFMJ8g==} + node-mock-http@1.0.4: + resolution: {integrity: sha512-8DY+kFsDkNXy1sJglUfuODx1/opAGJGyrTuFqEoN90oRc2Vk0ZbD4K2qmKXBBEhZQzdKHIVfEJpDU8Ak2NJEvQ==} - node-releases@2.0.19: - resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==} + 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@5.3.0: - resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - object-assign@4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} @@ -3798,142 +2970,59 @@ packages: 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@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-limit@4.0.0: - resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - - p-locate@5.0.0: - resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} - engines: {node: '>=10'} - - p-locate@6.0.0: - resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - - 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-exists@5.0.0: - resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - - 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'} - path-parse@1.0.7: 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@6.0.0: - resolution: {integrity: sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==} - engines: {node: '>=18'} - - pathe@1.1.2: - resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} - pathe@2.0.3: resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==} - pathval@2.0.0: - resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==} - engines: {node: '>= 14.16'} - picocolors@1.1.1: resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} - picomatch@2.3.1: - resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} + picomatch@2.3.2: + resolution: {integrity: sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==} engines: {node: '>=8.6'} - picomatch@4.0.2: - resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} + 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'} - pirates@4.0.6: - resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} + pirates@4.0.7: + resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==} engines: {node: '>= 6'} - pkg-types@1.3.0: - resolution: {integrity: sha512-kS7yWjVFCkIw9hqdJBoMxDdzEngmkr5FXeWZZfQ6GoYacjVnsW6l2CcYW/0ThD0vF4LPJgVYnrg4d0uuhwYQbg==} + pkg-types@1.3.1: + resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==} - playwright-core@1.55.0: - resolution: {integrity: sha512-GvZs4vU3U5ro2nZpeiwyb0zuFaqb9sUiAJuyrWpcGouD8y9/HLgGbNRjIph7zU9D3hnPaisMl9zG9CgFi/biIg==} - engines: {node: '>=18'} + playwright-core@1.62.1: + resolution: {integrity: sha512-wPYSwEBJY9GHraISXqyqtx0na0LpO3XEX7jNDhntbex7tzUS7kLnZsOlFruFJB4Hi/rhDMjXGqHewDZ68nYZVw==} + engines: {node: '>=20'} hasBin: true - playwright@1.55.0: - resolution: {integrity: sha512-sdCWStblvV1YU909Xqx0DhOjPZE4/5lJsIS84IfN9dAZfcl/CIZ5O8l3o0j7hPMjDvqoTF8ZUcc+i/GL5erstA==} - 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'} @@ -3946,24 +3035,12 @@ packages: peerDependencies: postcss: ^8.0.0 - postcss-js@4.0.1: - resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==} + 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'} @@ -3996,8 +3073,8 @@ packages: resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==} engines: {node: '>=4'} - postcss-selector-parser@7.1.0: - resolution: {integrity: sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==} + postcss-selector-parser@7.1.4: + resolution: {integrity: sha512-HeP7D2wyhkR+XaK6v4W8oRF62Dsz4flyuczALJp61GckGm42u1saSSJ/0auvcBqxs3jMRFEcPK34At/0JBKdOg==} engines: {node: '>=4'} postcss-value-parser@4.2.0: @@ -4007,27 +3084,19 @@ packages: resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==} engines: {node: ^10 || ^12 || >=14} - postcss@8.4.41: - resolution: {integrity: sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==} + 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==} + postcss@8.5.25: + resolution: {integrity: sha512-DTPx3RWSSnWyzLxQnlH0rJP+EW5ekl16ZU4/psbIhA0e53kJfdgaN5vKM+xP7yJtXVu+nfdVFmlgFDEKAe4Pyw==} engines: {node: ^10 || ^12 || >=14} - postcss@8.5.6: - resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==} - 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.5.0: - resolution: {integrity: sha512-A5nzX8U9x+FJdpOKrDrH9eq86xHZNiGguWpphS6chTME0OK1bDgH1X+WLtZq7qV3kUEMkL/dHkr6C1NLdUA7RQ==} - - prettier-plugin-organize-imports@4.2.0: - resolution: {integrity: sha512-Zdy27UhlmyvATZi67BTnLcKTo8fm6Oik59Sz6H64PgZJVs6NJpPD1mT240mmJn62c98/QaL+r3kx9Q3gRpDajg==} + prettier-plugin-organize-imports@4.3.0: + resolution: {integrity: sha512-FxFz0qFhyBsGdIsb697f/EkvHzi5SZOhWAjxcx2dLt+Q532bAlhswcXGYB1yzjZ69kW8UoadFBw7TyNwlq96Iw==} peerDependencies: prettier: '>=2.0' typescript: '>=2.9' @@ -4036,38 +3105,33 @@ packages: vue-tsc: optional: true - prettier@3.6.2: - resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==} + 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==} radix3@1.1.2: resolution: {integrity: sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==} - react-dom@19.1.1: - resolution: {integrity: sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw==} + react-dom@19.2.6: + resolution: {integrity: sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g==} peerDependencies: - react: ^19.1.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.17.0: - resolution: {integrity: sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==} + react@19.2.6: + resolution: {integrity: sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==} engines: {node: '>=0.10.0'} - react@19.1.1: - resolution: {integrity: sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ==} + react@19.2.7: + resolution: {integrity: sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==} engines: {node: '>=0.10.0'} read-cache@1.0.0: @@ -4077,101 +3141,59 @@ packages: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} engines: {node: '>=8.10.0'} - readdirp@4.1.1: - resolution: {integrity: sha512-h80JrZu/MHUZCyHu5ciuoI0+WxsCxzxJTILn6Fs8rxSnFPh+UVHYfeIxK1nVGugMqkfC4vJcBOYbkfkwYK0+gw==} + readdirp@4.1.2: + resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==} engines: {node: '>= 14.18.0'} - reflect.getprototypeof@1.0.6: - resolution: {integrity: sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==} - engines: {node: '>= 0.4'} - - 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'} - 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==} - hasBin: true - - reusify@1.0.4: - resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} + reusify@1.1.0: + resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - rollup@4.34.9: - resolution: {integrity: sha512-nF5XYqWWp9hx/LrpC8sZvvvmq0TeTjQgaZHYmAgwysT9nh8sWnZhBnM8ZyVbbJFIQBLwHDNoMqsBZBbUo4U8sQ==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} + rolldown@1.2.1: + resolution: {integrity: sha512-4FKJhg8d3OiyQOA6Q1Q0hoFFpW9/OoX+VsHzpECsdsIZoOArrAK90gl59YK/Z+gnDel45bgJZK03ozH/9bCqEw==} + engines: {node: ^20.19.0 || >=22.12.0} hasBin: true - rollup@4.44.0: - resolution: {integrity: sha512-qHcdEzLCiktQIfwBq420pn2dP+30uzqYxv9ETm91wdt2R9AFcWfjNAmje4NWlnCIQ5RMTzVf0ZyisOKqHR6RwA==} + 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==} - safe-array-concat@1.1.2: - resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==} - engines: {node: '>=0.4'} - - safe-regex-test@1.0.3: - resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==} - engines: {node: '>= 0.4'} - safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - scheduler@0.26.0: - resolution: {integrity: sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==} + scheduler@0.27.0: + resolution: {integrity: sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==} - semver@6.3.1: - resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} - hasBin: true + schema-utils@4.3.3: + resolution: {integrity: sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==} + engines: {node: '>= 10.13.0'} - semver@7.7.2: - resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==} + semver@7.8.5: + resolution: {integrity: sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==} 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.34.3: - resolution: {integrity: sha512-eX2IQ6nFohW4DbvHIOLRB3MHFpYqaqvXd3Tp5e/T/dSH83fxaNJQRvDMhASmkNTsNTVF2/OOopzRCt7xokgPfg==} + sharp@0.34.5: + resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==} 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'} - siginfo@2.0.0: resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==} @@ -4179,9 +3201,6 @@ packages: 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@5.1.0: resolution: {integrity: sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==} engines: {node: '>=14.16'} @@ -4197,66 +3216,18 @@ packages: resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} engines: {node: '>=0.10.0'} - source-map@0.8.0-beta.0: - resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} - engines: {node: '>= 8'} - deprecated: The work that was done in this beta branch won't be included in future versions + 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==} - std-env@3.7.0: - resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==} + std-env@4.1.0: + resolution: {integrity: sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==} - 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@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==} @@ -4271,38 +3242,34 @@ packages: babel-plugin-macros: optional: true - sucrase@3.35.0: - resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} + sucrase@3.35.1: + resolution: {integrity: sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==} engines: {node: '>=16 || 14 >=14.17'} hasBin: true - 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'} - system-architecture@0.1.0: - resolution: {integrity: sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==} - engines: {node: '>=18'} + tagged-tag@1.0.0: + resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==} + engines: {node: '>=20'} - tailwindcss@3.4.14: - resolution: {integrity: sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==} + 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==} + tapable@2.3.3: + resolution: {integrity: sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==} engines: {node: '>=6'} - tar@7.4.3: - resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==} - engines: {node: '>=18'} - - terser@5.31.6: - resolution: {integrity: sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==} + terser@5.48.0: + resolution: {integrity: sha512-J/9An6vs9Us6wKRriSFXBWdRZapREHqFzdNUKk0pmu804EMR6dr6winwo7e5JDxN4xahxQsuysyYFwlwj4XN/Q==} engines: {node: '>=10'} hasBin: true @@ -4319,36 +3286,33 @@ packages: tinybench@2.9.0: resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} + tinyclip@0.1.15: + resolution: {integrity: sha512-uo33abH+Ays0xYaDysoBt494Hb3hsEczMpcC0MwFl773pazORx4fmvKhclhR1wonUbB6vvpRsvVMwnhfqeMc+A==} + engines: {node: ^16.14.0 || >= 17.3.0} + tinyexec@0.3.2: resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} - tinyglobby@0.2.12: - resolution: {integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==} + tinyexec@1.1.2: + resolution: {integrity: sha512-dAqSqE/RabpBKI8+h26GfLq6Vb3JVXs30XYQjdMjaj/c2tS8IYYMbIzP599KtRj7c57/wYApb3QjgRgXmrCukA==} + engines: {node: '>=18'} + + tinyglobby@0.2.16: + resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==} engines: {node: '>=12.0.0'} - tinyglobby@0.2.14: - resolution: {integrity: sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==} + tinyglobby@0.2.17: + resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==} engines: {node: '>=12.0.0'} - tinypool@1.0.0: - resolution: {integrity: sha512-KIKExllK7jp3uvrNtvRBYBWBOAXSX8ZvoaD8T+7KB/QHIuoJW3Pmr60zucywjAlMb5TeXUkcs/MWeWLu0qvuAQ==} - engines: {node: ^18.0.0 || >=20.0.0} - - tinyrainbow@1.2.0: - resolution: {integrity: sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==} - engines: {node: '>=14.0.0'} - - tinyspy@3.0.0: - resolution: {integrity: sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==} + 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==} - tree-kill@1.2.2: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} hasBin: true @@ -4369,26 +3333,17 @@ packages: tree-sitter: optional: true - tree-sitter@0.22.4: - resolution: {integrity: sha512-usbHZP9/oxNsUY65MQUsduGRqDHQOou1cagUSwjhoSYAmSahjQDAVsh9s+SlZkn8X8+O1FULRGwHu7AFP3kjzg==} - - 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==} - 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==} - tsup@8.5.0: - resolution: {integrity: sha512-VmBp77lWNQq6PfuMqCHD3xWl22vEoWsKajkF8t+yMBawlUS8JzEI+vOVMeuNZIuMML8qXRizFKi9oD5glKQVcQ==} + tsup@8.5.1: + resolution: {integrity: sha512-xtgkqwdhpKWr3tKPmCkvYmS9xnQK3m3XgxZHwSUjvfTjp7YfXe5tT3GgWi0F2N+ZSMsOeWeZFh7ZZFg5iPhing==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -4406,175 +3361,72 @@ packages: typescript: optional: true - tsx@4.19.1: - resolution: {integrity: sha512-0flMz1lh74BR4wOvBjuh9olbnwqCPc35OOlfyzHba0Dc+QNUeWX/Gq2YTbnwcWPO3BMd8fkzRVrHcsR+a7z7rA==} - engines: {node: '>=18.0.0'} - hasBin: true - - turbo-darwin-64@2.5.4: - resolution: {integrity: sha512-ah6YnH2dErojhFooxEzmvsoZQTMImaruZhFPfMKPBq8sb+hALRdvBNLqfc8NWlZq576FkfRZ/MSi4SHvVFT9PQ==} - cpu: [x64] - os: [darwin] - - turbo-darwin-arm64@2.5.4: - resolution: {integrity: sha512-2+Nx6LAyuXw2MdXb7pxqle3MYignLvS7OwtsP9SgtSBaMlnNlxl9BovzqdYAgkUW3AsYiQMJ/wBRb7d+xemM5A==} - cpu: [arm64] - os: [darwin] - - turbo-linux-64@2.5.4: - resolution: {integrity: sha512-5May2kjWbc8w4XxswGAl74GZ5eM4Gr6IiroqdLhXeXyfvWEdm2mFYCSWOzz0/z5cAgqyGidF1jt1qzUR8hTmOA==} - cpu: [x64] - os: [linux] - - turbo-linux-arm64@2.5.4: - resolution: {integrity: sha512-/2yqFaS3TbfxV3P5yG2JUI79P7OUQKOUvAnx4MV9Bdz6jqHsHwc9WZPpO4QseQm+NvmgY6ICORnoVPODxGUiJg==} - cpu: [arm64] - os: [linux] - - turbo-windows-64@2.5.4: - resolution: {integrity: sha512-EQUO4SmaCDhO6zYohxIjJpOKRN3wlfU7jMAj3CgcyTPvQR/UFLEKAYHqJOnJtymbQmiiM/ihX6c6W6Uq0yC7mA==} - cpu: [x64] - os: [win32] - - turbo-windows-arm64@2.5.4: - resolution: {integrity: sha512-oQ8RrK1VS8lrxkLriotFq+PiF7iiGgkZtfLKF4DDKsmdbPo0O9R2mQxm7jHLuXraRCuIQDWMIw6dpcr7Iykf4A==} - cpu: [arm64] - os: [win32] - - turbo@2.5.4: - resolution: {integrity: sha512-kc8ZibdRcuWUG1pbYSBFWqmIjynlD8Lp7IB6U3vIzvOv9VG+6Sp8bzyeBWE3Oi8XV5KsQrznyRTBPvrf99E4mA==} + turbo@2.10.8: + resolution: {integrity: sha512-9+8YX5QOkGXzZxcIykTHgaooRHGMWO+jfdyRK0o+rN0U7hBIig2MrJ8r/aNzIPDPhdA73SGb0O+tIztaModTMg==} hasBin: true typanion@3.14.0: resolution: {integrity: sha512-ZW/lVMRabETuYCd9O9ZvMhAh8GslSqaUjxmK/JLPCh6l73CvLBiuXswj/+7LdnWOgYsQ130FqLzFz5aGT4I3Ug==} - type-check@0.4.0: - resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} - engines: {node: '>= 0.8.0'} + type-fest@5.6.0: + resolution: {integrity: sha512-8ZiHFm91orbSAe2PSAiSVBVko18pbhbiB3U9GglSzF/zCGkR+rxpHx6sEMCUm4kxY4LjDIUGgCfUMtwfZfjfUA==} + engines: {node: '>=20'} - type-fest@4.36.0: - resolution: {integrity: sha512-3T/PUdKTCnkUmhQU6FFJEHsLwadsRegktX3TNHk+2JJB9HlA8gp1/VXblXVDI93kSnXF2rdPx0GMbHtJIV2LPg==} - 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==} + typescript@5.9.3: + resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} engines: {node: '>=14.17'} hasBin: true - typescript@5.6.3: - resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==} + typescript@6.0.3: + resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==} engines: {node: '>=14.17'} hasBin: true - ufo@1.5.4: - resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==} - - ufo@1.6.1: - resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==} - - unbox-primitive@1.0.2: - resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} + ufo@1.6.4: + resolution: {integrity: sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==} uncrypto@0.1.3: resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==} - undici-types@5.26.5: - resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - undici-types@6.21.0: resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} - unicorn-magic@0.1.0: - resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} - engines: {node: '>=18'} + undici-types@7.24.6: + resolution: {integrity: sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==} - unicorn-magic@0.3.0: - resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==} - engines: {node: '>=18'} + unicorn-magic@0.4.0: + resolution: {integrity: sha512-wH590V9VNgYH9g3lH9wWjTrUoKsjLF6sGLjhR4sH1LWpLmCOH0Zf7PukhDA8BiS7KHe4oPNkcTHqYkj7SOGUOw==} + engines: {node: '>=20'} - universal-user-agent@7.0.2: - resolution: {integrity: sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q==} + universal-user-agent@7.0.3: + resolution: {integrity: sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==} - untun@0.1.3: - resolution: {integrity: sha512-4luGP9LMYszMRZwsvyUd9MrxgEGZdZuZgpVQHEEX0lCYFESasVRvZd0EYpCkOIbJKHMuv0LskpXc/8Un+MJzEQ==} + untun@0.2.2: + resolution: {integrity: sha512-+NnOJcSiEtYsVgJmXUzQbJeRAFXJC4yPJYuh6kF9B0Rm6zunXcs/3GZOTllyocSbUDIxD6Bj7e/4ATw7sph1Sw==} hasBin: true - update-browserslist-db@1.1.1: - resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==} + update-browserslist-db@1.2.3: + resolution: {integrity: sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' - uqr@0.1.2: - resolution: {integrity: sha512-MJu7ypHq6QasgF5YRTjqscSzQp/W11zoUk6kvmlH+fmWEs63Y0Eib13hYFwAzagRJcVY8WVnlV+eBDUGMJ5IbA==} - - 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==} - 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} - 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@7.0.0: - resolution: {integrity: sha512-ixXJB1YRgDIw2OszKQS9WxGHKwLdCsbQNkpJN171udl6szi/rIySHL6/Os3s2+oE4P/FLD4dxg4mD7Wust+u5g==} + vite@8.2.0: + resolution: {integrity: sha512-pn+CFpM0lwDeKwmOq1ZaBK/9sjorZcgqxki6MbY/jPEVd9vichIlmlD4HmQ5wdP5EgqQCFRaACBxMC7uEGc6lQ==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: '@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: ^4.0.0 - lightningcss: ^1.21.0 sass: ^1.70.0 sass-embedded: ^1.70.0 stylus: '>=0.54.8' @@ -4585,12 +3437,14 @@ packages: 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: @@ -4606,23 +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 @@ -4631,766 +3501,419 @@ 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'} hasBin: true - word-wrap@1.2.5: - resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} - engines: {node: '>=0.10.0'} - - wrap-ansi@6.2.0: - resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} - engines: {node: '>=8'} - - 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==} - - yallist@5.0.0: - resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} - engines: {node: '>=18'} - - 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'} - - yocto-queue@1.2.1: - resolution: {integrity: sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==} - engines: {node: '>=12.20'} - - yoctocolors-cjs@2.1.2: - resolution: {integrity: sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==} - engines: {node: '>=18'} - 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.27.1': + '@emnapi/core@1.11.3': dependencies: - '@babel/helper-validator-identifier': 7.27.1 - js-tokens: 4.0.0 - picocolors: 1.1.1 - - '@babel/compat-data@7.27.5': {} - - '@babel/core@7.28.0': - dependencies: - '@ampproject/remapping': 2.3.0 - '@babel/code-frame': 7.27.1 - '@babel/generator': 7.28.0 - '@babel/helper-compilation-targets': 7.27.2 - '@babel/helper-module-transforms': 7.27.3(@babel/core@7.28.0) - '@babel/helpers': 7.27.6 - '@babel/parser': 7.28.0 - '@babel/template': 7.27.2 - '@babel/traverse': 7.28.0 - '@babel/types': 7.28.2 - convert-source-map: 2.0.0 - debug: 4.4.0 - gensync: 1.0.0-beta.2 - json5: 2.2.3 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - - '@babel/generator@7.28.0': - dependencies: - '@babel/parser': 7.28.0 - '@babel/types': 7.28.2 - '@jridgewell/gen-mapping': 0.3.12 - '@jridgewell/trace-mapping': 0.3.29 - jsesc: 3.1.0 - - '@babel/helper-compilation-targets@7.27.2': - dependencies: - '@babel/compat-data': 7.27.5 - '@babel/helper-validator-option': 7.27.1 - browserslist: 4.24.4 - lru-cache: 5.1.1 - semver: 6.3.1 - - '@babel/helper-globals@7.28.0': {} - - '@babel/helper-module-imports@7.27.1': - dependencies: - '@babel/traverse': 7.28.0 - '@babel/types': 7.28.2 - transitivePeerDependencies: - - supports-color - - '@babel/helper-module-transforms@7.27.3(@babel/core@7.28.0)': - dependencies: - '@babel/core': 7.28.0 - '@babel/helper-module-imports': 7.27.1 - '@babel/helper-validator-identifier': 7.27.1 - '@babel/traverse': 7.28.0 - transitivePeerDependencies: - - supports-color - - '@babel/helper-plugin-utils@7.27.1': {} - - '@babel/helper-string-parser@7.27.1': {} - - '@babel/helper-validator-identifier@7.27.1': {} - - '@babel/helper-validator-option@7.27.1': {} - - '@babel/helpers@7.27.6': - dependencies: - '@babel/template': 7.27.2 - '@babel/types': 7.28.2 - - '@babel/parser@7.28.0': - dependencies: - '@babel/types': 7.28.2 - - '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.28.0)': - dependencies: - '@babel/core': 7.28.0 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.28.0)': - dependencies: - '@babel/core': 7.28.0 - '@babel/helper-plugin-utils': 7.27.1 - - '@babel/template@7.27.2': - dependencies: - '@babel/code-frame': 7.27.1 - '@babel/parser': 7.28.0 - '@babel/types': 7.28.2 - - '@babel/traverse@7.28.0': - dependencies: - '@babel/code-frame': 7.27.1 - '@babel/generator': 7.28.0 - '@babel/helper-globals': 7.28.0 - '@babel/parser': 7.28.0 - '@babel/template': 7.27.2 - '@babel/types': 7.28.2 - debug: 4.4.0 - transitivePeerDependencies: - - supports-color - - '@babel/types@7.28.2': - dependencies: - '@babel/helper-string-parser': 7.27.1 - '@babel/helper-validator-identifier': 7.27.1 - - '@emnapi/core@1.5.0': - dependencies: - '@emnapi/wasi-threads': 1.1.0 + '@emnapi/wasi-threads': 1.2.3 tslib: 2.8.1 - '@emnapi/runtime@1.5.0': + '@emnapi/core@2.0.0-alpha.3': + dependencies: + '@emnapi/wasi-threads': 2.0.1 + tslib: 2.8.1 + optional: true + + '@emnapi/runtime@1.10.0': + dependencies: + tslib: 2.8.1 + optional: true + + '@emnapi/runtime@1.11.3': dependencies: tslib: 2.8.1 - '@emnapi/wasi-threads@1.1.0': + '@emnapi/runtime@2.0.0-alpha.3': + dependencies: + tslib: 2.8.1 + optional: true + + '@emnapi/wasi-threads@1.2.1': + dependencies: + tslib: 2.8.1 + optional: true + + '@emnapi/wasi-threads@1.2.3': dependencies: tslib: 2.8.1 - '@esbuild/aix-ppc64@0.21.5': - optional: true - - '@esbuild/aix-ppc64@0.23.1': - optional: true - - '@esbuild/aix-ppc64@0.25.0': - optional: true - - '@esbuild/android-arm64@0.21.5': - optional: true - - '@esbuild/android-arm64@0.23.1': - optional: true - - '@esbuild/android-arm64@0.25.0': - optional: true - - '@esbuild/android-arm@0.21.5': - optional: true - - '@esbuild/android-arm@0.23.1': - optional: true - - '@esbuild/android-arm@0.25.0': - optional: true - - '@esbuild/android-x64@0.21.5': - optional: true - - '@esbuild/android-x64@0.23.1': - optional: true - - '@esbuild/android-x64@0.25.0': - optional: true - - '@esbuild/darwin-arm64@0.21.5': - optional: true - - '@esbuild/darwin-arm64@0.23.1': - optional: true - - '@esbuild/darwin-arm64@0.25.0': - optional: true - - '@esbuild/darwin-x64@0.21.5': - optional: true - - '@esbuild/darwin-x64@0.23.1': - optional: true - - '@esbuild/darwin-x64@0.25.0': - optional: true - - '@esbuild/freebsd-arm64@0.21.5': - optional: true - - '@esbuild/freebsd-arm64@0.23.1': - optional: true - - '@esbuild/freebsd-arm64@0.25.0': - optional: true - - '@esbuild/freebsd-x64@0.21.5': - optional: true - - '@esbuild/freebsd-x64@0.23.1': - optional: true - - '@esbuild/freebsd-x64@0.25.0': - optional: true - - '@esbuild/linux-arm64@0.21.5': - optional: true - - '@esbuild/linux-arm64@0.23.1': - optional: true - - '@esbuild/linux-arm64@0.25.0': - optional: true - - '@esbuild/linux-arm@0.21.5': - optional: true - - '@esbuild/linux-arm@0.23.1': - optional: true - - '@esbuild/linux-arm@0.25.0': - optional: true - - '@esbuild/linux-ia32@0.21.5': - optional: true - - '@esbuild/linux-ia32@0.23.1': - optional: true - - '@esbuild/linux-ia32@0.25.0': - optional: true - - '@esbuild/linux-loong64@0.21.5': - optional: true - - '@esbuild/linux-loong64@0.23.1': - optional: true - - '@esbuild/linux-loong64@0.25.0': - optional: true - - '@esbuild/linux-mips64el@0.21.5': - optional: true - - '@esbuild/linux-mips64el@0.23.1': - optional: true - - '@esbuild/linux-mips64el@0.25.0': - optional: true - - '@esbuild/linux-ppc64@0.21.5': - optional: true - - '@esbuild/linux-ppc64@0.23.1': - optional: true - - '@esbuild/linux-ppc64@0.25.0': - optional: true - - '@esbuild/linux-riscv64@0.21.5': - optional: true - - '@esbuild/linux-riscv64@0.23.1': - optional: true - - '@esbuild/linux-riscv64@0.25.0': - optional: true - - '@esbuild/linux-s390x@0.21.5': - optional: true - - '@esbuild/linux-s390x@0.23.1': - optional: true - - '@esbuild/linux-s390x@0.25.0': - optional: true - - '@esbuild/linux-x64@0.21.5': - optional: true - - '@esbuild/linux-x64@0.23.1': - optional: true - - '@esbuild/linux-x64@0.25.0': - optional: true - - '@esbuild/netbsd-arm64@0.25.0': - optional: true - - '@esbuild/netbsd-x64@0.21.5': - optional: true - - '@esbuild/netbsd-x64@0.23.1': - optional: true - - '@esbuild/netbsd-x64@0.25.0': - optional: true - - '@esbuild/openbsd-arm64@0.23.1': - optional: true - - '@esbuild/openbsd-arm64@0.25.0': - optional: true - - '@esbuild/openbsd-x64@0.21.5': - optional: true - - '@esbuild/openbsd-x64@0.23.1': - optional: true - - '@esbuild/openbsd-x64@0.25.0': - optional: true - - '@esbuild/sunos-x64@0.21.5': - optional: true - - '@esbuild/sunos-x64@0.23.1': - optional: true - - '@esbuild/sunos-x64@0.25.0': - optional: true - - '@esbuild/win32-arm64@0.21.5': - optional: true - - '@esbuild/win32-arm64@0.23.1': - optional: true - - '@esbuild/win32-arm64@0.25.0': - optional: true - - '@esbuild/win32-ia32@0.21.5': - optional: true - - '@esbuild/win32-ia32@0.23.1': - optional: true - - '@esbuild/win32-ia32@0.25.0': - optional: true - - '@esbuild/win32-x64@0.21.5': - optional: true - - '@esbuild/win32-x64@0.23.1': - optional: true - - '@esbuild/win32-x64@0.25.0': - optional: true - - '@eslint-community/eslint-utils@4.4.0(eslint@9.33.0(jiti@2.5.1))': + '@emnapi/wasi-threads@2.0.1': dependencies: - eslint: 9.33.0(jiti@2.5.1) - eslint-visitor-keys: 3.4.3 + tslib: 2.8.1 + optional: true - '@eslint-community/regexpp@4.12.1': {} + '@esbuild/aix-ppc64@0.27.7': + optional: true - '@eslint/config-array@0.21.0': + '@esbuild/android-arm64@0.27.7': + optional: true + + '@esbuild/android-arm@0.27.7': + optional: true + + '@esbuild/android-x64@0.27.7': + optional: true + + '@esbuild/darwin-arm64@0.27.7': + optional: true + + '@esbuild/darwin-x64@0.27.7': + optional: true + + '@esbuild/freebsd-arm64@0.27.7': + optional: true + + '@esbuild/freebsd-x64@0.27.7': + optional: true + + '@esbuild/linux-arm64@0.27.7': + optional: true + + '@esbuild/linux-arm@0.27.7': + optional: true + + '@esbuild/linux-ia32@0.27.7': + optional: true + + '@esbuild/linux-loong64@0.27.7': + optional: true + + '@esbuild/linux-mips64el@0.27.7': + optional: true + + '@esbuild/linux-ppc64@0.27.7': + optional: true + + '@esbuild/linux-riscv64@0.27.7': + optional: true + + '@esbuild/linux-s390x@0.27.7': + optional: true + + '@esbuild/linux-x64@0.27.7': + optional: true + + '@esbuild/netbsd-arm64@0.27.7': + optional: true + + '@esbuild/netbsd-x64@0.27.7': + optional: true + + '@esbuild/openbsd-arm64@0.27.7': + optional: true + + '@esbuild/openbsd-x64@0.27.7': + optional: true + + '@esbuild/openharmony-arm64@0.27.7': + optional: true + + '@esbuild/sunos-x64@0.27.7': + optional: true + + '@esbuild/win32-arm64@0.27.7': + optional: true + + '@esbuild/win32-ia32@0.27.7': + optional: true + + '@esbuild/win32-x64@0.27.7': + optional: true + + '@img/colour@1.1.0': + optional: true + + '@img/sharp-darwin-arm64@0.34.5': + optionalDependencies: + '@img/sharp-libvips-darwin-arm64': 1.2.4 + optional: true + + '@img/sharp-darwin-x64@0.34.5': + optionalDependencies: + '@img/sharp-libvips-darwin-x64': 1.2.4 + optional: true + + '@img/sharp-libvips-darwin-arm64@1.2.4': + optional: true + + '@img/sharp-libvips-darwin-x64@1.2.4': + optional: true + + '@img/sharp-libvips-linux-arm64@1.2.4': + optional: true + + '@img/sharp-libvips-linux-arm@1.2.4': + optional: true + + '@img/sharp-libvips-linux-ppc64@1.2.4': + optional: true + + '@img/sharp-libvips-linux-riscv64@1.2.4': + optional: true + + '@img/sharp-libvips-linux-s390x@1.2.4': + optional: true + + '@img/sharp-libvips-linux-x64@1.2.4': + optional: true + + '@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.2.4 + optional: true + + '@img/sharp-linux-arm@0.34.5': + optionalDependencies: + '@img/sharp-libvips-linux-arm': 1.2.4 + optional: true + + '@img/sharp-linux-ppc64@0.34.5': + optionalDependencies: + '@img/sharp-libvips-linux-ppc64': 1.2.4 + optional: true + + '@img/sharp-linux-riscv64@0.34.5': + optionalDependencies: + '@img/sharp-libvips-linux-riscv64': 1.2.4 + optional: true + + '@img/sharp-linux-s390x@0.34.5': + optionalDependencies: + '@img/sharp-libvips-linux-s390x': 1.2.4 + optional: true + + '@img/sharp-linux-x64@0.34.5': + optionalDependencies: + '@img/sharp-libvips-linux-x64': 1.2.4 + optional: true + + '@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: - '@eslint/object-schema': 2.1.6 - debug: 4.4.0 - minimatch: 3.1.2 - transitivePeerDependencies: - - supports-color + '@emnapi/runtime': 1.11.3 + optional: true - '@eslint/config-helpers@0.3.1': {} + '@img/sharp-win32-arm64@0.34.5': + optional: true - '@eslint/core@0.15.2': + '@img/sharp-win32-ia32@0.34.5': + optional: true + + '@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: - '@types/json-schema': 7.0.15 + '@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 - '@eslint/eslintrc@3.3.1': + '@inquirer/confirm@6.1.1(@types/node@25.9.1)': dependencies: - ajv: 6.12.6 - debug: 4.4.0 - espree: 10.4.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 + '@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 - '@eslint/js@9.33.0': {} - - '@eslint/object-schema@2.1.6': {} - - '@eslint/plugin-kit@0.3.5': + '@inquirer/core@11.2.1(@types/node@25.9.1)': dependencies: - '@eslint/core': 0.15.2 - 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.2': {} - - '@img/sharp-darwin-arm64@0.34.3': - optionalDependencies: - '@img/sharp-libvips-darwin-arm64': 1.2.0 - optional: true - - '@img/sharp-darwin-x64@0.34.3': - optionalDependencies: - '@img/sharp-libvips-darwin-x64': 1.2.0 - optional: true - - '@img/sharp-libvips-darwin-arm64@1.2.0': - optional: true - - '@img/sharp-libvips-darwin-x64@1.2.0': - optional: true - - '@img/sharp-libvips-linux-arm64@1.2.0': - optional: true - - '@img/sharp-libvips-linux-arm@1.2.0': - optional: true - - '@img/sharp-libvips-linux-ppc64@1.2.0': - optional: true - - '@img/sharp-libvips-linux-s390x@1.2.0': - optional: true - - '@img/sharp-libvips-linux-x64@1.2.0': - optional: true - - '@img/sharp-libvips-linuxmusl-arm64@1.2.0': - optional: true - - '@img/sharp-libvips-linuxmusl-x64@1.2.0': - optional: true - - '@img/sharp-linux-arm64@0.34.3': - optionalDependencies: - '@img/sharp-libvips-linux-arm64': 1.2.0 - optional: true - - '@img/sharp-linux-arm@0.34.3': - optionalDependencies: - '@img/sharp-libvips-linux-arm': 1.2.0 - optional: true - - '@img/sharp-linux-ppc64@0.34.3': - optionalDependencies: - '@img/sharp-libvips-linux-ppc64': 1.2.0 - optional: true - - '@img/sharp-linux-s390x@0.34.3': - optionalDependencies: - '@img/sharp-libvips-linux-s390x': 1.2.0 - optional: true - - '@img/sharp-linux-x64@0.34.3': - optionalDependencies: - '@img/sharp-libvips-linux-x64': 1.2.0 - optional: true - - '@img/sharp-linuxmusl-arm64@0.34.3': - optionalDependencies: - '@img/sharp-libvips-linuxmusl-arm64': 1.2.0 - optional: true - - '@img/sharp-linuxmusl-x64@0.34.3': - optionalDependencies: - '@img/sharp-libvips-linuxmusl-x64': 1.2.0 - optional: true - - '@img/sharp-wasm32@0.34.3': - dependencies: - '@emnapi/runtime': 1.5.0 - optional: true - - '@img/sharp-win32-arm64@0.34.3': - optional: true - - '@img/sharp-win32-ia32@0.34.3': - optional: true - - '@img/sharp-win32-x64@0.34.3': - optional: true - - '@inquirer/ansi@1.0.0': {} - - '@inquirer/checkbox@4.2.4(@types/node@20.19.1)': - dependencies: - '@inquirer/ansi': 1.0.0 - '@inquirer/core': 10.2.2(@types/node@20.19.1) - '@inquirer/figures': 1.0.13 - '@inquirer/type': 3.0.8(@types/node@20.19.1) - yoctocolors-cjs: 2.1.2 - optionalDependencies: - '@types/node': 20.19.1 - - '@inquirer/confirm@5.1.18(@types/node@20.19.1)': - dependencies: - '@inquirer/core': 10.2.2(@types/node@20.19.1) - '@inquirer/type': 3.0.8(@types/node@20.19.1) - optionalDependencies: - '@types/node': 20.19.1 - - '@inquirer/core@10.2.2(@types/node@20.19.1)': - dependencies: - '@inquirer/ansi': 1.0.0 - '@inquirer/figures': 1.0.13 - '@inquirer/type': 3.0.8(@types/node@20.19.1) + '@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 - mute-stream: 2.0.0 + fast-wrap-ansi: 0.2.2 + mute-stream: 3.0.0 signal-exit: 4.1.0 - wrap-ansi: 6.2.0 - yoctocolors-cjs: 2.1.2 optionalDependencies: - '@types/node': 20.19.1 + '@types/node': 25.9.1 - '@inquirer/editor@4.2.20(@types/node@20.19.1)': + '@inquirer/editor@5.2.2(@types/node@25.9.1)': dependencies: - '@inquirer/core': 10.2.2(@types/node@20.19.1) - '@inquirer/external-editor': 1.0.2(@types/node@20.19.1) - '@inquirer/type': 3.0.8(@types/node@20.19.1) + '@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': 20.19.1 + '@types/node': 25.9.1 - '@inquirer/expand@4.0.20(@types/node@20.19.1)': + '@inquirer/expand@5.1.1(@types/node@25.9.1)': dependencies: - '@inquirer/core': 10.2.2(@types/node@20.19.1) - '@inquirer/type': 3.0.8(@types/node@20.19.1) - yoctocolors-cjs: 2.1.2 + '@inquirer/core': 11.2.1(@types/node@25.9.1) + '@inquirer/type': 4.0.7(@types/node@25.9.1) optionalDependencies: - '@types/node': 20.19.1 + '@types/node': 25.9.1 - '@inquirer/external-editor@1.0.2(@types/node@20.19.1)': + '@inquirer/external-editor@3.0.3(@types/node@25.9.1)': dependencies: - chardet: 2.1.0 - iconv-lite: 0.7.0 + chardet: 2.1.1 + iconv-lite: 0.7.2 optionalDependencies: - '@types/node': 20.19.1 + '@types/node': 25.9.1 - '@inquirer/figures@1.0.13': {} + '@inquirer/figures@2.0.7': {} - '@inquirer/input@4.2.4(@types/node@20.19.1)': + '@inquirer/input@5.1.2(@types/node@25.9.1)': dependencies: - '@inquirer/core': 10.2.2(@types/node@20.19.1) - '@inquirer/type': 3.0.8(@types/node@20.19.1) + '@inquirer/core': 11.2.1(@types/node@25.9.1) + '@inquirer/type': 4.0.7(@types/node@25.9.1) optionalDependencies: - '@types/node': 20.19.1 + '@types/node': 25.9.1 - '@inquirer/number@3.0.20(@types/node@20.19.1)': + '@inquirer/number@4.1.1(@types/node@25.9.1)': dependencies: - '@inquirer/core': 10.2.2(@types/node@20.19.1) - '@inquirer/type': 3.0.8(@types/node@20.19.1) + '@inquirer/core': 11.2.1(@types/node@25.9.1) + '@inquirer/type': 4.0.7(@types/node@25.9.1) optionalDependencies: - '@types/node': 20.19.1 + '@types/node': 25.9.1 - '@inquirer/password@4.0.20(@types/node@20.19.1)': + '@inquirer/password@5.1.1(@types/node@25.9.1)': dependencies: - '@inquirer/ansi': 1.0.0 - '@inquirer/core': 10.2.2(@types/node@20.19.1) - '@inquirer/type': 3.0.8(@types/node@20.19.1) + '@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': 20.19.1 + '@types/node': 25.9.1 - '@inquirer/prompts@7.8.6(@types/node@20.19.1)': + '@inquirer/prompts@8.5.2(@types/node@25.9.1)': dependencies: - '@inquirer/checkbox': 4.2.4(@types/node@20.19.1) - '@inquirer/confirm': 5.1.18(@types/node@20.19.1) - '@inquirer/editor': 4.2.20(@types/node@20.19.1) - '@inquirer/expand': 4.0.20(@types/node@20.19.1) - '@inquirer/input': 4.2.4(@types/node@20.19.1) - '@inquirer/number': 3.0.20(@types/node@20.19.1) - '@inquirer/password': 4.0.20(@types/node@20.19.1) - '@inquirer/rawlist': 4.1.8(@types/node@20.19.1) - '@inquirer/search': 3.1.3(@types/node@20.19.1) - '@inquirer/select': 4.3.4(@types/node@20.19.1) + '@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': 20.19.1 + '@types/node': 25.9.1 - '@inquirer/rawlist@4.1.8(@types/node@20.19.1)': + '@inquirer/rawlist@5.3.1(@types/node@25.9.1)': dependencies: - '@inquirer/core': 10.2.2(@types/node@20.19.1) - '@inquirer/type': 3.0.8(@types/node@20.19.1) - yoctocolors-cjs: 2.1.2 + '@inquirer/core': 11.2.1(@types/node@25.9.1) + '@inquirer/type': 4.0.7(@types/node@25.9.1) optionalDependencies: - '@types/node': 20.19.1 + '@types/node': 25.9.1 - '@inquirer/search@3.1.3(@types/node@20.19.1)': + '@inquirer/search@4.2.1(@types/node@25.9.1)': dependencies: - '@inquirer/core': 10.2.2(@types/node@20.19.1) - '@inquirer/figures': 1.0.13 - '@inquirer/type': 3.0.8(@types/node@20.19.1) - yoctocolors-cjs: 2.1.2 + '@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': 20.19.1 + '@types/node': 25.9.1 - '@inquirer/select@4.3.4(@types/node@20.19.1)': + '@inquirer/select@5.2.1(@types/node@25.9.1)': dependencies: - '@inquirer/ansi': 1.0.0 - '@inquirer/core': 10.2.2(@types/node@20.19.1) - '@inquirer/figures': 1.0.13 - '@inquirer/type': 3.0.8(@types/node@20.19.1) - yoctocolors-cjs: 2.1.2 + '@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': 20.19.1 + '@types/node': 25.9.1 - '@inquirer/type@3.0.8(@types/node@20.19.1)': + '@inquirer/type@4.0.7(@types/node@25.9.1)': optionalDependencies: - '@types/node': 20.19.1 + '@types/node': 25.9.1 - '@isaacs/cliui@8.0.2': + '@jridgewell/gen-mapping@0.3.13': 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 - - '@isaacs/fs-minipass@4.0.1': - dependencies: - minipass: 7.1.2 - - '@jridgewell/gen-mapping@0.3.12': - dependencies: - '@jridgewell/sourcemap-codec': 1.5.0 - '@jridgewell/trace-mapping': 0.3.29 - - '@jridgewell/gen-mapping@0.3.5': - dependencies: - '@jridgewell/set-array': 1.2.1 - '@jridgewell/sourcemap-codec': 1.5.0 - '@jridgewell/trace-mapping': 0.3.25 + '@jridgewell/sourcemap-codec': 1.5.5 + '@jridgewell/trace-mapping': 0.3.31 '@jridgewell/remapping@2.3.5': dependencies: - '@jridgewell/gen-mapping': 0.3.12 - '@jridgewell/trace-mapping': 0.3.29 + '@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.12 - '@jridgewell/trace-mapping': 0.3.29 - optional: true - - '@jridgewell/sourcemap-codec@1.5.0': {} + '@jridgewell/gen-mapping': 0.3.13 + '@jridgewell/trace-mapping': 0.3.31 '@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 - '@jridgewell/trace-mapping@0.3.29': + '@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: - '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.5.0 - - '@napi-rs/cli@3.2.0(@emnapi/runtime@1.5.0)(@types/node@20.19.1)(emnapi@1.5.0(node-addon-api@8.3.0))': - dependencies: - '@inquirer/prompts': 7.8.6(@types/node@20.19.1) - '@napi-rs/cross-toolchain': 1.0.3 - '@napi-rs/wasm-tools': 1.0.1 - '@octokit/rest': 22.0.0 + '@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 - debug: 4.4.3 - es-toolkit: 1.39.10 - find-up: 7.0.0 - js-yaml: 4.1.0 - semver: 7.7.2 + 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.5.0 - emnapi: 1.5.0(node-addon-api@8.3.0) + '@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' @@ -5402,14 +3925,17 @@ snapshots: - '@napi-rs/cross-toolchain-x64-target-s390x' - '@napi-rs/cross-toolchain-x64-target-x86_64' - '@types/node' + - node-addon-api - supports-color - '@napi-rs/cross-toolchain@1.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 - '@napi-rs/tar': 1.1.0 + '@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': @@ -5451,9 +3977,12 @@ snapshots: '@napi-rs/lzma-linux-x64-musl@1.4.5': optional: true - '@napi-rs/lzma-wasm32-wasi@1.4.5': + '@napi-rs/lzma-wasm32-wasi@1.4.5(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': dependencies: - '@napi-rs/wasm-runtime': 1.0.5 + '@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': @@ -5465,7 +3994,7 @@ snapshots: '@napi-rs/lzma-win32-x64-msvc@1.4.5': optional: true - '@napi-rs/lzma@1.4.5': + '@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 @@ -5480,10 +4009,13 @@ snapshots: '@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 + '@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 @@ -5521,9 +4053,12 @@ snapshots: '@napi-rs/tar-linux-x64-musl@1.1.0': optional: true - '@napi-rs/tar-wasm32-wasi@1.1.0': + '@napi-rs/tar-wasm32-wasi@1.1.0(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': dependencies: - '@napi-rs/wasm-runtime': 1.0.5 + '@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': @@ -5535,7 +4070,7 @@ snapshots: '@napi-rs/tar-win32-x64-msvc@1.1.0': optional: true - '@napi-rs/tar@1.1.0': + '@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 @@ -5549,16 +4084,33 @@ snapshots: '@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 + '@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.0.5': + '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': dependencies: - '@emnapi/core': 1.5.0 - '@emnapi/runtime': 1.5.0 - '@tybys/wasm-util': 0.10.1 + '@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 @@ -5587,9 +4139,12 @@ snapshots: '@napi-rs/wasm-tools-linux-x64-musl@1.0.1': optional: true - '@napi-rs/wasm-tools-wasm32-wasi@1.0.1': + '@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.0.5 + '@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': @@ -5601,7 +4156,7 @@ snapshots: '@napi-rs/wasm-tools-win32-x64-msvc@1.0.1': optional: true - '@napi-rs/wasm-tools@1.0.1': + '@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 @@ -5612,39 +4167,38 @@ snapshots: '@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 + '@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@15.4.7': {} + '@next/env@16.2.7': {} - '@next/eslint-plugin-next@15.4.7': - dependencies: - fast-glob: 3.3.1 - - '@next/swc-darwin-arm64@15.4.7': + '@next/swc-darwin-arm64@16.2.7': optional: true - '@next/swc-darwin-x64@15.4.7': + '@next/swc-darwin-x64@16.2.7': optional: true - '@next/swc-linux-arm64-gnu@15.4.7': + '@next/swc-linux-arm64-gnu@16.2.7': optional: true - '@next/swc-linux-arm64-musl@15.4.7': + '@next/swc-linux-arm64-musl@16.2.7': optional: true - '@next/swc-linux-x64-gnu@15.4.7': + '@next/swc-linux-x64-gnu@16.2.7': optional: true - '@next/swc-linux-x64-musl@15.4.7': + '@next/swc-linux-x64-musl@16.2.7': optional: true - '@next/swc-win32-arm64-msvc@15.4.7': + '@next/swc-win32-arm64-msvc@16.2.7': optional: true - '@next/swc-win32-x64-msvc@15.4.7': + '@next/swc-win32-x64-msvc@16.2.7': optional: true '@nodelib/fs.scandir@2.1.5': @@ -5657,360 +4211,362 @@ snapshots: '@nodelib/fs.walk@1.2.8': dependencies: '@nodelib/fs.scandir': 2.1.5 - fastq: 1.17.1 - - '@nolyfill/is-core-module@1.0.39': {} + fastq: 1.20.1 '@octokit/auth-token@6.0.0': {} - '@octokit/core@7.0.4': + '@octokit/core@7.0.6': dependencies: '@octokit/auth-token': 6.0.0 - '@octokit/graphql': 9.0.1 - '@octokit/request': 10.0.3 - '@octokit/request-error': 7.0.0 - '@octokit/types': 15.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.2 + universal-user-agent: 7.0.3 - '@octokit/endpoint@11.0.0': + '@octokit/endpoint@11.0.3': dependencies: - '@octokit/types': 14.1.0 - universal-user-agent: 7.0.2 + '@octokit/types': 16.0.0 + universal-user-agent: 7.0.3 - '@octokit/graphql@9.0.1': + '@octokit/graphql@9.0.3': dependencies: - '@octokit/request': 10.0.3 - '@octokit/types': 14.1.0 - universal-user-agent: 7.0.2 + '@octokit/request': 10.0.9 + '@octokit/types': 16.0.0 + universal-user-agent: 7.0.3 - '@octokit/openapi-types@25.1.0': {} + '@octokit/openapi-types@27.0.0': {} - '@octokit/openapi-types@26.0.0': {} - - '@octokit/plugin-paginate-rest@13.1.1(@octokit/core@7.0.4)': + '@octokit/plugin-paginate-rest@14.0.0(@octokit/core@7.0.6)': dependencies: - '@octokit/core': 7.0.4 - '@octokit/types': 14.1.0 + '@octokit/core': 7.0.6 + '@octokit/types': 16.0.0 - '@octokit/plugin-request-log@6.0.0(@octokit/core@7.0.4)': + '@octokit/plugin-request-log@6.0.0(@octokit/core@7.0.6)': dependencies: - '@octokit/core': 7.0.4 + '@octokit/core': 7.0.6 - '@octokit/plugin-rest-endpoint-methods@16.1.0(@octokit/core@7.0.4)': + '@octokit/plugin-rest-endpoint-methods@17.0.0(@octokit/core@7.0.6)': dependencies: - '@octokit/core': 7.0.4 - '@octokit/types': 15.0.0 + '@octokit/core': 7.0.6 + '@octokit/types': 16.0.0 - '@octokit/request-error@7.0.0': + '@octokit/request-error@7.1.0': dependencies: - '@octokit/types': 14.1.0 + '@octokit/types': 16.0.0 - '@octokit/request@10.0.3': + '@octokit/request@10.0.9': dependencies: - '@octokit/endpoint': 11.0.0 - '@octokit/request-error': 7.0.0 - '@octokit/types': 14.1.0 + '@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 - universal-user-agent: 7.0.2 + json-with-bigint: 3.5.8 + universal-user-agent: 7.0.3 - '@octokit/rest@22.0.0': + '@octokit/rest@22.0.1': dependencies: - '@octokit/core': 7.0.4 - '@octokit/plugin-paginate-rest': 13.1.1(@octokit/core@7.0.4) - '@octokit/plugin-request-log': 6.0.0(@octokit/core@7.0.4) - '@octokit/plugin-rest-endpoint-methods': 16.1.0(@octokit/core@7.0.4) + '@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@14.1.0': + '@octokit/types@16.0.0': dependencies: - '@octokit/openapi-types': 25.1.0 + '@octokit/openapi-types': 27.0.0 - '@octokit/types@15.0.0': - dependencies: - '@octokit/openapi-types': 26.0.0 - - '@oven/bun-darwin-aarch64@1.2.20': + '@oven/bun-darwin-aarch64@1.3.14': optional: true - '@oven/bun-darwin-x64-baseline@1.2.20': + '@oven/bun-darwin-x64-baseline@1.3.14': optional: true - '@oven/bun-darwin-x64@1.2.20': + '@oven/bun-darwin-x64@1.3.14': optional: true - '@oven/bun-linux-aarch64-musl@1.2.20': + '@oven/bun-freebsd-aarch64@1.3.14': optional: true - '@oven/bun-linux-aarch64@1.2.20': + '@oven/bun-freebsd-x64@1.3.14': optional: true - '@oven/bun-linux-x64-baseline@1.2.20': + '@oven/bun-linux-aarch64-android@1.3.14': optional: true - '@oven/bun-linux-x64-musl-baseline@1.2.20': + '@oven/bun-linux-aarch64-musl@1.3.14': optional: true - '@oven/bun-linux-x64-musl@1.2.20': + '@oven/bun-linux-aarch64@1.3.14': optional: true - '@oven/bun-linux-x64@1.2.20': + '@oven/bun-linux-x64-android@1.3.14': optional: true - '@oven/bun-windows-x64-baseline@1.2.20': + '@oven/bun-linux-x64-baseline@1.3.14': optional: true - '@oven/bun-windows-x64@1.2.20': + '@oven/bun-linux-x64-musl-baseline@1.3.14': optional: true - '@parcel/watcher-android-arm64@2.5.0': + '@oven/bun-linux-x64-musl@1.3.14': optional: true - '@parcel/watcher-android-arm64@2.5.1': + '@oven/bun-linux-x64@1.3.14': optional: true - '@parcel/watcher-darwin-arm64@2.5.0': + '@oven/bun-windows-aarch64@1.3.14': optional: true - '@parcel/watcher-darwin-arm64@2.5.1': {} - - '@parcel/watcher-darwin-x64@2.5.0': + '@oven/bun-windows-x64-baseline@1.3.14': optional: true - '@parcel/watcher-darwin-x64@2.5.1': {} - - '@parcel/watcher-freebsd-x64@2.5.0': + '@oven/bun-windows-x64@1.3.14': optional: true - '@parcel/watcher-freebsd-x64@2.5.1': + '@oxc-project/types@0.142.0': {} + + '@parcel/watcher-android-arm64@2.6.0': optional: true - '@parcel/watcher-linux-arm-glibc@2.5.0': + '@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.5.1': + '@parcel/watcher-linux-arm-glibc@2.6.0': optional: true - '@parcel/watcher-linux-arm-musl@2.5.0': + '@parcel/watcher-linux-arm-musl@2.6.0': optional: true - '@parcel/watcher-linux-arm-musl@2.5.1': - optional: true + '@parcel/watcher-linux-arm64-glibc@2.6.0': {} - '@parcel/watcher-linux-arm64-glibc@2.5.0': - optional: true + '@parcel/watcher-linux-arm64-musl@2.6.0': {} - '@parcel/watcher-linux-arm64-glibc@2.5.1': {} + '@parcel/watcher-linux-x64-glibc@2.6.0': {} - '@parcel/watcher-linux-arm64-musl@2.5.0': - optional: true + '@parcel/watcher-linux-x64-musl@2.6.0': {} - '@parcel/watcher-linux-arm64-musl@2.5.1': {} - - '@parcel/watcher-linux-x64-glibc@2.5.0': - optional: true - - '@parcel/watcher-linux-x64-glibc@2.5.1': {} - - '@parcel/watcher-linux-x64-musl@2.5.0': - optional: true - - '@parcel/watcher-linux-x64-musl@2.5.1': {} - - '@parcel/watcher-wasm@2.5.0': + '@parcel/watcher-wasm@2.5.6': dependencies: is-glob: 4.0.3 - micromatch: 4.0.7 + picomatch: 4.0.5 - '@parcel/watcher-win32-arm64@2.5.0': + '@parcel/watcher-win32-arm64@2.6.0': optional: true - '@parcel/watcher-win32-arm64@2.5.1': - optional: true + '@parcel/watcher-win32-x64@2.6.0': {} - '@parcel/watcher-win32-ia32@2.5.0': - optional: true - - '@parcel/watcher-win32-ia32@2.5.1': - optional: true - - '@parcel/watcher-win32-x64@2.5.0': - optional: true - - '@parcel/watcher-win32-x64@2.5.1': {} - - '@parcel/watcher@2.5.0': + '@parcel/watcher@2.6.0(patch_hash=705ce75ccea54337110c4d7fe0a8b421658ea0c23e1a77c1fa890a86041179da)': dependencies: - detect-libc: 1.0.3 + detect-libc: 2.1.2 is-glob: 4.0.3 - micromatch: 4.0.7 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 - '@parcel/watcher@2.5.1(patch_hash=zs2vvlrje3h42xp5ed2v44fep4)': + '@playwright/test@1.62.1': dependencies: - detect-libc: 1.0.3 - is-glob: 4.0.3 - micromatch: 4.0.8 - node-addon-api: 7.1.1 + playwright: 1.62.1 + + '@rolldown/binding-android-arm64@1.2.1': + optional: true + + '@rolldown/binding-darwin-arm64@1.2.1': + optional: true + + '@rolldown/binding-darwin-x64@1.2.1': + optional: true + + '@rolldown/binding-freebsd-x64@1.2.1': + optional: true + + '@rolldown/binding-linux-arm-gnueabihf@1.2.1': + optional: true + + '@rolldown/binding-linux-arm64-gnu@1.2.1': + optional: true + + '@rolldown/binding-linux-arm64-musl@1.2.1': + optional: true + + '@rolldown/binding-linux-ppc64-gnu@1.2.1': + optional: true + + '@rolldown/binding-linux-s390x-gnu@1.2.1': + optional: true + + '@rolldown/binding-linux-x64-gnu@1.2.1': + optional: true + + '@rolldown/binding-linux-x64-musl@1.2.1': + optional: true + + '@rolldown/binding-openharmony-arm64@1.2.1': + optional: true + + '@rolldown/binding-wasm32-wasi@1.2.1': + dependencies: + '@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: - '@parcel/watcher-android-arm64': 2.5.1 - '@parcel/watcher-darwin-arm64': 2.5.1 - '@parcel/watcher-darwin-x64': 2.5.1 - '@parcel/watcher-freebsd-x64': 2.5.1 - '@parcel/watcher-linux-arm-glibc': 2.5.1 - '@parcel/watcher-linux-arm-musl': 2.5.1 - '@parcel/watcher-linux-arm64-glibc': 2.5.1 - '@parcel/watcher-linux-arm64-musl': 2.5.1 - '@parcel/watcher-linux-x64-glibc': 2.5.1 - '@parcel/watcher-linux-x64-musl': 2.5.1 - '@parcel/watcher-win32-arm64': 2.5.1 - '@parcel/watcher-win32-ia32': 2.5.1 - '@parcel/watcher-win32-x64': 2.5.1 + '@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 - '@pkgjs/parseargs@0.11.0': - optional: true - - '@playwright/test@1.55.0': + '@rspack/core@2.0.2(@swc/helpers@0.5.15)': dependencies: - playwright: 1.55.0 + '@rspack/binding': 2.0.2 + optionalDependencies: + '@swc/helpers': 0.5.15 - '@rolldown/pluginutils@1.0.0-beta.30': {} + '@sindresorhus/merge-streams@4.0.0': {} - '@rollup/rollup-android-arm-eabi@4.34.9': - optional: true - - '@rollup/rollup-android-arm-eabi@4.44.0': - optional: true - - '@rollup/rollup-android-arm64@4.34.9': - optional: true - - '@rollup/rollup-android-arm64@4.44.0': - optional: true - - '@rollup/rollup-darwin-arm64@4.34.9': - optional: true - - '@rollup/rollup-darwin-arm64@4.44.0': - optional: true - - '@rollup/rollup-darwin-x64@4.34.9': - optional: true - - '@rollup/rollup-darwin-x64@4.44.0': - optional: true - - '@rollup/rollup-freebsd-arm64@4.34.9': - optional: true - - '@rollup/rollup-freebsd-arm64@4.44.0': - optional: true - - '@rollup/rollup-freebsd-x64@4.34.9': - optional: true - - '@rollup/rollup-freebsd-x64@4.44.0': - optional: true - - '@rollup/rollup-linux-arm-gnueabihf@4.34.9': - optional: true - - '@rollup/rollup-linux-arm-gnueabihf@4.44.0': - optional: true - - '@rollup/rollup-linux-arm-musleabihf@4.34.9': - optional: true - - '@rollup/rollup-linux-arm-musleabihf@4.44.0': - optional: true - - '@rollup/rollup-linux-arm64-gnu@4.34.9': - optional: true - - '@rollup/rollup-linux-arm64-gnu@4.44.0': - optional: true - - '@rollup/rollup-linux-arm64-musl@4.34.9': - optional: true - - '@rollup/rollup-linux-arm64-musl@4.44.0': - optional: true - - '@rollup/rollup-linux-loongarch64-gnu@4.34.9': - optional: true - - '@rollup/rollup-linux-loongarch64-gnu@4.44.0': - optional: true - - '@rollup/rollup-linux-powerpc64le-gnu@4.34.9': - optional: true - - '@rollup/rollup-linux-powerpc64le-gnu@4.44.0': - optional: true - - '@rollup/rollup-linux-riscv64-gnu@4.34.9': - optional: true - - '@rollup/rollup-linux-riscv64-gnu@4.44.0': - optional: true - - '@rollup/rollup-linux-riscv64-musl@4.44.0': - optional: true - - '@rollup/rollup-linux-s390x-gnu@4.34.9': - optional: true - - '@rollup/rollup-linux-s390x-gnu@4.44.0': - optional: true - - '@rollup/rollup-linux-x64-gnu@4.34.9': - optional: true - - '@rollup/rollup-linux-x64-gnu@4.44.0': - optional: true - - '@rollup/rollup-linux-x64-musl@4.34.9': - optional: true - - '@rollup/rollup-linux-x64-musl@4.44.0': - optional: true - - '@rollup/rollup-win32-arm64-msvc@4.34.9': - optional: true - - '@rollup/rollup-win32-arm64-msvc@4.44.0': - optional: true - - '@rollup/rollup-win32-ia32-msvc@4.34.9': - optional: true - - '@rollup/rollup-win32-ia32-msvc@4.44.0': - optional: true - - '@rollup/rollup-win32-x64-msvc@4.34.9': - optional: true - - '@rollup/rollup-win32-x64-msvc@4.44.0': - optional: true - - '@rtsao/scc@1.1.0': {} - - '@rushstack/eslint-patch@1.10.4': {} - - '@sindresorhus/merge-streams@2.3.0': {} + '@standard-schema/spec@1.1.0': {} '@swc/helpers@0.5.15': dependencies: @@ -6020,487 +4576,300 @@ snapshots: dependencies: tailwindcss: link:packages/tailwindcss - '@tailwindcss/forms@0.5.10(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.16(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 - '@tybys/wasm-util@0.10.1': + '@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: tslib: 2.8.1 - '@types/babel__core@7.20.5': + '@types/bun@1.3.14': dependencies: - '@babel/parser': 7.28.0 - '@babel/types': 7.28.2 - '@types/babel__generator': 7.6.8 - '@types/babel__template': 7.4.4 - '@types/babel__traverse': 7.20.6 + bun-types: 1.3.14 - '@types/babel__generator@7.6.8': + '@types/chai@5.2.3': dependencies: - '@babel/types': 7.28.2 + '@types/deep-eql': 4.0.2 + assertion-error: 2.0.1 - '@types/babel__template@7.4.4': - dependencies: - '@babel/parser': 7.28.0 - '@babel/types': 7.28.2 - - '@types/babel__traverse@7.20.6': - dependencies: - '@babel/types': 7.28.2 - - '@types/braces@3.0.5': {} - - '@types/bun@1.2.20(@types/react@19.1.9)': - dependencies: - bun-types: 1.2.20(@types/react@19.1.9) - transitivePeerDependencies: - - '@types/react' - - '@types/estree@1.0.6': {} + '@types/deep-eql@4.0.2': {} '@types/estree@1.0.8': {} + '@types/estree@1.0.9': {} + '@types/json-schema@7.0.15': {} - '@types/json5@0.0.29': {} - - '@types/node@20.14.13': - dependencies: - undici-types: 5.26.5 - - '@types/node@20.19.1': + '@types/node@22.20.1': dependencies: undici-types: 6.21.0 + '@types/node@25.9.1': + dependencies: + undici-types: 7.24.6 + '@types/postcss-import@14.0.3': dependencies: - postcss: 8.4.41 + postcss: 8.5.25 - '@types/react-dom@19.1.7(@types/react@19.1.9)': + '@types/react-dom@19.2.3(@types/react@19.2.15)': dependencies: - '@types/react': 19.1.9 + '@types/react': 19.2.15 - '@types/react@19.1.9': + '@types/react@19.2.15': dependencies: - csstype: 3.1.3 + csstype: 3.2.3 - '@types/semver@7.7.0': {} + '@types/semver@7.8.0': {} - '@typescript-eslint/eslint-plugin@8.11.0(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4))(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4)': + '@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: - '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4) - '@typescript-eslint/scope-manager': 8.11.0 - '@typescript-eslint/type-utils': 8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4) - '@typescript-eslint/utils': 8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4) - '@typescript-eslint/visitor-keys': 8.11.0 - eslint: 9.33.0(jiti@2.5.1) - 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 + '@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.33.0(jiti@2.5.1))(typescript@5.6.3))(eslint@9.33.0(jiti@2.5.1))(typescript@5.6.3)': + '@vitest/expect@4.1.10': dependencies: - '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.6.3) - '@typescript-eslint/scope-manager': 8.11.0 - '@typescript-eslint/type-utils': 8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.6.3) - '@typescript-eslint/utils': 8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 8.11.0 - eslint: 9.33.0(jiti@2.5.1) - 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 + '@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/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4)': + '@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: - '@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.4.0 - eslint: 9.33.0(jiti@2.5.1) - optionalDependencies: - typescript: 5.5.4 - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(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.4.0 - eslint: 9.33.0(jiti@2.5.1) - 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.33.0(jiti@2.5.1))(typescript@5.5.4)': - dependencies: - '@typescript-eslint/typescript-estree': 8.11.0(typescript@5.5.4) - '@typescript-eslint/utils': 8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4) - debug: 4.4.0 - 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.33.0(jiti@2.5.1))(typescript@5.6.3)': - dependencies: - '@typescript-eslint/typescript-estree': 8.11.0(typescript@5.6.3) - '@typescript-eslint/utils': 8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.6.3) - debug: 4.4.0 - 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.4.0 - fast-glob: 3.3.3 - is-glob: 4.0.3 - minimatch: 9.0.5 - semver: 7.7.2 - 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.4.0 - fast-glob: 3.3.3 - is-glob: 4.0.3 - minimatch: 9.0.5 - semver: 7.7.2 - 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.33.0(jiti@2.5.1))(typescript@5.5.4)': - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.33.0(jiti@2.5.1)) - '@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.33.0(jiti@2.5.1) - transitivePeerDependencies: - - supports-color - - typescript - - '@typescript-eslint/utils@8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.6.3)': - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.33.0(jiti@2.5.1)) - '@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.33.0(jiti@2.5.1) - 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@5.0.0(vite@7.0.0(@types/node@20.19.1)(jiti@2.5.1)(lightningcss@1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm))(terser@5.31.6)(tsx@4.19.1)(yaml@2.6.0))': - dependencies: - '@babel/core': 7.28.0 - '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.0) - '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.28.0) - '@rolldown/pluginutils': 1.0.0-beta.30 - '@types/babel__core': 7.20.5 - react-refresh: 0.17.0 - vite: 7.0.0(@types/node@20.19.1)(jiti@2.5.1)(lightningcss@1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm))(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.18 - 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.15.0): + '@vitest/pretty-format@4.1.10': dependencies: - acorn: 8.15.0 + tinyrainbow: 3.1.0 - acorn@8.14.0: {} + '@vitest/runner@4.1.10': + dependencies: + '@vitest/utils': 4.1.10 + pathe: 2.0.3 - acorn@8.15.0: {} + '@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 - ajv@6.12.6: + '@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@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.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.21(postcss@8.4.47): + autoprefixer@10.5.0(postcss@8.5.25): dependencies: - browserslist: 4.24.4 - caniuse-lite: 1.0.30001705 - 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 - - axe-core@4.10.2: {} - - axobject-query@4.1.0: {} - - balanced-match@1.0.2: {} + baseline-browser-mapping@2.10.31: {} 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.24.4: + browserslist@4.28.2: dependencies: - caniuse-lite: 1.0.30001705 - electron-to-chromium: 1.5.119 - node-releases: 2.0.19 - update-browserslist-db: 1.1.1(browserslist@4.24.4) + 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) - buffer-from@1.1.2: - optional: true + buffer-from@1.1.2: {} - bun-types@1.2.20(@types/react@19.1.9): + bun-types@1.3.14: dependencies: - '@types/node': 20.19.1 - '@types/react': 19.1.9 + '@types/node': 25.9.1 - bun@1.2.20: + bun@1.3.14: optionalDependencies: - '@oven/bun-darwin-aarch64': 1.2.20 - '@oven/bun-darwin-x64': 1.2.20 - '@oven/bun-darwin-x64-baseline': 1.2.20 - '@oven/bun-linux-aarch64': 1.2.20 - '@oven/bun-linux-aarch64-musl': 1.2.20 - '@oven/bun-linux-x64': 1.2.20 - '@oven/bun-linux-x64-baseline': 1.2.20 - '@oven/bun-linux-x64-musl': 1.2.20 - '@oven/bun-linux-x64-musl-baseline': 1.2.20 - '@oven/bun-windows-x64': 1.2.20 - '@oven/bun-windows-x64-baseline': 1.2.20 + '@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.1.0(esbuild@0.25.0): + bundle-require@5.1.0(esbuild@0.27.7): dependencies: - esbuild: 0.25.0 + esbuild: 0.27.7 load-tsconfig: 0.2.5 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.30001705: {} + 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@4.1.2: - dependencies: - ansi-styles: 4.3.0 - supports-color: 7.2.0 - - chardet@2.1.0: {} - - check-error@2.1.1: {} + chardet@2.1.1: {} chokidar@3.6.0: dependencies: @@ -6516,13 +4885,11 @@ snapshots: chokidar@4.0.3: dependencies: - readdirp: 4.1.1 + readdirp: 4.1.2 - chownr@3.0.0: {} + chrome-trace-event@1.0.4: {} - citty@0.1.6: - dependencies: - consola: 3.2.3 + citty@0.2.2: {} cli-width@4.1.0: {} @@ -6532,642 +4899,124 @@ snapshots: dependencies: typanion: 3.14.0 - clipboardy@4.0.0: - dependencies: - execa: 8.0.1 - is-wsl: 3.1.0 - is64bit: 2.0.0 - - color-convert@2.0.1: - dependencies: - color-name: 1.1.4 - - 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 - colorette@2.0.20: {} - 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: {} - consola@3.4.0: {} + content-type@2.0.0: {} convert-source-map@2.0.0: {} - cookie-es@1.2.2: {} - - cross-spawn@7.0.6: - dependencies: - path-key: 3.1.1 - shebang-command: 2.0.0 - which: 2.0.2 - - crossws@0.3.1: - dependencies: - uncrypto: 0.1.3 + cookie-es@1.2.3: {} crossws@0.3.5: dependencies: uncrypto: 0.1.3 + crossws@0.4.10: {} + cssesc@3.0.0: {} - csstype@3.1.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: - dependencies: - ms: 2.1.3 - - debug@4.3.6: - dependencies: - ms: 2.1.2 - - debug@4.4.0: - dependencies: - ms: 2.1.3 + csstype@3.2.3: {} debug@4.4.3: dependencies: ms: 2.1.3 - dedent@1.6.0: {} + dedent@1.7.2: {} - 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 - - defu@6.1.4: {} + defu@6.1.7: {} destr@2.0.5: {} detect-libc@1.0.3: {} - detect-libc@2.0.4: {} + detect-libc@2.1.2: {} didyoumean@1.2.2: {} dlv@1.1.3: {} - doctrine@2.1.0: - dependencies: - esutils: 2.0.3 + electron-to-chromium@1.5.361: {} - eastasianwidth@0.2.0: {} - - electron-to-chromium@1.5.119: {} - - emnapi@1.5.0(node-addon-api@8.3.0): + emnapi@1.11.3(node-addon-api@8.7.0): optionalDependencies: - node-addon-api: 8.3.0 + node-addon-api: 8.7.0 - emoji-regex@8.0.0: {} - - emoji-regex@9.2.2: {} - - enhanced-resolve@5.18.3: + 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 - - es-toolkit@1.39.10: {} - - 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.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.25.0: - optionalDependencies: - '@esbuild/aix-ppc64': 0.25.0 - '@esbuild/android-arm': 0.25.0 - '@esbuild/android-arm64': 0.25.0 - '@esbuild/android-x64': 0.25.0 - '@esbuild/darwin-arm64': 0.25.0 - '@esbuild/darwin-x64': 0.25.0 - '@esbuild/freebsd-arm64': 0.25.0 - '@esbuild/freebsd-x64': 0.25.0 - '@esbuild/linux-arm': 0.25.0 - '@esbuild/linux-arm64': 0.25.0 - '@esbuild/linux-ia32': 0.25.0 - '@esbuild/linux-loong64': 0.25.0 - '@esbuild/linux-mips64el': 0.25.0 - '@esbuild/linux-ppc64': 0.25.0 - '@esbuild/linux-riscv64': 0.25.0 - '@esbuild/linux-s390x': 0.25.0 - '@esbuild/linux-x64': 0.25.0 - '@esbuild/netbsd-arm64': 0.25.0 - '@esbuild/netbsd-x64': 0.25.0 - '@esbuild/openbsd-arm64': 0.25.0 - '@esbuild/openbsd-x64': 0.25.0 - '@esbuild/sunos-x64': 0.25.0 - '@esbuild/win32-arm64': 0.25.0 - '@esbuild/win32-ia32': 0.25.0 - '@esbuild/win32-x64': 0.25.0 + '@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@4.0.0: {} - - eslint-config-next@15.4.7(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4): - dependencies: - '@next/eslint-plugin-next': 15.4.7 - '@rushstack/eslint-patch': 1.10.4 - '@typescript-eslint/eslint-plugin': 8.11.0(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4))(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4) - '@typescript-eslint/parser': 8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4) - eslint: 9.33.0(jiti@2.5.1) - eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.33.0(jiti@2.5.1)) - eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4))(eslint@9.33.0(jiti@2.5.1)) - eslint-plugin-jsx-a11y: 6.10.1(eslint@9.33.0(jiti@2.5.1)) - eslint-plugin-react: 7.37.2(eslint@9.33.0(jiti@2.5.1)) - eslint-plugin-react-hooks: 5.0.0(eslint@9.33.0(jiti@2.5.1)) - optionalDependencies: - typescript: 5.5.4 - transitivePeerDependencies: - - eslint-import-resolver-webpack - - eslint-plugin-import-x - - supports-color - - eslint-config-next@15.4.7(eslint@9.33.0(jiti@2.5.1))(typescript@5.6.3): - dependencies: - '@next/eslint-plugin-next': 15.4.7 - '@rushstack/eslint-patch': 1.10.4 - '@typescript-eslint/eslint-plugin': 8.11.0(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.6.3))(eslint@9.33.0(jiti@2.5.1))(typescript@5.6.3) - '@typescript-eslint/parser': 8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.6.3) - eslint: 9.33.0(jiti@2.5.1) - eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.33.0(jiti@2.5.1)) - eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3)(eslint@9.33.0(jiti@2.5.1)) - eslint-plugin-jsx-a11y: 6.10.1(eslint@9.33.0(jiti@2.5.1)) - eslint-plugin-react: 7.37.2(eslint@9.33.0(jiti@2.5.1)) - eslint-plugin-react-hooks: 5.0.0(eslint@9.33.0(jiti@2.5.1)) - 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.33.0(jiti@2.5.1))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.33.0(jiti@2.5.1)): - dependencies: - '@nolyfill/is-core-module': 1.0.39 - debug: 4.4.0 - enhanced-resolve: 5.18.3 - eslint: 9.33.0(jiti@2.5.1) - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(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.33.0(jiti@2.5.1))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.33.0(jiti@2.5.1)))(eslint@9.33.0(jiti@2.5.1)) - fast-glob: 3.3.3 - get-tsconfig: 4.10.0 - 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.33.0(jiti@2.5.1))(typescript@5.5.4))(eslint@9.33.0(jiti@2.5.1)) - 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.33.0(jiti@2.5.1))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.33.0(jiti@2.5.1)): - dependencies: - '@nolyfill/is-core-module': 1.0.39 - debug: 4.4.0 - enhanced-resolve: 5.18.3 - eslint: 9.33.0(jiti@2.5.1) - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(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.33.0(jiti@2.5.1))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.33.0(jiti@2.5.1)))(eslint@9.33.0(jiti@2.5.1)) - fast-glob: 3.3.3 - get-tsconfig: 4.10.0 - 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.33.0(jiti@2.5.1))(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3)(eslint@9.33.0(jiti@2.5.1)) - 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.33.0(jiti@2.5.1))(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.33.0(jiti@2.5.1))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.33.0(jiti@2.5.1)))(eslint@9.33.0(jiti@2.5.1)): - dependencies: - debug: 3.2.7 - optionalDependencies: - '@typescript-eslint/parser': 8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4) - eslint: 9.33.0(jiti@2.5.1) - eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.33.0(jiti@2.5.1)) - transitivePeerDependencies: - - supports-color - - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(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.33.0(jiti@2.5.1))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.33.0(jiti@2.5.1)))(eslint@9.33.0(jiti@2.5.1)): - dependencies: - debug: 3.2.7 - optionalDependencies: - '@typescript-eslint/parser': 8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.6.3) - eslint: 9.33.0(jiti@2.5.1) - eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.33.0(jiti@2.5.1)) - transitivePeerDependencies: - - supports-color - - eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(typescript@5.5.4))(eslint@9.33.0(jiti@2.5.1)): - 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.33.0(jiti@2.5.1) - eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(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.33.0(jiti@2.5.1))(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.33.0(jiti@2.5.1)))(eslint@9.33.0(jiti@2.5.1)) - 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.33.0(jiti@2.5.1))(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.33.0(jiti@2.5.1))(typescript@5.6.3))(eslint-import-resolver-typescript@3.6.3)(eslint@9.33.0(jiti@2.5.1)): - 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.33.0(jiti@2.5.1) - eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.11.0(eslint@9.33.0(jiti@2.5.1))(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.33.0(jiti@2.5.1))(typescript@5.6.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.33.0(jiti@2.5.1)))(eslint@9.33.0(jiti@2.5.1)) - 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.33.0(jiti@2.5.1))(typescript@5.6.3) - transitivePeerDependencies: - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - - supports-color - - eslint-plugin-jsx-a11y@6.10.1(eslint@9.33.0(jiti@2.5.1)): - 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.33.0(jiti@2.5.1) - 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.33.0(jiti@2.5.1)): - dependencies: - eslint: 9.33.0(jiti@2.5.1) - - eslint-plugin-react@7.37.2(eslint@9.33.0(jiti@2.5.1)): - 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.33.0(jiti@2.5.1) - 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.4.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.1: {} - - eslint@9.33.0(jiti@2.5.1): - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.33.0(jiti@2.5.1)) - '@eslint-community/regexpp': 4.12.1 - '@eslint/config-array': 0.21.0 - '@eslint/config-helpers': 0.3.1 - '@eslint/core': 0.15.2 - '@eslint/eslintrc': 3.3.1 - '@eslint/js': 9.33.0 - '@eslint/plugin-kit': 0.3.5 - '@humanfs/node': 0.16.6 - '@humanwhocodes/module-importer': 1.0.1 - '@humanwhocodes/retry': 0.4.2 - '@types/estree': 1.0.8 - '@types/json-schema': 7.0.15 - ajv: 6.12.6 - chalk: 4.1.2 - cross-spawn: 7.0.6 - debug: 4.4.0 - escape-string-regexp: 4.0.0 - eslint-scope: 8.4.0 - eslint-visitor-keys: 4.2.1 - espree: 10.4.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.5.1 - transitivePeerDependencies: - - supports-color - - espree@10.4.0: - dependencies: - acorn: 8.15.0 - acorn-jsx: 5.3.2(acorn@8.15.0) - eslint-visitor-keys: 4.2.1 - - 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.8 + '@types/estree': 1.0.9 - esutils@2.0.3: {} + events@3.3.0: {} - execa@8.0.1: - dependencies: - cross-spawn: 7.0.6 - 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 + expect-type@1.3.0: {} fast-content-type-parse@3.0.0: {} fast-deep-equal@3.1.3: {} - fast-glob@3.3.1: - 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.8 + fast-equals@5.4.0: {} fast-glob@3.3.3: dependencies: @@ -7177,62 +5026,45 @@ snapshots: merge2: 1.4.1 micromatch: 4.0.8 - fast-json-stable-stringify@2.1.0: {} + fast-string-truncated-width@3.0.3: {} - fast-levenshtein@2.0.6: {} - - fastq@1.17.1: + fast-string-width@3.0.2: dependencies: - reusify: 1.0.4 + fast-string-truncated-width: 3.0.3 - fdir@6.4.6(picomatch@4.0.2): + fast-stringify@4.0.0: {} + + fast-uri@3.1.2: {} + + fast-wrap-ansi@0.2.2: + dependencies: + fast-string-width: 3.0.2 + + fastq@1.20.1: + dependencies: + reusify: 1.1.0 + + fdir@6.5.0(picomatch@4.0.4): optionalDependencies: - picomatch: 4.0.2 + picomatch: 4.0.4 - file-entry-cache@8.0.0: - dependencies: - flat-cache: 4.0.1 + 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@5.0.0: - dependencies: - locate-path: 6.0.0 - path-exists: 4.0.0 - - find-up@7.0.0: - dependencies: - locate-path: 7.2.0 - path-exists: 5.0.0 - unicorn-magic: 0.1.0 + find-up-simple@1.0.1: {} fix-dts-default-cjs-exports@1.0.1: dependencies: - magic-string: 0.30.18 - mlly: 1.7.4 - rollup: 4.44.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.6 - signal-exit: 4.1.0 - - fraction.js@4.3.7: {} + fraction.js@5.3.4: {} fsevents@2.3.2: optional: true @@ -7242,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-port-please@3.1.2: {} - - 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.10.0: - dependencies: - resolve-pkg-maps: 1.0.0 + get-port-please@3.2.0: {} glob-parent@5.1.2: dependencies: @@ -7285,383 +5084,159 @@ 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@14.0.0: {} - - globalthis@1.0.4: - dependencies: - define-properties: 1.2.1 - gopd: 1.0.1 - - globby@14.1.0: - dependencies: - '@sindresorhus/merge-streams': 2.3.0 + '@sindresorhus/merge-streams': 4.0.0 fast-glob: 3.3.3 - ignore: 7.0.3 - path-type: 6.0.0 + ignore: 7.0.5 + is-path-inside: 4.0.0 slash: 5.1.0 - unicorn-magic: 0.3.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: {} - - h3@1.15.4: + h3@1.15.11: dependencies: - cookie-es: 1.2.2 + cookie-es: 1.2.3 crossws: 0.3.5 - defu: 6.1.4 + defu: 6.1.7 destr: 2.0.5 iron-webcrypto: 1.2.1 - node-mock-http: 1.0.2 + node-mock-http: 1.0.4 radix3: 1.1.2 - ufo: 1.6.1 + ufo: 1.6.4 uncrypto: 0.1.3 - has-bigints@1.0.2: {} - 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 http-shutdown@1.2.2: {} - human-signals@5.0.0: {} - - iconv-lite@0.7.0: + iconv-lite@0.7.2: dependencies: safer-buffer: 2.1.2 - ignore@5.3.2: {} - - ignore@7.0.3: {} - - import-fresh@3.3.0: - dependencies: - parent-module: 1.0.1 - resolve-from: 4.0.0 - - imurmurhash@0.1.4: {} - - internal-slot@1.0.7: - dependencies: - es-errors: 1.3.0 - hasown: 2.0.2 - side-channel: 1.0.6 + ignore@7.0.5: {} iron-webcrypto@1.2.1: {} - 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 - 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.7.2 - - is-callable@1.2.7: {} - - 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 - - is-docker@3.0.0: {} + 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-inside-container@1.0.0: - dependencies: - is-docker: 3.0.0 - - 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@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 - - is-wsl@3.1.0: - dependencies: - is-inside-container: 1.0.0 - - is64bit@2.0.0: - dependencies: - system-architecture: 0.1.0 - - 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.2: {} - - jiti@2.5.1: {} + 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@3.1.0: {} + 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.30.1: {} - - lightningcss-darwin-x64@1.30.1: {} - - lightningcss-freebsd-x64@1.30.1: + lightningcss-android-arm64@1.33.0: optional: true - lightningcss-linux-arm-gnueabihf@1.30.1: + 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.30.1: {} - - lightningcss-linux-arm64-musl@1.30.1: {} - - lightningcss-linux-x64-gnu@1.30.1: {} - - lightningcss-linux-x64-musl@1.30.1: {} - - lightningcss-win32-arm64-msvc@1.30.1: + lightningcss-linux-arm-gnueabihf@1.33.0: optional: true - lightningcss-win32-x64-msvc@1.30.1: {} + lightningcss-linux-arm64-gnu@1.33.0: {} - lightningcss@1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm): + 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: 2.0.4 + detect-libc: 2.1.2 optionalDependencies: - lightningcss-darwin-arm64: 1.30.1 - lightningcss-darwin-x64: 1.30.1 - lightningcss-freebsd-x64: 1.30.1 - lightningcss-linux-arm-gnueabihf: 1.30.1 - lightningcss-linux-arm64-gnu: 1.30.1 - lightningcss-linux-arm64-musl: 1.30.1 - lightningcss-linux-x64-gnu: 1.30.1 - lightningcss-linux-x64-musl: 1.30.1 - lightningcss-win32-arm64-msvc: 1.30.1 - lightningcss-win32-x64-msvc: 1.30.1 + 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.9.0: + listhen@1.10.1(@parcel/watcher@2.6.0(patch_hash=705ce75ccea54337110c4d7fe0a8b421658ea0c23e1a77c1fa890a86041179da)): dependencies: - '@parcel/watcher': 2.5.0 - '@parcel/watcher-wasm': 2.5.0 - citty: 0.1.6 - clipboardy: 4.0.0 - consola: 3.2.3 - crossws: 0.3.1 - defu: 6.1.4 - get-port-please: 3.1.2 - h3: 1.15.4 + '@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.4.2 - mlly: 1.7.3 - node-forge: 1.3.1 - pathe: 1.1.2 - std-env: 3.7.0 - ufo: 1.5.4 - untun: 0.1.3 - uqr: 0.1.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 - locate-path@7.2.0: - dependencies: - p-locate: 6.0.0 - - 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: - 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.18: + magic-string@1.1.0: dependencies: '@jridgewell/sourcemap-codec': 1.5.5 @@ -7669,61 +5244,43 @@ snapshots: merge2@1.4.1: {} - micro-memoize@4.1.3: {} - - micromatch@4.0.7: + micro-memoize@5.1.1: dependencies: - braces: 3.0.3 - picomatch: 2.3.1 + fast-equals: 5.4.0 + fast-stringify: 4.0.0 micromatch@4.0.8: dependencies: braces: 3.0.3 - picomatch: 2.3.1 + picomatch: 2.3.2 - 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: {} - - minizlib@3.0.2: - dependencies: - minipass: 7.1.2 - - mkdirp@3.0.1: {} - - mlly@1.7.3: - dependencies: - acorn: 8.14.0 - pathe: 1.1.2 - pkg-types: 1.3.0 - ufo: 1.6.1 - - mlly@1.7.4: - dependencies: - acorn: 8.15.0 + acorn: 8.16.0 pathe: 2.0.3 - pkg-types: 1.3.0 - ufo: 1.6.1 + pkg-types: 1.3.1 + ufo: 1.6.4 mri@1.2.0: {} - ms@2.1.2: {} - ms@2.1.3: {} - mute-stream@2.0.0: {} + mute-stream@3.0.0: {} mz@2.7.0: dependencies: @@ -7731,233 +5288,131 @@ snapshots: object-assign: 4.1.1 thenify-all: 1.6.0 - nanoid@3.3.11: {} + nanoid@3.3.12: {} - nanoid@3.3.7: {} + nanoid@3.3.16: {} - natural-compare@1.4.0: {} + neo-async@2.6.2: {} - next@15.4.7(@playwright/test@1.55.0)(react-dom@19.1.1(react@19.1.1))(react@19.1.1): + 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.4.7 + '@next/env': 16.2.7 '@swc/helpers': 0.5.15 - caniuse-lite: 1.0.30001705 + baseline-browser-mapping: 2.10.31 + caniuse-lite: 1.0.30001793 postcss: 8.4.31 - react: 19.1.1 - react-dom: 19.1.1(react@19.1.1) - styled-jsx: 5.1.6(react@19.1.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.4.7 - '@next/swc-darwin-x64': 15.4.7 - '@next/swc-linux-arm64-gnu': 15.4.7 - '@next/swc-linux-arm64-musl': 15.4.7 - '@next/swc-linux-x64-gnu': 15.4.7 - '@next/swc-linux-x64-musl': 15.4.7 - '@next/swc-win32-arm64-msvc': 15.4.7 - '@next/swc-win32-x64-msvc': 15.4.7 - '@playwright/test': 1.55.0 - sharp: 0.34.3 + '@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-addon-api@8.3.0: {} - - node-forge@1.3.1: {} - - node-gyp-build@4.8.2: {} + node-forge@1.4.0: {} node-gyp-build@4.8.4: {} - node-mock-http@1.0.2: {} + node-mock-http@1.0.4: {} - node-releases@2.0.19: {} + node-releases@2.0.46: {} normalize-path@3.0.0: {} - normalize-range@0.1.2: {} - - 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@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-limit@4.0.0: - dependencies: - yocto-queue: 1.2.1 - - p-locate@5.0.0: - dependencies: - p-limit: 3.1.0 - - p-locate@6.0.0: - dependencies: - p-limit: 4.0.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-exists@5.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@6.0.0: {} - - pathe@1.1.2: {} - pathe@2.0.3: {} - pathval@2.0.0: {} - picocolors@1.1.1: {} - picomatch@2.3.1: {} + picomatch@2.3.2: {} - picomatch@4.0.2: {} + picomatch@4.0.4: {} + + picomatch@4.0.5: {} pify@2.3.0: {} - pirates@4.0.6: {} + pirates@4.0.7: {} - pkg-types@1.3.0: + pkg-types@1.3.1: dependencies: confbox: 0.1.8 - mlly: 1.7.3 - pathe: 1.1.2 + mlly: 1.8.2 + pathe: 2.0.3 - playwright-core@1.55.0: {} + playwright-core@1.62.1: {} - playwright@1.55.0: + playwright@1.62.1: dependencies: - playwright-core: 1.55.0 + 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.1(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.1(postcss@8.5.6): - dependencies: - postcss: 8.5.6 - 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.5.1)(postcss@8.5.6)(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.5.1 - postcss: 8.5.6 - 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: @@ -7970,7 +5425,7 @@ snapshots: cssesc: 3.0.0 util-deprecate: 1.0.2 - postcss-selector-parser@7.1.0: + postcss-selector-parser@7.1.4: dependencies: cssesc: 3.0.0 util-deprecate: 1.0.2 @@ -7979,70 +5434,57 @@ snapshots: postcss@8.4.31: dependencies: - nanoid: 3.3.11 + 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 + nanoid: 3.3.12 picocolors: 1.1.1 source-map-js: 1.2.1 - postcss@8.4.47: + postcss@8.5.25: dependencies: - nanoid: 3.3.7 + nanoid: 3.3.16 picocolors: 1.1.1 source-map-js: 1.2.1 - postcss@8.5.6: + prettier-plugin-embed@0.5.1: dependencies: - nanoid: 3.3.11 - picocolors: 1.1.1 - source-map-js: 1.2.1 - - prelude-ls@1.2.1: {} - - prettier-plugin-embed@0.5.0: - dependencies: - '@types/estree': 1.0.6 - dedent: 1.6.0 - micro-memoize: 4.1.3 + '@types/estree': 1.0.9 + dedent: 1.7.2 + micro-memoize: 5.1.1 package-up: 5.0.0 tiny-jsonc: 1.0.2 - type-fest: 4.36.0 + type-fest: 5.6.0 transitivePeerDependencies: - babel-plugin-macros - prettier-plugin-organize-imports@4.2.0(prettier@3.6.2)(typescript@5.5.4): + prettier-plugin-organize-imports@4.3.0(prettier@3.9.6)(typescript@5.9.3): dependencies: - prettier: 3.6.2 - typescript: 5.5.4 + prettier: 3.9.6 + typescript: 5.9.3 - prettier@3.6.2: {} - - 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: {} radix3@1.1.2: {} - react-dom@19.1.1(react@19.1.1): + react-dom@19.2.6(react@19.2.6): dependencies: - react: 19.1.1 - scheduler: 0.26.0 + react: 19.2.6 + scheduler: 0.27.0 - react-is@16.13.1: {} + react-dom@19.2.7(react@19.2.7): + dependencies: + react: 19.2.7 + scheduler: 0.27.0 - react-refresh@0.17.0: {} + react@19.2.6: {} - react@19.1.1: {} + react@19.2.7: {} read-cache@1.0.0: dependencies: @@ -8050,191 +5492,128 @@ snapshots: readdirp@3.6.0: dependencies: - picomatch: 2.3.1 + picomatch: 2.3.2 - readdirp@4.1.1: {} + readdirp@4.1.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 - - 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.1 + 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.34.9: + rolldown@1.2.1: dependencies: - '@types/estree': 1.0.6 + '@oxc-project/types': 0.142.0 + '@rolldown/pluginutils': 1.0.1 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.34.9 - '@rollup/rollup-android-arm64': 4.34.9 - '@rollup/rollup-darwin-arm64': 4.34.9 - '@rollup/rollup-darwin-x64': 4.34.9 - '@rollup/rollup-freebsd-arm64': 4.34.9 - '@rollup/rollup-freebsd-x64': 4.34.9 - '@rollup/rollup-linux-arm-gnueabihf': 4.34.9 - '@rollup/rollup-linux-arm-musleabihf': 4.34.9 - '@rollup/rollup-linux-arm64-gnu': 4.34.9 - '@rollup/rollup-linux-arm64-musl': 4.34.9 - '@rollup/rollup-linux-loongarch64-gnu': 4.34.9 - '@rollup/rollup-linux-powerpc64le-gnu': 4.34.9 - '@rollup/rollup-linux-riscv64-gnu': 4.34.9 - '@rollup/rollup-linux-s390x-gnu': 4.34.9 - '@rollup/rollup-linux-x64-gnu': 4.34.9 - '@rollup/rollup-linux-x64-musl': 4.34.9 - '@rollup/rollup-win32-arm64-msvc': 4.34.9 - '@rollup/rollup-win32-ia32-msvc': 4.34.9 - '@rollup/rollup-win32-x64-msvc': 4.34.9 - 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.44.0: + rollup@4.60.4: dependencies: '@types/estree': 1.0.8 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.44.0 - '@rollup/rollup-android-arm64': 4.44.0 - '@rollup/rollup-darwin-arm64': 4.44.0 - '@rollup/rollup-darwin-x64': 4.44.0 - '@rollup/rollup-freebsd-arm64': 4.44.0 - '@rollup/rollup-freebsd-x64': 4.44.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.44.0 - '@rollup/rollup-linux-arm-musleabihf': 4.44.0 - '@rollup/rollup-linux-arm64-gnu': 4.44.0 - '@rollup/rollup-linux-arm64-musl': 4.44.0 - '@rollup/rollup-linux-loongarch64-gnu': 4.44.0 - '@rollup/rollup-linux-powerpc64le-gnu': 4.44.0 - '@rollup/rollup-linux-riscv64-gnu': 4.44.0 - '@rollup/rollup-linux-riscv64-musl': 4.44.0 - '@rollup/rollup-linux-s390x-gnu': 4.44.0 - '@rollup/rollup-linux-x64-gnu': 4.44.0 - '@rollup/rollup-linux-x64-musl': 4.44.0 - '@rollup/rollup-win32-arm64-msvc': 4.44.0 - '@rollup/rollup-win32-ia32-msvc': 4.44.0 - '@rollup/rollup-win32-x64-msvc': 4.44.0 + '@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: - dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 - has-symbols: 1.0.3 - isarray: 2.0.5 - - safe-regex-test@1.0.3: - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-regex: 1.1.4 - safer-buffer@2.1.2: {} - scheduler@0.26.0: {} + scheduler@0.27.0: {} - semver@6.3.1: {} - - semver@7.7.2: {} - - set-function-length@1.2.2: + schema-utils@4.3.3: 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 + '@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) - 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 + semver@7.8.5: {} - sharp@0.34.3: + sharp@0.34.5: dependencies: - color: 4.2.3 - detect-libc: 2.0.4 - semver: 7.7.2 + '@img/colour': 1.1.0 + detect-libc: 2.1.2 + semver: 7.8.5 optionalDependencies: - '@img/sharp-darwin-arm64': 0.34.3 - '@img/sharp-darwin-x64': 0.34.3 - '@img/sharp-libvips-darwin-arm64': 1.2.0 - '@img/sharp-libvips-darwin-x64': 1.2.0 - '@img/sharp-libvips-linux-arm': 1.2.0 - '@img/sharp-libvips-linux-arm64': 1.2.0 - '@img/sharp-libvips-linux-ppc64': 1.2.0 - '@img/sharp-libvips-linux-s390x': 1.2.0 - '@img/sharp-libvips-linux-x64': 1.2.0 - '@img/sharp-libvips-linuxmusl-arm64': 1.2.0 - '@img/sharp-libvips-linuxmusl-x64': 1.2.0 - '@img/sharp-linux-arm': 0.34.3 - '@img/sharp-linux-arm64': 0.34.3 - '@img/sharp-linux-ppc64': 0.34.3 - '@img/sharp-linux-s390x': 0.34.3 - '@img/sharp-linux-x64': 0.34.3 - '@img/sharp-linuxmusl-arm64': 0.34.3 - '@img/sharp-linuxmusl-x64': 0.34.3 - '@img/sharp-wasm32': 0.34.3 - '@img/sharp-win32-arm64': 0.34.3 - '@img/sharp-win32-ia32': 0.34.3 - '@img/sharp-win32-x64': 0.34.3 + '@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@4.1.0: {} - simple-swizzle@0.2.2: - dependencies: - is-arrayish: 0.3.2 - optional: true - slash@5.1.0: {} source-map-js@1.2.1: {} @@ -8243,114 +5622,41 @@ snapshots: 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: {} - string-width@4.2.3: - dependencies: - emoji-regex: 8.0.0 - is-fullwidth-code-point: 3.0.0 - strip-ansi: 6.0.1 + std-env@4.2.0: {} - 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@3.0.0: {} - - strip-json-comments@3.1.1: {} - - styled-jsx@5.1.6(react@19.1.1): + styled-jsx@5.1.6(react@19.2.7): dependencies: client-only: 0.0.1 - react: 19.1.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@7.2.0: + supports-color@8.1.1: dependencies: has-flag: 4.0.0 supports-preserve-symlinks-flag@1.0.0: {} - system-architecture@0.1.0: {} + tagged-tag@1.0.0: {} - tailwindcss@3.4.14: + tailwindcss@3.4.19(yaml@2.9.0): dependencies: '@alloc/quick-lru': 5.2.0 arg: 5.0.2 @@ -8360,41 +5666,32 @@ snapshots: 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: {} - tar@7.4.3: + terser@5.48.0: dependencies: - '@isaacs/fs-minipass': 4.0.1 - chownr: 3.0.0 - minipass: 7.1.2 - minizlib: 3.0.2 - mkdirp: 3.0.1 - yallist: 5.0.0 - - terser@5.31.6: - dependencies: - '@jridgewell/source-map': 0.3.6 - acorn: 8.15.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: @@ -8408,385 +5705,227 @@ snapshots: tinybench@2.9.0: {} + tinyclip@0.1.15: {} + tinyexec@0.3.2: {} - tinyglobby@0.2.12: + tinyexec@1.1.2: {} + + tinyglobby@0.2.16: dependencies: - fdir: 6.4.6(picomatch@4.0.2) - picomatch: 4.0.2 + fdir: 6.5.0(picomatch@4.0.4) + picomatch: 4.0.4 - tinyglobby@0.2.14: + tinyglobby@0.2.17: dependencies: - fdir: 6.4.6(picomatch@4.0.2) - picomatch: 4.0.2 + fdir: 6.5.0(picomatch@4.0.5) + picomatch: 4.0.5 - tinypool@1.0.0: {} - - tinyrainbow@1.2.0: {} - - tinyspy@3.0.0: {} + 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.4): + tree-sitter-javascript@0.23.1(tree-sitter@0.25.1): dependencies: - node-addon-api: 8.2.2 - node-gyp-build: 4.8.2 - optionalDependencies: - tree-sitter: 0.22.4 - - tree-sitter-typescript@0.23.2(tree-sitter@0.22.4): - dependencies: - node-addon-api: 8.2.2 - node-gyp-build: 4.8.2 - tree-sitter-javascript: 0.23.1(tree-sitter@0.22.4) - optionalDependencies: - tree-sitter: 0.22.4 - - tree-sitter@0.22.4: - dependencies: - node-addon-api: 8.3.0 + node-addon-api: 8.7.0 node-gyp-build: 4.8.4 + optionalDependencies: + tree-sitter: 0.25.1 - ts-api-utils@1.3.0(typescript@5.5.4): + tree-sitter-typescript@0.23.2(tree-sitter@0.25.1): dependencies: - typescript: 5.5.4 + 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.25.1 - ts-api-utils@1.3.0(typescript@5.6.3): + tree-sitter@0.25.1: 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: {} - tsup@8.5.0(jiti@2.5.1)(postcss@8.5.6)(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.1.0(esbuild@0.25.0) + bundle-require: 5.1.0(esbuild@0.27.7) cac: 6.7.14 chokidar: 4.0.3 - consola: 3.4.0 - debug: 4.4.0 - esbuild: 0.25.0 + 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.5.1)(postcss@8.5.6)(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.34.9 - 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.12 + tinyglobby: 0.2.16 tree-kill: 1.2.2 optionalDependencies: - postcss: 8.5.6 - 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.10.0 + turbo@2.10.8: optionalDependencies: - fsevents: 2.3.3 - optional: true - - turbo-darwin-64@2.5.4: - optional: true - - turbo-darwin-arm64@2.5.4: - optional: true - - turbo-linux-64@2.5.4: - optional: true - - turbo-linux-arm64@2.5.4: - optional: true - - turbo-windows-64@2.5.4: - optional: true - - turbo-windows-arm64@2.5.4: - optional: true - - turbo@2.5.4: - optionalDependencies: - turbo-darwin-64: 2.5.4 - turbo-darwin-arm64: 2.5.4 - turbo-linux-64: 2.5.4 - turbo-linux-arm64: 2.5.4 - turbo-windows-64: 2.5.4 - turbo-windows-arm64: 2.5.4 + '@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 typanion@3.14.0: {} - type-check@0.4.0: + type-fest@5.6.0: dependencies: - prelude-ls: 1.2.1 + tagged-tag: 1.0.0 - type-fest@4.36.0: {} + typescript@5.9.3: {} - typed-array-buffer@1.0.2: - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-typed-array: 1.1.13 + typescript@6.0.3: {} - 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: {} - - ufo@1.5.4: {} - - ufo@1.6.1: {} - - 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 + ufo@1.6.4: {} uncrypto@0.1.3: {} - undici-types@5.26.5: {} - undici-types@6.21.0: {} - unicorn-magic@0.1.0: {} + undici-types@7.24.6: {} - unicorn-magic@0.3.0: {} + unicorn-magic@0.4.0: {} - universal-user-agent@7.0.2: {} + universal-user-agent@7.0.3: {} - untun@0.1.3: + untun@0.2.2: {} + + update-browserslist-db@1.2.3(browserslist@4.28.2): dependencies: - citty: 0.1.6 - consola: 3.2.3 - pathe: 1.1.2 - - update-browserslist-db@1.1.1(browserslist@4.24.4): - dependencies: - browserslist: 4.24.4 + browserslist: 4.28.2 escalade: 3.2.0 picocolors: 1.1.1 - uqr@0.1.2: {} - - 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.19.1)(lightningcss@1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm))(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.4.0 - pathe: 1.1.2 - tinyrainbow: 1.2.0 - vite: 5.4.0(@types/node@20.19.1)(lightningcss@1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm))(terser@5.31.6) - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - sass-embedded - - stylus - - sugarss - - supports-color - - terser - - vite@5.4.0(@types/node@20.19.1)(lightningcss@1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm))(terser@5.31.6): - dependencies: - esbuild: 0.21.5 - postcss: 8.5.6 - rollup: 4.44.0 + 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.19.1 + '@types/node': 22.20.1 + esbuild: 0.27.7 fsevents: 2.3.3 - lightningcss: 1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm) - terser: 5.31.6 + jiti: 2.7.0 + terser: 5.48.0 + yaml: 2.9.0 - vite@7.0.0(@types/node@20.19.1)(jiti@2.5.1)(lightningcss@1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm))(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.25.0 - fdir: 6.4.6(picomatch@4.0.2) - picomatch: 4.0.2 - postcss: 8.5.6 - rollup: 4.44.0 - tinyglobby: 0.2.14 + 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.19.1 + '@types/node': 25.9.1 + esbuild: 0.27.7 fsevents: 2.3.3 - jiti: 2.5.1 - lightningcss: 1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm) - 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.19.1)(lightningcss@1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm))(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.18 - 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.19.1)(lightningcss@1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm))(terser@5.31.6) - vite-node: 2.0.5(@types/node@20.19.1)(lightningcss@1.30.1(patch_hash=tzyxy3asfxcqc7ihrooumyi5fm))(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.19.1 + '@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@6.2.0: - dependencies: - ansi-styles: 4.3.0 - string-width: 4.2.3 - strip-ansi: 6.0.1 - - 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: {} - - yallist@5.0.0: {} - - yaml@2.6.0: {} - - yocto-queue@0.1.0: {} - - yocto-queue@1.2.1: {} - - yoctocolors-cjs@2.1.2: {} + yaml@2.9.0: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 3f1d90027..bcddef126 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -5,15 +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.19.0 - prettier: 3.6.2 - vite: ^7.0.0 - lightningcss: 1.30.1 - lightningcss-darwin-arm64: 1.30.1 - lightningcss-darwin-x64: 1.30.1 - lightningcss-linux-arm64-gnu: 1.30.1 - lightningcss-linux-arm64-musl: 1.30.1 - lightningcss-linux-x64-gnu: 1.30.1 - lightningcss-linux-x64-musl: 1.30.1 - lightningcss-win32-x64-msvc: 1.30.1 + '@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 aaba1588e..f92020c65 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.85.0" +channel = "1.95.0" profile = "default" diff --git a/scripts/pack-packages.mjs b/scripts/pack-packages.mjs index 7bec3eda4..2b0b9f15d 100644 --- a/scripts/pack-packages.mjs +++ b/scripts/pack-packages.mjs @@ -21,18 +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) }) + 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/turbo.json b/turbo.json index 87eba2732..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": { 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/*']