Skip to content

Commit 7414c0e

Browse files
Merge branch 'feature/prettier-code' into develop
2 parents cb9e8e8 + 96188fa commit 7414c0e

File tree

7 files changed

+185
-8
lines changed

7 files changed

+185
-8
lines changed

.babelrc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
{
2-
"presets": [
3-
"@babel/env",
4-
"@babel/preset-typescript"
5-
]
2+
"presets": ["@babel/env", "@babel/preset-typescript"]
63
}

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package.json

.prettierrc.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"singleQuote": true,
3+
"trailingComma": "es5",
4+
"useTabs": true
5+
}

package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
"scripts": {
1212
"build": "npm run clean && babel src -d lib --extensions '.js,.ts'",
1313
"clean": "rimraf lib/*",
14+
"format": "prettier --write 'src/**'",
1415
"lint": "tsc; tslint -p ./",
16+
"precommit": "pretty-quick --staged",
1517
"test": "echo \"Error: no test specified\" && exit 1"
1618
},
1719
"dependencies": {},
@@ -20,6 +22,9 @@
2022
"@babel/core": "^7.0.0-beta.54",
2123
"@babel/preset-env": "^7.0.0-beta.54",
2224
"@babel/preset-typescript": "^7.0.0-beta.54",
25+
"husky": "^0.14.3",
26+
"prettier": "^1.13.7",
27+
"pretty-quick": "^1.6.0",
2328
"rimraf": "^2.6.2",
2429
"tslint": "^5.11.0",
2530
"typescript": "^2.9.2"

tsconfig.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@
1212
"skipLibCheck": true,
1313
"sourceMap": true
1414
},
15-
"include": [
16-
"src"
17-
]
15+
"include": ["src"]
1816
}

tslint.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
{
22
"extends": [
33
"tslint:recommended"
4-
]
4+
],
5+
"rules": {
6+
"arrow-parens": false,
7+
"indent": false,
8+
"object-literal-key-quotes": false,
9+
"one-line": false,
10+
"quotemark": false,
11+
"trailing-comma": false,
12+
"whitespace": false
13+
}
514
}

yarn.lock

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,10 @@ chownr@^1.0.1:
737737
version "1.0.1"
738738
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
739739

740+
ci-info@^1.0.0:
741+
version "1.1.3"
742+
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
743+
740744
class-utils@^0.3.5:
741745
version "0.3.6"
742746
resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -795,6 +799,14 @@ core-util-is@~1.0.0:
795799
version "1.0.2"
796800
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
797801

802+
cross-spawn@^5.0.1:
803+
version "5.1.0"
804+
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
805+
dependencies:
806+
lru-cache "^4.0.1"
807+
shebang-command "^1.2.0"
808+
which "^1.2.9"
809+
798810
debug@^2.1.2, debug@^2.2.0, debug@^2.3.3:
799811
version "2.6.9"
800812
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -862,6 +874,18 @@ esutils@^2.0.2:
862874
version "2.0.2"
863875
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
864876

877+
execa@^0.8.0:
878+
version "0.8.0"
879+
resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"
880+
dependencies:
881+
cross-spawn "^5.0.1"
882+
get-stream "^3.0.0"
883+
is-stream "^1.1.0"
884+
npm-run-path "^2.0.0"
885+
p-finally "^1.0.0"
886+
signal-exit "^3.0.0"
887+
strip-eof "^1.0.0"
888+
865889
expand-brackets@^2.1.4:
866890
version "2.1.4"
867891
resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -909,6 +933,12 @@ fill-range@^4.0.0:
909933
repeat-string "^1.6.1"
910934
to-regex-range "^2.1.0"
911935

936+
find-up@^2.1.0:
937+
version "2.1.0"
938+
resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
939+
dependencies:
940+
locate-path "^2.0.0"
941+
912942
for-in@^1.0.2:
913943
version "1.0.2"
914944
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -953,6 +983,10 @@ gauge@~2.7.3:
953983
strip-ansi "^3.0.1"
954984
wide-align "^1.1.0"
955985

