这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: outExtension for generating dts files by rollup #1053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −9
Open

fix: outExtension for generating dts files by rollup #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 22 additions & 6 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import {
slash,
MaybePromise,
toObjectEntry,
defaultOutExtension,
} from './utils'
import { getAllDepsHash, loadTsupConfig } from './load'
import { getAllDepsHash, loadPkg, loadTsupConfig } from './load'
import glob from 'globby'
import { loadTsConfig } from 'bundle-require'
import { handleError, PrettyError } from './errors'
Expand Down Expand Up @@ -77,13 +78,15 @@ const normalizeOptions = async (
...optionsOverride,
}

const formats =
typeof _options.format === 'string'
? [_options.format as Format]
: _options.format || ['cjs']

const options: Partial<NormalizedOptions> = {
outDir: 'dist',
..._options,
format:
typeof _options.format === 'string'
? [_options.format as Format]
: _options.format || ['cjs'],
format: formats,
dts:
typeof _options.dts === 'boolean'
? _options.dts
Expand All @@ -107,6 +110,7 @@ const normalizeOptions = async (
}
: undefined,
}


setSilent(options.silent)

Expand Down Expand Up @@ -173,7 +177,19 @@ const normalizeOptions = async (
options.target = 'node16'
}

return options as NormalizedOptions
const normalizedOptions = options as NormalizedOptions

const pkg = await loadPkg(process.cwd())
const formatOutExtension = formats.map((format) => {
const exts = _options.outExtension?.({ format, options: normalizedOptions, pkgType: pkg.type });
return {
...defaultOutExtension({ format, pkgType: pkg.type }),
...(exts || {})
}
});
normalizedOptions.formatOutExtension = formatOutExtension;

return normalizedOptions
}

export async function build(_options: Options) {
Expand Down
2 changes: 2 additions & 0 deletions src/options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,4 +256,6 @@ export type NormalizedOptions = Omit<
tsconfigResolvePaths: Record<string, string[]>
tsconfigDecoratorMetadata?: boolean
format: Format[]
// OutExtensionObject array for each format
formatOutExtension: OutExtensionObject[]
}
6 changes: 3 additions & 3 deletions src/rollup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@ const getRollupConfig = async (
...(options.external || []),
],
},
outputConfig: options.format.map((format): OutputOptions => {
const outputExtension =
options.outExtension?.({ format, options, pkgType: pkg.type }).dts ||
outputConfig: options.format.map((format, i): OutputOptions => {
const outputExtension =
options.formatOutExtension?.[i]?.dts ||
defaultOutExtension({ format, pkgType: pkg.type }).dts
return {
dir: options.outDir || 'dist',
Expand Down