From ca9fe6ff215351c3f4c8de65a333f5cfd5876488 Mon Sep 17 00:00:00 2001 From: kolaente Date: Fri, 28 Apr 2023 09:16:54 +0200 Subject: [PATCH] fix: tsconfig as per https://github.com/vuejs/tsconfig#configuration-for-node-environments --- package.json | 1 + pnpm-lock.yaml | 7 +++++++ tsconfig.app.json | 2 +- tsconfig.config.json | 5 ++++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b78871fc..6072ed74 100644 --- a/package.json +++ b/package.json @@ -95,6 +95,7 @@ "@histoire/plugin-screenshot": "0.16.1", "@histoire/plugin-vue": "0.16.1", "@rushstack/eslint-patch": "1.2.0", + "@tsconfig/node18": "^2.0.0", "@types/codemirror": "5.60.7", "@types/dompurify": "3.0.2", "@types/flexsearch": "0.7.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c0690c0c..fa7156b3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -152,6 +152,9 @@ devDependencies: '@rushstack/eslint-patch': specifier: 1.2.0 version: 1.2.0 + '@tsconfig/node18': + specifier: ^2.0.0 + version: 2.0.0 '@types/codemirror': specifier: 5.60.7 version: 5.60.7 @@ -3771,6 +3774,10 @@ packages: resolution: {integrity: sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==} dev: true + /@tsconfig/node18@2.0.0: + resolution: {integrity: sha512-uI/B0ShkiEwTk036pncXucVlj4y11EW6mycQvCEzC1PkR2TBvdQZ5Wf96dp+XXWAc70FEDfvwTqanoaDpP6rPw==} + dev: true + /@types/chai-subset@1.3.3: resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==} dependencies: diff --git a/tsconfig.app.json b/tsconfig.app.json index 1449d4f3..aaec2047 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -1,5 +1,5 @@ { - "extends": "@vue/tsconfig/tsconfig.web.json", + "extends": "@vue/tsconfig/tsconfig.dom.json", "include": ["env.d.ts", "src/**/*.d.ts", "src/**/*", "src/**/*.vue", "src/**/*.json"], "exclude": ["src/**/__tests__/*"], "compilerOptions": { diff --git a/tsconfig.config.json b/tsconfig.config.json index 70f4a37f..eae5920b 100644 --- a/tsconfig.config.json +++ b/tsconfig.config.json @@ -1,5 +1,8 @@ { - "extends": "@vue/tsconfig/tsconfig.node.json", + "extends": [ + "@tsconfig/node18/tsconfig.json", + "@vue/tsconfig/tsconfig.json" + ], "include": ["vite.config.*", "vitest.config.*", "cypress.config.*", "env.config.d.ts"], "compilerOptions": { "composite": true,