From c8af6dbab6100189b7a3e967f034f7ae5a42d051 Mon Sep 17 00:00:00 2001 From: Princesseuh <3019731+Princesseuh@users.noreply.github.com> Date: Wed, 15 May 2024 14:07:53 +0200 Subject: [PATCH] chore: update Volar --- .changeset/large-maps-sneeze.md | 8 + packages/language-server/package.json | 24 +-- packages/ts-plugin/package.json | 4 +- packages/vscode/package.json | 4 +- pnpm-lock.yaml | 202 ++++++++++++++------------ 5 files changed, 136 insertions(+), 106 deletions(-) create mode 100644 .changeset/large-maps-sneeze.md diff --git a/.changeset/large-maps-sneeze.md b/.changeset/large-maps-sneeze.md new file mode 100644 index 00000000..102d78c8 --- /dev/null +++ b/.changeset/large-maps-sneeze.md @@ -0,0 +1,8 @@ +--- +"@astrojs/language-server": minor +"@astrojs/ts-plugin": minor +"astro-vscode": minor +"@astrojs/check": minor +--- + +Upgrades the language server to use the latest version of Volar. This changes should have no negative impacts on the experience. diff --git a/packages/language-server/package.json b/packages/language-server/package.json index 258cce51..1be6798f 100644 --- a/packages/language-server/package.json +++ b/packages/language-server/package.json @@ -23,18 +23,18 @@ "dependencies": { "@astrojs/compiler": "^2.7.0", "@jridgewell/sourcemap-codec": "^1.4.15", - "@volar/kit": "~2.2.1", - "@volar/language-core": "~2.2.1", - "@volar/language-server": "~2.2.1", - "@volar/language-service": "~2.2.1", - "@volar/typescript": "~2.2.1", + "@volar/kit": "~2.2.3", + "@volar/language-core": "~2.2.3", + "@volar/language-server": "~2.2.3", + "@volar/language-service": "~2.2.3", + "@volar/typescript": "~2.2.3", "fast-glob": "^3.2.12", - "volar-service-css": "0.0.43", - "volar-service-emmet": "0.0.43", - "volar-service-html": "0.0.43", - "volar-service-prettier": "0.0.43", - "volar-service-typescript": "0.0.43", - "volar-service-typescript-twoslash-queries": "0.0.43", + "volar-service-css": "0.0.45", + "volar-service-emmet": "0.0.45", + "volar-service-html": "0.0.45", + "volar-service-prettier": "0.0.45", + "volar-service-typescript": "0.0.45", + "volar-service-typescript-twoslash-queries": "0.0.45", "vscode-html-languageservice": "^5.2.0", "vscode-uri": "^3.0.8" }, @@ -45,7 +45,7 @@ "@types/chai": "^4.3.5", "@types/mocha": "^10.0.1", "@types/node": "^18.17.8", - "@volar/test-utils": "~2.2.1", + "@volar/test-utils": "~2.2.3", "astro": "^4.3.5", "chai": "^4.3.7", "mocha": "^10.2.0", diff --git a/packages/ts-plugin/package.json b/packages/ts-plugin/package.json index a7c35227..ca58764e 100644 --- a/packages/ts-plugin/package.json +++ b/packages/ts-plugin/package.json @@ -19,8 +19,8 @@ "author": "withastro", "license": "MIT", "dependencies": { - "@volar/language-core": "~2.2.1", - "@volar/typescript": "~2.2.1", + "@volar/language-core": "~2.2.3", + "@volar/typescript": "~2.2.3", "@astrojs/compiler": "^2.7.0", "@jridgewell/sourcemap-codec": "^1.4.15", "semver": "^7.3.8", diff --git a/packages/vscode/package.json b/packages/vscode/package.json index 27ebf105..28c8f9d9 100644 --- a/packages/vscode/package.json +++ b/packages/vscode/package.json @@ -207,8 +207,8 @@ "@types/mocha": "^10.0.1", "@types/node": "^18.17.8", "@types/vscode": "^1.82.0", - "@volar/language-server": "~2.2.1", - "@volar/vscode": "~2.2.1", + "@volar/language-server": "~2.2.3", + "@volar/vscode": "~2.2.3", "@vscode/test-electron": "^2.3.2", "@vscode/vsce": "latest", "esbuild": "^0.17.19", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index edb6b542..12a822d2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -82,41 +82,41 @@ importers: specifier: ^1.4.15 version: 1.4.15 '@volar/kit': - specifier: ~2.2.1 - version: 2.2.1(typescript@5.2.2) + specifier: ~2.2.3 + version: 2.2.3(typescript@5.2.2) '@volar/language-core': - specifier: ~2.2.1 - version: 2.2.1 + specifier: ~2.2.3 + version: 2.2.3 '@volar/language-server': - specifier: ~2.2.1 - version: 2.2.1 + specifier: ~2.2.3 + version: 2.2.3 '@volar/language-service': - specifier: ~2.2.1 - version: 2.2.1 + specifier: ~2.2.3 + version: 2.2.3 '@volar/typescript': - specifier: ~2.2.1 - version: 2.2.1 + specifier: ~2.2.3 + version: 2.2.3 fast-glob: specifier: ^3.2.12 version: 3.2.12 volar-service-css: - specifier: 0.0.43 - version: 0.0.43(@volar/language-service@2.2.1) + specifier: 0.0.45 + version: 0.0.45(@volar/language-service@2.2.3) volar-service-emmet: - specifier: 0.0.43 - version: 0.0.43(@volar/language-service@2.2.1) + specifier: 0.0.45 + version: 0.0.45(@volar/language-service@2.2.3) volar-service-html: - specifier: 0.0.43 - version: 0.0.43(@volar/language-service@2.2.1) + specifier: 0.0.45 + version: 0.0.45(@volar/language-service@2.2.3) volar-service-prettier: - specifier: 0.0.43 - version: 0.0.43(@volar/language-service@2.2.1)(prettier@3.2.5) + specifier: 0.0.45 + version: 0.0.45(@volar/language-service@2.2.3)(prettier@3.2.5) volar-service-typescript: - specifier: 0.0.43 - version: 0.0.43(@volar/language-service@2.2.1) + specifier: 0.0.45 + version: 0.0.45(@volar/language-service@2.2.3) volar-service-typescript-twoslash-queries: - specifier: 0.0.43 - version: 0.0.43(@volar/language-service@2.2.1) + specifier: 0.0.45 + version: 0.0.45(@volar/language-service@2.2.3) vscode-html-languageservice: specifier: ^5.2.0 version: 5.2.0 @@ -140,8 +140,8 @@ importers: specifier: ^18.17.8 version: 18.17.8 '@volar/test-utils': - specifier: ~2.2.1 - version: 2.2.1 + specifier: ~2.2.3 + version: 2.2.3 astro: specifier: ^4.3.5 version: 4.3.5(@types/node@18.17.8)(typescript@5.2.2) @@ -182,11 +182,11 @@ importers: specifier: ^1.4.15 version: 1.4.15 '@volar/language-core': - specifier: ~2.2.1 - version: 2.2.1 + specifier: ~2.2.3 + version: 2.2.3 '@volar/typescript': - specifier: ~2.2.1 - version: 2.2.1 + specifier: ~2.2.3 + version: 2.2.3 semver: specifier: ^7.3.8 version: 7.5.4 @@ -247,17 +247,17 @@ importers: specifier: ^1.82.0 version: 1.83.0 '@volar/language-server': - specifier: ~2.2.1 - version: 2.2.1 + specifier: ~2.2.3 + version: 2.2.3 '@volar/vscode': - specifier: ~2.2.1 - version: 2.2.1 + specifier: ~2.2.3 + version: 2.2.3 '@vscode/test-electron': specifier: ^2.3.2 version: 2.3.2 '@vscode/vsce': specifier: latest - version: 2.26.1 + version: 2.26.0 esbuild: specifier: ^0.17.19 version: 0.17.19 @@ -1202,10 +1202,31 @@ packages: '@emmetio/scanner': 1.0.4 dev: false + /@emmetio/css-parser@0.4.0: + resolution: {integrity: sha512-z7wkxRSZgrQHXVzObGkXG+Vmj3uRlpM11oCZ9pbaz0nFejvCDmAiNDpY75+wgXOcffKpj4rzGtwGaZxfJKsJxw==} + dependencies: + '@emmetio/stream-reader': 2.2.0 + '@emmetio/stream-reader-utils': 0.1.0 + dev: false + + /@emmetio/html-matcher@1.3.0: + resolution: {integrity: sha512-NTbsvppE5eVyBMuyGfVu2CRrLvo7J4YHb6t9sBFLyY03WYhXET37qA4zOYUjBWFCRHO7pS1B9khERtY0f5JXPQ==} + dependencies: + '@emmetio/scanner': 1.0.4 + dev: false + /@emmetio/scanner@1.0.4: resolution: {integrity: sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==} dev: false + /@emmetio/stream-reader-utils@0.1.0: + resolution: {integrity: sha512-ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A==} + dev: false + + /@emmetio/stream-reader@2.2.0: + resolution: {integrity: sha512-fXVXEyFA5Yv3M3n8sUGT7+fvecGrZP4k6FnWWMSZVQf69kAq0LLpaBQLGcPR30m3zMmKYhECP4k/ZkzvhEW5kw==} + dev: false + /@esbuild-kit/cjs-loader@2.4.2: resolution: {integrity: sha512-BDXFbYOJzT/NBEtp71cvsrGPwGAMGRB/349rwKuoxNSiKjPraNNnlK6MIIabViCjqZugu6j+xeMDlEkWdHHJSg==} dependencies: @@ -2243,31 +2264,31 @@ packages: optional: true dev: true - /@volar/kit@2.2.1(typescript@5.2.2): - resolution: {integrity: sha512-Ga1uqGfNATdJd0nlpRxFcJoew6xqJwkATvsPiAMvinmfmmJzkGLdVLZl8aNnaDq2TBId/+5daPbwBMAzdu1Sjw==} + /@volar/kit@2.2.3(typescript@5.2.2): + resolution: {integrity: sha512-+l9NsI9oTcLhhjLT+iwbSIST4ivKwGEezVxVvxIcKghI5gwZSbh1as5eZNQEoi1+Ia0bw23QB3VofspxPuCuRw==} peerDependencies: typescript: '*' dependencies: - '@volar/language-service': 2.2.1 - '@volar/typescript': 2.2.1 + '@volar/language-service': 2.2.3 + '@volar/typescript': 2.2.3 typesafe-path: 0.2.2 typescript: 5.2.2 vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 dev: false - /@volar/language-core@2.2.1: - resolution: {integrity: sha512-iHJAZKcYldZgyS8gx6DfIZApViVBeqbf6iPhqoZpG5A6F4zsZiFldKfwaKaBA3/wnOTWE2i8VUbXywI1WywCPg==} + /@volar/language-core@2.2.3: + resolution: {integrity: sha512-8GT6QiWJMdiU4k/PStcGYLGYjoaQnN/hbFNtHvturzdIiK2tJRmZuub4tBrwGS4AeklhkvA32E6fPdGMQkMPLA==} dependencies: - '@volar/source-map': 2.2.1 + '@volar/source-map': 2.2.3 - /@volar/language-server@2.2.1: - resolution: {integrity: sha512-29j2owXGUd9nk9+vuRbasoRp5XcRQSbzHUwBUh9Yhf9zkctTZZJDT+Q1wjBKI+5XohR7UVQCBEvmLp4L+WirwA==} + /@volar/language-server@2.2.3: + resolution: {integrity: sha512-BubmmAJBXIe8KcvHDL729KQoKB3cyy8hT0lhLxHaqMnGLj87rbYzjJm0cgnf13XFz4qrcN5Wjes3wSIGQ3MbXw==} dependencies: - '@volar/language-core': 2.2.1 - '@volar/language-service': 2.2.1 - '@volar/snapshot-document': 2.2.1 - '@volar/typescript': 2.2.1 + '@volar/language-core': 2.2.3 + '@volar/language-service': 2.2.3 + '@volar/snapshot-document': 2.2.3 + '@volar/typescript': 2.2.3 '@vscode/l10n': 0.0.16 path-browserify: 1.0.1 request-light: 0.7.0 @@ -2276,44 +2297,44 @@ packages: vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 - /@volar/language-service@2.2.1: - resolution: {integrity: sha512-Zt0xELrxTJ+Aag44qkXSFRRIPh2XrhRTYaxUmZNY6QIIu5wWfroySK4LZaA6g7WhloGTrATstk3OxPS0RSlbRw==} + /@volar/language-service@2.2.3: + resolution: {integrity: sha512-hqIUdrODcmyddHsK6hqqcBJc6pJN6BZ86uD7r+ka77iN70zcVMNdymqlMeSPCPSPkC2Ar2rhCGhNoVvEDyim/g==} dependencies: - '@volar/language-core': 2.2.1 + '@volar/language-core': 2.2.3 vscode-languageserver-protocol: 3.17.5 vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 - /@volar/snapshot-document@2.2.1: - resolution: {integrity: sha512-ISq74JwzdPcjw7TjZZ9VdOYdgwPoX/X3Jus3emD4ftG59v0gomIp11yz7Ds65rUi/coss/uTPse+onXR+64rpg==} + /@volar/snapshot-document@2.2.3: + resolution: {integrity: sha512-cs6+QYFFVD1BiWiHpwnuxvA+F56qsQrP4XzeTLah9BznrcLBXQBSquwF5m3g9TkgTBMDkdillKo9TWlUeg/05A==} dependencies: vscode-languageserver-protocol: 3.17.5 vscode-languageserver-textdocument: 1.0.11 - /@volar/source-map@2.2.1: - resolution: {integrity: sha512-w1Bgpguhbp7YTr7VUFu6gb4iAZjeEPsOX4zpgiuvlldbzvIWDWy4t0jVifsIsxZ99HAu+c3swiME7wt+GeNqhA==} + /@volar/source-map@2.2.3: + resolution: {integrity: sha512-Be1rBnC0yvLprcCaoNxU+hLUguYQt4jp/IBnwdMbCXLDWIU0fXHgPPIBWmYSiGe0uu0ns5cQMEqzNsGwiX/mGw==} dependencies: muggle-string: 0.4.0 - /@volar/test-utils@2.2.1: - resolution: {integrity: sha512-L9xeIa0kfemzQkDvdVg33AuYfFTOVQgoTBYMXKxWSdiZRBLr01pUlZrvGt4kJxCUYtGDgzCuNBQVK112s1bgNQ==} + /@volar/test-utils@2.2.3: + resolution: {integrity: sha512-88R9CitNA5AdRlxiNeooa7pbdVSim0DpuQeB3oJknyzRACPklryOV0FPmayBDVaUOVh/GvD6hC5GivdimY5tpw==} dependencies: - '@volar/language-core': 2.2.1 - '@volar/language-server': 2.2.1 + '@volar/language-core': 2.2.3 + '@volar/language-server': 2.2.3 vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 dev: true - /@volar/typescript@2.2.1: - resolution: {integrity: sha512-Z/tqluR7Hz5/5dCqQp7wo9C/6tSv/IYl+tTzgzUt2NjTq95bKSsuO4E+V06D0c+3aP9x5S9jggLqw451hpnc6Q==} + /@volar/typescript@2.2.3: + resolution: {integrity: sha512-/0zAf1Rn5x0Pw5kKJp1n522CRp6ptPhvECH3250d3NBo0qwxP183brcVO+0ourqGWQy39vcfB3VwQnze6w4mgQ==} dependencies: - '@volar/language-core': 2.2.1 + '@volar/language-core': 2.2.3 path-browserify: 1.0.1 - /@volar/vscode@2.2.1: - resolution: {integrity: sha512-Xqk5ORMNOzYaaIu9xsfurZzSt3ekInBgRt1wyz7DgzkJKqFeX+Sfs2QDWlOATsE+y/A9ZNt4E0e0gXWF/Q9gMQ==} + /@volar/vscode@2.2.3: + resolution: {integrity: sha512-lHZ2xTM1lGHijc1w0EPkQqaEArGI359Nlw81yvo3n0/zCa5xDptU9WztMPdElYwTX8nd/MwBBhiNBJIx/lVisA==} dependencies: - '@volar/language-server': 2.2.1 + '@volar/language-server': 2.2.3 path-browserify: 1.0.1 vscode-languageclient: 9.0.1 vscode-nls: 5.2.0 @@ -2348,8 +2369,8 @@ packages: - supports-color dev: true - /@vscode/vsce@2.26.1: - resolution: {integrity: sha512-QOG6Ht7V93nhwcBxPWcG33UK0qDGEoJdg0xtVeaTN27W6PGdMJUJGTPhB/sNHUIFKwvwzv/zMAHvDgMNXbcwlA==} + /@vscode/vsce@2.26.0: + resolution: {integrity: sha512-v54ltgMzUG8lGY0kAgaOlry57xse1RlWzes9FotfGEx+Fr05KeR8rZicQzEMDmi9QnOgVWHuiEq+xA2HWkAz+Q==} engines: {node: '>= 16'} hasBin: true dependencies: @@ -7469,51 +7490,52 @@ packages: vite: 5.0.12(@types/node@18.17.8) dev: true - /volar-service-css@0.0.43(@volar/language-service@2.2.1): - resolution: {integrity: sha512-rg2gTXhswq6Wz8euZgCRS68+7EPH+3R7SeTqYfAAtHKoU0rS1bwdxP1CWHezyxnHrLMiXEypCgJJWcMTay3W7g==} + /volar-service-css@0.0.45(@volar/language-service@2.2.3): + resolution: {integrity: sha512-f+AlUI1+kESbcZSVaNJVAnK0c/9Da5StoxzPqA5/8VqUHJWNdubWNnwG5xpFVTfgh6pgTcey3UBhBfHytFaIOg==} peerDependencies: - '@volar/language-service': ~2.2.0 + '@volar/language-service': ~2.2.3 peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 2.2.1 + '@volar/language-service': 2.2.3 vscode-css-languageservice: 6.2.10 vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 dev: false - /volar-service-emmet@0.0.43(@volar/language-service@2.2.1): - resolution: {integrity: sha512-ODsSOsSScVTNSD1Z+e4EV21RuN3q38ahGnuyxKYHW9Fg0RwfLatHl6wIRfj21XlVVa8twBMsA/Fp43ObuDEBxQ==} + /volar-service-emmet@0.0.45(@volar/language-service@2.2.3): + resolution: {integrity: sha512-9nLXSDkR1vA/3fQkFEsSXAu3XovQxOpTkVG2jilQgfek/K1ZLkaA/WMhN/TtmPmQg4NxE9Ni6mA5udBQ5gVXIA==} peerDependencies: - '@volar/language-service': ~2.2.0 + '@volar/language-service': ~2.2.3 peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 2.2.1 + '@emmetio/css-parser': 0.4.0 + '@emmetio/html-matcher': 1.3.0 + '@volar/language-service': 2.2.3 '@vscode/emmet-helper': 2.9.2 - vscode-html-languageservice: /@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462 dev: false - /volar-service-html@0.0.43(@volar/language-service@2.2.1): - resolution: {integrity: sha512-Z/S7SCkHmpoR708WTQLCE3k+hfT16xjMfq9Htv7Y3yJeykah1jZO8oZX3433OPFfbS/ZFbGa2VlAIgDTVRU5Pg==} + /volar-service-html@0.0.45(@volar/language-service@2.2.3): + resolution: {integrity: sha512-tLTJqfy1v5C4nmeAsfekFIKPl4r4qDMyL0L9MWywr/EApZzPCsbeUGxCqdzxSMC2q7PMCfX2i167txDo+J0LVA==} peerDependencies: - '@volar/language-service': ~2.2.0 + '@volar/language-service': ~2.2.3 peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 2.2.1 + '@volar/language-service': 2.2.3 vscode-html-languageservice: /@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462 vscode-languageserver-textdocument: 1.0.11 vscode-uri: 3.0.8 dev: false - /volar-service-prettier@0.0.43(@volar/language-service@2.2.1)(prettier@3.2.5): - resolution: {integrity: sha512-Beq+iNyG05PlSPTISOFK5Yoj29rXdGb6htvyFk2u0jVFRGX1QD0Pb5ze9OiqfUVwT+3cFZhPrSPndbTR1ft/aA==} + /volar-service-prettier@0.0.45(@volar/language-service@2.2.3)(prettier@3.2.5): + resolution: {integrity: sha512-+mBS2EsDgp/kunKEBnHvhBwIQm5v2ahw4NKpKdg4sTpXy3UxqHt+Fq/wRYQ7Z8LlNVNRVfp75ThjM+w2zaZBAw==} peerDependencies: - '@volar/language-service': ~2.2.0 + '@volar/language-service': ~2.2.3 prettier: ^2.2 || ^3.0 peerDependenciesMeta: '@volar/language-service': @@ -7521,31 +7543,31 @@ packages: prettier: optional: true dependencies: - '@volar/language-service': 2.2.1 + '@volar/language-service': 2.2.3 prettier: 3.2.5 vscode-uri: 3.0.8 dev: false - /volar-service-typescript-twoslash-queries@0.0.43(@volar/language-service@2.2.1): - resolution: {integrity: sha512-FUqgvK2a6YxNO0P+zmY5syVatD8I7+qEA+mj1lotqQxwtY0Gh3UDCCqTVapX1E4VxF/pvNac7eVOBkCUVVZC5w==} + /volar-service-typescript-twoslash-queries@0.0.45(@volar/language-service@2.2.3): + resolution: {integrity: sha512-KrPUUvKggZgV9mrDpstCzmf20irgv0ooMv+FGDzIIQUkya+d2+nSS8Mx2h9FvsYgLccUVw5jU3Rhwhd3pv/7qg==} peerDependencies: - '@volar/language-service': ~2.2.0 + '@volar/language-service': ~2.2.3 peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 2.2.1 + '@volar/language-service': 2.2.3 dev: false - /volar-service-typescript@0.0.43(@volar/language-service@2.2.1): - resolution: {integrity: sha512-oXYZHuM7QYBmgSiheFkoQPyUzzvm9ddaUzfDqc9cOM+fDuMAkUer2bEqnqZXerGjhsjuXNCu4PGlSOJJMxWe3A==} + /volar-service-typescript@0.0.45(@volar/language-service@2.2.3): + resolution: {integrity: sha512-i/mMIIAMastJ2kgPo3qvX0Rrl7NyxhIYZ0ug/B4ambZcLPI1vzBgS2fmvyWX3jhBYHh8NmbAotFj+0Y9JtN47A==} peerDependencies: - '@volar/language-service': ~2.2.0 + '@volar/language-service': ~2.2.3 peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 2.2.1 + '@volar/language-service': 2.2.3 path-browserify: 1.0.1 semver: 7.5.4 typescript-auto-import-cache: 0.3.2