Skip to content

Fix scanning classes delimited by tab characters #15169

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 8 commits into from
Nov 26, 2024
Merged

Fix scanning classes delimited by tab characters #15169

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7debe3c
format parser
RobinMalfait Nov 25, 2024
580977b
add failing integration test
RobinMalfait Nov 25, 2024
150bde0
add failing test
RobinMalfait Nov 25, 2024
74dcd3b
skip all whitespace
RobinMalfait Nov 25, 2024
c3e044e
update changelog
RobinMalfait Nov 25, 2024
9329d57
add dedicated tests with different whitespace (none, spaces, tabs and…
RobinMalfait Nov 25, 2024
3177231
improve reproduction integration tests
RobinMalfait Nov 25, 2024
7ec2bf8
drop integration tests
RobinMalfait Nov 26, 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
improve reproduction integration tests
  • Loading branch information
@RobinMalfait
RobinMalfait committed Nov 26, 2024
commit 31772318700f080a6567b2dc7959875b83cadaec
75 changes: 75 additions & 0 deletions integrations/cli/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,3 +992,78 @@ test(
`)
},
)

test(
'https://github.com/tailwindlabs/tailwindcss/issues/15148',
{
fs: {
'package.json': json`
{
"type": "module",
"dependencies": {
"tailwindcss": "workspace:^",
"@tailwindcss/cli": "workspace:^"
}
}
`,
'index.css': css`
@import 'tailwindcss';
@utility test-a {
color: red;
}
@utility test-b {
color: green;
}
@utility test-c {
color: blue;
}
@utility test-d {
color: tomato;
}
`,
'app.js': js`
const classes = [
'test-a',
'test-b',
'test-c',
'test-d',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
'multiple-entries-to-keep-newlines',
]
`
// The original test case used Svelte, Vite, etc… The issue is caused by
// the fact that output from the compiler is what is/was scanned by Oxide.
// The Svelte compiler uses tabs for indents instead of spaces which was
// the actual cause of the bug. It could be reproduced in the CLI just by
// using tabs
.replace(/\[[\s\S]*\]/gm, (m) => m.replace(/\s+/g, '\t')),
},
},
async ({ fs, exec }) => {
await exec('pnpm tailwindcss --input index.css --output dist/out.css')

let files = await fs.glob('dist/**/*.css')
expect(files).toHaveLength(1)

await fs.expectFileToContain(files[0][0], [
candidate`test-a`,
candidate`test-b`,
candidate`test-c`,
candidate`test-d`,
])
},
)
23 changes: 7 additions & 16 deletions integrations/vite/svelte.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'vitest'
import { candidate, css, html, js, json, retryAssertion, test, ts } from '../utils'
import { candidate, css, html, json, retryAssertion, test, ts } from '../utils'

test(
'production build',
Expand Down Expand Up @@ -253,6 +253,9 @@ test(
},
)

// Context: when using `svelte()` before `tailwindcss()` it means that
// `tailwindcss()` sees the contents after the svelte compiler ran. The svelte
// compiler outputs tabs instead of spaces which we didn't handle correctly.
test(
'https://github.com/tailwindlabs/tailwindcss/issues/15148',
{
Expand All @@ -275,22 +278,13 @@ test(
'vite.config.ts': ts`
import { defineConfig } from 'vite'
import tailwindcss from '@tailwindcss/vite'
import { svelte } from '@sveltejs/vite-plugin-svelte'
import { svelte, vitePreprocess } from '@sveltejs/vite-plugin-svelte'

// https://vite.dev/config/
export default defineConfig({
plugins: [svelte(), tailwindcss()],
plugins: [svelte({ preprocess: [vitePreprocess()] }), tailwindcss()],
})
`,
'svelte.config.js': js`
import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'

export default {
// Consult https://svelte.dev/docs#compile-time-svelte-preprocess
// for more information about preprocessors
preprocess: vitePreprocess(),
}
`,
'index.html': html`
<!doctype html>
<html>
Expand Down Expand Up @@ -355,10 +349,7 @@ test(
{#each classes as cls}
<div class="{cls}"></div>
{/each}
`

// Replace all spaces with tabs
.replace(/\[[\s\S]*\]/gm, (m) => m.replace(/[ ]+/g, '\t')),
`,
},
},
async ({ fs, exec }) => {
Expand Down