Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion src/plugins/mkdist.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import type { LoaderFile } from '../block-loader/types'
import type { VueSFCTransformerFileLoader } from '../sfc-transformer'
import type { Loader } from '../types/mkdist'
import { resolve } from 'node:path'
import { readFileSync } from 'node:fs'
import { createRequire } from 'node:module'
import { join, resolve } from 'node:path'
import { scriptLoader } from '../block-loader/script'
import { styleLoader } from '../block-loader/style'
import { templateLoader } from '../block-loader/template'
Expand All @@ -19,6 +21,29 @@ function importEsbuild(): Promise<typeof import('esbuild')> | typeof import('esb
})()
}

let _isMkdistSupportDualVueDts: boolean | undefined
function isMkdistSupportDualVueDts(): boolean {
if (typeof _isMkdistSupportDualVueDts === 'boolean') {
return _isMkdistSupportDualVueDts
}
try {
const require = createRequire(import.meta.url)
const mkdistPath = require.resolve('mkdist').replace(/\\/g, '/')
const lastNodeModules = mkdistPath.lastIndexOf('/mkdist/')
const withoutDist = lastNodeModules !== -1 ? mkdistPath.slice(0, lastNodeModules) : mkdistPath
const packageJson = readFileSync(join(withoutDist, 'mkdist/package.json'), 'utf-8')
const { version = '0.0.0' } = JSON.parse(packageJson) as { version: string }
const [major = 0, minor = 0, patch = 0] = version.split('.').map(n => Number.parseInt(n))
const normalizedVersion = major * 1_000_000 + minor * 1_000 + patch

return !Number.isNaN(normalizedVersion) && normalizedVersion > 2_003_000
}
catch (error) {
console.error(`Error checking mkdist version: ${error}`)
return false
}
}

const vueSFCTransformer = defineVueSFCTransformer({
blockLoaders: {
template: templateLoader,
Expand Down Expand Up @@ -77,6 +102,15 @@ export const vueLoader: Loader = async (input, mkdistContext) => {
extension: '.js',
getContents: () => 'export default {}',
}))?.filter(f => f.declaration) || []
if (dts.length && isMkdistSupportDualVueDts()) {
dts.push({
contents: await input.getContents(),
path: input.path,
srcPath: input.srcPath,
extension: '.d.vue.ts',
declaration: true,
})
}

return [
{
Expand Down
23 changes: 22 additions & 1 deletion test/mkdist.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,15 @@ describe('transform typescript script setup', () => {
const msg = 1
</script>`

expect(await legacyDeclaration(src)).toMatchInlineSnapshot(`
"declare const _default: import("vue").DefineComponent<{
msg: string;
}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{
msg: string;
}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
export default _default;
"
`)
expect(await declaration(src)).toMatchInlineSnapshot(`
"declare const _default: import("vue").DefineComponent<{
msg: string;
Expand All @@ -245,6 +254,11 @@ describe('transform typescript script setup', () => {
`)

expect(await fixture(`<template><div /></template>`)).toMatchInlineSnapshot(`"<template><div /></template>"`)
expect(await legacyDeclaration(`<template><div /></template>`)).toMatchInlineSnapshot(`
"declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
export default _default;
"
`)
expect(await declaration(`<template><div /></template>`)).toMatchInlineSnapshot(`
"declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
export default _default;
Expand Down Expand Up @@ -424,11 +438,18 @@ describe('transform typescript script setup', () => {
return await readFile(join(tmpDir, 'dist/index.vue'), 'utf-8')
}

async function declaration(src: string): Promise<string | undefined> {
async function legacyDeclaration(src: string): Promise<string | undefined> {
await rm(tmpDir, { force: true, recursive: true })
await mkdir(join(tmpDir, 'src'), { recursive: true })
await writeFile(join(tmpDir, 'src/index.vue'), src)
await mkdist({ declaration: true, loaders: ['js', vueLoader], rootDir: tmpDir })
return await readFile(join(tmpDir, 'dist/index.vue.d.ts'), 'utf-8').catch(() => undefined)
}
async function declaration(src: string): Promise<string | undefined> {
await rm(tmpDir, { force: true, recursive: true })
await mkdir(join(tmpDir, 'src'), { recursive: true })
await writeFile(join(tmpDir, 'src/index.vue'), src)
await mkdist({ declaration: true, loaders: ['js', vueLoader], rootDir: tmpDir })
return await readFile(join(tmpDir, 'dist/index.d.vue.ts'), 'utf-8').catch(() => undefined)
}
})
Loading