From 327b9ed37f358476d62eee4f646e219aa34a4689 Mon Sep 17 00:00:00 2001 From: _Kerman Date: Sat, 21 Jun 2025 15:14:42 +0800 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] [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 7/7] [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)