diff --git a/package.json b/package.json index 5b162992..4a40ba51 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "@cypress/grep": "^4.0.1", "@intlify/unplugin-vue-i18n": "^1.6.0", "@rushstack/eslint-patch": "^1.6.1", + "@tsconfig/node18": "^18.2.2", "@types/node": "^20.10.4", "@types/rusha": "^0.8.3", "@types/sortablejs": "^1.15.7", @@ -52,7 +53,7 @@ "@vitejs/plugin-vue": "^4.5.2", "@vue/eslint-config-prettier": "^8.0.0", "@vue/eslint-config-typescript": "^12.0.0", - "@vue/tsconfig": "^0.1.3", + "@vue/tsconfig": "^0.5.0", "cypress": "^13.6.1", "cypress-downloadfile": "1.2.3", "cypress-mochawesome-reporter": "^3.7.0", @@ -67,7 +68,7 @@ "stylelint": "^16.0.2", "stylelint-config-recommended-vue": "^1.5.0", "stylelint-config-standard-scss": "^12.0.0", - "typescript": "^4.9.5", + "typescript": "~5.3.0", "vite": "^5.0.10", "vite-plugin-vuetify": "^2.0.1", "vue-tsc": "1.8.25" diff --git a/src/components/CachedDamUserChip.vue b/src/components/CachedDamUserChip.vue index 64c8306f..7b29d535 100644 --- a/src/components/CachedDamUserChip.vue +++ b/src/components/CachedDamUserChip.vue @@ -14,7 +14,7 @@ const props = withDefaults( ) const router = useRouter() -const cached = shallowRef(undefined) +// const cached = shallowRef(undefined) const loaded = shallowRef(false) const { getCachedUser } = useCachedUsers() diff --git a/tsconfig.app.json b/tsconfig.app.json index 6dd5d922..ad305b49 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -1,10 +1,10 @@ { - "extends": "@vue/tsconfig/tsconfig.web.json", - "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "src/**/*.json"], + "extends": "@vue/tsconfig/tsconfig.dom.json", + "include": ["env.d.ts", "src/**/*", "src/**/*.vue"], "exclude": ["src/**/__tests__/*"], "compilerOptions": { "composite": true, - "sourceMap": true, + "noEmit": true, "baseUrl": ".", "paths": { "@/*": ["./src/*"] diff --git a/tsconfig.config.json b/tsconfig.config.json deleted file mode 100644 index c2d3a309..00000000 --- a/tsconfig.config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "@vue/tsconfig/tsconfig.node.json", - "include": ["vite.config.*", "vitest.config.*", "cypress.config.*"], - "compilerOptions": { - "composite": true, - "types": ["node"] - } -} diff --git a/tsconfig.cypress-ct.json b/tsconfig.cypress-ct.json new file mode 100644 index 00000000..b21f0843 --- /dev/null +++ b/tsconfig.cypress-ct.json @@ -0,0 +1,14 @@ +{ + "extends": "./tsconfig.app.json", + "include": [ + "env.d.ts", + "src/**/*", + "src/**/*.vue", + "cypress/support/component.*", + "cypress/support/commands.ts" + ], + "exclude": [], + "compilerOptions": { + "composite": true + } +} diff --git a/tsconfig.json b/tsconfig.json index 40eccf91..d3b6c317 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,10 +2,16 @@ "files": [], "references": [ { - "path": "./tsconfig.config.json" + "path": "./tsconfig.node.json" }, { "path": "./tsconfig.app.json" + }, + { + "path": "./tsconfig.cypress-ct.json" } - ] + ], + "compilerOptions": { + "module": "NodeNext" + } } diff --git a/tsconfig.node.json b/tsconfig.node.json new file mode 100644 index 00000000..46cf2e14 --- /dev/null +++ b/tsconfig.node.json @@ -0,0 +1,17 @@ +{ + "extends": "@tsconfig/node18/tsconfig.json", + "include": [ + "vite.config.*", + "vitest.config.*", + "cypress.config.*", + "nightwatch.conf.*", + "playwright.config.*" + ], + "compilerOptions": { + "composite": true, + "noEmit": true, + "module": "ESNext", + "moduleResolution": "Bundler", + "types": ["node"] + } +} diff --git a/yarn.lock b/yarn.lock index 0ab3d100..49cab814 100644 --- a/yarn.lock +++ b/yarn.lock @@ -762,6 +762,13 @@ __metadata: languageName: node linkType: hard +"@tsconfig/node18@npm:^18.2.2": + version: 18.2.2 + resolution: "@tsconfig/node18@npm:18.2.2" + checksum: 1c4b04b570e33de14bf518492e077079db2dcfba738c8d40c6ff916d94c9410246f4cb56f0802d9771423862140bf714c35d4a5f6cec2446d851cf61d3f8f9df + languageName: node + linkType: hard + "@types/cookie@npm:^0.5.1": version: 0.5.3 resolution: "@types/cookie@npm:0.5.3" @@ -1387,15 +1394,10 @@ __metadata: languageName: node linkType: hard -"@vue/tsconfig@npm:^0.1.3": - version: 0.1.3 - resolution: "@vue/tsconfig@npm:0.1.3" - peerDependencies: - "@types/node": "*" - peerDependenciesMeta: - "@types/node": - optional: true - checksum: 8150a24497a5348bc342c27afb38ad989de2ce8e94c349020628065d2a8df6837cb8bb3012f9161eea716487832612ac71b5f910d95bac41539ac6021d6bd88d +"@vue/tsconfig@npm:^0.5.0": + version: 0.5.0 + resolution: "@vue/tsconfig@npm:0.5.0" + checksum: 32f9dae6e61be4311100588532ed7dc47c29e79f9f1dcf14103e0e291778441a55327f6cf3f97afd94b0abdd9b77a8faa42943addd26e258c065012fb1594786 languageName: node linkType: hard @@ -1577,6 +1579,7 @@ __metadata: "@intlify/unplugin-vue-i18n": "npm:^1.6.0" "@mdi/font": "npm:7.3.67" "@rushstack/eslint-patch": "npm:^1.6.1" + "@tsconfig/node18": "npm:^18.2.2" "@types/node": "npm:^20.10.4" "@types/rusha": "npm:^0.8.3" "@types/sortablejs": "npm:^1.15.7" @@ -1585,7 +1588,7 @@ __metadata: "@vitejs/plugin-vue": "npm:^4.5.2" "@vue/eslint-config-prettier": "npm:^8.0.0" "@vue/eslint-config-typescript": "npm:^12.0.0" - "@vue/tsconfig": "npm:^0.1.3" + "@vue/tsconfig": "npm:^0.5.0" "@vuelidate/core": "npm:^2.0.3" "@vuelidate/validators": "npm:^2.0.4" "@vueuse/core": "npm:10.7.0" @@ -1610,7 +1613,7 @@ __metadata: stylelint: "npm:^16.0.2" stylelint-config-recommended-vue: "npm:^1.5.0" stylelint-config-standard-scss: "npm:^12.0.0" - typescript: "npm:^4.9.5" + typescript: "npm:~5.3.0" universal-cookie: "npm:^6.1.1" uuid: "npm:^9.0.1" vite: "npm:^5.0.10" @@ -7371,23 +7374,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^4.9.5": - version: 4.9.5 - resolution: "typescript@npm:4.9.5" +"typescript@npm:~5.3.0": + version: 5.3.3 + resolution: "typescript@npm:5.3.3" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 458f7220ab11e0fc191514cc41be1707645ec9a8c2d609448a448e18c522cef9646f58728f6811185a4c35613dacdf6c98cf8965c88b3541d0288c47291e4300 + checksum: 6e4e6a14a50c222b3d14d4ea2f729e79f972fa536ac1522b91202a9a65af3605c2928c4a790a4a50aa13694d461c479ba92cedaeb1e7b190aadaa4e4b96b8e18 languageName: node linkType: hard -"typescript@patch:typescript@npm%3A^4.9.5#optional!builtin": - version: 4.9.5 - resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin::version=4.9.5&hash=289587" +"typescript@patch:typescript@npm%3A~5.3.0#optional!builtin": + version: 5.3.3 + resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin::version=5.3.3&hash=e012d7" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 5659316360b5cc2d6f5931b346401fa534107b68b60179cf14970e27978f0936c1d5c46f4b5b8175f8cba0430f522b3ce355b4b724c0ea36ce6c0347fab25afd + checksum: c93786fcc9a70718ba1e3819bab56064ead5817004d1b8186f8ca66165f3a2d0100fee91fa64c840dcd45f994ca5d615d8e1f566d39a7470fc1e014dbb4cf15d languageName: node linkType: hard