Skip to content

Commit 628db68

Browse files
authored
Merge pull request #1849 from StoDevX/greenkeeper/prettier-1.8.1
Update Prettier to v1.8.1
2 parents c587bc1 + 9f96c44 commit 628db68

File tree

9 files changed

+35
-25
lines changed

9 files changed

+35
-25
lines changed

dangerfile.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ if (thisPRSize > bigPRThreshold) {
5353
<details>
5454
<summary>:exclamation: Big PR!</summary>
5555
<blockquote>
56-
<p>We like to try and keep PRs under ${bigPRThreshold} lines, and this one was ${thisPRSize} lines.</p>
56+
<p>We like to try and keep PRs under ${
57+
bigPRThreshold
58+
} lines, and this one was ${thisPRSize} lines.</p>
5759
<p>If the PR contains multiple logical changes, splitting each change into a separate PR will allow a faster, easier, and more thorough review.</p>
5860
</blockquote>
5961
</details>`,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
"marked": "0.3.6",
119119
"minimist": "1.2.0",
120120
"pify": "3.0.0",
121-
"prettier": "1.7.4",
121+
"prettier": "1.8.1",
122122
"prop-types": "15.6.0",
123123
"react-native-view-shot": "1.12.0",
124124
"react-test-renderer": "16.0.0-alpha.12",

source/lib/login.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ export function loadLoginCredentials(): Promise<{
1818
username?: string,
1919
password?: string,
2020
}> {
21-
return Keychain.getInternetCredentials(
22-
SIS_LOGIN_CREDENTIAL_KEY,
23-
).catch(() => ({}))
21+
return Keychain.getInternetCredentials(SIS_LOGIN_CREDENTIAL_KEY).catch(
22+
() => ({}),
23+
)
2424
}
2525
export function clearLoginCredentials() {
26-
return Keychain.resetInternetCredentials(
27-
SIS_LOGIN_CREDENTIAL_KEY,
28-
).catch(() => ({}))
26+
return Keychain.resetInternetCredentials(SIS_LOGIN_CREDENTIAL_KEY).catch(
27+
() => ({}),
28+
)
2929
}
3030

3131
export async function isLoggedIn(): Promise<boolean> {

source/user-agent.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ const platformString =
1010
: Platform.OS == 'android' ? 'Android' : 'unknown'
1111
const platformVersion = Platform.Version || 'unknown'
1212

13-
export const AAO_USER_AGENT = `AllAboutOlaf/${aaoVersion} (${platformString}/${platformVersion})`
13+
export const AAO_USER_AGENT = `AllAboutOlaf/${aaoVersion} (${platformString}/${
14+
platformVersion
15+
})`

source/views/calendar/calendar-google.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ export class GoogleCalendarView extends React.Component {
4141
}
4242

4343
buildCalendarUrl(calendarId: string) {
44-
let calendarUrl = `https://www.googleapis.com/calendar/v3/calendars/${calendarId}/events`
44+
let calendarUrl = `https://www.googleapis.com/calendar/v3/calendars/${
45+
calendarId
46+
}/events`
4547
let params = {
4648
maxResults: 50,
4749
orderBy: 'startTime',

source/views/news/news-item.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ export default function NewsItem(props: {
4141
<header class="aao-header">
4242
<h1>${story.title}</h1>
4343
</header>
44-
${embedFeaturedImage && story.featuredImage
45-
? `<img src="${story.featuredImage}">`
46-
: ''}
44+
${
45+
embedFeaturedImage && story.featuredImage
46+
? `<img src="${story.featuredImage}">`
47+
: ''
48+
}
4749
${story.content}
4850
`
4951

source/views/student-orgs/list.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ export class StudentOrgsView extends React.Component {
9797
}
9898

9999
fetchData = async () => {
100-
const responseData: StudentOrgType[] = await fetchJson(
101-
orgsUrl,
102-
).catch(err => {
103-
reportNetworkProblem(err)
104-
this.setState(() => ({error: true}))
105-
return []
106-
})
100+
const responseData: StudentOrgType[] = await fetchJson(orgsUrl).catch(
101+
err => {
102+
reportNetworkProblem(err)
103+
this.setState(() => ({error: true}))
104+
return []
105+
},
106+
)
107107

108108
const sortableRegex = /^(St\.? Olaf(?: College)?|The) +/i
109109
const withSortableNames = responseData.map(item => {

source/views/transportation/bus/map.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ export class BusMapView extends React.PureComponent {
8989
const today = now.format('dddd')
9090
return (
9191
<NoticeView
92-
text={`No coordinates have been provided for today's (${today}) schedule on the "${lineToDisplay}" line`}
92+
text={`No coordinates have been provided for today's (${
93+
today
94+
}) schedule on the "${lineToDisplay}" line`}
9395
/>
9496
)
9597
}

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4006,9 +4006,9 @@ preserve@^0.2.0:
40064006
version "0.2.0"
40074007
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
40084008

4009-
prettier@1.7.4:
4010-
version "1.7.4"
4011-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.7.4.tgz#5e8624ae9363c80f95ec644584ecdf55d74f93fa"
4009+
prettier@1.8.1:
4010+
version "1.8.1"
4011+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.8.1.tgz#91064d778c08c85ac1cbe6b23195c34310d039f9"
40124012

40134013
pretty-format@^21.2.1:
40144014
version "21.2.1"
@@ -5313,7 +5313,7 @@ vinyl@^0.5.0:
53135313
clone-stats "^0.0.1"
53145314
replace-ext "0.0.1"
53155315

5316-
"vm2@github:patriksimek/vm2#custom_files":
5316+
vm2@patriksimek/vm2#custom_files:
53175317
version "3.5.0"
53185318
resolved "https://codeload.github.com/patriksimek/vm2/tar.gz/7e82f90ac705fc44fad044147cb0df09b4c79a57"
53195319

0 commit comments

Comments
 (0)