diff --git a/next-packages/styled/__tests__/styled.js b/next-packages/styled/__tests__/styled.js index b89ff9d78..0611be58f 100644 --- a/next-packages/styled/__tests__/styled.js +++ b/next-packages/styled/__tests__/styled.js @@ -178,7 +178,7 @@ describe('styled', () => { ` const H2 = styled(H1)` - font-size: ${fontSize * 2 / 3 + 'px'}; + font-size: ${(fontSize * 2) / 3 + 'px'}; ` const tree = renderer diff --git a/package.json b/package.json index 7fd4736b2..966a4e0dd 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "polished": "^1.2.1", "preact": "^8.2.9", "preact-render-to-json": "^3.6.6", - "prettier": "1.10.2", + "prettier": "1.14.3", "raf": "^3.4.0", "react": "^16.3.2", "react-dom": "^16.3.2", diff --git a/packages/babel-plugin-emotion/src/macro-styled.js b/packages/babel-plugin-emotion/src/macro-styled.js index 9525adf40..414dad7e7 100644 --- a/packages/babel-plugin-emotion/src/macro-styled.js +++ b/packages/babel-plugin-emotion/src/macro-styled.js @@ -10,7 +10,11 @@ import { createMacro } from 'babel-plugin-macros' export default createMacro(macro) function macro(options) { - const { references, state, babel: { types: t } } = options + const { + references, + state, + babel: { types: t } + } = options let referencesWithoutDefault = references if (references.default) { referencesWithoutDefault = omit(references, key => key !== 'default') diff --git a/packages/babel-plugin-emotion/test/macro/react.test.js b/packages/babel-plugin-emotion/test/macro/react.test.js index 3b9de09db..84cae6348 100644 --- a/packages/babel-plugin-emotion/test/macro/react.test.js +++ b/packages/babel-plugin-emotion/test/macro/react.test.js @@ -225,7 +225,7 @@ describe('styled', () => { ` const H2 = styled(H1)` - font-size: ${fontSize * 2 / 3 + 'px'}; + font-size: ${(fontSize * 2) / 3 + 'px'}; ` const tree = renderer diff --git a/packages/create-emotion-server/src/stream.js b/packages/create-emotion-server/src/stream.js index 4bc282546..ef007b9d8 100644 --- a/packages/create-emotion-server/src/stream.js +++ b/packages/create-emotion-server/src/stream.js @@ -56,7 +56,10 @@ const createRenderStylesToNodeStream = ( } ) - return pipe(tokenStream, inlineStream) + return pipe( + tokenStream, + inlineStream + ) } export default createRenderStylesToNodeStream diff --git a/packages/create-emotion/test/styled.test.js b/packages/create-emotion/test/styled.test.js index fb0c10542..d52dbd329 100644 --- a/packages/create-emotion/test/styled.test.js +++ b/packages/create-emotion/test/styled.test.js @@ -229,7 +229,7 @@ describe('styled', () => { ` const H2 = styled(H1)` - font-size: ${fontSize * 2 / 3 + 'px'}; + font-size: ${(fontSize * 2) / 3 + 'px'}; ` const tree = renderer diff --git a/packages/emotion-server/test/util.js b/packages/emotion-server/test/util.js index a19362a8f..4c0cf16be 100644 --- a/packages/emotion-server/test/util.js +++ b/packages/emotion-server/test/util.js @@ -123,7 +123,7 @@ export const createBigComponent = ({ injectGlobal, css }: Emotion) => { className={css({ color: '#' + - Math.round(1 / count * maxColors) + Math.round((1 / count) * maxColors) .toString(16) .padStart(6, '0') })} diff --git a/packages/react-emotion/test/index.test.js b/packages/react-emotion/test/index.test.js index fc4a39b9e..ff50d195d 100644 --- a/packages/react-emotion/test/index.test.js +++ b/packages/react-emotion/test/index.test.js @@ -223,7 +223,7 @@ describe('styled', () => { ` const H2 = styled(H1)` - font-size: ${fontSize * 2 / 3 + 'px'}; + font-size: ${(fontSize * 2) / 3 + 'px'}; ` const tree = renderer diff --git a/scripts/benchmarks/src/app/App.js b/scripts/benchmarks/src/app/App.js index 12cb65fe5..f5a953535 100644 --- a/scripts/benchmarks/src/app/App.js +++ b/scripts/benchmarks/src/app/App.js @@ -118,7 +118,9 @@ export default class App extends Component<{}> { - {results.map((result, i) => )} + {results.map((result, i) => ( + + ))} {status === 'running' ? ( { createElement( 'svg', { - style: StyleSheet.compose(styles.root, props.style), + style: StyleSheet.compose( + styles.root, + props.style + ), width: 24, height: 24, viewBox: '0 0 24 24' diff --git a/scripts/benchmarks/src/cases/SierpinskiTriangle.js b/scripts/benchmarks/src/cases/SierpinskiTriangle.js index d77d33023..25cf09ab1 100644 --- a/scripts/benchmarks/src/cases/SierpinskiTriangle.js +++ b/scripts/benchmarks/src/cases/SierpinskiTriangle.js @@ -49,7 +49,7 @@ class SierpinskiTriangle extends React.Component { } // introduce randomness to ensure that repeated runs don't produce the same colors - const color = fn(renderCount * Math.random() / 20) + const color = fn((renderCount * Math.random()) / 20) return ( - {depth === 0 && } + {depth === 0 && } {depth !== 0 && Array.from({ length: breadth }).map((el, i) => ( { let { Provider } = React.createContext(defaultContext) render(
- some contentthis is the actual value!!
} /> + some content + this is the actual value!!} /> ) expect(document.documentElement).toMatchSnapshot() diff --git a/site/src/pages/community.js b/site/src/pages/community.js index ae162c705..f0c8ebf0d 100644 --- a/site/src/pages/community.js +++ b/site/src/pages/community.js @@ -30,7 +30,8 @@ const Community = (props: *) => ( This list comes from{' '} awesome-emotion - . Anything added to that that list will appear here automatically. + + . Anything added to that that list will appear here automatically. Thanks! diff --git a/yarn.lock b/yarn.lock index 28fcf2d84..c563246c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14173,9 +14173,9 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@1.10.2: - version "1.10.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93" +prettier@1.14.3: + version "1.14.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.3.tgz#90238dd4c0684b7edce5f83b0fb7328e48bd0895" pretty-bytes@^4.0.2: version "4.0.2"