Merge pull request #2550 from StoDevX/greenkeeper/prettier-1.12.1

rye · web-flow · commit f2cd853b81fe · 2018-04-26T07:32:49.000-05:00
Greenkeeper/prettier 1.12.1
diff --git a/dangerfile.js b/dangerfile.js
@@ -62,7 +62,7 @@ async function runAndroid() {
 		return
 	}
 
-	if (!await didNativeDependencyChange()) {
+	if (!(await didNativeDependencyChange())) {
 		// nothing changed to make this worth analyzing
 		return
 	}
@@ -84,7 +84,7 @@ async function runiOS() {
 		return
 	}
 
-	if (!await didNativeDependencyChange()) {
+	if (!(await didNativeDependencyChange())) {
 		// nothing changed to make this worth analyzing
 		return
 	}
diff --git a/package.json b/package.json
@@ -169,7 +169,7 @@
     "minimist": "1.2.0",
     "mkdirp": "0.5.1",
     "pify": "3.0.0",
-    "prettier": "1.11.1",
+    "prettier": "1.12.1",
     "pretty-bytes": "4.0.2",
     "pretty-quick": "1.4.1",
     "prop-types": "15.6.1",
diff --git a/source/user-agent.js b/source/user-agent.js
@@ -7,7 +7,9 @@ const aaoVersion = version || 'unknown'
 const platformString =
 	Platform.OS === 'ios'
 		? 'iOS'
-		: Platform.OS === 'android' ? 'Android' : 'unknown'
+		: Platform.OS === 'android'
+			? 'Android'
+			: 'unknown'
 const platformVersion = Platform.Version || 'unknown'
 
 export const AAO_USER_AGENT = `AllAboutOlaf/${aaoVersion} (${platformString}/${platformVersion})`
diff --git a/source/views/settings/components/login-button.js b/source/views/settings/components/login-button.js
@@ -24,7 +24,9 @@ export function LoginButton({
 			title={
 				loading
 					? `Logging in to ${label}…`
-					: loggedIn ? `Sign Out of ${label}` : `Sign In to ${label}`
+					: loggedIn
+						? `Sign Out of ${label}`
+						: `Sign In to ${label}`
 			}
 		/>
 	)
diff --git a/yarn.lock b/yarn.lock
@@ -5026,9 +5026,9 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
+prettier@1.12.1:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325"
 
 pretty-bytes@4.0.2:
   version "4.0.2"

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ async function runAndroid() {`
`62`	`62`	`return`
`63`	`63`	`}`
`64`	`64`
`65`		`- if (!await didNativeDependencyChange()) {`
	`65`	`+ if (!(await didNativeDependencyChange())) {`
`66`	`66`	`// nothing changed to make this worth analyzing`
`67`	`67`	`return`
`68`	`68`	`}`
`@@ -84,7 +84,7 @@ async function runiOS() {`
`84`	`84`	`return`
`85`	`85`	`}`
`86`	`86`
`87`		`- if (!await didNativeDependencyChange()) {`
	`87`	`+ if (!(await didNativeDependencyChange())) {`
`88`	`88`	`// nothing changed to make this worth analyzing`
`89`	`89`	`return`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,9 @@ export function LoginButton({`
`24`	`24`	`title={`
`25`	`25`	`loading`
`26`	`26`	? `Logging in to ${label}…`
`27`		- : loggedIn ? `Sign Out of ${label}` : `Sign In to ${label}`
	`27`	`+ : loggedIn`
	`28`	+ ? `Sign Out of ${label}`
	`29`	+ : `Sign In to ${label}`
`28`	`30`	`}`
`29`	`31`	`/>`
`30`	`32`	`)`