From 9a8fea1d7883d374fcf67b87ba8c9f39568bde8e Mon Sep 17 00:00:00 2001 From: Nick the Sick Date: Fri, 12 Dec 2025 08:57:01 +0100 Subject: [PATCH] fix: relax shiki package requirements #2279 --- docs/package.json | 10 +- .../07-custom-code-block/.bnexample.json | 10 +- .../07-custom-code-block/package.json | 10 +- packages/code-block/package.json | 12 +- packages/core/package.json | 6 +- playground/src/examples.gen.tsx | 10 +- pnpm-lock.yaml | 164 ++++++++++++------ 7 files changed, 136 insertions(+), 86 deletions(-) diff --git a/docs/package.json b/docs/package.json index 86632cac88..51290a6cc4 100644 --- a/docs/package.json +++ b/docs/package.json @@ -51,11 +51,11 @@ "@react-email/render": "^1.1.2", "@react-pdf/renderer": "^4.3.0", "@sentry/nextjs": "9.14.0", - "@shikijs/core": "^3.2.1", - "@shikijs/engine-javascript": "^3.2.1", - "@shikijs/langs-precompiled": "^3.2.1", - "@shikijs/themes": "^3.2.1", - "@shikijs/types": "^3.2.1", + "@shikijs/core": "^3.19.0", + "@shikijs/engine-javascript": "^3.19.0", + "@shikijs/langs-precompiled": "^3.19.0", + "@shikijs/themes": "^3.19.0", + "@shikijs/types": "^3.19.0", "@tiptap/core": "^3.13.0", "@uppy/core": "^3.13.1", "@uppy/dashboard": "^3.9.1", diff --git a/examples/04-theming/07-custom-code-block/.bnexample.json b/examples/04-theming/07-custom-code-block/.bnexample.json index 409f131962..5776d2de67 100644 --- a/examples/04-theming/07-custom-code-block/.bnexample.json +++ b/examples/04-theming/07-custom-code-block/.bnexample.json @@ -5,10 +5,10 @@ "tags": ["Basic"], "dependencies": { "@blocknote/code-block": "latest", - "@shikijs/types": "^3.2.1", - "@shikijs/core": "^3.2.1", - "@shikijs/engine-javascript": "^3.2.1", - "@shikijs/langs-precompiled": "^3.2.1", - "@shikijs/themes": "^3.2.1" + "@shikijs/core": "^3.19.0", + "@shikijs/engine-javascript": "^3.19.0", + "@shikijs/langs-precompiled": "^3.19.0", + "@shikijs/themes": "^3.19.0", + "@shikijs/types": "^3.19.0" } } diff --git a/examples/04-theming/07-custom-code-block/package.json b/examples/04-theming/07-custom-code-block/package.json index d96fb34aa3..3d7cd68702 100644 --- a/examples/04-theming/07-custom-code-block/package.json +++ b/examples/04-theming/07-custom-code-block/package.json @@ -22,11 +22,11 @@ "react": "^19.2.1", "react-dom": "^19.2.1", "@blocknote/code-block": "latest", - "@shikijs/types": "^3.2.1", - "@shikijs/core": "^3.2.1", - "@shikijs/engine-javascript": "^3.2.1", - "@shikijs/langs-precompiled": "^3.2.1", - "@shikijs/themes": "^3.2.1" + "@shikijs/core": "^3.19.0", + "@shikijs/engine-javascript": "^3.19.0", + "@shikijs/langs-precompiled": "^3.19.0", + "@shikijs/themes": "^3.19.0", + "@shikijs/types": "^3.19.0" }, "devDependencies": { "@types/react": "^19.2.2", diff --git a/packages/code-block/package.json b/packages/code-block/package.json index bdb85bb484..78be3f0a65 100644 --- a/packages/code-block/package.json +++ b/packages/code-block/package.json @@ -50,12 +50,12 @@ }, "dependencies": { "@blocknote/core": "0.44.2", - "@shikijs/core": "^3.13.0", - "@shikijs/engine-javascript": "^3.13.0", - "@shikijs/langs": "^3.13.0", - "@shikijs/langs-precompiled": "^3.13.0", - "@shikijs/themes": "^3.13.0", - "@shikijs/types": "^3.13.0" + "@shikijs/core": "^3", + "@shikijs/engine-javascript": "^3", + "@shikijs/langs": "^3", + "@shikijs/langs-precompiled": "^3", + "@shikijs/themes": "^3", + "@shikijs/types": "^3" }, "devDependencies": { "eslint": "^8.57.1", diff --git a/packages/core/package.json b/packages/core/package.json index 17abcd8876..0209577129 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -90,9 +90,9 @@ }, "dependencies": { "@emoji-mart/data": "^1.2.1", - "@handlewithcare/prosemirror-inputrules": "0.1.3", - "@shikijs/types": "3.13.0", - "@tanstack/store": "0.7.7", + "@handlewithcare/prosemirror-inputrules": "^0.1.3", + "@shikijs/types": "^3", + "@tanstack/store": "^0.7.7", "@tiptap/core": "^3.13.0", "@tiptap/extension-bold": "^3.13.0", "@tiptap/extension-code": "^3.13.0", diff --git a/playground/src/examples.gen.tsx b/playground/src/examples.gen.tsx index 23b527f751..67236495e5 100644 --- a/playground/src/examples.gen.tsx +++ b/playground/src/examples.gen.tsx @@ -958,11 +958,11 @@ ], "dependencies": { "@blocknote/code-block": "latest", - "@shikijs/types": "^3.2.1", - "@shikijs/core": "^3.2.1", - "@shikijs/engine-javascript": "^3.2.1", - "@shikijs/langs-precompiled": "^3.2.1", - "@shikijs/themes": "^3.2.1" + "@shikijs/core": "^3.19.0", + "@shikijs/engine-javascript": "^3.19.0", + "@shikijs/langs-precompiled": "^3.19.0", + "@shikijs/themes": "^3.19.0", + "@shikijs/types": "^3.19.0" } as any }, "title": "Custom Code Block Theme & Language", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e9e4203128..34715c6d01 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -173,20 +173,20 @@ importers: specifier: 9.14.0 version: 9.14.0(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(encoding@0.1.13)(next@15.5.9(@babel/core@7.28.4)(@opentelemetry/api@1.9.0)(@playwright/test@1.51.1)(babel-plugin-react-compiler@19.1.0-rc.2)(react-dom@19.2.1(react@19.2.1))(react@19.2.1))(react@19.2.1)(webpack@5.98.0) '@shikijs/core': - specifier: ^3.2.1 - version: 3.13.0 + specifier: ^3.19.0 + version: 3.19.0 '@shikijs/engine-javascript': - specifier: ^3.2.1 - version: 3.13.0 + specifier: ^3.19.0 + version: 3.19.0 '@shikijs/langs-precompiled': - specifier: ^3.2.1 - version: 3.13.0 + specifier: ^3.19.0 + version: 3.19.0 '@shikijs/themes': - specifier: ^3.2.1 - version: 3.13.0 + specifier: ^3.19.0 + version: 3.19.0 '@shikijs/types': - specifier: ^3.2.1 - version: 3.13.0 + specifier: ^3.19.0 + version: 3.19.0 '@tiptap/core': specifier: ^3.0.0 version: 3.13.0(@tiptap/pm@3.13.0) @@ -2488,20 +2488,20 @@ importers: specifier: ^6.0.22 version: 6.0.22(react@19.2.1) '@shikijs/core': - specifier: ^3.2.1 - version: 3.13.0 + specifier: ^3.19.0 + version: 3.19.0 '@shikijs/engine-javascript': - specifier: ^3.2.1 - version: 3.13.0 + specifier: ^3.19.0 + version: 3.19.0 '@shikijs/langs-precompiled': - specifier: ^3.2.1 - version: 3.13.0 + specifier: ^3.19.0 + version: 3.19.0 '@shikijs/themes': - specifier: ^3.2.1 - version: 3.13.0 + specifier: ^3.19.0 + version: 3.19.0 '@shikijs/types': - specifier: ^3.2.1 - version: 3.13.0 + specifier: ^3.19.0 + version: 3.19.0 react: specifier: ^19.2.1 version: 19.2.1 @@ -4478,23 +4478,23 @@ importers: specifier: 0.44.2 version: link:../core '@shikijs/core': - specifier: ^3.13.0 - version: 3.13.0 + specifier: ^3 + version: 3.19.0 '@shikijs/engine-javascript': - specifier: ^3.13.0 - version: 3.13.0 + specifier: ^3 + version: 3.19.0 '@shikijs/langs': - specifier: ^3.13.0 - version: 3.13.0 + specifier: ^3 + version: 3.19.0 '@shikijs/langs-precompiled': - specifier: ^3.13.0 - version: 3.13.0 + specifier: ^3 + version: 3.19.0 '@shikijs/themes': - specifier: ^3.13.0 - version: 3.13.0 + specifier: ^3 + version: 3.19.0 '@shikijs/types': - specifier: ^3.13.0 - version: 3.13.0 + specifier: ^3 + version: 3.19.0 devDependencies: eslint: specifier: ^8.57.1 @@ -4521,16 +4521,16 @@ importers: specifier: ^1.2.1 version: 1.2.1 '@handlewithcare/prosemirror-inputrules': - specifier: 0.1.3 + specifier: ^0.1.3 version: 0.1.3(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-view@1.41.4) '@hocuspocus/provider': specifier: ^2.15.2 || ^3.0.0 version: 2.15.3(y-protocols@1.0.6(yjs@13.6.27))(yjs@13.6.27) '@shikijs/types': - specifier: 3.13.0 - version: 3.13.0 + specifier: ^3 + version: 3.19.0 '@tanstack/store': - specifier: 0.7.7 + specifier: ^0.7.7 version: 0.7.7 '@tiptap/core': specifier: ^3.0.0 @@ -4582,7 +4582,7 @@ importers: version: 1.8.2 prosemirror-highlight: specifier: ^0.13.0 - version: 0.13.0(@shikijs/types@3.13.0)(@types/hast@3.0.4)(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-transform@1.10.5)(prosemirror-view@1.41.4) + version: 0.13.0(@shikijs/types@3.19.0)(@types/hast@3.0.4)(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-transform@1.10.5)(prosemirror-view@1.41.4) prosemirror-model: specifier: ^1.25.4 version: 1.25.4 @@ -9457,25 +9457,37 @@ packages: '@shikijs/core@3.13.0': resolution: {integrity: sha512-3P8rGsg2Eh2qIHekwuQjzWhKI4jV97PhvYjYUzGqjvJfqdQPz+nMlfWahU24GZAyW1FxFI1sYjyhfh5CoLmIUA==} + '@shikijs/core@3.19.0': + resolution: {integrity: sha512-L7SrRibU7ZoYi1/TrZsJOFAnnHyLTE1SwHG1yNWjZIVCqjOEmCSuK2ZO9thnRbJG6TOkPp+Z963JmpCNw5nzvA==} + '@shikijs/engine-javascript@3.13.0': resolution: {integrity: sha512-Ty7xv32XCp8u0eQt8rItpMs6rU9Ki6LJ1dQOW3V/56PKDcpvfHPnYFbsx5FFUP2Yim34m/UkazidamMNVR4vKg==} + '@shikijs/engine-javascript@3.19.0': + resolution: {integrity: sha512-ZfWJNm2VMhKkQIKT9qXbs76RRcT0SF/CAvEz0+RkpUDAoDaCx0uFdCGzSRiD9gSlhm6AHkjdieOBJMaO2eC1rQ==} + '@shikijs/engine-oniguruma@3.13.0': resolution: {integrity: sha512-O42rBGr4UDSlhT2ZFMxqM7QzIU+IcpoTMzb3W7AlziI1ZF7R8eS2M0yt5Ry35nnnTX/LTLXFPUjRFCIW+Operg==} - '@shikijs/langs-precompiled@3.13.0': - resolution: {integrity: sha512-B2xmXar8IdCy2Gf+VtWmcv8tWpfeFPxPP3eKDa13dKshERbxHHVe0gCV+NrlcWbyVxBm22IUqqj7TIewJstNBQ==} + '@shikijs/langs-precompiled@3.19.0': + resolution: {integrity: sha512-aGrlICbUBOK2/HeG6lTUo+wQOvbw0JGUx+qhQLMcZiKTmJzgwLXCsX3rWHFH6gpL2EA/LztpvDwSUpDwwiIo5Q==} engines: {node: '>=20'} '@shikijs/langs@3.13.0': resolution: {integrity: sha512-672c3WAETDYHwrRP0yLy3W1QYB89Hbpj+pO4KhxK6FzIrDI2FoEXNiNCut6BQmEApYLfuYfpgOZaqbY+E9b8wQ==} + '@shikijs/langs@3.19.0': + resolution: {integrity: sha512-dBMFzzg1QiXqCVQ5ONc0z2ebyoi5BKz+MtfByLm0o5/nbUu3Iz8uaTCa5uzGiscQKm7lVShfZHU1+OG3t5hgwg==} + '@shikijs/rehype@3.13.0': resolution: {integrity: sha512-dxvB5gXEpiTI3beGwOPEwxFxQNmUWM4cwOWbvUmL6DnQJGl18/+cCjVHZK2OnasmU0v7SvM39Zh3iliWdwfBDA==} '@shikijs/themes@3.13.0': resolution: {integrity: sha512-Vxw1Nm1/Od8jyA7QuAenaV78BG2nSr3/gCGdBkLpfLscddCkzkL36Q5b67SrLLfvAJTOUzW39x4FHVCFriPVgg==} + '@shikijs/themes@3.19.0': + resolution: {integrity: sha512-H36qw+oh91Y0s6OlFfdSuQ0Ld+5CgB/VE6gNPK+Hk4VRbVG/XQgkjnt4KzfnnoO6tZPtKJKHPjwebOCfjd6F8A==} + '@shikijs/transformers@3.13.0': resolution: {integrity: sha512-833lcuVzcRiG+fXvgslWsM2f4gHpjEgui1ipIknSizRuTgMkNZupiXE5/TVJ6eSYfhNBFhBZKkReKWO2GgYmqA==} @@ -9487,6 +9499,9 @@ packages: '@shikijs/types@3.13.0': resolution: {integrity: sha512-oM9P+NCFri/mmQ8LoFGVfVyemm5Hi27330zuOBp0annwJdKH1kOLndw3zCtAVDehPLg9fKqoEx3Ht/wNZxolfw==} + '@shikijs/types@3.19.0': + resolution: {integrity: sha512-Z2hdeEQlzuntf/BZpFG8a+Fsw9UVXdML7w0o3TgSXV3yNESGon+bs9ITkQb3Ki7zxoXOOu5oJWqZ2uto06V9iQ==} + '@shikijs/vscode-textmate@10.0.2': resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==} @@ -11559,6 +11574,10 @@ packages: resolution: {integrity: sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==} engines: {node: '>=10.13.0'} + enhanced-resolve@5.18.4: + resolution: {integrity: sha512-LgQMM4WXU3QI+SYgEc2liRgznaD5ojbmY3sb8LxyguVkIg5FxdpTkvk72te2R38/TGKxH634oLxXRGY6d7AP+Q==} + engines: {node: '>=10.13.0'} + enquirer@2.3.6: resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==} engines: {node: '>=8.6'} @@ -13651,8 +13670,8 @@ packages: oniguruma-parser@0.12.1: resolution: {integrity: sha512-8Unqkvk1RYc6yq2WBYRj4hdnsAxVze8i7iPfQr8e4uSP3tRv0rpZcbGUDvxfQQcdwHt/e9PrMvGCsa8OqG9X3w==} - oniguruma-to-es@4.3.3: - resolution: {integrity: sha512-rPiZhzC3wXwE59YQMRDodUwwT9FZ9nNBwQQfsd1wfdtlKEyCdRV0avrTcSZ5xlIvGRVPd/cx6ZN45ECmS39xvg==} + oniguruma-to-es@4.3.4: + resolution: {integrity: sha512-3VhUGN3w2eYxnTzHn+ikMI+fp/96KoRSVK9/kMTcFqj1NRDh2IhQCKvYxDnWePKRXY/AqH+Fuiyb7VHSzBjHfA==} open@10.2.0: resolution: {integrity: sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==} @@ -14405,8 +14424,8 @@ packages: regex-utilities@2.3.0: resolution: {integrity: sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==} - regex@6.0.1: - resolution: {integrity: sha512-uorlqlzAKjKQZ5P+kTJr3eeJGSVroLKoHmquUj4zHWuR+hEyNqlXsSKlYYF5F4NI6nl7tWCs0apKJ0lmfsXAPA==} + regex@6.1.0: + resolution: {integrity: sha512-6VwtthbV4o/7+OaAF9I5L5V3llLEsoPyq9P1JVXkedTP33c7MfCG0/5NOPcSJn0TzXcG9YUrR0gQSWioew3LDg==} regexp.prototype.flags@1.5.4: resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==} @@ -15021,8 +15040,8 @@ packages: resolution: {integrity: sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g==} engines: {node: '>=18'} - terser-webpack-plugin@5.3.15: - resolution: {integrity: sha512-PGkOdpRFK+rb1TzVz+msVhw4YMRT9txLF4kRqvJhGhCM324xuR3REBSHALN+l+sAhKUmz0aotnjp5D+P83mLhQ==} + terser-webpack-plugin@5.3.16: + resolution: {integrity: sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q==} engines: {node: '>= 10.13.0'} peerDependencies: '@swc/core': '*' @@ -20291,26 +20310,43 @@ snapshots: '@types/hast': 3.0.4 hast-util-to-html: 9.0.5 + '@shikijs/core@3.19.0': + dependencies: + '@shikijs/types': 3.19.0 + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 + hast-util-to-html: 9.0.5 + '@shikijs/engine-javascript@3.13.0': dependencies: '@shikijs/types': 3.13.0 '@shikijs/vscode-textmate': 10.0.2 - oniguruma-to-es: 4.3.3 + oniguruma-to-es: 4.3.4 + + '@shikijs/engine-javascript@3.19.0': + dependencies: + '@shikijs/types': 3.19.0 + '@shikijs/vscode-textmate': 10.0.2 + oniguruma-to-es: 4.3.4 '@shikijs/engine-oniguruma@3.13.0': dependencies: '@shikijs/types': 3.13.0 '@shikijs/vscode-textmate': 10.0.2 - '@shikijs/langs-precompiled@3.13.0': + '@shikijs/langs-precompiled@3.19.0': dependencies: - '@shikijs/types': 3.13.0 - oniguruma-to-es: 4.3.3 + '@shikijs/types': 3.19.0 + oniguruma-to-es: 4.3.4 '@shikijs/langs@3.13.0': dependencies: '@shikijs/types': 3.13.0 + '@shikijs/langs@3.19.0': + dependencies: + '@shikijs/types': 3.19.0 + '@shikijs/rehype@3.13.0': dependencies: '@shikijs/types': 3.13.0 @@ -20324,6 +20360,10 @@ snapshots: dependencies: '@shikijs/types': 3.13.0 + '@shikijs/themes@3.19.0': + dependencies: + '@shikijs/types': 3.19.0 + '@shikijs/transformers@3.13.0': dependencies: '@shikijs/core': 3.13.0 @@ -20343,6 +20383,11 @@ snapshots: '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.4 + '@shikijs/types@3.19.0': + dependencies: + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 + '@shikijs/vscode-textmate@10.0.2': {} '@shuding/opentype.js@1.4.0-beta.0': @@ -22733,6 +22778,11 @@ snapshots: graceful-fs: 4.2.11 tapable: 2.3.0 + enhanced-resolve@5.18.4: + dependencies: + graceful-fs: 4.2.11 + tapable: 2.3.0 + enquirer@2.3.6: dependencies: ansi-colors: 4.1.3 @@ -25526,10 +25576,10 @@ snapshots: oniguruma-parser@0.12.1: {} - oniguruma-to-es@4.3.3: + oniguruma-to-es@4.3.4: dependencies: oniguruma-parser: 0.12.1 - regex: 6.0.1 + regex: 6.1.0 regex-recursion: 6.0.2 open@10.2.0: @@ -25960,9 +26010,9 @@ snapshots: prosemirror-state: 1.4.4 prosemirror-view: 1.41.4 - prosemirror-highlight@0.13.0(@shikijs/types@3.13.0)(@types/hast@3.0.4)(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-transform@1.10.5)(prosemirror-view@1.41.4): + prosemirror-highlight@0.13.0(@shikijs/types@3.19.0)(@types/hast@3.0.4)(prosemirror-model@1.25.4)(prosemirror-state@1.4.4)(prosemirror-transform@1.10.5)(prosemirror-view@1.41.4): optionalDependencies: - '@shikijs/types': 3.13.0 + '@shikijs/types': 3.19.0 '@types/hast': 3.0.4 prosemirror-model: 1.25.4 prosemirror-state: 1.4.4 @@ -26316,7 +26366,7 @@ snapshots: regex-utilities@2.3.0: {} - regex@6.0.1: + regex@6.1.0: dependencies: regex-utilities: 2.3.0 @@ -27151,7 +27201,7 @@ snapshots: minizlib: 3.1.0 yallist: 5.0.0 - terser-webpack-plugin@5.3.15(webpack@5.98.0): + terser-webpack-plugin@5.3.16(webpack@5.98.0): dependencies: '@jridgewell/trace-mapping': 0.3.31 jest-worker: 27.5.1 @@ -27908,7 +27958,7 @@ snapshots: acorn: 8.15.0 browserslist: 4.28.1 chrome-trace-event: 1.0.4 - enhanced-resolve: 5.18.3 + enhanced-resolve: 5.18.4 es-module-lexer: 1.7.0 eslint-scope: 5.1.1 events: 3.3.0 @@ -27920,7 +27970,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 4.3.3 tapable: 2.3.0 - terser-webpack-plugin: 5.3.15(webpack@5.98.0) + terser-webpack-plugin: 5.3.16(webpack@5.98.0) watchpack: 2.4.4 webpack-sources: 3.3.3 transitivePeerDependencies: