Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.0] Upgrade Prettier to 1.5 #1270

Merged
merged 1 commit into from
Jun 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions examples/client-only-paths/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
"typography": "^0.15.8",
"typography-breakpoint-constants": "^0.14.0"
},
"keywords": [
"gatsby"
],
"keywords": ["gatsby"],
"license": "MIT",
"main": "n/a",
"scripts": {
Expand Down
4 changes: 1 addition & 3 deletions examples/feed/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
"gatsby-transformer-remark": "next",
"gatsby-plugin-feed": "next"
},
"keywords": [
"gatsby"
],
"keywords": ["gatsby"],
"license": "MIT",
"main": "index.js",
"scripts": {
Expand Down
4 changes: 1 addition & 3 deletions examples/gatsbygram/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@
"typeface-space-mono": "^0.0.22",
"typography": "^0.15.0"
},
"keywords": [
"gatsby"
],
"keywords": ["gatsby"],
"license": "MIT",
"main": "n/a",
"scripts": {
Expand Down
1 change: 0 additions & 1 deletion examples/gatsbygram/src/components/modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,5 +167,4 @@ export const modalFragment = graphql`
fragment Modal_posts on PostsJson {
id
}

`
4 changes: 2 additions & 2 deletions examples/gatsbygram/src/pages/about.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ class About extends React.Component {
>
<h1>About Gatsbygram</h1>
<p>
Gatsbygram is an example website built with
the JavaScript web framework
Gatsbygram is an example website built with the JavaScript web
framework
{` `}
<a target="_blank" href="https://github.com/gatsbyjs/gatsby">
Gatsby
Expand Down
4 changes: 1 addition & 3 deletions examples/hn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
"lodash": "^4.16.4",
"slash": "^1.0.0"
},
"keywords": [
"gatsby"
],
"keywords": ["gatsby"],
"license": "MIT",
"main": "n/a",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions examples/hn/src/components/story-comment.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ class StoryComment extends React.Component {
<td className="default">
<div style={{ marginTop: 2, marginBottom: -10 }}>
<span className="comhead">
<strong>{comment.by}</strong>
<strong>
{comment.by}
</strong>
{` `}
<span className="age">
{comment.timeISO}
Expand All @@ -39,9 +41,7 @@ class StoryComment extends React.Component {
<p>
<font size="1">
<u>
<a href="#noop">
reply
</a>
<a href="#noop">reply</a>
</u>
</font>
</p>
Expand Down
12 changes: 9 additions & 3 deletions examples/hn/src/components/story-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ class StoryItem extends React.Component {
}}
className="title"
>
<span className="rank">{story.order}.</span>
<span className="rank">
{story.order}.
</span>
</td>
<td className="title">
<a href={story.url} className="storylink">
Expand All @@ -39,10 +41,14 @@ class StoryItem extends React.Component {
{` `}
by
{` `}
<a href="" className="hnuser">{story.by}</a>
<a href="" className="hnuser">
{story.by}
</a>
{` `}
<span className="age">
<Link to={`/item/${story.id}/`}>{story.timeISO}</Link>
<Link to={`/item/${story.id}/`}>
{story.timeISO}
</Link>
</span>
{` `}
<span id={`unv_${story.id}`} />
Expand Down
4 changes: 3 additions & 1 deletion examples/hn/src/layouts/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ class DefaultLayout extends React.Component {
</td>
<td style={{ lineHeight: `12pt`, height: `10px` }}>
<span className="pagetop">
<b className="hnname"><Link to="/">Hacker News </Link></b>
<b className="hnname">
<Link to="/">Hacker News </Link>
</b>
<a href="newest">new</a>
{` `}
|
Expand Down
6 changes: 4 additions & 2 deletions examples/hn/src/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ class Index extends React.Component {
<tr className="morespace" style={{ height: `10px` }} />
<tr>
<td style={{ paddingLeft: 36 }} className="title">
<a href="/page/2/" className="morelink" rel="nofollow">More</a>
<a href="/page/2/" className="morelink" rel="nofollow">
More
</a>
</td>
</tr>
</table>
Expand All @@ -25,7 +27,7 @@ export default Index

export const pageQuery = graphql`
query PageQuery {
allHnStory(sort: {fields: [order]}) {
allHnStory(sort: { fields: [order] }) {
edges {
node {
...Story_item
Expand Down
40 changes: 20 additions & 20 deletions examples/hn/src/templates/story.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,18 @@ class Story extends React.Component {
</tr>
<tr>
<td className="subtext">
<span className="score">
{story.score} points
</span>
<span className="score">{story.score} points</span>
{` `}
by
{` `}
<a href="" className="hnuser">{story.by}</a>
<a href="" className="hnuser">
{story.by}
</a>
{` `}
<span className="age">
<Link to={`/item/${story.id}/`}>{story.timeISO}</Link>
<Link to={`/item/${story.id}/`}>
{story.timeISO}
</Link>
</span>
{` `}
|
Expand Down Expand Up @@ -95,19 +97,16 @@ class Story extends React.Component {
export default Story

export const pageQuery = graphql`
query StoryQuery($id: String!)
{
hnStory(id: {eq: $id}) {
id
title
url
domain
score
timeISO(fromNow: true)
descendants
by
children {
...StoryComment
query StoryQuery($id: String!) {
hnStory(id: { eq: $id }) {
id
title
url
domain
score
timeISO(fromNow: true)
descendants
by
children {
...StoryComment
children {
Expand All @@ -122,6 +121,9 @@ query StoryQuery($id: String!)
...StoryComment
children {
...StoryComment
children {
...StoryComment
}
}
}
}
Expand All @@ -131,6 +133,4 @@ query StoryQuery($id: String!)
}
}
}
}

`
5 changes: 1 addition & 4 deletions examples/image-processing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
"typography": "^0.15.8",
"typography-theme-bootstrap": "^0.15.10"
},
"keywords": [
"gatsby",
"sharp"
],
"keywords": ["gatsby", "sharp"],
"license": "MIT",
"main": "n/a",
"scripts": {
Expand Down
Loading