diff --git a/.changeset/shiki-v4.md b/.changeset/shiki-v4.md new file mode 100644 index 000000000000..7dcdeb4636cd --- /dev/null +++ b/.changeset/shiki-v4.md @@ -0,0 +1,8 @@ +--- +'@astrojs/markdown-remark': major +'astro': major +--- + +Updates dependency `shiki` to v4 + +Check [Shiki's upgrade guide](https://shiki.style/blog/v4). diff --git a/packages/astro/package.json b/packages/astro/package.json index 78ad1b186f1d..9fdc10872e22 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -154,7 +154,7 @@ "picomatch": "^4.0.3", "rehype": "^13.0.2", "semver": "^7.7.4", - "shiki": "^3.22.0", + "shiki": "^4.0.0", "smol-toml": "^1.6.0", "svgo": "^4.0.0", "tinyexec": "^1.0.2", diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index 587e9dc3a0f2..147ab4a22cdf 100644 --- a/packages/integrations/mdx/package.json +++ b/packages/integrations/mdx/package.json @@ -52,8 +52,8 @@ "astro": "^6.0.0-alpha.0" }, "devDependencies": { - "@shikijs/rehype": "^3.22.0", - "@shikijs/twoslash": "^3.22.0", + "@shikijs/rehype": "^4.0.0", + "@shikijs/twoslash": "^4.0.0", "@types/estree": "^1.0.8", "@types/hast": "^3.0.4", "@types/mdast": "^4.0.4", @@ -68,7 +68,7 @@ "remark-math": "^6.0.0", "remark-rehype": "^11.1.2", "remark-toc": "^9.0.0", - "shiki": "^3.22.0", + "shiki": "^4.0.0", "unified": "^11.0.5", "vite": "^7.3.1" }, diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json index 6c1aae39a3ab..dbe85d202662 100644 --- a/packages/markdown/remark/package.json +++ b/packages/markdown/remark/package.json @@ -50,7 +50,7 @@ "remark-parse": "^11.0.0", "remark-rehype": "^11.1.2", "remark-smartypants": "^3.0.2", - "shiki": "^3.23.0", + "shiki": "^4.0.0", "smol-toml": "^1.6.0", "unified": "^11.0.5", "unist-util-remove-position": "^5.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 65a64206e364..477f55a22b3e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -620,8 +620,8 @@ importers: specifier: ^7.7.4 version: 7.7.4 shiki: - specifier: ^3.22.0 - version: 3.23.0 + specifier: ^4.0.0 + version: 4.0.0 smol-toml: specifier: ^1.6.0 version: 1.6.0 @@ -5461,11 +5461,11 @@ importers: version: 6.0.3 devDependencies: '@shikijs/rehype': - specifier: ^3.22.0 - version: 3.23.0 + specifier: ^4.0.0 + version: 4.0.0 '@shikijs/twoslash': - specifier: ^3.22.0 - version: 3.23.0(typescript@5.9.3) + specifier: ^4.0.0 + version: 4.0.0(typescript@5.9.3) '@types/estree': specifier: ^1.0.8 version: 1.0.8 @@ -5498,7 +5498,7 @@ importers: version: 7.1.0 rehype-pretty-code: specifier: ^0.14.1 - version: 0.14.1(shiki@3.23.0) + version: 0.14.1(shiki@4.0.0) remark-math: specifier: ^6.0.0 version: 6.0.0 @@ -5509,8 +5509,8 @@ importers: specifier: ^9.0.0 version: 9.0.0 shiki: - specifier: ^3.22.0 - version: 3.23.0 + specifier: ^4.0.0 + version: 4.0.0 unified: specifier: ^11.0.5 version: 11.0.5 @@ -6936,8 +6936,8 @@ importers: specifier: ^3.0.2 version: 3.0.2 shiki: - specifier: ^3.23.0 - version: 3.23.0 + specifier: ^4.0.0 + version: 4.0.0 smol-toml: specifier: ^1.6.0 version: 1.6.0 @@ -9781,31 +9781,43 @@ packages: resolution: {integrity: sha512-Nqc90v4lWCXyakD6xNyNACBJNJ0tNCwj2WNk/7ivyacYHxiITVgmLUFXTBOeCdy79iz6HtN9Y31uw/jbLrdOAg==} engines: {node: '>=20.0.0'} - '@shikijs/core@3.23.0': - resolution: {integrity: sha512-NSWQz0riNb67xthdm5br6lAkvpDJRTgB36fxlo37ZzM2yq0PQFFzbd8psqC2XMPgCzo1fW6cVi18+ArJ44wqgA==} + '@shikijs/core@4.0.0': + resolution: {integrity: sha512-tvV94Dwyz4qFZ8R0MUaFx5Yptgy8yrloa4dwynEJDGjKz+8vqO8Q6FmPZL9W1gSzFHOUMOGQzIHK62aGourFxA==} + engines: {node: '>=20'} + + '@shikijs/engine-javascript@4.0.0': + resolution: {integrity: sha512-+PEyTS+JTz2lLy2C1Dwwx6hzoehIzqxQYh5MEjv9V4JtSabx+bIkRHfQT+6DnBmPAplGH0exBknWeiJSXC7w1w==} + engines: {node: '>=20'} - '@shikijs/engine-javascript@3.23.0': - resolution: {integrity: sha512-aHt9eiGFobmWR5uqJUViySI1bHMqrAgamWE1TYSUoftkAeCCAiGawPMwM+VCadylQtF4V3VNOZ5LmfItH5f3yA==} + '@shikijs/engine-oniguruma@4.0.0': + resolution: {integrity: sha512-KXmq4b6Xw16+4+rz5M4NZMoe/tzs5kTOMSJz8+LCyxSrwmxwTBAM/ab85iSO2Gw79E47HkW4B9HPHUXhrNOivw==} + engines: {node: '>=20'} - '@shikijs/engine-oniguruma@3.23.0': - resolution: {integrity: sha512-1nWINwKXxKKLqPibT5f4pAFLej9oZzQTsby8942OTlsJzOBZ0MWKiwzMsd+jhzu8YPCHAswGnnN1YtQfirL35g==} + '@shikijs/langs@4.0.0': + resolution: {integrity: sha512-dSAT6fBcnOcYZQMWZO8+OmzUKKm+OO0As/qZ3TXLiSy0JsCTEYz1TaX7TDupnYLz7dr0oF2DOTEgPocx1D3aFw==} + engines: {node: '>=20'} - '@shikijs/langs@3.23.0': - resolution: {integrity: sha512-2Ep4W3Re5aB1/62RSYQInK9mM3HsLeB91cHqznAJMuylqjzNVAVCMnNWRHFtcNHXsoNRayP9z1qj4Sq3nMqYXg==} + '@shikijs/primitive@4.0.0': + resolution: {integrity: sha512-6K2zD7JTgsyFc2vM1rqy8eRGC8D5Hius3qzVONjq2lHMrqfTSn1HcGeJZiFPYSV9m3DQuBHncBbA5xe0hKSOkQ==} + engines: {node: '>=20'} - '@shikijs/rehype@3.23.0': - resolution: {integrity: sha512-GepKJxXHbXFfAkiZZZ+4V7x71Lw3s0ALYmydUxJRdvpKjSx9FOMSaunv6WRLFBXR6qjYerUq1YZQno+2gLEPwA==} + '@shikijs/rehype@4.0.0': + resolution: {integrity: sha512-zvvK1H763oSOH7jh2eVMYwM2zDEVVqboSn4ChIC1W8SnB5kQwanZYdIWJrWJPlzCjyd8loHlp0a9mOTds8QtGA==} + engines: {node: '>=20'} - '@shikijs/themes@3.23.0': - resolution: {integrity: sha512-5qySYa1ZgAT18HR/ypENL9cUSGOeI2x+4IvYJu4JgVJdizn6kG4ia5Q1jDEOi7gTbN4RbuYtmHh0W3eccOrjMA==} + '@shikijs/themes@4.0.0': + resolution: {integrity: sha512-xe42kvxOXan5ouXxULez6qwDNUJkoP6kicfg0wKuJBkeIaHLxZBZa2gEGYutL1q27DQZ5+XoR6caVX+E/aNR5A==} + engines: {node: '>=20'} - '@shikijs/twoslash@3.23.0': - resolution: {integrity: sha512-pNaLJWMA3LU7PhT8tm9OQBZ1epy0jmdgeJzntBtr1EVXLbHxGzTj3mnf9vOdcl84l96qnlJXkJ/NGXZYBpXl5g==} + '@shikijs/twoslash@4.0.0': + resolution: {integrity: sha512-Kl1SpkL7yX2o8MmSCSqXE3Mova/X8LZj5rX5FpAy/JniCEvn/oWEOlUG/8hIDfH3qaRcKuLxwlR92yh5mH8juA==} + engines: {node: '>=20'} peerDependencies: typescript: '>=5.5.0' - '@shikijs/types@3.23.0': - resolution: {integrity: sha512-3JZ5HXOZfYjsYSk0yPwBrkupyYSLpAE26Qc0HLghhZNGTZg/SKxXIIgoxOpmmeQP0RRSDJTk1/vPfw9tbw+jSQ==} + '@shikijs/types@4.0.0': + resolution: {integrity: sha512-LCnfBTtQKNtJyc1qMShZr2dJt1uxNI6pI0/YTc2DSNET91aUvnMGHUHsucVCC5AJVcv5XyBqk2NgYRwd20EjbA==} + engines: {node: '>=20'} '@shikijs/vscode-textmate@10.0.2': resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==} @@ -14649,8 +14661,9 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - shiki@3.23.0: - resolution: {integrity: sha512-55Dj73uq9ZXL5zyeRPzHQsK7Nbyt6Y10k5s7OjuFZGMhpp4r/rsLBH0o/0fstIzX1Lep9VxefWljK/SKCzygIA==} + shiki@4.0.0: + resolution: {integrity: sha512-rjKoiw30ZaFsM0xnPPwxco/Jftz/XXqZkcQZBTX4LGheDw8gCDEH87jdgaKDEG3FZO2bFOK27+sR/sDHhbBXfg==} + engines: {node: '>=20'} side-channel-list@1.0.0: resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==} @@ -18805,51 +18818,58 @@ snapshots: '@secretlint/types@10.2.2': {} - '@shikijs/core@3.23.0': + '@shikijs/core@4.0.0': dependencies: - '@shikijs/types': 3.23.0 + '@shikijs/primitive': 4.0.0 + '@shikijs/types': 4.0.0 '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.4 hast-util-to-html: 9.0.5 - '@shikijs/engine-javascript@3.23.0': + '@shikijs/engine-javascript@4.0.0': dependencies: - '@shikijs/types': 3.23.0 + '@shikijs/types': 4.0.0 '@shikijs/vscode-textmate': 10.0.2 oniguruma-to-es: 4.3.4 - '@shikijs/engine-oniguruma@3.23.0': + '@shikijs/engine-oniguruma@4.0.0': dependencies: - '@shikijs/types': 3.23.0 + '@shikijs/types': 4.0.0 '@shikijs/vscode-textmate': 10.0.2 - '@shikijs/langs@3.23.0': + '@shikijs/langs@4.0.0': + dependencies: + '@shikijs/types': 4.0.0 + + '@shikijs/primitive@4.0.0': dependencies: - '@shikijs/types': 3.23.0 + '@shikijs/types': 4.0.0 + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 - '@shikijs/rehype@3.23.0': + '@shikijs/rehype@4.0.0': dependencies: - '@shikijs/types': 3.23.0 + '@shikijs/types': 4.0.0 '@types/hast': 3.0.4 hast-util-to-string: 3.0.1 - shiki: 3.23.0 + shiki: 4.0.0 unified: 11.0.5 unist-util-visit: 5.1.0 - '@shikijs/themes@3.23.0': + '@shikijs/themes@4.0.0': dependencies: - '@shikijs/types': 3.23.0 + '@shikijs/types': 4.0.0 - '@shikijs/twoslash@3.23.0(typescript@5.9.3)': + '@shikijs/twoslash@4.0.0(typescript@5.9.3)': dependencies: - '@shikijs/core': 3.23.0 - '@shikijs/types': 3.23.0 + '@shikijs/core': 4.0.0 + '@shikijs/types': 4.0.0 twoslash: 0.3.6(typescript@5.9.3) typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@shikijs/types@3.23.0': + '@shikijs/types@4.0.0': dependencies: '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.4 @@ -24228,13 +24248,13 @@ snapshots: hast-util-from-html: 2.0.3 unified: 11.0.5 - rehype-pretty-code@0.14.1(shiki@3.23.0): + rehype-pretty-code@0.14.1(shiki@4.0.0): dependencies: '@types/hast': 3.0.4 hast-util-to-string: 3.0.1 parse-numeric-range: 1.3.0 rehype-parse: 9.0.1 - shiki: 3.23.0 + shiki: 4.0.0 unified: 11.0.5 unist-util-visit: 5.1.0 @@ -24625,14 +24645,14 @@ snapshots: shebang-regex@3.0.0: {} - shiki@3.23.0: + shiki@4.0.0: dependencies: - '@shikijs/core': 3.23.0 - '@shikijs/engine-javascript': 3.23.0 - '@shikijs/engine-oniguruma': 3.23.0 - '@shikijs/langs': 3.23.0 - '@shikijs/themes': 3.23.0 - '@shikijs/types': 3.23.0 + '@shikijs/core': 4.0.0 + '@shikijs/engine-javascript': 4.0.0 + '@shikijs/engine-oniguruma': 4.0.0 + '@shikijs/langs': 4.0.0 + '@shikijs/themes': 4.0.0 + '@shikijs/types': 4.0.0 '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.4