From ce5623e52a31c99797052727a817d422266f210d Mon Sep 17 00:00:00 2001 From: Johnson Chu Date: Mon, 23 Oct 2023 22:34:03 +0800 Subject: [PATCH] refactor: reorganize packages (#3685) --- .github/workflows/release.yml | 4 +- .github/workflows/update-html-data.yml | 4 +- .gitignore | 4 +- .vscode/launch.json | 6 +- .vscode/settings.json | 2 +- CHANGELOG.md | 2 +- README.md | 26 +++--- .../vscode-typescript-plugin}/.vscodeignore | 0 .../vscode-typescript-plugin}/CHANGELOG.md | 0 .../vscode-typescript-plugin}/LICENSE | 0 .../vscode-typescript-plugin}/README.md | 0 .../vscode-typescript-plugin}/images/icon.png | Bin .../vscode-typescript-plugin}/package.json | 2 +- .../scripts/build.js | 0 .../vscode-typescript-plugin}/tsconfig.json | 2 +- .../vscode}/.vscodeignore | 0 .../vscode}/CHANGELOG.md | 0 .../vscode}/LICENSE | 0 .../vscode}/README.md | 0 .../vscode}/client.js | 0 .../vscode}/images/icon.png | Bin .../vscode}/images/split-editors.png | Bin .../markdown-language-configuration.json | 0 .../sfc-template-language-configuration.json | 0 .../languages/vue-language-configuration.json | 0 .../vscode}/package.json | 2 +- .../vscode}/package.nls.json | 0 .../vscode}/scripts/build.js | 0 .../vscode}/server.js | 0 .../vscode}/src/common.ts | 0 .../vscode}/src/config.ts | 0 .../vscode}/src/features/componentMeta.ts | 0 .../vscode}/src/features/doctor.ts | 2 +- .../vscode}/src/features/nameCasing.ts | 0 .../vscode}/src/features/splitEditors.ts | 0 .../vscode}/src/middleware.ts | 0 .../vscode}/src/nodeClientMain.ts | 0 .../vscode}/syntaxes/markdown-vue.json | 0 .../vscode}/syntaxes/vue-directives.json | 0 .../vscode}/syntaxes/vue-interpolations.json | 0 .../vue-sfc-style-variable-injection.json | 0 .../vscode}/syntaxes/vue.tmLanguage.json | 0 .../vscode}/tests/index.spec.ts | 0 extensions/vscode/tsconfig.json | 11 +++ .../vscode-vue => extensions/vscode}/web.js | 0 package.json | 20 ++-- .../{vscode-vue => component-meta}/LICENSE | 0 .../README.md | 4 +- .../package.json | 2 +- .../src/index.ts | 0 .../src/types.ts | 0 .../tests/index.spec.ts | 0 .../tsconfig.json | 2 +- .../LICENSE | 0 .../README.md | 0 .../index.d.ts | 0 .../index.js | 0 .../package.json | 2 +- .../LICENSE | 0 .../package.json | 2 +- .../vue-tsconfig.deprecated.schema.json | 0 .../schemas/vue-tsconfig.schema.json | 2 +- .../src/generators/script.ts | 0 .../src/generators/template.ts | 0 .../src/index.ts | 0 .../src/languageModule.ts | 0 .../src/parsers/scriptRanges.ts | 0 .../src/parsers/scriptSetupRanges.ts | 0 .../src/plugins.ts | 0 .../src/plugins/file-html.ts | 0 .../src/plugins/file-md.ts | 0 .../src/plugins/file-vue.ts | 0 .../src/plugins/vue-sfc-customblocks.ts | 0 .../src/plugins/vue-sfc-scripts.ts | 0 .../src/plugins/vue-sfc-styles.ts | 0 .../src/plugins/vue-sfc-template.ts | 0 .../src/plugins/vue-template-html.ts | 0 .../src/plugins/vue-tsx.ts | 0 .../src/types.ts | 0 .../src/utils/globalTypes.ts | 0 .../src/utils/parseCssClassNames.ts | 0 .../src/utils/parseCssVars.ts | 0 .../src/utils/parseSfc.ts | 0 .../src/utils/shared.ts | 0 .../src/utils/transform.ts | 0 .../src/utils/ts.ts | 0 .../src/utils/vue2TemplateCompiler.ts | 0 .../src/virtualFile/computedFiles.ts | 0 .../src/virtualFile/computedMappings.ts | 0 .../src/virtualFile/computedSfc.ts | 0 .../src/virtualFile/computedVueSfc.ts | 0 .../src/virtualFile/embeddedFile.ts | 0 .../src/virtualFile/vueFile.ts | 0 .../tsconfig.json | 0 .../LICENSE | 0 .../README.md | 0 .../package.json | 2 +- .../src/index.ts | 0 .../tsconfig.json | 2 +- .../LICENSE | 0 .../bin/vue-language-server.js | 0 .../package.json | 2 +- .../src/index.ts | 0 .../src/languageServerPlugin.ts | 0 .../src/nodeServer.ts | 0 .../src/protocol.ts | 0 .../src/types.ts | 0 .../src/webServer.ts | 0 .../tsconfig.json | 5 +- .../LICENSE | 0 .../data/language-blocks/en.json | 0 .../data/language-blocks/fr.json | 0 .../data/language-blocks/it.json | 0 .../data/language-blocks/ja.json | 0 .../data/language-blocks/ko.json | 0 .../data/language-blocks/pt.json | 0 .../data/language-blocks/zh-cn.json | 0 .../data/model-modifiers/en.json | 0 .../data/model-modifiers/fr.json | 0 .../data/model-modifiers/it.json | 0 .../data/model-modifiers/ja.json | 0 .../data/model-modifiers/ko.json | 0 .../data/model-modifiers/pt.json | 0 .../data/model-modifiers/zh-cn.json | 0 .../data/template/en.json | 0 .../data/template/fr.json | 0 .../data/template/it.json | 0 .../data/template/ja.json | 0 .../data/template/ko.json | 0 .../data/template/pt.json | 0 .../data/template/zh-cn.json | 0 .../package.json | 2 +- .../scripts/update-html-data.js | 0 .../src/helpers.ts | 0 .../src/ideFeatures/nameCasing.ts | 0 .../src/index.ts | 0 .../src/languageService.ts | 0 .../src/plugins/data.ts | 0 .../src/plugins/vue-autoinsert-dotvalue.ts | 0 .../src/plugins/vue-autoinsert-parentheses.ts | 0 .../src/plugins/vue-autoinsert-space.ts | 0 .../src/plugins/vue-codelens-references.ts | 0 .../src/plugins/vue-directive-comments.ts | 0 .../src/plugins/vue-extract-file.ts | 0 .../src/plugins/vue-template.ts | 0 .../plugins/vue-toggle-v-bind-codeaction.ts | 0 .../src/plugins/vue-twoslash-queries.ts | 0 .../vue-visualize-hidden-callback-param.ts | 0 .../src/plugins/vue.ts | 0 .../src/types.ts | 0 .../tests/complete.ts | 0 .../tests/findDefinition.ts | 0 .../tests/format/1210.spec.ts | 0 .../tests/format/1398.spec.ts | 0 .../tests/format/1806.spec.ts | 0 .../tests/format/1823.spec.ts | 0 .../tests/format/2026.spec.ts | 0 .../tests/format/2105.spec.ts | 0 .../tests/format/2305.spec.ts | 0 .../tests/format/2350.spec.ts | 0 .../tests/format/2385.spec.ts | 0 .../tests/format/2390.spec.ts | 0 .../tests/format/2393.spec.ts | 0 .../tests/format/2480.spec.ts | 0 .../tests/format/2505.spec.ts | 0 .../tests/format/2507.spec.ts | 0 .../tests/format/2519.spec.ts | 0 .../tests/format/2520.spec.ts | 0 .../tests/format/2571.spec.ts | 0 .../tests/format/2750.spec.ts | 0 .../tests/format/3101.spec.ts | 0 .../tests/format/3572.spec.ts | 0 .../tests/format/js template strings.spec.ts | 0 .../format/multi-line html comment.spec.ts | 0 .../format/multi-line interpolation.spec.ts | 0 .../tests/index.spec.ts | 0 .../tests/reference.ts | 0 .../tests/rename.ts | 0 .../tests/utils/createTester.ts | 0 .../tests/utils/format.ts | 0 .../tsconfig.json | 2 +- .../LICENSE | 0 .../README.md | 0 .../package.json | 2 +- .../src/index.ts | 2 +- .../tsconfig.json | 2 +- packages/{vue-tsc-eslint-hook => tsc}/LICENSE | 0 packages/{vue-tsc => tsc}/README.md | 0 packages/{vue-tsc => tsc}/bin/vue-tsc.js | 0 packages/{vue-tsc => tsc}/package.json | 4 +- packages/{vue-tsc => tsc}/src/index.ts | 33 +++++-- packages/{vue-tsc => tsc}/src/shared.ts | 0 .../tests/__snapshots__/dts.spec.ts.snap | 0 packages/{vue-tsc => tsc}/tests/dts.spec.ts | 0 packages/{vue-tsc => tsc}/tests/index.spec.ts | 0 packages/tsc/tsconfig.json | 11 +++ .../{vue-tsc => typescript-plugin}/LICENSE | 0 .../package.json | 4 +- .../src/index.ts | 12 ++- packages/typescript-plugin/tsconfig.json | 11 +++ packages/typescript-vue-plugin/package.json | 20 ---- packages/typescript-vue-plugin/tsconfig.json | 12 --- packages/vue-language-server/tsconfig.json | 13 --- packages/vue-language-service/tsconfig.json | 12 --- packages/vue-tsc/tsconfig.json | 12 --- packages/vue-typescript/LICENSE | 21 ----- packages/vue-typescript/src/index.ts | 44 --------- pnpm-lock.yaml | 86 ++++++++---------- pnpm-workspace.yaml | 1 + tsconfig.ci.json | 8 +- tsconfig.json | 16 ++-- 211 files changed, 177 insertions(+), 265 deletions(-) rename {packages/vscode-typescript-vue-plugin => extensions/vscode-typescript-plugin}/.vscodeignore (100%) rename {packages/vscode-typescript-vue-plugin => extensions/vscode-typescript-plugin}/CHANGELOG.md (100%) rename {packages/typescript-vue-plugin => extensions/vscode-typescript-plugin}/LICENSE (100%) rename {packages/vscode-typescript-vue-plugin => extensions/vscode-typescript-plugin}/README.md (100%) rename {packages/vscode-typescript-vue-plugin => extensions/vscode-typescript-plugin}/images/icon.png (100%) rename {packages/vscode-typescript-vue-plugin => extensions/vscode-typescript-plugin}/package.json (94%) rename {packages/vscode-typescript-vue-plugin => extensions/vscode-typescript-plugin}/scripts/build.js (100%) rename {packages/vscode-typescript-vue-plugin => extensions/vscode-typescript-plugin}/tsconfig.json (70%) rename {packages/vscode-vue => extensions/vscode}/.vscodeignore (100%) rename {packages/vscode-vue => extensions/vscode}/CHANGELOG.md (100%) rename {packages/vscode-typescript-vue-plugin => extensions/vscode}/LICENSE (100%) rename {packages/vscode-vue => extensions/vscode}/README.md (100%) rename {packages/vscode-vue => extensions/vscode}/client.js (100%) rename {packages/vscode-vue => extensions/vscode}/images/icon.png (100%) rename {packages/vscode-vue => extensions/vscode}/images/split-editors.png (100%) rename {packages/vscode-vue => extensions/vscode}/languages/markdown-language-configuration.json (100%) rename {packages/vscode-vue => extensions/vscode}/languages/sfc-template-language-configuration.json (100%) rename {packages/vscode-vue => extensions/vscode}/languages/vue-language-configuration.json (100%) rename {packages/vscode-vue => extensions/vscode}/package.json (99%) rename {packages/vscode-vue => extensions/vscode}/package.nls.json (100%) rename {packages/vscode-vue => extensions/vscode}/scripts/build.js (100%) rename {packages/vscode-vue => extensions/vscode}/server.js (100%) rename {packages/vscode-vue => extensions/vscode}/src/common.ts (100%) rename {packages/vscode-vue => extensions/vscode}/src/config.ts (100%) rename {packages/vscode-vue => extensions/vscode}/src/features/componentMeta.ts (100%) rename {packages/vscode-vue => extensions/vscode}/src/features/doctor.ts (99%) rename {packages/vscode-vue => extensions/vscode}/src/features/nameCasing.ts (100%) rename {packages/vscode-vue => extensions/vscode}/src/features/splitEditors.ts (100%) rename {packages/vscode-vue => extensions/vscode}/src/middleware.ts (100%) rename {packages/vscode-vue => extensions/vscode}/src/nodeClientMain.ts (100%) rename {packages/vscode-vue => extensions/vscode}/syntaxes/markdown-vue.json (100%) rename {packages/vscode-vue => extensions/vscode}/syntaxes/vue-directives.json (100%) rename {packages/vscode-vue => extensions/vscode}/syntaxes/vue-interpolations.json (100%) rename {packages/vscode-vue => extensions/vscode}/syntaxes/vue-sfc-style-variable-injection.json (100%) rename {packages/vscode-vue => extensions/vscode}/syntaxes/vue.tmLanguage.json (100%) rename {packages/vscode-vue => extensions/vscode}/tests/index.spec.ts (100%) create mode 100644 extensions/vscode/tsconfig.json rename {packages/vscode-vue => extensions/vscode}/web.js (100%) rename packages/{vscode-vue => component-meta}/LICENSE (100%) rename packages/{vue-component-meta => component-meta}/README.md (96%) rename packages/{vue-component-meta => component-meta}/package.json (92%) rename packages/{vue-component-meta => component-meta}/src/index.ts (100%) rename packages/{vue-component-meta => component-meta}/src/types.ts (100%) rename packages/{vue-component-meta => component-meta}/tests/index.spec.ts (100%) rename packages/{vue-typescript => component-meta}/tsconfig.json (74%) rename packages/{vue-component-type-helpers => component-type-helpers}/LICENSE (100%) rename packages/{vue-component-type-helpers => component-type-helpers}/README.md (100%) rename packages/{vue-component-type-helpers => component-type-helpers}/index.d.ts (100%) rename packages/{vue-component-type-helpers => component-type-helpers}/index.js (100%) rename packages/{vue-component-type-helpers => component-type-helpers}/package.json (80%) rename packages/{vue-component-meta => language-core}/LICENSE (100%) rename packages/{vue-language-core => language-core}/package.json (94%) rename packages/{vue-language-core => language-core}/schemas/vue-tsconfig.deprecated.schema.json (100%) rename packages/{vue-language-core => language-core}/schemas/vue-tsconfig.schema.json (98%) rename packages/{vue-language-core => language-core}/src/generators/script.ts (100%) rename packages/{vue-language-core => language-core}/src/generators/template.ts (100%) rename packages/{vue-language-core => language-core}/src/index.ts (100%) rename packages/{vue-language-core => language-core}/src/languageModule.ts (100%) rename packages/{vue-language-core => language-core}/src/parsers/scriptRanges.ts (100%) rename packages/{vue-language-core => language-core}/src/parsers/scriptSetupRanges.ts (100%) rename packages/{vue-language-core => language-core}/src/plugins.ts (100%) rename packages/{vue-language-core => language-core}/src/plugins/file-html.ts (100%) rename packages/{vue-language-core => language-core}/src/plugins/file-md.ts (100%) rename packages/{vue-language-core => language-core}/src/plugins/file-vue.ts (100%) rename packages/{vue-language-core => language-core}/src/plugins/vue-sfc-customblocks.ts (100%) rename packages/{vue-language-core => language-core}/src/plugins/vue-sfc-scripts.ts (100%) rename packages/{vue-language-core => language-core}/src/plugins/vue-sfc-styles.ts (100%) rename packages/{vue-language-core => language-core}/src/plugins/vue-sfc-template.ts (100%) rename packages/{vue-language-core => language-core}/src/plugins/vue-template-html.ts (100%) rename packages/{vue-language-core => language-core}/src/plugins/vue-tsx.ts (100%) rename packages/{vue-language-core => language-core}/src/types.ts (100%) rename packages/{vue-language-core => language-core}/src/utils/globalTypes.ts (100%) rename packages/{vue-language-core => language-core}/src/utils/parseCssClassNames.ts (100%) rename packages/{vue-language-core => language-core}/src/utils/parseCssVars.ts (100%) rename packages/{vue-language-core => language-core}/src/utils/parseSfc.ts (100%) rename packages/{vue-language-core => language-core}/src/utils/shared.ts (100%) rename packages/{vue-language-core => language-core}/src/utils/transform.ts (100%) rename packages/{vue-language-core => language-core}/src/utils/ts.ts (100%) rename packages/{vue-language-core => language-core}/src/utils/vue2TemplateCompiler.ts (100%) rename packages/{vue-language-core => language-core}/src/virtualFile/computedFiles.ts (100%) rename packages/{vue-language-core => language-core}/src/virtualFile/computedMappings.ts (100%) rename packages/{vue-language-core => language-core}/src/virtualFile/computedSfc.ts (100%) rename packages/{vue-language-core => language-core}/src/virtualFile/computedVueSfc.ts (100%) rename packages/{vue-language-core => language-core}/src/virtualFile/embeddedFile.ts (100%) rename packages/{vue-language-core => language-core}/src/virtualFile/vueFile.ts (100%) rename packages/{vue-language-core => language-core}/tsconfig.json (100%) rename packages/{vue-language-core => language-plugin-pug}/LICENSE (100%) rename packages/{vue-language-plugin-pug => language-plugin-pug}/README.md (100%) rename packages/{vue-language-plugin-pug => language-plugin-pug}/package.json (88%) rename packages/{vue-language-plugin-pug => language-plugin-pug}/src/index.ts (100%) rename packages/{vue-language-plugin-pug => language-plugin-pug}/tsconfig.json (74%) rename packages/{vue-language-plugin-pug => language-server}/LICENSE (100%) rename packages/{vue-language-server => language-server}/bin/vue-language-server.js (100%) rename packages/{vue-language-server => language-server}/package.json (92%) rename packages/{vue-language-server => language-server}/src/index.ts (100%) rename packages/{vue-language-server => language-server}/src/languageServerPlugin.ts (100%) rename packages/{vue-language-server => language-server}/src/nodeServer.ts (100%) rename packages/{vue-language-server => language-server}/src/protocol.ts (100%) rename packages/{vue-language-server => language-server}/src/types.ts (100%) rename packages/{vue-language-server => language-server}/src/webServer.ts (100%) rename packages/{vue-component-meta => language-server}/tsconfig.json (50%) rename packages/{vue-language-server => language-service}/LICENSE (100%) rename packages/{vue-language-service => language-service}/data/language-blocks/en.json (100%) rename packages/{vue-language-service => language-service}/data/language-blocks/fr.json (100%) rename packages/{vue-language-service => language-service}/data/language-blocks/it.json (100%) rename packages/{vue-language-service => language-service}/data/language-blocks/ja.json (100%) rename packages/{vue-language-service => language-service}/data/language-blocks/ko.json (100%) rename packages/{vue-language-service => language-service}/data/language-blocks/pt.json (100%) rename packages/{vue-language-service => language-service}/data/language-blocks/zh-cn.json (100%) rename packages/{vue-language-service => language-service}/data/model-modifiers/en.json (100%) rename packages/{vue-language-service => language-service}/data/model-modifiers/fr.json (100%) rename packages/{vue-language-service => language-service}/data/model-modifiers/it.json (100%) rename packages/{vue-language-service => language-service}/data/model-modifiers/ja.json (100%) rename packages/{vue-language-service => language-service}/data/model-modifiers/ko.json (100%) rename packages/{vue-language-service => language-service}/data/model-modifiers/pt.json (100%) rename packages/{vue-language-service => language-service}/data/model-modifiers/zh-cn.json (100%) rename packages/{vue-language-service => language-service}/data/template/en.json (100%) rename packages/{vue-language-service => language-service}/data/template/fr.json (100%) rename packages/{vue-language-service => language-service}/data/template/it.json (100%) rename packages/{vue-language-service => language-service}/data/template/ja.json (100%) rename packages/{vue-language-service => language-service}/data/template/ko.json (100%) rename packages/{vue-language-service => language-service}/data/template/pt.json (100%) rename packages/{vue-language-service => language-service}/data/template/zh-cn.json (100%) rename packages/{vue-language-service => language-service}/package.json (95%) rename packages/{vue-language-service => language-service}/scripts/update-html-data.js (100%) rename packages/{vue-language-service => language-service}/src/helpers.ts (100%) rename packages/{vue-language-service => language-service}/src/ideFeatures/nameCasing.ts (100%) rename packages/{vue-language-service => language-service}/src/index.ts (100%) rename packages/{vue-language-service => language-service}/src/languageService.ts (100%) rename packages/{vue-language-service => language-service}/src/plugins/data.ts (100%) rename packages/{vue-language-service => language-service}/src/plugins/vue-autoinsert-dotvalue.ts (100%) rename packages/{vue-language-service => language-service}/src/plugins/vue-autoinsert-parentheses.ts (100%) rename packages/{vue-language-service => language-service}/src/plugins/vue-autoinsert-space.ts (100%) rename packages/{vue-language-service => language-service}/src/plugins/vue-codelens-references.ts (100%) rename packages/{vue-language-service => language-service}/src/plugins/vue-directive-comments.ts (100%) rename packages/{vue-language-service => language-service}/src/plugins/vue-extract-file.ts (100%) rename packages/{vue-language-service => language-service}/src/plugins/vue-template.ts (100%) rename packages/{vue-language-service => language-service}/src/plugins/vue-toggle-v-bind-codeaction.ts (100%) rename packages/{vue-language-service => language-service}/src/plugins/vue-twoslash-queries.ts (100%) rename packages/{vue-language-service => language-service}/src/plugins/vue-visualize-hidden-callback-param.ts (100%) rename packages/{vue-language-service => language-service}/src/plugins/vue.ts (100%) rename packages/{vue-language-service => language-service}/src/types.ts (100%) rename packages/{vue-language-service => language-service}/tests/complete.ts (100%) rename packages/{vue-language-service => language-service}/tests/findDefinition.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/1210.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/1398.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/1806.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/1823.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/2026.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/2105.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/2305.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/2350.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/2385.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/2390.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/2393.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/2480.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/2505.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/2507.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/2519.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/2520.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/2571.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/2750.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/3101.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/3572.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/js template strings.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/multi-line html comment.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/format/multi-line interpolation.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/index.spec.ts (100%) rename packages/{vue-language-service => language-service}/tests/reference.ts (100%) rename packages/{vue-language-service => language-service}/tests/rename.ts (100%) rename packages/{vue-language-service => language-service}/tests/utils/createTester.ts (100%) rename packages/{vue-language-service => language-service}/tests/utils/format.ts (100%) rename packages/{vscode-vue => language-service}/tsconfig.json (73%) rename packages/{vue-language-service => tsc-eslint-hook}/LICENSE (100%) rename packages/{vue-tsc-eslint-hook => tsc-eslint-hook}/README.md (100%) rename packages/{vue-tsc-eslint-hook => tsc-eslint-hook}/package.json (91%) rename packages/{vue-tsc-eslint-hook => tsc-eslint-hook}/src/index.ts (97%) rename packages/{vue-tsc-eslint-hook => tsc-eslint-hook}/tsconfig.json (78%) rename packages/{vue-tsc-eslint-hook => tsc}/LICENSE (100%) rename packages/{vue-tsc => tsc}/README.md (100%) rename packages/{vue-tsc => tsc}/bin/vue-tsc.js (100%) rename packages/{vue-tsc => tsc}/package.json (86%) rename packages/{vue-tsc => tsc}/src/index.ts (81%) rename packages/{vue-tsc => tsc}/src/shared.ts (100%) rename packages/{vue-tsc => tsc}/tests/__snapshots__/dts.spec.ts.snap (100%) rename packages/{vue-tsc => tsc}/tests/dts.spec.ts (100%) rename packages/{vue-tsc => tsc}/tests/index.spec.ts (100%) create mode 100644 packages/tsc/tsconfig.json rename packages/{vue-tsc => typescript-plugin}/LICENSE (100%) rename packages/{vue-typescript => typescript-plugin}/package.json (79%) rename packages/{typescript-vue-plugin => typescript-plugin}/src/index.ts (82%) create mode 100644 packages/typescript-plugin/tsconfig.json delete mode 100644 packages/typescript-vue-plugin/package.json delete mode 100644 packages/typescript-vue-plugin/tsconfig.json delete mode 100644 packages/vue-language-server/tsconfig.json delete mode 100644 packages/vue-language-service/tsconfig.json delete mode 100644 packages/vue-tsc/tsconfig.json delete mode 100644 packages/vue-typescript/LICENSE delete mode 100644 packages/vue-typescript/src/index.ts diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e107d38f46..6ac3b2c3f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,10 +19,10 @@ jobs: - run: npm i -g pnpm ovsx - run: pnpm install --frozen-lockfile --no-optional - run: pnpm run build:minify && pnpm ovsx publish - working-directory: packages/vscode-vue + working-directory: extensions/vscode env: OVSX_PAT: ${{ secrets.OVSX_PAT }} - run: pnpm ovsx publish - working-directory: packages/vscode-typescript-vue-plugin + working-directory: extensions/vscode-typescript-plugin env: OVSX_PAT: ${{ secrets.OVSX_PAT }} diff --git a/.github/workflows/update-html-data.yml b/.github/workflows/update-html-data.yml index 2ebc1a13be..b81bd7db8f 100644 --- a/.github/workflows/update-html-data.yml +++ b/.github/workflows/update-html-data.yml @@ -21,14 +21,14 @@ jobs: # update data - name: Update HTML Data - run: cd packages/vue-language-service && npm run update-html-data + run: cd packages/language-service && npm run update-html-data # commit - name: Commit uses: EndBug/add-and-commit@v9 with: message: "ci(language-service): update html data" - add: "packages/vue-language-service/data" + add: "packages/language-service/data" default_author: github_actions env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 00ae1e6580..30a2a61301 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,5 @@ node_modules *.tsbuildinfo *.vsix .vscode-test-web -packages/vscode-vue/meta.json -packages/vscode-vue/stats.html +extensions/*/meta.json +extensions/*/stats.html diff --git a/.vscode/launch.json b/.vscode/launch.json index d3f98a6752..dfeb32f09c 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,7 +9,7 @@ "runtimeExecutable": "${execPath}", "args": [ // "--disable-extensions", - "--extensionDevelopmentPath=${workspaceRoot}/packages/vscode-vue" + "--extensionDevelopmentPath=${workspaceRoot}/extensions/vscode" ], "outFiles": [ "${workspaceRoot}/*/*/out/**/*.js" @@ -26,7 +26,7 @@ "runtimeExecutable": "${execPath}", "args": [ "--disable-extensions", - "--extensionDevelopmentPath=${workspaceRoot}/packages/vscode-typescript-vue-plugin" + "--extensionDevelopmentPath=${workspaceRoot}/extensions/vscode-typescript-plugin" ], "outFiles": [ "${workspaceRoot}/*/*/out/**/*.js" @@ -43,7 +43,7 @@ "request": "launch", "args": [ "--disable-extensions", - "--extensionDevelopmentPath=${workspaceFolder}/packages/vscode-vue", + "--extensionDevelopmentPath=${workspaceFolder}/extensions/vscode", "--extensionDevelopmentKind=web" ], "outFiles": [ diff --git a/.vscode/settings.json b/.vscode/settings.json index 3137ce3003..14cba4cc87 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,5 +16,5 @@ "[jsonc]": { "editor.defaultFormatter": "vscode.json-language-features" }, - "vue.server.path": "./packages/vscode-vue/server.js", + "vue.server.path": "./extensions/vscode/server.js", } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 882d3ebb1d..f8d9a868a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2089,7 +2089,7 @@ do not force config `compatConfig: { Mode: 2 }` to template compiler with `"expe ## 0.28.6 (2021/10/16) -- feat: support for emit SFC dts by vue-tsc (See https://github.com/vuejs/language-tools/tree/master/packages/vue-tsc#using) +- feat: support for emit SFC dts by vue-tsc (See https://github.com/vuejs/language-tools/tree/master/packages/tsc#using) ## 0.28.5 (2021/10/16) diff --git a/README.md b/README.md index e1ab4eff19..552556b610 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ Discord: https://discord.gg/5bnSSSSBbK ## Packages -- [Vue Language Features](https://github.com/vuejs/language-tools/tree/master/packages/vscode-vue) \ +- [Vue Language Features](https://github.com/vuejs/language-tools/tree/master/extensions/vscode) \ *Vue, Vitepress, petite-vue language support extension for VSCode* -- [TypeScript Vue Plugin](https://github.com/vuejs/language-tools/tree/master/packages/vscode-typescript-vue-plugin) \ +- [TypeScript Vue Plugin](https://github.com/vuejs/language-tools/tree/master/extensions/vscode-typescript-plugin) \ *VSCode extension to support Vue in TS server* -- [vue-tsc](https://github.com/vuejs/language-tools/tree/master/packages/vue-tsc) \ +- [vue-tsc](https://github.com/vuejs/language-tools/tree/master/packages/tsc) \ *Type-check and dts build command line tool* -- [vue-component-meta](https://github.com/vuejs/language-tools/tree/master/packages/vue-component-meta) \ +- [vue-component-meta](https://github.com/vuejs/language-tools/tree/master/packages/component-meta) \ *Component props, events, slots types information extract tool* - [vite-plugin-vue-component-preview](https://github.com/johnsoncodehk/vite-plugin-vue-component-preview) \ *Vite plugin for support Vue component preview view with `Vue Language Features`* @@ -117,8 +117,8 @@ flowchart LR VSC_VUE[vscode-vue] VSC_TSVP[vscode-typescript-vue-plugin] - click VSC_VUE "https://github.com/vuejs/language-tools/tree/master/packages/vscode-vue" - click VSC_TSVP "https://github.com/vuejs/language-tools/tree/master/packages/vscode-typescript-vue-plugin" + click VSC_VUE "https://github.com/vuejs/language-tools/tree/master/extensions/vscode" + click VSC_TSVP "https://github.com/vuejs/language-tools/tree/master/extensions/vscode-typescript-plugin" %% Volar - Packages VOLAR_VUE_SERVER["@vue/language-server"] @@ -131,13 +131,13 @@ flowchart LR VUE_COMPONENT_META[vue-component-meta] TS_VUE_PLUGIN[typescript-vue-plugin] - click VOLAR_VUE_SERVER "https://github.com/vuejs/language-tools/tree/master/packages/vue-language-server" - click VOLAR_VUE_TS "https://github.com/vuejs/language-tools/tree/master/packages/vue-typescript" - click VOLAR_VUE_CORE "https://github.com/vuejs/language-tools/tree/master/packages/vue-language-core" - click VOLAR_VUE_SERVICE "https://github.com/vuejs/language-tools/tree/master/packages/vue-language-service" - click VUE_TSC "https://github.com/vuejs/language-tools/tree/master/packages/vue-tsc" - click VUE_COMPONENT_META "https://github.com/vuejs/language-tools/tree/master/packages/vue-component-meta" - click TS_VUE_PLUGIN "https://github.com/vuejs/language-tools/tree/master/packages/typescript-vue-plugin" + click VOLAR_VUE_SERVER "https://github.com/vuejs/language-tools/tree/master/packages/language-server" + click VOLAR_VUE_TS "https://github.com/vuejs/language-tools/tree/master/packages/typescript" + click VOLAR_VUE_CORE "https://github.com/vuejs/language-tools/tree/master/packages/language-core" + click VOLAR_VUE_SERVICE "https://github.com/vuejs/language-tools/tree/master/packages/language-service" + click VUE_TSC "https://github.com/vuejs/language-tools/tree/master/packages/tsc" + click VUE_COMPONENT_META "https://github.com/vuejs/language-tools/tree/master/packages/component-meta" + click TS_VUE_PLUGIN "https://github.com/vuejs/language-tools/tree/master/packages/typescript-plugin" click VOLAR_PUG_SERVICE "https://github.com/vuejs/language-tools/tree/master/packages/pug-language-service" click VOLAR_TS_SERVICE "https://github.com/vuejs/language-tools/tree/master/packages/typescript-language-service" diff --git a/packages/vscode-typescript-vue-plugin/.vscodeignore b/extensions/vscode-typescript-plugin/.vscodeignore similarity index 100% rename from packages/vscode-typescript-vue-plugin/.vscodeignore rename to extensions/vscode-typescript-plugin/.vscodeignore diff --git a/packages/vscode-typescript-vue-plugin/CHANGELOG.md b/extensions/vscode-typescript-plugin/CHANGELOG.md similarity index 100% rename from packages/vscode-typescript-vue-plugin/CHANGELOG.md rename to extensions/vscode-typescript-plugin/CHANGELOG.md diff --git a/packages/typescript-vue-plugin/LICENSE b/extensions/vscode-typescript-plugin/LICENSE similarity index 100% rename from packages/typescript-vue-plugin/LICENSE rename to extensions/vscode-typescript-plugin/LICENSE diff --git a/packages/vscode-typescript-vue-plugin/README.md b/extensions/vscode-typescript-plugin/README.md similarity index 100% rename from packages/vscode-typescript-vue-plugin/README.md rename to extensions/vscode-typescript-plugin/README.md diff --git a/packages/vscode-typescript-vue-plugin/images/icon.png b/extensions/vscode-typescript-plugin/images/icon.png similarity index 100% rename from packages/vscode-typescript-vue-plugin/images/icon.png rename to extensions/vscode-typescript-plugin/images/icon.png diff --git a/packages/vscode-typescript-vue-plugin/package.json b/extensions/vscode-typescript-plugin/package.json similarity index 94% rename from packages/vscode-typescript-vue-plugin/package.json rename to extensions/vscode-typescript-plugin/package.json index 91820ebc2c..489a6ce97e 100644 --- a/packages/vscode-typescript-vue-plugin/package.json +++ b/extensions/vscode-typescript-plugin/package.json @@ -5,7 +5,7 @@ "repository": { "type": "git", "url": "https://github.com/vuejs/language-tools.git", - "directory": "packages/vscode-typescript-vue-plugin" + "directory": "extensions/vscode-typescript-plugin" }, "sponsor": { "url": "https://github.com/sponsors/johnsoncodehk" diff --git a/packages/vscode-typescript-vue-plugin/scripts/build.js b/extensions/vscode-typescript-plugin/scripts/build.js similarity index 100% rename from packages/vscode-typescript-vue-plugin/scripts/build.js rename to extensions/vscode-typescript-plugin/scripts/build.js diff --git a/packages/vscode-typescript-vue-plugin/tsconfig.json b/extensions/vscode-typescript-plugin/tsconfig.json similarity index 70% rename from packages/vscode-typescript-vue-plugin/tsconfig.json rename to extensions/vscode-typescript-plugin/tsconfig.json index 74fab308ee..173527e3aa 100644 --- a/packages/vscode-typescript-vue-plugin/tsconfig.json +++ b/extensions/vscode-typescript-plugin/tsconfig.json @@ -6,6 +6,6 @@ }, "include": [ "src" ], "references": [ - { "path": "../typescript-vue-plugin/tsconfig.json" }, + { "path": "../../packages/typescript-plugin/tsconfig.json" }, ] } \ No newline at end of file diff --git a/packages/vscode-vue/.vscodeignore b/extensions/vscode/.vscodeignore similarity index 100% rename from packages/vscode-vue/.vscodeignore rename to extensions/vscode/.vscodeignore diff --git a/packages/vscode-vue/CHANGELOG.md b/extensions/vscode/CHANGELOG.md similarity index 100% rename from packages/vscode-vue/CHANGELOG.md rename to extensions/vscode/CHANGELOG.md diff --git a/packages/vscode-typescript-vue-plugin/LICENSE b/extensions/vscode/LICENSE similarity index 100% rename from packages/vscode-typescript-vue-plugin/LICENSE rename to extensions/vscode/LICENSE diff --git a/packages/vscode-vue/README.md b/extensions/vscode/README.md similarity index 100% rename from packages/vscode-vue/README.md rename to extensions/vscode/README.md diff --git a/packages/vscode-vue/client.js b/extensions/vscode/client.js similarity index 100% rename from packages/vscode-vue/client.js rename to extensions/vscode/client.js diff --git a/packages/vscode-vue/images/icon.png b/extensions/vscode/images/icon.png similarity index 100% rename from packages/vscode-vue/images/icon.png rename to extensions/vscode/images/icon.png diff --git a/packages/vscode-vue/images/split-editors.png b/extensions/vscode/images/split-editors.png similarity index 100% rename from packages/vscode-vue/images/split-editors.png rename to extensions/vscode/images/split-editors.png diff --git a/packages/vscode-vue/languages/markdown-language-configuration.json b/extensions/vscode/languages/markdown-language-configuration.json similarity index 100% rename from packages/vscode-vue/languages/markdown-language-configuration.json rename to extensions/vscode/languages/markdown-language-configuration.json diff --git a/packages/vscode-vue/languages/sfc-template-language-configuration.json b/extensions/vscode/languages/sfc-template-language-configuration.json similarity index 100% rename from packages/vscode-vue/languages/sfc-template-language-configuration.json rename to extensions/vscode/languages/sfc-template-language-configuration.json diff --git a/packages/vscode-vue/languages/vue-language-configuration.json b/extensions/vscode/languages/vue-language-configuration.json similarity index 100% rename from packages/vscode-vue/languages/vue-language-configuration.json rename to extensions/vscode/languages/vue-language-configuration.json diff --git a/packages/vscode-vue/package.json b/extensions/vscode/package.json similarity index 99% rename from packages/vscode-vue/package.json rename to extensions/vscode/package.json index a0b381e629..49d1650188 100644 --- a/packages/vscode-vue/package.json +++ b/extensions/vscode/package.json @@ -5,7 +5,7 @@ "repository": { "type": "git", "url": "https://github.com/vuejs/language-tools.git", - "directory": "packages/vscode-vue" + "directory": "packages/vscode" }, "categories": [ "Programming Languages" diff --git a/packages/vscode-vue/package.nls.json b/extensions/vscode/package.nls.json similarity index 100% rename from packages/vscode-vue/package.nls.json rename to extensions/vscode/package.nls.json diff --git a/packages/vscode-vue/scripts/build.js b/extensions/vscode/scripts/build.js similarity index 100% rename from packages/vscode-vue/scripts/build.js rename to extensions/vscode/scripts/build.js diff --git a/packages/vscode-vue/server.js b/extensions/vscode/server.js similarity index 100% rename from packages/vscode-vue/server.js rename to extensions/vscode/server.js diff --git a/packages/vscode-vue/src/common.ts b/extensions/vscode/src/common.ts similarity index 100% rename from packages/vscode-vue/src/common.ts rename to extensions/vscode/src/common.ts diff --git a/packages/vscode-vue/src/config.ts b/extensions/vscode/src/config.ts similarity index 100% rename from packages/vscode-vue/src/config.ts rename to extensions/vscode/src/config.ts diff --git a/packages/vscode-vue/src/features/componentMeta.ts b/extensions/vscode/src/features/componentMeta.ts similarity index 100% rename from packages/vscode-vue/src/features/componentMeta.ts rename to extensions/vscode/src/features/componentMeta.ts diff --git a/packages/vscode-vue/src/features/doctor.ts b/extensions/vscode/src/features/doctor.ts similarity index 99% rename from packages/vscode-vue/src/features/doctor.ts rename to extensions/vscode/src/features/doctor.ts index 03dc430166..33a2885cf0 100644 --- a/packages/vscode-vue/src/features/doctor.ts +++ b/extensions/vscode/src/features/doctor.ts @@ -43,7 +43,7 @@ export async function register(context: vscode.ExtensionContext, client: BaseLan } content += '---\n\n'; - content += `> Have any questions about the report message? You can see how it is composed by inspecting the [source code](https://github.com/vuejs/language-tools/blob/master/packages/vscode-vue/src/features/doctor.ts).\n\n`; + content += `> Have any questions about the report message? You can see how it is composed by inspecting the [source code](https://github.com/vuejs/language-tools/blob/master/extensions/vscode/src/features/doctor.ts).\n\n`; return content.trim(); } diff --git a/packages/vscode-vue/src/features/nameCasing.ts b/extensions/vscode/src/features/nameCasing.ts similarity index 100% rename from packages/vscode-vue/src/features/nameCasing.ts rename to extensions/vscode/src/features/nameCasing.ts diff --git a/packages/vscode-vue/src/features/splitEditors.ts b/extensions/vscode/src/features/splitEditors.ts similarity index 100% rename from packages/vscode-vue/src/features/splitEditors.ts rename to extensions/vscode/src/features/splitEditors.ts diff --git a/packages/vscode-vue/src/middleware.ts b/extensions/vscode/src/middleware.ts similarity index 100% rename from packages/vscode-vue/src/middleware.ts rename to extensions/vscode/src/middleware.ts diff --git a/packages/vscode-vue/src/nodeClientMain.ts b/extensions/vscode/src/nodeClientMain.ts similarity index 100% rename from packages/vscode-vue/src/nodeClientMain.ts rename to extensions/vscode/src/nodeClientMain.ts diff --git a/packages/vscode-vue/syntaxes/markdown-vue.json b/extensions/vscode/syntaxes/markdown-vue.json similarity index 100% rename from packages/vscode-vue/syntaxes/markdown-vue.json rename to extensions/vscode/syntaxes/markdown-vue.json diff --git a/packages/vscode-vue/syntaxes/vue-directives.json b/extensions/vscode/syntaxes/vue-directives.json similarity index 100% rename from packages/vscode-vue/syntaxes/vue-directives.json rename to extensions/vscode/syntaxes/vue-directives.json diff --git a/packages/vscode-vue/syntaxes/vue-interpolations.json b/extensions/vscode/syntaxes/vue-interpolations.json similarity index 100% rename from packages/vscode-vue/syntaxes/vue-interpolations.json rename to extensions/vscode/syntaxes/vue-interpolations.json diff --git a/packages/vscode-vue/syntaxes/vue-sfc-style-variable-injection.json b/extensions/vscode/syntaxes/vue-sfc-style-variable-injection.json similarity index 100% rename from packages/vscode-vue/syntaxes/vue-sfc-style-variable-injection.json rename to extensions/vscode/syntaxes/vue-sfc-style-variable-injection.json diff --git a/packages/vscode-vue/syntaxes/vue.tmLanguage.json b/extensions/vscode/syntaxes/vue.tmLanguage.json similarity index 100% rename from packages/vscode-vue/syntaxes/vue.tmLanguage.json rename to extensions/vscode/syntaxes/vue.tmLanguage.json diff --git a/packages/vscode-vue/tests/index.spec.ts b/extensions/vscode/tests/index.spec.ts similarity index 100% rename from packages/vscode-vue/tests/index.spec.ts rename to extensions/vscode/tests/index.spec.ts diff --git a/extensions/vscode/tsconfig.json b/extensions/vscode/tsconfig.json new file mode 100644 index 0000000000..2024e05c6b --- /dev/null +++ b/extensions/vscode/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "outDir": "out", + "rootDir": "src", + }, + "include": [ "src" ], + "references": [ + { "path": "../../packages/language-server/tsconfig.json" }, + ], +} \ No newline at end of file diff --git a/packages/vscode-vue/web.js b/extensions/vscode/web.js similarity index 100% rename from packages/vscode-vue/web.js rename to extensions/vscode/web.js diff --git a/package.json b/package.json index 48c085215c..485348f3b3 100644 --- a/package.json +++ b/package.json @@ -3,22 +3,22 @@ "scripts": { "build": "tsc -b", "build-ci": "tsc -b tsconfig.ci.json", - "watch": "npm run build && (npm run watch:base & npm run watch:vue & npm run watch:typescript-vue-plugin)", + "watch": "npm run build && (npm run watch:base & npm run watch:vue & npm run watch:ts-plugin)", "watch:base": "tsc -b -w", - "watch:vue": "cd ./packages/vscode-vue && npm run watch", - "watch:typescript-vue-plugin": "cd ./packages/vscode-typescript-vue-plugin && npm run watch", + "watch:vue": "cd ./extensions/vscode && npm run watch", + "watch:ts-plugin": "cd ./extensions/vscode-typescript-plugin && npm run watch", "prerelease": "npm run build && npm run test", "version:test": "lerna version --exact --force-publish --yes --sync-workspace-lock --no-push --no-git-tag-version", - "release": "npm run release:base && npm run release:vue && npm run release:typescript-vue-plugin", + "release": "npm run release:base && npm run release:vue && npm run release:ts-plugin", "release:base": "lerna publish --exact --force-publish --yes --sync-workspace-lock --no-push", - "release:vue": "cd ./packages/vscode-vue && npm run release", - "release:typescript-vue-plugin": "cd ./packages/vscode-typescript-vue-plugin && npm run release", - "release:next": "npm run release:next-base && npm run release:next-vue && npm run release:next-typescript-vue-plugin", + "release:vue": "cd ./extensions/vscode && npm run release", + "release:ts-plugin": "cd ./extensions/vscode-typescript-plugin && npm run release", + "release:next": "npm run release:next-base && npm run release:next-vue && npm run release:next-ts-plugin", "release:next-base": "npm run release:base -- --dist-tag next", - "release:next-vue": "cd ./packages/vscode-vue && npm run release:next", - "release:next-typescript-vue-plugin": "cd ./packages/vscode-typescript-vue-plugin && npm run release:next", + "release:next-vue": "cd ./extensions/vscode && npm run release:next", + "release:next-ts-plugin": "cd ./extensions/vscode-typescript-plugin && npm run release:next", "test": "vitest run", - "chrome": "vscode-test-web --browserType=chromium --extensionDevelopmentPath=./packages/vscode-vue ../volar-starter" + "chrome": "vscode-test-web --browserType=chromium --extensionDevelopmentPath=./extensions/vscode ../volar-starter" }, "devDependencies": { "@types/node": "latest", diff --git a/packages/vscode-vue/LICENSE b/packages/component-meta/LICENSE similarity index 100% rename from packages/vscode-vue/LICENSE rename to packages/component-meta/LICENSE diff --git a/packages/vue-component-meta/README.md b/packages/component-meta/README.md similarity index 96% rename from packages/vue-component-meta/README.md rename to packages/component-meta/README.md index 5b5ca1d65b..c35ca94042 100644 --- a/packages/vue-component-meta/README.md +++ b/packages/component-meta/README.md @@ -40,7 +40,7 @@ const componentPath = path.join(__dirname, 'path-to-component'); const meta = checker.getComponentMeta(componentPath); ``` -This meta contains really useful stuff like component props, slots, events and more. You can refer to its [type definition](https://github.com/vuejs/language-tools/blob/master/packages/vue-component-meta/src/types.ts) for more details. +This meta contains really useful stuff like component props, slots, events and more. You can refer to its [type definition](https://github.com/vuejs/language-tools/blob/master/packages/component-meta/src/types.ts) for more details. ### Extracting prop meta @@ -166,7 +166,7 @@ You need to add `as const` to variable definition: ## Reference 📚 -- [tests](https://github.com/vuejs/language-tools/blob/master/packages/vue-component-meta/tests/index.spec.ts) +- [tests](https://github.com/vuejs/language-tools/blob/master/packages/component-meta/tests/index.spec.ts) - [Anu's components' API automation](https://github.com/jd-solanki/anu/blob/main/scripts/gen-component-meta.ts) - [Discord chat for dynamic usage](https://discord.com/channels/793943652350427136/1027819645677350912) diff --git a/packages/vue-component-meta/package.json b/packages/component-meta/package.json similarity index 92% rename from packages/vue-component-meta/package.json rename to packages/component-meta/package.json index e474f34b59..11fd32ca27 100644 --- a/packages/vue-component-meta/package.json +++ b/packages/component-meta/package.json @@ -10,7 +10,7 @@ "repository": { "type": "git", "url": "https://github.com/vuejs/language-tools.git", - "directory": "packages/vue-component-meta" + "directory": "packages/component-meta" }, "dependencies": { "@volar/typescript": "~1.10.4", diff --git a/packages/vue-component-meta/src/index.ts b/packages/component-meta/src/index.ts similarity index 100% rename from packages/vue-component-meta/src/index.ts rename to packages/component-meta/src/index.ts diff --git a/packages/vue-component-meta/src/types.ts b/packages/component-meta/src/types.ts similarity index 100% rename from packages/vue-component-meta/src/types.ts rename to packages/component-meta/src/types.ts diff --git a/packages/vue-component-meta/tests/index.spec.ts b/packages/component-meta/tests/index.spec.ts similarity index 100% rename from packages/vue-component-meta/tests/index.spec.ts rename to packages/component-meta/tests/index.spec.ts diff --git a/packages/vue-typescript/tsconfig.json b/packages/component-meta/tsconfig.json similarity index 74% rename from packages/vue-typescript/tsconfig.json rename to packages/component-meta/tsconfig.json index 66985f5dc9..dda928445c 100644 --- a/packages/vue-typescript/tsconfig.json +++ b/packages/component-meta/tsconfig.json @@ -6,6 +6,6 @@ }, "include": [ "src" ], "references": [ - { "path": "../vue-language-core/tsconfig.json" }, + { "path": "../language-core/tsconfig.json" }, ], } \ No newline at end of file diff --git a/packages/vue-component-type-helpers/LICENSE b/packages/component-type-helpers/LICENSE similarity index 100% rename from packages/vue-component-type-helpers/LICENSE rename to packages/component-type-helpers/LICENSE diff --git a/packages/vue-component-type-helpers/README.md b/packages/component-type-helpers/README.md similarity index 100% rename from packages/vue-component-type-helpers/README.md rename to packages/component-type-helpers/README.md diff --git a/packages/vue-component-type-helpers/index.d.ts b/packages/component-type-helpers/index.d.ts similarity index 100% rename from packages/vue-component-type-helpers/index.d.ts rename to packages/component-type-helpers/index.d.ts diff --git a/packages/vue-component-type-helpers/index.js b/packages/component-type-helpers/index.js similarity index 100% rename from packages/vue-component-type-helpers/index.js rename to packages/component-type-helpers/index.js diff --git a/packages/vue-component-type-helpers/package.json b/packages/component-type-helpers/package.json similarity index 80% rename from packages/vue-component-type-helpers/package.json rename to packages/component-type-helpers/package.json index 3a9368bfc6..c1bbca8c68 100644 --- a/packages/vue-component-type-helpers/package.json +++ b/packages/component-type-helpers/package.json @@ -9,6 +9,6 @@ "repository": { "type": "git", "url": "https://github.com/vuejs/language-tools.git", - "directory": "packages/vue-component-type-helpers" + "directory": "packages/component-type-helpers" } } diff --git a/packages/vue-component-meta/LICENSE b/packages/language-core/LICENSE similarity index 100% rename from packages/vue-component-meta/LICENSE rename to packages/language-core/LICENSE diff --git a/packages/vue-language-core/package.json b/packages/language-core/package.json similarity index 94% rename from packages/vue-language-core/package.json rename to packages/language-core/package.json index ee259eb352..3434b9632a 100644 --- a/packages/vue-language-core/package.json +++ b/packages/language-core/package.json @@ -10,7 +10,7 @@ "repository": { "type": "git", "url": "https://github.com/vuejs/language-tools.git", - "directory": "packages/vue-language-core" + "directory": "packages/language-core" }, "dependencies": { "@volar/language-core": "~1.10.4", diff --git a/packages/vue-language-core/schemas/vue-tsconfig.deprecated.schema.json b/packages/language-core/schemas/vue-tsconfig.deprecated.schema.json similarity index 100% rename from packages/vue-language-core/schemas/vue-tsconfig.deprecated.schema.json rename to packages/language-core/schemas/vue-tsconfig.deprecated.schema.json diff --git a/packages/vue-language-core/schemas/vue-tsconfig.schema.json b/packages/language-core/schemas/vue-tsconfig.schema.json similarity index 98% rename from packages/vue-language-core/schemas/vue-tsconfig.schema.json rename to packages/language-core/schemas/vue-tsconfig.schema.json index 2cbed9687e..2f40e2fcf3 100644 --- a/packages/vue-language-core/schemas/vue-tsconfig.schema.json +++ b/packages/language-core/schemas/vue-tsconfig.schema.json @@ -17,7 +17,7 @@ "extensions": { "type": "array", "default": [ ".vue" ], - "markdownDescription": "Valid file extensions that should be considered as regular Vue SFC, please note that you should not use this option separately for additional file extensions IDE support, see https://github.com/vuejs/language-tools/tree/master/packages/vscode-vue/README.md#custom-file-extensions." + "markdownDescription": "Valid file extensions that should be considered as regular Vue SFC, please note that you should not use this option separately for additional file extensions IDE support, see https://github.com/vuejs/language-tools/tree/master/extensions/vscode/README.md#custom-file-extensions." }, "lib": { "default": "", diff --git a/packages/vue-language-core/src/generators/script.ts b/packages/language-core/src/generators/script.ts similarity index 100% rename from packages/vue-language-core/src/generators/script.ts rename to packages/language-core/src/generators/script.ts diff --git a/packages/vue-language-core/src/generators/template.ts b/packages/language-core/src/generators/template.ts similarity index 100% rename from packages/vue-language-core/src/generators/template.ts rename to packages/language-core/src/generators/template.ts diff --git a/packages/vue-language-core/src/index.ts b/packages/language-core/src/index.ts similarity index 100% rename from packages/vue-language-core/src/index.ts rename to packages/language-core/src/index.ts diff --git a/packages/vue-language-core/src/languageModule.ts b/packages/language-core/src/languageModule.ts similarity index 100% rename from packages/vue-language-core/src/languageModule.ts rename to packages/language-core/src/languageModule.ts diff --git a/packages/vue-language-core/src/parsers/scriptRanges.ts b/packages/language-core/src/parsers/scriptRanges.ts similarity index 100% rename from packages/vue-language-core/src/parsers/scriptRanges.ts rename to packages/language-core/src/parsers/scriptRanges.ts diff --git a/packages/vue-language-core/src/parsers/scriptSetupRanges.ts b/packages/language-core/src/parsers/scriptSetupRanges.ts similarity index 100% rename from packages/vue-language-core/src/parsers/scriptSetupRanges.ts rename to packages/language-core/src/parsers/scriptSetupRanges.ts diff --git a/packages/vue-language-core/src/plugins.ts b/packages/language-core/src/plugins.ts similarity index 100% rename from packages/vue-language-core/src/plugins.ts rename to packages/language-core/src/plugins.ts diff --git a/packages/vue-language-core/src/plugins/file-html.ts b/packages/language-core/src/plugins/file-html.ts similarity index 100% rename from packages/vue-language-core/src/plugins/file-html.ts rename to packages/language-core/src/plugins/file-html.ts diff --git a/packages/vue-language-core/src/plugins/file-md.ts b/packages/language-core/src/plugins/file-md.ts similarity index 100% rename from packages/vue-language-core/src/plugins/file-md.ts rename to packages/language-core/src/plugins/file-md.ts diff --git a/packages/vue-language-core/src/plugins/file-vue.ts b/packages/language-core/src/plugins/file-vue.ts similarity index 100% rename from packages/vue-language-core/src/plugins/file-vue.ts rename to packages/language-core/src/plugins/file-vue.ts diff --git a/packages/vue-language-core/src/plugins/vue-sfc-customblocks.ts b/packages/language-core/src/plugins/vue-sfc-customblocks.ts similarity index 100% rename from packages/vue-language-core/src/plugins/vue-sfc-customblocks.ts rename to packages/language-core/src/plugins/vue-sfc-customblocks.ts diff --git a/packages/vue-language-core/src/plugins/vue-sfc-scripts.ts b/packages/language-core/src/plugins/vue-sfc-scripts.ts similarity index 100% rename from packages/vue-language-core/src/plugins/vue-sfc-scripts.ts rename to packages/language-core/src/plugins/vue-sfc-scripts.ts diff --git a/packages/vue-language-core/src/plugins/vue-sfc-styles.ts b/packages/language-core/src/plugins/vue-sfc-styles.ts similarity index 100% rename from packages/vue-language-core/src/plugins/vue-sfc-styles.ts rename to packages/language-core/src/plugins/vue-sfc-styles.ts diff --git a/packages/vue-language-core/src/plugins/vue-sfc-template.ts b/packages/language-core/src/plugins/vue-sfc-template.ts similarity index 100% rename from packages/vue-language-core/src/plugins/vue-sfc-template.ts rename to packages/language-core/src/plugins/vue-sfc-template.ts diff --git a/packages/vue-language-core/src/plugins/vue-template-html.ts b/packages/language-core/src/plugins/vue-template-html.ts similarity index 100% rename from packages/vue-language-core/src/plugins/vue-template-html.ts rename to packages/language-core/src/plugins/vue-template-html.ts diff --git a/packages/vue-language-core/src/plugins/vue-tsx.ts b/packages/language-core/src/plugins/vue-tsx.ts similarity index 100% rename from packages/vue-language-core/src/plugins/vue-tsx.ts rename to packages/language-core/src/plugins/vue-tsx.ts diff --git a/packages/vue-language-core/src/types.ts b/packages/language-core/src/types.ts similarity index 100% rename from packages/vue-language-core/src/types.ts rename to packages/language-core/src/types.ts diff --git a/packages/vue-language-core/src/utils/globalTypes.ts b/packages/language-core/src/utils/globalTypes.ts similarity index 100% rename from packages/vue-language-core/src/utils/globalTypes.ts rename to packages/language-core/src/utils/globalTypes.ts diff --git a/packages/vue-language-core/src/utils/parseCssClassNames.ts b/packages/language-core/src/utils/parseCssClassNames.ts similarity index 100% rename from packages/vue-language-core/src/utils/parseCssClassNames.ts rename to packages/language-core/src/utils/parseCssClassNames.ts diff --git a/packages/vue-language-core/src/utils/parseCssVars.ts b/packages/language-core/src/utils/parseCssVars.ts similarity index 100% rename from packages/vue-language-core/src/utils/parseCssVars.ts rename to packages/language-core/src/utils/parseCssVars.ts diff --git a/packages/vue-language-core/src/utils/parseSfc.ts b/packages/language-core/src/utils/parseSfc.ts similarity index 100% rename from packages/vue-language-core/src/utils/parseSfc.ts rename to packages/language-core/src/utils/parseSfc.ts diff --git a/packages/vue-language-core/src/utils/shared.ts b/packages/language-core/src/utils/shared.ts similarity index 100% rename from packages/vue-language-core/src/utils/shared.ts rename to packages/language-core/src/utils/shared.ts diff --git a/packages/vue-language-core/src/utils/transform.ts b/packages/language-core/src/utils/transform.ts similarity index 100% rename from packages/vue-language-core/src/utils/transform.ts rename to packages/language-core/src/utils/transform.ts diff --git a/packages/vue-language-core/src/utils/ts.ts b/packages/language-core/src/utils/ts.ts similarity index 100% rename from packages/vue-language-core/src/utils/ts.ts rename to packages/language-core/src/utils/ts.ts diff --git a/packages/vue-language-core/src/utils/vue2TemplateCompiler.ts b/packages/language-core/src/utils/vue2TemplateCompiler.ts similarity index 100% rename from packages/vue-language-core/src/utils/vue2TemplateCompiler.ts rename to packages/language-core/src/utils/vue2TemplateCompiler.ts diff --git a/packages/vue-language-core/src/virtualFile/computedFiles.ts b/packages/language-core/src/virtualFile/computedFiles.ts similarity index 100% rename from packages/vue-language-core/src/virtualFile/computedFiles.ts rename to packages/language-core/src/virtualFile/computedFiles.ts diff --git a/packages/vue-language-core/src/virtualFile/computedMappings.ts b/packages/language-core/src/virtualFile/computedMappings.ts similarity index 100% rename from packages/vue-language-core/src/virtualFile/computedMappings.ts rename to packages/language-core/src/virtualFile/computedMappings.ts diff --git a/packages/vue-language-core/src/virtualFile/computedSfc.ts b/packages/language-core/src/virtualFile/computedSfc.ts similarity index 100% rename from packages/vue-language-core/src/virtualFile/computedSfc.ts rename to packages/language-core/src/virtualFile/computedSfc.ts diff --git a/packages/vue-language-core/src/virtualFile/computedVueSfc.ts b/packages/language-core/src/virtualFile/computedVueSfc.ts similarity index 100% rename from packages/vue-language-core/src/virtualFile/computedVueSfc.ts rename to packages/language-core/src/virtualFile/computedVueSfc.ts diff --git a/packages/vue-language-core/src/virtualFile/embeddedFile.ts b/packages/language-core/src/virtualFile/embeddedFile.ts similarity index 100% rename from packages/vue-language-core/src/virtualFile/embeddedFile.ts rename to packages/language-core/src/virtualFile/embeddedFile.ts diff --git a/packages/vue-language-core/src/virtualFile/vueFile.ts b/packages/language-core/src/virtualFile/vueFile.ts similarity index 100% rename from packages/vue-language-core/src/virtualFile/vueFile.ts rename to packages/language-core/src/virtualFile/vueFile.ts diff --git a/packages/vue-language-core/tsconfig.json b/packages/language-core/tsconfig.json similarity index 100% rename from packages/vue-language-core/tsconfig.json rename to packages/language-core/tsconfig.json diff --git a/packages/vue-language-core/LICENSE b/packages/language-plugin-pug/LICENSE similarity index 100% rename from packages/vue-language-core/LICENSE rename to packages/language-plugin-pug/LICENSE diff --git a/packages/vue-language-plugin-pug/README.md b/packages/language-plugin-pug/README.md similarity index 100% rename from packages/vue-language-plugin-pug/README.md rename to packages/language-plugin-pug/README.md diff --git a/packages/vue-language-plugin-pug/package.json b/packages/language-plugin-pug/package.json similarity index 88% rename from packages/vue-language-plugin-pug/package.json rename to packages/language-plugin-pug/package.json index 284e83b9ba..b5dd20edba 100644 --- a/packages/vue-language-plugin-pug/package.json +++ b/packages/language-plugin-pug/package.json @@ -10,7 +10,7 @@ "repository": { "type": "git", "url": "https://github.com/vuejs/language-tools.git", - "directory": "packages/vue-language-plugin-pug" + "directory": "packages/language-plugin-pug" }, "devDependencies": { "@vue/language-core": "1.8.20" diff --git a/packages/vue-language-plugin-pug/src/index.ts b/packages/language-plugin-pug/src/index.ts similarity index 100% rename from packages/vue-language-plugin-pug/src/index.ts rename to packages/language-plugin-pug/src/index.ts diff --git a/packages/vue-language-plugin-pug/tsconfig.json b/packages/language-plugin-pug/tsconfig.json similarity index 74% rename from packages/vue-language-plugin-pug/tsconfig.json rename to packages/language-plugin-pug/tsconfig.json index 66985f5dc9..dda928445c 100644 --- a/packages/vue-language-plugin-pug/tsconfig.json +++ b/packages/language-plugin-pug/tsconfig.json @@ -6,6 +6,6 @@ }, "include": [ "src" ], "references": [ - { "path": "../vue-language-core/tsconfig.json" }, + { "path": "../language-core/tsconfig.json" }, ], } \ No newline at end of file diff --git a/packages/vue-language-plugin-pug/LICENSE b/packages/language-server/LICENSE similarity index 100% rename from packages/vue-language-plugin-pug/LICENSE rename to packages/language-server/LICENSE diff --git a/packages/vue-language-server/bin/vue-language-server.js b/packages/language-server/bin/vue-language-server.js similarity index 100% rename from packages/vue-language-server/bin/vue-language-server.js rename to packages/language-server/bin/vue-language-server.js diff --git a/packages/vue-language-server/package.json b/packages/language-server/package.json similarity index 92% rename from packages/vue-language-server/package.json rename to packages/language-server/package.json index ed47cf27ed..6713fd75bf 100644 --- a/packages/vue-language-server/package.json +++ b/packages/language-server/package.json @@ -13,7 +13,7 @@ "repository": { "type": "git", "url": "https://github.com/vuejs/language-tools.git", - "directory": "packages/vue-language-server" + "directory": "packages/language-server" }, "dependencies": { "@volar/language-core": "~1.10.4", diff --git a/packages/vue-language-server/src/index.ts b/packages/language-server/src/index.ts similarity index 100% rename from packages/vue-language-server/src/index.ts rename to packages/language-server/src/index.ts diff --git a/packages/vue-language-server/src/languageServerPlugin.ts b/packages/language-server/src/languageServerPlugin.ts similarity index 100% rename from packages/vue-language-server/src/languageServerPlugin.ts rename to packages/language-server/src/languageServerPlugin.ts diff --git a/packages/vue-language-server/src/nodeServer.ts b/packages/language-server/src/nodeServer.ts similarity index 100% rename from packages/vue-language-server/src/nodeServer.ts rename to packages/language-server/src/nodeServer.ts diff --git a/packages/vue-language-server/src/protocol.ts b/packages/language-server/src/protocol.ts similarity index 100% rename from packages/vue-language-server/src/protocol.ts rename to packages/language-server/src/protocol.ts diff --git a/packages/vue-language-server/src/types.ts b/packages/language-server/src/types.ts similarity index 100% rename from packages/vue-language-server/src/types.ts rename to packages/language-server/src/types.ts diff --git a/packages/vue-language-server/src/webServer.ts b/packages/language-server/src/webServer.ts similarity index 100% rename from packages/vue-language-server/src/webServer.ts rename to packages/language-server/src/webServer.ts diff --git a/packages/vue-component-meta/tsconfig.json b/packages/language-server/tsconfig.json similarity index 50% rename from packages/vue-component-meta/tsconfig.json rename to packages/language-server/tsconfig.json index eb57dc135c..b1ee8b023b 100644 --- a/packages/vue-component-meta/tsconfig.json +++ b/packages/language-server/tsconfig.json @@ -6,7 +6,8 @@ }, "include": [ "src" ], "references": [ - { "path": "../vue-language-core/tsconfig.json" }, - { "path": "../vue-typescript/tsconfig.json" }, + { "path": "../language-core/tsconfig.json" }, + { "path": "../language-service/tsconfig.json" }, + { "path": "../component-meta/tsconfig.json" }, ], } \ No newline at end of file diff --git a/packages/vue-language-server/LICENSE b/packages/language-service/LICENSE similarity index 100% rename from packages/vue-language-server/LICENSE rename to packages/language-service/LICENSE diff --git a/packages/vue-language-service/data/language-blocks/en.json b/packages/language-service/data/language-blocks/en.json similarity index 100% rename from packages/vue-language-service/data/language-blocks/en.json rename to packages/language-service/data/language-blocks/en.json diff --git a/packages/vue-language-service/data/language-blocks/fr.json b/packages/language-service/data/language-blocks/fr.json similarity index 100% rename from packages/vue-language-service/data/language-blocks/fr.json rename to packages/language-service/data/language-blocks/fr.json diff --git a/packages/vue-language-service/data/language-blocks/it.json b/packages/language-service/data/language-blocks/it.json similarity index 100% rename from packages/vue-language-service/data/language-blocks/it.json rename to packages/language-service/data/language-blocks/it.json diff --git a/packages/vue-language-service/data/language-blocks/ja.json b/packages/language-service/data/language-blocks/ja.json similarity index 100% rename from packages/vue-language-service/data/language-blocks/ja.json rename to packages/language-service/data/language-blocks/ja.json diff --git a/packages/vue-language-service/data/language-blocks/ko.json b/packages/language-service/data/language-blocks/ko.json similarity index 100% rename from packages/vue-language-service/data/language-blocks/ko.json rename to packages/language-service/data/language-blocks/ko.json diff --git a/packages/vue-language-service/data/language-blocks/pt.json b/packages/language-service/data/language-blocks/pt.json similarity index 100% rename from packages/vue-language-service/data/language-blocks/pt.json rename to packages/language-service/data/language-blocks/pt.json diff --git a/packages/vue-language-service/data/language-blocks/zh-cn.json b/packages/language-service/data/language-blocks/zh-cn.json similarity index 100% rename from packages/vue-language-service/data/language-blocks/zh-cn.json rename to packages/language-service/data/language-blocks/zh-cn.json diff --git a/packages/vue-language-service/data/model-modifiers/en.json b/packages/language-service/data/model-modifiers/en.json similarity index 100% rename from packages/vue-language-service/data/model-modifiers/en.json rename to packages/language-service/data/model-modifiers/en.json diff --git a/packages/vue-language-service/data/model-modifiers/fr.json b/packages/language-service/data/model-modifiers/fr.json similarity index 100% rename from packages/vue-language-service/data/model-modifiers/fr.json rename to packages/language-service/data/model-modifiers/fr.json diff --git a/packages/vue-language-service/data/model-modifiers/it.json b/packages/language-service/data/model-modifiers/it.json similarity index 100% rename from packages/vue-language-service/data/model-modifiers/it.json rename to packages/language-service/data/model-modifiers/it.json diff --git a/packages/vue-language-service/data/model-modifiers/ja.json b/packages/language-service/data/model-modifiers/ja.json similarity index 100% rename from packages/vue-language-service/data/model-modifiers/ja.json rename to packages/language-service/data/model-modifiers/ja.json diff --git a/packages/vue-language-service/data/model-modifiers/ko.json b/packages/language-service/data/model-modifiers/ko.json similarity index 100% rename from packages/vue-language-service/data/model-modifiers/ko.json rename to packages/language-service/data/model-modifiers/ko.json diff --git a/packages/vue-language-service/data/model-modifiers/pt.json b/packages/language-service/data/model-modifiers/pt.json similarity index 100% rename from packages/vue-language-service/data/model-modifiers/pt.json rename to packages/language-service/data/model-modifiers/pt.json diff --git a/packages/vue-language-service/data/model-modifiers/zh-cn.json b/packages/language-service/data/model-modifiers/zh-cn.json similarity index 100% rename from packages/vue-language-service/data/model-modifiers/zh-cn.json rename to packages/language-service/data/model-modifiers/zh-cn.json diff --git a/packages/vue-language-service/data/template/en.json b/packages/language-service/data/template/en.json similarity index 100% rename from packages/vue-language-service/data/template/en.json rename to packages/language-service/data/template/en.json diff --git a/packages/vue-language-service/data/template/fr.json b/packages/language-service/data/template/fr.json similarity index 100% rename from packages/vue-language-service/data/template/fr.json rename to packages/language-service/data/template/fr.json diff --git a/packages/vue-language-service/data/template/it.json b/packages/language-service/data/template/it.json similarity index 100% rename from packages/vue-language-service/data/template/it.json rename to packages/language-service/data/template/it.json diff --git a/packages/vue-language-service/data/template/ja.json b/packages/language-service/data/template/ja.json similarity index 100% rename from packages/vue-language-service/data/template/ja.json rename to packages/language-service/data/template/ja.json diff --git a/packages/vue-language-service/data/template/ko.json b/packages/language-service/data/template/ko.json similarity index 100% rename from packages/vue-language-service/data/template/ko.json rename to packages/language-service/data/template/ko.json diff --git a/packages/vue-language-service/data/template/pt.json b/packages/language-service/data/template/pt.json similarity index 100% rename from packages/vue-language-service/data/template/pt.json rename to packages/language-service/data/template/pt.json diff --git a/packages/vue-language-service/data/template/zh-cn.json b/packages/language-service/data/template/zh-cn.json similarity index 100% rename from packages/vue-language-service/data/template/zh-cn.json rename to packages/language-service/data/template/zh-cn.json diff --git a/packages/vue-language-service/package.json b/packages/language-service/package.json similarity index 95% rename from packages/vue-language-service/package.json rename to packages/language-service/package.json index 9e5a1c8f4a..53ff14e1b9 100644 --- a/packages/vue-language-service/package.json +++ b/packages/language-service/package.json @@ -11,7 +11,7 @@ "repository": { "type": "git", "url": "https://github.com/vuejs/language-tools.git", - "directory": "packages/vue-language-service" + "directory": "packages/language-service" }, "scripts": { "update-html-data": "node ./scripts/update-html-data.js" diff --git a/packages/vue-language-service/scripts/update-html-data.js b/packages/language-service/scripts/update-html-data.js similarity index 100% rename from packages/vue-language-service/scripts/update-html-data.js rename to packages/language-service/scripts/update-html-data.js diff --git a/packages/vue-language-service/src/helpers.ts b/packages/language-service/src/helpers.ts similarity index 100% rename from packages/vue-language-service/src/helpers.ts rename to packages/language-service/src/helpers.ts diff --git a/packages/vue-language-service/src/ideFeatures/nameCasing.ts b/packages/language-service/src/ideFeatures/nameCasing.ts similarity index 100% rename from packages/vue-language-service/src/ideFeatures/nameCasing.ts rename to packages/language-service/src/ideFeatures/nameCasing.ts diff --git a/packages/vue-language-service/src/index.ts b/packages/language-service/src/index.ts similarity index 100% rename from packages/vue-language-service/src/index.ts rename to packages/language-service/src/index.ts diff --git a/packages/vue-language-service/src/languageService.ts b/packages/language-service/src/languageService.ts similarity index 100% rename from packages/vue-language-service/src/languageService.ts rename to packages/language-service/src/languageService.ts diff --git a/packages/vue-language-service/src/plugins/data.ts b/packages/language-service/src/plugins/data.ts similarity index 100% rename from packages/vue-language-service/src/plugins/data.ts rename to packages/language-service/src/plugins/data.ts diff --git a/packages/vue-language-service/src/plugins/vue-autoinsert-dotvalue.ts b/packages/language-service/src/plugins/vue-autoinsert-dotvalue.ts similarity index 100% rename from packages/vue-language-service/src/plugins/vue-autoinsert-dotvalue.ts rename to packages/language-service/src/plugins/vue-autoinsert-dotvalue.ts diff --git a/packages/vue-language-service/src/plugins/vue-autoinsert-parentheses.ts b/packages/language-service/src/plugins/vue-autoinsert-parentheses.ts similarity index 100% rename from packages/vue-language-service/src/plugins/vue-autoinsert-parentheses.ts rename to packages/language-service/src/plugins/vue-autoinsert-parentheses.ts diff --git a/packages/vue-language-service/src/plugins/vue-autoinsert-space.ts b/packages/language-service/src/plugins/vue-autoinsert-space.ts similarity index 100% rename from packages/vue-language-service/src/plugins/vue-autoinsert-space.ts rename to packages/language-service/src/plugins/vue-autoinsert-space.ts diff --git a/packages/vue-language-service/src/plugins/vue-codelens-references.ts b/packages/language-service/src/plugins/vue-codelens-references.ts similarity index 100% rename from packages/vue-language-service/src/plugins/vue-codelens-references.ts rename to packages/language-service/src/plugins/vue-codelens-references.ts diff --git a/packages/vue-language-service/src/plugins/vue-directive-comments.ts b/packages/language-service/src/plugins/vue-directive-comments.ts similarity index 100% rename from packages/vue-language-service/src/plugins/vue-directive-comments.ts rename to packages/language-service/src/plugins/vue-directive-comments.ts diff --git a/packages/vue-language-service/src/plugins/vue-extract-file.ts b/packages/language-service/src/plugins/vue-extract-file.ts similarity index 100% rename from packages/vue-language-service/src/plugins/vue-extract-file.ts rename to packages/language-service/src/plugins/vue-extract-file.ts diff --git a/packages/vue-language-service/src/plugins/vue-template.ts b/packages/language-service/src/plugins/vue-template.ts similarity index 100% rename from packages/vue-language-service/src/plugins/vue-template.ts rename to packages/language-service/src/plugins/vue-template.ts diff --git a/packages/vue-language-service/src/plugins/vue-toggle-v-bind-codeaction.ts b/packages/language-service/src/plugins/vue-toggle-v-bind-codeaction.ts similarity index 100% rename from packages/vue-language-service/src/plugins/vue-toggle-v-bind-codeaction.ts rename to packages/language-service/src/plugins/vue-toggle-v-bind-codeaction.ts diff --git a/packages/vue-language-service/src/plugins/vue-twoslash-queries.ts b/packages/language-service/src/plugins/vue-twoslash-queries.ts similarity index 100% rename from packages/vue-language-service/src/plugins/vue-twoslash-queries.ts rename to packages/language-service/src/plugins/vue-twoslash-queries.ts diff --git a/packages/vue-language-service/src/plugins/vue-visualize-hidden-callback-param.ts b/packages/language-service/src/plugins/vue-visualize-hidden-callback-param.ts similarity index 100% rename from packages/vue-language-service/src/plugins/vue-visualize-hidden-callback-param.ts rename to packages/language-service/src/plugins/vue-visualize-hidden-callback-param.ts diff --git a/packages/vue-language-service/src/plugins/vue.ts b/packages/language-service/src/plugins/vue.ts similarity index 100% rename from packages/vue-language-service/src/plugins/vue.ts rename to packages/language-service/src/plugins/vue.ts diff --git a/packages/vue-language-service/src/types.ts b/packages/language-service/src/types.ts similarity index 100% rename from packages/vue-language-service/src/types.ts rename to packages/language-service/src/types.ts diff --git a/packages/vue-language-service/tests/complete.ts b/packages/language-service/tests/complete.ts similarity index 100% rename from packages/vue-language-service/tests/complete.ts rename to packages/language-service/tests/complete.ts diff --git a/packages/vue-language-service/tests/findDefinition.ts b/packages/language-service/tests/findDefinition.ts similarity index 100% rename from packages/vue-language-service/tests/findDefinition.ts rename to packages/language-service/tests/findDefinition.ts diff --git a/packages/vue-language-service/tests/format/1210.spec.ts b/packages/language-service/tests/format/1210.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/1210.spec.ts rename to packages/language-service/tests/format/1210.spec.ts diff --git a/packages/vue-language-service/tests/format/1398.spec.ts b/packages/language-service/tests/format/1398.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/1398.spec.ts rename to packages/language-service/tests/format/1398.spec.ts diff --git a/packages/vue-language-service/tests/format/1806.spec.ts b/packages/language-service/tests/format/1806.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/1806.spec.ts rename to packages/language-service/tests/format/1806.spec.ts diff --git a/packages/vue-language-service/tests/format/1823.spec.ts b/packages/language-service/tests/format/1823.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/1823.spec.ts rename to packages/language-service/tests/format/1823.spec.ts diff --git a/packages/vue-language-service/tests/format/2026.spec.ts b/packages/language-service/tests/format/2026.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/2026.spec.ts rename to packages/language-service/tests/format/2026.spec.ts diff --git a/packages/vue-language-service/tests/format/2105.spec.ts b/packages/language-service/tests/format/2105.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/2105.spec.ts rename to packages/language-service/tests/format/2105.spec.ts diff --git a/packages/vue-language-service/tests/format/2305.spec.ts b/packages/language-service/tests/format/2305.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/2305.spec.ts rename to packages/language-service/tests/format/2305.spec.ts diff --git a/packages/vue-language-service/tests/format/2350.spec.ts b/packages/language-service/tests/format/2350.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/2350.spec.ts rename to packages/language-service/tests/format/2350.spec.ts diff --git a/packages/vue-language-service/tests/format/2385.spec.ts b/packages/language-service/tests/format/2385.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/2385.spec.ts rename to packages/language-service/tests/format/2385.spec.ts diff --git a/packages/vue-language-service/tests/format/2390.spec.ts b/packages/language-service/tests/format/2390.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/2390.spec.ts rename to packages/language-service/tests/format/2390.spec.ts diff --git a/packages/vue-language-service/tests/format/2393.spec.ts b/packages/language-service/tests/format/2393.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/2393.spec.ts rename to packages/language-service/tests/format/2393.spec.ts diff --git a/packages/vue-language-service/tests/format/2480.spec.ts b/packages/language-service/tests/format/2480.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/2480.spec.ts rename to packages/language-service/tests/format/2480.spec.ts diff --git a/packages/vue-language-service/tests/format/2505.spec.ts b/packages/language-service/tests/format/2505.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/2505.spec.ts rename to packages/language-service/tests/format/2505.spec.ts diff --git a/packages/vue-language-service/tests/format/2507.spec.ts b/packages/language-service/tests/format/2507.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/2507.spec.ts rename to packages/language-service/tests/format/2507.spec.ts diff --git a/packages/vue-language-service/tests/format/2519.spec.ts b/packages/language-service/tests/format/2519.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/2519.spec.ts rename to packages/language-service/tests/format/2519.spec.ts diff --git a/packages/vue-language-service/tests/format/2520.spec.ts b/packages/language-service/tests/format/2520.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/2520.spec.ts rename to packages/language-service/tests/format/2520.spec.ts diff --git a/packages/vue-language-service/tests/format/2571.spec.ts b/packages/language-service/tests/format/2571.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/2571.spec.ts rename to packages/language-service/tests/format/2571.spec.ts diff --git a/packages/vue-language-service/tests/format/2750.spec.ts b/packages/language-service/tests/format/2750.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/2750.spec.ts rename to packages/language-service/tests/format/2750.spec.ts diff --git a/packages/vue-language-service/tests/format/3101.spec.ts b/packages/language-service/tests/format/3101.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/3101.spec.ts rename to packages/language-service/tests/format/3101.spec.ts diff --git a/packages/vue-language-service/tests/format/3572.spec.ts b/packages/language-service/tests/format/3572.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/3572.spec.ts rename to packages/language-service/tests/format/3572.spec.ts diff --git a/packages/vue-language-service/tests/format/js template strings.spec.ts b/packages/language-service/tests/format/js template strings.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/js template strings.spec.ts rename to packages/language-service/tests/format/js template strings.spec.ts diff --git a/packages/vue-language-service/tests/format/multi-line html comment.spec.ts b/packages/language-service/tests/format/multi-line html comment.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/multi-line html comment.spec.ts rename to packages/language-service/tests/format/multi-line html comment.spec.ts diff --git a/packages/vue-language-service/tests/format/multi-line interpolation.spec.ts b/packages/language-service/tests/format/multi-line interpolation.spec.ts similarity index 100% rename from packages/vue-language-service/tests/format/multi-line interpolation.spec.ts rename to packages/language-service/tests/format/multi-line interpolation.spec.ts diff --git a/packages/vue-language-service/tests/index.spec.ts b/packages/language-service/tests/index.spec.ts similarity index 100% rename from packages/vue-language-service/tests/index.spec.ts rename to packages/language-service/tests/index.spec.ts diff --git a/packages/vue-language-service/tests/reference.ts b/packages/language-service/tests/reference.ts similarity index 100% rename from packages/vue-language-service/tests/reference.ts rename to packages/language-service/tests/reference.ts diff --git a/packages/vue-language-service/tests/rename.ts b/packages/language-service/tests/rename.ts similarity index 100% rename from packages/vue-language-service/tests/rename.ts rename to packages/language-service/tests/rename.ts diff --git a/packages/vue-language-service/tests/utils/createTester.ts b/packages/language-service/tests/utils/createTester.ts similarity index 100% rename from packages/vue-language-service/tests/utils/createTester.ts rename to packages/language-service/tests/utils/createTester.ts diff --git a/packages/vue-language-service/tests/utils/format.ts b/packages/language-service/tests/utils/format.ts similarity index 100% rename from packages/vue-language-service/tests/utils/format.ts rename to packages/language-service/tests/utils/format.ts diff --git a/packages/vscode-vue/tsconfig.json b/packages/language-service/tsconfig.json similarity index 73% rename from packages/vscode-vue/tsconfig.json rename to packages/language-service/tsconfig.json index b1ee9b331f..dda928445c 100644 --- a/packages/vscode-vue/tsconfig.json +++ b/packages/language-service/tsconfig.json @@ -6,6 +6,6 @@ }, "include": [ "src" ], "references": [ - { "path": "../vue-language-server/tsconfig.json" }, + { "path": "../language-core/tsconfig.json" }, ], } \ No newline at end of file diff --git a/packages/vue-language-service/LICENSE b/packages/tsc-eslint-hook/LICENSE similarity index 100% rename from packages/vue-language-service/LICENSE rename to packages/tsc-eslint-hook/LICENSE diff --git a/packages/vue-tsc-eslint-hook/README.md b/packages/tsc-eslint-hook/README.md similarity index 100% rename from packages/vue-tsc-eslint-hook/README.md rename to packages/tsc-eslint-hook/README.md diff --git a/packages/vue-tsc-eslint-hook/package.json b/packages/tsc-eslint-hook/package.json similarity index 91% rename from packages/vue-tsc-eslint-hook/package.json rename to packages/tsc-eslint-hook/package.json index 7ac76f0362..5515689258 100644 --- a/packages/vue-tsc-eslint-hook/package.json +++ b/packages/tsc-eslint-hook/package.json @@ -11,7 +11,7 @@ "repository": { "type": "git", "url": "https://github.com/vuejs/language-tools.git", - "directory": "packages/vue-tsc-eslint" + "directory": "packages/tsc-eslint" }, "devDependencies": { "@types/eslint": "latest", diff --git a/packages/vue-tsc-eslint-hook/src/index.ts b/packages/tsc-eslint-hook/src/index.ts similarity index 97% rename from packages/vue-tsc-eslint-hook/src/index.ts rename to packages/tsc-eslint-hook/src/index.ts index 8e80b09355..d074951ffa 100644 --- a/packages/vue-tsc-eslint-hook/src/index.ts +++ b/packages/tsc-eslint-hook/src/index.ts @@ -14,7 +14,7 @@ export = async function ( useEslintrc: false, }); const fileNames = program.__vue.languageHost.getScriptFileNames(); - const mapper = program.__vue.languageService.__internal__.context.virtualFiles; + const mapper = program.__vue.langaugeContext.virtualFiles; const formatter = await eslint.loadFormatter(); for (const fileName of fileNames) { diff --git a/packages/vue-tsc-eslint-hook/tsconfig.json b/packages/tsc-eslint-hook/tsconfig.json similarity index 78% rename from packages/vue-tsc-eslint-hook/tsconfig.json rename to packages/tsc-eslint-hook/tsconfig.json index 12355acdd6..0534ae34f0 100644 --- a/packages/vue-tsc-eslint-hook/tsconfig.json +++ b/packages/tsc-eslint-hook/tsconfig.json @@ -6,6 +6,6 @@ }, "include": [ "src" ], "references": [ - { "path": "../vue-tsc/tsconfig.json" }, + { "path": "../tsc/tsconfig.json" }, ], } \ No newline at end of file diff --git a/packages/vue-tsc-eslint-hook/LICENSE b/packages/tsc/LICENSE similarity index 100% rename from packages/vue-tsc-eslint-hook/LICENSE rename to packages/tsc/LICENSE diff --git a/packages/vue-tsc/README.md b/packages/tsc/README.md similarity index 100% rename from packages/vue-tsc/README.md rename to packages/tsc/README.md diff --git a/packages/vue-tsc/bin/vue-tsc.js b/packages/tsc/bin/vue-tsc.js similarity index 100% rename from packages/vue-tsc/bin/vue-tsc.js rename to packages/tsc/bin/vue-tsc.js diff --git a/packages/vue-tsc/package.json b/packages/tsc/package.json similarity index 86% rename from packages/vue-tsc/package.json rename to packages/tsc/package.json index c2ac4e6828..ed84544f8e 100644 --- a/packages/vue-tsc/package.json +++ b/packages/tsc/package.json @@ -11,14 +11,14 @@ "repository": { "type": "git", "url": "https://github.com/vuejs/language-tools.git", - "directory": "packages/vue-tsc" + "directory": "packages/tsc" }, "bin": { "vue-tsc": "./bin/vue-tsc.js" }, "dependencies": { + "@volar/typescript": "~1.10.4", "@vue/language-core": "1.8.20", - "@vue/typescript": "1.8.20", "semver": "^7.5.4" }, "peerDependencies": { diff --git a/packages/vue-tsc/src/index.ts b/packages/tsc/src/index.ts similarity index 81% rename from packages/vue-tsc/src/index.ts rename to packages/tsc/src/index.ts index 73c8064b43..3b83ea1563 100644 --- a/packages/vue-tsc/src/index.ts +++ b/packages/tsc/src/index.ts @@ -1,6 +1,6 @@ import type * as ts from 'typescript/lib/tsserverlibrary'; import * as vue from '@vue/language-core'; -import * as vueTs from '@vue/typescript'; +import * as volarTs from '@volar/typescript'; import { state } from './shared'; export type Hook = (program: _Program) => void; @@ -8,11 +8,12 @@ export type Hook = (program: _Program) => void; export type _Program = ts.Program & { __vue: ProgramContext; }; interface ProgramContext { - projectVersion: number, - options: ts.CreateProgramOptions, - languageHost: vue.TypeScriptLanguageHost, - vueCompilerOptions: Partial, - languageService: ReturnType, + projectVersion: number; + options: ts.CreateProgramOptions; + languageHost: vue.TypeScriptLanguageHost; + vueCompilerOptions: Partial; + langaugeContext: vue.LanguageContext; + languageService: ts.LanguageService; } const windowsPathReg = /\\/g; @@ -53,6 +54,9 @@ export function createProgram(options: ts.CreateProgramOptions) { get languageService() { return vueTsLs; }, + get langaugeContext() { + return languageContext; + }, }; const vueCompilerOptions = getVueCompilerOptions(); const scripts = new Map ctx.options.projectReferences, getCancellationToken: ctx.options.host!.getCancellationToken ? () => ctx.options.host!.getCancellationToken!() : undefined, }; - const vueTsLs = vueTs.createLanguageService(languageHost, vueCompilerOptions, ts as any, ts.sys); - - program = vueTs.getProgram(ts as any, vueTsLs.__internal__.context, vueTsLs, ts.sys) as (ts.Program & { __vue: ProgramContext; }); + const languageContext = vue.createLanguageContext( + languageHost, + vue.createLanguages( + languageHost.getCompilationSettings(), + vueCompilerOptions, + ts, + ), + ); + const languageServiceHost = volarTs.createLanguageServiceHost(languageContext, ts, ts.sys, undefined); + const vueTsLs = ts.createLanguageService(languageServiceHost, volarTs.getDocumentRegistry(ts, ts.sys.useCaseSensitiveFileNames, languageHost.workspacePath)); + + volarTs.decorateLanguageService(languageContext.virtualFiles, vueTsLs, false); + + program = volarTs.getProgram(ts as any, languageContext, vueTsLs, ts.sys) as (ts.Program & { __vue: ProgramContext; }); program.__vue = ctx; function getVueCompilerOptions(): Partial { diff --git a/packages/vue-tsc/src/shared.ts b/packages/tsc/src/shared.ts similarity index 100% rename from packages/vue-tsc/src/shared.ts rename to packages/tsc/src/shared.ts diff --git a/packages/vue-tsc/tests/__snapshots__/dts.spec.ts.snap b/packages/tsc/tests/__snapshots__/dts.spec.ts.snap similarity index 100% rename from packages/vue-tsc/tests/__snapshots__/dts.spec.ts.snap rename to packages/tsc/tests/__snapshots__/dts.spec.ts.snap diff --git a/packages/vue-tsc/tests/dts.spec.ts b/packages/tsc/tests/dts.spec.ts similarity index 100% rename from packages/vue-tsc/tests/dts.spec.ts rename to packages/tsc/tests/dts.spec.ts diff --git a/packages/vue-tsc/tests/index.spec.ts b/packages/tsc/tests/index.spec.ts similarity index 100% rename from packages/vue-tsc/tests/index.spec.ts rename to packages/tsc/tests/index.spec.ts diff --git a/packages/tsc/tsconfig.json b/packages/tsc/tsconfig.json new file mode 100644 index 0000000000..dda928445c --- /dev/null +++ b/packages/tsc/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "outDir": "out", + "rootDir": "src", + }, + "include": [ "src" ], + "references": [ + { "path": "../language-core/tsconfig.json" }, + ], +} \ No newline at end of file diff --git a/packages/vue-tsc/LICENSE b/packages/typescript-plugin/LICENSE similarity index 100% rename from packages/vue-tsc/LICENSE rename to packages/typescript-plugin/LICENSE diff --git a/packages/vue-typescript/package.json b/packages/typescript-plugin/package.json similarity index 79% rename from packages/vue-typescript/package.json rename to packages/typescript-plugin/package.json index 54a1e52ad1..1c67878d15 100644 --- a/packages/vue-typescript/package.json +++ b/packages/typescript-plugin/package.json @@ -1,5 +1,5 @@ { - "name": "@vue/typescript", + "name": "typescript-vue-plugin", "version": "1.8.20", "main": "out/index.js", "license": "MIT", @@ -10,7 +10,7 @@ "repository": { "type": "git", "url": "https://github.com/vuejs/language-tools.git", - "directory": "packages/vue-typescript" + "directory": "packages/typescript-plugin" }, "dependencies": { "@volar/typescript": "~1.10.4", diff --git a/packages/typescript-vue-plugin/src/index.ts b/packages/typescript-plugin/src/index.ts similarity index 82% rename from packages/typescript-vue-plugin/src/index.ts rename to packages/typescript-plugin/src/index.ts index 536a6904c7..b4e24fd55f 100644 --- a/packages/typescript-vue-plugin/src/index.ts +++ b/packages/typescript-plugin/src/index.ts @@ -1,5 +1,5 @@ +import { decorateLanguageService, decorateLanguageServiceHost, searchExternalFiles } from '@volar/typescript'; import * as vue from '@vue/language-core'; -import { decorateLanguageService, decorateLanguageServiceHost, searchExternalFiles } from '@vue/typescript'; import type * as ts from 'typescript/lib/tsserverlibrary'; const externalFiles = new WeakMap(); @@ -20,6 +20,16 @@ const init: ts.server.PluginModuleFactory = (modules) => { decorateLanguageService(virtualFiles, info.languageService, true); decorateLanguageServiceHost(virtualFiles, info.languageServiceHost, ts, ['.vue']); + const getCompletionsAtPosition = info.languageService.getCompletionsAtPosition.bind(info.languageService); + + info.languageService.getCompletionsAtPosition = (fileName, position, options) => { + const result = getCompletionsAtPosition(fileName, position, options); + if (result) { + result.entries = result.entries.filter(entry => entry.name.indexOf('__VLS_') === -1); + } + return result; + }; + return info.languageService; function getVueCompilerOptions() { diff --git a/packages/typescript-plugin/tsconfig.json b/packages/typescript-plugin/tsconfig.json new file mode 100644 index 0000000000..dda928445c --- /dev/null +++ b/packages/typescript-plugin/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "outDir": "out", + "rootDir": "src", + }, + "include": [ "src" ], + "references": [ + { "path": "../language-core/tsconfig.json" }, + ], +} \ No newline at end of file diff --git a/packages/typescript-vue-plugin/package.json b/packages/typescript-vue-plugin/package.json deleted file mode 100644 index 58844de1e5..0000000000 --- a/packages/typescript-vue-plugin/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "typescript-vue-plugin", - "version": "1.8.20", - "main": "out/index.js", - "license": "MIT", - "files": [ - "out/**/*.js", - "out/**/*.d.ts" - ], - "repository": { - "type": "git", - "url": "https://github.com/vuejs/language-tools.git", - "directory": "packages/typescript-vue-plugin" - }, - "dependencies": { - "@vue/language-core": "1.8.20", - "@vue/typescript": "1.8.20", - "vscode-uri": "^3.0.8" - } -} diff --git a/packages/typescript-vue-plugin/tsconfig.json b/packages/typescript-vue-plugin/tsconfig.json deleted file mode 100644 index eb57dc135c..0000000000 --- a/packages/typescript-vue-plugin/tsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "out", - "rootDir": "src", - }, - "include": [ "src" ], - "references": [ - { "path": "../vue-language-core/tsconfig.json" }, - { "path": "../vue-typescript/tsconfig.json" }, - ], -} \ No newline at end of file diff --git a/packages/vue-language-server/tsconfig.json b/packages/vue-language-server/tsconfig.json deleted file mode 100644 index d94012498b..0000000000 --- a/packages/vue-language-server/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "out", - "rootDir": "src", - }, - "include": [ "src" ], - "references": [ - { "path": "../vue-language-core/tsconfig.json" }, - { "path": "../vue-language-service/tsconfig.json" }, - { "path": "../vue-component-meta/tsconfig.json" }, - ], -} \ No newline at end of file diff --git a/packages/vue-language-service/tsconfig.json b/packages/vue-language-service/tsconfig.json deleted file mode 100644 index eb57dc135c..0000000000 --- a/packages/vue-language-service/tsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "out", - "rootDir": "src", - }, - "include": [ "src" ], - "references": [ - { "path": "../vue-language-core/tsconfig.json" }, - { "path": "../vue-typescript/tsconfig.json" }, - ], -} \ No newline at end of file diff --git a/packages/vue-tsc/tsconfig.json b/packages/vue-tsc/tsconfig.json deleted file mode 100644 index eb57dc135c..0000000000 --- a/packages/vue-tsc/tsconfig.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "outDir": "out", - "rootDir": "src", - }, - "include": [ "src" ], - "references": [ - { "path": "../vue-language-core/tsconfig.json" }, - { "path": "../vue-typescript/tsconfig.json" }, - ], -} \ No newline at end of file diff --git a/packages/vue-typescript/LICENSE b/packages/vue-typescript/LICENSE deleted file mode 100644 index b55e47a7e8..0000000000 --- a/packages/vue-typescript/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021-present Johnson Chu - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/packages/vue-typescript/src/index.ts b/packages/vue-typescript/src/index.ts deleted file mode 100644 index 729f376c28..0000000000 --- a/packages/vue-typescript/src/index.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { createLanguageServiceHost, getDocumentRegistry, decorateLanguageService as _decorateLanguageService } from '@volar/typescript'; -import * as vue from '@vue/language-core'; -import type * as ts from 'typescript/lib/tsserverlibrary'; - -export { getProgram, decorateLanguageServiceHost, searchExternalFiles } from '@volar/typescript'; - -export function createLanguageService( - host: vue.TypeScriptLanguageHost, - vueCompilerOptions: Partial, - ts: typeof import('typescript/lib/tsserverlibrary'), - sys: ts.System, -) { - const languageContext = vue.createLanguageContext( - host, - vue.createLanguages( - host.getCompilationSettings(), - vueCompilerOptions, - ts, - ), - ); - const languageServiceHost = createLanguageServiceHost(languageContext, ts, sys, undefined); - const languageService = ts.createLanguageService(languageServiceHost, getDocumentRegistry(ts, sys.useCaseSensitiveFileNames, host.workspacePath)); - decorateLanguageService(languageContext.virtualFiles, languageService, false); - return { - ...languageService, - __internal__: { - context: languageContext, - }, - }; -} - -export function decorateLanguageService(virtualFiles: vue.VirtualFiles, ls: ts.LanguageService, isTsPlugin: boolean) { - - _decorateLanguageService(virtualFiles, ls, isTsPlugin); - - const getCompletionsAtPosition = ls.getCompletionsAtPosition.bind(ls); - ls.getCompletionsAtPosition = (fileName, position, options) => { - const result = getCompletionsAtPosition(fileName, position, options); - if (result) { - result.entries = result.entries.filter(entry => entry.name.indexOf('__VLS_') === -1); - } - return result; - }; -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 16a7cbb963..afb8b4d71e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,31 +31,7 @@ importers: specifier: latest version: 0.34.6 - packages/typescript-vue-plugin: - dependencies: - '@vue/language-core': - specifier: 1.8.20 - version: link:../vue-language-core - '@vue/typescript': - specifier: 1.8.20 - version: link:../vue-typescript - vscode-uri: - specifier: ^3.0.8 - version: 3.0.8 - - packages/vscode-typescript-vue-plugin: - devDependencies: - esbuild: - specifier: 0.15.18 - version: 0.15.18 - typescript-vue-plugin: - specifier: 1.8.20 - version: link:../typescript-vue-plugin - vsce: - specifier: latest - version: 2.15.0 - - packages/vscode-vue: + extensions/vscode: devDependencies: '@types/semver': specifier: ^7.5.3 @@ -68,10 +44,10 @@ importers: version: 1.10.4(vscode-languageclient@9.0.1) '@vue/language-core': specifier: 1.8.20 - version: link:../vue-language-core + version: link:../../packages/language-core '@vue/language-server': specifier: 1.8.20 - version: link:../vue-language-server + version: link:../../packages/language-server esbuild: specifier: 0.15.18 version: 0.15.18 @@ -91,24 +67,36 @@ importers: specifier: ^9.0.1 version: 9.0.1 - packages/vue-component-meta: + extensions/vscode-typescript-plugin: + devDependencies: + esbuild: + specifier: 0.15.18 + version: 0.15.18 + typescript-vue-plugin: + specifier: 1.8.20 + version: link:../../packages/typescript-plugin + vsce: + specifier: latest + version: 2.15.0 + + packages/component-meta: dependencies: '@volar/typescript': specifier: ~1.10.4 version: 1.10.4 '@vue/language-core': specifier: 1.8.20 - version: link:../vue-language-core + version: link:../language-core typesafe-path: specifier: ^0.2.2 version: 0.2.2 vue-component-type-helpers: specifier: 1.8.20 - version: link:../vue-component-type-helpers + version: link:../component-type-helpers - packages/vue-component-type-helpers: {} + packages/component-type-helpers: {} - packages/vue-language-core: + packages/language-core: dependencies: '@volar/language-core': specifier: ~1.10.4 @@ -142,7 +130,7 @@ importers: specifier: ^3.3.0 version: 3.3.4 - packages/vue-language-plugin-pug: + packages/language-plugin-pug: dependencies: '@volar/source-map': specifier: ~1.10.4 @@ -153,9 +141,9 @@ importers: devDependencies: '@vue/language-core': specifier: 1.8.20 - version: link:../vue-language-core + version: link:../language-core - packages/vue-language-server: + packages/language-server: dependencies: '@volar/language-core': specifier: ~1.10.4 @@ -168,18 +156,18 @@ importers: version: 1.10.4 '@vue/language-core': specifier: 1.8.20 - version: link:../vue-language-core + version: link:../language-core '@vue/language-service': specifier: 1.8.20 - version: link:../vue-language-service + version: link:../language-service vscode-languageserver-protocol: specifier: ^3.17.5 version: 3.17.5 vue-component-meta: specifier: 1.8.20 - version: link:../vue-component-meta + version: link:../component-meta - packages/vue-language-service: + packages/language-service: dependencies: '@volar/language-core': specifier: ~1.10.4 @@ -195,7 +183,7 @@ importers: version: 3.3.4 '@vue/language-core': specifier: 1.8.20 - version: link:../vue-language-core + version: link:../language-core '@vue/shared': specifier: ^3.3.0 version: 3.3.4 @@ -243,19 +231,19 @@ importers: specifier: ^3.0.8 version: 3.0.8 - packages/vue-tsc: + packages/tsc: dependencies: + '@volar/typescript': + specifier: ~1.10.4 + version: 1.10.4 '@vue/language-core': specifier: 1.8.20 - version: link:../vue-language-core - '@vue/typescript': - specifier: 1.8.20 - version: link:../vue-typescript + version: link:../language-core semver: specifier: ^7.5.4 version: 7.5.4 - packages/vue-tsc-eslint-hook: + packages/tsc-eslint-hook: dependencies: vscode-languageserver-textdocument: specifier: ^1.0.11 @@ -266,16 +254,16 @@ importers: version: 8.44.6 vue-tsc: specifier: 1.8.20 - version: link:../vue-tsc + version: link:../tsc - packages/vue-typescript: + packages/typescript-plugin: dependencies: '@volar/typescript': specifier: ~1.10.4 version: 1.10.4 '@vue/language-core': specifier: 1.8.20 - version: link:../vue-language-core + version: link:../language-core test-workspace: devDependencies: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index db03ddb0d0..792e037dd5 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,3 +1,4 @@ packages: + - 'extensions/*' - 'packages/*' - 'test-workspace' diff --git a/tsconfig.ci.json b/tsconfig.ci.json index 4f0d2aef7b..740ac1c22f 100644 --- a/tsconfig.ci.json +++ b/tsconfig.ci.json @@ -1,9 +1,9 @@ { "include": [ ], "references": [ - { "path": "./packages/vue-language-server/tsconfig.json" }, - { "path": "./packages/vue-tsc/tsconfig.json" }, - { "path": "./packages/vue-component-meta/tsconfig.json" }, - { "path": "./packages/vue-language-plugin-pug/tsconfig.json" }, + { "path": "./packages/language-server/tsconfig.json" }, + { "path": "./packages/tsc/tsconfig.json" }, + { "path": "./packages/component-meta/tsconfig.json" }, + { "path": "./packages/language-plugin-pug/tsconfig.json" }, ], } \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 7b3181e3a8..e1dc6131f5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,14 +5,12 @@ }, "include": [ "packages/*/tests" ], "references": [ - // VSCode Extensions - { "path": "./packages/vscode-vue/tsconfig.json" }, - { "path": "./packages/vscode-typescript-vue-plugin/tsconfig.json" }, - // Libraries - { "path": "./packages/vue-language-plugin-pug/tsconfig.json" }, - { "path": "./packages/typescript-vue-plugin/tsconfig.json" }, - { "path": "./packages/vue-tsc/tsconfig.json" }, - { "path": "./packages/vue-tsc-eslint-hook/tsconfig.json" }, - { "path": "./packages/vue-component-meta/tsconfig.json" }, + { "path": "./extensions/vscode/tsconfig.json" }, + { "path": "./extensions/vscode-typescript-plugin/tsconfig.json" }, + { "path": "./packages/language-plugin-pug/tsconfig.json" }, + { "path": "./packages/typescript-plugin/tsconfig.json" }, + { "path": "./packages/tsc/tsconfig.json" }, + { "path": "./packages/tsc-eslint-hook/tsconfig.json" }, + { "path": "./packages/component-meta/tsconfig.json" }, ], } \ No newline at end of file