diff --git a/src/core/ctx.ts b/src/core/ctx.ts index adc20d4..eb3faa4 100644 --- a/src/core/ctx.ts +++ b/src/core/ctx.ts @@ -112,7 +112,7 @@ ${dts}`.trim()}\n` originalDTS[key] = currentDTS[key] }) const dtsList = Object.keys(originalDTS).sort().map(k => ` ${k}: ${originalDTS[k]}`) - return currentContent.replace(dtsReg, `declare global {\n${dtsList.join('\n')}\n}`) + return currentContent.replace(dtsReg, () => `declare global {\n${dtsList.join('\n')}\n}`) } return currentContent @@ -166,13 +166,13 @@ ${dts}`.trim()}\n` async function scanDirs() { if (dirs?.length) { await unimport.modifyDynamicImports(async (imports) => { - const exports = await scanDirExports(dirs, { + const exports_ = await scanDirExports(dirs, { filePatterns: ['*.{tsx,jsx,ts,js,mjs,cjs,mts,cts}'], }) as ImportExtended[] - exports.forEach(i => i.__source = 'dir') + exports_.forEach(i => i.__source = 'dir') return modifyDefaultExportsAlias([ ...imports.filter((i: ImportExtended) => i.__source !== 'dir'), - ...exports, + ...exports_, ], options) }) } diff --git a/test/dts.increase.test.ts b/test/dts.increase.test.ts index b45dbb9..e2cc151 100644 --- a/test/dts.increase.test.ts +++ b/test/dts.increase.test.ts @@ -14,4 +14,5 @@ it('dts', async () => { const dtsContent = await ctx.generateDTS(dts) expect(dtsContent).toContain('AAA') expect(dtsContent).toContain('BBB') + expect(dtsContent).toContain('$$') }) diff --git a/test/tmp/dts.increase.d.ts b/test/tmp/dts.increase.d.ts index 9c2592e..043f35c 100644 --- a/test/tmp/dts.increase.d.ts +++ b/test/tmp/dts.increase.d.ts @@ -4,6 +4,8 @@ // Generated by unplugin-auto-import export {} declare global { + const $$: typeof import('vue/macros')['$$'] + const $: typeof import('vue/macros')['$'] const AAA: typeof import('xxx/es')['AAA'] const BBB: typeof import('xxx/es')['BBB'] }