Merge branch 'master' into renamed-nowrap

ben-rogerson · Nov 25, 2020 · 05176b9 · 05176b9
2 parents ecff94f + 6f020aa
commit 05176b9
Show file tree

Hide file tree

Showing 56 changed files with 12,765 additions and 7,605 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -38,6 +38,8 @@ module.exports = {
     '@typescript-eslint/restrict-template-expressions': 0,
     '@typescript-eslint/default-param-last': 0,
     '@typescript-eslint/prefer-optional-chain': 0,
+    '@typescript-eslint/explicit-module-boundary-types': 0,
+    '@typescript-eslint/no-var-requires': 0,
     'react/prop-types': 0,
     'jest/prefer-expect-assertions': 0,
     'capitalized-comments': 0,
@@ -61,6 +63,10 @@ module.exports = {
       },
     ],
     'unicorn/prefer-type-error': 0,
+    'unicorn/no-reduce': 0,
+    'unicorn/import-style': 0,
+    'unicorn/prefer-optional-catch-binding': 0,
+    'unicorn/no-null': 0,
   },
   overrides: [
     {

diff --git a/README.md b/README.md
@@ -178,39 +178,39 @@ Take a look at these examples to get started:
 
 #### React
 
-[💅 Styled Components](https://github.com/ben-rogerson/twin.examples/tree/master/react-styled-components) &nbsp; [👩‍🎤 Emotion](https://github.com/ben-rogerson/twin.examples/tree/master/react-emotion)
+[💅 styled-components](https://github.com/ben-rogerson/twin.examples/tree/master/react-styled-components) &nbsp; [👩‍🎤 emotion](https://github.com/ben-rogerson/twin.examples/tree/master/react-emotion)
 
 #### Preact
 
-[💅 Styled Components](https://github.com/ben-rogerson/twin.examples/tree/master/preact-styled-components) &nbsp; [🥜 Goober](https://github.com/ben-rogerson/twin.examples/tree/master/preact-goober)
+[💅 styled-components](https://github.com/ben-rogerson/twin.examples/tree/master/preact-styled-components) &nbsp; [🥜 goober](https://github.com/ben-rogerson/twin.examples/tree/master/preact-goober)
 
 #### Create React App
 
-[💅 Styled Components](https://github.com/ben-rogerson/twin.examples/tree/master/cra-styled-components) &nbsp; [👩‍🎤 Emotion](https://github.com/ben-rogerson/twin.examples/tree/master/cra-emotion)
+[💅 styled-components](https://github.com/ben-rogerson/twin.examples/tree/master/cra-styled-components) &nbsp; [👩‍🎤 emotion](https://github.com/ben-rogerson/twin.examples/tree/master/cra-emotion)
 
 #### Gatsby
 
-[💅 Styled Components](https://github.com/ben-rogerson/twin.examples/tree/master/gatsby-styled-components) &nbsp; [👩‍🎤 Emotion](https://github.com/ben-rogerson/twin.examples/tree/master/gatsby-emotion)
+[💅 styled-components](https://github.com/ben-rogerson/twin.examples/tree/master/gatsby-styled-components) &nbsp; [👩‍🎤 emotion](https://github.com/ben-rogerson/twin.examples/tree/master/gatsby-emotion)
 
 #### Next.js
 
-[💅 Styled Components](https://github.com/ben-rogerson/twin.examples/tree/master/next-styled-components) &nbsp; [👩‍🎤 Emotion](https://github.com/ben-rogerson/twin.examples/tree/master/next-emotion)
+[💅 styled-components](https://github.com/ben-rogerson/twin.examples/tree/master/next-styled-components) &nbsp; [👩‍🎤 emotion](https://github.com/ben-rogerson/twin.examples/tree/master/next-emotion)
 
 #### Snowpack
 
-[💅 Styled Components](https://github.com/ben-rogerson/twin.examples/tree/master/snowpack-react-styled-components) &nbsp; [👩‍🎤 Emotion](https://github.com/ben-rogerson/twin.examples/tree/master/snowpack-react-emotion)
+[💅 styled-components](https://github.com/ben-rogerson/twin.examples/tree/master/snowpack-react-styled-components) &nbsp; [👩‍🎤 emotion](https://github.com/ben-rogerson/twin.examples/tree/master/snowpack-react-emotion)
 
 #### Storybook
 
-[👩‍🎤 Emotion](https://github.com/ben-rogerson/twin.examples/tree/master/storybook-emotion)
+[👩‍🎤 emotion](https://github.com/ben-rogerson/twin.examples/tree/master/storybook-emotion)
 
 #### Laravel
 
-[💅 Styled Components](https://github.com/ben-rogerson/twin.examples/tree/master/laravel-styled-components-typescript)
+[💅 styled-components](https://github.com/ben-rogerson/twin.examples/tree/master/laravel-styled-components-typescript)
 
 #### Vue
 
-[👩‍🎤 Emotion](https://github.com/ben-rogerson/twin.examples/tree/master/vue-emotion) (Experimental)
+[👩‍🎤 emotion](https://github.com/ben-rogerson/twin.examples/tree/master/vue-emotion) (Experimental)
 
 ## Plugins
 

diff --git a/__fixtures__/!custom.js b/__fixtures__/!custom.js
@@ -14,5 +14,4 @@ tw`group-focus:bg-red-500`
 tw`group-active:bg-red-500`
 tw`group-visited:bg-red-500`
 
-tw`clearfix`
 tw`stroke-non-scaling`
diff --git a/__fixtures__/!ordering.js b/__fixtures__/!ordering.js
@@ -2,4 +2,4 @@ import tw from './macro'
 
 // This tests the screens end up in the order they are defined in the config
 
-tw.div`xl:bg-red-500 lg:bg-blue-500 bg-green-500 fill-current md:bg-pink-500 sm:bg-orange-500 sm:text-yellow-500 hidden`
+tw.div`xl:bg-red-500 lg:bg-blue-500 bg-green-500 fill-current md:bg-pink-500 sm:bg-green-500 sm:text-yellow-500 hidden`
diff --git a/__fixtures__/animation.js b/__fixtures__/animation.js