From 666ca0925075bed6926f648a210f37d56af9577b Mon Sep 17 00:00:00 2001 From: rk_zhang <40221744+qmhc@users.noreply.github.com> Date: Wed, 10 Nov 2021 16:39:42 +0800 Subject: [PATCH] fix: cannot resolve types defined in dts files fix #42 --- example/src/global.d.ts | 1 + example/src/index.ts | 2 + package.json | 2 +- src/plugin.ts | 1 + yarn.lock | 140 ++++++++++++++++++++-------------------- 5 files changed, 75 insertions(+), 71 deletions(-) create mode 100644 example/src/global.d.ts diff --git a/example/src/global.d.ts b/example/src/global.d.ts new file mode 100644 index 0000000..6c55104 --- /dev/null +++ b/example/src/global.d.ts @@ -0,0 +1 @@ +declare type GlobalType = string | number diff --git a/example/src/index.ts b/example/src/index.ts index 745d660..4d3e27f 100644 --- a/example/src/index.ts +++ b/example/src/index.ts @@ -28,3 +28,5 @@ export type { Component } from '@/components' export { BothScripts, JsTest, JsxLangTest, JsxTest, TsxLangTest, TsxTest, TypeProps } export default DefaultImport + +export const dtsTypeTest: GlobalType = 1 diff --git a/package.json b/package.json index 84606bc..a0f0a30 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "tsup": "^5.4.0", "typescript": "4.4.3", "vite": "^2.6.5", - "vue": "^3.2.20" + "vue": "^3.2.21" }, "engines": { "node": ">=12.0.0" diff --git a/src/plugin.ts b/src/plugin.ts index 398fa5f..40d0010 100644 --- a/src/plugin.ts +++ b/src/plugin.ts @@ -240,6 +240,7 @@ export function dtsPlugin(options: PluginOptions = {}): Plugin { ) if (dtsRE.test(file)) { + project.addSourceFileAtPath(file) sourceDtsFiles.add(file) } }) diff --git a/yarn.lock b/yarn.lock index 357feef..6be8320 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1306,115 +1306,115 @@ __metadata: languageName: node linkType: hard -"@vue/compiler-core@npm:3.2.20": - version: 3.2.20 - resolution: "@vue/compiler-core@npm:3.2.20" +"@vue/compiler-core@npm:3.2.21": + version: 3.2.21 + resolution: "@vue/compiler-core@npm:3.2.21" dependencies: "@babel/parser": ^7.15.0 - "@vue/shared": 3.2.20 + "@vue/shared": 3.2.21 estree-walker: ^2.0.2 source-map: ^0.6.1 - checksum: d90f9469e7e420d1b2527ce7c55853b98ad94595e9b6ff4b535048073e9777f6f750707d69fa64aa72b839e204471640db91e50c2ff7f079df4fd26c8447fb7f + checksum: 8fa2e02cfec836c6b5259a954beafaf558e0fdf6402feeb26a51fb2c7e06e512a24a59f19b6b4f972f1b587019fe156ff1a517bb1e6dd772925681396ed6d13c languageName: node linkType: hard -"@vue/compiler-dom@npm:3.2.20": - version: 3.2.20 - resolution: "@vue/compiler-dom@npm:3.2.20" +"@vue/compiler-dom@npm:3.2.21": + version: 3.2.21 + resolution: "@vue/compiler-dom@npm:3.2.21" dependencies: - "@vue/compiler-core": 3.2.20 - "@vue/shared": 3.2.20 - checksum: e587926a9c64af27b31824465514d011a4178629b3e4a4f46f2e9350ae686b534bea8f7bdcc93182235b6675cb33e3578075c30d7dfe529bb66669cec4bc6ab1 + "@vue/compiler-core": 3.2.21 + "@vue/shared": 3.2.21 + checksum: 7f0c71605d3b480cc1aa129c45ab0d34726fffa8e2095405b064a5a147ab3fb8198152c12afb2cdc836bdbb4e34ab9619fe0015c5e8f74d56b51f565ca57e742 languageName: node linkType: hard -"@vue/compiler-sfc@npm:3.2.20": - version: 3.2.20 - resolution: "@vue/compiler-sfc@npm:3.2.20" +"@vue/compiler-sfc@npm:3.2.21": + version: 3.2.21 + resolution: "@vue/compiler-sfc@npm:3.2.21" dependencies: "@babel/parser": ^7.15.0 - "@vue/compiler-core": 3.2.20 - "@vue/compiler-dom": 3.2.20 - "@vue/compiler-ssr": 3.2.20 - "@vue/ref-transform": 3.2.20 - "@vue/shared": 3.2.20 + "@vue/compiler-core": 3.2.21 + "@vue/compiler-dom": 3.2.21 + "@vue/compiler-ssr": 3.2.21 + "@vue/ref-transform": 3.2.21 + "@vue/shared": 3.2.21 estree-walker: ^2.0.2 magic-string: ^0.25.7 postcss: ^8.1.10 source-map: ^0.6.1 - checksum: 7cc19b19a83879260454cbd548a1229ead3b7dc4c76700714c3b1d9567e4e407beb5cee0a2e1c66a564016e79c6276b545af82dbe0c7923bc150880b0b7dd9a5 + checksum: b55f576330acec96f50325aff439be41dcf47f0e7ed8717f39111ddaef1aeeb58f9b0550e28580967e88226384f59ccacfbd20ad1ea7ed4f6f0b7e524be76324 languageName: node linkType: hard -"@vue/compiler-ssr@npm:3.2.20": - version: 3.2.20 - resolution: "@vue/compiler-ssr@npm:3.2.20" +"@vue/compiler-ssr@npm:3.2.21": + version: 3.2.21 + resolution: "@vue/compiler-ssr@npm:3.2.21" dependencies: - "@vue/compiler-dom": 3.2.20 - "@vue/shared": 3.2.20 - checksum: 01861c9222e11ca1a458006645d3fb55f539899566bdc85ccc464347fbeb75b8b27a876d328c53a317559bb0d7d9ad42230cebd150fa9937da62a7bf2c38527f + "@vue/compiler-dom": 3.2.21 + "@vue/shared": 3.2.21 + checksum: 9e7c1133ef8a05c94c28494e45c0ef16c0a5e88c1bc015c9555446d9eba759d0b33688772988afb196411b7e4dd9d45bacc1ac0c08078a9f392bc59dcb56314e languageName: node linkType: hard -"@vue/reactivity@npm:3.2.20": - version: 3.2.20 - resolution: "@vue/reactivity@npm:3.2.20" +"@vue/reactivity@npm:3.2.21": + version: 3.2.21 + resolution: "@vue/reactivity@npm:3.2.21" dependencies: - "@vue/shared": 3.2.20 - checksum: 12e29289a37263d75c8388677c1d4f1159cdb0debac38462d0fcdbd7e4478961912887c42c75ed67ecff94f617398d2fcb5c3ef466e435940c2e3d79fd9e19bf + "@vue/shared": 3.2.21 + checksum: a9347a2f86485364c0dbb82cc0e0b810fd6fb01dd08ff1b3f5ed2d7bb657cf55c04ffe990f03a3f6e44c26b4dcbaebd934182cdd9600338a2b6697049500ff21 languageName: node linkType: hard -"@vue/ref-transform@npm:3.2.20": - version: 3.2.20 - resolution: "@vue/ref-transform@npm:3.2.20" +"@vue/ref-transform@npm:3.2.21": + version: 3.2.21 + resolution: "@vue/ref-transform@npm:3.2.21" dependencies: "@babel/parser": ^7.15.0 - "@vue/compiler-core": 3.2.20 - "@vue/shared": 3.2.20 + "@vue/compiler-core": 3.2.21 + "@vue/shared": 3.2.21 estree-walker: ^2.0.2 magic-string: ^0.25.7 - checksum: f2dd004ace6cb2b47411a9285391a88b53e62f83355255ad7e68d8ee9f889a035383e89bd3fbcd0637812653b547618b4aed8baa8c9613ac71022f34d290d9f8 + checksum: d73605e845d95aea0e07dbefa4cbc7e3746b322c32dd0f10e55a3a5151d4fa1406318dc863b9544037f7ccdf3bf8ddc53c4c776e62f13a5e32fdad39ed2eb6d3 languageName: node linkType: hard -"@vue/runtime-core@npm:3.2.20": - version: 3.2.20 - resolution: "@vue/runtime-core@npm:3.2.20" +"@vue/runtime-core@npm:3.2.21": + version: 3.2.21 + resolution: "@vue/runtime-core@npm:3.2.21" dependencies: - "@vue/reactivity": 3.2.20 - "@vue/shared": 3.2.20 - checksum: 80865df7959f014ee3a41ea6709d39aa3cae5dc7b8fd19175a5ff34c16cf41fbadac15432987b79cd6269ac8cf747f0c89e9620e5623df1fc636235c2b27ff00 + "@vue/reactivity": 3.2.21 + "@vue/shared": 3.2.21 + checksum: fba39089dd82b5575da4eb9408e81548c3453c80fcdf3526d47360d4289683dd53427374d2527dec8c19c4d7dfd353f8b1ae5667fb115105aaa4e24005f781a8 languageName: node linkType: hard -"@vue/runtime-dom@npm:3.2.20": - version: 3.2.20 - resolution: "@vue/runtime-dom@npm:3.2.20" +"@vue/runtime-dom@npm:3.2.21": + version: 3.2.21 + resolution: "@vue/runtime-dom@npm:3.2.21" dependencies: - "@vue/runtime-core": 3.2.20 - "@vue/shared": 3.2.20 + "@vue/runtime-core": 3.2.21 + "@vue/shared": 3.2.21 csstype: ^2.6.8 - checksum: a4b0c6656a75a760d38bd0285efc0e5103fd765bdc633bca84a31607c426eddf869fa307388a6888c1e110771e2f9cadc80b4e073920784eff8a9d96f372f65e + checksum: 235845277fb70f002325e32b71c9431fe4f0c62c4c9105eefdbd5ba5508956f8d73f148c7ba1e34b55578f989302fa50a7a4b4e8e51c93c1a437232d32ae736c languageName: node linkType: hard -"@vue/server-renderer@npm:3.2.20": - version: 3.2.20 - resolution: "@vue/server-renderer@npm:3.2.20" +"@vue/server-renderer@npm:3.2.21": + version: 3.2.21 + resolution: "@vue/server-renderer@npm:3.2.21" dependencies: - "@vue/compiler-ssr": 3.2.20 - "@vue/shared": 3.2.20 + "@vue/compiler-ssr": 3.2.21 + "@vue/shared": 3.2.21 peerDependencies: - vue: 3.2.20 - checksum: baebafd9021242247ea36d66a3724e9e53f941156425f5ddb1876a41627bc65904d27de8c7e3a4a446e9cd0683839a7593ad768bc6cdf44158aedb29b7b52238 + vue: 3.2.21 + checksum: 504d79e4b32b9df2df0dd9331acffe77f3dd131040eeef77a80e19c4e72c82a7c01bc01699b72b13325425416e41d83938edf5b70de10d7f6bb97c2a146fb00f languageName: node linkType: hard -"@vue/shared@npm:3.2.20": - version: 3.2.20 - resolution: "@vue/shared@npm:3.2.20" - checksum: da6e59a40622b5be5300c51d83e0a9d8ae1f67315dbec86cfc809b89f8620c09a3c6222cae5d80df0fb986f92afc1b6345db4e7a9b1a079f5783d27a839fea7d +"@vue/shared@npm:3.2.21": + version: 3.2.21 + resolution: "@vue/shared@npm:3.2.21" + checksum: 78d3f08b8bb168437a2a66a416de8a3f91e4a15f0fc9def297bc11b6b15c8978005a56c310ebbc7af8f9fdae6b6929f2c291301a099e17ab1a4e43edf68a6f67 languageName: node linkType: hard @@ -7875,7 +7875,7 @@ typescript@4.4.3: tsup: ^5.4.0 typescript: 4.4.3 vite: ^2.6.5 - vue: ^3.2.20 + vue: ^3.2.21 peerDependencies: vite: ">=2.4.4" languageName: unknown @@ -7910,16 +7910,16 @@ typescript@4.4.3: languageName: node linkType: hard -"vue@npm:3.2.20, vue@npm:^3.2.20": - version: 3.2.20 - resolution: "vue@npm:3.2.20" +"vue@npm:3.2.21, vue@npm:^3.2.21": + version: 3.2.21 + resolution: "vue@npm:3.2.21" dependencies: - "@vue/compiler-dom": 3.2.20 - "@vue/compiler-sfc": 3.2.20 - "@vue/runtime-dom": 3.2.20 - "@vue/server-renderer": 3.2.20 - "@vue/shared": 3.2.20 - checksum: 25a289f230583f5e24c8ed105178df1b895717d5e5f4d68c4f0f7968909ca0040d751960f5957d9fbe5c1f00a5518dcda509fceee702960d9af756b3d6014a75 + "@vue/compiler-dom": 3.2.21 + "@vue/compiler-sfc": 3.2.21 + "@vue/runtime-dom": 3.2.21 + "@vue/server-renderer": 3.2.21 + "@vue/shared": 3.2.21 + checksum: 2c68558f22d784da10b324b914a8f9508cbd3212a003fccb8c17613a300da6929ce71236268c87ee15b64ad8d87db7299619313731496c0656d98d00b01a70b7 languageName: node linkType: hard