986+
get-stream@^3.0.0:
987+
version "3.0.0"
988+
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
989+
956990
get-value@^2.0.3, get-value@^2.0.6:
957991
version "2.0.6"
958992
resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -1024,6 +1058,14 @@ has-values@^1.0.0:
10241058
is-number "^3.0.0"
10251059
kind-of "^4.0.0"
10261060

1061+
husky@^0.14.3:
1062+
version "0.14.3"
1063+
resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
1064+
dependencies:
1065+
is-ci "^1.0.10"
1066+
normalize-path "^1.0.0"
1067+
strip-indent "^2.0.0"
1068+
10271069
iconv-lite@^0.4.4:
10281070
version "0.4.23"
10291071
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
@@ -1036,6 +1078,10 @@ ignore-walk@^3.0.1:
10361078
dependencies:
10371079
minimatch "^3.0.4"
10381080

1081+
ignore@^3.3.7:
1082+
version "3.3.10"
1083+
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
1084+
10391085
inflight@^1.0.4:
10401086
version "1.0.6"
10411087
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -1079,6 +1125,12 @@ is-buffer@^1.1.5:
10791125
version "1.1.6"
10801126
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
10811127

1128+
is-ci@^1.0.10:
1129+
version "1.1.0"
1130+
resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
1131+
dependencies:
1132+
ci-info "^1.0.0"
1133+
10821134
is-data-descriptor@^0.1.4:
10831135
version "0.1.4"
10841136
resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -1159,6 +1211,10 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
11591211
dependencies:
11601212
isobject "^3.0.1"
11611213

1214+
is-stream@^1.1.0:
1215+
version "1.1.0"
1216+
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
1217+
11621218
is-windows@^1.0.2:
11631219
version "1.0.2"
11641220
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -1167,6 +1223,10 @@ isarray@1.0.0, isarray@~1.0.0:
11671223
version "1.0.0"
11681224
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
11691225

1226+
isexe@^2.0.0:
1227+
version "2.0.0"
1228+
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
1229+
11701230
isobject@^2.0.0:
11711231
version "2.1.0"
11721232
resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -1228,6 +1288,13 @@ kind-of@^6.0.0, kind-of@^6.0.2:
12281288
version "6.0.2"
12291289
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
12301290

1291+
locate-path@^2.0.0:
1292+
version "2.0.0"
1293+
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
1294+
dependencies:
1295+
p-locate "^2.0.0"
1296+
path-exists "^3.0.0"
1297+
12311298
lodash.debounce@^4.0.8:
12321299
version "4.0.8"
12331300
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -1242,6 +1309,13 @@ loose-envify@^1.0.0:
12421309
dependencies:
12431310
js-tokens "^3.0.0 || ^4.0.0"
12441311

1312+
lru-cache@^4.0.1:
1313+
version "4.1.3"
1314+
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
1315+
dependencies:
1316+
pseudomap "^1.0.2"
1317+
yallist "^2.1.2"
1318+
12451319
map-cache@^0.2.2:
12461320
version "0.2.2"
12471321
resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -1310,6 +1384,10 @@ mkdirp@^0.5.0, mkdirp@^0.5.1:
13101384
dependencies:
13111385
minimist "0.0.8"
13121386

1387+
mri@^1.1.0:
1388+
version "1.1.1"
1389+
resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.1.tgz#85aa26d3daeeeedf80dc5984af95cc5ca5cad9f1"
1390+
13131391
ms@2.0.0:
13141392
version "2.0.0"
13151393
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -1364,6 +1442,10 @@ nopt@^4.0.1:
13641442
abbrev "1"
13651443
osenv "^0.1.4"
13661444

1445+
normalize-path@^1.0.0:
1446+
version "1.0.0"
1447+
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
1448+
13671449
normalize-path@^2.1.1:
13681450
version "2.1.1"
13691451
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -1381,6 +1463,12 @@ npm-packlist@^1.1.6:
13811463
ignore-walk "^3.0.1"
13821464
npm-bundled "^1.0.1"
13831465

1466+
npm-run-path@^2.0.0:
1467+
version "2.0.2"
1468+
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
1469+
dependencies:
1470+
path-key "^2.0.0"
1471+
13841472
npmlog@^4.0.2:
13851473
version "4.1.2"
13861474
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -1447,6 +1535,26 @@ output-file-sync@^2.0.0:
14471535
is-plain-obj "^1.1.0"
14481536
mkdirp "^0.5.1"
14491537

