From b6f2388db8c654ff929d714762759108f3475811 Mon Sep 17 00:00:00 2001 From: Mohammad Hosein Feizi <5635677+mhfeizi@users.noreply.github.com> Date: Fri, 22 Jul 2022 18:59:14 +0430 Subject: [PATCH 1/4] fix typeCheck when app is in sub directory --- packages/vite/src/server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index 0e76e49aef5..4e00a6969ea 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -107,7 +107,7 @@ export async function buildServer (ctx: ViteBuildContext) { // Add type-checking if (ctx.nuxt.options.typescript.typeCheck === true || (ctx.nuxt.options.typescript.typeCheck === 'build' && !ctx.nuxt.options.dev)) { const checker = await import('vite-plugin-checker').then(r => r.default) - serverConfig.plugins.push(checker({ vueTsc: true })) + serverConfig.plugins.push(checker({ vueTsc: { root: ctx.nuxt.options.rootDir, tsconfigPath: "tsconfig.json" } })) } await ctx.nuxt.callHook('vite:extendConfig', serverConfig, { isClient: false, isServer: true }) From 00e9562c56b35e3c19a0c74de9518d528fed381b Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Fri, 22 Jul 2022 15:47:42 +0100 Subject: [PATCH 2/4] style: single quotes --- packages/vite/src/server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index 4e00a6969ea..c5303d07499 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -107,7 +107,7 @@ export async function buildServer (ctx: ViteBuildContext) { // Add type-checking if (ctx.nuxt.options.typescript.typeCheck === true || (ctx.nuxt.options.typescript.typeCheck === 'build' && !ctx.nuxt.options.dev)) { const checker = await import('vite-plugin-checker').then(r => r.default) - serverConfig.plugins.push(checker({ vueTsc: { root: ctx.nuxt.options.rootDir, tsconfigPath: "tsconfig.json" } })) + serverConfig.plugins.push(checker({ vueTsc: { root: ctx.nuxt.options.rootDir, tsconfigPath: 'tsconfig.json' } })) } await ctx.nuxt.callHook('vite:extendConfig', serverConfig, { isClient: false, isServer: true }) From dc3fe7ef3b637e0da68a86a9febcd656487f7091 Mon Sep 17 00:00:00 2001 From: Mohammad Hosein Feizi <5635677+mhfeizi@users.noreply.github.com> Date: Fri, 22 Jul 2022 23:08:59 +0430 Subject: [PATCH 3/4] fix(vite): change tsconfigPath --- packages/vite/src/server.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index c5303d07499..46e0ada5da5 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -1,3 +1,4 @@ +import { resolveTSConfig } from 'pkg-types' import { resolve, normalize } from 'pathe' import * as vite from 'vite' import vuePlugin from '@vitejs/plugin-vue' @@ -107,7 +108,8 @@ export async function buildServer (ctx: ViteBuildContext) { // Add type-checking if (ctx.nuxt.options.typescript.typeCheck === true || (ctx.nuxt.options.typescript.typeCheck === 'build' && !ctx.nuxt.options.dev)) { const checker = await import('vite-plugin-checker').then(r => r.default) - serverConfig.plugins.push(checker({ vueTsc: { root: ctx.nuxt.options.rootDir, tsconfigPath: 'tsconfig.json' } })) + serverConfig.plugins.push(checker({ vueTsc: { tsconfigPath: await resolveTSConfig(ctx.nuxt.options.rootDir) + } })) } await ctx.nuxt.callHook('vite:extendConfig', serverConfig, { isClient: false, isServer: true }) From dbc7c946c38bc5b4e90739112f6376ace445fbc7 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 25 Jul 2022 12:17:32 +0200 Subject: [PATCH 4/4] fix lint issue --- packages/vite/src/server.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index 46e0ada5da5..04a4c5eab58 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -108,8 +108,11 @@ export async function buildServer (ctx: ViteBuildContext) { // Add type-checking if (ctx.nuxt.options.typescript.typeCheck === true || (ctx.nuxt.options.typescript.typeCheck === 'build' && !ctx.nuxt.options.dev)) { const checker = await import('vite-plugin-checker').then(r => r.default) - serverConfig.plugins.push(checker({ vueTsc: { tsconfigPath: await resolveTSConfig(ctx.nuxt.options.rootDir) - } })) + serverConfig.plugins.push(checker({ + vueTsc: { + tsconfigPath: await resolveTSConfig(ctx.nuxt.options.rootDir) + } + })) } await ctx.nuxt.callHook('vite:extendConfig', serverConfig, { isClient: false, isServer: true })