diff --git a/packages/vue-test-workspace-vue-2/package.json b/packages/vue-test-workspace-vue-2/package.json index c04676ddc0..48608c46ba 100644 --- a/packages/vue-test-workspace-vue-2/package.json +++ b/packages/vue-test-workspace-vue-2/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "@volar/vue-test-workspace-vue-2", + "name": "@vue/vue-test-workspace-vue-2", "version": "1.8.19", "license": "MIT", "devDependencies": { diff --git a/packages/vue-test-workspace-vue-2/tsconfig.json b/packages/vue-test-workspace-vue-2/tsconfig.json index c0e26c8eed..d92aa75082 100644 --- a/packages/vue-test-workspace-vue-2/tsconfig.json +++ b/packages/vue-test-workspace-vue-2/tsconfig.json @@ -1,18 +1,19 @@ { - "compilerOptions": { - "lib": [ - "esnext", - "dom" - ], - "strict": true, - "noUncheckedIndexedAccess": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "skipLibCheck": true, - "allowJs": true, - "jsx": "preserve", - }, - "include": [ - "**/*" - ] + "compilerOptions": { + "lib": [ + "esnext", + "dom" + ], + "strict": true, + "noUncheckedIndexedAccess": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "skipLibCheck": true, + "allowJs": true, + "jsx": "preserve", + "baseUrl": ".", + }, + "include": [ + "**/*" + ] } diff --git a/packages/vue-test-workspace-vue-2/vue-tsc/non-strict-template/tsconfig.json b/packages/vue-test-workspace-vue-2/vue-tsc/non-strict-template/tsconfig.json new file mode 100644 index 0000000000..8411f7729a --- /dev/null +++ b/packages/vue-test-workspace-vue-2/vue-tsc/non-strict-template/tsconfig.json @@ -0,0 +1,4 @@ +{ + "extends": "../tsconfig.base.json", + "include": ["**/*"] +} diff --git a/packages/vue-test-workspace-vue-2/vue-tsc/tsconfig.base.json b/packages/vue-test-workspace-vue-2/vue-tsc/tsconfig.base.json index 705c64ead7..179fa7cdf6 100644 --- a/packages/vue-test-workspace-vue-2/vue-tsc/tsconfig.base.json +++ b/packages/vue-test-workspace-vue-2/vue-tsc/tsconfig.base.json @@ -6,7 +6,7 @@ "vueCompilerOptions": { "target": 2.7, "jsxSlots": true, - "plugins": ["../../vue-language-plugin-pug"] + "plugins": [ "../../vue-language-plugin-pug" ] }, - "include": [] + "include": [ ] } diff --git a/packages/vue-test-workspace/LICENSE b/packages/vue-test-workspace/LICENSE deleted file mode 100644 index b55e47a7e8..0000000000 --- a/packages/vue-test-workspace/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-test-workspace/package.json b/packages/vue-test-workspace/package.json index 50319e2457..e6b86a3783 100644 --- a/packages/vue-test-workspace/package.json +++ b/packages/vue-test-workspace/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "@volar/vue-test-workspace", + "name": "@vue/vue-test-workspace", "version": "1.8.19", "license": "MIT", "devDependencies": { diff --git a/packages/vue-tsc/tests/index.spec.ts b/packages/vue-tsc/tests/index.spec.ts index d30d97ab35..6ae58681f0 100644 --- a/packages/vue-tsc/tests/index.spec.ts +++ b/packages/vue-tsc/tests/index.spec.ts @@ -10,11 +10,15 @@ const workspaceVue2 = path.resolve(__dirname, '../../vue-test-workspace-vue-2/vu function prettyPath(path: string, isRoot: boolean) { const segments = path.split('/'); - return !isRoot ? segments.slice(segments.length - 2, segments.length).join('/') : segments[segments.length - 1]; + const slicePath = (seg: number) => segments + .slice(segments.length - seg, segments.length) + .join('/') + .replace('/vue-tsc', ''); + return !isRoot ? slicePath(4) : slicePath(3); } function collectTests(dir: string, depth = 2, isRoot: boolean = true): [filePath: string, isRoot: boolean][] { - const tests: [filePath: string, isRoot: boolean][] = []; + const tests: [filePath: string, isRoot: boolean][] = []; if (depth <= 0) { return tests;