Skip to content

Commit 9f78913

Browse files
johanhenrikssngaearon
authored andcommitted
Update prettier (facebook#13205)
* Update Prettier to 1.13.7 * Apply Prettier changes * Pin prettier version * EOL
1 parent 6d3e262 commit 9f78913

File tree

11 files changed

+35
-15
lines changed

11 files changed

+35
-15
lines changed

.prettierrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ module.exports = {
66
jsxBracketSameLine: true,
77
trailingComma: 'es5',
88
printWidth: 80,
9+
parser: 'babylon',
910

1011
overrides: [
1112
{

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"ncp": "^2.0.0",
7878
"object-assign": "^4.1.1",
7979
"platform": "^1.1.0",
80-
"prettier": "1.11.1",
80+
"prettier": "1.13.7",
8181
"prop-types": "^15.6.2",
8282
"random-seed": "^0.3.0",
8383
"react-lifecycles-compat": "^3.0.2",

packages/events/EventPluginUtils.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,16 @@ if (__DEV__) {
3939
const listenersIsArr = Array.isArray(dispatchListeners);
4040
const listenersLen = listenersIsArr
4141
? dispatchListeners.length
42-
: dispatchListeners ? 1 : 0;
42+
: dispatchListeners
43+
? 1
44+
: 0;
4345

4446
const instancesIsArr = Array.isArray(dispatchInstances);
4547
const instancesLen = instancesIsArr
4648
? dispatchInstances.length
47-
: dispatchInstances ? 1 : 0;
49+
: dispatchInstances
50+
? 1
51+
: 0;
4852

4953
warningWithoutStack(
5054
instancesIsArr === listenersIsArr && instancesLen === listenersLen,

packages/events/ResponderEventPlugin.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,9 @@ const ResponderEventPlugin = {
548548
? eventTypes.responderStart
549549
: isResponderTouchMove
550550
? eventTypes.responderMove
551-
: isResponderTouchEnd ? eventTypes.responderEnd : null;
551+
: isResponderTouchEnd
552+
? eventTypes.responderEnd
553+
: null;
552554

553555
if (incrementalTouch) {
554556
const gesture = ResponderSyntheticEvent.getPooled(
@@ -571,7 +573,9 @@ const ResponderEventPlugin = {
571573
noResponderTouches(nativeEvent);
572574
const finalTouch = isResponderTerminate
573575
? eventTypes.responderTerminate
574-
: isResponderRelease ? eventTypes.responderRelease : null;
576+
: isResponderRelease
577+
? eventTypes.responderRelease
578+
: null;
575579
if (finalTouch) {
576580
const finalEvent = ResponderSyntheticEvent.getPooled(
577581
finalTouch,

packages/react-dom/src/__tests__/ReactComponentLifeCycle-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ type ComponentLifeCycle =
6868
* Mounted components have a DOM node representation and are capable of
6969
* receiving new props.
7070
*/
71-
| 'MOUNTED' /**
71+
| 'MOUNTED'
72+
/**
7273
* Unmounted components are inactive and cannot receive new props.
7374
*/
7475
| 'UNMOUNTED';

packages/react-dom/src/events/SyntheticWheelEvent.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ const SyntheticWheelEvent = SyntheticMouseEvent.extend({
1616
return 'deltaX' in event
1717
? event.deltaX
1818
: // 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;
2022
},
2123
deltaY(event) {
2224
return 'deltaY' in event
@@ -25,7 +27,9 @@ const SyntheticWheelEvent = SyntheticMouseEvent.extend({
2527
'wheelDeltaY' in event
2628
? -event.wheelDeltaY
2729
: // 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;
2933
},
3034
deltaZ: null,
3135

packages/react-dom/src/events/TapEventPlugin.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ function extractSingleTouch(nativeEvent) {
9494

9595
return !hasTouches && hasChangedTouches
9696
? changedTouches[0]
97-
: hasTouches ? touches[0] : nativeEvent;
97+
: hasTouches
98+
? touches[0]
99+
: nativeEvent;
98100
}
99101

100102
function getAxisCoordOfEvent(

packages/react-test-renderer/src/ReactShallowRenderer.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ class ReactShallowRenderer {
6666
'components, but the provided element type was `%s`.',
6767
Array.isArray(element.type)
6868
? 'array'
69-
: element.type === null ? 'null' : typeof element.type,
69+
: element.type === null
70+
? 'null'
71+
: typeof element.type,
7072
);
7173

7274
if (this._rendering) {

packages/shared/describeComponentFrame.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ export default function(
2121
':' +
2222
source.lineNumber +
2323
')'
24-
: ownerName ? ' (created by ' + ownerName + ')' : '')
24+
: ownerName
25+
? ' (created by ' + ownerName + ')'
26+
: '')
2527
);
2628
}

scripts/bench/stats.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function calculateMeanAndSdOfRatioFromDeltaMethod(
3333
) {
3434
const mean =
3535
(meanTest - meanControl) / meanControl -
36-
Math.pow(semControl, 2) * meanTest / Math.pow(meanControl, 3);
36+
(Math.pow(semControl, 2) * meanTest) / Math.pow(meanControl, 3);
3737
const variance =
3838
Math.pow(semTest / meanControl, 2) +
3939
Math.pow(semControl * meanTest, 2) / Math.pow(meanControl, 4);

0 commit comments

Comments
 (0)