From f0f375387e2cdb3df68a5a7e539ee4cd3477f979 Mon Sep 17 00:00:00 2001 From: Brian Vaughn Date: Thu, 23 Nov 2017 08:36:26 -0800 Subject: [PATCH] Changed trailing-commas to es5, moved example config to separate rc file --- .prettierrc.examples | 8 +++++ .../composing-components.js | 2 +- .../extracting-components-continued.js | 5 ++-- .../extracting-components.js | 5 ++-- .../rendering-a-component.js | 2 +- examples/es5-syntax-example.js | 2 +- examples/hello-world.js | 2 +- examples/introducing-jsx.js | 2 +- examples/reconciliation/index-used-as-key.js | 29 ++++++++++++------- .../reconciliation/no-index-used-as-key.js | 24 ++++++++------- examples/tutorial-expanded-version.js | 4 ++- package.json | 4 +-- 12 files changed, 56 insertions(+), 33 deletions(-) create mode 100644 .prettierrc.examples diff --git a/.prettierrc.examples b/.prettierrc.examples new file mode 100644 index 00000000..1d6941b2 --- /dev/null +++ b/.prettierrc.examples @@ -0,0 +1,8 @@ +{ + "bracketSpacing": false, + "jsxBracketSameLine": true, + "parser": "flow", + "printWidth": 40, + "singleQuote": true, + "trailingComma": "es5" +} \ No newline at end of file diff --git a/examples/components-and-props/composing-components.js b/examples/components-and-props/composing-components.js index 7b27a2a1..f81f7668 100644 --- a/examples/components-and-props/composing-components.js +++ b/examples/components-and-props/composing-components.js @@ -14,5 +14,5 @@ function App() { ReactDOM.render( , - document.getElementById('root'), + document.getElementById('root') ); diff --git a/examples/components-and-props/extracting-components-continued.js b/examples/components-and-props/extracting-components-continued.js index 22e2fb43..bcd08b85 100644 --- a/examples/components-and-props/extracting-components-continued.js +++ b/examples/components-and-props/extracting-components-continued.js @@ -39,7 +39,8 @@ function Comment(props) { const comment = { date: new Date(), - text: 'I hope you enjoy learning React!', + text: + 'I hope you enjoy learning React!', author: { name: 'Hello Kitty', avatarUrl: @@ -52,5 +53,5 @@ ReactDOM.render( text={comment.text} author={comment.author} />, - document.getElementById('root'), + document.getElementById('root') ); diff --git a/examples/components-and-props/extracting-components.js b/examples/components-and-props/extracting-components.js index 63ce9671..1ad153c3 100644 --- a/examples/components-and-props/extracting-components.js +++ b/examples/components-and-props/extracting-components.js @@ -27,7 +27,8 @@ function Comment(props) { const comment = { date: new Date(), - text: 'I hope you enjoy learning React!', + text: + 'I hope you enjoy learning React!', author: { name: 'Hello Kitty', avatarUrl: @@ -40,5 +41,5 @@ ReactDOM.render( text={comment.text} author={comment.author} />, - document.getElementById('root'), + document.getElementById('root') ); diff --git a/examples/components-and-props/rendering-a-component.js b/examples/components-and-props/rendering-a-component.js index 9ca3c560..5458b516 100644 --- a/examples/components-and-props/rendering-a-component.js +++ b/examples/components-and-props/rendering-a-component.js @@ -5,5 +5,5 @@ function Welcome(props) { const element = ; ReactDOM.render( element, - document.getElementById('root'), + document.getElementById('root') ); diff --git a/examples/es5-syntax-example.js b/examples/es5-syntax-example.js index 20723ce5..122f7c39 100644 --- a/examples/es5-syntax-example.js +++ b/examples/es5-syntax-example.js @@ -1,5 +1,5 @@ const element =

Hello, world!

; const container = document.getElementById( - 'root', + 'root' ); ReactDOM.render(element, container); diff --git a/examples/hello-world.js b/examples/hello-world.js index 3a40a142..d0f87a59 100644 --- a/examples/hello-world.js +++ b/examples/hello-world.js @@ -1,4 +1,4 @@ ReactDOM.render(

Hello, world!

, - document.getElementById('root'), + document.getElementById('root') ); diff --git a/examples/introducing-jsx.js b/examples/introducing-jsx.js index 3900f34e..67013fa8 100644 --- a/examples/introducing-jsx.js +++ b/examples/introducing-jsx.js @@ -15,5 +15,5 @@ const element = ( ReactDOM.render( element, - document.getElementById('root'), + document.getElementById('root') ); diff --git a/examples/reconciliation/index-used-as-key.js b/examples/reconciliation/index-used-as-key.js index 74dda0e4..bb4d4284 100644 --- a/examples/reconciliation/index-used-as-key.js +++ b/examples/reconciliation/index-used-as-key.js @@ -33,8 +33,10 @@ class ToDoList extends React.Component { sortByEarliest() { const sortedList = this.state.list.sort( (a, b) => { - return a.createdAt - b.createdAt; - }, + return ( + a.createdAt - b.createdAt + ); + } ); this.setState({ list: [...sortedList], @@ -44,8 +46,10 @@ class ToDoList extends React.Component { sortByLatest() { const sortedList = this.state.list.sort( (a, b) => { - return b.createdAt - a.createdAt; - }, + return ( + b.createdAt - a.createdAt + ); + } ); this.setState({ list: [...sortedList], @@ -87,25 +91,25 @@ class ToDoList extends React.Component {
@@ -117,8 +121,11 @@ class ToDoList extends React.Component { {this.state.list.map( (todo, index) => ( - - ), + + ) )} @@ -128,5 +135,5 @@ class ToDoList extends React.Component { ReactDOM.render( , - document.getElementById('root'), + document.getElementById('root') ); diff --git a/examples/reconciliation/no-index-used-as-key.js b/examples/reconciliation/no-index-used-as-key.js index 9f004bb9..04e3ffad 100644 --- a/examples/reconciliation/no-index-used-as-key.js +++ b/examples/reconciliation/no-index-used-as-key.js @@ -33,8 +33,10 @@ class ToDoList extends React.Component { sortByEarliest() { const sortedList = this.state.list.sort( (a, b) => { - return a.createdAt - b.createdAt; - }, + return ( + a.createdAt - b.createdAt + ); + } ); this.setState({ list: [...sortedList], @@ -44,8 +46,10 @@ class ToDoList extends React.Component { sortByLatest() { const sortedList = this.state.list.sort( (a, b) => { - return b.createdAt - a.createdAt; - }, + return ( + b.createdAt - a.createdAt + ); + } ); this.setState({ list: [...sortedList], @@ -87,25 +91,25 @@ class ToDoList extends React.Component {
@@ -121,7 +125,7 @@ class ToDoList extends React.Component { key={todo.id} {...todo} /> - ), + ) )} @@ -131,5 +135,5 @@ class ToDoList extends React.Component { ReactDOM.render( , - document.getElementById('root'), + document.getElementById('root') ); diff --git a/examples/tutorial-expanded-version.js b/examples/tutorial-expanded-version.js index f3ad0d72..61a7d094 100644 --- a/examples/tutorial-expanded-version.js +++ b/examples/tutorial-expanded-version.js @@ -1,5 +1,7 @@
-

Shopping List for {props.name}

+

+ Shopping List for {props.name} +

  • Instagram
  • WhatsApp
    • diff --git a/package.json b/package.json index 98c644d1..4b551bb2 100644 --- a/package.json +++ b/package.json @@ -80,11 +80,11 @@ "dev": "gatsby develop -H 0.0.0.0", "flow": "flow", "format:source": "prettier --config .prettierrc --write \"{gatsby-*.js,{flow-typed,plugins,src}/**/*.js}\"", - "format:examples": "prettier --config .prettierrc --write --print-width 44 \"examples/**/*.js\"", + "format:examples": "prettier --config .prettierrc.examples --write \"examples/**/*.js\"", "lint": "eslint .", "netlify": "yarn install && yarn build", "nit:source": "prettier --config .prettierrc --list-different \"{gatsby-*.js,{flow-typed,plugins,src}/**/*.js}\"", - "nit:examples": "prettier --config .prettierrc --list-different --print-width 44 \"examples/**/*.js\"", + "nit:examples": "prettier --config .prettierrc.examples --list-different \"examples/**/*.js\"", "prettier": "yarn format:source && yarn format:examples", "prettier:diff": "yarn nit:source && yarn nit:examples", "reset": "rimraf ./.cache"