1538+
p-finally@^1.0.0:
1539+
version "1.0.0"
1540+
resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
1541+
1542+
p-limit@^1.1.0:
1543+
version "1.3.0"
1544+
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
1545+
dependencies:
1546+
p-try "^1.0.0"
1547+
1548+
p-locate@^2.0.0:
1549+
version "2.0.0"
1550+
resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
1551+
dependencies:
1552+
p-limit "^1.1.0"
1553+
1554+
p-try@^1.0.0:
1555+
version "1.0.0"
1556+
resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
1557+
14501558
pascalcase@^0.1.1:
14511559
version "0.1.1"
14521560
resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -1455,10 +1563,18 @@ path-dirname@^1.0.0:
14551563
version "1.0.2"
14561564
resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
14571565

1566+
path-exists@^3.0.0:
1567+
version "3.0.0"
1568+
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
1569+
14581570
path-is-absolute@^1.0.0:
14591571
version "1.0.1"
14601572
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
14611573

1574+
path-key@^2.0.0:
1575+
version "2.0.1"
1576+
resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
1577+
14621578
path-parse@^1.0.5:
14631579
version "1.0.5"
14641580
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
@@ -1467,6 +1583,20 @@ posix-character-classes@^0.1.0:
14671583
version "0.1.1"
14681584
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
14691585

1586+
prettier@^1.13.7:
1587+
version "1.13.7"
1588+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281"
1589+
1590+
pretty-quick@^1.6.0:
1591+
version "1.6.0"
1592+
resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-1.6.0.tgz#afc3591eb5c4cf37614a305d489a8a40e57c9258"
1593+
dependencies:
1594+
chalk "^2.3.0"
1595+
execa "^0.8.0"
1596+
find-up "^2.1.0"
1597+
ignore "^3.3.7"
1598+
mri "^1.1.0"
1599+
14701600
private@^0.1.6:
14711601
version "0.1.8"
14721602
resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -1475,6 +1605,10 @@ process-nextick-args@~2.0.0:
14751605
version "2.0.0"
14761606
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
14771607

1608+
pseudomap@^1.0.2:
1609+
version "1.0.2"
1610+
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
1611+
14781612
rc@^1.2.7:
14791613
version "1.2.8"
14801614
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -1629,6 +1763,16 @@ set-value@^2.0.0:
16291763
is-plain-object "^2.0.3"
16301764
split-string "^3.0.1"
16311765

1766+
shebang-command@^1.2.0:
1767+
version "1.2.0"
1768+
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
1769+
dependencies:
1770+
shebang-regex "^1.0.0"
1771+
1772+
shebang-regex@^1.0.0:
1773+
version "1.0.0"
1774+
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
1775+
16321776
signal-exit@^3.0.0:
16331777
version "3.0.2"
16341778
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -1732,6 +1876,14 @@ strip-ansi@^4.0.0:
17321876
dependencies:
17331877
ansi-regex "^3.0.0"
17341878

1879+
strip-eof@^1.0.0:
1880+
version "1.0.0"
1881+
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
1882+
1883+
strip-indent@^2.0.0:
1884+
version "2.0.0"
1885+
resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
1886+
17351887
strip-json-comments@~2.0.1:
17361888
version "2.0.1"
17371889
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -1870,6 +2022,12 @@ util-deprecate@~1.0.1:
18702022
version "1.0.2"
18712023
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
18722024

2025+
which@^1.2.9:
2026+
version "1.3.1"
2027+
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
2028+
dependencies:
2029+
isexe "^2.0.0"
2030+
18732031
wide-align@^1.1.0:
18742032
version "1.1.3"
18752033
resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
@@ -1880,6 +2038,10 @@ wrappy@1:
18802038
version "1.0.2"
18812039
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
18822040

2041+
yallist@^2.1.2:
2042+
version "2.1.2"
2043+
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
2044+
18832045
yallist@^3.0.0, yallist@^3.0.2:
18842046
version "3.0.2"
18852047
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"

0 commit comments

Comments
 (0)