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.

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

className matching #282

Merged
merged 2 commits into from
Jan 20, 2021
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
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ module.exports = {
'unicorn/import-style': 0,
'unicorn/prefer-optional-catch-binding': 0,
'unicorn/no-null': 0,
'unicorn/prevent-abbreviations': 0,
},
overrides: [
{
Expand Down Expand Up @@ -94,4 +95,5 @@ module.exports = {
},
},
],
ignorePatterns: ['.eslintrc.js'],
}
2 changes: 0 additions & 2 deletions __fixtures__/!general.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
/* eslint-disable react/react-in-jsx-scope */
import tw from './macro'

/**
Expand Down
2 changes: 0 additions & 2 deletions __fixtures__/!imports.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
/* eslint-disable react/react-in-jsx-scope */
import tw, { theme, styled, css, GlobalStyles } from './macro'

const twPropertyTest = <div tw="text-purple-500" />
Expand Down
4 changes: 0 additions & 4 deletions __fixtures__/!namelessImport.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
/* eslint-disable import/no-unassigned-import */
/* eslint-disable react/react-in-jsx-scope */
/* eslint-disable react/jsx-curly-brace-presence */
import './macro'

const twPropertyString = <div tw="text-purple-500" />
Expand Down
1 change: 0 additions & 1 deletion __fixtures__/!plugins.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import tw from './macro'

// Tailwind plugin tests
Expand Down
2 changes: 0 additions & 2 deletions __fixtures__/!properties.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
/* eslint-disable react/react-in-jsx-scope */
import tw from './macro'

const Component1 = () => <div tw="uppercase" />
Expand Down
1 change: 0 additions & 1 deletion __fixtures__/!variantGrouping.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import tw from './macro'

const basic = tw`group-hover:(flex m-10)`
Expand Down
1 change: 0 additions & 1 deletion __fixtures__/!variants.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import tw from './macro'

// Before/after pseudo elements
Expand Down
8 changes: 8 additions & 0 deletions __fixtures__/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = {
rules: {
'@typescript-eslint/no-unused-vars': 'off',
'react/react-in-jsx-scope': 'off',
'import/no-unassigned-import': 'off',
'react/jsx-curly-brace-presence': 'off',
},
}
3 changes: 3 additions & 0 deletions __fixtures__/includeClassNames/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"includeClassNames": true
}
144 changes: 144 additions & 0 deletions __fixtures__/includeClassNames/includeClassNames.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
import tw from './macro'

const SkipEmptyClassName = <div className="" />
const OnlyUppercaseConverted = <div className="uppercase spare-class" />
const AllConverted = <div className="uppercase block" />
const SkippedCurlies = <div className={'mt-1'} />
const SkippedConditionals = <div className={true && 'mt-1'} />
const SkippedGroup = <div className="group" />

// css + className
const CssPropFirst = (
<div
css={`
color: red;
`}
className="block"
/>
)
const CssPropLast = (
<div
className="block"
css={`
color: red;
`}
/>
)

// tw + className
const TwPropFirst = <div tw="block" className="mt-1" />
const TwPropLast = <div className="mt-1" tw="block" />

// tw + css + className
const TwThenCssThenClassName = (
<div
tw="block"
css={`
color: red;
`}
className="mt-1"
/>
)
const TwThenClassNameThenCss_KNOWN_ORDER_ISSUE = (
<div
tw="block"
className="mt-1"
css={`
color: red;
`}
/>
)
const ClassNameThenTwThenCss_KNOWN_ORDER_ISSUE = (
<div
className="mt-1"
tw="block"
css={`
color: red;
`}
/>
)
const ClassNameThenCssThenTw = (
<div
className="mt-1"
css={`
color: red;
`}
tw="block"
/>
)
const CssThenClassNameThenTw_KNOWN_ORDER_ISSUE = (
<div
css={`
color: red;
`}
className="mt-1"
tw="block"
/>
)
const CssThenTwThenClassName = (
<div
css={`
color: red;
`}
tw="block"
className="mt-1"
/>
)

// styled + everything
const Button = tw.div``

const StyledTwThenCssThenClassName = (
<Button
tw="block"
css={`
color: red;
`}
className="mt-1"
/>
)
const StyledTwThenClassNameThenCss_KNOWN_ORDER_ISSUE = (
<Button
tw="block"
className="mt-1"
css={`
color: red;
`}
/>
)
const StyledClassNameThenTwThenCss_KNOWN_ORDER_ISSUE = (
<Button
className="mt-1"
tw="block"
css={`
color: red;
`}
/>
)
const StyledClassNameThenCssThenTw = (
<Button
className="mt-1"
css={`
color: red;
`}
tw="block"
/>
)
const StyledCssThenClassNameThenTw_KNOWN_ORDER_ISSUE = (
<Button
css={`
color: red;
`}
className="mt-1"
tw="block"
/>
)
const StyledCssThenTwThenClassName = (
<Button
css={`
color: red;
`}
tw="block"
className="mt-1"
/>
)
Loading