Skip to content

fix: generate stub types of with explicit extension import if pkg type is module #371

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

Merged
pi0 merged 3 commits into from
Jun 4, 2024
Merged

fix: generate stub types of with explicit extension import if pkg type is module #371

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22f8ac8
fix: d.ts should import files with '.js' extension in ESM package
yshrsmz Feb 24, 2024
5403eda
Merge branch 'main' into pr/yshrsmz/371
pi0 Jun 4, 2024
fe51c11
lint
pi0 Jun 4, 2024
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
12 changes: 8 additions & 4 deletions src/builder/rollup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,17 @@ export async function rollupBuild(ctx: BuildContext) {
entry.name!,
);

const isESM = ctx.pkg.type === "module";
const resolvedEntry = normalize(
tryResolve(entry.input, ctx.options.rootDir) || entry.input,
);
const resolvedEntryWithoutExt = resolvedEntry.slice(
0,
Math.max(0, resolvedEntry.length - extname(resolvedEntry).length),
);
const resolvedEntryForTypeImport = isESM
? `${resolvedEntry.replace(/(\.m?)(ts)$/, "$1js")}`
: resolvedEntryWithoutExt;
const code = await fsp.readFile(resolvedEntry, "utf8");
const shebang = getShebang(code);

Expand All @@ -85,7 +89,7 @@ export async function rollupBuild(ctx: BuildContext) {
`const _jiti = jiti(null, ${serializedJitiOptions})`,
"",
`/** @type {import(${JSON.stringify(
resolvedEntryWithoutExt,
resolvedEntryForTypeImport,
)})} */`,
`module.exports = _jiti(${JSON.stringify(resolvedEntry)})`,
].join("\n"),
Expand Down Expand Up @@ -114,7 +118,7 @@ export async function rollupBuild(ctx: BuildContext) {
"",
`const _jiti = jiti(null, ${serializedJitiOptions})`,
"",
`/** @type {import(${JSON.stringify(resolvedEntryWithoutExt)})} */`,
`/** @type {import(${JSON.stringify(resolvedEntryForTypeImport)})} */`,
`const _module = await _jiti.import(${JSON.stringify(
resolvedEntry,
)});`,
Expand All @@ -129,10 +133,10 @@ export async function rollupBuild(ctx: BuildContext) {
await writeFile(
output + ".d.ts",
[
`export * from ${JSON.stringify(resolvedEntryWithoutExt)};`,
`export * from ${JSON.stringify(resolvedEntryForTypeImport)};`,
hasDefaultExport
? `export { default } from ${JSON.stringify(
resolvedEntryWithoutExt,
resolvedEntryForTypeImport,
)};`
: "",
].join("\n"),
Expand Down