diff --git a/Makefile b/Makefile index ca1a8cf..df01f23 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,7 @@ +update: + pnpm update + pnpm update svelte@next + dev: pnpm run astro dev diff --git a/package.json b/package.json index 52ab9f9..5573b93 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "@astrojs/svelte": "^5.0.3", "@citation-js/plugin-bibtex": "^0.7.8", "@js-temporal/polyfill": "^0.4.4", - "astro": "^4.3.7", + "astro": "^4.4.0", "astro-pagefind": "^1.4.0", "chart.js": "^4.4.1", "citation-js": "^0.7.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aff5392..8db2a9b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,10 +7,10 @@ settings: dependencies: '@astrojs/mdx': specifier: ^2.1.1 - version: 2.1.1(astro@4.3.7) + version: 2.1.1(astro@4.4.0) '@astrojs/svelte': specifier: ^5.0.3 - version: 5.0.3(astro@4.3.7)(svelte@5.0.0-next.54)(typescript@5.3.3)(vite@5.1.2) + version: 5.0.3(astro@4.4.0)(svelte@5.0.0-next.54)(typescript@5.3.3)(vite@5.1.3) '@citation-js/plugin-bibtex': specifier: ^0.7.8 version: 0.7.8(@citation-js/core@0.7.6) @@ -18,11 +18,11 @@ dependencies: specifier: ^0.4.4 version: 0.4.4 astro: - specifier: ^4.3.7 - version: 4.3.7(sass@1.70.0)(typescript@5.3.3) + specifier: ^4.4.0 + version: 4.4.0(sass@1.70.0)(typescript@5.3.3) astro-pagefind: specifier: ^1.4.0 - version: 1.4.0(astro@4.3.7) + version: 1.4.0(astro@4.4.0) chart.js: specifier: ^4.4.1 version: 4.4.1 @@ -143,7 +143,7 @@ packages: - supports-color dev: false - /@astrojs/mdx@2.1.1(astro@4.3.7): + /@astrojs/mdx@2.1.1(astro@4.4.0): resolution: {integrity: sha512-AgGFdE7HOGmoFooGvMSatkA9FiSKwyVW7ImHot/bXJ6uAbFfu6iG2ht18Cf1pT22Hda/6iSCGWusFvBv0/EnKQ==} engines: {node: '>=18.14.1'} peerDependencies: @@ -152,7 +152,7 @@ packages: '@astrojs/markdown-remark': 4.2.1 '@mdx-js/mdx': 3.0.1 acorn: 8.11.3 - astro: 4.3.7(sass@1.70.0)(typescript@5.3.3) + astro: 4.4.0(sass@1.70.0)(typescript@5.3.3) es-module-lexer: 1.4.1 estree-util-visit: 2.0.0 github-slugger: 2.0.0 @@ -176,15 +176,15 @@ packages: prismjs: 1.29.0 dev: false - /@astrojs/svelte@5.0.3(astro@4.3.7)(svelte@5.0.0-next.54)(typescript@5.3.3)(vite@5.1.2): + /@astrojs/svelte@5.0.3(astro@4.4.0)(svelte@5.0.0-next.54)(typescript@5.3.3)(vite@5.1.3): resolution: {integrity: sha512-6TUBRUxmsEczKPBT6oDUAfvzuFCmITuhZfKPT5ZtOOyj9XOVnEnj/Iobd3ajKUbpWNYX7qZVAd1KMkmJc1Nhsg==} engines: {node: '>=18.14.1'} peerDependencies: astro: ^4.0.0 svelte: ^4.0.0 || ^5.0.0-next.1 dependencies: - '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@5.0.0-next.54)(vite@5.1.2) - astro: 4.3.7(sass@1.70.0)(typescript@5.3.3) + '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@5.0.0-next.54)(vite@5.1.3) + astro: 4.4.0(sass@1.70.0)(typescript@5.3.3) svelte: 5.0.0-next.54 svelte2tsx: 0.6.27(svelte@5.0.0-next.54)(typescript@5.3.3) transitivePeerDependencies: @@ -1016,6 +1016,10 @@ packages: - supports-color dev: false + /@medv/finder@3.1.0: + resolution: {integrity: sha512-ojkXjR3K0Zz3jnCR80tqPL+0yvbZk/lEodb6RIVjLz7W8RVA2wrw8ym/CzCpXO9SYVUIKHFUpc7jvf8UKfIM3w==} + dev: false + /@nodelib/fs.scandir@2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -1080,104 +1084,104 @@ packages: resolution: {integrity: sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==} dev: false - /@rollup/rollup-android-arm-eabi@4.10.0: - resolution: {integrity: sha512-/MeDQmcD96nVoRumKUljsYOLqfv1YFJps+0pTrb2Z9Nl/w5qNUysMaWQsrd1mvAlNT4yza1iVyIu4Q4AgF6V3A==} + /@rollup/rollup-android-arm-eabi@4.11.0: + resolution: {integrity: sha512-BV+u2QSfK3i1o6FucqJh5IK9cjAU6icjFFhvknzFgu472jzl0bBojfDAkJLBEsHFMo+YZg6rthBvBBt8z12IBQ==} cpu: [arm] os: [android] requiresBuild: true dev: false optional: true - /@rollup/rollup-android-arm64@4.10.0: - resolution: {integrity: sha512-lvu0jK97mZDJdpZKDnZI93I0Om8lSDaiPx3OiCk0RXn3E8CMPJNS/wxjAvSJJzhhZpfjXsjLWL8LnS6qET4VNQ==} + /@rollup/rollup-android-arm64@4.11.0: + resolution: {integrity: sha512-0ij3iw7sT5jbcdXofWO2NqDNjSVVsf6itcAkV2I6Xsq4+6wjW1A8rViVB67TfBEan7PV2kbLzT8rhOVWLI2YXw==} cpu: [arm64] os: [android] requiresBuild: true dev: false optional: true - /@rollup/rollup-darwin-arm64@4.10.0: - resolution: {integrity: sha512-uFpayx8I8tyOvDkD7X6n0PriDRWxcqEjqgtlxnUA/G9oS93ur9aZ8c8BEpzFmsed1TH5WZNG5IONB8IiW90TQg==} + /@rollup/rollup-darwin-arm64@4.11.0: + resolution: {integrity: sha512-yPLs6RbbBMupArf6qv1UDk6dzZvlH66z6NLYEwqTU0VHtss1wkI4UYeeMS7TVj5QRVvaNAWYKP0TD/MOeZ76Zg==} cpu: [arm64] os: [darwin] requiresBuild: true dev: false optional: true - /@rollup/rollup-darwin-x64@4.10.0: - resolution: {integrity: sha512-nIdCX03qFKoR/MwQegQBK+qZoSpO3LESurVAC6s6jazLA1Mpmgzo3Nj3H1vydXp/JM29bkCiuF7tDuToj4+U9Q==} + /@rollup/rollup-darwin-x64@4.11.0: + resolution: {integrity: sha512-OvqIgwaGAwnASzXaZEeoJY3RltOFg+WUbdkdfoluh2iqatd090UeOG3A/h0wNZmE93dDew9tAtXgm3/+U/B6bw==} cpu: [x64] os: [darwin] requiresBuild: true dev: false optional: true - /@rollup/rollup-linux-arm-gnueabihf@4.10.0: - resolution: {integrity: sha512-Fz7a+y5sYhYZMQFRkOyCs4PLhICAnxRX/GnWYReaAoruUzuRtcf+Qnw+T0CoAWbHCuz2gBUwmWnUgQ67fb3FYw==} + /@rollup/rollup-linux-arm-gnueabihf@4.11.0: + resolution: {integrity: sha512-X17s4hZK3QbRmdAuLd2EE+qwwxL8JxyVupEqAkxKPa/IgX49ZO+vf0ka69gIKsaYeo6c1CuwY3k8trfDtZ9dFg==} cpu: [arm] os: [linux] requiresBuild: true dev: false optional: true - /@rollup/rollup-linux-arm64-gnu@4.10.0: - resolution: {integrity: sha512-yPtF9jIix88orwfTi0lJiqINnlWo6p93MtZEoaehZnmCzEmLL0eqjA3eGVeyQhMtxdV+Mlsgfwhh0+M/k1/V7Q==} + /@rollup/rollup-linux-arm64-gnu@4.11.0: + resolution: {integrity: sha512-673Lu9EJwxVB9NfYeA4AdNu0FOHz7g9t6N1DmT7bZPn1u6bTF+oZjj+fuxUcrfxWXE0r2jxl5QYMa9cUOj9NFg==} cpu: [arm64] os: [linux] requiresBuild: true dev: false optional: true - /@rollup/rollup-linux-arm64-musl@4.10.0: - resolution: {integrity: sha512-9GW9yA30ib+vfFiwjX+N7PnjTnCMiUffhWj4vkG4ukYv1kJ4T9gHNg8zw+ChsOccM27G9yXrEtMScf1LaCuoWQ==} + /@rollup/rollup-linux-arm64-musl@4.11.0: + resolution: {integrity: sha512-yFW2msTAQNpPJaMmh2NpRalr1KXI7ZUjlN6dY/FhWlOclMrZezm5GIhy3cP4Ts2rIAC+IPLAjNibjp1BsxCVGg==} cpu: [arm64] os: [linux] requiresBuild: true dev: false optional: true - /@rollup/rollup-linux-riscv64-gnu@4.10.0: - resolution: {integrity: sha512-X1ES+V4bMq2ws5fF4zHornxebNxMXye0ZZjUrzOrf7UMx1d6wMQtfcchZ8SqUnQPPHdOyOLW6fTcUiFgHFadRA==} + /@rollup/rollup-linux-riscv64-gnu@4.11.0: + resolution: {integrity: sha512-kKT9XIuhbvYgiA3cPAGntvrBgzhWkGpBMzuk1V12Xuoqg7CI41chye4HU0vLJnGf9MiZzfNh4I7StPeOzOWJfA==} cpu: [riscv64] os: [linux] requiresBuild: true dev: false optional: true - /@rollup/rollup-linux-x64-gnu@4.10.0: - resolution: {integrity: sha512-w/5OpT2EnI/Xvypw4FIhV34jmNqU5PZjZue2l2Y3ty1Ootm3SqhI+AmfhlUYGBTd9JnpneZCDnt3uNOiOBkMyw==} + /@rollup/rollup-linux-x64-gnu@4.11.0: + resolution: {integrity: sha512-6q4ESWlyTO+erp1PSCmASac+ixaDv11dBk1fqyIuvIUc/CmRAX2Zk+2qK1FGo5q7kyDcjHCFVwgGFCGIZGVwCA==} cpu: [x64] os: [linux] requiresBuild: true dev: false optional: true - /@rollup/rollup-linux-x64-musl@4.10.0: - resolution: {integrity: sha512-q/meftEe3QlwQiGYxD9rWwB21DoKQ9Q8wA40of/of6yGHhZuGfZO0c3WYkN9dNlopHlNT3mf5BPsUSxoPuVQaw==} + /@rollup/rollup-linux-x64-musl@4.11.0: + resolution: {integrity: sha512-vIAQUmXeMLmaDN78HSE4Kh6xqof2e3TJUKr+LPqXWU4NYNON0MDN9h2+t4KHrPAQNmU3w1GxBQ/n01PaWFwa5w==} cpu: [x64] os: [linux] requiresBuild: true dev: false optional: true - /@rollup/rollup-win32-arm64-msvc@4.10.0: - resolution: {integrity: sha512-NrR6667wlUfP0BHaEIKgYM/2va+Oj+RjZSASbBMnszM9k+1AmliRjHc3lJIiOehtSSjqYiO7R6KLNrWOX+YNSQ==} + /@rollup/rollup-win32-arm64-msvc@4.11.0: + resolution: {integrity: sha512-LVXo9dDTGPr0nezMdqa1hK4JeoMZ02nstUxGYY/sMIDtTYlli1ZxTXBYAz3vzuuvKO4X6NBETciIh7N9+abT1g==} cpu: [arm64] os: [win32] requiresBuild: true dev: false optional: true - /@rollup/rollup-win32-ia32-msvc@4.10.0: - resolution: {integrity: sha512-FV0Tpt84LPYDduIDcXvEC7HKtyXxdvhdAOvOeWMWbQNulxViH2O07QXkT/FffX4FqEI02jEbCJbr+YcuKdyyMg==} + /@rollup/rollup-win32-ia32-msvc@4.11.0: + resolution: {integrity: sha512-xZVt6K70Gr3I7nUhug2dN6VRR1ibot3rXqXS3wo+8JP64t7djc3lBFyqO4GiVrhNaAIhUCJtwQ/20dr0h0thmQ==} cpu: [ia32] os: [win32] requiresBuild: true dev: false optional: true - /@rollup/rollup-win32-x64-msvc@4.10.0: - resolution: {integrity: sha512-OZoJd+o5TaTSQeFFQ6WjFCiltiYVjIdsXxwu/XZ8qRpsvMQr4UsVrE5UyT9RIvsnuF47DqkJKhhVZ2Q9YW9IpQ==} + /@rollup/rollup-win32-x64-msvc@4.11.0: + resolution: {integrity: sha512-f3I7h9oTg79UitEco9/2bzwdciYkWr8pITs3meSDSlr1TdvQ7IxkQaaYN2YqZXX5uZhiYL+VuYDmHwNzhx+HOg==} cpu: [x64] os: [win32] requiresBuild: true @@ -1189,7 +1193,7 @@ packages: engines: {node: '>=10'} dev: false - /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@5.0.0-next.54)(vite@5.1.2): + /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@5.0.0-next.54)(vite@5.1.3): resolution: {integrity: sha512-gjr9ZFg1BSlIpfZ4PRewigrvYmHWbDrq2uvvPB1AmTWKuM+dI1JXQSUu2pIrYLb/QncyiIGkFDFKTwJ0XqQZZg==} engines: {node: ^18.0.0 || >=20} peerDependencies: @@ -1197,30 +1201,30 @@ packages: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 dependencies: - '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@5.0.0-next.54)(vite@5.1.2) + '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@5.0.0-next.54)(vite@5.1.3) debug: 4.3.4 svelte: 5.0.0-next.54 - vite: 5.1.2(sass@1.70.0) + vite: 5.1.3(sass@1.70.0) transitivePeerDependencies: - supports-color dev: false - /@sveltejs/vite-plugin-svelte@3.0.2(svelte@5.0.0-next.54)(vite@5.1.2): + /@sveltejs/vite-plugin-svelte@3.0.2(svelte@5.0.0-next.54)(vite@5.1.3): resolution: {integrity: sha512-MpmF/cju2HqUls50WyTHQBZUV3ovV/Uk8k66AN2gwHogNAG8wnW8xtZDhzNBsFJJuvmq1qnzA5kE7YfMJNFv2Q==} engines: {node: ^18.0.0 || >=20} peerDependencies: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@5.0.0-next.54)(vite@5.1.2) + '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@5.0.0-next.54)(vite@5.1.3) debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.7 svelte: 5.0.0-next.54 svelte-hmr: 0.15.3(svelte@5.0.0-next.54) - vite: 5.1.2(sass@1.70.0) - vitefu: 0.2.5(vite@5.1.2) + vite: 5.1.3(sass@1.70.0) + vitefu: 0.2.5(vite@5.1.3) transitivePeerDependencies: - supports-color dev: false @@ -1423,19 +1427,19 @@ packages: hasBin: true dev: false - /astro-pagefind@1.4.0(astro@4.3.7): + /astro-pagefind@1.4.0(astro@4.4.0): resolution: {integrity: sha512-WMUlS0TTqIDqygplj/cxKU+l3oI+zB2qgYNMZed5R5nXuw8HhAKATog9zazuN05TOSWxI2Ap9+9WAYnnJ+4C7A==} peerDependencies: astro: ^2.0.4 || ^3.0.0 || ^4.0.0 dependencies: '@pagefind/default-ui': 1.0.4 - astro: 4.3.7(sass@1.70.0)(typescript@5.3.3) + astro: 4.4.0(sass@1.70.0)(typescript@5.3.3) pagefind: 1.0.4 sirv: 2.0.4 dev: false - /astro@4.3.7(sass@1.70.0)(typescript@5.3.3): - resolution: {integrity: sha512-spdl+Ae6WZjQ0w8VBPq8ulN1hdN0m4EWvKG7ecgHjPQIHidMnzWJoZLEFEeKASqCGB1fDibqr7RDHoHkhZbp2Q==} + /astro@4.4.0(sass@1.70.0)(typescript@5.3.3): + resolution: {integrity: sha512-JAsMrm1Z6W4Iqg9Q7LW/6lCXrqa4jndEOlR/yu7NGNP0BrPwSM8i4+yzya6hxgsNvyyVK8ywthaNhFmqd8Z+cg==} engines: {node: '>=18.14.1', npm: '>=6.14.0'} hasBin: true dependencies: @@ -1449,6 +1453,7 @@ packages: '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.23.9) '@babel/traverse': 7.23.9 '@babel/types': 7.23.9 + '@medv/finder': 3.1.0 '@types/babel__core': 7.20.5 acorn: 8.11.3 aria-query: 5.3.0 @@ -1486,7 +1491,6 @@ packages: p-queue: 8.0.1 path-to-regexp: 6.2.1 preferred-pm: 3.1.2 - probe-image-size: 7.2.3 prompts: 2.4.2 rehype: 13.0.1 resolve: 1.22.8 @@ -1499,8 +1503,8 @@ packages: tsconfck: 3.0.2(typescript@5.3.3) unist-util-visit: 5.0.0 vfile: 6.0.1 - vite: 5.1.2(sass@1.70.0) - vitefu: 0.2.5(vite@5.1.2) + vite: 5.1.3(sass@1.70.0) + vitefu: 0.2.5(vite@5.1.3) which-pm: 2.1.1 yargs-parser: 21.1.1 zod: 3.22.4 @@ -1545,14 +1549,14 @@ packages: requiresBuild: true dependencies: bare-events: 2.2.0 - bare-os: 2.1.3 + bare-os: 2.2.0 bare-path: 2.1.0 streamx: 2.15.8 dev: false optional: true - /bare-os@2.1.3: - resolution: {integrity: sha512-YMKOQzoMouGCrYgJ0rassKvmbTz+TYDOKKmu4JkfNXS/qKn+If1ODCMEXnmknQXfnB1PS8bR+uHu6xBgwAQXew==} + /bare-os@2.2.0: + resolution: {integrity: sha512-hD0rOPfYWOMpVirTACt4/nK8mC55La12K5fY1ij8HAdfQakD62M+H4o4tpfKzVGLgRDTuk3vjA4GqGXXCeFbag==} requiresBuild: true dev: false optional: true @@ -1561,7 +1565,7 @@ packages: resolution: {integrity: sha512-DIIg7ts8bdRKwJRJrUMy/PICEaQZaPGZ26lsSx9MJSwIhSrcdHn7/C8W+XmnG/rKi6BaRcz+JO00CjZteybDtw==} requiresBuild: true dependencies: - bare-os: 2.1.3 + bare-os: 2.2.0 dev: false optional: true @@ -1621,7 +1625,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001587 - electron-to-chromium: 1.4.669 + electron-to-chromium: 1.4.671 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.23.0) dev: false @@ -1849,28 +1853,6 @@ packages: hasBin: true dev: false - /debug@2.6.9: - resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.0.0 - dev: false - - /debug@3.2.7: - resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.3 - dev: false - /debug@4.3.4: resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -1958,8 +1940,8 @@ packages: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} dev: false - /electron-to-chromium@1.4.669: - resolution: {integrity: sha512-E2SmpffFPrZhBSgf8ibqanRS2mpuk3FIRDzLDwt7WFpfgJMKDHJs0hmacyP0PS1cWsq0dVkwIIzlscNaterkPg==} + /electron-to-chromium@1.4.671: + resolution: {integrity: sha512-UUlE+/rWbydmp+FW8xlnnTA5WNA0ZZd2XL8CuMS72rh+k4y1f8+z6yk3UQhEwqHQWj6IBdL78DwWOdGMvYfQyA==} dev: false /emoji-regex@10.3.0: @@ -2470,13 +2452,6 @@ packages: engines: {node: '>=16.17.0'} dev: false - /iconv-lite@0.4.24: - resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} - engines: {node: '>=0.10.0'} - dependencies: - safer-buffer: 2.1.2 - dev: false - /ieee754@1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} dev: false @@ -2717,10 +2692,6 @@ packages: p-locate: 5.0.0 dev: false - /lodash.merge@4.6.2: - resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} - dev: false - /log-symbols@5.1.0: resolution: {integrity: sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==} engines: {node: '>=12'} @@ -3431,18 +3402,10 @@ packages: engines: {node: '>=10'} dev: false - /ms@2.0.0: - resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} - dev: false - /ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} dev: false - /ms@2.1.3: - resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - dev: false - /nanoid@3.3.7: resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -3455,18 +3418,6 @@ packages: dev: false optional: true - /needle@2.9.1: - resolution: {integrity: sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==} - engines: {node: '>= 4.4.x'} - hasBin: true - dependencies: - debug: 3.2.7 - iconv-lite: 0.4.24 - sax: 1.3.0 - transitivePeerDependencies: - - supports-color - dev: false - /nlcst-to-string@3.1.1: resolution: {integrity: sha512-63mVyqaqt0cmn2VcI2aH6kxe1rLAmSROqHMA0i4qqg1tidkfExgpb0FGMikMCn86mw5dFtBtEANfmSSK7TjNHw==} dependencies: @@ -3774,16 +3725,6 @@ packages: engines: {node: '>=6'} dev: false - /probe-image-size@7.2.3: - resolution: {integrity: sha512-HubhG4Rb2UH8YtV4ba0Vp5bQ7L78RTONYu/ujmCu5nBI8wGv24s4E9xSKBi0N1MowRpxk76pFCpJtW0KPzOK0w==} - dependencies: - lodash.merge: 4.6.2 - needle: 2.9.1 - stream-parser: 0.3.1 - transitivePeerDependencies: - - supports-color - dev: false - /prompts@2.4.2: resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==} engines: {node: '>= 6'} @@ -4048,26 +3989,26 @@ packages: engines: {node: '>=18.0.0'} dev: false - /rollup@4.10.0: - resolution: {integrity: sha512-t2v9G2AKxcQ8yrG+WGxctBes1AomT0M4ND7jTFBCVPXQ/WFTvNSefIrNSmLKhIKBrvN8SG+CZslimJcT3W2u2g==} + /rollup@4.11.0: + resolution: {integrity: sha512-2xIbaXDXjf3u2tajvA5xROpib7eegJ9Y/uPlSFhXLNpK9ampCczXAhLEb5yLzJyG3LAdI1NWtNjDXiLyniNdjQ==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true dependencies: '@types/estree': 1.0.5 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.10.0 - '@rollup/rollup-android-arm64': 4.10.0 - '@rollup/rollup-darwin-arm64': 4.10.0 - '@rollup/rollup-darwin-x64': 4.10.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.10.0 - '@rollup/rollup-linux-arm64-gnu': 4.10.0 - '@rollup/rollup-linux-arm64-musl': 4.10.0 - '@rollup/rollup-linux-riscv64-gnu': 4.10.0 - '@rollup/rollup-linux-x64-gnu': 4.10.0 - '@rollup/rollup-linux-x64-musl': 4.10.0 - '@rollup/rollup-win32-arm64-msvc': 4.10.0 - '@rollup/rollup-win32-ia32-msvc': 4.10.0 - '@rollup/rollup-win32-x64-msvc': 4.10.0 + '@rollup/rollup-android-arm-eabi': 4.11.0 + '@rollup/rollup-android-arm64': 4.11.0 + '@rollup/rollup-darwin-arm64': 4.11.0 + '@rollup/rollup-darwin-x64': 4.11.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.11.0 + '@rollup/rollup-linux-arm64-gnu': 4.11.0 + '@rollup/rollup-linux-arm64-musl': 4.11.0 + '@rollup/rollup-linux-riscv64-gnu': 4.11.0 + '@rollup/rollup-linux-x64-gnu': 4.11.0 + '@rollup/rollup-linux-x64-musl': 4.11.0 + '@rollup/rollup-win32-arm64-msvc': 4.11.0 + '@rollup/rollup-win32-ia32-msvc': 4.11.0 + '@rollup/rollup-win32-x64-msvc': 4.11.0 fsevents: 2.3.3 dev: false @@ -4081,10 +4022,6 @@ packages: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} dev: false - /safer-buffer@2.1.2: - resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - dev: false - /sass@1.70.0: resolution: {integrity: sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==} engines: {node: '>=14.0.0'} @@ -4094,10 +4031,6 @@ packages: immutable: 4.3.5 source-map-js: 1.0.2 - /sax@1.3.0: - resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==} - dev: false - /section-matter@1.0.0: resolution: {integrity: sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==} engines: {node: '>=4'} @@ -4264,14 +4197,6 @@ packages: bl: 5.1.0 dev: false - /stream-parser@0.3.1: - resolution: {integrity: sha512-bJ/HgKq41nlKvlhccD5kaCr/P+Hu0wPNKPJOH7en+YrJu/9EgqUF+88w5Jb6KNcjOFMhfX4B2asfeAtIGuHObQ==} - dependencies: - debug: 2.6.9 - transitivePeerDependencies: - - supports-color - dev: false - /streamx@2.15.8: resolution: {integrity: sha512-6pwMeMY/SuISiRsuS8TeIrAzyFbG5gGPHFQsYjUr/pbBadaL1PCWmzKw+CHZSwainfvcF6Si6cVLq4XTEwswFQ==} requiresBuild: true @@ -4730,8 +4655,8 @@ packages: vfile-message: 4.0.2 dev: false - /vite@5.1.2(sass@1.70.0): - resolution: {integrity: sha512-uwiFebQbTWRIGbCaTEBVAfKqgqKNKMJ2uPXsXeLIZxM8MVMjoS3j0cG8NrPxdDIadaWnPSjrkLWffLSC+uiP3Q==} + /vite@5.1.3(sass@1.70.0): + resolution: {integrity: sha512-UfmUD36DKkqhi/F75RrxvPpry+9+tTkrXfMNZD+SboZqBCMsxKtO52XeGzzuh7ioz+Eo/SYDBbdb0Z7vgcDJew==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -4760,13 +4685,13 @@ packages: dependencies: esbuild: 0.19.12 postcss: 8.4.35 - rollup: 4.10.0 + rollup: 4.11.0 sass: 1.70.0 optionalDependencies: fsevents: 2.3.3 dev: false - /vitefu@0.2.5(vite@5.1.2): + /vitefu@0.2.5(vite@5.1.3): resolution: {integrity: sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==} peerDependencies: vite: ^3.0.0 || ^4.0.0 || ^5.0.0 @@ -4774,7 +4699,7 @@ packages: vite: optional: true dependencies: - vite: 5.1.2(sass@1.70.0) + vite: 5.1.3(sass@1.70.0) dev: false /web-namespaces@2.0.1: diff --git a/src/styles/_kanagawa.scss b/src/styles/_kanagawa.scss index a5334db..76836df 100644 --- a/src/styles/_kanagawa.scss +++ b/src/styles/_kanagawa.scss @@ -80,11 +80,17 @@ // Keywords .keyword { color: var(--kngw-oniViolet); } - + .keyword-coroutine { color: var(--kngw-oniViolet); } + .keyword-function { color: var(--kngw-oniViolet); } + .keyword-operator { color: var(--kngw-boatYellow2); } + .keyword-import { color: var(--kngw-oniViolet); } + .keyword-repeat { color: var(--kngw-oniViolet); } .keyword-return { color: var(--kngw-peachRed); } .keyword-debug { color: var(--kngw-peachRed); } .keyword-exception { color: var(--kngw-peachRed); } + .keyword-conditional { color: var(--kngw-oniViolet); } + // Punctuation .punctuation-delimiter { color: var(--kngw-springViolet2); } .punctuation-bracket { color: var(--kngw-springViolet2); } diff --git a/tools/treesitter/queries/css/highlights.scm b/tools/treesitter/queries/css/highlights.scm index e271d85..a07fcb7 100644 --- a/tools/treesitter/queries/css/highlights.scm +++ b/tools/treesitter/queries/css/highlights.scm @@ -1,10 +1,38 @@ -(comment) @comment +[ + "@media" + "@charset" + "@namespace" + "@supports" + "@keyframes" + (at_keyword) +] @keyword.directive + +"@import" @keyword.import + +[ + (to) + (from) +] @keyword + +(comment) @comment @spell + +(tag_name) @tag + +(class_name) @type + +(id_name) @constant + +[ + (property_name) + (feature_name) +] @property [ - (tag_name) (nesting_selector) (universal_selector) -] @tag +] @character.special + +(function_name) @function [ "~" @@ -19,60 +47,59 @@ "~=" "$=" "*=" +] @operator + +[ "and" "or" "not" "only" -] @operator +] @keyword.operator -(attribute_selector (plain_value) @string) +(important) @type.qualifier -(attribute_name) @attribute -(pseudo_element_selector (tag_name) @attribute) -(pseudo_class_selector (class_name) @attribute) +(attribute_selector + (plain_value) @string) + +(pseudo_element_selector + "::" + (tag_name) @attribute) + +(pseudo_class_selector + (class_name) @attribute) + +(attribute_name) @tag.attribute + +(namespace_name) @module + +((property_name) @variable + (#lua-match? @variable "^[-][-]")) + +((plain_value) @variable + (#lua-match? @variable "^[-][-]")) [ - (class_name) - (id_name) - (namespace_name) - (property_name) - (feature_name) -] @property + (string_value) + (color_value) + (unit) +] @string -(function_name) @function +(integer_value) @number -( - [ - (property_name) - (plain_value) - ] @variable.special - (#match? @variable.special "^--") -) - -[ - "@media" - "@import" - "@charset" - "@namespace" - "@supports" - "@keyframes" - (at_keyword) - (to) - (from) - (important) -] @keyword - -(string_value) @string -(color_value) @string.special - -[ - (integer_value) - (float_value) -] @number - -(unit) @type +(float_value) @number.float [ + "#" "," + "." ":" + "::" + ";" ] @punctuation.delimiter + +[ + "{" + ")" + "(" + "}" +] @punctuation.bracket diff --git a/tools/treesitter/queries/ecma/highlights.scm b/tools/treesitter/queries/ecma/highlights.scm new file mode 100644 index 0000000..d21816b --- /dev/null +++ b/tools/treesitter/queries/ecma/highlights.scm @@ -0,0 +1,82 @@ +; Keywords +;---------- +[ + "if" + "else" + "switch" + "case" +] @keyword.conditional + +[ + "import" + "from" +] @keyword.import + +(export_specifier + "as" @keyword.import) + +(import_specifier + "as" @keyword.import) + +(namespace_export + "as" @keyword.import) + +(namespace_import + "as" @keyword.import) + +[ + "for" + "of" + "do" + "while" + "continue" +] @keyword.repeat + +[ + "break" + "class" + "const" + "debugger" + "export" + "extends" + "get" + "let" + "set" + "static" + "target" + "var" + "with" +] @keyword + +[ + "async" + "await" +] @keyword.coroutine + +[ + "return" + "yield" +] @keyword.return + +"function" @keyword.function + +[ + "new" + "delete" + "in" + "instanceof" + "typeof" +] @keyword.operator + +[ + "throw" + "try" + "catch" + "finally" +] @keyword.exception + +(export_statement + "default" @keyword) + +(switch_default + "default" @keyword.conditional) diff --git a/tools/treesitter/src/configs.rs b/tools/treesitter/src/configs.rs index 0d6627c..5db0cc9 100644 --- a/tools/treesitter/src/configs.rs +++ b/tools/treesitter/src/configs.rs @@ -49,7 +49,7 @@ pub static CONFIGS: Lazy> = Lazy:: tree_sitter_astro::language(), query!("astro/highlights"), query!("astro/injections"), - "" + "", ) ), ( @@ -83,7 +83,10 @@ pub static CONFIGS: Lazy> = Lazy:: "javascript", config_for( tree_sitter_javascript::language(), - tree_sitter_javascript::HIGHLIGHT_QUERY, + &format!("{} {}", + query!("ecma/highlights"), + tree_sitter_javascript::HIGHLIGHT_QUERY, + ), tree_sitter_javascript::INJECTION_QUERY, tree_sitter_javascript::LOCALS_QUERY, ) @@ -92,9 +95,10 @@ pub static CONFIGS: Lazy> = Lazy:: "jsx", config_for( tree_sitter_javascript::language(), - &format!("{} {}", + &format!("{} {} {}", + query!("ecma/highlights"), tree_sitter_javascript::HIGHLIGHT_QUERY, - tree_sitter_javascript::JSX_HIGHLIGHT_QUERY + tree_sitter_javascript::JSX_HIGHLIGHT_QUERY, ), tree_sitter_javascript::INJECTION_QUERY, tree_sitter_javascript::LOCALS_QUERY, @@ -106,7 +110,7 @@ pub static CONFIGS: Lazy> = Lazy:: tree_sitter_md::language(), tree_sitter_md::HIGHLIGHT_QUERY_BLOCK, tree_sitter_md::INJECTION_QUERY_BLOCK, - "" + "", ) ), ( @@ -115,7 +119,7 @@ pub static CONFIGS: Lazy> = Lazy:: tree_sitter_regex::language(), query!("regex/highlights"), "", - "" + "", ) ), ( @@ -133,7 +137,7 @@ pub static CONFIGS: Lazy> = Lazy:: tree_sitter_scheme::language(), tree_sitter_scheme::HIGHLIGHTS_QUERY, "", - "" + "", ) ), ( @@ -142,14 +146,15 @@ pub static CONFIGS: Lazy> = Lazy:: tree_sitter_toml::language(), tree_sitter_toml::HIGHLIGHT_QUERY, "", - "" + "", ) ), ( "tsx", config_for( tree_sitter_typescript::language_tsx(), - &format!("{} {} {}", + &format!("{} {} {} {}", + query!("ecma/highlights"), tree_sitter_javascript::HIGHLIGHT_QUERY, tree_sitter_javascript::JSX_HIGHLIGHT_QUERY, tree_sitter_typescript::HIGHLIGHT_QUERY, @@ -165,9 +170,10 @@ pub static CONFIGS: Lazy> = Lazy:: "typescript", config_for( tree_sitter_typescript::language_typescript(), - &format!("{} {}", + &format!("{} {} {}", + query!("ecma/highlights"), tree_sitter_javascript::HIGHLIGHT_QUERY, - tree_sitter_typescript::HIGHLIGHT_QUERY + tree_sitter_typescript::HIGHLIGHT_QUERY, ), tree_sitter_javascript::INJECTION_QUERY, &format!("{} {}",