From 7f4d6252a0b406cade227585cfff7ec028a6c99b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Feb 2025 10:18:26 +0000 Subject: [PATCH] Update shiki monorepo to v3 --- apps/docs/package.json | 6 +- packages/core/package.json | 6 +- packages/openapi/package.json | 2 +- packages/twoslash/package.json | 6 +- packages/typescript/package.json | 2 +- pnpm-lock.yaml | 154 ++++++++++++++++++++++--------- 6 files changed, 120 insertions(+), 56 deletions(-) diff --git a/apps/docs/package.json b/apps/docs/package.json index a0f019efc..08c645ebd 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -20,8 +20,8 @@ "@radix-ui/react-popover": "^1.1.6", "@radix-ui/react-slot": "^1.1.2", "@radix-ui/react-tooltip": "^1.1.8", - "@shikijs/rehype": "^2.4.1", - "@shikijs/twoslash": "^2.4.1", + "@shikijs/rehype": "^3.0.0", + "@shikijs/twoslash": "^3.0.0", "@theguild/remark-mermaid": "^0.2.0", "class-variance-authority": "^0.7.1", "fumadocs-core": "workspace:*", @@ -48,7 +48,7 @@ "remark-rehype": "^11.1.1", "remark-stringify": "^11.0.0", "scroll-into-view-if-needed": "^3.1.0", - "shiki": "^2.4.1", + "shiki": "^3.0.0", "tailwind-merge": "^3.0.1", "zod": "^3.24.2" }, diff --git a/packages/core/package.json b/packages/core/package.json index 62ff35f2e..c486c458f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -90,8 +90,8 @@ "dependencies": { "@formatjs/intl-localematcher": "^0.6.0", "@orama/orama": "^2.1.1", - "@shikijs/rehype": "^2.4.1", - "@shikijs/transformers": "^2.4.1", + "@shikijs/rehype": "^3.0.0", + "@shikijs/transformers": "^3.0.0", "github-slugger": "^2.0.0", "hast-util-to-estree": "^3.1.1", "hast-util-to-jsx-runtime": "^2.3.2", @@ -101,7 +101,7 @@ "remark": "^15.0.0", "remark-gfm": "^4.0.1", "scroll-into-view-if-needed": "^3.1.0", - "shiki": "^2.4.1", + "shiki": "^3.0.0", "unist-util-visit": "^5.0.0" }, "devDependencies": { diff --git a/packages/openapi/package.json b/packages/openapi/package.json index e8e5b8ada..c851b02bd 100644 --- a/packages/openapi/package.json +++ b/packages/openapi/package.json @@ -64,7 +64,7 @@ "react-hook-form": "^7.54.2", "remark": "^15.0.1", "remark-rehype": "^11.1.1", - "shiki": "^2.4.1", + "shiki": "^3.0.0", "xml-js": "^1.6.11" }, "devDependencies": { diff --git a/packages/twoslash/package.json b/packages/twoslash/package.json index 19e94f4d3..169bcb403 100644 --- a/packages/twoslash/package.json +++ b/packages/twoslash/package.json @@ -37,7 +37,7 @@ }, "dependencies": { "@radix-ui/react-popover": "^1.1.6", - "@shikijs/twoslash": "^2.4.1", + "@shikijs/twoslash": "^3.0.0", "mdast-util-from-markdown": "^2.0.2", "mdast-util-gfm": "^3.1.0", "mdast-util-to-hast": "^13.2.0", @@ -50,13 +50,13 @@ "@types/react": "^19.0.9", "eslint-config-custom": "workspace:*", "fumadocs-ui": "workspace:*", - "shiki": "^2.4.1", + "shiki": "^3.0.0", "tsconfig": "workspace:*" }, "peerDependencies": { "fumadocs-ui": "^15.0.0", "react": "18.x.x || 19.x.x", - "shiki": "1.x.x || 2.x.x" + "shiki": "3.x" }, "publishConfig": { "access": "public" diff --git a/packages/typescript/package.json b/packages/typescript/package.json index f029e4202..7b9fd645c 100644 --- a/packages/typescript/package.json +++ b/packages/typescript/package.json @@ -40,7 +40,7 @@ "mdast-util-from-markdown": "^2.0.2", "mdast-util-gfm": "^3.1.0", "mdast-util-to-hast": "^13.2.0", - "shiki": "^2.4.1", + "shiki": "^3.0.0", "ts-morph": "^25.0.1" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0e54ae7f3..66c875c7d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,7 +40,7 @@ importers: version: 6.0.1 tsup: specifier: 8.3.6 - version: 8.3.6(@swc/core@1.10.16)(jiti@2.4.2)(postcss@8.5.2)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) + version: 8.3.6(@swc/core@1.10.16(@swc/helpers@0.5.15))(jiti@2.4.2)(postcss@8.5.2)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0) turbo: specifier: 2.4.2 version: 2.4.2 @@ -81,11 +81,11 @@ importers: specifier: ^1.1.8 version: 1.1.8(@types/react-dom@19.0.3(@types/react@19.0.9))(@types/react@19.0.9)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@shikijs/rehype': - specifier: ^2.4.1 - version: 2.4.1 + specifier: ^3.0.0 + version: 3.0.0 '@shikijs/twoslash': - specifier: ^2.4.1 - version: 2.4.1(typescript@5.7.3) + specifier: ^3.0.0 + version: 3.0.0(typescript@5.7.3) '@theguild/remark-mermaid': specifier: ^0.2.0 version: 0.2.0(react@19.0.0) @@ -165,8 +165,8 @@ importers: specifier: ^3.1.0 version: 3.1.0 shiki: - specifier: ^2.4.1 - version: 2.4.1 + specifier: ^3.0.0 + version: 3.0.0 tailwind-merge: specifier: ^3.0.1 version: 3.0.1 @@ -532,11 +532,11 @@ importers: specifier: ^2.1.1 version: 2.1.1 '@shikijs/rehype': - specifier: ^2.4.1 - version: 2.4.1 + specifier: ^3.0.0 + version: 3.0.0 '@shikijs/transformers': - specifier: ^2.4.1 - version: 2.4.1 + specifier: ^3.0.0 + version: 3.0.0 github-slugger: specifier: ^2.0.0 version: 2.0.0 @@ -571,8 +571,8 @@ importers: specifier: ^3.1.0 version: 3.1.0 shiki: - specifier: ^2.4.1 - version: 2.4.1 + specifier: ^3.0.0 + version: 3.0.0 unist-util-visit: specifier: ^5.0.0 version: 5.0.0 @@ -851,7 +851,7 @@ importers: version: 6.0.3 webpack: specifier: ^5.97.1 - version: 5.97.1(@swc/core@1.10.16)(esbuild@0.25.0) + version: 5.97.1(@swc/core@1.10.16(@swc/helpers@0.5.15))(esbuild@0.25.0) packages/mdx-remote: dependencies: @@ -962,8 +962,8 @@ importers: specifier: ^11.1.1 version: 11.1.1 shiki: - specifier: ^2.4.1 - version: 2.4.1 + specifier: ^3.0.0 + version: 3.0.0 xml-js: specifier: ^1.6.11 version: 1.6.11 @@ -1010,8 +1010,8 @@ importers: specifier: ^1.1.6 version: 1.1.6(@types/react-dom@19.0.3(@types/react@19.0.9))(@types/react@19.0.9)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@shikijs/twoslash': - specifier: ^2.4.1 - version: 2.4.1(typescript@5.7.3) + specifier: ^3.0.0 + version: 3.0.0(typescript@5.7.3) mdast-util-from-markdown: specifier: ^2.0.2 version: 2.0.2 @@ -1047,8 +1047,8 @@ importers: specifier: workspace:* version: link:../ui shiki: - specifier: ^2.4.1 - version: 2.4.1 + specifier: ^3.0.0 + version: 3.0.0 tsconfig: specifier: workspace:* version: link:../tsconfig @@ -1071,8 +1071,8 @@ importers: specifier: ^13.2.0 version: 13.2.0 shiki: - specifier: ^2.4.1 - version: 2.4.1 + specifier: ^3.0.0 + version: 3.0.0 ts-morph: specifier: ^25.0.1 version: 25.0.1 @@ -3128,30 +3128,48 @@ packages: '@shikijs/core@2.4.1': resolution: {integrity: sha512-c7AkRsCpSVjKHsTwuvRVMEAdADq4Z1KoodcS4LaIqMzBTM0+Q572VRk1PIxtzaMtdiHlRPO6mH5iPdJoTV59mQ==} + '@shikijs/core@3.0.0': + resolution: {integrity: sha512-gSm3JQf2J2psiUn5bWokmZwnu5N0jfBtRps4CQ1B+qrFvmZCRAkMVoaxgl9qZgAFK5KisLAS3//XaMFVytYHKw==} + '@shikijs/engine-javascript@2.4.1': resolution: {integrity: sha512-2DnVilsUCgA81lnxt67dEZf2C6hdRzDYIs7yG33yWQIjljAxlXi3MKt7n0BXKr6uT5sZ0JdtX/+Pq2FN31YVdQ==} + '@shikijs/engine-javascript@3.0.0': + resolution: {integrity: sha512-zoB10hTfvk1iZk1ldt6VaF+0iucQL+4TtSvTdTu5MhOeLPLEf5nZ8Wz6uxlp99y627OLalYa2z4W0iTTwb6oyA==} + '@shikijs/engine-oniguruma@2.4.1': resolution: {integrity: sha512-PvN76WM2HjmSbNQmLl8Jzm3h8Hsf/g9kKs3jPWKD6uMpCfk+M3HalWONz85zQF4lqrI3lamMTV5pHcOVSswpqg==} + '@shikijs/engine-oniguruma@3.0.0': + resolution: {integrity: sha512-uM9lqwMrlPHPVcdpAN/4pAzTJah1pY7mi9f1MxG887SDkjF/tdiQK+5200Y8N5Hg125sewdMQ1K2agoAo8hDiA==} + '@shikijs/langs@2.4.1': resolution: {integrity: sha512-MLpCfw8gqWAgYvkV4Qsh/yjJirGhqwBQqtNgNrYOES7IoMTsthQ2x/8+JEO1hIDyS3qJPSooxCGQpX7EXsiFpQ==} - '@shikijs/rehype@2.4.1': - resolution: {integrity: sha512-uX7SVftdBk0xijdjyDxJF4ZNxutcpIJpQ3wMUnxlbFCNvSB7CvRiG7wBOVQGUAY8VYMyOyY0il0HSJNjEN0usg==} + '@shikijs/langs@3.0.0': + resolution: {integrity: sha512-HBsZAukiYz7k3hzttPWa0en3PABEwK3cpxcAcERRwvwuKc5pn0Y+yPxAIYZtN9cFdtNqrbFJNhfcEu/xbG1u/A==} + + '@shikijs/rehype@3.0.0': + resolution: {integrity: sha512-cvl6W9rkxM94q1nECj8WTpOjUxZ1BIhuAxiq1V1sqLPWLm7TN6GtNOPT7fhg1fHX6M5fj3fE0LUXELFKC2FRCQ==} '@shikijs/themes@2.4.1': resolution: {integrity: sha512-U+Yt03Qfy9251BjQkPf9IkbiRypCqLcxfeCkk9cjqAuAhgM6G+v8GRHB+7VR1OQu92sWkhmk+zdbJAhgAnnL8g==} - '@shikijs/transformers@2.4.1': - resolution: {integrity: sha512-vTvV4+Fv9LJDWVgB/3o/q7EyYZFiJIEEOsS9KQ/8wyL6jKE+9m0fvuPmpx3SGjmj/MQcqnRBwKaXBW29M5XmLA==} + '@shikijs/themes@3.0.0': + resolution: {integrity: sha512-mz63nyVB5nXWsv5H2hifDFIThZEJ/cJhMq1/+0JjMdOuuBq2H2D1Fn8UM5yzUtEvap/ipRltv381+hsHZFs4ug==} + + '@shikijs/transformers@3.0.0': + resolution: {integrity: sha512-N6iwlPt1IN4oQMdwSqWJhveBjfY2eLBjdmGglPngQ9ML1OPAgCPog0hI1lFPl52Rx7+s7GGuvWsSIu4zCUv2XA==} - '@shikijs/twoslash@2.4.1': - resolution: {integrity: sha512-46upQ065EpircksLAXgALcrlXMtmV3dYrAiGFqbi+3WlhCY6piDF+ZSRQmCRNpdLwbsaTNtll1lDKe32tI2xDA==} + '@shikijs/twoslash@3.0.0': + resolution: {integrity: sha512-Il7XsIzbBLGV67i4yCoBDFvlMOuky1DpMyHgBjNjBu7gEw/DcmpoEEs1MwVH6Lk6fX4wXDhMQ+pDL2EwqzWqdQ==} '@shikijs/types@2.4.1': resolution: {integrity: sha512-fE73tqCjiHIDUq7SYU8i4d9TyOcJh2u2J8aQGqQs0KkFg6FbBEQoDiBASMM5Vxqag1VS58y+MHLBuSQmwtB4Og==} + '@shikijs/types@3.0.0': + resolution: {integrity: sha512-kh/xgZHxI6m9trVvPw+C47jyVHx190r0F5gkF+VO5vYB54UtcoPJe66dzZmK7GbJbzmtGEGbOwct/jsoPjjUqg==} + '@shikijs/vscode-textmate@10.0.2': resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==} @@ -6258,6 +6276,9 @@ packages: shiki@2.4.1: resolution: {integrity: sha512-1MmgQgSSx04OSUPqTg7deJudOL4vXpkNEJHlzKEoVNOLFUmXPB/vRvJoLxzy/Un+UIp4zryXJcWDUAUTOSbDyw==} + shiki@3.0.0: + resolution: {integrity: sha512-x6MMdYN9auPGx7kMFtyKbaj65eCdetfrfkvQZwqisZLnGMnAZsZxOpcWD0ElvLPFWHOSMukVyN9Opm7TxQjnZA==} + side-channel-list@1.0.0: resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==} engines: {node: '>= 0.4'} @@ -8988,27 +9009,49 @@ snapshots: '@types/hast': 3.0.4 hast-util-to-html: 9.0.4 + '@shikijs/core@3.0.0': + dependencies: + '@shikijs/types': 3.0.0 + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 + hast-util-to-html: 9.0.4 + '@shikijs/engine-javascript@2.4.1': dependencies: '@shikijs/types': 2.4.1 '@shikijs/vscode-textmate': 10.0.2 oniguruma-to-es: 3.1.0 + '@shikijs/engine-javascript@3.0.0': + dependencies: + '@shikijs/types': 3.0.0 + '@shikijs/vscode-textmate': 10.0.2 + oniguruma-to-es: 3.1.0 + '@shikijs/engine-oniguruma@2.4.1': dependencies: '@shikijs/types': 2.4.1 '@shikijs/vscode-textmate': 10.0.2 + '@shikijs/engine-oniguruma@3.0.0': + dependencies: + '@shikijs/types': 3.0.0 + '@shikijs/vscode-textmate': 10.0.2 + '@shikijs/langs@2.4.1': dependencies: '@shikijs/types': 2.4.1 - '@shikijs/rehype@2.4.1': + '@shikijs/langs@3.0.0': dependencies: - '@shikijs/types': 2.4.1 + '@shikijs/types': 3.0.0 + + '@shikijs/rehype@3.0.0': + dependencies: + '@shikijs/types': 3.0.0 '@types/hast': 3.0.4 hast-util-to-string: 3.0.1 - shiki: 2.4.1 + shiki: 3.0.0 unified: 11.0.5 unist-util-visit: 5.0.0 @@ -9016,15 +9059,19 @@ snapshots: dependencies: '@shikijs/types': 2.4.1 - '@shikijs/transformers@2.4.1': + '@shikijs/themes@3.0.0': dependencies: - '@shikijs/core': 2.4.1 - '@shikijs/types': 2.4.1 + '@shikijs/types': 3.0.0 - '@shikijs/twoslash@2.4.1(typescript@5.7.3)': + '@shikijs/transformers@3.0.0': dependencies: - '@shikijs/core': 2.4.1 - '@shikijs/types': 2.4.1 + '@shikijs/core': 3.0.0 + '@shikijs/types': 3.0.0 + + '@shikijs/twoslash@3.0.0(typescript@5.7.3)': + dependencies: + '@shikijs/core': 3.0.0 + '@shikijs/types': 3.0.0 twoslash: 0.2.12(typescript@5.7.3) transitivePeerDependencies: - supports-color @@ -9035,6 +9082,11 @@ snapshots: '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.4 + '@shikijs/types@3.0.0': + dependencies: + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 + '@shikijs/vscode-textmate@10.0.2': {} '@sindresorhus/merge-streams@4.0.0': {} @@ -9071,7 +9123,7 @@ snapshots: '@swc/core-win32-x64-msvc@1.10.16': optional: true - '@swc/core@1.10.16': + '@swc/core@1.10.16(@swc/helpers@0.5.15)': dependencies: '@swc/counter': 0.1.3 '@swc/types': 0.1.17 @@ -9086,6 +9138,7 @@ snapshots: '@swc/core-win32-arm64-msvc': 1.10.16 '@swc/core-win32-ia32-msvc': 1.10.16 '@swc/core-win32-x64-msvc': 1.10.16 + '@swc/helpers': 0.5.15 optional: true '@swc/counter@0.1.3': {} @@ -13022,6 +13075,17 @@ snapshots: '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.4 + shiki@3.0.0: + dependencies: + '@shikijs/core': 3.0.0 + '@shikijs/engine-javascript': 3.0.0 + '@shikijs/engine-oniguruma': 3.0.0 + '@shikijs/langs': 3.0.0 + '@shikijs/themes': 3.0.0 + '@shikijs/types': 3.0.0 + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 + side-channel-list@1.0.0: dependencies: es-errors: 1.3.0 @@ -13233,16 +13297,16 @@ snapshots: term-size@2.2.1: {} - terser-webpack-plugin@5.3.10(@swc/core@1.10.16)(esbuild@0.25.0)(webpack@5.97.1(@swc/core@1.10.16)(esbuild@0.25.0)): + terser-webpack-plugin@5.3.10(@swc/core@1.10.16(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack@5.97.1(@swc/core@1.10.16(@swc/helpers@0.5.15))(esbuild@0.25.0)): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 3.3.0 serialize-javascript: 6.0.2 terser: 5.39.0 - webpack: 5.97.1(@swc/core@1.10.16)(esbuild@0.25.0) + webpack: 5.97.1(@swc/core@1.10.16(@swc/helpers@0.5.15))(esbuild@0.25.0) optionalDependencies: - '@swc/core': 1.10.16 + '@swc/core': 1.10.16(@swc/helpers@0.5.15) esbuild: 0.25.0 terser@5.39.0: @@ -13327,7 +13391,7 @@ snapshots: tslib@2.8.1: {} - tsup@8.3.6(@swc/core@1.10.16)(jiti@2.4.2)(postcss@8.5.2)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0): + tsup@8.3.6(@swc/core@1.10.16(@swc/helpers@0.5.15))(jiti@2.4.2)(postcss@8.5.2)(tsx@4.19.2)(typescript@5.7.3)(yaml@2.7.0): dependencies: bundle-require: 5.1.0(esbuild@0.24.2) cac: 6.7.14 @@ -13346,7 +13410,7 @@ snapshots: tinyglobby: 0.2.10 tree-kill: 1.2.2 optionalDependencies: - '@swc/core': 1.10.16 + '@swc/core': 1.10.16(@swc/helpers@0.5.15) postcss: 8.5.2 typescript: 5.7.3 transitivePeerDependencies: @@ -13703,7 +13767,7 @@ snapshots: webpack-sources@3.2.3: {} - webpack@5.97.1(@swc/core@1.10.16)(esbuild@0.25.0): + webpack@5.97.1(@swc/core@1.10.16(@swc/helpers@0.5.15))(esbuild@0.25.0): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.6 @@ -13725,7 +13789,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.10(@swc/core@1.10.16)(esbuild@0.25.0)(webpack@5.97.1(@swc/core@1.10.16)(esbuild@0.25.0)) + terser-webpack-plugin: 5.3.10(@swc/core@1.10.16(@swc/helpers@0.5.15))(esbuild@0.25.0)(webpack@5.97.1(@swc/core@1.10.16(@swc/helpers@0.5.15))(esbuild@0.25.0)) watchpack: 2.4.2 webpack-sources: 3.2.3 transitivePeerDependencies: