Skip to content

Commit 86fdcd1

Browse files
committed
updated prettier
1 parent 9ee1d33 commit 86fdcd1

File tree

5 files changed

+28
-37
lines changed

5 files changed

+28
-37
lines changed

HTMLView.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import React, {Component, PropTypes} from 'react';
22
import htmlToElement from './htmlToElement';
3-
import {
4-
Linking,
5-
StyleSheet,
6-
View,
7-
} from 'react-native';
3+
import {Linking, StyleSheet, View} from 'react-native';
84

95
const boldStyle = {fontWeight: '500'};
106
const italicStyle = {fontStyle: 'italic'};

__tests__/HTMLView-test.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ describe('<HTMLView/>', () => {
4040
});
4141

4242
it('should render an <Image />, with default width/height of 1', () => {
43-
const imgSrc = 'https://facebook.github.io/react-native/img/header_logo.png';
43+
const imgSrc =
44+
'https://facebook.github.io/react-native/img/header_logo.png';
4445
const htmlContent = `<img src="${imgSrc}"/>`;
4546

4647
expect(
@@ -49,7 +50,8 @@ describe('<HTMLView/>', () => {
4950
});
5051

5152
it('should render an <Image /> with set width/height', () => {
52-
const imgSrc = 'https://facebook.github.io/react-native/img/header_logo.png';
53+
const imgSrc =
54+
'https://facebook.github.io/react-native/img/header_logo.png';
5355
const htmlContent = `<img src="${imgSrc}" width="66" height="58"/>`;
5456

5557
expect(

format.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#!/bin/bash
2+
3+
if [[ -z $1 ]]; then
4+
echo "Error: expected args"
5+
exit 1
6+
fi
27
node_modules/.bin/prettier \
3-
$@ \
8+
"$@" \
49
--bracket-spacing=false \
510
--trailing-comma=es5 \
611
--single-quote=true \

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"eslint": "2.7.0",
1919
"eslint-plugin-react": "4.3.0",
2020
"jest": "^19.0.2",
21-
"prettier": "^0.22.0",
21+
"prettier": "^1.3.1",
2222
"react": "^15.4.2",
2323
"react-addons-test-utils": "^15.4.2",
2424
"react-dom": "^15.4.2",

yarn.lock

+16-28
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,9 @@ assert-plus@^0.2.0:
187187
version "0.2.0"
188188
resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
189189

190-
191-
version "0.8.18"
192-
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.18.tgz#c8b98574898e8914e9d8de74b947564a9fe929af"
193-
194-
195-
version "0.9.4"
196-
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.4.tgz#410d1f81890aeb8e0a38621558ba5869ae53c91b"
190+
191+
version "0.9.8"
192+
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.8.tgz#6cb6a40beba31f49f20928e28439fc14a3dab078"
197193

198194
async@^1.4.0, async@^1.4.2:
199195
version "1.5.2"
@@ -896,9 +892,9 @@ babel-types@^6.0.19, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.21
896892
lodash "^4.2.0"
897893
to-fast-properties "^1.0.1"
898894

899-
babylon@6.15.0:
900-
version "6.15.0"
901-
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e"
895+
babylon@7.0.0-beta.8:
896+
version "7.0.0-beta.8"
897+
resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.8.tgz#2bdc5ae366041442c27e068cce6f0d7c06ea9949"
902898

903899
babylon@^6.0.18, babylon@^6.11.0, babylon@^6.13.0, babylon@^6.14.1, babylon@^6.15.0:
904900
version "6.16.1"
@@ -1131,10 +1127,6 @@ color-name@^1.1.1:
11311127
version "1.1.2"
11321128
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
11331129

1134-
colors@>=0.6.2:
1135-
version "1.1.2"
1136-
resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
1137-
11381130
combined-stream@^1.0.5, combined-stream@~1.0.5:
11391131
version "1.0.5"
11401132
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
@@ -1834,13 +1826,9 @@ flat-cache@^1.2.1:
18341826
graceful-fs "^4.1.2"
18351827
write "^0.2.1"
18361828

1837-
1838-
version "0.40.0"
1839-
resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.40.0.tgz#b3444742189093323c4319c4fe9d35391f46bcbc"
1840-
dependencies:
1841-
ast-types "0.8.18"
1842-
colors ">=0.6.2"
1843-
minimist ">=0.2.0"
1829+
1830+
version "0.45.0"
1831+
resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.45.0.tgz#aa29d4ae27f06aa02817772bba0fcbefef7e62f0"
18441832

18451833
for-in@^1.0.1:
18461834
version "1.0.2"
@@ -3055,7 +3043,7 @@ [email protected], minimist@~0.0.1:
30553043
version "0.0.8"
30563044
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
30573045

3058-
[email protected], minimist@>=0.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0:
3046+
[email protected], minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0:
30593047
version "1.2.0"
30603048
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
30613049

@@ -3369,16 +3357,16 @@ preserve@^0.2.0:
33693357
version "0.2.0"
33703358
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
33713359

3372-
prettier@^0.22.0:
3373-
version "0.22.0"
3374-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-0.22.0.tgz#7b37c4480d0858180407e5a8e13f0f47da7385d2"
3360+
prettier@^1.3.1:
3361+
version "1.3.1"
3362+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.3.1.tgz#fa0ea84b45ac0ba6de6a1e4cecdcff900d563151"
33753363
dependencies:
3376-
ast-types "0.9.4"
3364+
ast-types "0.9.8"
33773365
babel-code-frame "6.22.0"
3378-
babylon "6.15.0"
3366+
babylon "7.0.0-beta.8"
33793367
chalk "1.1.3"
33803368
esutils "2.0.2"
3381-
flow-parser "0.40.0"
3369+
flow-parser "0.45.0"
33823370
get-stdin "5.0.1"
33833371
glob "7.1.1"
33843372
jest-validate "19.0.0"

0 commit comments

Comments
 (0)