Skip to content
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

Jump to bottom

[bugfix] Ensured that normalizeFileExt ignores .css.d.ts files #1450

Merged
merged 3 commits into from
May 25, 2023
Merged

[bugfix] Ensured that normalizeFileExt ignores .css.d.ts files #1450

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9a89bb
refactor: Made an early exit
ijlee2 May 25, 2023
6d73777
bugfix: Ensured that normalizeFileExt doesn't change .css.d.ts files …
ijlee2 May 25, 2023
7d83eef
feedback: Used a negative lookbehind assertion so that we can have a …
ijlee2 May 25, 2023
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
2 changes: 1 addition & 1 deletion packages/addon-dev/src/rollup-public-entrypoints.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import minimatch from 'minimatch';
import type { Plugin } from 'rollup';

function normalizeFileExt(fileName: string) {
return fileName.replace(/\.ts|\.hbs|\.gts|\.gjs$/, '.js');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please check your use case and see if this implementation also solves it?

return fileName.replace(/(?<!\.d)\.ts|\.hbs|\.gts|\.gjs$/, '.js');

The idea here is "negative lookbehind assertions".

If this works, we can stick with only a single regex replace instead of nesting them.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, I checked that your solution works in ijlee2/embroider-css-modules#46.

return fileName.replace(/(?<!\.d)\.ts|\.hbs|\.gts|\.gjs$/, '.js');
}

export default function publicEntrypoints(args: {
Expand Down