diff --git a/package.json b/package.json index b9ada95..c65a8f0 100644 --- a/package.json +++ b/package.json @@ -34,14 +34,14 @@ "devDependencies": { "@astrojs/check": "^0.9.12", "@axe-core/playwright": "^4.14.0", - "@biomejs/biome": "^2.6.3", + "@biomejs/biome": "^2.6.4", "@playwright/test": "^1.64.1", - "@types/node": "^26.6.5", + "@types/node": "^26.6.6", "@types/react": "^19.3.0", "@types/react-dom": "^19.3.0", "@vitest/coverage-v8": "^5.0.5", "markdownlint-cli2": "^0.24.0", - "pagefind": "^1.5.2", + "pagefind": "^1.6.0", "typescript": "^6.0.3", "vitest": "^5.0.5" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 62fb049..39f886a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -172,10 +172,10 @@ importers: dependencies: '@astrojs/mdx': specifier: ^8.1.2 - version: 8.1.2(@astrojs/markdown-satteri@0.4.6)(astro@7.4.4(@types/node@26.6.5)(yaml@2.9.1)) + version: 8.1.2(@astrojs/markdown-satteri@0.4.6)(astro@7.4.4(@types/node@26.6.6)(yaml@2.9.1)) '@astrojs/react': specifier: ^7.1.2 - version: 7.1.2(@types/node@26.6.5)(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.3.1(react@19.3.1))(react@19.3.1)(yaml@2.9.1) + version: 7.1.2(@types/node@26.6.6)(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.3.1(react@19.3.1))(react@19.3.1)(yaml@2.9.1) '@astrojs/sitemap': specifier: ^3.7.4 version: 3.7.4 @@ -190,7 +190,7 @@ importers: version: 5.3.2 astro: specifier: ^7.4.4 - version: 7.4.4(@types/node@26.6.5)(yaml@2.9.1) + version: 7.4.4(@types/node@26.6.6)(yaml@2.9.1) react: specifier: ^19.3.1 version: 19.3.1 @@ -208,14 +208,14 @@ importers: specifier: ^4.14.0 version: 4.14.0(playwright-core@1.64.1) '@biomejs/biome': - specifier: ^2.6.3 - version: 2.6.3 + specifier: ^2.6.4 + version: 2.6.4 '@playwright/test': specifier: ^1.64.1 version: 1.64.1 '@types/node': - specifier: ^26.6.5 - version: 26.6.5 + specifier: ^26.6.6 + version: 26.6.6 '@types/react': specifier: ^19.3.0 version: 19.3.0 @@ -229,14 +229,14 @@ importers: specifier: ^0.24.0 version: 0.24.0 pagefind: - specifier: ^1.5.2 - version: 1.5.2 + specifier: ^1.6.0 + version: 1.6.0 typescript: specifier: ^6.0.3 version: 6.0.3 vitest: specifier: ^5.0.5 - version: 5.0.5(@types/node@26.6.5)(@vitest/coverage-v8@5.0.5)(vite@8.3.5(@types/node@26.6.5)(yaml@2.9.1)) + version: 5.0.5(@types/node@26.6.6)(@vitest/coverage-v8@5.0.5)(vite@8.3.5(@types/node@26.6.6)(yaml@2.9.1)) packages: @@ -404,71 +404,71 @@ packages: resolution: {integrity: sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==} engines: {node: '>=18'} - '@biomejs/biome@2.6.3': - resolution: {integrity: sha512-va/0xPku7wnfzv+D8Zpdm5uKiGJWiV8neqoEPnRjvNQQwhl4tVXS4fETs4H0CCB2rGeqJ4cu9y4iOZOnOYKAUA==} + '@biomejs/biome@2.6.4': + resolution: {integrity: sha512-8sKKwaNW4ot22awZ3lBjwWLHnUFXgXnrBPYS2gNlBAXRbDC++7kqjK2H7dR/FgCDtPvO1xfKpgEhJkGxAKYkxA==} engines: {node: '>=14.21.3'} hasBin: true - '@biomejs/cli-android-arm64@2.6.3': - resolution: {integrity: sha512-5JD7QQDEHxdeEb4sftEHG+lsuUyu8Cob/hVLqRELbgGlFl68Rldv/PPi2k4dRjERZ/EItJ3O6Xmv8lqsEtUBiw==} + '@biomejs/cli-android-arm64@2.6.4': + resolution: {integrity: sha512-jwrwigP4tBcHxzuV8izioX/BOUhJL/4e2rNSOE5nCjBkVC018LQAQUGiH+CNkFYvLtQ1dcZo5/xXERmaAGc7JQ==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [android] - '@biomejs/cli-android-x64@2.6.3': - resolution: {integrity: sha512-70WOGKCgpT+Uqg6LFdTLqefV54/DypdZg+LnBQDO6AWvkgXO+9xhVClajQyDsIHYjnXMtI1pRO5sP+zMXlS/bw==} + '@biomejs/cli-android-x64@2.6.4': + resolution: {integrity: sha512-HdGInPJ4nZFwHxzvEtcp2nmSBtUyJrurmtIK43upFckuS3+ZqVM05HtsxQWnqGsuy/pxckIAjyKWlEKRlBXUyA==} engines: {node: '>=14.21.3'} cpu: [x64] os: [android] - '@biomejs/cli-darwin-arm64@2.6.3': - resolution: {integrity: sha512-ezf+XEKeyJ2yYlBhrzyEEHLvfRYrhtNKc6maLzR/WcAcBccb4RVDeFxsymjBve2LO0bpIMRUAiS90D4bUBRT0A==} + '@biomejs/cli-darwin-arm64@2.6.4': + resolution: {integrity: sha512-0VvcUz46wbg59Q4TZ59KkIjDJrxEyu4Eoe79+F4SChxoWe+W7AEyIp6F5r72C9+p6MsB6dIovnZt1D30lGM3XA==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [darwin] - '@biomejs/cli-darwin-x64@2.6.3': - resolution: {integrity: sha512-Lg2tFdg4elJo+7i707PpLMs6N1hATVt4kqDo6MD/q/VnPs8rsKReKXsz1TA5GNdfRVAQNJ5GRiyK2EwNptK+MA==} + '@biomejs/cli-darwin-x64@2.6.4': + resolution: {integrity: sha512-fxmvkF81srlS3DiMyfm+aG3J0eG+6/BjaxRyjy57KbLSafnq0PO+hHfVWmtH2ty0S7nm6yDXBRwySfFeaRJKRQ==} engines: {node: '>=14.21.3'} cpu: [x64] os: [darwin] - '@biomejs/cli-linux-arm64-musl@2.6.3': - resolution: {integrity: sha512-dYU70A89OFHzakQPE9VOPbE60JNcQt4mtxvUGQl+EgTkGtqCFxLD2RUn1SbiMu8Mu5xFscS1bfYDpoasaUrqNA==} + '@biomejs/cli-linux-arm64-musl@2.6.4': + resolution: {integrity: sha512-31ZaH/MHqPX+O+evRwRrCHQ8W5/9adY+/eMytGGWZnRx1T41QsWIF09+/WujynLBhWZUxNGS5CtsWLwgOFTAyg==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] libc: [musl] - '@biomejs/cli-linux-arm64@2.6.3': - resolution: {integrity: sha512-8Stcvq98n1gs9VyLKuaWrnsd8kbXE2nKDAHtuLHGSYdGyNWN5JIIm5a28xdnmgdKzKHmiDgYyATetkEv7+zGow==} + '@biomejs/cli-linux-arm64@2.6.4': + resolution: {integrity: sha512-6+bK1Y/evmIUiJr7auertuMbiaYVicJhqA1bZyL47lCMWugv8l0gFQCqvR/gN1vZMHYm+HwoTKgeMxdNFCoQTg==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] libc: [glibc] - '@biomejs/cli-linux-x64-musl@2.6.3': - resolution: {integrity: sha512-j6eFjUcWSphmgVTbrobEMA0wdbfNHKrGi8hRsFkc17jeS1n7nHwFACxp6jWqe9sxQqyFAeyOgt2/1bOGVcbATA==} + '@biomejs/cli-linux-x64-musl@2.6.4': + resolution: {integrity: sha512-bomSa2XdQAGGj6Cwdm4M13qE+lN9+AOlW8KtI4hdyVyRRF/Z71qPAi95T4wtdZK0QpBbkTW8hgbZZCwPi4xzIw==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] libc: [musl] - '@biomejs/cli-linux-x64@2.6.3': - resolution: {integrity: sha512-CShmx0bO6BngywT3minv8K1xsQX1ig1vsBqYTLnmDY3mBiDYHlaLRIsdHoM1pEU9dV3BN5a0uiH0IGDtYh9TWA==} + '@biomejs/cli-linux-x64@2.6.4': + resolution: {integrity: sha512-tbFZMdL6dP/ws4edXxYG9WhvaVa1ZDzL4G5DzahnWW7Psib9H+VTdyU4XXVxpJk5j/nYZroSbvSNyYlpW3yCIw==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] libc: [glibc] - '@biomejs/cli-win32-arm64@2.6.3': - resolution: {integrity: sha512-00SthDxBPwNiT7IL/mOneif6fiEU1PXK875zhr+InpeZjovY1mF5tCuDhXo1Hh0GYyiKHKzLbItzn58SAyLhJQ==} + '@biomejs/cli-win32-arm64@2.6.4': + resolution: {integrity: sha512-eCsqt8Ma3eVap+oyJCDnJZH60SIU464B66n3y38EUTJdM1T/HfZol1FJC9vb+sHToX0ix8XzqPcwJnOzyAJz0g==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [win32] - '@biomejs/cli-win32-x64@2.6.3': - resolution: {integrity: sha512-GhtOPphBWlnCepqpNk/w5eGN5oGRCzL20EbAkL1XCIpyboeVC9R642noyT43l8LSenGS4qz9IL8sKPfwY37V/Q==} + '@biomejs/cli-win32-x64@2.6.4': + resolution: {integrity: sha512-pYsMy5AThiHFOZAsngg8qN4PurM6nInKBhVX7sbj3eNpRQqo1Hb0MgCwPL7VqVMrmcEEMj9Ks3qbkallR65e8g==} engines: {node: '>=14.21.3'} cpu: [x64] os: [win32] @@ -786,38 +786,38 @@ packages: '@oxc-project/types@0.155.0': resolution: {integrity: sha512-SeE8JPwW1xs1tHeNycjUtUBdhorRa8o4jlvjwk49R7/Z291i+4DQa7JJIgOm/TaYQZx+QrPQbVJ/9c8dMIZN8Q==} - '@pagefind/darwin-arm64@1.5.2': - resolution: {integrity: sha512-MXpI+7HsAdPkvJ0gk9xj9g541BCqBZOBbdwj9g6lB5LCj6kSV6nqDSjzcAJwvOsfu0fjwvC8hQU+ecfhp+MpiQ==} + '@pagefind/darwin-arm64@1.6.0': + resolution: {integrity: sha512-611gl64aqN12UcMyKPtZ8+vRWBKlJFSh2JgO8uScxa1Eyjo1dXz9r4wZuRno0yCUE/KN0FauEoKZ3KEwUYHCCg==} cpu: [arm64] os: [darwin] - '@pagefind/darwin-x64@1.5.2': - resolution: {integrity: sha512-IojxFWMEJe0RQ7PQ3KXQsPIImNsbpPYpoZ+QUDrL8fAl/O27IX+LVLs74/UzEZy5uA2LD8Nz1AiwKr72vrkZQw==} + '@pagefind/darwin-x64@1.6.0': + resolution: {integrity: sha512-rd3ZbtuxyYqjASKZAPuIV7eeQQHJ7VYpoNKKG8CvglaD3g30eT5Nb7XGNLYwVReBsCccpkURwrGwWjSwr8nyQQ==} cpu: [x64] os: [darwin] - '@pagefind/freebsd-x64@1.5.2': - resolution: {integrity: sha512-7EVzo9+0w+2cbe671BtMj10UlNo83I+HrLVLfRxO731svHRJKUfJ/mo05gU14pe9PCfpKNQT8FS3Xc/oDN6pOA==} + '@pagefind/freebsd-x64@1.6.0': + resolution: {integrity: sha512-d+sXqsaThszmPWGVDSRKqIz9GpZcj/bAksNZfg19asSxU0ogNPOMND4kV4giQvOjPFMsltUFf6hQJfoHQ6+hSQ==} cpu: [x64] os: [freebsd] - '@pagefind/linux-arm64@1.5.2': - resolution: {integrity: sha512-Ovt9+K35sqzn8H3ZMXGwls4TD/wMJuvRtShHIsmUQREmaxjrDEX7gHckRCrwYJ4XE1H1p6HkLz3wukrAnsfXQw==} + '@pagefind/linux-arm64@1.6.0': + resolution: {integrity: sha512-SLB2I+XqCZma8NvIGIH8nyKblgKIxw5PmqsVtofWOKxNHhEtOEsddbqU+hsrNcT3EV0faM6UmKDHVIxcPYq29w==} cpu: [arm64] os: [linux] - '@pagefind/linux-x64@1.5.2': - resolution: {integrity: sha512-V+tFqHKXhQKq/WqPBD67AFy7scn1/aZID00ws4fSDd+1daSi5UHR9VVlRrOUYKxn3VuFQYRD7lYXdZK1WED1YA==} + '@pagefind/linux-x64@1.6.0': + resolution: {integrity: sha512-IbMSx/+Vr/Xk0TTBlLkjgK+rvnbOXGmmb2/MKxQu99AR5DsqQoV3NKEA9PQz2tAhuCZjeD5xJBp4w5N5DHIC7Q==} cpu: [x64] os: [linux] - '@pagefind/windows-arm64@1.5.2': - resolution: {integrity: sha512-hN9Nh90fNW61nNRCW9ZyQrAj/mD0eRvmJ8NlTUzkbuW8kIzGJUi3cxjFkEcMZ5h/8FsKWD/VcouZl4yo1F7B6g==} + '@pagefind/windows-arm64@1.6.0': + resolution: {integrity: sha512-wUrniW3REr7VWJHz6xE6F/p/AQgHDFpGZiY9sbWT71KfEijDE5Jnc37V8zc7cilV9h/QkwJGXoEP2+ZLwDmhtw==} cpu: [arm64] os: [win32] - '@pagefind/windows-x64@1.5.2': - resolution: {integrity: sha512-Fa2Iyw7kaDRzGMfNYNUXNW2zbL5FQVDgSOcbDHdzBrDEdpqOqg8TcZ68F22ol6NJ9IGzvUdmeyZypLW5dyhqsg==} + '@pagefind/windows-x64@1.6.0': + resolution: {integrity: sha512-cUA2+yXfbymdJllyMjY5YTBwuOgh0/H53Pn5fYKjDnDjk154Ft4U5RVj3TenWySPL/jG6zJfARUWSlyUyXHlZw==} cpu: [x64] os: [win32] @@ -996,8 +996,8 @@ packages: '@types/node@24.19.2': resolution: {integrity: sha512-93d49wCWJkCyN87MxLpNN6KXPCwFw7bVUg79mGUV1OS40JGWwVCr8n61DXCSqz7CV6/VfPkb7xec7uP2M+QHWQ==} - '@types/node@26.6.5': - resolution: {integrity: sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==} + '@types/node@26.6.6': + resolution: {integrity: sha512-MzQj+8Kx3XI40OmUAE6Qoh58ZMNstNNMwn2nfd3qWsfe7nDNSqJNzes4njhz6AHwrSHOffSLwXU6yb474Q4aog==} '@types/react-dom@19.3.0': resolution: {integrity: sha512-ZI7bU42mZXXKHn/qNLEw2IrbiINU7X5+vfgdixBHkCNpYWXjKgfQ/P+uyGb5CjOLB9UcnTeg3rylQtV2hym44Q==} @@ -1793,8 +1793,8 @@ packages: package-manager-detector@1.9.0: resolution: {integrity: sha512-zAMfbta9nPA8AKkA4WdmNAT8R8s6Dk0/xwPsqNnRidMFcLo1YkLuPDTgs2f64XdzS8vbLNnoJ+uUIkgbz7oRHA==} - pagefind@1.5.2: - resolution: {integrity: sha512-XTUaK0hXMCu2jszWE584JGQT7y284TmMV9l/HX3rnG5uo3rHI/uHU56XTyyyPFjeWEBxECbAi0CaFDJOONtG0Q==} + pagefind@1.6.0: + resolution: {integrity: sha512-yeOd9EA0TUE1PUfbQIluBxzPadBG5/0BV48FAxwMVLkhZcOvwCz6TX4/a/Ofz97pF9/FwwT7CVbTC97BfmI+LQ==} hasBin: true parse-entities@4.0.2: @@ -2517,28 +2517,28 @@ snapshots: github-slugger: 2.0.0 satteri: 0.10.5 - '@astrojs/mdx@8.1.2(@astrojs/markdown-satteri@0.4.6)(astro@7.4.4(@types/node@26.6.5)(yaml@2.9.1))': + '@astrojs/mdx@8.1.2(@astrojs/markdown-satteri@0.4.6)(astro@7.4.4(@types/node@26.6.6)(yaml@2.9.1))': dependencies: '@astrojs/internal-helpers': 0.13.0 '@astrojs/markdown-satteri': 0.4.6 - astro: 7.4.4(@types/node@26.6.5)(yaml@2.9.1) + astro: 7.4.4(@types/node@26.6.6)(yaml@2.9.1) es-module-lexer: 3.0.4 '@astrojs/prism@4.1.2': dependencies: prismjs: 1.30.0 - '@astrojs/react@7.1.2(@types/node@26.6.5)(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.3.1(react@19.3.1))(react@19.3.1)(yaml@2.9.1)': + '@astrojs/react@7.1.2(@types/node@26.6.6)(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.3.1(react@19.3.1))(react@19.3.1)(yaml@2.9.1)': dependencies: '@astrojs/internal-helpers': 0.13.0 '@types/react': 19.3.0 '@types/react-dom': 19.3.0(@types/react@19.3.0) - '@vitejs/plugin-react': 6.1.2(vite@8.3.5(@types/node@26.6.5)(yaml@2.9.1)) + '@vitejs/plugin-react': 6.1.2(vite@8.3.5(@types/node@26.6.6)(yaml@2.9.1)) devalue: 6.0.3 react: 19.3.1 react-dom: 19.3.1(react@19.3.1) ultrahtml: 1.7.0 - vite: 8.3.5(@types/node@26.6.5)(yaml@2.9.1) + vite: 8.3.5(@types/node@26.6.6)(yaml@2.9.1) transitivePeerDependencies: - '@rolldown/plugin-babel' - '@types/node' @@ -2591,47 +2591,47 @@ snapshots: '@bcoe/v8-coverage@1.0.2': {} - '@biomejs/biome@2.6.3': + '@biomejs/biome@2.6.4': optionalDependencies: - '@biomejs/cli-android-arm64': 2.6.3 - '@biomejs/cli-android-x64': 2.6.3 - '@biomejs/cli-darwin-arm64': 2.6.3 - '@biomejs/cli-darwin-x64': 2.6.3 - '@biomejs/cli-linux-arm64': 2.6.3 - '@biomejs/cli-linux-arm64-musl': 2.6.3 - '@biomejs/cli-linux-x64': 2.6.3 - '@biomejs/cli-linux-x64-musl': 2.6.3 - '@biomejs/cli-win32-arm64': 2.6.3 - '@biomejs/cli-win32-x64': 2.6.3 - - '@biomejs/cli-android-arm64@2.6.3': + '@biomejs/cli-android-arm64': 2.6.4 + '@biomejs/cli-android-x64': 2.6.4 + '@biomejs/cli-darwin-arm64': 2.6.4 + '@biomejs/cli-darwin-x64': 2.6.4 + '@biomejs/cli-linux-arm64': 2.6.4 + '@biomejs/cli-linux-arm64-musl': 2.6.4 + '@biomejs/cli-linux-x64': 2.6.4 + '@biomejs/cli-linux-x64-musl': 2.6.4 + '@biomejs/cli-win32-arm64': 2.6.4 + '@biomejs/cli-win32-x64': 2.6.4 + + '@biomejs/cli-android-arm64@2.6.4': optional: true - '@biomejs/cli-android-x64@2.6.3': + '@biomejs/cli-android-x64@2.6.4': optional: true - '@biomejs/cli-darwin-arm64@2.6.3': + '@biomejs/cli-darwin-arm64@2.6.4': optional: true - '@biomejs/cli-darwin-x64@2.6.3': + '@biomejs/cli-darwin-x64@2.6.4': optional: true - '@biomejs/cli-linux-arm64-musl@2.6.3': + '@biomejs/cli-linux-arm64-musl@2.6.4': optional: true - '@biomejs/cli-linux-arm64@2.6.3': + '@biomejs/cli-linux-arm64@2.6.4': optional: true - '@biomejs/cli-linux-x64-musl@2.6.3': + '@biomejs/cli-linux-x64-musl@2.6.4': optional: true - '@biomejs/cli-linux-x64@2.6.3': + '@biomejs/cli-linux-x64@2.6.4': optional: true - '@biomejs/cli-win32-arm64@2.6.3': + '@biomejs/cli-win32-arm64@2.6.4': optional: true - '@biomejs/cli-win32-x64@2.6.3': + '@biomejs/cli-win32-x64@2.6.4': optional: true '@bruits/satteri-darwin-arm64@0.10.5': @@ -2891,25 +2891,25 @@ snapshots: '@oxc-project/types@0.155.0': {} - '@pagefind/darwin-arm64@1.5.2': + '@pagefind/darwin-arm64@1.6.0': optional: true - '@pagefind/darwin-x64@1.5.2': + '@pagefind/darwin-x64@1.6.0': optional: true - '@pagefind/freebsd-x64@1.5.2': + '@pagefind/freebsd-x64@1.6.0': optional: true - '@pagefind/linux-arm64@1.5.2': + '@pagefind/linux-arm64@1.6.0': optional: true - '@pagefind/linux-x64@1.5.2': + '@pagefind/linux-x64@1.6.0': optional: true - '@pagefind/windows-arm64@1.5.2': + '@pagefind/windows-arm64@1.6.0': optional: true - '@pagefind/windows-x64@1.5.2': + '@pagefind/windows-x64@1.6.0': optional: true '@playwright/test@1.64.1': @@ -3046,7 +3046,7 @@ snapshots: dependencies: undici-types: 7.24.6 - '@types/node@26.6.5': + '@types/node@26.6.6': dependencies: undici-types: 8.9.0 @@ -3060,7 +3060,7 @@ snapshots: '@types/sax@1.2.7': dependencies: - '@types/node': 26.6.5 + '@types/node': 26.6.6 '@types/unist@2.0.11': {} @@ -3068,10 +3068,10 @@ snapshots: '@ungap/structured-clone@1.4.0': {} - '@vitejs/plugin-react@6.1.2(vite@8.3.5(@types/node@26.6.5)(yaml@2.9.1))': + '@vitejs/plugin-react@6.1.2(vite@8.3.5(@types/node@26.6.6)(yaml@2.9.1))': dependencies: '@rolldown/pluginutils': 1.0.1 - vite: 8.3.5(@types/node@26.6.5)(yaml@2.9.1) + vite: 8.3.5(@types/node@26.6.6)(yaml@2.9.1) '@vitest/coverage-v8@5.0.5(vitest@5.0.5)': dependencies: @@ -3083,7 +3083,7 @@ snapshots: obug: 3.0.0 std-env: 4.3.0 tinyrainbow: 3.2.0 - vitest: 5.0.5(@types/node@26.6.5)(@vitest/coverage-v8@5.0.5)(vite@8.3.5(@types/node@26.6.5)(yaml@2.9.1)) + vitest: 5.0.5(@types/node@26.6.6)(@vitest/coverage-v8@5.0.5)(vite@8.3.5(@types/node@26.6.6)(yaml@2.9.1)) '@vitest/istanbul-lib-coverage@1.0.2': {} @@ -3091,14 +3091,14 @@ snapshots: dependencies: '@vitest/istanbul-lib-coverage': 1.0.2 - '@vitest/mocker@5.0.5(vite@8.3.5(@types/node@26.6.5)(yaml@2.9.1))': + '@vitest/mocker@5.0.5(vite@8.3.5(@types/node@26.6.6)(yaml@2.9.1))': dependencies: '@jridgewell/trace-mapping': 0.3.31 '@vitest/spy': 5.0.5 estree-walker: 3.0.3 magic-string: 1.4.3 optionalDependencies: - vite: 8.3.5(@types/node@26.6.5)(yaml@2.9.1) + vite: 8.3.5(@types/node@26.6.6)(yaml@2.9.1) '@vitest/spy@5.0.5': {} @@ -3203,7 +3203,7 @@ snapshots: estree-walker: 3.0.3 js-tokens: 10.0.0 - astro@7.4.4(@types/node@26.6.5)(yaml@2.9.1): + astro@7.4.4(@types/node@26.6.6)(yaml@2.9.1): dependencies: '@astrojs/compiler-rs': 0.5.2 '@astrojs/internal-helpers': 0.13.0 @@ -3252,13 +3252,13 @@ snapshots: unifont: 1.0.3 unstorage: 1.17.6 verkit: 0.5.0 - vite: 8.3.5(@types/node@26.6.5)(yaml@2.9.1) - vitefu: 1.1.3(vite@8.3.5(@types/node@26.6.5)(yaml@2.9.1)) + vite: 8.3.5(@types/node@26.6.6)(yaml@2.9.1) + vitefu: 1.1.3(vite@8.3.5(@types/node@26.6.6)(yaml@2.9.1)) xxhash-wasm: 1.1.0 yargs-parser: 22.0.0 zod: 4.6.7 optionalDependencies: - sharp: 0.35.5(@types/node@26.6.5) + sharp: 0.35.5(@types/node@26.6.6) transitivePeerDependencies: - '@azure/app-configuration' - '@azure/cosmos' @@ -3964,15 +3964,15 @@ snapshots: package-manager-detector@1.9.0: {} - pagefind@1.5.2: + pagefind@1.6.0: optionalDependencies: - '@pagefind/darwin-arm64': 1.5.2 - '@pagefind/darwin-x64': 1.5.2 - '@pagefind/freebsd-x64': 1.5.2 - '@pagefind/linux-arm64': 1.5.2 - '@pagefind/linux-x64': 1.5.2 - '@pagefind/windows-arm64': 1.5.2 - '@pagefind/windows-x64': 1.5.2 + '@pagefind/darwin-arm64': 1.6.0 + '@pagefind/darwin-x64': 1.6.0 + '@pagefind/freebsd-x64': 1.6.0 + '@pagefind/linux-arm64': 1.6.0 + '@pagefind/linux-x64': 1.6.0 + '@pagefind/windows-arm64': 1.6.0 + '@pagefind/windows-x64': 1.6.0 parse-entities@4.0.2: dependencies: @@ -4105,7 +4105,7 @@ snapshots: semver@7.8.5: {} - sharp@0.35.5(@types/node@26.6.5): + sharp@0.35.5(@types/node@26.6.6): dependencies: '@img/colour': 1.1.0 detect-libc: 2.1.2 @@ -4136,7 +4136,7 @@ snapshots: '@img/sharp-win32-arm64': 0.35.5 '@img/sharp-win32-ia32': 0.35.5 '@img/sharp-win32-x64': 0.35.5 - '@types/node': 26.6.5 + '@types/node': 26.6.6 optional: true shiki@4.5.0: @@ -4313,7 +4313,7 @@ snapshots: '@types/unist': 3.0.3 vfile-message: 4.0.3 - vite@8.3.5(@types/node@26.6.5)(yaml@2.9.1): + vite@8.3.5(@types/node@26.6.6)(yaml@2.9.1): dependencies: lightningcss: 1.33.0 picomatch: 4.0.7 @@ -4321,18 +4321,18 @@ snapshots: rolldown: 1.2.15 tinyglobby: 0.2.17 optionalDependencies: - '@types/node': 26.6.5 + '@types/node': 26.6.6 fsevents: 2.3.3 yaml: 2.9.1 - vitefu@1.1.3(vite@8.3.5(@types/node@26.6.5)(yaml@2.9.1)): + vitefu@1.1.3(vite@8.3.5(@types/node@26.6.6)(yaml@2.9.1)): optionalDependencies: - vite: 8.3.5(@types/node@26.6.5)(yaml@2.9.1) + vite: 8.3.5(@types/node@26.6.6)(yaml@2.9.1) - vitest@5.0.5(@types/node@26.6.5)(@vitest/coverage-v8@5.0.5)(vite@8.3.5(@types/node@26.6.5)(yaml@2.9.1)): + vitest@5.0.5(@types/node@26.6.6)(@vitest/coverage-v8@5.0.5)(vite@8.3.5(@types/node@26.6.6)(yaml@2.9.1)): dependencies: '@types/chai': 5.2.3 - '@vitest/mocker': 5.0.5(vite@8.3.5(@types/node@26.6.5)(yaml@2.9.1)) + '@vitest/mocker': 5.0.5(vite@8.3.5(@types/node@26.6.6)(yaml@2.9.1)) chai: 6.3.0 es-module-lexer: 2.3.2 expect-type: 1.4.0 @@ -4343,10 +4343,10 @@ snapshots: tinybench: 6.2.2 tinyexec: 1.3.1 tinyglobby: 0.2.17 - vite: 8.3.5(@types/node@26.6.5)(yaml@2.9.1) + vite: 8.3.5(@types/node@26.6.6)(yaml@2.9.1) why-is-node-running: 3.2.1 optionalDependencies: - '@types/node': 26.6.5 + '@types/node': 26.6.6 '@vitest/coverage-v8': 5.0.5(vitest@5.0.5) transitivePeerDependencies: - msw diff --git a/src/components/Search.astro b/src/components/Search.astro index 7de5c8f..dcc5277 100644 --- a/src/components/Search.astro +++ b/src/components/Search.astro @@ -86,6 +86,7 @@ const strings = { url: string; excerpt: string; meta: Record; + filters?: Record; sub_results?: { title: string; url: string; excerpt: string }[]; } interface PagefindResult { @@ -113,7 +114,8 @@ const strings = { const DEBOUNCE = 130; /** * 364 compare pages repeat both countries' names in their headings and are short, so Pagefind ranks them above the - * country entries for a bare country name. Scale their scores down; a query naming both countries still finds its pair. + * country entries for a bare country name. Scale their scores down, except for a pair whose two countries the query + * names (each compare page carries a `side` filter per country), so "germany japan" still finds its pair. */ const COMPARE_WEIGHT = 0.1; @@ -226,6 +228,19 @@ const strings = { select(-1); }; + /** Ids of the compare results whose two countries both appear in the query. */ + const namedPairs = async (q: string, compares: PagefindResult[]) => { + const lower = q.toLocaleLowerCase(); + const names = (side: string) => side.toLocaleLowerCase().replace(/^the\s+/, ""); + const hits = await Promise.all( + compares.slice(0, LIMIT).map(async (r) => { + const sides = (await r.data()).filters?.side ?? []; + return sides.length === 2 && sides.every((side) => lower.includes(names(side))) ? r.id : null; + }), + ); + return new Set(hits.filter((id): id is string => id !== null)); + }; + const run = async (q: string) => { const mine = ++seq; if (!q.trim()) { @@ -238,8 +253,11 @@ const strings = { const [res, cmp] = await Promise.all([pf.search(q), pf.search(q, { filters: { kind: "compare" } })]); if (!res || mine !== seq) return; const isCompare = new Set(cmp?.results.map((r) => r.id)); + const named = await namedPairs(q, cmp?.results ?? []); + if (mine !== seq) return; + const demote = (id: string) => isCompare.has(id) && !named.has(id); const ranked = res.results - .map((r) => ({ r, score: r.score * (isCompare.has(r.id) ? COMPARE_WEIGHT : 1) })) + .map((r) => ({ r, score: r.score * (demote(r.id) ? COMPARE_WEIGHT : 1) })) .sort((a, b) => b.score - a.score); const data = await Promise.all(ranked.slice(0, LIMIT).map(({ r }) => r.data())); if (mine !== seq) return; diff --git a/src/views/Compare.astro b/src/views/Compare.astro index f459f41..f5ec1a3 100644 --- a/src/views/Compare.astro +++ b/src/views/Compare.astro @@ -49,6 +49,9 @@ const columns = [ {t["title.join"]} {b.noun.object} + {/* Search.astro: a query naming both countries keeps this page's full rank. */} + +

{glossTitle} {DISPLAY_CODE[idA]}