Skip to content

CSS codemod: inject @import in a more expected location #14536

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
RobinMalfait merged 11 commits into from
Sep 30, 2024
Merged

CSS codemod: inject @import in a more expected location #14536

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ac5b8d4
add failing test
RobinMalfait Sep 27, 2024
42c0f1e
ensure we inject the `@import` into a more sensible location
RobinMalfait Sep 27, 2024
2b8bdcb
update changelog
RobinMalfait Sep 27, 2024
00b0cee
cleanup changelog
RobinMalfait Sep 27, 2024
5f9943a
ensure code _before_ `@tailwind` directives end up in an `@layer`
RobinMalfait Sep 27, 2024
2126c38
add additional test to verify that we don't inject unnecessary `@layer`s
RobinMalfait Sep 27, 2024
a7e7b0f
add note why there is no wrapping `@layer`
RobinMalfait Sep 30, 2024
a90e5c5
add additional test
RobinMalfait Sep 30, 2024
67ae8b4
add check that allows `@charset` and `@layer foo, bar;` at the top
RobinMalfait Sep 30, 2024
866fefb
remove unnecessary `@tailwind components`
RobinMalfait Sep 30, 2024
1c2d678
Update packages/@tailwindcss-upgrade/src/codemods/migrate-missing-lay…
RobinMalfait Sep 30, 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
Prev Previous commit
Next Next commit
add note why there is no wrapping @layer
  • Loading branch information
@RobinMalfait
RobinMalfait committed Sep 30, 2024
commit a7e7b0f404a78434fe0f7126fab582ee0ef48149
26 changes: 15 additions & 11 deletions packages/@tailwindcss-upgrade/src/codemods/migrate-tailwind-directives.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,20 +76,24 @@ it('should migrate the default @tailwind directives to a single import in a vali
@tailwind components;
@tailwind utilities;
`),
).toEqual(css`
@charset "UTF-8";
@layer foo, bar, baz;
)
// NOTE: The `html {}` is not wrapped in a `@layer` directive, because that
// is handled by another migration step. See ../index.test.ts for a
// dedicated test.
.toEqual(css`
@charset "UTF-8";
@layer foo, bar, baz;

/**!
* License header
*/
/**!
* License header
*/

@import 'tailwindcss';
@import 'tailwindcss';

html {
color: red;
}
`)
html {
color: red;
}
`)
})

it('should migrate the default @tailwind directives as imports to a single import in a valid location', async () => {
Expand Down