From 327b9ed37f358476d62eee4f646e219aa34a4689 Mon Sep 17 00:00:00 2001 From: _Kerman Date: Sat, 21 Jun 2025 15:14:42 +0800 Subject: [PATCH 01/14] perf/fix(vscode): fix build and publish, reduce extension size --- eslint.config.js | 2 + package.json | 2 +- packages/client/package.json | 1 - packages/vscode/.vscodeignore | 6 +- .../vscode/language-server/import-meta-url.ts | 2 - packages/vscode/package.json | 6 +- packages/vscode/scripts/publish.ts | 16 +- packages/vscode/tsdown.config.ts | 32 +- pnpm-lock.yaml | 282 ++++++------------ pnpm-workspace.yaml | 6 +- taze.config.ts | 2 + 11 files changed, 136 insertions(+), 221 deletions(-) delete mode 100644 packages/vscode/language-server/import-meta-url.ts diff --git a/eslint.config.js b/eslint.config.js index ce935c58b1..59f5dc794b 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -25,5 +25,7 @@ export default antfu({ ignores: [ 'packages/create-theme/template/package.json', 'packages/create-app/template/package.json', + // VSCE and OVSX do not support pnpm catalog when reading `@types/vscode`'s version. + 'packages/vscode/package.json', ], }) diff --git a/package.json b/package.json index 1425434f2b..c0b9db1b39 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "lint-staged": "catalog:dev", "mermaid": "catalog:frontend", "playwright-chromium": "catalog:dev", - "prettier": "catalog:frontend", + "prettier": "catalog:dev", "prettier-plugin-slidev": "catalog:dev", "rimraf": "catalog:dev", "shiki": "catalog:frontend", diff --git a/packages/client/package.json b/packages/client/package.json index 885484d4ff..8daedc3452 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -54,7 +54,6 @@ "monaco-editor": "catalog:monaco", "nanotar": "catalog:frontend", "pptxgenjs": "catalog:prod", - "prettier": "catalog:frontend", "recordrtc": "catalog:frontend", "shiki": "catalog:frontend", "shiki-magic-move": "catalog:frontend", diff --git a/packages/vscode/.vscodeignore b/packages/vscode/.vscodeignore index 612dfb9158..bd104b8c05 100644 --- a/packages/vscode/.vscodeignore +++ b/packages/vscode/.vscodeignore @@ -5,4 +5,8 @@ language-server/** scripts/** src/** tsdown.config.ts -*.map +**/*.map +syntaxes/codeblock-patch.ts +syntaxes/slidev.example.md +syntaxes/tsconfig.json +syntaxes/.vscode diff --git a/packages/vscode/language-server/import-meta-url.ts b/packages/vscode/language-server/import-meta-url.ts deleted file mode 100644 index 18d9319126..0000000000 --- a/packages/vscode/language-server/import-meta-url.ts +++ /dev/null @@ -1,2 +0,0 @@ -// eslint-disable-next-line no-var, ts/no-require-imports, import/no-mutable-exports -export var import_meta_url = require('node:url').pathToFileURL(__filename) diff --git a/packages/vscode/package.json b/packages/vscode/package.json index 2907ef6fd3..99256d33cf 100644 --- a/packages/vscode/package.json +++ b/packages/vscode/package.json @@ -18,7 +18,7 @@ "main": "./dist/index.cjs", "icon": "dist/res/logo.png", "engines": { - "vscode": "^1.89.0" + "vscode": "^1.101.0" }, "activationEvents": [ "onStartupFinished" @@ -449,13 +449,13 @@ "@slidev/parser": "workspace:*", "@slidev/types": "workspace:*", "@types/node": "catalog:types", - "@types/vscode": "catalog:types", + "@types/vscode": "^1.101.0", "@volar/language-server": "catalog:vscode", "@volar/vscode": "catalog:vscode", "get-port-please": "catalog:prod", "mlly": "catalog:prod", "ovsx": "catalog:dev", - "prettier": "catalog:frontend", + "prettier": "catalog:vscode", "reactive-vscode": "catalog:vscode", "tm-grammars": "catalog:frontend", "ts-json-schema-generator": "catalog:vscode", diff --git a/packages/vscode/scripts/publish.ts b/packages/vscode/scripts/publish.ts index 706b5b6ef1..1e1a949380 100644 --- a/packages/vscode/scripts/publish.ts +++ b/packages/vscode/scripts/publish.ts @@ -1,6 +1,6 @@ import fs from 'node:fs/promises' import process from 'node:process' -import { x } from 'tinyexec' +import { type Options, x } from 'tinyexec' async function publish() { const root = new URL('..', import.meta.url) @@ -23,11 +23,19 @@ async function publish() { console.log('Publishing VS Code extension...') - await x('npm', ['run', 'build'], { nodeOptions: { cwd: root, stdio: 'inherit' } }) + const options: Partial = { + nodeOptions: { + cwd: root, + stdio: 'inherit', + }, + throwOnError: true, + } + + await x('npm', ['run', 'build'], options) console.log('\nPublish to VSCE...\n') - await x('npx', ['@vscode/vsce', 'publish', '--no-dependencies', '-p', process.env.VSCE_TOKEN!], { nodeOptions: { cwd: root, stdio: 'inherit' } }) + await x('npx', ['@vscode/vsce', 'publish', '--no-dependencies', '-p', process.env.VSCE_TOKEN!], options) console.log('\nPublish to OVSE...\n') - await x('npx', ['ovsx', 'publish', '--no-dependencies', '-p', process.env.OVSX_TOKEN!], { nodeOptions: { cwd: root, stdio: 'inherit' } }) + await x('npx', ['ovsx', 'publish', '--no-dependencies', '-p', process.env.OVSX_TOKEN!], options) } publish() diff --git a/packages/vscode/tsdown.config.ts b/packages/vscode/tsdown.config.ts index 86c63ac057..b907b9c975 100644 --- a/packages/vscode/tsdown.config.ts +++ b/packages/vscode/tsdown.config.ts @@ -7,40 +7,40 @@ import { defineConfig } from 'tsdown' import { generateCodeblockPatch } from './syntaxes/codeblock-patch.ts' export default defineConfig({ - // @ts-expect-error `entry` is valid option entry: { 'index': 'src/index.ts', 'language-server': 'language-server/bin.ts', }, format: 'cjs', - target: 'node18', + target: 'node20', clean: true, minify: process.env.NODE_ENV === 'production', sourcemap: true, external: [ 'vscode', ], - shims: ['./language-server/import-meta-url.ts'], - define: { - 'import.meta.url': 'import_meta_url', - }, alias: { '@slidev/parser/fs': fileURLToPath(new URL('../parser/src/fs.ts', import.meta.url)), '@slidev/parser/core': fileURLToPath(new URL('../parser/src/core.ts', import.meta.url)), '@slidev/parser/types': fileURLToPath(new URL('../parser/src/types.ts', import.meta.url)), '@slidev/parser': fileURLToPath(new URL('../parser/src/index.ts', import.meta.url)), }, - plugins: [{ - name: 'umd2esm', - setup(build: any) { - build.onResolve({ filter: /^(vscode-.*-languageservice|jsonc-parser)/ }, async (args: any) => { - const pathUmdMay = await resolvePath(args.path, { url: args.resolveDir }) - // Call twice the replace is to solve the problem of the path in Windows - const pathEsm = pathUmdMay.replace('/umd/', '/esm/').replace('\\umd\\', '\\esm\\') - return { path: pathEsm } - }) + plugins: [ + { + name: 'umd2esm', + resolveId: { + filter: { + id: /^(vscode-.*-languageservice|vscode-languageserver-types|jsonc-parser)$/, + }, + async handler(source, importer) { + const pathUmdMay = await resolvePath(source, { url: importer }) + // Call twice the replace is to solve the problem of the path in Windows + const pathEsm = pathUmdMay.replace('/umd/', '/esm/').replace('\\umd\\', '\\esm\\') + return { id: pathEsm } + }, + }, }, - }], + ], async onSuccess() { const assetsDir = join(import.meta.dirname, '../../assets') const resDir = join(import.meta.dirname, './dist/res') diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e3c57b9364..2c2e820dc7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,6 +43,9 @@ catalogs: postcss-nested: specifier: ^7.0.2 version: 7.0.2 + prettier: + specifier: ^3.5.3 + version: 3.5.3 prettier-plugin-slidev: specifier: ^1.0.5 version: 1.0.5 @@ -141,9 +144,6 @@ catalogs: plantuml-encoder: specifier: ^1.4.0 version: 1.4.0 - prettier: - specifier: ^3.5.3 - version: 3.5.3 recordrtc: specifier: ^5.6.2 version: 5.6.2 @@ -404,9 +404,6 @@ catalogs: '@types/semver': specifier: ^7.7.0 version: 7.7.0 - '@types/vscode': - specifier: ^1.89.0 - version: 1.92.0 '@types/yargs': specifier: ^17.0.33 version: 17.0.33 @@ -417,9 +414,12 @@ catalogs: '@volar/vscode': specifier: ^2.4.14 version: 2.4.14 + prettier: + specifier: ^2.8.7 + version: 2.8.7 reactive-vscode: - specifier: ^0.2.19 - version: 0.2.19 + specifier: ^0.3.0 + version: 0.3.0 ts-json-schema-generator: specifier: ^2.4.0 version: 2.4.0 @@ -434,11 +434,6 @@ overrides: typescript: ^5.8.3 vite: ^6.3.5 -patchedDependencies: - '@hedgedoc/markdown-it-plugins@2.1.4': - hash: 49e14003b6caa0b7d164cbe71da573809d375babb2012c0a5ac943573e063c90 - path: patches/@hedgedoc__markdown-it-plugins@2.1.4.patch - importers: .: @@ -534,7 +529,7 @@ importers: specifier: catalog:dev version: 1.53.0 prettier: - specifier: catalog:frontend + specifier: catalog:dev version: 3.5.3 prettier-plugin-slidev: specifier: catalog:dev @@ -809,9 +804,6 @@ importers: pptxgenjs: specifier: catalog:prod version: 4.0.0 - prettier: - specifier: catalog:frontend - version: 3.5.3 recordrtc: specifier: catalog:frontend version: 5.6.2 @@ -1010,7 +1002,7 @@ importers: version: 1.4.0 playwright-chromium: specifier: ^1.10.0 - version: 1.52.0 + version: 1.53.0 postcss-nested: specifier: catalog:dev version: 7.0.2(postcss@8.5.3) @@ -1098,7 +1090,7 @@ importers: devDependencies: '@hedgedoc/markdown-it-plugins': specifier: catalog:prod - version: 2.1.4(patch_hash=49e14003b6caa0b7d164cbe71da573809d375babb2012c0a5ac943573e063c90)(markdown-it@14.1.0) + version: 2.1.4(markdown-it@14.1.0) '@types/picomatch': specifier: catalog:types version: 4.0.0 @@ -1175,8 +1167,8 @@ importers: specifier: catalog:types version: 22.15.31 '@types/vscode': - specifier: catalog:types - version: 1.92.0 + specifier: ^1.101.0 + version: 1.101.0 '@volar/language-server': specifier: catalog:vscode version: 2.4.14 @@ -1193,11 +1185,11 @@ importers: specifier: catalog:dev version: 0.10.4 prettier: - specifier: catalog:frontend - version: 3.5.3 + specifier: catalog:vscode + version: 2.8.7 reactive-vscode: specifier: catalog:vscode - version: 0.2.19(@types/vscode@1.92.0) + version: 0.3.0(@types/vscode@1.101.0) tm-grammars: specifier: catalog:frontend version: 1.23.26 @@ -1206,7 +1198,7 @@ importers: version: 2.4.0 volar-service-prettier: specifier: catalog:vscode - version: 0.0.64(@volar/language-service@2.4.14)(prettier@3.5.3) + version: 0.0.64(@volar/language-service@2.4.14)(prettier@2.8.7) volar-service-yaml: specifier: catalog:vscode version: 0.0.64(@volar/language-service@2.4.14) @@ -1411,10 +1403,6 @@ packages: resolution: {integrity: sha512-IaaGWsQqfsQWVLqMn9OB92MNN7zukfVA4s7KKAI0KfrrDsZ0yhi5uV4baBuLuN7n3vsZpwP8asPPcVwApxvjBQ==} engines: {node: '>=6.9.0'} - '@babel/generator@7.27.3': - resolution: {integrity: sha512-xnlJYj5zepml8NXtjkG0WquFUv8RskFqyFcVgTBp5k+NaA/8uw/K+OSVf8AMGw5e9HKP2ETd5xpK5MLZQD6b4Q==} - engines: {node: '>=6.9.0'} - '@babel/generator@7.27.5': resolution: {integrity: sha512-ZGhA37l0e/g2s1Cnzdix0O3aLYm66eF8aufiVteOgnwxgnRP8GoyMj7VWsgWnQbVKXyge7hqrFh2K2TQM6t1Hw==} engines: {node: '>=6.9.0'} @@ -1481,11 +1469,6 @@ packages: resolution: {integrity: sha512-FCvFTm0sWV8Fxhpp2McP5/W53GPllQ9QeQ7SiqGWjMf/LVG07lFa5+pgK05IRhVwtvafT22KF+ZSnM9I545CvQ==} engines: {node: '>=6.9.0'} - '@babel/parser@7.27.4': - resolution: {integrity: sha512-BRmLHGwpUqLFR2jzx9orBuX/ABDkj2jLKOXrHDTN2aOKL+jFDDKaRNo9nyYsIl9h/UE/7lMKdDjKQQyxKKDZ7g==} - engines: {node: '>=6.0.0'} - hasBin: true - '@babel/parser@7.27.5': resolution: {integrity: sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg==} engines: {node: '>=6.0.0'} @@ -1525,10 +1508,6 @@ packages: resolution: {integrity: sha512-ZCYtZciz1IWJB4U61UPu4KEaqyfj+r5T1Q5mqPo+IBpcG9kHv30Z0aD8LXPgC1trYa6rK0orRyAhqUgk4MjmEg==} engines: {node: '>=6.9.0'} - '@babel/types@7.27.3': - resolution: {integrity: sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw==} - engines: {node: '>=6.9.0'} - '@babel/types@7.27.6': resolution: {integrity: sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q==} engines: {node: '>=6.9.0'} @@ -2078,8 +2057,8 @@ packages: resolution: {integrity: sha512-sx8J1O/+j2lqs8MvsEz6rs/6UAUpCb4fu7C6EqtMqzbS3CmqLkTDTOMK+DrWukvyUuHzl8DhMjfNJzQDTqfGJg==} engines: {node: '>=20.18.0'} - '@reactive-vscode/reactivity@0.2.19': - resolution: {integrity: sha512-b8v4/Q1irXV5xREmsF8w3EpKp+WI/T29+aa74SBNrAnolC3qHslckGvj2/M12b2wcXmlVUVJl5mUHFpxjaAhHA==} + '@reactive-vscode/reactivity@0.3.0': + resolution: {integrity: sha512-eV9JUTqOjNfYp/RjxBuZhjASxego+HiR0Ze2BxWmElTO4aVzlafrOpDF1gHelcypge8xMMzOl0oWM3015UJMcg==} '@rolldown/binding-darwin-arm64@1.0.0-beta.11-commit.f051675': resolution: {integrity: sha512-Hlt/h+lOJ+ksC2wED2M9Hku/9CA2Hr17ENK82gNMmi3OqwcZLdZFqJDpASTli65wIOeT4p9rIUMdkfshCoJpYA==} @@ -2254,6 +2233,9 @@ packages: '@shikijs/core@3.6.0': resolution: {integrity: sha512-9By7Xb3olEX0o6UeJyPLI1PE1scC4d3wcVepvtv2xbuN9/IThYN4Wcwh24rcFeASzPam11MCq8yQpwwzCgSBRw==} + '@shikijs/core@3.7.0': + resolution: {integrity: sha512-yilc0S9HvTPyahHpcum8eonYrQtmGTU0lbtwxhA6jHv4Bm1cAdlPFRCJX4AHebkCm75aKTjjRAW+DezqD1b/cg==} + '@shikijs/engine-javascript@3.6.0': resolution: {integrity: sha512-7YnLhZG/TU05IHMG14QaLvTW/9WiK8SEYafceccHUSXs2Qr5vJibUwsDfXDLmRi0zHdzsxrGKpSX6hnqe0k8nA==} @@ -2285,9 +2267,17 @@ packages: peerDependencies: typescript: ^5.8.3 + '@shikijs/twoslash@3.7.0': + resolution: {integrity: sha512-EjnV193iasm/M5UHVDJg6WyX6dIMCb0YhsKKlgWv3OK7iLFjuW7sUp978ZkO2OIn3niqBT6e+CX1LgoPM8jYjQ==} + peerDependencies: + typescript: ^5.8.3 + '@shikijs/types@3.6.0': resolution: {integrity: sha512-cLWFiToxYu0aAzJqhXTQsFiJRTFDAGl93IrMSBNaGSzs7ixkLfdG6pH11HipuWFGW5vyx4X47W8HDQ7eSrmBUg==} + '@shikijs/types@3.7.0': + resolution: {integrity: sha512-MGaLeaRlSWpnP0XSAum3kP3a8vtcTsITqoEPYdt3lQG3YCdQH4DnEhodkYcNMcU0uW0RffhoD1O3e0vG5eSBBg==} + '@shikijs/vitepress-twoslash@3.6.0': resolution: {integrity: sha512-pUoRj98UDV41CxfxPysrBryc1/1WdUL93ogcD/s156i4XcujnCfJJc+y5vR3W5Nc1R31VUacwWsI8HhaRRS/uA==} @@ -2481,9 +2471,6 @@ packages: '@types/ms@0.7.34': resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==} - '@types/node@22.15.29': - resolution: {integrity: sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==} - '@types/node@22.15.31': resolution: {integrity: sha512-jnVe5ULKl6tijxUhvQeNbQG/84fHfg+yMak02cT8QVhBx/F05rAVxCGBYYTh2EKz22D6JF5ktXuNwdx7b9iEGw==} @@ -2517,8 +2504,8 @@ packages: '@types/unist@3.0.3': resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==} - '@types/vscode@1.92.0': - resolution: {integrity: sha512-DcZoCj17RXlzB4XJ7IfKdPTcTGDLYvTOcTNkvtjXWF+K2TlKzHHkBEXNWQRpBIXixNEUgx39cQeTFunY0E2msw==} + '@types/vscode@1.101.0': + resolution: {integrity: sha512-ZWf0IWa+NGegdW3iU42AcDTFHWW7fApLdkdnBqwYEtHVIBGbTu0ZNQKP/kX3Ds/uMJXIMQNAojHR4vexCEEz5Q==} '@types/web-bluetooth@0.0.21': resolution: {integrity: sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==} @@ -2553,10 +2540,6 @@ packages: peerDependencies: typescript: ^5.8.3 - '@typescript-eslint/scope-manager@8.32.1': - resolution: {integrity: sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/scope-manager@8.34.0': resolution: {integrity: sha512-9Ac0X8WiLykl0aj1oYQNcLZjHgBojT6cW68yAgZ19letYu+Hxd0rE0veI1XznSSst1X5lwnxhPbVdwjDRIomRw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -2574,33 +2557,16 @@ packages: eslint: ^8.57.0 || ^9.0.0 typescript: ^5.8.3 - '@typescript-eslint/types@8.32.1': - resolution: {integrity: sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/types@8.34.0': resolution: {integrity: sha512-9V24k/paICYPniajHfJ4cuAWETnt7Ssy+R0Rbcqo5sSFr3QEZ/8TSoUi9XeXVBGXCaLtwTOKSLGcInCAvyZeMA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.32.1': - resolution: {integrity: sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - typescript: ^5.8.3 - '@typescript-eslint/typescript-estree@8.34.0': resolution: {integrity: sha512-rOi4KZxI7E0+BMqG7emPSK1bB4RICCpF7QD3KCLXn9ZvWoESsOMlHyZPAHyG04ujVplPaHbmEvs34m+wjgtVtg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: ^5.8.3 - '@typescript-eslint/utils@8.32.1': - resolution: {integrity: sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 - typescript: ^5.8.3 - '@typescript-eslint/utils@8.34.0': resolution: {integrity: sha512-8L4tWatGchV9A1cKbjaavS6mwYwp39jql8xUmIIKJdm+qiaeHy5KMKlBrf30akXAWBzn2SqKsNOtSENWUwg7XQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -2608,10 +2574,6 @@ packages: eslint: ^8.57.0 || ^9.0.0 typescript: ^5.8.3 - '@typescript-eslint/visitor-keys@8.32.1': - resolution: {integrity: sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/visitor-keys@8.34.0': resolution: {integrity: sha512-qHV7pW7E85A0x6qyrFn+O+q1k1p3tQCsqIZ1KZ5ESLXY57aTvUd3/a4rdPTeXisvhXn2VQG0VSKUqs8KHF2zcA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -4740,9 +4702,6 @@ packages: js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - js-tokens@9.0.0: - resolution: {integrity: sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==} - js-tokens@9.0.1: resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==} @@ -5624,21 +5583,11 @@ packages: plantuml-encoder@1.4.0: resolution: {integrity: sha512-sxMwpDw/ySY1WB2CE3+IdMuEcWibJ72DDOsXLkSmEaSzwEUaYBT6DWgOfBiHGCux4q433X6+OEFWjlVqp7gL6g==} - playwright-chromium@1.52.0: - resolution: {integrity: sha512-ZTpzBzRFFRglyqRnAqdK5mFaw1P41qe8V2zSR+fA0eKPgGEEaH7r91ejXKijs3WhReatRcatHQe3ndMBMN1PLA==} - engines: {node: '>=18'} - hasBin: true - playwright-chromium@1.53.0: resolution: {integrity: sha512-wFIOWSc3037Ql9swJrfCQL/SfcVXbl8X944CzzQmkvh4KqCNp1QMBOGPfltu/+URTfCa5I9qc6HW1YEgY1jeNA==} engines: {node: '>=18'} hasBin: true - playwright-core@1.52.0: - resolution: {integrity: sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==} - engines: {node: '>=18'} - hasBin: true - playwright-core@1.53.0: resolution: {integrity: sha512-mGLg8m0pm4+mmtB7M89Xw/GSqoNC+twivl8ITteqvAndachozYe2ZA7srU6uleV1vEdAHYqjq+SV8SNxRRFYBw==} engines: {node: '>=18'} @@ -5781,10 +5730,10 @@ packages: resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} hasBin: true - reactive-vscode@0.2.19: - resolution: {integrity: sha512-dqkuhOB0LmiTgODo3Uzn9UgkiuAgFxEdiuwlt6NKyPQWT5hOhfA862BFv4LnZM5fJXNyZ2XQ6INweroc5p8lfw==} + reactive-vscode@0.3.0: + resolution: {integrity: sha512-wV39vjfWl6ezJNwN3ZisskVVjFecDyEa8cCQOmyj2NdczywwAEfXdzTyt8iVlLGKTjaFN8+E/MmPXc2Uva6cgw==} peerDependencies: - '@types/vscode': ^1.89.0 + '@types/vscode': ^1.101.0 read@1.0.7: resolution: {integrity: sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==} @@ -7246,14 +7195,14 @@ snapshots: dependencies: '@ampproject/remapping': 2.3.0 '@babel/code-frame': 7.27.1 - '@babel/generator': 7.27.3 + '@babel/generator': 7.27.5 '@babel/helper-compilation-targets': 7.27.2 '@babel/helper-module-transforms': 7.27.1(@babel/core@7.27.1) '@babel/helpers': 7.27.1 - '@babel/parser': 7.27.4 + '@babel/parser': 7.27.5 '@babel/template': 7.27.2 '@babel/traverse': 7.27.1 - '@babel/types': 7.27.3 + '@babel/types': 7.27.6 convert-source-map: 2.0.0 debug: 4.4.1(supports-color@8.1.1) gensync: 1.0.0-beta.2 @@ -7262,14 +7211,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/generator@7.27.3': - dependencies: - '@babel/parser': 7.27.4 - '@babel/types': 7.27.3 - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 - jsesc: 3.1.0 - '@babel/generator@7.27.5': dependencies: '@babel/parser': 7.27.5 @@ -7280,7 +7221,7 @@ snapshots: '@babel/helper-annotate-as-pure@7.27.1': dependencies: - '@babel/types': 7.27.3 + '@babel/types': 7.27.6 '@babel/helper-compilation-targets@7.27.2': dependencies: @@ -7306,14 +7247,14 @@ snapshots: '@babel/helper-member-expression-to-functions@7.27.1': dependencies: '@babel/traverse': 7.27.1 - '@babel/types': 7.27.3 + '@babel/types': 7.27.6 transitivePeerDependencies: - supports-color '@babel/helper-module-imports@7.27.1': dependencies: '@babel/traverse': 7.27.1 - '@babel/types': 7.27.3 + '@babel/types': 7.27.6 transitivePeerDependencies: - supports-color @@ -7328,7 +7269,7 @@ snapshots: '@babel/helper-optimise-call-expression@7.27.1': dependencies: - '@babel/types': 7.27.3 + '@babel/types': 7.27.6 '@babel/helper-plugin-utils@7.27.1': {} @@ -7344,7 +7285,7 @@ snapshots: '@babel/helper-skip-transparent-expression-wrappers@7.27.1': dependencies: '@babel/traverse': 7.27.1 - '@babel/types': 7.27.3 + '@babel/types': 7.27.6 transitivePeerDependencies: - supports-color @@ -7357,11 +7298,7 @@ snapshots: '@babel/helpers@7.27.1': dependencies: '@babel/template': 7.27.2 - '@babel/types': 7.27.3 - - '@babel/parser@7.27.4': - dependencies: - '@babel/types': 7.27.3 + '@babel/types': 7.27.6 '@babel/parser@7.27.5': dependencies: @@ -7396,26 +7333,21 @@ snapshots: '@babel/template@7.27.2': dependencies: '@babel/code-frame': 7.27.1 - '@babel/parser': 7.27.4 - '@babel/types': 7.27.3 + '@babel/parser': 7.27.5 + '@babel/types': 7.27.6 '@babel/traverse@7.27.1': dependencies: '@babel/code-frame': 7.27.1 - '@babel/generator': 7.27.3 - '@babel/parser': 7.27.4 + '@babel/generator': 7.27.5 + '@babel/parser': 7.27.5 '@babel/template': 7.27.2 - '@babel/types': 7.27.3 + '@babel/types': 7.27.6 debug: 4.4.1(supports-color@8.1.1) globals: 11.12.0 transitivePeerDependencies: - supports-color - '@babel/types@7.27.3': - dependencies: - '@babel/helper-string-parser': 7.27.1 - '@babel/helper-validator-identifier': 7.27.1 - '@babel/types@7.27.6': dependencies: '@babel/helper-string-parser': 7.27.1 @@ -7530,7 +7462,7 @@ snapshots: '@es-joy/jsdoccomment@0.50.2': dependencies: '@types/estree': 1.0.6 - '@typescript-eslint/types': 8.32.1 + '@typescript-eslint/types': 8.34.0 comment-parser: 1.4.1 esquery: 1.6.0 jsdoc-type-pratt-parser: 4.1.0 @@ -7695,7 +7627,7 @@ snapshots: '@floating-ui/utils@0.2.7': {} - '@hedgedoc/markdown-it-plugins@2.1.4(patch_hash=49e14003b6caa0b7d164cbe71da573809d375babb2012c0a5ac943573e063c90)(markdown-it@14.1.0)': + '@hedgedoc/markdown-it-plugins@2.1.4(markdown-it@14.1.0)': dependencies: '@mrdrogdrog/optional': 1.2.1 html-entities: 2.5.2 @@ -7971,7 +7903,7 @@ snapshots: dependencies: quansync: 0.2.8 - '@reactive-vscode/reactivity@0.2.19': {} + '@reactive-vscode/reactivity@0.3.0': {} '@rolldown/binding-darwin-arm64@1.0.0-beta.11-commit.f051675': optional: true @@ -8088,6 +8020,13 @@ snapshots: '@types/hast': 3.0.4 hast-util-to-html: 9.0.5 + '@shikijs/core@3.7.0': + dependencies: + '@shikijs/types': 3.7.0 + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 + hast-util-to-html: 9.0.5 + '@shikijs/engine-javascript@3.6.0': dependencies: '@shikijs/types': 3.6.0 @@ -8132,14 +8071,28 @@ snapshots: transitivePeerDependencies: - supports-color + '@shikijs/twoslash@3.7.0(typescript@5.8.3)': + dependencies: + '@shikijs/core': 3.7.0 + '@shikijs/types': 3.7.0 + twoslash: 0.3.1(typescript@5.8.3) + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color + '@shikijs/types@3.6.0': dependencies: '@shikijs/vscode-textmate': 10.0.2 '@types/hast': 3.0.4 + '@shikijs/types@3.7.0': + dependencies: + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 + '@shikijs/vitepress-twoslash@3.6.0(@nuxt/kit@3.13.0(rollup@4.35.0))(typescript@5.8.3)': dependencies: - '@shikijs/twoslash': 3.6.0(typescript@5.8.3) + '@shikijs/twoslash': 3.7.0(typescript@5.8.3) floating-vue: 5.2.2(@nuxt/kit@3.13.0(rollup@4.35.0))(vue@3.5.16(typescript@5.8.3)) mdast-util-from-markdown: 2.0.2 mdast-util-gfm: 3.1.0 @@ -8185,7 +8138,7 @@ snapshots: '@stylistic/eslint-plugin@5.0.0-beta.3(eslint@9.28.0(jiti@2.4.2))(typescript@5.8.3)': dependencies: - '@typescript-eslint/utils': 8.32.1(eslint@9.28.0(jiti@2.4.2))(typescript@5.8.3) + '@typescript-eslint/utils': 8.34.0(eslint@9.28.0(jiti@2.4.2))(typescript@5.8.3) eslint: 9.28.0(jiti@2.4.2) eslint-visitor-keys: 4.2.0 espree: 10.3.0 @@ -8372,10 +8325,6 @@ snapshots: '@types/ms@0.7.34': {} - '@types/node@22.15.29': - dependencies: - undici-types: 6.21.0 - '@types/node@22.15.31': dependencies: undici-types: 6.21.0 @@ -8384,7 +8333,7 @@ snapshots: '@types/plantuml-encoder@1.4.2': dependencies: - '@types/node': 22.15.29 + '@types/node': 22.15.31 '@types/prompts@2.4.9': dependencies: @@ -8406,7 +8355,7 @@ snapshots: '@types/unist@3.0.3': {} - '@types/vscode@1.92.0': {} + '@types/vscode@1.101.0': {} '@types/web-bluetooth@0.0.21': {} @@ -8459,11 +8408,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.32.1': - dependencies: - '@typescript-eslint/types': 8.32.1 - '@typescript-eslint/visitor-keys': 8.32.1 - '@typescript-eslint/scope-manager@8.34.0': dependencies: '@typescript-eslint/types': 8.34.0 @@ -8484,24 +8428,8 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/types@8.32.1': {} - '@typescript-eslint/types@8.34.0': {} - '@typescript-eslint/typescript-estree@8.32.1(typescript@5.8.3)': - dependencies: - '@typescript-eslint/types': 8.32.1 - '@typescript-eslint/visitor-keys': 8.32.1 - debug: 4.4.1(supports-color@8.1.1) - fast-glob: 3.3.3 - is-glob: 4.0.3 - minimatch: 9.0.5 - semver: 7.7.2 - ts-api-utils: 2.1.0(typescript@5.8.3) - typescript: 5.8.3 - transitivePeerDependencies: - - supports-color - '@typescript-eslint/typescript-estree@8.34.0(typescript@5.8.3)': dependencies: '@typescript-eslint/project-service': 8.34.0(typescript@5.8.3) @@ -8518,17 +8446,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.32.1(eslint@9.28.0(jiti@2.4.2))(typescript@5.8.3)': - dependencies: - '@eslint-community/eslint-utils': 4.7.0(eslint@9.28.0(jiti@2.4.2)) - '@typescript-eslint/scope-manager': 8.32.1 - '@typescript-eslint/types': 8.32.1 - '@typescript-eslint/typescript-estree': 8.32.1(typescript@5.8.3) - eslint: 9.28.0(jiti@2.4.2) - typescript: 5.8.3 - transitivePeerDependencies: - - supports-color - '@typescript-eslint/utils@8.34.0(eslint@9.28.0(jiti@2.4.2))(typescript@5.8.3)': dependencies: '@eslint-community/eslint-utils': 4.7.0(eslint@9.28.0(jiti@2.4.2)) @@ -8540,11 +8457,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/visitor-keys@8.32.1': - dependencies: - '@typescript-eslint/types': 8.32.1 - eslint-visitor-keys: 4.2.0 - '@typescript-eslint/visitor-keys@8.34.0': dependencies: '@typescript-eslint/types': 8.34.0 @@ -8741,7 +8653,7 @@ snapshots: '@vitest/eslint-plugin@1.2.1(eslint@9.28.0(jiti@2.4.2))(typescript@5.8.3)(vitest@3.2.3(@types/debug@4.1.12)(@types/node@22.15.31)(jiti@2.4.2)(lightningcss@1.30.1)(tsx@4.20.2)(yaml@2.8.0))': dependencies: - '@typescript-eslint/utils': 8.32.1(eslint@9.28.0(jiti@2.4.2))(typescript@5.8.3) + '@typescript-eslint/utils': 8.34.0(eslint@9.28.0(jiti@2.4.2))(typescript@5.8.3) eslint: 9.28.0(jiti@2.4.2) optionalDependencies: typescript: 5.8.3 @@ -8907,7 +8819,7 @@ snapshots: '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.27.1) '@babel/template': 7.27.2 '@babel/traverse': 7.27.1 - '@babel/types': 7.27.3 + '@babel/types': 7.27.6 '@vue/babel-helper-vue-transform-on': 1.4.0 '@vue/babel-plugin-resolve-type': 1.4.0(@babel/core@7.27.1) '@vue/shared': 3.5.16 @@ -8922,14 +8834,14 @@ snapshots: '@babel/core': 7.27.1 '@babel/helper-module-imports': 7.27.1 '@babel/helper-plugin-utils': 7.27.1 - '@babel/parser': 7.27.4 + '@babel/parser': 7.27.5 '@vue/compiler-sfc': 3.5.16 transitivePeerDependencies: - supports-color '@vue/compiler-core@3.5.16': dependencies: - '@babel/parser': 7.27.4 + '@babel/parser': 7.27.5 '@vue/shared': 3.5.16 entities: 4.5.0 estree-walker: 2.0.2 @@ -8942,7 +8854,7 @@ snapshots: '@vue/compiler-sfc@3.5.16': dependencies: - '@babel/parser': 7.27.4 + '@babel/parser': 7.27.5 '@vue/compiler-core': 3.5.16 '@vue/compiler-dom': 3.5.16 '@vue/compiler-ssr': 3.5.16 @@ -10183,7 +10095,7 @@ snapshots: eslint-plugin-n@17.20.0(eslint@9.28.0(jiti@2.4.2))(typescript@5.8.3): dependencies: '@eslint-community/eslint-utils': 4.7.0(eslint@9.28.0(jiti@2.4.2)) - '@typescript-eslint/utils': 8.32.1(eslint@9.28.0(jiti@2.4.2))(typescript@5.8.3) + '@typescript-eslint/utils': 8.34.0(eslint@9.28.0(jiti@2.4.2))(typescript@5.8.3) enhanced-resolve: 5.17.1 eslint: 9.28.0(jiti@2.4.2) eslint-plugin-es-x: 7.8.0(eslint@9.28.0(jiti@2.4.2)) @@ -10980,9 +10892,6 @@ snapshots: js-tokens@4.0.0: {} - js-tokens@9.0.0: - optional: true - js-tokens@9.0.1: {} js-yaml@3.14.1: @@ -12060,16 +11969,10 @@ snapshots: plantuml-encoder@1.4.0: {} - playwright-chromium@1.52.0: - dependencies: - playwright-core: 1.52.0 - playwright-chromium@1.53.0: dependencies: playwright-core: 1.53.0 - playwright-core@1.52.0: {} - playwright-core@1.53.0: {} pluralize@8.0.0: {} @@ -12115,7 +12018,7 @@ snapshots: pptxgenjs@4.0.0: dependencies: - '@types/node': 22.15.29 + '@types/node': 22.15.31 https: 1.0.0 image-size: 1.1.1 jszip: 3.10.1 @@ -12149,8 +12052,7 @@ snapshots: '@slidev/parser': 0.47.5 prettier: 3.5.3 - prettier@2.8.7: - optional: true + prettier@2.8.7: {} prettier@3.5.3: {} @@ -12218,10 +12120,10 @@ snapshots: strip-json-comments: 2.0.1 optional: true - reactive-vscode@0.2.19(@types/vscode@1.92.0): + reactive-vscode@0.3.0(@types/vscode@1.101.0): dependencies: - '@reactive-vscode/reactivity': 0.2.19 - '@types/vscode': 1.92.0 + '@reactive-vscode/reactivity': 0.3.0 + '@types/vscode': 1.101.0 read@1.0.7: dependencies: @@ -12682,7 +12584,7 @@ snapshots: strip-literal@2.1.0: dependencies: - js-tokens: 9.0.0 + js-tokens: 9.0.1 optional: true strip-literal@3.0.0: @@ -13130,7 +13032,7 @@ snapshots: dependencies: '@babel/core': 7.27.1 '@babel/standalone': 7.25.5 - '@babel/types': 7.27.3 + '@babel/types': 7.27.6 defu: 6.1.4 jiti: 1.21.6 mri: 1.2.0 @@ -13396,12 +13298,12 @@ snapshots: - tsx - yaml - volar-service-prettier@0.0.64(@volar/language-service@2.4.14)(prettier@3.5.3): + volar-service-prettier@0.0.64(@volar/language-service@2.4.14)(prettier@2.8.7): dependencies: vscode-uri: 3.0.8 optionalDependencies: '@volar/language-service': 2.4.14 - prettier: 3.5.3 + prettier: 2.8.7 volar-service-yaml@0.0.64(@volar/language-service@2.4.14): dependencies: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 389d7305b4..e27e3ed559 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -20,6 +20,7 @@ catalogs: ovsx: ^0.10.4 playwright-chromium: ^1.53.0 postcss-nested: ^7.0.2 + prettier: ^3.5.3 prettier-plugin-slidev: ^1.0.5 rimraf: ^6.0.1 simple-git-hooks: ^2.13.0 @@ -55,7 +56,6 @@ catalogs: mermaid: ^11.6.0 nanotar: ^0.2.0 plantuml-encoder: ^1.4.0 - prettier: ^3.5.3 recordrtc: ^5.6.2 shiki: ^3.6.0 shiki-magic-move: ^1.1.0 @@ -147,12 +147,12 @@ catalogs: '@types/recordrtc': ^5.6.14 '@types/resolve': ^1.20.6 '@types/semver': ^7.7.0 - '@types/vscode': ^1.89.0 '@types/yargs': ^17.0.33 vscode: '@volar/language-server': ~2.4.14 '@volar/vscode': ^2.4.14 - reactive-vscode: ^0.2.19 + prettier: ^2.8.7 + reactive-vscode: ^0.3.0 ts-json-schema-generator: ^2.4.0 volar-service-prettier: ^0.0.64 volar-service-yaml: ^0.0.64 diff --git a/taze.config.ts b/taze.config.ts index 0516e730ac..9bfe446a79 100644 --- a/taze.config.ts +++ b/taze.config.ts @@ -6,5 +6,7 @@ export default defineConfig({ 'typeit': 'ignore', // `engines.vscode` must be updated when bumping `@types/vscode` version '@types/vscode': 'ignore', + // Prevent multiple versions. `volar-service-yaml` is using v2. + 'prettier': 'patch', }, }) From 158b1ec86a465d6cadd8fd58058d0b03236a9db2 Mon Sep 17 00:00:00 2001 From: _Kerman Date: Sat, 21 Jun 2025 17:02:47 +0800 Subject: [PATCH 02/14] fix: pnpm lockfile --- pnpm-lock.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2c2e820dc7..6fdecc0b34 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -434,6 +434,11 @@ overrides: typescript: ^5.8.3 vite: ^6.3.5 +patchedDependencies: + '@hedgedoc/markdown-it-plugins@2.1.4': + hash: 49e14003b6caa0b7d164cbe71da573809d375babb2012c0a5ac943573e063c90 + path: patches/@hedgedoc__markdown-it-plugins@2.1.4.patch + importers: .: @@ -1090,7 +1095,7 @@ importers: devDependencies: '@hedgedoc/markdown-it-plugins': specifier: catalog:prod - version: 2.1.4(markdown-it@14.1.0) + version: 2.1.4(patch_hash=49e14003b6caa0b7d164cbe71da573809d375babb2012c0a5ac943573e063c90)(markdown-it@14.1.0) '@types/picomatch': specifier: catalog:types version: 4.0.0 @@ -7627,7 +7632,7 @@ snapshots: '@floating-ui/utils@0.2.7': {} - '@hedgedoc/markdown-it-plugins@2.1.4(markdown-it@14.1.0)': + '@hedgedoc/markdown-it-plugins@2.1.4(patch_hash=49e14003b6caa0b7d164cbe71da573809d375babb2012c0a5ac943573e063c90)(markdown-it@14.1.0)': dependencies: '@mrdrogdrog/optional': 1.2.1 html-entities: 2.5.2 From b11f6a3d229927739c0030c823562ed5aa52071f Mon Sep 17 00:00:00 2001 From: _Kerman Date: Sat, 21 Jun 2025 17:15:17 +0800 Subject: [PATCH 03/14] fix lint --- eslint.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/eslint.config.js b/eslint.config.js index 59f5dc794b..ab2dd39b78 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -20,6 +20,7 @@ export default antfu({ 'vue/no-v-text-v-html-on-component', 'vue/component-name-in-template-casing', 'jsonc/sort-array-values', + 'pnpm/yaml-no-duplicate-catalog-item', ) .override('antfu/pnpm/package-json', { ignores: [ From a766be5098eb18254325d47fe7b0dbc013301346 Mon Sep 17 00:00:00 2001 From: _Kerman Date: Sat, 21 Jun 2025 17:17:01 +0800 Subject: [PATCH 04/14] try fix --- packages/slidev/node/vite/extendConfig.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/slidev/node/vite/extendConfig.ts b/packages/slidev/node/vite/extendConfig.ts index 4ef8c6a6f2..848476af85 100644 --- a/packages/slidev/node/vite/extendConfig.ts +++ b/packages/slidev/node/vite/extendConfig.ts @@ -90,9 +90,9 @@ export function createConfigPlugin(options: ResolvedSlidevOptions): Plugin { }, ...(isInstalledGlobally.value ? await Promise.all(INCLUDE_GLOBAL.map(async dep => ({ - find: dep, - replacement: fileURLToPath(await resolveClientDep(dep)), - }))) + find: dep, + replacement: fileURLToPath(await resolveClientDep(dep)), + }))) : [] ), ], From a5fe1faf0e4a7eb39c1a3a3d41918a94cd65a91f Mon Sep 17 00:00:00 2001 From: _Kerman Date: Sat, 21 Jun 2025 17:17:43 +0800 Subject: [PATCH 05/14] try fix --- packages/slidev/node/vite/extendConfig.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/slidev/node/vite/extendConfig.ts b/packages/slidev/node/vite/extendConfig.ts index 848476af85..68d81a2455 100644 --- a/packages/slidev/node/vite/extendConfig.ts +++ b/packages/slidev/node/vite/extendConfig.ts @@ -11,7 +11,6 @@ const INCLUDE_GLOBAL = [ '@typescript/ata', 'file-saver', 'lz-string', - 'prettier', 'recordrtc', 'typescript', 'yaml', From 67c33d147faad4c270741118c10dcbaa5c0bef6f Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Sat, 21 Jun 2025 09:19:00 +0000 Subject: [PATCH 06/14] [autofix.ci] apply automated fixes --- packages/types/src/builtin-layouts.ts | 44 +++++++++++++-------------- packages/types/src/clicks.ts | 28 ++++++++--------- packages/types/src/setups.ts | 4 +-- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/packages/types/src/builtin-layouts.ts b/packages/types/src/builtin-layouts.ts index f3a33fc9d7..148cde83a1 100644 --- a/packages/types/src/builtin-layouts.ts +++ b/packages/types/src/builtin-layouts.ts @@ -1,22 +1,22 @@ -export type BuiltinLayouts = - | '404' - | 'center' - | 'cover' - | 'default' - | 'end' - | 'error' - | 'fact' - | 'full' - | 'iframe-left' - | 'iframe-right' - | 'iframe' - | 'image-left' - | 'image-right' - | 'image' - | 'intro' - | 'none' - | 'quote' - | 'section' - | 'statement' - | 'two-cols-header' - | 'two-cols' +export type BuiltinLayouts + = | '404' + | 'center' + | 'cover' + | 'default' + | 'end' + | 'error' + | 'fact' + | 'full' + | 'iframe-left' + | 'iframe-right' + | 'iframe' + | 'image-left' + | 'image-right' + | 'image' + | 'intro' + | 'none' + | 'quote' + | 'section' + | 'statement' + | 'two-cols-header' + | 'two-cols' diff --git a/packages/types/src/clicks.ts b/packages/types/src/clicks.ts index 6810f10873..2d465fc324 100644 --- a/packages/types/src/clicks.ts +++ b/packages/types/src/clicks.ts @@ -4,20 +4,20 @@ export type RawSingleAtValue = null | undefined | boolean | string | number export type RawRangeAtValue = null | undefined | false | [string | number, string | number] export type RawAtValue = RawSingleAtValue | RawRangeAtValue -export type NormalizedSingleClickValue = - | number // since absolute click - | string // since relative click - | null // disabled -export type NormalizedRangeClickValue = - | [number, number] // [absolute start, absolute end] - | [number, string] // [absolute start, absolute end based on start] - | [string, number] // [relative start, absolute end] - | [string, string] // [relative start, relative end] - | [string | number, string | number] // make TypeScript happy - | null // disabled -export type NormalizedAtValue = - | NormalizedSingleClickValue // since - | NormalizedRangeClickValue // range +export type NormalizedSingleClickValue + = | number // since absolute click + | string // since relative click + | null // disabled +export type NormalizedRangeClickValue + = | [number, number] // [absolute start, absolute end] + | [number, string] // [absolute start, absolute end based on start] + | [string, number] // [relative start, absolute end] + | [string, string] // [relative start, relative end] + | [string | number, string | number] // make TypeScript happy + | null // disabled +export type NormalizedAtValue + = | NormalizedSingleClickValue // since + | NormalizedRangeClickValue // range export type ClicksElement = Element | string diff --git a/packages/types/src/setups.ts b/packages/types/src/setups.ts index 86254afbf3..0f0d6f071d 100644 --- a/packages/types/src/setups.ts +++ b/packages/types/src/setups.ts @@ -53,8 +53,8 @@ export interface ShikiContext { loadTheme: (path: string) => Promise } -export type ShikiSetupReturn = - Partial< +export type ShikiSetupReturn + = Partial< & Omit, 'lang'> & CodeOptionsThemes & CodeOptionsMeta From 1001d2a11d615bc9e8c0515765762b0c23ad64a4 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Wed, 9 Jul 2025 08:02:03 +0000 Subject: [PATCH 07/14] [autofix.ci] apply automated fixes --- packages/vscode/scripts/publish.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vscode/scripts/publish.ts b/packages/vscode/scripts/publish.ts index 1e1a949380..c4b464fa8a 100644 --- a/packages/vscode/scripts/publish.ts +++ b/packages/vscode/scripts/publish.ts @@ -1,6 +1,7 @@ +import type { Options } from 'tinyexec' import fs from 'node:fs/promises' import process from 'node:process' -import { type Options, x } from 'tinyexec' +import { x } from 'tinyexec' async function publish() { const root = new URL('..', import.meta.url) From b0613cb12aa7a15239203b60466965738e9751a6 Mon Sep 17 00:00:00 2001 From: _Kerman Date: Fri, 14 Nov 2025 15:51:28 +0800 Subject: [PATCH 08/14] Discard changes to pnpm-workspace.yaml --- pnpm-workspace.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 6ded9a5378..5bc36188f2 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -8,6 +8,7 @@ shamefullyHoist: true ignoreWorkspaceRootCheck: true strictPeerDependencies: false linkWorkspacePackages: true +trustPolicy: no-downgrade patchedDependencies: '@hedgedoc/markdown-it-plugins@2.1.4': patches/@hedgedoc__markdown-it-plugins@2.1.4.patch @@ -25,7 +26,6 @@ catalogs: ovsx: ^0.10.6 playwright-chromium: ^1.56.1 postcss-nested: ^7.0.2 - prettier: ^3.6.2 prettier-plugin-slidev: ^1.0.5 rimraf: ^6.1.0 simple-git-hooks: ^2.13.1 @@ -61,6 +61,7 @@ catalogs: mermaid: ^11.12.1 nanotar: ^0.2.0 plantuml-encoder: ^1.4.0 + prettier: ^3.6.2 recordrtc: ^5.6.2 shiki: ^3.15.0 shiki-magic-move: ^1.2.1 From e316774969130fb01dc5628e295ed12d80ff2070 Mon Sep 17 00:00:00 2001 From: _Kerman Date: Fri, 14 Nov 2025 15:53:44 +0800 Subject: [PATCH 09/14] fix --- packages/vscode/package.json | 2 +- pnpm-workspace.yaml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/vscode/package.json b/packages/vscode/package.json index 91ed62f7e5..aa10e5effd 100644 --- a/packages/vscode/package.json +++ b/packages/vscode/package.json @@ -610,7 +610,7 @@ "get-port-please": "catalog:prod", "mlly": "catalog:prod", "ovsx": "catalog:dev", - "prettier": "catalog:dev", + "prettier": "catalog:vscode", "reactive-vscode": "catalog:vscode", "tm-grammars": "catalog:frontend", "ts-json-schema-generator": "catalog:vscode", diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 5bc36188f2..6c650e3e98 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -61,7 +61,6 @@ catalogs: mermaid: ^11.12.1 nanotar: ^0.2.0 plantuml-encoder: ^1.4.0 - prettier: ^3.6.2 recordrtc: ^5.6.2 shiki: ^3.15.0 shiki-magic-move: ^1.2.1 @@ -153,11 +152,11 @@ catalogs: '@types/recordrtc': ^5.6.15 '@types/resolve': ^1.20.6 '@types/semver': ^7.7.1 - '@types/vscode': ^1.89.0 '@types/yargs': ^17.0.34 vscode: '@volar/language-server': ~2.4.23 '@volar/vscode': ^2.4.23 + prettier: ^3.6.2 reactive-vscode: ^0.4.1 ts-json-schema-generator: ^2.4.0 volar-service-prettier: ^0.0.64 From 0ddd3af67b9a9ba3506f54ae4f26f657c07813b9 Mon Sep 17 00:00:00 2001 From: _Kerman Date: Sat, 15 Nov 2025 22:41:34 +0800 Subject: [PATCH 10/14] fix --- pnpm-lock.yaml | 19 ++++++++++++++++++- pnpm-workspace.yaml | 1 + 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 57e0235960..fe96f01c62 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -178,6 +178,9 @@ catalogs: '@iconify-json/svg-spinners': specifier: ^1.2.4 version: 1.2.4 + '@iconify/json': + specifier: ^2.2.404 + version: 2.2.407 monaco: '@shikijs/monaco': specifier: ^3.15.0 @@ -408,6 +411,9 @@ catalogs: '@volar/vscode': specifier: ^2.4.23 version: 2.4.23 + prettier: + specifier: ^3.6.2 + version: 3.6.2 reactive-vscode: specifier: ^0.4.1 version: 0.4.1 @@ -650,6 +656,9 @@ importers: '@antfu/utils': specifier: catalog:frontend version: 9.3.0 + '@iconify/json': + specifier: catalog:icons + version: 2.2.407 '@shikijs/vitepress-twoslash': specifier: catalog:prod version: 3.15.0(@nuxt/kit@3.13.0(rollup@4.44.1))(typescript@5.9.3) @@ -1175,7 +1184,7 @@ importers: specifier: catalog:dev version: 0.10.6 prettier: - specifier: catalog:dev + specifier: catalog:vscode version: 3.6.2 reactive-vscode: specifier: catalog:vscode @@ -1778,6 +1787,9 @@ packages: '@iconify-json/vscode-icons@1.2.32': resolution: {integrity: sha512-UzZmL6hF02YGu/qEbpskEVnstlNJG+c+0PNzNYTIBf/dXylWHLUVufhOXqAzuGRjkUZ2q7rPpOEwLUPkhkFHUA==} + '@iconify/json@2.2.407': + resolution: {integrity: sha512-GI81Sh05/31UyyIK2+hhMpzJb3PgvAJq/w6B0xgfQcTMwsWOaLL0QV50WNgoIHltt8FvqgR+BK/nOGnrTqugiQ==} + '@iconify/types@2.0.0': resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==} @@ -7483,6 +7495,11 @@ snapshots: dependencies: '@iconify/types': 2.0.0 + '@iconify/json@2.2.407': + dependencies: + '@iconify/types': 2.0.0 + pathe: 2.0.3 + '@iconify/types@2.0.0': {} '@iconify/utils@3.0.2': diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 6c650e3e98..85d252874c 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -26,6 +26,7 @@ catalogs: ovsx: ^0.10.6 playwright-chromium: ^1.56.1 postcss-nested: ^7.0.2 + prettier: ^3.6.2 prettier-plugin-slidev: ^1.0.5 rimraf: ^6.1.0 simple-git-hooks: ^2.13.1 From 4e27556b4e3dfde7f3aa4349be261ef8bbd54aa0 Mon Sep 17 00:00:00 2001 From: _Kerman Date: Thu, 20 Nov 2025 14:38:16 +0800 Subject: [PATCH 11/14] fix build --- packages/vscode/tsdown.config.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/vscode/tsdown.config.ts b/packages/vscode/tsdown.config.ts index b907b9c975..9603039d71 100644 --- a/packages/vscode/tsdown.config.ts +++ b/packages/vscode/tsdown.config.ts @@ -1,4 +1,5 @@ -import { copyFileSync, existsSync, mkdirSync, writeFileSync } from 'node:fs' +import { existsSync } from 'node:fs' +import { copyFile, mkdir, writeFile } from 'node:fs/promises' import { join } from 'node:path' import process from 'node:process' import { fileURLToPath } from 'node:url' @@ -30,7 +31,7 @@ export default defineConfig({ name: 'umd2esm', resolveId: { filter: { - id: /^(vscode-.*-languageservice|vscode-languageserver-types|jsonc-parser)$/, + id: /^(vscode-.*-languageservice|vscode-languageserver-types|jsonc-parser)/, }, async handler(source, importer) { const pathUmdMay = await resolvePath(source, { url: importer }) @@ -46,12 +47,12 @@ export default defineConfig({ const resDir = join(import.meta.dirname, './dist/res') if (!existsSync(resDir)) - mkdirSync(resDir, { recursive: true }) + await mkdir(resDir, { recursive: true }) for (const file of ['logo-mono.svg', 'logo-mono-dark.svg', 'logo.png', 'logo.svg']) - copyFileSync(join(assetsDir, file), join(resDir, file)) + await copyFile(join(assetsDir, file), join(resDir, file)) - writeFileSync( + await writeFile( join(import.meta.dirname, 'syntaxes/codeblock-patch.json'), JSON.stringify(generateCodeblockPatch(), null, 2), ) From ecaed5f2e146951bf16fd53a0469b59cef695480 Mon Sep 17 00:00:00 2001 From: _Kerman Date: Thu, 20 Nov 2025 15:30:36 +0800 Subject: [PATCH 12/14] upgrade tsdown --- pnpm-lock.yaml | 258 +++++++++++++++++++++++--------------------- pnpm-workspace.yaml | 3 +- 2 files changed, 139 insertions(+), 122 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8af3f59cf5..3842321193 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,8 +56,8 @@ catalogs: specifier: ^19.9.0 version: 19.9.0 tsdown: - specifier: ^0.16.0 - version: 0.16.0 + specifier: ^0.16.6 + version: 0.16.6 tsx: specifier: ^4.20.6 version: 4.20.6 @@ -544,7 +544,7 @@ importers: version: 1.0.2 tsdown: specifier: catalog:dev - version: 0.16.0(typescript@5.9.3)(vue-tsc@3.1.3(typescript@5.9.3)) + version: 0.16.6(typescript@5.9.3)(vue-tsc@3.1.3(typescript@5.9.3)) tsx: specifier: catalog:dev version: 4.20.6 @@ -1895,28 +1895,24 @@ packages: engines: {node: '>= 10'} cpu: [arm64] os: [linux] - libc: [glibc] '@node-rs/crc32-linux-arm64-musl@1.10.6': resolution: {integrity: sha512-k8ra/bmg0hwRrIEE8JL1p32WfaN9gDlUUpQRWsbxd1WhjqvXea7kKO6K4DwVxyxlPhBS9Gkb5Urq7Y4mXANzaw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - libc: [musl] '@node-rs/crc32-linux-x64-gnu@1.10.6': resolution: {integrity: sha512-IfjtqcuFK7JrSZ9mlAFhb83xgium30PguvRjIMI45C3FJwu18bnLk1oR619IYb/zetQT82MObgmqfKOtgemEKw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - libc: [glibc] '@node-rs/crc32-linux-x64-musl@1.10.6': resolution: {integrity: sha512-LbFYsA5M9pNunOweSt6uhxenYQF94v3bHDAQRPTQ3rnjn+mK6IC7YTAYoBjvoJP8lVzcvk9hRj8wp4Jyh6Y80g==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - libc: [musl] '@node-rs/crc32-wasm32-wasi@1.10.6': resolution: {integrity: sha512-KaejdLgHMPsRaxnM+OG9L9XdWL2TabNx80HLdsCOoX9BVhEkfh39OeahBo8lBmidylKbLGMQoGfIKDjq0YMStw==} @@ -1965,8 +1961,12 @@ packages: resolution: {integrity: sha512-JBGSjF9Hd8guvTV2312eM1RulCMJc50yR3CeMZPLDsI02A8TXQnABS8EbgvGRvxD43q/ITjj21B2ffG1wEVrnQ==} engines: {node: ^14.18.0 || >=16.10.0} - '@oxc-project/types@0.96.0': - resolution: {integrity: sha512-r/xkmoXA0xEpU6UGtn18CNVjXH6erU3KCpCDbpLmbVxBFor1U9MqN5Z2uMmCHJuXjJzlnDR+hWY+yPoLo8oHDw==} + '@oxc-project/runtime@0.96.0': + resolution: {integrity: sha512-34lh4o9CcSw09Hx6fKihPu85+m+4pmDlkXwJrLvN5nMq5JrcGhhihVM415zDqT8j8IixO1PYYdQZRN4SwQCncg==} + engines: {node: ^20.19.0 || >=22.12.0} + + '@oxc-project/types@0.98.0': + resolution: {integrity: sha512-Vzmd6FsqVuz5HQVcRC/hrx7Ujo3WEVeQP7C2UNP5uy1hUY4SQvMB+93jxkI1KRHz9a/6cni3glPOtvteN+zpsw==} '@pdf-lib/standard-fonts@1.0.0': resolution: {integrity: sha512-hU30BK9IUN/su0Mn9VdlVKsWBS6GyhVfqjwl1FjZN4TxP6cCw0jP2w7V3Hf5uX7M0AZJ16vey9yE0ny7Sa59ZA==} @@ -1987,89 +1987,85 @@ packages: '@reactive-vscode/reactivity@0.4.1': resolution: {integrity: sha512-ThNXTkTNK9LHvdlBcyzqSywlfF61FIQDlVDqv12+rkRQCCUjWsD+oilbIYYi5uAJkQ2h/yLyowx3f0YVEY1bxQ==} - '@rolldown/binding-android-arm64@1.0.0-beta.46': - resolution: {integrity: sha512-1nfXUqZ227uKuLw9S12OQZU5z+h+cUOXLW5orntWVxHWvt20pt1PGUcVoIU8ssngKABu0vzHY268kAxuYX24BQ==} + '@rolldown/binding-android-arm64@1.0.0-beta.51': + resolution: {integrity: sha512-Ctn8FUXKWWQI9pWC61P1yumS9WjQtelNS9riHwV7oCkknPGaAry4o7eFx2KgoLMnI2BgFJYpW7Im8/zX3BuONg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] - '@rolldown/binding-darwin-arm64@1.0.0-beta.46': - resolution: {integrity: sha512-w4IyumCQkpA3ezZ37COG3mMusFYxjEE8zqCfXZU/qb5k1JMD2kVl0fgJafIbGli27tgelYMweXkJGnlrxSGT9Q==} + '@rolldown/binding-darwin-arm64@1.0.0-beta.51': + resolution: {integrity: sha512-EL1aRW2Oq15ShUEkBPsDtLMO8GTqfb/ktM/dFaVzXKQiEE96Ss6nexMgfgQrg8dGnNpndFyffVDb5IdSibsu1g==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] - '@rolldown/binding-darwin-x64@1.0.0-beta.46': - resolution: {integrity: sha512-9QqaRHPbdAnv306+7nzltq4CktJ49Z4W9ybHLWYxSeDSoOGL4l1QmxjDWoRHrqYEkNr+DWHqqoD4NNHgOk7lKw==} + '@rolldown/binding-darwin-x64@1.0.0-beta.51': + resolution: {integrity: sha512-uGtYKlFen9pMIPvkHPWZVDtmYhMQi5g5Ddsndg1gf3atScKYKYgs5aDP4DhHeTwGXQglhfBG7lEaOIZ4UAIWww==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] - '@rolldown/binding-freebsd-x64@1.0.0-beta.46': - resolution: {integrity: sha512-Cuk5opdEMb+Evi7QcGArc4hWVoHSGz/qyUUWLTpFJWjylb8wH1u4f+HZE6gVGACuf4w/5P/VhAIamHyweAbBVQ==} + '@rolldown/binding-freebsd-x64@1.0.0-beta.51': + resolution: {integrity: sha512-JRoVTQtHYbZj1P07JLiuTuXjiBtIa7ag7/qgKA6CIIXnAcdl4LrOf7nfDuHPJcuRKaP5dzecMgY99itvWfmUFQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] - '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.46': - resolution: {integrity: sha512-BPWDxEnxb4JNMXrSmPuc5ywI6cHOELofmT0e/WGkbL1MwKYRVvqTf+gMcGLF6zAV+OF5hLYMAEk8XKfao6xmDQ==} + '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.51': + resolution: {integrity: sha512-BKATVnpPZ0TYBW9XfDwyd4kPGgvf964HiotIwUgpMrFOFYWqpZ+9ONNzMV4UFAYC7Hb5C2qgYQk/qj2OnAd4RQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.46': - resolution: {integrity: sha512-CDQSVlryuRC955EwgbBK1h/6xQyttSxQG8+6/PeOfvUlfKGPMbBdcsOEHzGve5ED1Y7Ovh2UFjY/eT106aQqig==} + '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.51': + resolution: {integrity: sha512-xLd7da5jkfbVsBCm1buIRdWtuXY8+hU3+6ESXY/Tk5X5DPHaifrUblhYDgmA34dQt6WyNC2kfXGgrduPEvDI6Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] - libc: [glibc] - '@rolldown/binding-linux-arm64-musl@1.0.0-beta.46': - resolution: {integrity: sha512-6IZHycZetmVaC9zwcl1aA9fPYPuxLa5apALjJRoJu/2BZdER3zBWxDnCzlEh4SUlo++cwdfV9ZQRK9JS8cLNuA==} + '@rolldown/binding-linux-arm64-musl@1.0.0-beta.51': + resolution: {integrity: sha512-EQFXTgHxxTzv3t5EmjUP/DfxzFYx9sMndfLsYaAY4DWF6KsK1fXGYsiupif6qPTViPC9eVmRm78q0pZU/kuIPg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] - libc: [musl] - '@rolldown/binding-linux-x64-gnu@1.0.0-beta.46': - resolution: {integrity: sha512-R/kI8fMnsxXvWzcMv5A408hfvrwtAwD/HdQKIE1HKWmfxdSHB11Y3PVwlnt7RVo7I++6mWCIxxj5o3gut4ibEw==} + '@rolldown/binding-linux-x64-gnu@1.0.0-beta.51': + resolution: {integrity: sha512-p5P6Xpa68w3yFaAdSzIZJbj+AfuDnMDqNSeglBXM7UlJT14Q4zwK+rV+8Mhp9MiUb4XFISZtbI/seBprhkQbiQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] - libc: [glibc] - '@rolldown/binding-linux-x64-musl@1.0.0-beta.46': - resolution: {integrity: sha512-vGUXKuHGUlG2XBwvN4A8KIegeaVVxN2ZxdGG9thycwRkzUvZ9ccKvqUVZM8cVRyNRWgVgsGCS18qLUefVplwKw==} + '@rolldown/binding-linux-x64-musl@1.0.0-beta.51': + resolution: {integrity: sha512-sNVVyLa8HB8wkFipdfz1s6i0YWinwpbMWk5hO5S+XAYH2UH67YzUT13gs6wZTKg2x/3gtgXzYnHyF5wMIqoDAw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] - libc: [musl] - '@rolldown/binding-openharmony-arm64@1.0.0-beta.46': - resolution: {integrity: sha512-6SpDGH+0Dud3/RFDoC6fva6+Cm/0COnMRKR8kI4ssHWlCXPymlM59kYFCIBLZZqwURpNVVMPln4rWjxXuwD23w==} + '@rolldown/binding-openharmony-arm64@1.0.0-beta.51': + resolution: {integrity: sha512-e/JMTz9Q8+T3g/deEi8DK44sFWZWGKr9AOCW5e8C8SCVWzAXqYXAG7FXBWBNzWEZK0Rcwo9TQHTQ9Q0gXgdCaA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] - '@rolldown/binding-wasm32-wasi@1.0.0-beta.46': - resolution: {integrity: sha512-peWDGp8YUAbTw5RJzr9AuPlTuf2adr+TBNIGF6ysMbobBKuQL41wYfGQlcerXJfLmjnQLf6DU2zTPBTfrS2Y8A==} + '@rolldown/binding-wasm32-wasi@1.0.0-beta.51': + resolution: {integrity: sha512-We3LWqSu6J9s5Y0MK+N7fUiiu37aBGPG3Pc347EoaROuAwkCS2u9xJ5dpIyLW4B49CIbS3KaPmn4kTgPb3EyPw==} engines: {node: '>=14.0.0'} cpu: [wasm32] - '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.46': - resolution: {integrity: sha512-Ydbwg1JCnVbTAuDyKtu3dOuBLgZ6iZsy8p1jMPX/r7LMPnpXnS15GNcmMwa11nyl/M2VjGE1i/MORUTMt8mnRQ==} + '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.51': + resolution: {integrity: sha512-fj56buHRuMM+r/cb6ZYfNjNvO/0xeFybI6cTkTROJatdP4fvmQ1NS8D/Lm10FCSDEOkqIz8hK3TGpbAThbPHsA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] - '@rolldown/binding-win32-ia32-msvc@1.0.0-beta.46': - resolution: {integrity: sha512-XcPZG2uDxEn6G3takXQvi7xWgDiJqdC0N6mubL/giKD4I65zgQtbadwlIR8oDB/erOahZr5IX8cRBVcK3xcvpg==} + '@rolldown/binding-win32-ia32-msvc@1.0.0-beta.51': + resolution: {integrity: sha512-fkqEqaeEx8AySXiDm54b/RdINb3C0VovzJA3osMhZsbn6FoD73H0AOIiaVAtGr6x63hefruVKTX8irAm4Jkt2w==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ia32] os: [win32] - '@rolldown/binding-win32-x64-msvc@1.0.0-beta.46': - resolution: {integrity: sha512-VPC+F9S6nllv02aGG+gxHRgpOaOlYBPn94kDe9DCFSLOztf4uYIAkN+tLDlg5OcsOC8XNR5rP49zOfI0PfnHYw==} + '@rolldown/binding-win32-x64-msvc@1.0.0-beta.51': + resolution: {integrity: sha512-CWuLG/HMtrVcjKGa0C4GnuxONrku89g0+CsH8nT0SNhOtREXuzwgjIXNJImpE/A/DMf9JF+1Xkrq/YRr+F/rCg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] @@ -2080,6 +2076,9 @@ packages: '@rolldown/pluginutils@1.0.0-beta.46': resolution: {integrity: sha512-xMNwJo/pHkEP/mhNVnW+zUiJDle6/hxrwO0mfSJuEVRbBfgrJFuUSRoZx/nYUw5pCjrysl9OkNXCkAdih8GCnA==} + '@rolldown/pluginutils@1.0.0-beta.51': + resolution: {integrity: sha512-51/8cNXMrqWqX3o8DZidhwz1uYq0BhHDDSfVygAND1Skx5s1TDw3APSSxCMcFFedwgqGcx34gRouwY+m404BBQ==} + '@rollup/pluginutils@5.1.4': resolution: {integrity: sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==} engines: {node: '>=14.0.0'} @@ -2123,67 +2122,56 @@ packages: resolution: {integrity: sha512-n0edDmSHlXFhrlmTK7XBuwKlG5MbS7yleS1cQ9nn4kIeW+dJH+ExqNgQ0RrFRew8Y+0V/x6C5IjsHrJmiHtkxQ==} cpu: [arm] os: [linux] - libc: [glibc] '@rollup/rollup-linux-arm-musleabihf@4.44.1': resolution: {integrity: sha512-8WVUPy3FtAsKSpyk21kV52HCxB+me6YkbkFHATzC2Yd3yuqHwy2lbFL4alJOLXKljoRw08Zk8/xEj89cLQ/4Nw==} cpu: [arm] os: [linux] - libc: [musl] '@rollup/rollup-linux-arm64-gnu@4.44.1': resolution: {integrity: sha512-yuktAOaeOgorWDeFJggjuCkMGeITfqvPgkIXhDqsfKX8J3jGyxdDZgBV/2kj/2DyPaLiX6bPdjJDTu9RB8lUPQ==} cpu: [arm64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-arm64-musl@4.44.1': resolution: {integrity: sha512-W+GBM4ifET1Plw8pdVaecwUgxmiH23CfAUj32u8knq0JPFyK4weRy6H7ooxYFD19YxBulL0Ktsflg5XS7+7u9g==} cpu: [arm64] os: [linux] - libc: [musl] '@rollup/rollup-linux-loongarch64-gnu@4.44.1': resolution: {integrity: sha512-1zqnUEMWp9WrGVuVak6jWTl4fEtrVKfZY7CvcBmUUpxAJ7WcSowPSAWIKa/0o5mBL/Ij50SIf9tuirGx63Ovew==} cpu: [loong64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-powerpc64le-gnu@4.44.1': resolution: {integrity: sha512-Rl3JKaRu0LHIx7ExBAAnf0JcOQetQffaw34T8vLlg9b1IhzcBgaIdnvEbbsZq9uZp3uAH+JkHd20Nwn0h9zPjA==} cpu: [ppc64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-riscv64-gnu@4.44.1': resolution: {integrity: sha512-j5akelU3snyL6K3N/iX7otLBIl347fGwmd95U5gS/7z6T4ftK288jKq3A5lcFKcx7wwzb5rgNvAg3ZbV4BqUSw==} cpu: [riscv64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-riscv64-musl@4.44.1': resolution: {integrity: sha512-ppn5llVGgrZw7yxbIm8TTvtj1EoPgYUAbfw0uDjIOzzoqlZlZrLJ/KuiE7uf5EpTpCTrNt1EdtzF0naMm0wGYg==} cpu: [riscv64] os: [linux] - libc: [musl] '@rollup/rollup-linux-s390x-gnu@4.44.1': resolution: {integrity: sha512-Hu6hEdix0oxtUma99jSP7xbvjkUM/ycke/AQQ4EC5g7jNRLLIwjcNwaUy95ZKBJJwg1ZowsclNnjYqzN4zwkAw==} cpu: [s390x] os: [linux] - libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.44.1': resolution: {integrity: sha512-EtnsrmZGomz9WxK1bR5079zee3+7a+AdFlghyd6VbAjgRJDbTANJ9dcPIPAi76uG05micpEL+gPGmAKYTschQw==} cpu: [x64] os: [linux] - libc: [glibc] '@rollup/rollup-linux-x64-musl@4.44.1': resolution: {integrity: sha512-iAS4p+J1az6Usn0f8xhgL4PaU878KEtutP4hqw52I4IO6AGoyOkHCxcc4bqufv1tQLdDWFx8lR9YlwxKuv3/3g==} cpu: [x64] os: [linux] - libc: [musl] '@rollup/rollup-win32-arm64-msvc@4.44.1': resolution: {integrity: sha512-NtSJVKcXwcqozOl+FwI41OH3OApDyLk3kqTJgx8+gp6On9ZEt5mYhIsKNPGuaZr3p9T6NWPKGU/03Vw4CNU9qg==} @@ -3012,8 +3000,8 @@ packages: resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==} engines: {node: '>=0.8'} - ast-kit@2.1.3: - resolution: {integrity: sha512-TH+b3Lv6pUjy/Nu0m6A2JULtdzLpmqF9x1Dhj00ZoEiML8qvVA9j1flkzTKNYgdEhWrjDwtWNpyyCUbfQe514g==} + ast-kit@2.2.0: + resolution: {integrity: sha512-m1Q/RaVOnTp9JxPX+F+Zn7IcLYMzM8kZofDImfsKZd8MbR+ikdOzTeztStWqfrqIxZnYWryyI9ePm3NGjnZgGw==} engines: {node: '>=20.19.0'} astral-regex@2.0.0: @@ -3065,6 +3053,9 @@ packages: birpc@2.6.1: resolution: {integrity: sha512-LPnFhlDpdSH6FJhJyn4M0kFO7vtQ5iPw24FnG0y21q09xC7e8+1LeR31S1MAIrDAHp4m7aas4bEkTDTvMAtebQ==} + birpc@2.8.0: + resolution: {integrity: sha512-Bz2a4qD/5GRhiHSwj30c/8kC8QGj12nNDwz3D4ErQ4Xhy35dsSDvF+RA/tWpjyU0pdGtSDiEk6B5fBGE1qNVhw==} + bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} @@ -3706,9 +3697,9 @@ packages: drauu@0.4.3: resolution: {integrity: sha512-3pk6ZdfgElrEW+L4C03Xtrr7VVdSmcWlBb8cUj+WUWree2hEN8IE9fxRBL9HYG5gr8hAEXFNB0X263Um1WlYwA==} - dts-resolver@2.1.2: - resolution: {integrity: sha512-xeXHBQkn2ISSXxbJWD828PFjtyg+/UrMDo7W4Ffcs7+YWCquxU8YjV1KoxuiL+eJ5pg3ll+bC6flVv61L3LKZg==} - engines: {node: '>=20.18.0'} + dts-resolver@2.1.3: + resolution: {integrity: sha512-bihc7jPC90VrosXNzK0LTE2cuLP6jr0Ro8jk+kMugHReJVLIpHz/xadeq3MhuwyO4TD4OA3L1Q8pBBFRc08Tsw==} + engines: {node: '>=20.19.0'} peerDependencies: oxc-resolver: '>=11.0.0' peerDependenciesMeta: @@ -4806,28 +4797,24 @@ packages: engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] - libc: [glibc] lightningcss-linux-arm64-musl@1.30.1: resolution: {integrity: sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] - libc: [musl] lightningcss-linux-x64-gnu@1.30.1: resolution: {integrity: sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] - libc: [glibc] lightningcss-linux-x64-musl@1.30.1: resolution: {integrity: sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] - libc: [musl] lightningcss-win32-arm64-msvc@1.30.1: resolution: {integrity: sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==} @@ -5321,6 +5308,9 @@ packages: ms: optional: true + obug@2.1.0: + resolution: {integrity: sha512-uu/tgLPoa75CFA7UDkmqspKbefvZh1WMPwkU3bNr0PY746a/+xwXVgbw5co5C3GvJj3h5u8g/pbxXzI0gd1QFg==} + ofetch@1.5.1: resolution: {integrity: sha512-2W4oUZlVaqAPAil6FUg/difl6YhqhUR7x2eZY4bQCko22UXg3hptq9KLQdqFClV+Wu85UX7hNtdGTngi/1BxcA==} @@ -5786,13 +5776,13 @@ packages: robust-predicates@3.0.2: resolution: {integrity: sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==} - rolldown-plugin-dts@0.17.3: - resolution: {integrity: sha512-8mGnNUVNrqEdTnrlcaDxs4sAZg0No6njO+FuhQd4L56nUbJO1tHxOoKDH3mmMJg7f/BhEj/1KjU5W9kZ9zM/kQ==} - engines: {node: '>=20.18.0'} + rolldown-plugin-dts@0.18.0: + resolution: {integrity: sha512-2CJtKYa9WPClZxkJeCt4bGUegQvQKQ1VJp9jFJzG0h8I/80XI6qDgoWfVJUOEhT2swbsRQh/42N1RIWvbXT4rA==} + engines: {node: '>=20.19.0'} peerDependencies: '@ts-macro/tsc': ^0.3.6 '@typescript/native-preview': '>=7.0.0-dev.20250601.1' - rolldown: ^1.0.0-beta.44 + rolldown: ^1.0.0-beta.51 typescript: ^5.9.3 vue-tsc: ~3.1.0 peerDependenciesMeta: @@ -5805,8 +5795,8 @@ packages: vue-tsc: optional: true - rolldown@1.0.0-beta.46: - resolution: {integrity: sha512-FYUbq0StVHOjkR/hEJ667Pup3ugeB9odBcbmxU5il9QfT9X2t/FPhkqFYQthbYxD2bKnQyO+2vHTgnmOHwZdeA==} + rolldown@1.0.0-beta.51: + resolution: {integrity: sha512-ZRLgPlS91l4JztLYEZnmMcd3Umcla1hkXJgiEiR4HloRJBBoeaX8qogTu5Jfu36rRMVLndzqYv0h+M5gJAkUfg==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true @@ -6233,18 +6223,17 @@ packages: engines: {node: '>=18.0.0'} hasBin: true - tsdown@0.16.0: - resolution: {integrity: sha512-VCqqxT5FbjCmxmLNlOLHiNhu1MBtdvCsk43murvUFloQzQzr/C0FRauWtAw7lAPmS40rZlgocCoTNFqX72WSTg==} + tsdown@0.16.6: + resolution: {integrity: sha512-g3xHEnGdfwJTlXhEkqww3Q/KlCfyNFw4rnzuQ9Gqw8T2xjDYrw94qmSw5wYYTAW5zV1sEfWDlfgxZo5mmtu0NQ==} engines: {node: '>=20.19.0'} hasBin: true peerDependencies: '@arethetypeswrong/core': ^0.18.1 - '@vitejs/devtools': ^0.0.0-alpha.10 + '@vitejs/devtools': ^0.0.0-alpha.17 publint: ^0.3.0 typescript: ^5.9.3 unplugin-lightningcss: ^0.4.0 unplugin-unused: ^0.5.0 - unrun: ^0.2.1 peerDependenciesMeta: '@arethetypeswrong/core': optional: true @@ -6258,8 +6247,6 @@ packages: optional: true unplugin-unused: optional: true - unrun: - optional: true tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} @@ -6327,6 +6314,9 @@ packages: ufo@1.6.1: resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==} + unconfig-core@7.4.1: + resolution: {integrity: sha512-Bp/bPZjV2Vl/fofoA2OYLSnw1Z0MOhCX7zHnVCYrazpfZvseBbGhwcNQMxsg185Mqh7VZQqK3C8hFG/Dyng+yA==} + unconfig@7.3.3: resolution: {integrity: sha512-QCkQoOnJF8L107gxfHL0uavn7WD9b3dpBcFX6HtfQYmjw2YzWxGuFQ0N0J6tE9oguCBJn9KOvfqYDCMPHIZrBA==} @@ -6457,6 +6447,16 @@ packages: resolution: {integrity: sha512-6NCPkv1ClwH+/BGE9QeoTIl09nuiAt0gS28nn1PvYXsGKRwM2TCbFA2QiilmehPDTXIe684k4rZI1yl3A1PCUw==} engines: {node: '>=18.12.0'} + unrun@0.2.11: + resolution: {integrity: sha512-HjUuNLRGfRxMvxkwOuO/CpkSzdizTPPApbarLplsTzUm8Kex+nS9eomKU1qgVus6WGWkDYhtf/mgNxGEpyTR6A==} + engines: {node: '>=20.19.0'} + hasBin: true + peerDependencies: + synckit: ^0.11.11 + peerDependenciesMeta: + synckit: + optional: true + untildify@4.0.0: resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==} engines: {node: '>=8'} @@ -7740,7 +7740,9 @@ snapshots: - supports-color optional: true - '@oxc-project/types@0.96.0': {} + '@oxc-project/runtime@0.96.0': {} + + '@oxc-project/types@0.98.0': {} '@pdf-lib/standard-fonts@1.0.0': dependencies: @@ -7760,54 +7762,56 @@ snapshots: '@reactive-vscode/reactivity@0.4.1': {} - '@rolldown/binding-android-arm64@1.0.0-beta.46': + '@rolldown/binding-android-arm64@1.0.0-beta.51': optional: true - '@rolldown/binding-darwin-arm64@1.0.0-beta.46': + '@rolldown/binding-darwin-arm64@1.0.0-beta.51': optional: true - '@rolldown/binding-darwin-x64@1.0.0-beta.46': + '@rolldown/binding-darwin-x64@1.0.0-beta.51': optional: true - '@rolldown/binding-freebsd-x64@1.0.0-beta.46': + '@rolldown/binding-freebsd-x64@1.0.0-beta.51': optional: true - '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.46': + '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.51': optional: true - '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.46': + '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.51': optional: true - '@rolldown/binding-linux-arm64-musl@1.0.0-beta.46': + '@rolldown/binding-linux-arm64-musl@1.0.0-beta.51': optional: true - '@rolldown/binding-linux-x64-gnu@1.0.0-beta.46': + '@rolldown/binding-linux-x64-gnu@1.0.0-beta.51': optional: true - '@rolldown/binding-linux-x64-musl@1.0.0-beta.46': + '@rolldown/binding-linux-x64-musl@1.0.0-beta.51': optional: true - '@rolldown/binding-openharmony-arm64@1.0.0-beta.46': + '@rolldown/binding-openharmony-arm64@1.0.0-beta.51': optional: true - '@rolldown/binding-wasm32-wasi@1.0.0-beta.46': + '@rolldown/binding-wasm32-wasi@1.0.0-beta.51': dependencies: '@napi-rs/wasm-runtime': 1.0.7 optional: true - '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.46': + '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.51': optional: true - '@rolldown/binding-win32-ia32-msvc@1.0.0-beta.46': + '@rolldown/binding-win32-ia32-msvc@1.0.0-beta.51': optional: true - '@rolldown/binding-win32-x64-msvc@1.0.0-beta.46': + '@rolldown/binding-win32-x64-msvc@1.0.0-beta.51': optional: true '@rolldown/pluginutils@1.0.0-beta.29': {} '@rolldown/pluginutils@1.0.0-beta.46': {} + '@rolldown/pluginutils@1.0.0-beta.51': {} + '@rollup/pluginutils@5.1.4(rollup@4.44.1)': dependencies: '@types/estree': 1.0.8 @@ -8928,7 +8932,7 @@ snapshots: assert-plus@1.0.0: {} - ast-kit@2.1.3: + ast-kit@2.2.0: dependencies: '@babel/parser': 7.28.5 pathe: 2.0.3 @@ -8975,6 +8979,8 @@ snapshots: birpc@2.6.1: {} + birpc@2.8.0: {} + bl@4.1.0: dependencies: buffer: 5.7.1 @@ -9705,7 +9711,7 @@ snapshots: dependencies: '@drauu/core': 0.4.3 - dts-resolver@2.1.2: {} + dts-resolver@2.1.3: {} dunder-proto@1.0.1: dependencies: @@ -11581,6 +11587,8 @@ snapshots: optionalDependencies: ms: 2.1.3 + obug@2.1.0: {} + ofetch@1.5.1: dependencies: destr: 2.0.5 @@ -12066,44 +12074,43 @@ snapshots: robust-predicates@3.0.2: {} - rolldown-plugin-dts@0.17.3(rolldown@1.0.0-beta.46)(typescript@5.9.3)(vue-tsc@3.1.3(typescript@5.9.3)): + rolldown-plugin-dts@0.18.0(rolldown@1.0.0-beta.51)(typescript@5.9.3)(vue-tsc@3.1.3(typescript@5.9.3)): dependencies: '@babel/generator': 7.28.5 '@babel/parser': 7.28.5 '@babel/types': 7.28.5 - ast-kit: 2.1.3 - birpc: 2.6.1 - debug: 4.4.3(supports-color@5.5.0) - dts-resolver: 2.1.2 + ast-kit: 2.2.0 + birpc: 2.8.0 + dts-resolver: 2.1.3 get-tsconfig: 4.13.0 magic-string: 0.30.21 - rolldown: 1.0.0-beta.46 + obug: 2.1.0 + rolldown: 1.0.0-beta.51 optionalDependencies: typescript: 5.9.3 vue-tsc: 3.1.3(typescript@5.9.3) transitivePeerDependencies: - oxc-resolver - - supports-color - rolldown@1.0.0-beta.46: + rolldown@1.0.0-beta.51: dependencies: - '@oxc-project/types': 0.96.0 - '@rolldown/pluginutils': 1.0.0-beta.46 + '@oxc-project/types': 0.98.0 + '@rolldown/pluginutils': 1.0.0-beta.51 optionalDependencies: - '@rolldown/binding-android-arm64': 1.0.0-beta.46 - '@rolldown/binding-darwin-arm64': 1.0.0-beta.46 - '@rolldown/binding-darwin-x64': 1.0.0-beta.46 - '@rolldown/binding-freebsd-x64': 1.0.0-beta.46 - '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-beta.46 - '@rolldown/binding-linux-arm64-gnu': 1.0.0-beta.46 - '@rolldown/binding-linux-arm64-musl': 1.0.0-beta.46 - '@rolldown/binding-linux-x64-gnu': 1.0.0-beta.46 - '@rolldown/binding-linux-x64-musl': 1.0.0-beta.46 - '@rolldown/binding-openharmony-arm64': 1.0.0-beta.46 - '@rolldown/binding-wasm32-wasi': 1.0.0-beta.46 - '@rolldown/binding-win32-arm64-msvc': 1.0.0-beta.46 - '@rolldown/binding-win32-ia32-msvc': 1.0.0-beta.46 - '@rolldown/binding-win32-x64-msvc': 1.0.0-beta.46 + '@rolldown/binding-android-arm64': 1.0.0-beta.51 + '@rolldown/binding-darwin-arm64': 1.0.0-beta.51 + '@rolldown/binding-darwin-x64': 1.0.0-beta.51 + '@rolldown/binding-freebsd-x64': 1.0.0-beta.51 + '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-beta.51 + '@rolldown/binding-linux-arm64-gnu': 1.0.0-beta.51 + '@rolldown/binding-linux-arm64-musl': 1.0.0-beta.51 + '@rolldown/binding-linux-x64-gnu': 1.0.0-beta.51 + '@rolldown/binding-linux-x64-musl': 1.0.0-beta.51 + '@rolldown/binding-openharmony-arm64': 1.0.0-beta.51 + '@rolldown/binding-wasm32-wasi': 1.0.0-beta.51 + '@rolldown/binding-win32-arm64-msvc': 1.0.0-beta.51 + '@rolldown/binding-win32-ia32-msvc': 1.0.0-beta.51 + '@rolldown/binding-win32-x64-msvc': 1.0.0-beta.51 rollup@4.44.1: dependencies: @@ -12556,29 +12563,30 @@ snapshots: tslib: 2.8.1 typescript: 5.9.3 - tsdown@0.16.0(typescript@5.9.3)(vue-tsc@3.1.3(typescript@5.9.3)): + tsdown@0.16.6(typescript@5.9.3)(vue-tsc@3.1.3(typescript@5.9.3)): dependencies: ansis: 4.2.0 cac: 6.7.14 chokidar: 4.0.3 - debug: 4.4.3(supports-color@5.5.0) diff: 8.0.2 empathic: 2.0.0 hookable: 5.5.3 - rolldown: 1.0.0-beta.46 - rolldown-plugin-dts: 0.17.3(rolldown@1.0.0-beta.46)(typescript@5.9.3)(vue-tsc@3.1.3(typescript@5.9.3)) + obug: 2.1.0 + rolldown: 1.0.0-beta.51 + rolldown-plugin-dts: 0.18.0(rolldown@1.0.0-beta.51)(typescript@5.9.3)(vue-tsc@3.1.3(typescript@5.9.3)) semver: 7.7.3 tinyexec: 1.0.2 tinyglobby: 0.2.15 tree-kill: 1.2.2 - unconfig: 7.3.3 + unconfig-core: 7.4.1 + unrun: 0.2.11 optionalDependencies: typescript: 5.9.3 transitivePeerDependencies: - '@ts-macro/tsc' - '@typescript/native-preview' - oxc-resolver - - supports-color + - synckit - vue-tsc tslib@1.14.1: {} @@ -12643,6 +12651,11 @@ snapshots: ufo@1.6.1: {} + unconfig-core@7.4.1: + dependencies: + '@quansync/fs': 0.1.5 + quansync: 0.2.11 + unconfig@7.3.3: dependencies: '@quansync/fs': 0.1.5 @@ -12826,6 +12839,11 @@ snapshots: picomatch: 4.0.3 webpack-virtual-modules: 0.6.2 + unrun@0.2.11: + dependencies: + '@oxc-project/runtime': 0.96.0 + rolldown: 1.0.0-beta.51 + untildify@4.0.0: {} untun@0.1.3: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 9dba340a7c..3332bad902 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -8,7 +8,6 @@ shamefullyHoist: true ignoreWorkspaceRootCheck: true strictPeerDependencies: false linkWorkspacePackages: true -trustPolicy: no-downgrade patchedDependencies: '@hedgedoc/markdown-it-plugins@2.1.4': patches/@hedgedoc__markdown-it-plugins@2.1.4.patch @@ -31,7 +30,7 @@ catalogs: rimraf: ^6.1.0 simple-git-hooks: ^2.13.1 taze: ^19.9.0 - tsdown: ^0.16.0 + tsdown: ^0.16.6 tsx: ^4.20.6 typescript: ^5.9.3 vitefu: ^1.1.1 From c9de2f8b9f6c6028ba54489206d0503fdb3cb554 Mon Sep 17 00:00:00 2001 From: _Kerman Date: Thu, 20 Nov 2025 15:38:23 +0800 Subject: [PATCH 13/14] fix --- packages/vscode/package.json | 4 +- pnpm-lock.yaml | 79 ++++++++++++++++++------------------ pnpm-workspace.yaml | 2 +- 3 files changed, 42 insertions(+), 43 deletions(-) diff --git a/packages/vscode/package.json b/packages/vscode/package.json index ab7bd57537..ab2a5eeff5 100644 --- a/packages/vscode/package.json +++ b/packages/vscode/package.json @@ -18,7 +18,7 @@ "main": "./dist/index.cjs", "icon": "dist/res/logo.png", "engines": { - "vscode": "^1.101.0" + "vscode": "^1.99.0" }, "activationEvents": [ "onStartupFinished" @@ -610,7 +610,7 @@ "@slidev/parser": "workspace:*", "@slidev/types": "workspace:*", "@types/node": "catalog:types", - "@types/vscode": "^1.101.0", + "@types/vscode": "^1.99.0", "@volar/language-server": "catalog:vscode", "@volar/vscode": "catalog:vscode", "get-port-please": "catalog:prod", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3842321193..75b9c279df 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -180,7 +180,7 @@ catalogs: version: 1.2.4 '@iconify/json': specifier: ^2.2.404 - version: 2.2.407 + version: 2.2.409 monaco: '@shikijs/monaco': specifier: ^3.15.0 @@ -409,8 +409,8 @@ catalogs: specifier: ^2.4.23 version: 2.4.23 prettier: - specifier: ^3.6.2 - version: 3.6.2 + specifier: ^2.8.7 + version: 2.8.7 reactive-vscode: specifier: ^0.4.1 version: 0.4.1 @@ -652,7 +652,7 @@ importers: version: 9.3.0 '@iconify/json': specifier: catalog:icons - version: 2.2.407 + version: 2.2.409 '@shikijs/vitepress-twoslash': specifier: catalog:prod version: 3.15.0(@nuxt/kit@3.13.0(rollup@4.44.1))(typescript@5.9.3) @@ -1163,7 +1163,7 @@ importers: specifier: catalog:types version: 24.10.0 '@types/vscode': - specifier: ^1.101.0 + specifier: ^1.99.0 version: 1.101.0 '@volar/language-server': specifier: catalog:vscode @@ -1182,7 +1182,7 @@ importers: version: 0.10.6 prettier: specifier: catalog:vscode - version: 3.6.2 + version: 2.8.7 reactive-vscode: specifier: catalog:vscode version: 0.4.1(@types/vscode@1.101.0) @@ -1194,7 +1194,7 @@ importers: version: 2.4.0 volar-service-prettier: specifier: catalog:vscode - version: 0.0.64(@volar/language-service@2.4.23)(prettier@3.6.2) + version: 0.0.64(@volar/language-service@2.4.23)(prettier@2.8.7) volar-service-yaml: specifier: catalog:vscode version: 0.0.64(@volar/language-service@2.4.23) @@ -1784,8 +1784,8 @@ packages: '@iconify-json/vscode-icons@1.2.32': resolution: {integrity: sha512-UzZmL6hF02YGu/qEbpskEVnstlNJG+c+0PNzNYTIBf/dXylWHLUVufhOXqAzuGRjkUZ2q7rPpOEwLUPkhkFHUA==} - '@iconify/json@2.2.407': - resolution: {integrity: sha512-GI81Sh05/31UyyIK2+hhMpzJb3PgvAJq/w6B0xgfQcTMwsWOaLL0QV50WNgoIHltt8FvqgR+BK/nOGnrTqugiQ==} + '@iconify/json@2.2.409': + resolution: {integrity: sha512-PnTFu5JSM+GTL2mPwLBi6UDFiQvqG+OVITz9JNfZgSjFuWcF67LhedfjKd4jO/0EgLQLl0StjGbDEu1B19V5vw==} '@iconify/types@2.0.0': resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==} @@ -7046,7 +7046,7 @@ snapshots: '@babel/types': 7.28.5 '@jridgewell/remapping': 2.3.5 convert-source-map: 2.0.0 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -7191,7 +7191,7 @@ snapshots: '@babel/parser': 7.28.5 '@babel/template': 7.27.2 '@babel/types': 7.28.5 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -7204,7 +7204,7 @@ snapshots: '@babel/parser': 7.28.5 '@babel/template': 7.27.2 '@babel/types': 7.28.5 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -7412,7 +7412,7 @@ snapshots: '@eslint/config-array@0.21.1': dependencies: '@eslint/object-schema': 2.1.7 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -7428,7 +7428,7 @@ snapshots: '@eslint/eslintrc@3.3.1': dependencies: ajv: 6.12.6 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) espree: 10.4.0 globals: 14.0.0 ignore: 5.3.2 @@ -7523,7 +7523,7 @@ snapshots: dependencies: '@iconify/types': 2.0.0 - '@iconify/json@2.2.407': + '@iconify/json@2.2.409': dependencies: '@iconify/types': 2.0.0 pathe: 2.0.3 @@ -7535,7 +7535,7 @@ snapshots: '@antfu/install-pkg': 1.1.0 '@antfu/utils': 9.3.0 '@iconify/types': 2.0.0 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) globals: 15.15.0 kolorist: 1.8.0 local-pkg: 1.1.2 @@ -8261,7 +8261,7 @@ snapshots: '@typescript-eslint/types': 8.46.3 '@typescript-eslint/typescript-estree': 8.46.3(typescript@5.9.3) '@typescript-eslint/visitor-keys': 8.46.3 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) eslint: 9.39.1(jiti@2.6.1) typescript: 5.9.3 transitivePeerDependencies: @@ -8271,7 +8271,7 @@ snapshots: dependencies: '@typescript-eslint/tsconfig-utils': 8.46.3(typescript@5.9.3) '@typescript-eslint/types': 8.46.3 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -8290,7 +8290,7 @@ snapshots: '@typescript-eslint/types': 8.46.3 '@typescript-eslint/typescript-estree': 8.46.3(typescript@5.9.3) '@typescript-eslint/utils': 8.46.3(eslint@9.39.1(jiti@2.6.1))(typescript@5.9.3) - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) eslint: 9.39.1(jiti@2.6.1) ts-api-utils: 2.1.0(typescript@5.9.3) typescript: 5.9.3 @@ -8305,7 +8305,7 @@ snapshots: '@typescript-eslint/tsconfig-utils': 8.46.3(typescript@5.9.3) '@typescript-eslint/types': 8.46.3 '@typescript-eslint/visitor-keys': 8.46.3 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) fast-glob: 3.3.3 is-glob: 4.0.3 minimatch: 9.0.5 @@ -8337,7 +8337,7 @@ snapshots: '@typescript/vfs@1.6.1(typescript@5.9.3)': dependencies: - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -8858,7 +8858,7 @@ snapshots: agent-base@7.1.1: dependencies: - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -9905,7 +9905,7 @@ snapshots: '@es-joy/resolve.exports': 1.2.0 are-docs-informative: 0.0.2 comment-parser: 1.4.1 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) escape-string-regexp: 4.0.0 eslint: 9.39.1(jiti@2.6.1) espree: 10.4.0 @@ -9984,7 +9984,7 @@ snapshots: eslint-plugin-toml@0.12.0(eslint@9.39.1(jiti@2.6.1)): dependencies: - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) eslint: 9.39.1(jiti@2.6.1) eslint-compat-utils: 0.6.5(eslint@9.39.1(jiti@2.6.1)) lodash: 4.17.21 @@ -10036,7 +10036,7 @@ snapshots: eslint-plugin-yml@1.19.0(eslint@9.39.1(jiti@2.6.1)): dependencies: - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) diff-sequences: 27.5.1 escape-string-regexp: 4.0.0 eslint: 9.39.1(jiti@2.6.1) @@ -10077,7 +10077,7 @@ snapshots: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.6 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) escape-string-regexp: 4.0.0 eslint-scope: 8.4.0 eslint-visitor-keys: 4.2.1 @@ -10541,7 +10541,7 @@ snapshots: http-proxy-agent@7.0.2: dependencies: agent-base: 7.1.1 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -10554,7 +10554,7 @@ snapshots: https-proxy-agent@7.0.5: dependencies: agent-base: 7.1.1 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -11391,7 +11391,7 @@ snapshots: micromark@4.0.0: dependencies: '@types/debug': 4.1.12 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) decode-named-character-reference: 1.1.0 devlop: 1.1.0 micromark-core-commonmark: 2.0.1 @@ -11869,8 +11869,7 @@ snapshots: '@slidev/parser': 0.47.5 prettier: 3.6.2 - prettier@2.8.7: - optional: true + prettier@2.8.7: {} prettier@3.6.2: {} @@ -12784,7 +12783,7 @@ snapshots: dependencies: '@antfu/install-pkg': 1.1.0 '@iconify/utils': 3.0.2 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) local-pkg: 1.1.2 unplugin: 2.3.10 optionalDependencies: @@ -12800,7 +12799,7 @@ snapshots: unplugin-vue-components@30.0.0(@babel/parser@7.28.5)(@nuxt/kit@3.13.0(rollup@4.44.1))(vue@3.5.24(typescript@5.9.3)): dependencies: chokidar: 4.0.3 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) local-pkg: 1.1.2 magic-string: 0.30.21 mlly: 1.8.0 @@ -12916,7 +12915,7 @@ snapshots: vite-plugin-inspect@11.3.3(@nuxt/kit@3.13.0(rollup@4.44.1))(vite@7.2.2(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.20.6)(yaml@2.8.1)): dependencies: ansis: 4.2.0 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) error-stack-parser-es: 1.0.5 ohash: 2.0.11 open: 10.2.0 @@ -12932,7 +12931,7 @@ snapshots: vite-plugin-remote-assets@2.1.0(vite@7.2.2(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.20.6)(yaml@2.8.1)): dependencies: - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) magic-string: 0.30.21 node-fetch-native: 1.6.7 ohash: 2.0.11 @@ -12950,7 +12949,7 @@ snapshots: vite-plugin-vue-server-ref@1.0.0(vite@7.2.2(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.20.6)(yaml@2.8.1))(vue@3.5.24(typescript@5.9.3)): dependencies: - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) klona: 2.0.6 mlly: 1.8.0 ufo: 1.6.1 @@ -13064,7 +13063,7 @@ snapshots: '@vitest/snapshot': 4.0.8 '@vitest/spy': 4.0.8 '@vitest/utils': 4.0.8 - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) es-module-lexer: 1.7.0 expect-type: 1.2.2 magic-string: 0.30.21 @@ -13094,12 +13093,12 @@ snapshots: - tsx - yaml - volar-service-prettier@0.0.64(@volar/language-service@2.4.23)(prettier@3.6.2): + volar-service-prettier@0.0.64(@volar/language-service@2.4.23)(prettier@2.8.7): dependencies: vscode-uri: 3.0.8 optionalDependencies: '@volar/language-service': 2.4.23 - prettier: 3.6.2 + prettier: 2.8.7 volar-service-yaml@0.0.64(@volar/language-service@2.4.23): dependencies: @@ -13156,7 +13155,7 @@ snapshots: vue-eslint-parser@10.2.0(eslint@9.39.1(jiti@2.6.1)): dependencies: - debug: 4.4.3(supports-color@5.5.0) + debug: 4.4.3(supports-color@8.1.1) eslint: 9.39.1(jiti@2.6.1) eslint-scope: 8.4.0 eslint-visitor-keys: 4.2.1 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 3332bad902..8de92803bb 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -155,7 +155,7 @@ catalogs: vscode: '@volar/language-server': ~2.4.23 '@volar/vscode': ^2.4.23 - prettier: ^3.6.2 + prettier: ^2.8.7 reactive-vscode: ^0.4.1 ts-json-schema-generator: ^2.4.0 volar-service-prettier: ^0.0.64 From 32d50d00c50dbc8519e1daaa439d05a111a2cc53 Mon Sep 17 00:00:00 2001 From: _Kerman Date: Thu, 20 Nov 2025 15:48:18 +0800 Subject: [PATCH 14/14] fix --- packages/vscode/syntaxes/codeblock-patch.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/vscode/syntaxes/codeblock-patch.ts b/packages/vscode/syntaxes/codeblock-patch.ts index 695e843612..91f1cc8962 100644 --- a/packages/vscode/syntaxes/codeblock-patch.ts +++ b/packages/vscode/syntaxes/codeblock-patch.ts @@ -1,9 +1,4 @@ -import { readFileSync } from 'node:fs' -import { join } from 'node:path' - -const Markdown = JSON.parse( - readFileSync(join(import.meta.dirname, '../node_modules/tm-grammars/grammars/markdown.json'), 'utf8'), -) +import Markdown from 'tm-grammars/grammars/markdown.json' with { type: 'json' } const base = { $schema: 'https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json',