diff --git a/packages/astro/package.json b/packages/astro/package.json index 286153d8addb..d44a88bd88f2 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -161,7 +161,7 @@ "prompts": "^2.4.2", "rehype": "^13.0.2", "semver": "^7.7.0", - "shiki": "^1.29.2", + "shiki": "^2.2.0", "tinyexec": "^0.3.2", "tsconfck": "^3.1.4", "ultrahtml": "^1.5.3", diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index 73ea24f2d1da..593f13fea7b3 100644 --- a/packages/integrations/mdx/package.json +++ b/packages/integrations/mdx/package.json @@ -68,7 +68,7 @@ "remark-rehype": "^11.1.1", "remark-shiki-twoslash": "^3.1.3", "remark-toc": "^9.0.0", - "shiki": "^1.29.2", + "shiki": "^2.2.0", "unified": "^11.0.5", "vite": "^6.0.11" }, diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json index 8e9e142a625e..d27713c2da97 100644 --- a/packages/markdown/remark/package.json +++ b/packages/markdown/remark/package.json @@ -45,7 +45,7 @@ "remark-parse": "^11.0.0", "remark-rehype": "^11.1.1", "remark-smartypants": "^3.0.2", - "shiki": "^1.29.2", + "shiki": "^2.2.0", "smol-toml": "^1.3.1", "unified": "^11.0.5", "unist-util-remove-position": "^5.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 31a2544cee88..0292575d2a44 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -590,8 +590,8 @@ importers: specifier: ^7.7.0 version: 7.7.0 shiki: - specifier: ^1.29.2 - version: 1.29.2 + specifier: ^2.2.0 + version: 2.2.0 tinyexec: specifier: ^0.3.2 version: 0.3.2 @@ -4813,7 +4813,7 @@ importers: version: 6.0.0 rehype-pretty-code: specifier: ^0.14.0 - version: 0.14.0(shiki@1.29.2) + version: 0.14.0(shiki@2.2.0) remark-math: specifier: ^6.0.0 version: 6.0.0 @@ -4827,8 +4827,8 @@ importers: specifier: ^9.0.0 version: 9.0.0 shiki: - specifier: ^1.29.2 - version: 1.29.2 + specifier: ^2.2.0 + version: 2.2.0 unified: specifier: ^11.0.5 version: 11.0.5 @@ -5115,7 +5115,7 @@ importers: devDependencies: '@astrojs/node': specifier: ^9.0.0 - version: 9.0.1(astro@packages+astro) + version: 9.0.2(astro@packages+astro) astro: specifier: workspace:* version: link:../../astro @@ -5436,8 +5436,8 @@ importers: specifier: ^3.0.2 version: 3.0.2 shiki: - specifier: ^1.29.2 - version: 1.29.2 + specifier: ^2.2.0 + version: 2.2.0 smol-toml: specifier: ^1.3.1 version: 1.3.1 @@ -5680,11 +5680,6 @@ packages: prettier-plugin-astro: optional: true - '@astrojs/node@9.0.1': - resolution: {integrity: sha512-vIKmKYhzK9o3NXANkHyjcFqi9e9N84mhgCESC/+rQ8danWnktu9uR6rGvbj3bdTb9+Dn5LDsmEm123P2Cun9nQ==} - peerDependencies: - astro: ^5.0.0 - '@astrojs/node@9.0.2': resolution: {integrity: sha512-MFFYRa5yQEBegKrSUPMeKnjDMB4okTrkVRA40/mU3ADKrKY5VV3af0LS+NYkH9pFOvj/OsPbdeQVxQ0jI3f6aQ==} peerDependencies: @@ -6971,23 +6966,23 @@ packages: '@sec-ant/readable-stream@0.4.1': resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} - '@shikijs/core@1.29.2': - resolution: {integrity: sha512-vju0lY9r27jJfOY4Z7+Rt/nIOjzJpZ3y+nYpqtUZInVoXQ/TJZcfGnNOGnKjFdVZb8qexiCuSlZRKcGfhhTTZQ==} + '@shikijs/core@2.2.0': + resolution: {integrity: sha512-U+vpKdsQDWuX3fPTCkSc8XPX9dCaS+r+qEP1XhnU30yxRFo2OxHJmY2H5rO1q+v0zB5R2vobsxEFt5uPf31CGQ==} - '@shikijs/engine-javascript@1.29.2': - resolution: {integrity: sha512-iNEZv4IrLYPv64Q6k7EPpOCE/nuvGiKl7zxdq0WFuRPF5PAE9PRo2JGq/d8crLusM59BRemJ4eOqrFrC4wiQ+A==} + '@shikijs/engine-javascript@2.2.0': + resolution: {integrity: sha512-96SpZ4V3UVMtpSPR5QpmU395CNrQiRPszXK62m8gKR2HMA0653ruce7omS5eX6EyAyFSYHvBWtTuspiIsHpu4A==} - '@shikijs/engine-oniguruma@1.29.2': - resolution: {integrity: sha512-7iiOx3SG8+g1MnlzZVDYiaeHe7Ez2Kf2HrJzdmGwkRisT7r4rak0e655AcM/tF9JG/kg5fMNYlLLKglbN7gBqA==} + '@shikijs/engine-oniguruma@2.2.0': + resolution: {integrity: sha512-wowCKwkvPFFMXFkiKK/a2vs5uTCc0W9+O9Xcu/oqFP6VoDFe14T8u/D+Rl4dCJJSOyeynP9mxNPJ82T5JHTNCw==} - '@shikijs/langs@1.29.2': - resolution: {integrity: sha512-FIBA7N3LZ+223U7cJDUYd5shmciFQlYkFXlkKVaHsCPgfVLiO+e12FmQE6Tf9vuyEsFe3dIl8qGWKXgEHL9wmQ==} + '@shikijs/langs@2.2.0': + resolution: {integrity: sha512-RSWLH3bnoyG6O1kZ2msh5jOkKKp8eENwyT30n62vUtXfp5cxkF/bpWPpO+p4+GAPhL2foBWR2kOerwkKG0HXlQ==} - '@shikijs/themes@1.29.2': - resolution: {integrity: sha512-i9TNZlsq4uoyqSbluIcZkmPL9Bfi3djVxRnofUHwvx/h6SRW3cwgBC5SML7vsDcWyukY0eCzVN980rqP6qNl9g==} + '@shikijs/themes@2.2.0': + resolution: {integrity: sha512-8Us9ZF2mV9kuh+4ySJ9MzrUDIpc2RIkRfKBZclkliW1z9a0PlGU2U7fCkItZZHpR5e4/ft5BzuO+GDqombC6Aw==} - '@shikijs/types@1.29.2': - resolution: {integrity: sha512-VJjK0eIijTZf0QSTODEXCqinjBn0joAHQ+aPSBzrv4O2d/QSbsMw+ZeSRx03kV34Hy7NzUvV/7NqfYGRLrASmw==} + '@shikijs/types@2.2.0': + resolution: {integrity: sha512-wkZZKs80NtW5Jp/7ONI1j7EdXSatX2BKMS7I01wliDa09gJKHkZyVqlEMRka/mjT5Qk9WgAyitoCKgGgbsP/9g==} '@shikijs/vscode-textmate@10.0.1': resolution: {integrity: sha512-fTIQwLF+Qhuws31iw7Ncl1R3HUDtGwIipiJ9iU+UsDUwMhegFcQKQHd51nZjb7CArq0MvON8rbgCGQYWHUKAdg==} @@ -8931,6 +8926,7 @@ packages: libsql@0.4.5: resolution: {integrity: sha512-sorTJV6PNt94Wap27Sai5gtVLIea4Otb2LUiAUyr3p6BPOScGMKGt5F1b5X/XgkNtcsDKeX5qfeBDj+PdShclQ==} + cpu: [x64, arm64, wasm32] os: [darwin, linux, win32] lightningcss-darwin-arm64@1.29.1: @@ -9529,8 +9525,8 @@ packages: resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} engines: {node: '>=12'} - oniguruma-to-es@2.2.0: - resolution: {integrity: sha512-EEsso27ri0sf+t4uRFEj5C5gvXQj0d0w1Y2qq06b+hDLBnvzO1rWTwEW4C7ytan6nhg4WPwE26eLoiPhHUbvKg==} + oniguruma-to-es@2.3.0: + resolution: {integrity: sha512-bwALDxriqfKGfUufKGGepCzu9x7nJQuoRoAFp4AnwehhC2crqrDIAP/uN2qdlsAvSMpeRC3+Yzhqc7hLmle5+g==} only-allow@1.2.1: resolution: {integrity: sha512-M7CJbmv7UCopc0neRKdzfoGWaVZC+xC1925GitKH9EAqYFzX9//25Q7oX4+jw0tiCCj+t5l6VZh8UPH23NZkMA==} @@ -10282,11 +10278,6 @@ packages: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} hasBin: true - semver@7.6.3: - resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==} - engines: {node: '>=10'} - hasBin: true - semver@7.7.0: resolution: {integrity: sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==} engines: {node: '>=10'} @@ -10332,8 +10323,8 @@ packages: shiki@0.10.1: resolution: {integrity: sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==} - shiki@1.29.2: - resolution: {integrity: sha512-njXuliz/cP+67jU2hukkxCNuH1yUi4QfdZZY+sMr5PPrIyXSu5iTb/qYC4BiWWB0vZ+7TbdvYUCeL23zpwCfbg==} + shiki@2.2.0: + resolution: {integrity: sha512-3uoZBmc+zpd2JOEeTvKP/vK5UVDDe8YiigkT9flq+MV5Z1MKFiUXfbLIvHfqcJ+V90StDiP1ckN97z1WlhC6cQ==} siginfo@2.0.0: resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==} @@ -11444,14 +11435,6 @@ snapshots: transitivePeerDependencies: - typescript - '@astrojs/node@9.0.1(astro@packages+astro)': - dependencies: - astro: link:packages/astro - send: 1.1.0 - server-destroy: 1.0.1 - transitivePeerDependencies: - - supports-color - '@astrojs/node@9.0.2(astro@packages+astro)': dependencies: astro: link:packages/astro @@ -12761,35 +12744,35 @@ snapshots: '@sec-ant/readable-stream@0.4.1': {} - '@shikijs/core@1.29.2': + '@shikijs/core@2.2.0': dependencies: - '@shikijs/engine-javascript': 1.29.2 - '@shikijs/engine-oniguruma': 1.29.2 - '@shikijs/types': 1.29.2 + '@shikijs/engine-javascript': 2.2.0 + '@shikijs/engine-oniguruma': 2.2.0 + '@shikijs/types': 2.2.0 '@shikijs/vscode-textmate': 10.0.1 '@types/hast': 3.0.4 hast-util-to-html: 9.0.4 - '@shikijs/engine-javascript@1.29.2': + '@shikijs/engine-javascript@2.2.0': dependencies: - '@shikijs/types': 1.29.2 + '@shikijs/types': 2.2.0 '@shikijs/vscode-textmate': 10.0.1 - oniguruma-to-es: 2.2.0 + oniguruma-to-es: 2.3.0 - '@shikijs/engine-oniguruma@1.29.2': + '@shikijs/engine-oniguruma@2.2.0': dependencies: - '@shikijs/types': 1.29.2 + '@shikijs/types': 2.2.0 '@shikijs/vscode-textmate': 10.0.1 - '@shikijs/langs@1.29.2': + '@shikijs/langs@2.2.0': dependencies: - '@shikijs/types': 1.29.2 + '@shikijs/types': 2.2.0 - '@shikijs/themes@1.29.2': + '@shikijs/themes@2.2.0': dependencies: - '@shikijs/types': 1.29.2 + '@shikijs/types': 2.2.0 - '@shikijs/types@1.29.2': + '@shikijs/types@2.2.0': dependencies: '@shikijs/vscode-textmate': 10.0.1 '@types/hast': 3.0.4 @@ -13514,7 +13497,7 @@ snapshots: progress: 2.0.3 reinterval: 1.1.0 retimer: 3.0.0 - semver: 7.6.3 + semver: 7.7.0 subarg: 1.0.0 timestring: 6.0.0 @@ -15740,7 +15723,7 @@ snapshots: dependencies: mimic-fn: 4.0.0 - oniguruma-to-es@2.2.0: + oniguruma-to-es@2.3.0: dependencies: emoji-regex-xs: 1.0.0 regex: 5.1.1 @@ -16372,13 +16355,13 @@ snapshots: hast-util-from-html: 2.0.3 unified: 11.0.5 - rehype-pretty-code@0.14.0(shiki@1.29.2): + rehype-pretty-code@0.14.0(shiki@2.2.0): dependencies: '@types/hast': 3.0.4 hast-util-to-string: 3.0.0 parse-numeric-range: 1.3.0 rehype-parse: 9.0.0 - shiki: 1.29.2 + shiki: 2.2.0 unified: 11.0.5 unist-util-visit: 5.0.0 @@ -16635,8 +16618,6 @@ snapshots: semver@6.3.1: {} - semver@7.6.3: {} - semver@7.7.0: {} send@1.1.0: @@ -16670,7 +16651,7 @@ snapshots: dependencies: color: 4.2.3 detect-libc: 2.0.3 - semver: 7.6.3 + semver: 7.7.0 optionalDependencies: '@img/sharp-darwin-arm64': 0.33.3 '@img/sharp-darwin-x64': 0.33.3 @@ -16714,14 +16695,14 @@ snapshots: vscode-oniguruma: 1.7.0 vscode-textmate: 5.2.0 - shiki@1.29.2: + shiki@2.2.0: dependencies: - '@shikijs/core': 1.29.2 - '@shikijs/engine-javascript': 1.29.2 - '@shikijs/engine-oniguruma': 1.29.2 - '@shikijs/langs': 1.29.2 - '@shikijs/themes': 1.29.2 - '@shikijs/types': 1.29.2 + '@shikijs/core': 2.2.0 + '@shikijs/engine-javascript': 2.2.0 + '@shikijs/engine-oniguruma': 2.2.0 + '@shikijs/langs': 2.2.0 + '@shikijs/themes': 2.2.0 + '@shikijs/types': 2.2.0 '@shikijs/vscode-textmate': 10.0.1 '@types/hast': 3.0.4