From 7c89572a53b65150a5bec5e6e5d72bd05a6f8f42 Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Fri, 21 Apr 2023 00:31:00 +0200 Subject: [PATCH] test: fix ct-vue-vite typechecks (#22538) --- tests/components/ct-vue-vite/package.json | 2 +- .../components/ct-vue-vite/tsconfig.app.json | 12 ------------ tests/components/ct-vue-vite/tsconfig.json | 19 +++++++++++-------- ...sconfig.config.json => tsconfig.node.json} | 5 +++-- .../components/ct-vue-vite/tsconfig.test.json | 10 ---------- 5 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 tests/components/ct-vue-vite/tsconfig.app.json rename tests/components/ct-vue-vite/{tsconfig.config.json => tsconfig.node.json} (73%) delete mode 100644 tests/components/ct-vue-vite/tsconfig.test.json diff --git a/tests/components/ct-vue-vite/package.json b/tests/components/ct-vue-vite/package.json index 8cced08db2..2687508698 100644 --- a/tests/components/ct-vue-vite/package.json +++ b/tests/components/ct-vue-vite/package.json @@ -5,7 +5,7 @@ "dev": "vite", "build": "vite build", "preview": "vite preview --port 5050", - "typecheck": "vue-tsc --noEmit --project tsconfig.test.json" + "typecheck": "vue-tsc --noEmit" }, "dependencies": { "vue": "^3.2.31", diff --git a/tests/components/ct-vue-vite/tsconfig.app.json b/tests/components/ct-vue-vite/tsconfig.app.json deleted file mode 100644 index e52dda05ba..0000000000 --- a/tests/components/ct-vue-vite/tsconfig.app.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "@vue/tsconfig/tsconfig.web.json", - "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "playwright"], - "exclude": ["src/**/*.spec.*/*"], - "compilerOptions": { - "composite": true, - "baseUrl": ".", - "paths": { - "@/*": ["./src/*"] - } - } -} diff --git a/tests/components/ct-vue-vite/tsconfig.json b/tests/components/ct-vue-vite/tsconfig.json index 536e033e83..d6d2007656 100644 --- a/tests/components/ct-vue-vite/tsconfig.json +++ b/tests/components/ct-vue-vite/tsconfig.json @@ -1,14 +1,17 @@ { - "files": [], + "extends": "@vue/tsconfig/tsconfig.web.json", + "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "playwright"], + "compilerOptions": { + "baseUrl": ".", + "paths": { + "@/*": ["./src/*"] + }, + "ignoreDeprecations": "5.0" + }, + "references": [ { - "path": "./tsconfig.config.json" - }, - { - "path": "./tsconfig.app.json" - }, - { - "path": "./tsconfig.test.json" + "path": "./tsconfig.node.json" } ] } diff --git a/tests/components/ct-vue-vite/tsconfig.config.json b/tests/components/ct-vue-vite/tsconfig.node.json similarity index 73% rename from tests/components/ct-vue-vite/tsconfig.config.json rename to tests/components/ct-vue-vite/tsconfig.node.json index 75f02c4939..7924803d11 100644 --- a/tests/components/ct-vue-vite/tsconfig.config.json +++ b/tests/components/ct-vue-vite/tsconfig.node.json @@ -3,6 +3,7 @@ "include": ["vite.config.*", "playwright.config.*"], "compilerOptions": { "composite": true, - "types": ["node"] + "types": ["node"], + "ignoreDeprecations": "5.0" } -} +} \ No newline at end of file diff --git a/tests/components/ct-vue-vite/tsconfig.test.json b/tests/components/ct-vue-vite/tsconfig.test.json deleted file mode 100644 index 0c7f9f7369..0000000000 --- a/tests/components/ct-vue-vite/tsconfig.test.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "./tsconfig.app.json", - "include": ["playwright", "env.d.ts", "src/**/*"], - "compilerOptions": { - "composite": true, - "lib": [], - "types": ["node"], - "ignoreDeprecations": "5.0" - } -}