fix: correct resolve Vue when create program

fix #380
qmhc · Sep 6, 2024 · 0621332 · 0621332
1 parent 7bbef0c
commit 0621332
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 85 deletions.
diff --git a/examples/react/package.json b/examples/react/package.json
@@ -1,7 +1,6 @@
 {
   "name": "react-example",
   "version": "0.0.0",
-  "auth": "qmhc",
   "type": "module",
   "private": true,
   "scripts": {
@@ -16,7 +15,8 @@
     "@types/react-dom": "^18.2.22",
     "@vitejs/plugin-react": "^4.2.1",
     "tslib": "^2.6.2",
-    "typescript": "5.5.3",
+    "typescript": "5.5.4",
     "vite": "^5.3.4"
-  }
+  },
+  "auth": "qmhc"
 }
diff --git a/examples/react/vite.config.ts b/examples/react/vite.config.ts
@@ -23,6 +23,7 @@ export default defineConfig({
   },
   plugins: [
     react(),
+    // @ts-ignore
     dts({
       outDir: ['dist', 'types'],
       // include: ['src/index.ts'],

diff --git a/examples/svelte/package.json b/examples/svelte/package.json
@@ -1,9 +1,9 @@
 {
   "name": "svelte-example",
   "version": "0.0.0",
-  "author": "qmhc",
   "type": "module",
   "private": true,
+  "author": "qmhc",
   "scripts": {
     "build": "DEBUG=\"vite-plugin-dts:bundle\" vite build"
   },
@@ -13,7 +13,7 @@
     "svelte": "^4.2.12",
     "svelte-check": "^3.6.8",
     "tslib": "^2.6.2",
-    "typescript": "5.5.3",
+    "typescript": "5.5.4",
     "vite": "^5.3.4"
   }
 }
diff --git a/examples/svelte/vite.config.ts b/examples/svelte/vite.config.ts
@@ -23,6 +23,7 @@ export default defineConfig({
   },
   plugins: [
     svelte(),
+    // @ts-ignore
     dts({
       outDir: ['dist', 'types'],
       staticImport: true,

diff --git a/examples/ts/package.json b/examples/ts/package.json
@@ -1,7 +1,6 @@
 {
   "name": "ts-example",
   "version": "0.0.0",
-  "auth": "qmhc",
   "type": "module",
   "private": true,
   "scripts": {
@@ -11,7 +10,8 @@
   "types": "dist/ts-test.d.ts",
   "devDependencies": {
     "tslib": "^2.6.2",
-    "typescript": "5.5.3",
+    "typescript": "5.5.4",
     "vite": "^5.3.4"
-  }
+  },
+  "auth": "qmhc"
 }
diff --git a/examples/ts/vite.config.ts b/examples/ts/vite.config.ts
@@ -20,14 +20,15 @@ export default defineConfig({
     }
   },
   plugins: [
+    // @ts-ignore
     dts({
       outDir: ['dist', 'types'],
       // include: ['src/index.ts'],
       exclude: ['src/ignore'],
       // aliasesExclude: [/^@components/],
       staticImport: true,
       // insertTypesEntry: true,
-      rollupTypes: false,
+      rollupTypes: true,
       declarationOnly: true,
       compilerOptions: {
         declarationMap: true

diff --git a/examples/vue/package.json b/examples/vue/package.json
@@ -14,7 +14,7 @@
     "@vitejs/plugin-vue": "^5.0.4",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "tslib": "^2.6.2",
-    "typescript": "5.5.3",
+    "typescript": "5.5.4",
     "vite": "^5.3.4"
   },
   "auth": "qmhc"

diff --git a/examples/vue/vite.config.ts b/examples/vue/vite.config.ts
@@ -35,6 +35,7 @@ export default defineConfig({
     }
   },
   plugins: [
+    // @ts-ignore
     dts({
       copyDtsFiles: true,
       outDir: [

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/plugin.ts b/src/plugin.ts
@@ -710,7 +710,7 @@ export function dtsPlugin(options: PluginOptions = {}): import('vite').Plugin {
               outDir,
               entryPath: path,
               fileName: basename(path),
-              libFolder: getTsLibFolder({ root, entryRoot }),
+              libFolder: getTsLibFolder(),
               rollupConfig,
               rollupOptions
             })

diff --git a/src/program.ts b/src/program.ts
@@ -7,19 +7,12 @@ import {
 
 import { proxyCreateProgram } from '@volar/typescript'
 import ts from 'typescript'
-import { getPackageInfoSync, resolveModule } from 'local-pkg'
 import { removeEmitGlobalTypes } from 'vue-tsc'
+import { tryGetPackageInfo } from './utils'
 
 export { createParsedCommandLine }
 
-let hasVue = false
-
-try {
-  hasVue = !!(
-    getPackageInfoSync('vue') ??
-    getPackageInfoSync('svelte', { paths: [resolveModule('svelte') || process.cwd()] })
-  )
-} catch (e) {}
+const hasVue = !!tryGetPackageInfo('vue')
 
 // If there has no Vue dependency, we think it's a normal TypeScript project.
 // So we use the original createProgram of TypeScript.

diff --git a/src/resolvers/svelte.ts b/src/resolvers/svelte.ts
@@ -1,7 +1,7 @@
 import { relative } from 'node:path'
 
-import { getPackageInfoSync, resolveModule } from 'local-pkg'
 import { compare } from 'compare-versions'
+import { tryGetPackageInfo } from '../utils'
 
 import type { Resolver } from '../types'
 
@@ -13,9 +13,7 @@ function querySvelteVersion() {
   if (typeof lowerVersion === 'boolean') return
 
   try {
-    const version =
-      getPackageInfoSync('svelte')?.version ??
-      getPackageInfoSync('svelte', { paths: [resolveModule('svelte') || process.cwd()] })?.version
+    const version = tryGetPackageInfo('svelte')?.version
     lowerVersion = version ? compare(version, '4.0.0', '<') : false
   } catch (e) {
     lowerVersion = false

diff --git a/src/rollup.ts b/src/rollup.ts
@@ -1,7 +1,5 @@
-import { resolve } from 'node:path'
-
 import { Extractor, ExtractorConfig } from '@microsoft/api-extractor'
-import { tryGetPkgPath } from './utils'
+import { resolve, tryGetPkgPath } from './utils'
 
 import type { ExtractorLogLevel, IExtractorInvokeOptions } from '@microsoft/api-extractor'
 import type { RollupConfig } from './types'
@@ -93,7 +91,7 @@ export function rollupDeclarationFiles({
     localBuild: false,
     showVerboseMessages: false,
     showDiagnostics: false,
-    typescriptCompilerFolder: libFolder ? resolve(libFolder) : undefined,
+    typescriptCompilerFolder: libFolder,
     ...rollupOptions
   })
 }