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

Remove layer(utilities) if imports contain @utility #14738

Merged
merged 7 commits into from
Oct 21, 2024
Merged

Remove layer(utilities) if imports contain @utility #14738

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
36eb79d
remove `layer(utilities)` if imports contain `@utility`
RobinMalfait Oct 21, 2024
3daabed
add test
RobinMalfait Oct 21, 2024
ce9a9cb
fix existing test with new logic
RobinMalfait Oct 21, 2024
c5f0bca
fix typos
RobinMalfait Oct 21, 2024
02272ac
only look at the CSS tree if an import with `layer()` exists
RobinMalfait Oct 21, 2024
dcefc16
update changelog
RobinMalfait Oct 21, 2024
cf436c2
squish import between existing imports
RobinMalfait Oct 21, 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
5 changes: 5 additions & 0 deletions packages/@tailwindcss-upgrade/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ async function run() {

// Cleanup `@import "…" layer(utilities)`
for (let sheet of stylesheets) {
// If the `@import` contains an injected `layer(…)` we need to remove it
if (!Array.from(sheet.importRules).some((node) => node.raws.tailwind_injected_layer)) {
continue
}

Copy link
Contributor

Choose a reason for hiding this comment

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

I think you can also skip stylesheets with parent stylesheets yeah?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah wait not if the tailwind stuff is in a non-root stylesheet so maybe not.

let hasAtUtility = false

// Only remove the `layer(…)` next to the import, if any of the children
Expand Down