Merge pull request #3 from erikras/prettier

Formatted with prettier

Author: erikras

README.md

@@ -6,6 +6,7 @@
 [![NPM Downloads](https://img.shields.io/npm/dm/styled-components-theme.svg?style=flat-square)](https://www.npmjs.com/package/styled-components-theme)
 [![Build Status](https://img.shields.io/travis/erikras/styled-components-theme/master.svg?style=flat-square)](https://travis-ci.org/erikras/styled-components-theme)
 [![codecov.io](https://codecov.io/github/erikras/styled-components-theme/coverage.svg?branch=master)](https://codecov.io/github/erikras/styled-components-theme?branch=master)
+[![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
 
 [`styled-components-theme`](https://github.com/erikras/styled-components-theme) generates 
 selectors for colors in your

package.json

@@ -14,6 +14,7 @@
     "build:lib": "babel src --out-dir lib",
     "build:umd": "cross-env NODE_ENV=development webpack src/index.js dist/styled-components-theme.js",
     "build:umd:min": "cross-env NODE_ENV=production webpack src/index.js dist/styled-components-theme.min.js",
+    "format": "prettier-eslint \"src/**/*.js\" --write --no-semi --single-quote --trailingComma=none",
     "clean": "rimraf dist lib",
     "lint": "eslint src",
     "prepublish": "npm run test && npm run lint && npm run clean && npm run build",
@@ -54,6 +55,8 @@
     "mocha": "^3.4.2",
     "mocha-lcov-reporter": "^1.3.0",
     "nyc": "^11.0.1",
+    "prettier": "^1.4.0",
+    "prettier-eslint-cli": "^4.0.2",
     "rimraf": "^2.6.1",
     "webpack": "^2.6.1"
   },

src/__tests__/index.spec.js

@@ -31,7 +31,11 @@ describe('makeTheme', () => {
     const lighterGray = graySelector.lighten(0.4)
     const darkerRed = redSelector.darken(0.1)
 
-    expect(lighterGray(themeFromProvider)).toBe(new Color(colors.gray).lighten(0.4).hex())
-    expect(darkerRed(themeFromProvider)).toBe(new Color(colors.red).darken(0.1).hex())
+    expect(lighterGray(themeFromProvider)).toBe(
+      new Color(colors.gray).lighten(0.4).hex()
+    )
+    expect(darkerRed(themeFromProvider)).toBe(
+      new Color(colors.red).darken(0.1).hex()
+    )
   })
 })

src/addModifier.js

@@ -5,7 +5,7 @@ import Color from 'color'
  * original function to get the color and then modifies that color, ultimately returning another
  * color string.
  */
-const addModifier = (fn, method, ...modifierArgs) =>
-  (...args) => new Color(fn(...args))[ method ](...modifierArgs).hex()
+const addModifier = (fn, method, ...modifierArgs) => (...args) =>
+  new Color(fn(...args))[method](...modifierArgs).hex()
 
 export default addModifier

src/colorMethods.js

@@ -1,20 +1,20 @@
 const colorMethods = [
-  'negate',     // rgb(0, 100, 255) -> rgb(255, 155, 0)
+  'negate', // rgb(0, 100, 255) -> rgb(255, 155, 0)
 
-  'lighten',    // hsl(100, 50%, 50%) -> hsl(100, 50%, 75%)
-  'darken',     // hsl(100, 50%, 50%) -> hsl(100, 50%, 25%)
+  'lighten', // hsl(100, 50%, 50%) -> hsl(100, 50%, 75%)
+  'darken', // hsl(100, 50%, 50%) -> hsl(100, 50%, 25%)
 
-  'saturate',   // hsl(100, 50%, 50%) -> hsl(100, 75%, 50%)
+  'saturate', // hsl(100, 50%, 50%) -> hsl(100, 75%, 50%)
   'desaturate', // hsl(100, 50%, 50%) -> hsl(100, 25%, 50%)
-  'greyscale',  // #5CBF54 -> #969696
+  'greyscale', // #5CBF54 -> #969696
 
-  'whiten',     // hwb(100, 50%, 50%) -> hwb(100, 75%, 50%)
-  'blacken',    // hwb(100, 50%, 50%) -> hwb(100, 50%, 75%)
+  'whiten', // hwb(100, 50%, 50%) -> hwb(100, 75%, 50%)
+  'blacken', // hwb(100, 50%, 50%) -> hwb(100, 50%, 75%)
 
-  'clearer',    // rgba(10, 10, 10, 0.8) -> rgba(10, 10, 10, 0.4)
-  'opaquer',    // rgba(10, 10, 10, 0.8) -> rgba(10, 10, 10, 1.0)
+  'clearer', // rgba(10, 10, 10, 0.8) -> rgba(10, 10, 10, 0.4)
+  'opaquer', // rgba(10, 10, 10, 0.8) -> rgba(10, 10, 10, 1.0)
 
-  'rotate'      // hsl(60, 20%, 20%) -> hsl(330, 20%, 20%)
+  'rotate' // hsl(60, 20%, 20%) -> hsl(330, 20%, 20%)
 ]
 
 export default colorMethods

src/decorateSelector.js

@@ -8,7 +8,8 @@ import addModifier from './addModifier'
 const decorateSelector = selector => {
   // add member functions to our selector
   colorMethods.forEach(method => {
-    selector[method] = (...args) => decorateSelector(addModifier(selector, method, ...args))
+    selector[method] = (...args) =>
+      decorateSelector(addModifier(selector, method, ...args))
   })
   return selector
 }

src/index.js

@@ -6,8 +6,6 @@ const makeTheme = (...colors) =>
     return result
   }, {})
 
-export {
-  makeThemeColor
-}
+export { makeThemeColor }
 
 export default makeTheme

src/makeThemeColor.js

@@ -1,6 +1,5 @@
 import decorateSelector from './decorateSelector'
 
-const makeThemeColor = key =>
-  decorateSelector(props => props.theme[key])
+const makeThemeColor = key => decorateSelector(props => props.theme[key])
 
 export default makeThemeColor