Update prettier (#13205)
* Update Prettier to 1.13.7 * Apply Prettier changes * Pin prettier version * EOL
Johan Henriksson committed
Jul 17, 2018 at 21:18 UTC
9f78913b20d52a5849dd26aafebfbc3caf190812
11 files changed
+35
-15
.prettierrc.js
+1
@@ -6,6 +6,7 @@ module.exports = {
6
jsxBracketSameLine: true,
7
trailingComma: 'es5',
8
printWidth: 80,
9
+ parser: 'babylon',
10
11
overrides: [
12
{
package.json
+1
-1
@@ -77,7 +77,7 @@
77
"ncp": "^2.0.0",
78
"object-assign": "^4.1.1",
79
"platform": "^1.1.0",
80
- "prettier": "1.11.1",
80
+ "prettier": "1.13.7",
81
"prop-types": "^15.6.2",
82
"random-seed": "^0.3.0",
83
"react-lifecycles-compat": "^3.0.2",
packages/events/EventPluginUtils.js
+6
-2
@@ -39,12 +39,16 @@ if (__DEV__) {
39
const listenersIsArr = Array.isArray(dispatchListeners);
40
const listenersLen = listenersIsArr
41
? dispatchListeners.length
42
- : dispatchListeners ? 1 : 0;
42
+ : dispatchListeners
43
+ ? 1
44
+ : 0;
45
46
const instancesIsArr = Array.isArray(dispatchInstances);
47
const instancesLen = instancesIsArr
48
? dispatchInstances.length
47
- : dispatchInstances ? 1 : 0;
49
+ : dispatchInstances
50
+ ? 1
51
+ : 0;
52
53
warningWithoutStack(
54
instancesIsArr === listenersIsArr && instancesLen === listenersLen,
packages/events/ResponderEventPlugin.js
+6
-2
@@ -548,7 +548,9 @@ const ResponderEventPlugin = {
548
? eventTypes.responderStart
549
: isResponderTouchMove
550
? eventTypes.responderMove
551
- : isResponderTouchEnd ? eventTypes.responderEnd : null;
551
+ : isResponderTouchEnd
552
+ ? eventTypes.responderEnd
553
+ : null;
554
555
if (incrementalTouch) {
556
const gesture = ResponderSyntheticEvent.getPooled(
@@ -571,7 +573,9 @@ const ResponderEventPlugin = {
573
noResponderTouches(nativeEvent);
574
const finalTouch = isResponderTerminate
575
? eventTypes.responderTerminate
574
- : isResponderRelease ? eventTypes.responderRelease : null;
576
+ : isResponderRelease
577
+ ? eventTypes.responderRelease
578
+ : null;
579
if (finalTouch) {
580
const finalEvent = ResponderSyntheticEvent.getPooled(
581
finalTouch,
packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js
+2
-1
@@ -68,7 +68,8 @@ type ComponentLifeCycle =
68
* Mounted components have a DOM node representation and are capable of
69
* receiving new props.
70
*/
71
- | 'MOUNTED' /**
71
+ | 'MOUNTED'
72
+ /**
73
* Unmounted components are inactive and cannot receive new props.
74
*/
75
| 'UNMOUNTED';
packages/react-dom/src/events/SyntheticWheelEvent.js
+6
-2
@@ -16,7 +16,9 @@ const SyntheticWheelEvent = SyntheticMouseEvent.extend({
16
return 'deltaX' in event
17
? event.deltaX
18
: // Fallback to `wheelDeltaX` for Webkit and normalize (right is positive).
19
- 'wheelDeltaX' in event ? -event.wheelDeltaX : 0;
19
+ 'wheelDeltaX' in event
20
+ ? -event.wheelDeltaX
21
+ : 0;
22
},
23
deltaY(event) {
24
return 'deltaY' in event
@@ -25,7 +27,9 @@ const SyntheticWheelEvent = SyntheticMouseEvent.extend({
27
'wheelDeltaY' in event
28
? -event.wheelDeltaY
29
: // Fallback to `wheelDelta` for IE<9 and normalize (down is positive).
28
- 'wheelDelta' in event ? -event.wheelDelta : 0;
30
+ 'wheelDelta' in event
31
+ ? -event.wheelDelta
32
+ : 0;
33
},
34
deltaZ: null,
35
packages/react-dom/src/events/TapEventPlugin.js
+3
-1
@@ -94,7 +94,9 @@ function extractSingleTouch(nativeEvent) {
94
95
return !hasTouches && hasChangedTouches
96
? changedTouches[0]
97
- : hasTouches ? touches[0] : nativeEvent;
97
+ : hasTouches
98
+ ? touches[0]
99
+ : nativeEvent;
100
}
101
102
function getAxisCoordOfEvent(
packages/react-test-renderer/src/ReactShallowRenderer.js
+3
-1
@@ -66,7 +66,9 @@ class ReactShallowRenderer {
66
'components, but the provided element type was `%s`.',
67
Array.isArray(element.type)
68
? 'array'
69
- : element.type === null ? 'null' : typeof element.type,
69
+ : element.type === null
70
+ ? 'null'
71
+ : typeof element.type,
72
);
73
74
if (this._rendering) {
packages/shared/describeComponentFrame.js
+3
-1
@@ -21,6 +21,8 @@ export default function(
21
':' +
22
source.lineNumber +
23
')'
24
- : ownerName ? ' (created by ' + ownerName + ')' : '')
24
+ : ownerName
25
+ ? ' (created by ' + ownerName + ')'
26
+ : '')
27
);
28
}
scripts/bench/stats.js
+1
-1
@@ -33,7 +33,7 @@ function calculateMeanAndSdOfRatioFromDeltaMethod(
33
) {
34
const mean =
35
(meanTest - meanControl) / meanControl -
36
- Math.pow(semControl, 2) * meanTest / Math.pow(meanControl, 3);
36
+ (Math.pow(semControl, 2) * meanTest) / Math.pow(meanControl, 3);
37
const variance =
38
Math.pow(semTest / meanControl, 2) +
39
Math.pow(semControl * meanTest, 2) / Math.pow(meanControl, 4);
yarn.lock
+3
-3
@@ -4570,9 +4570,9 @@ preserve@^0.2.0:
4570
version "0.2.0"
4571
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
4572
4573
-prettier@1.11.1, prettier@^1.0.0:
4574
- version "1.11.1"
4575
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
4573
+prettier@1.13.7, prettier@^1.0.0:
4574
+ version "1.13.7"
4575
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"
4576
4577
pretty-format@^23.0.1:
4578
version "23.0.1"