fix(schema): do non augment if @vue/language-core is not installed

nuxt · Feb 26, 2024 · c05fb60 · c05fb60
1 parent e339c74
commit c05fb60
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/schema/src/config/typescript.ts b/packages/schema/src/config/typescript.ts
@@ -43,7 +43,7 @@ export default defineUntypedSchema({
 
     /**
      * You can extend generated `.nuxt/tsconfig.json` using this option.
-     * @type {typeof import('pkg-types')['TSConfig'] & { vueCompilerOptions?: typeof import('@vue/language-core')['VueCompilerOptions']}}
+     * @type {0 extends 1 & VueCompilerOptions ? typeof import('pkg-types')['TSConfig'] : typeof import('pkg-types')['TSConfig'] & { vueCompilerOptions?: typeof import('@vue/language-core')['VueCompilerOptions']}}
      */
     tsConfig: {},
 

diff --git a/packages/schema/src/types/hooks.ts b/packages/schema/src/types/hooks.ts
@@ -20,9 +20,10 @@ export type HookResult = Promise<void> | void
 export type TSReference = { types: string } | { path: string }
 
 export type WatchEvent = 'add' | 'addDir' | 'change' | 'unlink' | 'unlinkDir'
-export type VueTSConfig = TSConfig & {
-  vueCompilerOptions?: VueCompilerOptions;
-};
+
+// If the user does not have `@vue/language-core` installed, VueCompilerOptions will be typed as `any`,
+// thus making the whole `VueTSConfig` type `any`. We only augment TSConfig if VueCompilerOptions is available. 
+export type VueTSConfig = 0 extends 1 & VueCompilerOptions ? TSConfig : TSConfig & { vueCompilerOptions?: VueCompilerOptions }
 
 export type NuxtPage = {
   name?: string