Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- _Experimental_: Improve codemod output, keep CSS after last Tailwind directive unlayered ([#14512](https://github.com/tailwindlabs/tailwindcss/pull/14512))
- _Experimental_: Fix incorrect empty `layer()` at the end of `@import` at-rules when running codemods ([#14513](https://github.com/tailwindlabs/tailwindcss/pull/14513))
- _Experimental_: Migrate `@import "tailwindcss/tailwind.css"` to `@import "tailwindcss"` ([#14514](https://github.com/tailwindlabs/tailwindcss/pull/14514))
- _Experimental_: Do not wrap comment nodes in `@layer` when running codemods ([#14517](https://github.com/tailwindlabs/tailwindcss/pull/14517))

## [4.0.0-alpha.25] - 2024-09-24

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,38 @@ it('should not migrate already migrated `@import` at-rules', async () => {
).toMatchInlineSnapshot(`"@import 'tailwindcss';"`)
})

it('should not wrap comments in a layer, if they are the only nodes', async () => {
expect(
await migrate(css`
@tailwind base;

/* BASE */

@tailwind components;

/* COMPONENTS */

@tailwind utilities;

/** UTILITIES */
/** - Another comment */
`),
).toMatchInlineSnapshot(`
"@tailwind base;

/* BASE */

@tailwind components;

/* COMPONENTS */

@tailwind utilities;

/** UTILITIES */
/** - Another comment */"
`)
})

it('should migrate rules between tailwind directives', async () => {
expect(
await migrate(css`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ export function migrateMissingLayers(): Plugin {

// Wrap each bucket in an `@layer` at-rule
for (let [layerName, nodes] of buckets) {
// Do not wrap comments in a layer, if they are the only nodes.
if (nodes.every((node) => node.type === 'comment')) {
continue
}

let target = nodes[0]
let layerNode = new AtRule({
name: 'layer',
Expand Down