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

Fix parallel variant ordering clash #9282

Merged
merged 23 commits into from
Sep 9, 2022
Merged

Fix parallel variant ordering clash #9282

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
862e2de
Remove remnants of the user layer
thecrypticace Sep 6, 2022
6c5b603
Rewrite sort offset generation
thecrypticace Sep 6, 2022
db71de7
wip
thecrypticace Sep 6, 2022
ad1e5be
wip
thecrypticace Sep 7, 2022
6c8cf5e
Handle parasite utilities
thecrypticace Sep 7, 2022
5166fd3
wip
thecrypticace Sep 7, 2022
a9ffcac
wip
thecrypticace Sep 7, 2022
610aad9
Make parallel variants sorting more resillient
thecrypticace Sep 7, 2022
2c92061
fix
thecrypticace Sep 7, 2022
1e16d90
remove todo
thecrypticace Sep 7, 2022
4f5aa4e
Simplify getClassOrder usage
thecrypticace Sep 7, 2022
c908d29
Simplify
thecrypticace Sep 7, 2022
3b52e9e
Add parasite utility for `dark`
thecrypticace Sep 7, 2022
99e42e4
Cleanup
thecrypticace Sep 7, 2022
2d2b7bf
Cleanup
thecrypticace Sep 7, 2022
01f76d5
Simplify
thecrypticace Sep 7, 2022
04cc215
format files
RobinMalfait Sep 9, 2022
bed2b35
Fix prettier plugin to use git build of Tailwind CSS
thecrypticace Sep 9, 2022
e3a6da3
Fix prettier error
thecrypticace Sep 9, 2022
7c121a5
wip
thecrypticace Sep 9, 2022
d965f20
fix test
thecrypticace Sep 9, 2022
8579ff4
Update changelog
thecrypticace Sep 9, 2022
bf2b1c4
Merge branch 'master' into fix/parallel-variant-ordering-clash
thecrypticace Sep 9, 2022
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 tests/arbitrary-variants.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ test('variants without & or an at-rule are ignored', () => {

test('arbitrary variants are sorted after other variants', () => {
let config = {
content: [{ raw: html`<div class="[&>*]:underline underline lg:underline"></div>` }],
content: [{ raw: html`<div class="underline lg:underline [&>*]:underline"></div>` }],
Copy link
Member

Choose a reason for hiding this comment

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

I had an error in my terminal and fixed it and now GitHub Actions is complaining and I'm pretty sure the new code is the correct code. 🤔

corePlugins: { preflight: false },
}

Expand Down
2 changes: 1 addition & 1 deletion tests/prefers-contrast.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { run, html, css, defaults } from './util/run'
it('should be possible to use contrast-more and contrast-less variants', () => {
let config = {
content: [
{ raw: html`<div class="contrast-more:bg-pink-500 contrast-less:bg-black bg-white"></div>` },
{ raw: html`<div class="bg-white contrast-more:bg-pink-500 contrast-less:bg-black"></div>` },
],
corePlugins: { preflight: false },
}
Expand Down