Skip to content

Add .gjs extension re-writing to addon.declarations when a project might be using gjs + gjs.d.ts #2583

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

Draft
NullVoxPopuli wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add .gjs extension re-writing to addon.declarations when a project might be using gjs + gjs.d.ts #2583

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
24 changes: 17 additions & 7 deletions packages/addon-dev/src/rollup-declarations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,22 @@ async function fixDeclarationsInMatchingFiles(dir: string) {
);
}

// Strip any .gts extension from imports in d.ts files, as these won't resolve. See https://github.com/typed-ember/glint/issues/628
// Once Glint v2 is available, this shouldn't be needed anymore.
// Strip any .gts extension from imports in d.ts files, as these won't resolve.
// See:
// - https://github.com/typed-ember/glint/issues/628
// - https://github.com/typed-ember/glint/pull/999/files
function fixDeclarations(content: string) {
return content
.replace(/from\s+'([^']+)\.gts'/g, `from '$1'`)
.replace(/from\s+"([^"]+)\.gts"/g, `from '$1'`)
.replace(/import\("([^"]+)\.gts"\)/g, `import('$1')`)
.replace(/import\('([^']+)\.gts'\)/g, `import('$1')`);
return (
content
.replace(/from\s+'([^']+)\.gts'/g, `from '$1'`)
.replace(/from\s+"([^"]+)\.gts"/g, `from '$1'`)
.replace(/import\("([^"]+)\.gts"\)/g, `import('$1')`)
.replace(/import\('([^']+)\.gts'\)/g, `import('$1')`)
// ts projects with mixed js (+ .d.ts)
// aka gts with gjs + .gjs.d.ts
.replace(/from\s+'([^']+)\.gjs'/g, `from '$1'`)
.replace(/from\s+"([^"]+)\.gjs"/g, `from '$1'`)
.replace(/import\("([^"]+)\.gjs"\)/g, `import('$1')`)
.replace(/import\('([^']+)\.gjs'\)/g, `import('$1')`)
);
}
Loading