Skip to content

Commit

Permalink
Merge branch 'master' into renamed-nowrap
Browse files Browse the repository at this point in the history
  • Loading branch information
ben-rogerson committed Nov 25, 2020
2 parents ecff94f + 6f020aa commit 05176b9
Show file tree
Hide file tree
Showing 56 changed files with 12,765 additions and 7,605 deletions.
6 changes: 6 additions & 0 deletions .eslintrc.js
Expand Up @@ -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,
Expand All @@ -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: [
{
Expand Down
18 changes: 9 additions & 9 deletions README.md
Expand Up @@ -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)   [👩‍🎤 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)   [👩‍🎤 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)   [🥜 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)   [🥜 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)   [👩‍🎤 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)   [👩‍🎤 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)   [👩‍🎤 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)   [👩‍🎤 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)   [👩‍🎤 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)   [👩‍🎤 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)   [👩‍🎤 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)   [👩‍🎤 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

Expand Down
1 change: 0 additions & 1 deletion __fixtures__/!custom.js
Expand Up @@ -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`
2 changes: 1 addition & 1 deletion __fixtures__/!ordering.js
Expand Up @@ -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`
8 changes: 0 additions & 8 deletions __fixtures__/animation.js

This file was deleted.

0 comments on commit 05176b9

Please sign in to comment.