From 13268dd3cf4c6bf1477c4f4ce3c9accb954ca061 Mon Sep 17 00:00:00 2001 From: Johnson Chu Date: Tue, 4 Jul 2023 03:01:10 +0800 Subject: [PATCH 01/25] chore: bump volar --- package.json | 2 +- packages/vscode-vue/package.json | 2 +- packages/vue-component-meta/package.json | 2 +- packages/vue-language-core/package.json | 4 +- packages/vue-language-plugin-pug/package.json | 4 +- packages/vue-language-server/package.json | 6 +- packages/vue-language-service/package.json | 24 +- packages/vue-typescript/package.json | 2 +- pnpm-lock.yaml | 412 ++++++++---------- 9 files changed, 206 insertions(+), 252 deletions(-) diff --git a/package.json b/package.json index ccb96eb30..ee22bd03c 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "devDependencies": { "@types/node": "latest", - "@volar/language-service": "1.7.10", + "@volar/language-service": "1.8.0", "typescript": "latest", "vite": "latest", "vitest": "latest" diff --git a/packages/vscode-vue/package.json b/packages/vscode-vue/package.json index 30c5e89a7..907e85a2d 100644 --- a/packages/vscode-vue/package.json +++ b/packages/vscode-vue/package.json @@ -733,7 +733,7 @@ "devDependencies": { "@types/semver": "^7.3.13", "@types/vscode": "1.67.0", - "@volar/vscode": "1.7.10", + "@volar/vscode": "1.8.0", "@vue/language-core": "1.8.3", "@vue/language-server": "1.8.3", "esbuild": "0.15.18", diff --git a/packages/vue-component-meta/package.json b/packages/vue-component-meta/package.json index 1a38f5d6c..0886114b6 100644 --- a/packages/vue-component-meta/package.json +++ b/packages/vue-component-meta/package.json @@ -13,7 +13,7 @@ "directory": "packages/vue-component-meta" }, "dependencies": { - "@volar/typescript": "1.7.10", + "@volar/typescript": "1.8.0", "@vue/language-core": "1.8.3", "typesafe-path": "^0.2.2", "vue-component-type-helpers": "1.8.3" diff --git a/packages/vue-language-core/package.json b/packages/vue-language-core/package.json index 37dd524c9..f2170875c 100644 --- a/packages/vue-language-core/package.json +++ b/packages/vue-language-core/package.json @@ -13,8 +13,8 @@ "directory": "packages/vue-language-core" }, "dependencies": { - "@volar/language-core": "1.7.10", - "@volar/source-map": "1.7.10", + "@volar/language-core": "1.8.0", + "@volar/source-map": "1.8.0", "@vue/compiler-dom": "^3.3.0", "@vue/reactivity": "^3.3.0", "@vue/shared": "^3.3.0", diff --git a/packages/vue-language-plugin-pug/package.json b/packages/vue-language-plugin-pug/package.json index 5a0392c88..e8357087b 100644 --- a/packages/vue-language-plugin-pug/package.json +++ b/packages/vue-language-plugin-pug/package.json @@ -16,7 +16,7 @@ "@vue/language-core": "1.8.3" }, "dependencies": { - "@volar/source-map": "1.7.10", - "volar-service-pug": "0.0.8" + "@volar/source-map": "1.8.0", + "volar-service-pug": "0.0.9" } } diff --git a/packages/vue-language-server/package.json b/packages/vue-language-server/package.json index db47feeea..3cd5d6e0c 100644 --- a/packages/vue-language-server/package.json +++ b/packages/vue-language-server/package.json @@ -16,9 +16,9 @@ "directory": "packages/vue-language-server" }, "dependencies": { - "@volar/language-core": "1.7.10", - "@volar/language-server": "1.7.10", - "@volar/typescript": "1.7.10", + "@volar/language-core": "1.8.0", + "@volar/language-server": "1.8.0", + "@volar/typescript": "1.8.0", "@vue/language-core": "1.8.3", "@vue/language-service": "1.8.3", "vscode-languageserver-protocol": "^3.17.3", diff --git a/packages/vue-language-service/package.json b/packages/vue-language-service/package.json index 8aa0bc988..e9d6c2780 100644 --- a/packages/vue-language-service/package.json +++ b/packages/vue-language-service/package.json @@ -17,26 +17,26 @@ "update-html-data": "node ./scripts/update-html-data.js" }, "dependencies": { - "@volar/language-core": "1.7.10", - "@volar/language-service": "1.7.10", - "@volar/typescript": "1.7.10", + "@volar/language-core": "1.8.0", + "@volar/language-service": "1.8.0", + "@volar/typescript": "1.8.0", "@vue/compiler-dom": "^3.3.0", "@vue/language-core": "1.8.3", "@vue/reactivity": "^3.3.0", "@vue/shared": "^3.3.0", - "volar-service-css": "0.0.8", - "volar-service-emmet": "0.0.8", - "volar-service-html": "0.0.8", - "volar-service-json": "0.0.8", - "volar-service-pug": "0.0.8", - "volar-service-pug-beautify": "0.0.8", - "volar-service-typescript": "0.0.8", - "volar-service-typescript-twoslash-queries": "0.0.8", + "volar-service-css": "0.0.9", + "volar-service-emmet": "0.0.9", + "volar-service-html": "0.0.9", + "volar-service-json": "0.0.9", + "volar-service-pug": "0.0.9", + "volar-service-pug-beautify": "0.0.9", + "volar-service-typescript": "0.0.9", + "volar-service-typescript-twoslash-queries": "0.0.9", "vscode-html-languageservice": "^5.0.4", "vscode-languageserver-textdocument": "^1.0.8" }, "devDependencies": { - "@volar/kit": "1.7.10", + "@volar/kit": "1.8.0", "vscode-languageserver-protocol": "^3.17.3", "vscode-uri": "^3.0.7" } diff --git a/packages/vue-typescript/package.json b/packages/vue-typescript/package.json index 80eedd6d2..bef82b46e 100644 --- a/packages/vue-typescript/package.json +++ b/packages/vue-typescript/package.json @@ -13,7 +13,7 @@ "directory": "packages/vue-typescript" }, "dependencies": { - "@volar/typescript": "1.7.10", + "@volar/typescript": "1.8.0", "@vue/language-core": "1.8.3" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 101729b40..7a577f0aa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,8 +19,8 @@ importers: specifier: latest version: 20.3.3 '@volar/language-service': - specifier: 1.7.10 - version: 1.7.10 + specifier: 1.8.0 + version: 1.8.0 typescript: specifier: latest version: 5.1.6 @@ -29,7 +29,7 @@ importers: version: 4.3.9(@types/node@20.3.3) vitest: specifier: latest - version: 0.32.2 + version: 0.32.4 packages/typescript-vue-plugin: dependencies: @@ -64,8 +64,8 @@ importers: specifier: 1.67.0 version: 1.67.0 '@volar/vscode': - specifier: 1.7.10 - version: 1.7.10 + specifier: 1.8.0 + version: 1.8.0 '@vue/language-core': specifier: 1.8.3 version: link:../vue-language-core @@ -94,8 +94,8 @@ importers: packages/vue-component-meta: dependencies: '@volar/typescript': - specifier: 1.7.10 - version: 1.7.10 + specifier: 1.8.0 + version: 1.8.0 '@vue/language-core': specifier: 1.8.3 version: link:../vue-language-core @@ -111,11 +111,11 @@ importers: packages/vue-language-core: dependencies: '@volar/language-core': - specifier: 1.7.10 - version: 1.7.10 + specifier: 1.8.0 + version: 1.8.0 '@volar/source-map': - specifier: 1.7.10 - version: 1.7.10 + specifier: 1.8.0 + version: 1.8.0 '@vue/compiler-dom': specifier: ^3.3.0 version: 3.3.4 @@ -145,11 +145,11 @@ importers: packages/vue-language-plugin-pug: dependencies: '@volar/source-map': - specifier: 1.7.10 - version: 1.7.10 + specifier: 1.8.0 + version: 1.8.0 volar-service-pug: - specifier: 0.0.8 - version: 0.0.8 + specifier: 0.0.9 + version: 0.0.9 devDependencies: '@vue/language-core': specifier: 1.8.3 @@ -158,14 +158,14 @@ importers: packages/vue-language-server: dependencies: '@volar/language-core': - specifier: 1.7.10 - version: 1.7.10 + specifier: 1.8.0 + version: 1.8.0 '@volar/language-server': - specifier: 1.7.10 - version: 1.7.10 + specifier: 1.8.0 + version: 1.8.0 '@volar/typescript': - specifier: 1.7.10 - version: 1.7.10 + specifier: 1.8.0 + version: 1.8.0 '@vue/language-core': specifier: 1.8.3 version: link:../vue-language-core @@ -182,14 +182,14 @@ importers: packages/vue-language-service: dependencies: '@volar/language-core': - specifier: 1.7.10 - version: 1.7.10 + specifier: 1.8.0 + version: 1.8.0 '@volar/language-service': - specifier: 1.7.10 - version: 1.7.10 + specifier: 1.8.0 + version: 1.8.0 '@volar/typescript': - specifier: 1.7.10 - version: 1.7.10 + specifier: 1.8.0 + version: 1.8.0 '@vue/compiler-dom': specifier: ^3.3.0 version: 3.3.4 @@ -203,29 +203,29 @@ importers: specifier: ^3.3.0 version: 3.3.4 volar-service-css: - specifier: 0.0.8 - version: 0.0.8(@volar/language-service@1.7.10) + specifier: 0.0.9 + version: 0.0.9(@volar/language-service@1.8.0) volar-service-emmet: - specifier: 0.0.8 - version: 0.0.8(@volar/language-service@1.7.10) + specifier: 0.0.9 + version: 0.0.9(@volar/language-service@1.8.0) volar-service-html: - specifier: 0.0.8 - version: 0.0.8(@volar/language-service@1.7.10) + specifier: 0.0.9 + version: 0.0.9(@volar/language-service@1.8.0) volar-service-json: - specifier: 0.0.8 - version: 0.0.8(@volar/language-service@1.7.10) + specifier: 0.0.9 + version: 0.0.9(@volar/language-service@1.8.0) volar-service-pug: - specifier: 0.0.8 - version: 0.0.8 + specifier: 0.0.9 + version: 0.0.9 volar-service-pug-beautify: - specifier: 0.0.8 - version: 0.0.8(@volar/language-service@1.7.10) + specifier: 0.0.9 + version: 0.0.9(@volar/language-service@1.8.0) volar-service-typescript: - specifier: 0.0.8 - version: 0.0.8(@volar/language-service@1.7.10)(@volar/typescript@1.7.10) + specifier: 0.0.9 + version: 0.0.9(@volar/language-service@1.8.0)(@volar/typescript@1.8.0) volar-service-typescript-twoslash-queries: - specifier: 0.0.8 - version: 0.0.8(@volar/language-service@1.7.10) + specifier: 0.0.9 + version: 0.0.9(@volar/language-service@1.8.0) vscode-html-languageservice: specifier: ^5.0.4 version: 5.0.6 @@ -234,8 +234,8 @@ importers: version: 1.0.8 devDependencies: '@volar/kit': - specifier: 1.7.10 - version: 1.7.10(typescript@5.1.6) + specifier: 1.8.0 + version: 1.8.0(typescript@5.1.6) vscode-languageserver-protocol: specifier: ^3.17.3 version: 3.17.3 @@ -280,8 +280,8 @@ importers: packages/vue-typescript: dependencies: '@volar/typescript': - specifier: 1.7.10 - version: 1.7.10 + specifier: 1.8.0 + version: 1.8.0 '@vue/language-core': specifier: 1.8.3 version: link:../vue-language-core @@ -585,6 +585,13 @@ packages: dev: false optional: true + /@jest/schemas@29.4.3: + resolution: {integrity: sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dependencies: + '@sinclair/typebox': 0.25.24 + dev: true + /@johnsoncodehk/pug-beautify@0.2.2: resolution: {integrity: sha512-qqNS/YD0Nck5wtQLCPHAfGVgWbbGafxSPjNh0ekYPFSNNqnDH2kamnduzYly8IiADmeVx/MfAE1njMEjVeHTMA==} dev: false @@ -638,7 +645,7 @@ packages: engines: {node: '>=16.15.0', npm: '>=8.5.0'} dependencies: '@npmcli/run-script': 6.0.2 - chalk: 5.2.0 + chalk: 5.3.0 clone-deep: 4.0.1 config-chain: 1.1.13 cosmiconfig: 8.2.0 @@ -646,7 +653,7 @@ packages: execa: 7.1.1 fs-extra: 11.1.1 glob-parent: 6.0.2 - globby: 13.2.0 + globby: 13.2.1 inquirer: 9.2.7 is-ci: 3.0.1 json5: 2.2.3 @@ -691,7 +698,7 @@ packages: '@lerna-lite/version': 2.4.2(@lerna-lite/publish@2.4.3) '@npmcli/arborist': 6.2.10 byte-size: 8.1.1 - chalk: 5.2.0 + chalk: 5.3.0 columnify: 1.6.0 fs-extra: 11.1.1 glob: 10.3.1 @@ -731,7 +738,7 @@ packages: '@lerna-lite/core': 2.4.2 '@octokit/plugin-enterprise-rest': 6.0.1 '@octokit/rest': 19.0.13 - chalk: 5.2.0 + chalk: 5.3.0 conventional-changelog-angular: 5.0.13 conventional-changelog-core: 4.2.4 conventional-changelog-writer: 5.0.1 @@ -739,7 +746,7 @@ packages: conventional-recommended-bump: 6.1.0 dedent: 0.7.0 fs-extra: 11.1.1 - get-stream: 7.0.0 + get-stream: 7.0.1 git-url-parse: 13.1.0 graceful-fs: 4.2.11 is-stream: 3.0.0 @@ -1053,7 +1060,7 @@ packages: '@octokit/request-error': 3.0.3 '@octokit/types': 9.3.2 is-plain-object: 5.0.0 - node-fetch: 2.6.11 + node-fetch: 2.6.12 universal-user-agent: 6.0.0 transitivePeerDependencies: - encoding @@ -1105,18 +1112,21 @@ packages: dev: false optional: true - /@sigstore/tuf@1.0.0: - resolution: {integrity: sha512-bLzi9GeZgMCvjJeLUIfs8LJYCxrPRA8IXQkzUtaFKKVPTz0mucRyqFcV2U20yg9K+kYAD0YSitzGfRZCFLjdHQ==} + /@sigstore/tuf@1.0.2: + resolution: {integrity: sha512-vjwcYePJzM01Ha6oWWZ9gNcdIgnzyFxfqfWzph483DPJTH8Tb7f7bQRRll3CYVkyH56j0AgcPAcl6Vg95DPF+Q==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dependencies: '@sigstore/protobuf-specs': 0.1.0 - make-fetch-happen: 11.1.1 tuf-js: 1.1.7 transitivePeerDependencies: - supports-color dev: false optional: true + /@sinclair/typebox@0.25.24: + resolution: {integrity: sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==} + dev: true + /@tootallnate/once@2.0.0: resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==} engines: {node: '>= 10'} @@ -1189,68 +1199,67 @@ packages: resolution: {integrity: sha512-GH8BDf8cw9AC9080uneJfulhSa7KHSMI2s/CyKePXoGNos9J486w2V4YKoeNUqIEkW4hKoEAWp6/cXTwyGj47g==} dev: true - /@vitest/expect@0.32.2: - resolution: {integrity: sha512-6q5yzweLnyEv5Zz1fqK5u5E83LU+gOMVBDuxBl2d2Jfx1BAp5M+rZgc5mlyqdnxquyoiOXpXmFNkcGcfFnFH3Q==} + /@vitest/expect@0.32.4: + resolution: {integrity: sha512-m7EPUqmGIwIeoU763N+ivkFjTzbaBn0n9evsTOcde03ugy2avPs3kZbYmw3DkcH1j5mxhMhdamJkLQ6dM1bk/A==} dependencies: - '@vitest/spy': 0.32.2 - '@vitest/utils': 0.32.2 + '@vitest/spy': 0.32.4 + '@vitest/utils': 0.32.4 chai: 4.3.7 dev: true - /@vitest/runner@0.32.2: - resolution: {integrity: sha512-06vEL0C1pomOEktGoLjzZw+1Fb+7RBRhmw/06WkDrd1akkT9i12su0ku+R/0QM69dfkIL/rAIDTG+CSuQVDcKw==} + /@vitest/runner@0.32.4: + resolution: {integrity: sha512-cHOVCkiRazobgdKLnczmz2oaKK9GJOw6ZyRcaPdssO1ej+wzHVIkWiCiNacb3TTYPdzMddYkCgMjZ4r8C0JFCw==} dependencies: - '@vitest/utils': 0.32.2 - concordance: 5.0.4 + '@vitest/utils': 0.32.4 p-limit: 4.0.0 pathe: 1.1.1 dev: true - /@vitest/snapshot@0.32.2: - resolution: {integrity: sha512-JwhpeH/PPc7GJX38vEfCy9LtRzf9F4er7i4OsAJyV7sjPwjj+AIR8cUgpMTWK4S3TiamzopcTyLsZDMuldoi5A==} + /@vitest/snapshot@0.32.4: + resolution: {integrity: sha512-IRpyqn9t14uqsFlVI2d7DFMImGMs1Q9218of40bdQQgMePwVdmix33yMNnebXcTzDU5eiV3eUsoxxH5v0x/IQA==} dependencies: magic-string: 0.30.0 pathe: 1.1.1 - pretty-format: 27.5.1 + pretty-format: 29.5.0 dev: true - /@vitest/spy@0.32.2: - resolution: {integrity: sha512-Q/ZNILJ4ca/VzQbRM8ur3Si5Sardsh1HofatG9wsJY1RfEaw0XKP8IVax2lI1qnrk9YPuG9LA2LkZ0EI/3d4ug==} + /@vitest/spy@0.32.4: + resolution: {integrity: sha512-oA7rCOqVOOpE6rEoXuCOADX7Lla1LIa4hljI2MSccbpec54q+oifhziZIJXxlE/CvI2E+ElhBHzVu0VEvJGQKQ==} dependencies: tinyspy: 2.1.1 dev: true - /@vitest/utils@0.32.2: - resolution: {integrity: sha512-lnJ0T5i03j0IJaeW73hxe2AuVnZ/y1BhhCOuIcl9LIzXnbpXJT9Lrt6brwKHXLOiA7MZ6N5hSJjt0xE1dGNCzQ==} + /@vitest/utils@0.32.4: + resolution: {integrity: sha512-Gwnl8dhd1uJ+HXrYyV0eRqfmk9ek1ASE/LWfTCuWMw+d07ogHqp4hEAV28NiecimK6UY9DpSEPh+pXBA5gtTBg==} dependencies: diff-sequences: 29.4.3 loupe: 2.3.6 - pretty-format: 27.5.1 + pretty-format: 29.5.0 dev: true - /@volar/kit@1.7.10(typescript@5.1.6): - resolution: {integrity: sha512-7bw9meQPgD6IB/d91A9jpsqP1CNYr3wesJUp6egLgdPUt3Bo+MFqFwtZrDK/z9/Tdb3upobqQDac4gkgd/2ydw==} + /@volar/kit@1.8.0(typescript@5.1.6): + resolution: {integrity: sha512-0zsAnS8mXJHRINtWMJaoMXGlgo1IwgvFcjVaccpLerTMyIPN4dJVkPuozsNiK7zxeRTNbG83BEp2Rxf3Z4l/eQ==} peerDependencies: typescript: '*' dependencies: - '@volar/language-service': 1.7.10 + '@volar/language-service': 1.8.0 typesafe-path: 0.2.2 typescript: 5.1.6 vscode-languageserver-textdocument: 1.0.8 vscode-uri: 3.0.7 dev: true - /@volar/language-core@1.7.10: - resolution: {integrity: sha512-18Gmth5M0UI3hDDqhZngjMnb6WCslcfglkOdepRIhGxRYe7xR7DRRzciisYDMZsvOQxDYme+uaohg0dKUxLV2Q==} + /@volar/language-core@1.8.0: + resolution: {integrity: sha512-ZHTvZPM3pEbOOuaq+ybNz5TQlHUqPQPK0G1+SonvApGq0e3qgGijjhtL5T7hsCtUEmxfix8FrAuCH14tMBOhTg==} dependencies: - '@volar/source-map': 1.7.10 + '@volar/source-map': 1.8.0 - /@volar/language-server@1.7.10: - resolution: {integrity: sha512-u5tbV8/QIJFlyslNq6i/rKP66cTnxXr6cLQ7TDeaLb9I1d8JdwDPc7GCNZV7mzjkMc6O7wU7GFKzH1rrPOk76w==} + /@volar/language-server@1.8.0: + resolution: {integrity: sha512-UEqVMMXyPHLY/rghIPQIj8hJf9kzlEIoeSOk+1Ha4pH5q4DnxPEbxBPlCY3hGLG+5uDKaSX4y+SDtwk+q7Vbsw==} dependencies: - '@volar/language-core': 1.7.10 - '@volar/language-service': 1.7.10 - '@volar/typescript': 1.7.10 + '@volar/language-core': 1.8.0 + '@volar/language-service': 1.8.0 + '@volar/typescript': 1.8.0 '@vscode/l10n': 0.0.11 request-light: 0.7.0 typesafe-path: 0.2.2 @@ -1259,29 +1268,29 @@ packages: vscode-languageserver-textdocument: 1.0.8 vscode-uri: 3.0.7 - /@volar/language-service@1.7.10: - resolution: {integrity: sha512-i/mwNeQNe8pjyIinvl+jOCs+XaQSA3T4gKylk4MMOU3Xy4acJIHMpcjZIQJXx++jA2fKf4rtZDh4YqTPuM8oDQ==} + /@volar/language-service@1.8.0: + resolution: {integrity: sha512-PxtVNaWLZF0T9jyCJ3cee/+4LUuQlOLtKvp/kghK0ZCiVhlGgqhXdpKheJmNnKmEsuSZxyUqRTLcBH4t4iLF5w==} dependencies: - '@volar/language-core': 1.7.10 - '@volar/source-map': 1.7.10 + '@volar/language-core': 1.8.0 + '@volar/source-map': 1.8.0 vscode-languageserver-protocol: 3.17.3 vscode-languageserver-textdocument: 1.0.8 vscode-uri: 3.0.7 - /@volar/source-map@1.7.10: - resolution: {integrity: sha512-FBpLEOKJpRxeh2nYbw1mTI5sZOPXYU8LlsCz6xuBY3yNtAizDTTIZtBHe1V8BaMpoSMgRysZe4gVxMEi3rDGVA==} + /@volar/source-map@1.8.0: + resolution: {integrity: sha512-d35aV0yFkIrkynRSKgrN5hgbMv6ekkFvcJsJGmOZ8UEjqLStto9zq7RSvpp6/PZ7/pa4Gn1f6K1qDt0bq0oUew==} dependencies: muggle-string: 0.3.1 - /@volar/typescript@1.7.10: - resolution: {integrity: sha512-yqIov4wndLU3GE1iE25bU5W6T+P+exPePcE1dFPPBKzQIBki1KvmdQN5jBlJp3Wo+wp7UIxa/RsdNkXT+iFBjg==} + /@volar/typescript@1.8.0: + resolution: {integrity: sha512-T/U1XLLhXv6tNr40Awznfc6QZWizSL99t6M0DeXtIMbnvSCqjjCVRnwlsq+DK9C1RlO3k8+i0Z8iJn7O1GGtoA==} dependencies: - '@volar/language-core': 1.7.10 + '@volar/language-core': 1.8.0 - /@volar/vscode@1.7.10: - resolution: {integrity: sha512-7X+ygOWOvevGqe+a7yaWvHSzMqiDw44PoBlqNi86TYqrA/9wKaLW3a6oafSzoPSIfOsg/Jm4Znwy6QEL+Ig63w==} + /@volar/vscode@1.8.0: + resolution: {integrity: sha512-jYjPm2HoX98wDRMVFeHGCJw4Ns/lBi256O4Az9pYYFL1Hz6D/5PUds93f8ZIX6VtrTgrVHQwYu5tOPPftAiHZg==} dependencies: - '@volar/language-server': 1.7.10 + '@volar/language-server': 1.8.0 typesafe-path: 0.2.2 vscode-nls: 5.2.0 dev: true @@ -1289,7 +1298,7 @@ packages: /@vscode/emmet-helper@2.9.2: resolution: {integrity: sha512-MaGuyW+fa13q3aYsluKqclmh62Hgp0BpKIqS66fCxfOaBcVQ1OnMQxRRgQUYnCkxFISAQlkJ0qWWPyXjro1Qrg==} dependencies: - emmet: 2.4.4 + emmet: 2.4.5 jsonc-parser: 2.3.1 vscode-languageserver-textdocument: 1.0.8 vscode-languageserver-types: 3.17.3 @@ -1535,7 +1544,7 @@ packages: engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dependencies: delegates: 1.0.0 - readable-stream: 4.4.0 + readable-stream: 4.4.2 dev: false optional: true @@ -1566,7 +1575,7 @@ packages: resolution: {integrity: sha512-XdiGPhrpaT5J8wdERRKs5g8E0Zy1pvOYTli7z9E8nmOn3YGp4FhtjhrOyFmX/8veWCwdI69mCHKJw6l+4J/bHA==} dependencies: tunnel: 0.0.6 - typed-rest-client: 1.8.10 + typed-rest-client: 1.8.11 dev: true /balanced-match@1.0.2: @@ -1603,10 +1612,6 @@ packages: inherits: 2.0.4 readable-stream: 3.6.2 - /blueimp-md5@2.19.0: - resolution: {integrity: sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==} - dev: true - /boolbase@1.0.0: resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} dev: true @@ -1744,8 +1749,8 @@ packages: ansi-styles: 4.3.0 supports-color: 7.2.0 - /chalk@5.2.0: - resolution: {integrity: sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==} + /chalk@5.3.0: + resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==} engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} dev: false optional: true @@ -1949,20 +1954,6 @@ packages: dev: false optional: true - /concordance@5.0.4: - resolution: {integrity: sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==} - engines: {node: '>=10.18.0 <11 || >=12.14.0 <13 || >=14'} - dependencies: - date-time: 3.1.0 - esutils: 2.0.3 - fast-diff: 1.3.0 - js-string-escape: 1.0.1 - lodash: 4.17.21 - md5-hex: 3.0.1 - semver: 7.5.3 - well-known-symbols: 2.0.0 - dev: true - /config-chain@1.1.13: resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==} dependencies: @@ -2132,13 +2123,6 @@ packages: dev: false optional: true - /date-time@3.1.0: - resolution: {integrity: sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==} - engines: {node: '>=6'} - dependencies: - time-zone: 1.0.0 - dev: true - /dateformat@3.0.3: resolution: {integrity: sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==} dev: false @@ -2299,8 +2283,8 @@ packages: dev: false optional: true - /emmet@2.4.4: - resolution: {integrity: sha512-v8Mwpjym55CS3EjJgiCLWUB3J2HSR93jhzXW325720u8KvYxdI2voYLstW3pHBxFz54H6jFjayR9G4LfTG0q+g==} + /emmet@2.4.5: + resolution: {integrity: sha512-xOiVNINJFh0dMik+KzXSEYbAnFLTnadEzanxj7+F15uIf6avQwu3uPa1wI/8AFtOWKZ8lHg7TjC83wXcPhgOPw==} dependencies: '@emmetio/abbreviation': 2.3.3 '@emmetio/css-abbreviation': 2.1.8 @@ -2633,11 +2617,6 @@ packages: /estree-walker@2.0.2: resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} - /esutils@2.0.3: - resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} - engines: {node: '>=0.10.0'} - dev: true - /event-target-shim@5.0.1: resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==} engines: {node: '>=6'} @@ -2691,12 +2670,8 @@ packages: dev: false optional: true - /fast-diff@1.3.0: - resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==} - dev: true - - /fast-glob@3.2.12: - resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==} + /fast-glob@3.3.0: + resolution: {integrity: sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==} engines: {node: '>=8.6.0'} dependencies: '@nodelib/fs.stat': 2.0.5 @@ -2891,8 +2866,8 @@ packages: dev: false optional: true - /get-stream@7.0.0: - resolution: {integrity: sha512-ql6FW5b8tgMYvI4UaoxG3EQN3VyZ6VeQpxNBGg5BZ4xD4u+HJeprzhMMA4OCBEGQgSR+m87pstWMpiVW64W8Fw==} + /get-stream@7.0.1: + resolution: {integrity: sha512-3M8C1EOFN6r8AMUhwUAACIoXZJEOufDU5+0gFFN5uNs6XYOralD2Pqkl7m046va6x77FwposWXbAhPPIOus7mQ==} engines: {node: '>=16'} dev: false optional: true @@ -2998,18 +2973,18 @@ packages: dependencies: array-union: 2.1.0 dir-glob: 3.0.1 - fast-glob: 3.2.12 + fast-glob: 3.3.0 ignore: 5.2.4 merge2: 1.4.1 slash: 3.0.0 dev: true - /globby@13.2.0: - resolution: {integrity: sha512-jWsQfayf13NvqKUIL3Ta+CIqMnvlaIDFveWE/dpOZ9+3AMEJozsxDvKA02zync9UuvOM8rOXzsD5GqKP4OnWPQ==} + /globby@13.2.1: + resolution: {integrity: sha512-DPCBxctI7dN4EeIqjW2KGqgdcUMbrhJ9AzON+PlxCtvppWhubTLD4+a0GFxiym14ZvacUydTPjLPc2DlKz7EIg==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: dir-glob: 3.0.1 - fast-glob: 3.2.12 + fast-glob: 3.3.0 ignore: 5.2.4 merge2: 1.4.1 slash: 4.0.0 @@ -3226,7 +3201,7 @@ packages: engines: {node: '>=14.18.0'} dependencies: ansi-escapes: 4.3.2 - chalk: 5.2.0 + chalk: 5.3.0 cli-cursor: 3.1.0 cli-width: 4.0.0 external-editor: 3.1.0 @@ -3428,11 +3403,6 @@ packages: dev: false optional: true - /js-string-escape@1.0.1: - resolution: {integrity: sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==} - engines: {node: '>= 0.8'} - dev: true - /js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} dev: false @@ -3549,7 +3519,7 @@ packages: npm-registry-fetch: 14.0.5 proc-log: 3.0.0 semver: 7.5.3 - sigstore: 1.6.0 + sigstore: 1.7.0 ssri: 10.0.4 transitivePeerDependencies: - supports-color @@ -3613,6 +3583,8 @@ packages: /lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + dev: false + optional: true /log-symbols@4.1.0: resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==} @@ -3709,13 +3681,6 @@ packages: uc.micro: 1.0.6 dev: true - /md5-hex@3.0.1: - resolution: {integrity: sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==} - engines: {node: '>=8'} - dependencies: - blueimp-md5: 2.19.0 - dev: true - /mdurl@1.0.1: resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==} dev: true @@ -3989,8 +3954,8 @@ packages: dev: false optional: true - /node-fetch@2.6.11: - resolution: {integrity: sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==} + /node-fetch@2.6.12: + resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==} engines: {node: 4.x || >=6.0.0} peerDependencies: encoding: ^0.1.0 @@ -4364,7 +4329,7 @@ packages: promise-retry: 2.0.1 read-package-json: 6.0.4 read-package-json-fast: 3.0.2 - sigstore: 1.6.0 + sigstore: 1.7.0 ssri: 10.0.4 tar: 6.1.15 transitivePeerDependencies: @@ -4589,13 +4554,13 @@ packages: tunnel-agent: 0.6.0 dev: true - /pretty-format@27.5.1: - resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + /pretty-format@29.5.0: + resolution: {integrity: sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - ansi-regex: 5.0.1 + '@jest/schemas': 29.4.3 ansi-styles: 5.2.0 - react-is: 17.0.2 + react-is: 18.2.0 dev: true /proc-log@3.0.0: @@ -4712,8 +4677,8 @@ packages: strip-json-comments: 2.0.1 dev: true - /react-is@17.0.2: - resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==} + /react-is@18.2.0: + resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} dev: true /read-cmd-shim@4.0.0: @@ -4810,14 +4775,15 @@ packages: string_decoder: 1.3.0 util-deprecate: 1.0.2 - /readable-stream@4.4.0: - resolution: {integrity: sha512-kDMOq0qLtxV9f/SQv522h8cxZBqNZXuXNyjyezmfAAuribMyVXziljpQ/uQhfE1XLg2/TLTW2DsnoE4VAi/krg==} + /readable-stream@4.4.2: + resolution: {integrity: sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: abort-controller: 3.0.0 buffer: 6.0.3 events: 3.3.0 process: 0.11.10 + string_decoder: 1.3.0 dev: false optional: true @@ -4899,8 +4865,8 @@ packages: dependencies: glob: 7.2.3 - /rollup@3.25.3: - resolution: {integrity: sha512-ZT279hx8gszBj9uy5FfhoG4bZx8c+0A1sbqtr7Q3KNWIizpTdDEPZbV2xcbvHsnFp4MavCQYZyzApJ+virB8Yw==} + /rollup@3.26.0: + resolution: {integrity: sha512-YzJH0eunH2hr3knvF3i6IkLO/jTjAEwU4HoMUbQl4//Tnl3ou0e7P5SjxdDr8HQJdeUJShlbEHXrrnEHy1l7Yg==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: @@ -5009,15 +4975,14 @@ packages: dev: false optional: true - /sigstore@1.6.0: - resolution: {integrity: sha512-QODKff/qW/TXOZI6V/Clqu74xnInAS6it05mufj4/fSewexLtfEntgLZZcBtUK44CDQyUE5TUXYy1ARYzlfG9g==} + /sigstore@1.7.0: + resolution: {integrity: sha512-KP7QULhWdlu3hlp+jw2EvgWKlOGOY9McLj/jrchLjHNlNPK0KWIwF919cbmOp6QiKXLmPijR2qH/5KYWlbtG9Q==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} hasBin: true dependencies: '@sigstore/protobuf-specs': 0.1.0 - '@sigstore/tuf': 1.0.0 + '@sigstore/tuf': 1.0.2 make-fetch-happen: 11.1.1 - tuf-js: 1.1.7 transitivePeerDependencies: - supports-color dev: false @@ -5322,11 +5287,6 @@ packages: dev: false optional: true - /time-zone@1.0.0: - resolution: {integrity: sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==} - engines: {node: '>=4'} - dev: true - /tinybench@2.5.0: resolution: {integrity: sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==} dev: true @@ -5450,8 +5410,8 @@ packages: dev: false optional: true - /typed-rest-client@1.8.10: - resolution: {integrity: sha512-32LDnqtreD3LMO/vdV2NSXUrTcaerRM7JRrI/e+4TI/AmvLXDPuw7COdWQPALkc10hxRQOFnUUKmS9FlInIu9A==} + /typed-rest-client@1.8.11: + resolution: {integrity: sha512-5UvfMpd1oelmUPRbbaVnq+rHP7ng2cE4qoQkQeAqxRL6PklkxsM0g32/HL0yfvruK6ojQ5x8EE+HF4YV6DtuCA==} dependencies: qs: 6.11.2 tunnel: 0.0.6 @@ -5559,8 +5519,8 @@ packages: dev: false optional: true - /vite-node@0.32.2(@types/node@20.3.3): - resolution: {integrity: sha512-dTQ1DCLwl2aEseov7cfQ+kDMNJpM1ebpyMMMwWzBvLbis8Nla/6c9WQcqpPssTwS6Rp/+U6KwlIj8Eapw4bLdA==} + /vite-node@0.32.4(@types/node@20.3.3): + resolution: {integrity: sha512-L2gIw+dCxO0LK14QnUMoqSYpa9XRGnTTTDjW2h19Mr+GR0EFj4vx52W41gFXfMLqpA00eK4ZjOVYo1Xk//LFEw==} engines: {node: '>=v14.18.0'} hasBin: true dependencies: @@ -5608,13 +5568,13 @@ packages: '@types/node': 20.3.3 esbuild: 0.17.19 postcss: 8.4.24 - rollup: 3.25.3 + rollup: 3.26.0 optionalDependencies: fsevents: 2.3.2 dev: true - /vitest@0.32.2: - resolution: {integrity: sha512-hU8GNNuQfwuQmqTLfiKcqEhZY72Zxb7nnN07koCUNmntNxbKQnVbeIS6sqUgR3eXSlbOpit8+/gr1KpqoMgWCQ==} + /vitest@0.32.4: + resolution: {integrity: sha512-3czFm8RnrsWwIzVDu/Ca48Y/M+qh3vOnF16czJm98Q/AN1y3B6PBsyV8Re91Ty5s7txKNjEhpgtGPcfdbh2MZg==} engines: {node: '>=v14.18.0'} hasBin: true peerDependencies: @@ -5647,16 +5607,15 @@ packages: '@types/chai': 4.3.5 '@types/chai-subset': 1.3.3 '@types/node': 20.3.3 - '@vitest/expect': 0.32.2 - '@vitest/runner': 0.32.2 - '@vitest/snapshot': 0.32.2 - '@vitest/spy': 0.32.2 - '@vitest/utils': 0.32.2 + '@vitest/expect': 0.32.4 + '@vitest/runner': 0.32.4 + '@vitest/snapshot': 0.32.4 + '@vitest/spy': 0.32.4 + '@vitest/utils': 0.32.4 acorn: 8.9.0 acorn-walk: 8.2.0 cac: 6.7.14 chai: 4.3.7 - concordance: 5.0.4 debug: 4.3.4 local-pkg: 0.4.3 magic-string: 0.30.0 @@ -5667,7 +5626,7 @@ packages: tinybench: 2.5.0 tinypool: 0.5.0 vite: 4.3.9(@types/node@20.3.3) - vite-node: 0.32.2(@types/node@20.3.3) + vite-node: 0.32.4(@types/node@20.3.3) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -5678,60 +5637,60 @@ packages: - terser dev: true - /volar-service-css@0.0.8(@volar/language-service@1.7.10): - resolution: {integrity: sha512-+zMVS7cgCZpZhW1RG00XL3V2umb/DlMMK7CHiAMvqtLLb4nKTv7XHc36vtGXPQKVUyzyG4ZO/olxM4EItsGGnA==} + /volar-service-css@0.0.9(@volar/language-service@1.8.0): + resolution: {integrity: sha512-56/PD+8xdpXFFRqMMU8kJ4Ym4wBvKmYhCU+MITzQQMHykhmDukxDe/vyWfo4twVBOuIIZ7gZCuVnMUVmKR2R1A==} peerDependencies: '@volar/language-service': '*' peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 1.7.10 + '@volar/language-service': 1.8.0 vscode-css-languageservice: 6.2.6 vscode-uri: 3.0.7 dev: false - /volar-service-emmet@0.0.8(@volar/language-service@1.7.10): - resolution: {integrity: sha512-F3BS6euSSD+q6AyZJmQzFDFtJVmhMTxfEY3VLE0fMsRFcOUmcEEgQfYixEXWEAgK21AUNaq9cCSWTkHjj9ysqw==} + /volar-service-emmet@0.0.9(@volar/language-service@1.8.0): + resolution: {integrity: sha512-HXDAzzNNRkeOMZiewlcclHRbEYsRinh9MTs/KtehWWcvcASP7CB9KvyG2uQ40RMCxxwj6OihfpYy6WModBPu5w==} peerDependencies: '@volar/language-service': '*' peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 1.7.10 + '@volar/language-service': 1.8.0 '@vscode/emmet-helper': 2.9.2 - volar-service-html: 0.0.8(@volar/language-service@1.7.10) + volar-service-html: 0.0.9(@volar/language-service@1.8.0) dev: false - /volar-service-html@0.0.8(@volar/language-service@1.7.10): - resolution: {integrity: sha512-pP1bmN9iJjjK8oDZ1F/c75/lwUqcw9BzcUYa6WE0eYTc30X6BPpj/6Rzed6Sw7dBMmAmsodoaHOamgNU/RJY/w==} + /volar-service-html@0.0.9(@volar/language-service@1.8.0): + resolution: {integrity: sha512-3y3S8Jw8f86IpkPkvFraYrKmiMj0cuGOz3O7g/SdwxpuFHhcU8ldFF+LheI/c49RpCHpbl8a4Zn7rePCvehHnA==} peerDependencies: '@volar/language-service': '*' peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 1.7.10 + '@volar/language-service': 1.8.0 vscode-html-languageservice: 5.0.6 vscode-uri: 3.0.7 dev: false - /volar-service-json@0.0.8(@volar/language-service@1.7.10): - resolution: {integrity: sha512-+v9gw2IylVtw9EpFVN6le7a6FDAzF/en3tgEVu8MIzhJ3Kg5SOOWuN8w0gtKWUIC/jaVw0yMdYimFSnfxZgxtQ==} + /volar-service-json@0.0.9(@volar/language-service@1.8.0): + resolution: {integrity: sha512-yASOesWTYGauoMgf3FK17YN4qxGeTLi+nkTK+/Nup6L3Lk//dKHvHDuHBI9ONZnDRTC7pOrTTtE6W/mYlasPrQ==} peerDependencies: '@volar/language-service': '*' peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 1.7.10 + '@volar/language-service': 1.8.0 vscode-json-languageservice: 5.3.5 vscode-uri: 3.0.7 dev: false - /volar-service-pug-beautify@0.0.8(@volar/language-service@1.7.10): - resolution: {integrity: sha512-2ovrzyCPyQ4d/kigvcWs+yCe7Lm8E7B7K/QzazOd97HgHX0e2k+JeoMOjkWOYu8BKrbxgRKeiREvz0DXLw9yNw==} + /volar-service-pug-beautify@0.0.9(@volar/language-service@1.8.0): + resolution: {integrity: sha512-zx0Hd3VWqTY+OACOVOKAY9CRZH5E8gg8MeFei7JBuo6DRCUMbgIFnvKn9UlZBSBwxiqnxmIM2567PHHnymyjeQ==} peerDependencies: '@volar/language-service': '*' peerDependenciesMeta: @@ -5739,35 +5698,35 @@ packages: optional: true dependencies: '@johnsoncodehk/pug-beautify': 0.2.2 - '@volar/language-service': 1.7.10 + '@volar/language-service': 1.8.0 dev: false - /volar-service-pug@0.0.8: - resolution: {integrity: sha512-rDYhhPFmo726oN8wCZs7+Cm/L3u1h7Nkz68PN1fBIdaBhcKPaPIDtGOW4mEpYw1A1sGm6GrklVkQ03p7clXGkQ==} + /volar-service-pug@0.0.9: + resolution: {integrity: sha512-vQaS/a+tl5Pr5d+TUmnh/rzNI48H7PcaIF2vibd2+Q4D558RIGDxgrFq2ge/rDPEO8Ov6EybH8NGmGP/Wd107A==} dependencies: - '@volar/language-service': 1.7.10 - '@volar/source-map': 1.7.10 + '@volar/language-service': 1.8.0 + '@volar/source-map': 1.8.0 muggle-string: 0.3.1 pug-lexer: 5.0.1 pug-parser: 6.0.0 - volar-service-html: 0.0.8(@volar/language-service@1.7.10) + volar-service-html: 0.0.9(@volar/language-service@1.8.0) vscode-html-languageservice: 5.0.6 vscode-languageserver-textdocument: 1.0.8 dev: false - /volar-service-typescript-twoslash-queries@0.0.8(@volar/language-service@1.7.10): - resolution: {integrity: sha512-2F5h2PAhDB0vnLGn2ldLs0NhIlcvq7Uj1HfSaKmdz2cOa2hGMY1riX6+HJakVqWOfXMcE+HcBPETSGkl5jiD5Q==} + /volar-service-typescript-twoslash-queries@0.0.9(@volar/language-service@1.8.0): + resolution: {integrity: sha512-NMSzeBtSxrHPyNKNDSurpZLHgPXu2/KqYjjGi5SghxeHhDA7SmKyYNtu5Mis5uZR+XULqGVnx+A+RNSfMW9toQ==} peerDependencies: '@volar/language-service': '*' peerDependenciesMeta: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 1.7.10 + '@volar/language-service': 1.8.0 dev: false - /volar-service-typescript@0.0.8(@volar/language-service@1.7.10)(@volar/typescript@1.7.10): - resolution: {integrity: sha512-R96t7IKAwv7MCRkmQkluIIAj6kawEoRYkc/zfygAGkjC//z8bDS5Fmmw9AEHHEdFPUaAJ7jkTuZ32dLuSuXn/g==} + /volar-service-typescript@0.0.9(@volar/language-service@1.8.0)(@volar/typescript@1.8.0): + resolution: {integrity: sha512-ZJSO2U9b4gnBuhDQpKA/wfH5XHpgv3n0qThVh0hfOUEpCHX8oCWI844jd+XXuQVNw0xafyUMQsNBrypDHg3kIQ==} peerDependencies: '@volar/language-service': '*' '@volar/typescript': '*' @@ -5775,8 +5734,8 @@ packages: '@volar/language-service': optional: true dependencies: - '@volar/language-service': 1.7.10 - '@volar/typescript': 1.7.10 + '@volar/language-service': 1.8.0 + '@volar/typescript': 1.8.0 semver: 7.5.3 typescript-auto-import-cache: 0.3.0 vscode-languageserver-textdocument: 1.0.8 @@ -5805,7 +5764,7 @@ packages: read: 1.0.7 semver: 5.7.1 tmp: 0.2.1 - typed-rest-client: 1.8.10 + typed-rest-client: 1.8.11 url-join: 4.0.1 xml2js: 0.4.23 yauzl: 2.10.0 @@ -5921,11 +5880,6 @@ packages: dev: false optional: true - /well-known-symbols@2.0.0: - resolution: {integrity: sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==} - engines: {node: '>=6'} - dev: true - /whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} dependencies: From f7dda2ab63ef2cd9a56437ae1d6299b0eeb63010 Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 4 Jul 2023 16:04:37 +0800 Subject: [PATCH 02/25] fix: sync volar usage (#3357) --- packages/vue-component-meta/src/index.ts | 2 +- packages/vue-language-service/tests/utils/createTester.ts | 2 +- packages/vue-tsc/src/index.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/vue-component-meta/src/index.ts b/packages/vue-component-meta/src/index.ts index 2e68536e4..c123391d7 100644 --- a/packages/vue-component-meta/src/index.ts +++ b/packages/vue-component-meta/src/index.ts @@ -69,7 +69,7 @@ function createComponentMetaCheckerWorker( const scriptSnapshots = new Map(); const _host: vue.TypeScriptLanguageHost = { getCurrentDirectory: () => rootPath, - getProjectVersion: () => projectVersion, + getProjectVersion: () => projectVersion.toString(), getCompilationSettings: () => parsedCommandLine.options, getScriptFileNames: () => fileNames, getProjectReferences: () => parsedCommandLine.projectReferences, diff --git a/packages/vue-language-service/tests/utils/createTester.ts b/packages/vue-language-service/tests/utils/createTester.ts index 050957052..45c7dda3c 100644 --- a/packages/vue-language-service/tests/utils/createTester.ts +++ b/packages/vue-language-service/tests/utils/createTester.ts @@ -20,7 +20,7 @@ function createTester(root: string) { parsedCommandLine.fileNames = parsedCommandLine.fileNames.map(fileName => fileName.replace(/\\/g, '/')); const scriptSnapshots = new Map(); const host: TypeScriptLanguageHost = { - getProjectVersion: () => 0, + getProjectVersion: () => '0', getScriptFileNames: () => parsedCommandLine.fileNames, getCurrentDirectory: () => root.replace(/\\/g, '/'), getCompilationSettings: () => parsedCommandLine.options, diff --git a/packages/vue-tsc/src/index.ts b/packages/vue-tsc/src/index.ts index 8fa5e068d..d8a5c4cab 100644 --- a/packages/vue-tsc/src/index.ts +++ b/packages/vue-tsc/src/index.ts @@ -63,7 +63,7 @@ export function createProgram(options: ts.CreateProgramOptions) { }, getScriptSnapshot, getProjectVersion: () => { - return ctx.projectVersion; + return ctx.projectVersion.toString(); }, getProjectReferences: () => ctx.options.projectReferences, getCurrentDirectory: () => ctx.options.host!.getCurrentDirectory().replace(/\\/g, '/'), From 896411f209d2677d57bfc7d7e2df7888fab424f0 Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 5 Jul 2023 09:09:18 +0800 Subject: [PATCH 03/25] fix: properly get components (#3333) Co-authored-by: Johnson Chu --- .../src/generators/script.ts | 8 +++---- .../src/generators/template.ts | 2 +- packages/vue-language-core/src/index.ts | 2 +- .../vue-language-core/src/languageModule.ts | 2 +- ...directorySharedTypes.ts => globalTypes.ts} | 11 +++++---- .../non-strict-template/#1886/main.vue | 23 +++++++++++++++++++ .../non-strict-template/#2157/main.vue | 11 +++++++++ 7 files changed, 48 insertions(+), 11 deletions(-) rename packages/vue-language-core/src/utils/{directorySharedTypes.ts => globalTypes.ts} (87%) create mode 100644 packages/vue-test-workspace/vue-tsc/non-strict-template/#1886/main.vue create mode 100644 packages/vue-test-workspace/vue-tsc/non-strict-template/#2157/main.vue diff --git a/packages/vue-language-core/src/generators/script.ts b/packages/vue-language-core/src/generators/script.ts index efe582937..ee8d0339a 100644 --- a/packages/vue-language-core/src/generators/script.ts +++ b/packages/vue-language-core/src/generators/script.ts @@ -12,7 +12,7 @@ import { Sfc } from '../types'; import type { VueCompilerOptions } from '../types'; import { getSlotsPropertyName } from '../utils/shared'; import { walkInterpolationFragment } from '../utils/transform'; -import * as sharedTypes from '../utils/directorySharedTypes'; +import * as sharedTypes from '../utils/globalTypes'; import * as muggle from 'muggle-string'; export function generate( @@ -827,10 +827,10 @@ declare function defineProp(value?: T | (() => T), required?: boolean, rest?: /* Components */ codes.push('/* Components */\n'); - codes.push(`let __VLS_localComponents!: NonNullable & typeof __VLS_componentsOption & typeof __VLS_ctx;\n`); - codes.push(`let __VLS_otherComponents!: typeof __VLS_localComponents & __VLS_GlobalComponents;\n`); + codes.push(`let __VLS_otherComponents!: NonNullable & typeof __VLS_componentsOption & typeof __VLS_ctx;\n`); codes.push(`let __VLS_own!: __VLS_SelfComponent { ${getSlotsPropertyName(vueCompilerOptions.target)}: typeof __VLS_slots })>;\n`); - codes.push(`let __VLS_components!: typeof __VLS_otherComponents & Omit;\n`); + codes.push(`let __VLS_localComponents!: typeof __VLS_otherComponents & Omit;\n`); + codes.push(`let __VLS_components!: typeof __VLS_localComponents & __VLS_GlobalComponents;\n`); // for html completion, TS references... /* Style Scoped */ codes.push('/* Style Scoped */\n'); diff --git a/packages/vue-language-core/src/generators/template.ts b/packages/vue-language-core/src/generators/template.ts index d83fcad3d..681116c13 100644 --- a/packages/vue-language-core/src/generators/template.ts +++ b/packages/vue-language-core/src/generators/template.ts @@ -194,7 +194,7 @@ export function generate( const validName = validTsVar.test(tagName) ? tagName : capitalize(camelize(tagName.replace(/:/g, '-'))); codes.push( - `& __VLS_WithComponent<'${validName}', typeof __VLS_components, `, + `& __VLS_WithComponent<'${validName}', typeof __VLS_localComponents, `, // order is important: https://github.com/vuejs/language-tools/issues/2010 `"${capitalize(camelize(tagName))}", `, `"${camelize(tagName)}", `, diff --git a/packages/vue-language-core/src/index.ts b/packages/vue-language-core/src/index.ts index c21311a42..c9ca00d58 100644 --- a/packages/vue-language-core/src/index.ts +++ b/packages/vue-language-core/src/index.ts @@ -8,7 +8,7 @@ export * from './utils/ts'; export * from './utils/parseSfc'; export * as scriptRanges from './parsers/scriptRanges'; -export * as sharedTypes from './utils/directorySharedTypes'; +export * as sharedTypes from './utils/globalTypes'; export * from '@volar/language-core'; export * from '@volar/source-map'; diff --git a/packages/vue-language-core/src/languageModule.ts b/packages/vue-language-core/src/languageModule.ts index 45d03759f..1d5ac30ef 100644 --- a/packages/vue-language-core/src/languageModule.ts +++ b/packages/vue-language-core/src/languageModule.ts @@ -3,7 +3,7 @@ import { posix as path } from 'path'; import { getDefaultVueLanguagePlugins } from './plugins'; import { VueFile } from './sourceFile'; import { VueCompilerOptions } from './types'; -import * as sharedTypes from './utils/directorySharedTypes'; +import * as sharedTypes from './utils/globalTypes'; import type * as ts from 'typescript/lib/tsserverlibrary'; import { resolveVueCompilerOptions } from './utils/ts'; diff --git a/packages/vue-language-core/src/utils/directorySharedTypes.ts b/packages/vue-language-core/src/utils/globalTypes.ts similarity index 87% rename from packages/vue-language-core/src/utils/directorySharedTypes.ts rename to packages/vue-language-core/src/utils/globalTypes.ts index f6bcd9156..e0f1d079e 100644 --- a/packages/vue-language-core/src/utils/directorySharedTypes.ts +++ b/packages/vue-language-core/src/utils/globalTypes.ts @@ -57,10 +57,13 @@ declare function __VLS_withScope(ctx: T, scope: K): ctx is T & K; declare function __VLS_makeOptional(t: T): { [K in keyof T]?: T[K] }; type __VLS_SelfComponent = string extends N ? {} : N extends string ? { [P in N]: C } : {}; -type __VLS_WithComponent = - N1 extends keyof Components ? N1 extends N0 ? Pick : { [K in N0]: Components[N1] } : - N2 extends keyof Components ? N2 extends N0 ? Pick : { [K in N0]: Components[N2] } : - N3 extends keyof Components ? N3 extends N0 ? Pick : { [K in N0]: Components[N3] } : +type __VLS_WithComponent = + N1 extends keyof LocalComponents ? N1 extends N0 ? Pick : { [K in N0]: LocalComponents[N1] } : + N2 extends keyof LocalComponents ? N2 extends N0 ? Pick : { [K in N0]: LocalComponents[N2] } : + N3 extends keyof LocalComponents ? N3 extends N0 ? Pick : { [K in N0]: LocalComponents[N3] } : + N1 extends keyof __VLS_GlobalComponents ? N1 extends N0 ? Pick<__VLS_GlobalComponents, N0> : { [K in N0]: __VLS_GlobalComponents[N1] } : + N2 extends keyof __VLS_GlobalComponents ? N2 extends N0 ? Pick<__VLS_GlobalComponents, N0> : { [K in N0]: __VLS_GlobalComponents[N2] } : + N3 extends keyof __VLS_GlobalComponents ? N3 extends N0 ? Pick<__VLS_GlobalComponents, N0> : { [K in N0]: __VLS_GlobalComponents[N3] } : ${vueCompilerOptions.strictTemplates ? '{}' : '{ [K in N0]: unknown }'} type __VLS_FillingEventArg_ParametersLength any> = __VLS_IsAny> extends true ? -1 : Parameters['length']; diff --git a/packages/vue-test-workspace/vue-tsc/non-strict-template/#1886/main.vue b/packages/vue-test-workspace/vue-tsc/non-strict-template/#1886/main.vue new file mode 100644 index 000000000..497953d76 --- /dev/null +++ b/packages/vue-test-workspace/vue-tsc/non-strict-template/#1886/main.vue @@ -0,0 +1,23 @@ + + + diff --git a/packages/vue-test-workspace/vue-tsc/non-strict-template/#2157/main.vue b/packages/vue-test-workspace/vue-tsc/non-strict-template/#2157/main.vue new file mode 100644 index 000000000..cd332dae3 --- /dev/null +++ b/packages/vue-test-workspace/vue-tsc/non-strict-template/#2157/main.vue @@ -0,0 +1,11 @@ + + + From cefbaffea299545cc8f46d29862be4b3c16f5e4e Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 5 Jul 2023 11:06:00 +0800 Subject: [PATCH 04/25] fix: support type narrowing for components (#3350) Co-authored-by: Johnson Chu --- .../src/generators/script.ts | 4 +- .../src/generators/template.ts | 115 ++++++++++-------- .../non-strict-template/#3138/main.vue | 14 +++ 3 files changed, 80 insertions(+), 53 deletions(-) create mode 100644 packages/vue-test-workspace/vue-tsc/non-strict-template/#3138/main.vue diff --git a/packages/vue-language-core/src/generators/script.ts b/packages/vue-language-core/src/generators/script.ts index ee8d0339a..70cb65cdb 100644 --- a/packages/vue-language-core/src/generators/script.ts +++ b/packages/vue-language-core/src/generators/script.ts @@ -827,10 +827,10 @@ declare function defineProp(value?: T | (() => T), required?: boolean, rest?: /* Components */ codes.push('/* Components */\n'); - codes.push(`let __VLS_otherComponents!: NonNullable & typeof __VLS_componentsOption & typeof __VLS_ctx;\n`); + codes.push(`let __VLS_otherComponents!: NonNullable & typeof __VLS_componentsOption;\n`); codes.push(`let __VLS_own!: __VLS_SelfComponent { ${getSlotsPropertyName(vueCompilerOptions.target)}: typeof __VLS_slots })>;\n`); codes.push(`let __VLS_localComponents!: typeof __VLS_otherComponents & Omit;\n`); - codes.push(`let __VLS_components!: typeof __VLS_localComponents & __VLS_GlobalComponents;\n`); // for html completion, TS references... + codes.push(`let __VLS_components!: typeof __VLS_localComponents & __VLS_GlobalComponents & typeof __VLS_ctx;\n`); // for html completion, TS references... /* Style Scoped */ codes.push('/* Style Scoped */\n'); diff --git a/packages/vue-language-core/src/generators/template.ts b/packages/vue-language-core/src/generators/template.ts index 681116c13..8c99c5c84 100644 --- a/packages/vue-language-core/src/generators/template.ts +++ b/packages/vue-language-core/src/generators/template.ts @@ -91,7 +91,7 @@ export function generate( let expectedErrorStart: undefined | number; let expectedErrorNode: CompilerDOM.CommentNode | undefined; - const componentVars = generateComponentVars(); + generatePreResolveComponents(); if (sfc.templateAst) { visitNode(sfc.templateAst, undefined, undefined, undefined); @@ -176,11 +176,22 @@ export function generate( codes.push('}\n'); } - function generateComponentVars() { + function toCanonicalComponentName(tagText: string) { + return validTsVar.test(tagText) ? tagText : capitalize(camelize(tagText.replace(/:/g, '-'))); + } + + function getPossibleOriginalComponentName(tagText: string) { + return [...new Set([ + // order is important: https://github.com/vuejs/language-tools/issues/2010 + capitalize(camelize(tagText)), + camelize(tagText), + tagText, + ])]; + } - const data: Record = {}; + function generatePreResolveComponents() { - codes.push(`let __VLS_templateComponents!: {}\n`); + codes.push(`let __VLS_resolvedLocalAndGlobalComponents!: {}\n`); for (const tagName in tagNames) { @@ -191,18 +202,14 @@ export function generate( if (isNamespacedTag) continue; - const validName = validTsVar.test(tagName) ? tagName : capitalize(camelize(tagName.replace(/:/g, '-'))); - codes.push( - `& __VLS_WithComponent<'${validName}', typeof __VLS_localComponents, `, + `& __VLS_WithComponent<'${toCanonicalComponentName(tagName)}', typeof __VLS_localComponents, `, // order is important: https://github.com/vuejs/language-tools/issues/2010 `"${capitalize(camelize(tagName))}", `, `"${camelize(tagName)}", `, `"${tagName}"`, '>\n', ); - - data[tagName] = validName; } codes.push(`;\n`); @@ -211,12 +218,7 @@ export function generate( const tagOffsets = tagNames[tagName]; const tagRanges: [number, number][] = tagOffsets.map(offset => [offset, offset + tagName.length]); - const names = new Set(nativeTags.has(tagName) ? [tagName] : [ - // order is important: https://github.com/vuejs/language-tools/issues/2010 - capitalize(camelize(tagName)), - camelize(tagName), - tagName, - ]); + const names = nativeTags.has(tagName) ? [tagName] : getPossibleOriginalComponentName(tagName); for (const name of names) { for (const tagRange of tagRanges) { @@ -240,32 +242,34 @@ export function generate( } codes.push('\n'); - const validName = data[tagName]; + if (nativeTags.has(tagName)) + continue; - if (validName) { - codes.push( - '// @ts-ignore\n', // #2304 - '[', - ); - for (const tagRange of tagRanges) { - codes.push([ - validName, - 'template', - tagRange, - { - completion: { - additional: true, - autoImportOnly: true, - }, + const isNamespacedTag = tagName.indexOf('.') >= 0; + if (isNamespacedTag) + continue; + + codes.push( + '// @ts-ignore\n', // #2304 + '[', + ); + const validName = toCanonicalComponentName(tagName); + for (const tagRange of tagRanges) { + codes.push([ + validName, + 'template', + tagRange, + { + completion: { + additional: true, + autoImportOnly: true, }, - ]); - codes.push(','); - } - codes.push(`];\n`); + }, + ]); + codes.push(','); } + codes.push(`];\n`); } - - return data; } function collectTagOffsets() { @@ -669,11 +673,12 @@ export function generate( ';\n', ); } - else if (componentVars[tag]) { - codes.push(`const ${var_originalComponent} = __VLS_templateComponents['${componentVars[tag]}'];\n`); - } else { - codes.push(`const ${var_originalComponent} = {} as any;\n`); + codes.push(`let ${var_originalComponent}!: `); + for (const componentName of getPossibleOriginalComponentName(tag)) { + codes.push(`'${componentName}' extends keyof typeof __VLS_ctx ? typeof __VLS_ctx${validTsVar.test(componentName) ? `.${componentName}` : `['${componentName}']`} : `); + } + codes.push(`typeof __VLS_resolvedLocalAndGlobalComponents['${toCanonicalComponentName(tag)}'];\n`); } codes.push( @@ -693,22 +698,30 @@ export function generate( codes.push(');\n'); for (const offset of tagOffsets) { - if (isNamespacedTag) { + if (isNamespacedTag || dynamicTagExp) { continue; } - else if (dynamicTagExp) { - continue; + else if (isIntrinsicElement) { + codes.push(`({} as __VLS_IntrinsicElements).`); + codes.push( + [ + tag, + 'template', + [offset, offset + tag.length], + { + ...capabilitiesPresets.tagHover, + ...capabilitiesPresets.diagnosticOnly, + }, + ], + ';\n', + ); } else { - if (isIntrinsicElement) { - codes.push(`({} as __VLS_IntrinsicElements).`); - } - else { - codes.push(`__VLS_templateComponents.`); - } + const key = toCanonicalComponentName(tag); + codes.push(`({} as { ${key}: typeof ${var_originalComponent} }).`); codes.push( [ - componentVars[tag] ?? tag, + key, 'template', [offset, offset + tag.length], { diff --git a/packages/vue-test-workspace/vue-tsc/non-strict-template/#3138/main.vue b/packages/vue-test-workspace/vue-tsc/non-strict-template/#3138/main.vue new file mode 100644 index 000000000..9edcd2435 --- /dev/null +++ b/packages/vue-test-workspace/vue-tsc/non-strict-template/#3138/main.vue @@ -0,0 +1,14 @@ + + + From 7a98593cd952403e1852fdbf8e9a46afcf593967 Mon Sep 17 00:00:00 2001 From: Johnson Chu Date: Wed, 5 Jul 2023 12:34:44 +0800 Subject: [PATCH 05/25] feat: support auto-complete for directive comments ref #3215 --- .../src/languageService.ts | 2 + .../src/plugins/vue-directive-comments.ts | 63 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 packages/vue-language-service/src/plugins/vue-directive-comments.ts diff --git a/packages/vue-language-service/src/languageService.ts b/packages/vue-language-service/src/languageService.ts index 405f33a92..93828fbf5 100644 --- a/packages/vue-language-service/src/languageService.ts +++ b/packages/vue-language-service/src/languageService.ts @@ -22,6 +22,7 @@ import createReferencesCodeLensService from './plugins/vue-codelens-references'; import createVueTemplateLanguageService from './plugins/vue-template'; import createVueTqService from './plugins/vue-twoslash-queries'; import createVisualizeHiddenCallbackParamService from './plugins/vue-visualize-hidden-callback-param'; +import createDirectiveCommentsService from './plugins/vue-directive-comments'; import { TagNameCasing, VueCompilerOptions } from './types'; export interface Settings { @@ -289,6 +290,7 @@ function resolvePlugins( services['vue/autoInsertParentheses'] ??= createAutoWrapParenthesesService(); services['vue/autoInsertSpaces'] ??= createAutoAddSpaceService(); services['vue/visualizeHiddenCallbackParam'] ??= createVisualizeHiddenCallbackParamService(); + services['vue/directiveComments'] ??= createDirectiveCommentsService(); services.emmet ??= createEmmetService(); return services; diff --git a/packages/vue-language-service/src/plugins/vue-directive-comments.ts b/packages/vue-language-service/src/plugins/vue-directive-comments.ts new file mode 100644 index 000000000..2c4b39794 --- /dev/null +++ b/packages/vue-language-service/src/plugins/vue-directive-comments.ts @@ -0,0 +1,63 @@ +import { CompletionItem, Service } from '@volar/language-service'; + +const cmds = [ + 'vue-ignore', + 'vue-skip', + 'vue-expect-error', +]; + +const plugin: Service = (): ReturnType => { + + return { + + triggerCharacters: ['@'], + + provideCompletionItems(document, position) { + + if (document.languageId !== 'html') + return; + + const line = document.getText({ start: { line: position.line, character: 0 }, end: position }); + const cmdStart = line.match(//g; + const plugin: Service = (context: ServiceContext | undefined, modules) => { if (!context || !modules?.typescript) @@ -18,7 +20,7 @@ const plugin: Service = (context: ServiceContext/g)) { + for (const pointer of document.getText(range).matchAll(twoslashReg)) { const offset = pointer.index! + pointer[0].indexOf('^?') + document.offsetAt(range.start); const position = document.positionAt(offset); hoverOffsets.push([position, document.offsetAt({ diff --git a/packages/vue-language-service/tests/findDefinition.ts b/packages/vue-language-service/tests/findDefinition.ts index 77b36374c..ad93996f4 100644 --- a/packages/vue-language-service/tests/findDefinition.ts +++ b/packages/vue-language-service/tests/findDefinition.ts @@ -71,9 +71,11 @@ function readFiles(dir: string) { return filesText; } +const definitionReg = /(\^*)definition:\s*([\S]*),\s*([\S]*),\s*([\S]*)/g; + function findActions(text: string) { - return [...text.matchAll(/(\^*)definition:\s*([\S]*),\s*([\S]*),\s*([\S]*)/g)].map(flag => { + return [...text.matchAll(definitionReg)].map(flag => { const offset = flag.index!; const targetFile = flag[2]; diff --git a/packages/vue-language-service/tests/rename.ts b/packages/vue-language-service/tests/rename.ts index 5228e3bf2..6912f7624 100644 --- a/packages/vue-language-service/tests/rename.ts +++ b/packages/vue-language-service/tests/rename.ts @@ -79,9 +79,11 @@ function readFiles(dir: string) { return filesText; } +const renameReg = /(\^*)rename:\s*([\S]*)/g; + function findRenameActions(text: string) { - return [...text.matchAll(/(\^*)rename:\s*([\S]*)/g)].map(flag => { + return [...text.matchAll(renameReg)].map(flag => { const start = flag.index!; const end = start + flag[1].length; diff --git a/packages/vue-tsc/src/index.ts b/packages/vue-tsc/src/index.ts index d8a5c4cab..f1f25cdf9 100644 --- a/packages/vue-tsc/src/index.ts +++ b/packages/vue-tsc/src/index.ts @@ -15,6 +15,8 @@ interface ProgramContext { languageService: ReturnType, } +const windowsPathReg = /\\/g; + export function createProgram(options: ts.CreateProgramOptions) { if (!options.options.noEmit && !options.options.emitDeclarationOnly) @@ -66,7 +68,7 @@ export function createProgram(options: ts.CreateProgramOptions) { return ctx.projectVersion.toString(); }, getProjectReferences: () => ctx.options.projectReferences, - getCurrentDirectory: () => ctx.options.host!.getCurrentDirectory().replace(/\\/g, '/'), + getCurrentDirectory: () => ctx.options.host!.getCurrentDirectory().replace(windowsPathReg, '/'), getCancellationToken: ctx.options.host!.getCancellationToken ? () => ctx.options.host!.getCancellationToken!() : undefined, }; const vueTsLs = vueTs.createLanguageService(languageHost, vueCompilerOptions, ts as any, ts.sys); From 0f039cfe36afb48576560c6e2b8d058357b68f8c Mon Sep 17 00:00:00 2001 From: Ilya Golovin <74474615+maIIady@users.noreply.github.com> Date: Thu, 13 Jul 2023 07:32:52 +0300 Subject: [PATCH 20/25] fix(class references): non scoped classes resolution regression (#3381) Co-authored-by: Johnson Chu --- packages/vue-language-core/src/generators/script.ts | 8 +++++--- packages/vue-language-core/src/generators/template.ts | 4 ++-- .../vue-language-core/src/utils/parseCssClassNames.ts | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/vue-language-core/src/generators/script.ts b/packages/vue-language-core/src/generators/script.ts index fdd4a4557..29daa8736 100644 --- a/packages/vue-language-core/src/generators/script.ts +++ b/packages/vue-language-core/src/generators/script.ts @@ -819,6 +819,7 @@ declare function defineProp(value?: T | (() => T), required?: boolean, rest?: { start: className.offset, end: className.offset + className.text.length }, 'string', false, + true, ); } codes.push('>;\n'); @@ -837,7 +838,7 @@ declare function defineProp(value?: T | (() => T), required?: boolean, rest?: codes.push('type __VLS_StyleScopedClasses = {}'); for (let i = 0; i < _sfc.styles.length; i++) { const style = _sfc.styles[i]; - if (!style.scoped) continue; + if (!style.scoped && vueCompilerOptions.experimentalResolveStyleCssClasses !== 'always') continue; for (const className of style.classNames) { generateCssClassProperty( i, @@ -845,6 +846,7 @@ declare function defineProp(value?: T | (() => T), required?: boolean, rest?: { start: className.offset, end: className.offset + className.text.length }, 'boolean', true, + !style.module, ); } } @@ -882,7 +884,7 @@ declare function defineProp(value?: T | (() => T), required?: boolean, rest?: return { cssIds }; - function generateCssClassProperty(styleIndex: number, className: string, classRange: TextRange, propertyType: string, optional: boolean) { + function generateCssClassProperty(styleIndex: number, className: string, classRange: TextRange, propertyType: string, optional: boolean, referencesCodeLens: boolean) { codes.push(`\n & { `); codes.push([ '', @@ -890,7 +892,7 @@ declare function defineProp(value?: T | (() => T), required?: boolean, rest?: classRange.start, { references: true, - referencesCodeLens: true, + referencesCodeLens, }, ]); codes.push(`'`); diff --git a/packages/vue-language-core/src/generators/template.ts b/packages/vue-language-core/src/generators/template.ts index 017042b10..0ca6c71ae 100644 --- a/packages/vue-language-core/src/generators/template.ts +++ b/packages/vue-language-core/src/generators/template.ts @@ -153,7 +153,7 @@ export function generate( const allClasses = new Set(); for (const block of sfc.styles) { - if (block.scoped) { + if (block.scoped || vueCompilerOptions.experimentalResolveStyleCssClasses === 'always') { for (const className of block.classNames) { allClasses.add(className.text.substring(1)); } @@ -809,7 +809,7 @@ export function generate( generateDirectives(node, var_originalComponent); generateElReferences(node); // - if (sfc.styles.some(s => s.scoped)) { + if (sfc.styles.some(s => s.scoped || vueCompilerOptions.experimentalResolveStyleCssClasses === 'always')) { generateClassScoped(node); } if (componentCtxVar) { diff --git a/packages/vue-language-core/src/utils/parseCssClassNames.ts b/packages/vue-language-core/src/utils/parseCssClassNames.ts index 2a9fd25a7..147376e13 100644 --- a/packages/vue-language-core/src/utils/parseCssClassNames.ts +++ b/packages/vue-language-core/src/utils/parseCssClassNames.ts @@ -4,8 +4,8 @@ const cssClassNameReg = /(?=([\.]{1}[a-zA-Z_]+[\w\_\-]*)[\s\.\+\{\>#\:]{1})/g; export function* parseCssClassNames(styleContent: string) { styleContent = clearComments(styleContent); - const matchs = styleContent.matchAll(cssClassNameReg); - for (const match of matchs) { + const matches = styleContent.matchAll(cssClassNameReg); + for (const match of matches) { if (match.index !== undefined) { const matchText = match[1]; if (matchText !== undefined) { From a899685d47da48c370c15c7a0ae08ea2512a58bb Mon Sep 17 00:00:00 2001 From: Chakir QATAB Date: Thu, 13 Jul 2023 08:33:38 +0400 Subject: [PATCH 21/25] test: change defineComponent to support JSX (#3384) --- .../vue-component-meta/tests/index.spec.ts | 21 +++++++++++++++++++ .../ts-component/component.ts | 2 +- .../ts-component/component.tsx | 8 +++++++ .../ts-named-export/component.ts | 4 ++-- 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 packages/vue-test-workspace/vue-component-meta/ts-component/component.tsx diff --git a/packages/vue-component-meta/tests/index.spec.ts b/packages/vue-component-meta/tests/index.spec.ts index 4533043de..2a6449220 100644 --- a/packages/vue-component-meta/tests/index.spec.ts +++ b/packages/vue-component-meta/tests/index.spec.ts @@ -732,6 +732,27 @@ const worker = (checker: ComponentMetaChecker, withTsconfig: boolean) => describ expect(meta.type).toEqual(TypeMeta.Unknown); }); + + test('ts-component.tsx', () => { + const componentPath = path.resolve(__dirname, '../../vue-test-workspace/vue-component-meta/ts-component/component.tsx'); + const meta = checker.getComponentMeta(componentPath); + + expect(meta.type).toEqual(TypeMeta.Function); + + const a = meta.props.find(prop => + prop.name === 'foo' + && prop.required === true + && prop.type === 'string' + ); + const b = meta.props.find(prop => + prop.name === 'bar' + && prop.required === false + && prop.type === 'number | undefined' + ); + + expect(a).toBeDefined(); + expect(b).toBeDefined(); + }); }); const checkerOptions: MetaCheckerOptions = { diff --git a/packages/vue-test-workspace/vue-component-meta/ts-component/component.ts b/packages/vue-test-workspace/vue-component-meta/ts-component/component.ts index 65af12043..55062a45f 100644 --- a/packages/vue-test-workspace/vue-component-meta/ts-component/component.ts +++ b/packages/vue-test-workspace/vue-component-meta/ts-component/component.ts @@ -2,5 +2,5 @@ import { h, defineComponent } from "vue"; import { MyProps } from "./PropDefinitions"; export default defineComponent((props: MyProps) => { - return h('pre', JSON.stringify(props, null, 2)); + return () => h('pre', JSON.stringify(props, null, 2)); }); diff --git a/packages/vue-test-workspace/vue-component-meta/ts-component/component.tsx b/packages/vue-test-workspace/vue-component-meta/ts-component/component.tsx new file mode 100644 index 000000000..0ceaa9e01 --- /dev/null +++ b/packages/vue-test-workspace/vue-component-meta/ts-component/component.tsx @@ -0,0 +1,8 @@ +import { defineComponent } from "vue"; +import { MyProps } from "./PropDefinitions"; + +export default defineComponent((props: MyProps) => { + return () => 
+		{JSON.stringify(props, null, 2)}
+
; +}); diff --git a/packages/vue-test-workspace/vue-component-meta/ts-named-export/component.ts b/packages/vue-test-workspace/vue-component-meta/ts-named-export/component.ts index a52d2bd6c..cf55be5cb 100644 --- a/packages/vue-test-workspace/vue-component-meta/ts-named-export/component.ts +++ b/packages/vue-test-workspace/vue-component-meta/ts-named-export/component.ts @@ -1,5 +1,5 @@ import { defineComponent } from "vue"; -export const Foo = defineComponent((_: { foo: string; }) => { }); +export const Foo = defineComponent((_: { foo: string; }) => ()=> { }); -export const Bar = defineComponent((_: { bar?: number; }) => { }); +export const Bar = defineComponent((_: { bar?: number; }) => ()=> { }); From b35cd234d5c55229090b7d253fcefadfbe45de23 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 13 Jul 2023 07:56:00 +0300 Subject: [PATCH 22/25] Use faster method after config change (#3393) Co-authored-by: Johnson Chu --- packages/vscode-vue/src/common.ts | 60 +++++++++++++++---------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/packages/vscode-vue/src/common.ts b/packages/vscode-vue/src/common.ts index f3abe1f89..934faf469 100644 --- a/packages/vscode-vue/src/common.ts +++ b/packages/vscode-vue/src/common.ts @@ -137,31 +137,28 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang activateServerSys(client); } - async function requestReloadVscode() { - const reload = await vscode.window.showInformationMessage( - 'Please reload VSCode to restart language servers.', - 'Reload Window' - ); - if (reload === undefined) return; // cancel - vscode.commands.executeCommand('workbench.action.reloadWindow'); - } function activateServerMaxOldSpaceSizeChange() { vscode.workspace.onDidChangeConfiguration((e) => { - if (e.affectsConfiguration('vue.server')) { - requestReloadVscode(); - } - else if (e.affectsConfiguration('vue')) { + if (e.affectsConfiguration('vue')) { vscode.commands.executeCommand('volar.action.restartServer'); } }); } + async function activateRestartRequest() { context.subscriptions.push(vscode.commands.registerCommand('volar.action.restartServer', async () => { + await Promise.all(clients.map(client => client.stop())); + + semanticClient.clientOptions.initializationOptions = await getInitializationOptions(ServerMode.PartialSemantic, context, semanticClient.clientOptions.initializationOptions); + syntacticClient.clientOptions.initializationOptions = await getInitializationOptions(ServerMode.Syntactic, context, syntacticClient.clientOptions.initializationOptions); + await Promise.all(clients.map(client => client.start())); + activateClientRequests(); })); } + function activateClientRequests() { nameCasing.activate(context, semanticClient); } @@ -204,29 +201,28 @@ export function getDocumentSelector(context: vscode.ExtensionContext, serverMode async function getInitializationOptions( serverMode: ServerMode, context: vscode.ExtensionContext, + options: VueServerInitializationOptions = {}, ) { - const initializationOptions: VueServerInitializationOptions = { - // volar - configFilePath: config.server.configFilePath, - serverMode, - diagnosticModel: config.server.diagnosticModel === 'pull' ? DiagnosticModel.Pull : DiagnosticModel.Push, - typescript: { tsdk: (await getTsdk(context)).tsdk }, - reverseConfigFilePriority: config.server.reverseConfigFilePriority, - maxFileSize: config.server.maxFileSize, - semanticTokensLegend: { + // volar + options.configFilePath = config.server.configFilePath; + options.serverMode = serverMode, + options.diagnosticModel = config.server.diagnosticModel === 'pull' ? DiagnosticModel.Pull : DiagnosticModel.Push, + options.typescript = { tsdk: (await getTsdk(context)).tsdk }, + options.reverseConfigFilePriority = config.server.reverseConfigFilePriority, + options.maxFileSize = config.server.maxFileSize, + options.semanticTokensLegend = { tokenTypes: ['component'], tokenModifiers: [], - }, - fullCompletionList: config.server.fullCompletionList, + }; + options.fullCompletionList = config.server.fullCompletionList, // vue - json: { + options.json = { customBlockSchemaUrls: config.server.json.customBlockSchemaUrls, - }, - additionalExtensions: [ - ...config.server.additionalExtensions, - ...!config.server.petiteVue.supportHtmlFile ? [] : ['html'], - ...!config.server.vitePress.supportMdFile ? [] : ['md'], - ], - }; - return initializationOptions; + }; + options.additionalExtensions = [ + ...config.server.additionalExtensions, + ...!config.server.petiteVue.supportHtmlFile ? [] : ['html'], + ...!config.server.vitePress.supportMdFile ? [] : ['md'], + ]; + return options; } From 67efd7e96d3bf7482a30688f4cd614b9b461e63b Mon Sep 17 00:00:00 2001 From: Johnson Chu Date: Thu, 13 Jul 2023 13:02:56 +0800 Subject: [PATCH 23/25] Deprecate language server `json.customBlockSchemaUrls` option (#3398) --- packages/vscode-vue/package.json | 3 --- packages/vscode-vue/src/common.ts | 6 +----- packages/vscode-vue/src/config.ts | 3 --- .../src/languageServerPlugin.ts | 20 ------------------- packages/vue-language-server/src/types.ts | 3 --- .../src/languageService.ts | 6 ++---- 6 files changed, 3 insertions(+), 38 deletions(-) diff --git a/packages/vscode-vue/package.json b/packages/vscode-vue/package.json index cefc615c3..2ded1468f 100644 --- a/packages/vscode-vue/package.json +++ b/packages/vscode-vue/package.json @@ -426,9 +426,6 @@ "type": "boolean", "default": false }, - "vue.server.json.customBlockSchemaUrls": { - "type": "object" - }, "vue.server.diagnosticModel": { "type": "string", "default": "push", diff --git a/packages/vscode-vue/src/common.ts b/packages/vscode-vue/src/common.ts index 934faf469..47fa649d9 100644 --- a/packages/vscode-vue/src/common.ts +++ b/packages/vscode-vue/src/common.ts @@ -214,11 +214,7 @@ async function getInitializationOptions( tokenTypes: ['component'], tokenModifiers: [], }; - options.fullCompletionList = config.server.fullCompletionList, - // vue - options.json = { - customBlockSchemaUrls: config.server.json.customBlockSchemaUrls, - }; + options.fullCompletionList = config.server.fullCompletionList; options.additionalExtensions = [ ...config.server.additionalExtensions, ...!config.server.petiteVue.supportHtmlFile ? [] : ['html'], diff --git a/packages/vscode-vue/src/config.ts b/packages/vscode-vue/src/config.ts index ef8ab3dd5..564bf0c06 100644 --- a/packages/vscode-vue/src/config.ts +++ b/packages/vscode-vue/src/config.ts @@ -29,9 +29,6 @@ export const config = { petiteVue: { supportHtmlFile: boolean; }; - json: { - customBlockSchemaUrls: Record; - }; }> { return _config().get('server')!; }, diff --git a/packages/vue-language-server/src/languageServerPlugin.ts b/packages/vue-language-server/src/languageServerPlugin.ts index 22c6c85e9..a43bfaf29 100644 --- a/packages/vue-language-server/src/languageServerPlugin.ts +++ b/packages/vue-language-server/src/languageServerPlugin.ts @@ -35,7 +35,6 @@ export function createServerPlugin(connection: Connection) { async resolveConfig(config, ctx) { const vueOptions = await getVueCompilerOptions(); - const vueLanguageServiceSettings = getVueLanguageServiceSettings(); if (ctx) { hostToVueOptions.set(ctx.host, vue.resolveVueCompilerOptions(vueOptions)); @@ -46,7 +45,6 @@ export function createServerPlugin(connection: Connection) { ctx?.host.getCompilationSettings() ?? {}, vueOptions, ts, - vueLanguageServiceSettings, initOptions.codegenStack, ); @@ -81,24 +79,6 @@ export function createServerPlugin(connection: Connection) { return vueOptions; } - - function getVueLanguageServiceSettings() { - - const settings: vue.Settings = {}; - - if (initOptions.json && ctx) { - settings.json = { schemas: [] }; - for (const blockType in initOptions.json.customBlockSchemaUrls) { - const url = initOptions.json.customBlockSchemaUrls[blockType]; - settings.json.schemas?.push({ - fileMatch: [`*.customBlock_${blockType}_*.json*`], - uri: new URL(url, ctx.project.rootUri.toString() + '/').toString(), - }); - } - } - - return settings; - } }, onInitialized(getService, env) { diff --git a/packages/vue-language-server/src/types.ts b/packages/vue-language-server/src/types.ts index e1cb00871..f1b17acf4 100644 --- a/packages/vue-language-server/src/types.ts +++ b/packages/vue-language-server/src/types.ts @@ -1,9 +1,6 @@ import { InitializationOptions } from "@volar/language-server"; export type VueServerInitializationOptions = InitializationOptions & { - json?: { - customBlockSchemaUrls?: Record; - }; /** * @example ['vue1', 'vue2'] */ diff --git a/packages/vue-language-service/src/languageService.ts b/packages/vue-language-service/src/languageService.ts index 0016bf9eb..0bc063bc9 100644 --- a/packages/vue-language-service/src/languageService.ts +++ b/packages/vue-language-service/src/languageService.ts @@ -34,7 +34,6 @@ export function resolveConfig( compilerOptions: ts.CompilerOptions = {}, vueCompilerOptions: Partial = {}, ts: typeof import('typescript/lib/tsserverlibrary') = require('typescript'), - settings?: Settings, codegenStack: boolean = false, ) { @@ -42,7 +41,7 @@ export function resolveConfig( const vueLanguageModules = vue.createLanguages(compilerOptions, resolvedVueCompilerOptions, ts, codegenStack); config.languages = Object.assign({}, vueLanguageModules, config.languages); - config.services = resolvePlugins(config.services, resolvedVueCompilerOptions, settings); + config.services = resolvePlugins(config.services, resolvedVueCompilerOptions); return config; } @@ -52,7 +51,6 @@ const unicodeReg = /\\u/g; function resolvePlugins( services: Config['services'], vueCompilerOptions: VueCompilerOptions, - settings?: Settings, ) { const originalTsPlugin: Service = services?.typescript ?? createTsService(); @@ -284,7 +282,7 @@ function resolvePlugins( services.vue ??= createVueService(); services.css ??= createCssService(); services['pug-beautify'] ??= createPugFormatService(); - services.json ??= createJsonService(settings?.json); + services.json ??= createJsonService(); services['typescript/twoslash-queries'] ??= createTsTqService(); services['vue/referencesCodeLens'] ??= createReferencesCodeLensService(); services['vue/autoInsertDotValue'] ??= createAutoDotValueService(); From a716e9bdd3aeff7d486b41d2745b649b87e78aab Mon Sep 17 00:00:00 2001 From: Johnson Chu Date: Thu, 13 Jul 2023 13:07:34 +0800 Subject: [PATCH 24/25] chore: bump volar --- package.json | 2 +- packages/vscode-vue/package.json | 2 +- packages/vue-component-meta/package.json | 2 +- packages/vue-language-core/package.json | 4 +-- packages/vue-language-plugin-pug/package.json | 2 +- packages/vue-language-server/package.json | 6 ++-- packages/vue-language-service/package.json | 8 +++--- packages/vue-typescript/package.json | 2 +- pnpm-lock.yaml | 28 +++++++++---------- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 443ec7be7..2584c1634 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "devDependencies": { "@types/node": "latest", - "@volar/language-service": "~1.8.0", + "@volar/language-service": "~1.8.3", "typescript": "latest", "vite": "latest", "vitest": "latest" diff --git a/packages/vscode-vue/package.json b/packages/vscode-vue/package.json index 2ded1468f..45eee322d 100644 --- a/packages/vscode-vue/package.json +++ b/packages/vscode-vue/package.json @@ -725,7 +725,7 @@ "devDependencies": { "@types/semver": "^7.3.13", "@types/vscode": "1.67.0", - "@volar/vscode": "~1.8.0", + "@volar/vscode": "~1.8.3", "@vue/language-core": "1.8.4", "@vue/language-server": "1.8.4", "esbuild": "0.15.18", diff --git a/packages/vue-component-meta/package.json b/packages/vue-component-meta/package.json index 1f34bffe8..b7bbf8cc4 100644 --- a/packages/vue-component-meta/package.json +++ b/packages/vue-component-meta/package.json @@ -13,7 +13,7 @@ "directory": "packages/vue-component-meta" }, "dependencies": { - "@volar/typescript": "~1.8.0", + "@volar/typescript": "~1.8.3", "@vue/language-core": "1.8.4", "typesafe-path": "^0.2.2", "vue-component-type-helpers": "1.8.4" diff --git a/packages/vue-language-core/package.json b/packages/vue-language-core/package.json index e306035ed..2365ab8fa 100644 --- a/packages/vue-language-core/package.json +++ b/packages/vue-language-core/package.json @@ -13,8 +13,8 @@ "directory": "packages/vue-language-core" }, "dependencies": { - "@volar/language-core": "~1.8.0", - "@volar/source-map": "~1.8.0", + "@volar/language-core": "~1.8.3", + "@volar/source-map": "~1.8.3", "@vue/compiler-dom": "^3.3.0", "@vue/reactivity": "^3.3.0", "@vue/shared": "^3.3.0", diff --git a/packages/vue-language-plugin-pug/package.json b/packages/vue-language-plugin-pug/package.json index 03ea72ef3..569f39b31 100644 --- a/packages/vue-language-plugin-pug/package.json +++ b/packages/vue-language-plugin-pug/package.json @@ -16,7 +16,7 @@ "@vue/language-core": "1.8.4" }, "dependencies": { - "@volar/source-map": "~1.8.0", + "@volar/source-map": "~1.8.3", "volar-service-pug": "0.0.9" } } diff --git a/packages/vue-language-server/package.json b/packages/vue-language-server/package.json index 5dc17bc3e..219f00684 100644 --- a/packages/vue-language-server/package.json +++ b/packages/vue-language-server/package.json @@ -16,9 +16,9 @@ "directory": "packages/vue-language-server" }, "dependencies": { - "@volar/language-core": "~1.8.0", - "@volar/language-server": "~1.8.0", - "@volar/typescript": "~1.8.0", + "@volar/language-core": "~1.8.3", + "@volar/language-server": "~1.8.3", + "@volar/typescript": "~1.8.3", "@vue/language-core": "1.8.4", "@vue/language-service": "1.8.4", "vscode-languageserver-protocol": "^3.17.3", diff --git a/packages/vue-language-service/package.json b/packages/vue-language-service/package.json index ff4a228ed..e3201b444 100644 --- a/packages/vue-language-service/package.json +++ b/packages/vue-language-service/package.json @@ -17,9 +17,9 @@ "update-html-data": "node ./scripts/update-html-data.js" }, "dependencies": { - "@volar/language-core": "~1.8.0", - "@volar/language-service": "~1.8.0", - "@volar/typescript": "~1.8.0", + "@volar/language-core": "~1.8.3", + "@volar/language-service": "~1.8.3", + "@volar/typescript": "~1.8.3", "@vue/compiler-dom": "^3.3.0", "@vue/language-core": "1.8.4", "@vue/reactivity": "^3.3.0", @@ -36,7 +36,7 @@ "vscode-languageserver-textdocument": "^1.0.8" }, "devDependencies": { - "@volar/kit": "~1.8.0", + "@volar/kit": "~1.8.3", "vscode-languageserver-protocol": "^3.17.3", "vscode-uri": "^3.0.7" } diff --git a/packages/vue-typescript/package.json b/packages/vue-typescript/package.json index 5cd2dc9ea..2f1b3255f 100644 --- a/packages/vue-typescript/package.json +++ b/packages/vue-typescript/package.json @@ -13,7 +13,7 @@ "directory": "packages/vue-typescript" }, "dependencies": { - "@volar/typescript": "~1.8.0", + "@volar/typescript": "~1.8.3", "@vue/language-core": "1.8.4" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 25f0456da..b40e9a12a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,7 +19,7 @@ importers: specifier: latest version: 20.4.2 '@volar/language-service': - specifier: ~1.8.0 + specifier: ~1.8.3 version: 1.8.3 typescript: specifier: latest @@ -64,7 +64,7 @@ importers: specifier: 1.67.0 version: 1.67.0 '@volar/vscode': - specifier: ~1.8.0 + specifier: ~1.8.3 version: 1.8.3 '@vue/language-core': specifier: 1.8.4 @@ -94,7 +94,7 @@ importers: packages/vue-component-meta: dependencies: '@volar/typescript': - specifier: ~1.8.0 + specifier: ~1.8.3 version: 1.8.3 '@vue/language-core': specifier: 1.8.4 @@ -111,10 +111,10 @@ importers: packages/vue-language-core: dependencies: '@volar/language-core': - specifier: ~1.8.0 + specifier: ~1.8.3 version: 1.8.3 '@volar/source-map': - specifier: ~1.8.0 + specifier: ~1.8.3 version: 1.8.3 '@vue/compiler-dom': specifier: ^3.3.0 @@ -145,7 +145,7 @@ importers: packages/vue-language-plugin-pug: dependencies: '@volar/source-map': - specifier: ~1.8.0 + specifier: ~1.8.3 version: 1.8.3 volar-service-pug: specifier: 0.0.9 @@ -158,13 +158,13 @@ importers: packages/vue-language-server: dependencies: '@volar/language-core': - specifier: ~1.8.0 + specifier: ~1.8.3 version: 1.8.3 '@volar/language-server': - specifier: ~1.8.0 + specifier: ~1.8.3 version: 1.8.3 '@volar/typescript': - specifier: ~1.8.0 + specifier: ~1.8.3 version: 1.8.3 '@vue/language-core': specifier: 1.8.4 @@ -182,13 +182,13 @@ importers: packages/vue-language-service: dependencies: '@volar/language-core': - specifier: ~1.8.0 + specifier: ~1.8.3 version: 1.8.3 '@volar/language-service': - specifier: ~1.8.0 + specifier: ~1.8.3 version: 1.8.3 '@volar/typescript': - specifier: ~1.8.0 + specifier: ~1.8.3 version: 1.8.3 '@vue/compiler-dom': specifier: ^3.3.0 @@ -234,7 +234,7 @@ importers: version: 1.0.8 devDependencies: '@volar/kit': - specifier: ~1.8.0 + specifier: ~1.8.3 version: 1.8.3(typescript@5.1.6) vscode-languageserver-protocol: specifier: ^3.17.3 @@ -280,7 +280,7 @@ importers: packages/vue-typescript: dependencies: '@volar/typescript': - specifier: ~1.8.0 + specifier: ~1.8.3 version: 1.8.3 '@vue/language-core': specifier: 1.8.4 From 378b8532fe4d49fe76c6f0774fee573059f335c6 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 13 Jul 2023 16:14:45 +0800 Subject: [PATCH 25/25] chore: fix typo (#3399) --- packages/vue-language-core/src/parsers/scriptSetupRanges.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/vue-language-core/src/parsers/scriptSetupRanges.ts b/packages/vue-language-core/src/parsers/scriptSetupRanges.ts index 053422477..1b4a3ab6f 100644 --- a/packages/vue-language-core/src/parsers/scriptSetupRanges.ts +++ b/packages/vue-language-core/src/parsers/scriptSetupRanges.ts @@ -44,9 +44,9 @@ export function parseScriptSetupRanges( // fix https://github.com/vuejs/language-tools/issues/1223 && !ts.isImportEqualsDeclaration(node) ) { - const commentRagnes = ts.getLeadingCommentRanges(ast.getFullText(), node.getFullStart()); - if (commentRagnes?.length) { - const commentRange = commentRagnes.sort((a, b) => a.pos - b.pos)[0]; + const commentRanges = ts.getLeadingCommentRanges(ast.getFullText(), node.getFullStart()); + if (commentRanges?.length) { + const commentRange = commentRanges.sort((a, b) => a.pos - b.pos)[0]; importSectionEndOffset = commentRange.pos; } else {