From 43bd622e293af6bc13b2bfaa90cc339843e6c871 Mon Sep 17 00:00:00 2001 From: Priscila Date: Wed, 15 Aug 2018 22:17:41 +0200 Subject: [PATCH] feat: added prettier (#921) --- .eslintrc | 4 +++- .prettierrc | 12 ++++++++++++ package.json | 21 ++++++++++++++++----- src/webui/.eslintrc | 9 ++++++++- yarn.lock | Bin 377212 -> 386307 bytes 5 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 .prettierrc diff --git a/.eslintrc b/.eslintrc index b50213f01..66b480dc3 100644 --- a/.eslintrc +++ b/.eslintrc @@ -9,7 +9,8 @@ "google", "plugin:react/recommended", "plugin:flowtype/recommended", - "plugin:jest/recommended" + "plugin:jest/recommended", + "plugin:prettier/recommended" ], "parser": "babel-eslint", "parserOptions": { @@ -30,6 +31,7 @@ "__APP_VERSION__": true }, "rules": { + "prettier/prettier": ["error", null, "@prettier"], "no-useless-escape": 2, "react/no-deprecated": 1, "react/jsx-no-target-blank": 1, diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 000000000..a29f3cdd6 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,12 @@ +{ + "useTabs": false, + "printWidth": 160, + "tabWidth": 2, + "singleQuote": true, + "requirePragma": true, + "bracketSpacing": false, + "jsxBracketSameLine": false, + "trailingComma": "es5", + "semi": true, + "parser": "flow" +} diff --git a/package.json b/package.json index 0d08fabcf..7b0842f1a 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "js-string-escape": "1.0.1", "js-yaml": "3.12.0", "jsonwebtoken": "8.3.0", + "lint-staged": "7.2.0", "lockfile": "1.0.4", "lodash": "4.17.10", "lunr": "0.7.0", @@ -77,8 +78,8 @@ "babel-register": "6.26.0", "babel-runtime": "6.26.0", "bundlesize": "0.17.0", - "cross-env": "5.1.4", "codecov": "3.0.4", + "cross-env": "5.1.4", "css-loader": "0.28.10", "element-react": "1.4.8", "element-theme-default": "1.4.13", @@ -86,11 +87,13 @@ "enzyme-adapter-react-16": "1.1.1", "eslint": "5.2.0", "eslint-config-google": "0.9.1", - "eslint-loader": "2.1.0", - "eslint-plugin-babel": "5.1.0", - "eslint-plugin-flowtype": "2.50.0", + "eslint-config-prettier": "2.9.0", + "eslint-loader": "2.0.0", + "eslint-plugin-babel": "4.1.2", + "eslint-plugin-flowtype": "2.49.3", "eslint-plugin-import": "2.13.0", "eslint-plugin-jest": "21.18.0", + "eslint-plugin-prettier": "2.6.2", "eslint-plugin-react": "7.10.0", "file-loader": "1.1.11", "flow-bin": "0.77.0", @@ -112,6 +115,7 @@ "normalize.css": "8.0.0", "optimize-css-assets-webpack-plugin": "5.0.0", "ora": "1.4.0", + "prettier": "1.13.7", "prop-types": "15.6.1", "puppeteer": "1.1.1", "react": "16.2.0", @@ -185,9 +189,16 @@ }, "husky": { "hooks": { - "pre-commit": "npm run lint" + "pre-commit": "lint-staged" } }, + "lint-staged": { + "*.js": [ + "eslint .", + "prettier --write", + "git add" + ] + }, "bundlesize": [ { "path": "./static/vendor*.js", diff --git a/src/webui/.eslintrc b/src/webui/.eslintrc index 0869e876d..eb219c736 100644 --- a/src/webui/.eslintrc +++ b/src/webui/.eslintrc @@ -10,7 +10,14 @@ }, "rules": { "require-jsdoc": 0, - "no-console": 2, + "no-console": [ + 1, + { + "allow": [ + "log" + ] + } + ], "no-unused-vars": [ 2, { diff --git a/yarn.lock b/yarn.lock index 4d61bfa783a27ffada5fa4ed0853c4e00f690ebe..fdda21f14c4b783a02b63b1ff60cc6c4d2543d61 100644 GIT binary patch delta 6147 zcma)AYiwM{b;iASR}^W>5+zxr6g^h-Beuk)X6DZ0-Z+gZDryudO8hKfIF>Yb9@N_8 zF0;F|EEj?6I%x~EO{5U;v^MfkQ@BBZ6l`7K)@@o@4cr9ok61w9)-e!U?z=%?w?OS5 zeYj`tKFFn1I2K?m&&-`Ua~|LM&iU_O9ee8KvE~1)>~G2WM@_S(PA{6KsUK*yn?}x8 z+l^`?YnkSwGMh8gC(u+pg(lqjk?@YW>7V0^1J!FDR4vY#YR^7?lTq5zM6;MEmKaHe zkjg5VB`Br|CDbMwaqfb@jK;Ug`q@?5R3lYppuUX}?sGD!?hn9Wjy4VOe> zi&G&;j1$WdGci`~caH_nt#3CM>q@qb`{575nd54%R_#f^5Uc+LlY2|}@JTIZ%4Qi7 zh#|yco)XLzCtNBpKa*KueBthXEgBnb&DE5t%6h9-nE+EvQFr-;@{R7~r-PyVBcBS$ z)_o`7Tsnm(E2=R+FYDSgr$LlXp^uDIDn31Gje2DQHVJqB!@;CmJ{623(bXl>5WJbt zhHH~jf*3ePDM2h2m}`<+f}{|c%}<^R9<1(ZwB~E7QMa|(=@ZPmVBiksmd}=|?)~2k zb|AmXJCUp;SC%J8qD-ThC8@OVClv@KEKv!TnK9YYg}27@#orG8eE;UjiUx~TZM`*p z0=y!oNRD0znnNXR>TS1cXE-yXjsFcM?)(7b3b@Z3m(Y}Hok`10mIx}r%m!yB)s_&5 zFXn?JCS2uTeKGjdZP(Ardb`?MsMYJH=`Oz>%-m<@%xWRru|`rY0;uz}3{i+Ntl&;z zVia4Q*qE}+KVyUa`D?v*c> zO8IgWJ{Gvf1JQKnv_?6+NkM#e(@UfT5s6I91QS}PL?kGM^GOV9Vk?O?ELPY|jEr<& zyfC*oTdP;?T;ojp?1BNS(R3;v2s|%x0Sor`uN-ox)`d48@H-3RC%uRF!+l3N_r21}bB6BiEv&eut7LBh+`@Yg z2AnIbWi-4FQ*0rfRAy6+6=f;>NHS{WlKjHhsFkgDRoASAI)TAt*j?Bjjji_qhrl52 z(r~yXKRq1Y807T2@V2ex>gh(~5qI$80YLFgIQbd#Sgl>iyk@=M5U~EA&khR-F2U3p zO%!69QEM#{0x;et3<;Amg^0C@w?2ICezqZ)$-lNI{NCo0SIaHe%j0gj7419HR~2sR z|1NIoz%tD^QIuo}#Gf{?O`tMzl<_!4B83>>kTM7}nm<6oXV(u;Rsd5Lo2KR7jLO^G z`~MY9<_GQwpBWihkWkvaRhn-4NO|TyTdQlRKs}+qeo(TixW%!eG@~Sy8Oex6P+drx zDrQqF0Lf#);jLhW{L4^{62};eHcJ%{xL6G>e1I;QV?M z{$j9Uvf}?}wRNpNeZti#q#S6s&Rv`hH|5{7;h+8T`pHVI1?1picj0ft!|vI)!o$OT zZsdXuxw8w`H$ZUzkchMB8&&~)?NBiFy)rlN9){+!_ju&Ki(#VMKIKE1^fqT zW;JH1mK-S}lmTqTDYFthM={OqaCF1?W=N31lVf-Jo~Y`NF1tV78|^&cv93q~AM4h$ zC`)6^7*q#h2-X~Ggh?bx7}1CTO705B-KODavqO8}j7M$`$J{3;qFV!&KeRWh-@MzS zajPw7jh==QwdQ`YbY-b}tU&C}9=IRmNO@`GxAd zTquqPP@8c7^AF*UfVc;5FK>Th&d8RjE-uVAr8d=iL!0iWq@#Do6V+M3NL!mTpkRTF zy~Sp&K3kQ|*+&cIK=IWJHS2l&!$!4>Gl^dvDV|bo!C4Rs&9d?2%f0ei02m2q{KVjL zv1*z{AbpLOM{P&$Q7hkSwpiCHWJ$}E-%U}$Cq&5|s$v4t(f*T~Kliwgx~0!#!2 zJpTip2>$qu_eyu1yylL+5^KH$?CdolG30ofAT0@04Cn+f&>9&-enYvBi3D}1Qi*hz z#>+e0J6|rB-NpM$*L`9&=Pm3A#Is|^H8ctq3nJB7?4o}m1S&V-gez6tb8kd9>?&fY zvumy~3-0xA?S4(%lPcUX)-?l=-K+r-(6fVk@;zWBpT^NX*|Eaf4Sh4LT`26(f#w8i z6+G2)4ZxtG;RE{M5s9WrYLH2xqlsf+Rp+k&K%6`hY+O3mES>OXP>ao0!$c60~u|SkW3TY*k0>?n-4OP%zXiT6I1JSpN z8wTW%E}ibjMe{tm?*e_rq>1T{EZ)WgvXJvEpH-y4JD1Jsxqk9$e*^t3#`EOrzNW zKQa|}1OxcvUbq7*I$%o9Gty4)XfKX{+V#* z$jT#pT=bI#pv8BezWMxU2knSat_) zibewLMlXhAMdwWN7fdv9vQ*3ff;*u`E^jRDJM6*Qi{Reg&w}32;#S2eh9QGw7HBWL zIyHbTnKBH94vIo+!k`T>yy$qxdzkOJ00w7{_yeKMcIS>qyIkd^(mr>~OVOF(etmH7 zp9gI>K2h5DiN36>M{!oQa802|N(i%r8x{LPuLw$&G(ckF3}eYNXcq;{BBXorRcMjU zeLO7jqMcn*%k22u+}A*9zuSDo!&2ofg)DQOp3sbjF#G?(#2{_J~!*@Bf1k4f_uCsK02W(BS0ZB zpp=4s71|=hQ!X%32{0j;7coE1ac^#l#wS|F&;Fnvp7+fFDCh0!!v$KgCgA47b)`q{|B!FF;ih;>4B)93J$)eD@6bb~@(gV9YIa+6UzA~gp&T?wHqIbR zL_#G^p`DaIf20%!ssVw{nr4C|I4^&;^w+`es%ELx6rLV?ZCYl+3rgxAxn_6%%@v)(yFyFn|4GDH_`_ zV00J!NpR?%0g(aQ4GIeE=>$B|28cG7FfO4m^ogO}G&aK`fti}L(3M#RbjPav^;b)0 zwz{wVT6x-i<)@`_h;L6zIsuZ|B!zZ^a|^8iu>ho2bKewjW(eRKWK$OBhkjc6t(_Zy zny-*O_x8)d!TZ)yK(BAX;a4`UB4V+CISNjUMH+@-0MS5$VvGd#lS>ItVJY+y`S*v) zlOyXqbA&c*`8f!>#=ZO8uWT(39rnWFjy|~rYS9B@Eme#t)PWQ_8*Cw6d5mC~X=904 z0%JF=U_KY~{9i}Qj}MKkP*C@EUOseR+n>22>|e7Yg46<{+CjdA0eSNSFfexpGfYXT z(nL_oq$Gd|T3DMY_eY-($M5{$-WB3vRqs)h_=mf(0;C+@9gOFn-Cn+P*I>6f<~G&C zNtg2SZ3lXd9#|N{R2oeU#Dvlc!V_kYS;jc#peM|kU{HwibG)qP1C;;cH_L9<{{b6L BSSSDh delta 791 zcmZvaUr1AN6vz4f?ylBMEvFj`%{3+bcjxc^-MtpE5K}Nh8&Z^(_uk!W3*E+?im`eq zf(i<0){p8TBIqrWR-LD^(kOZ>sD~cRCwnV}3apIgDtw9aayaMkdSuLy1t%fx8hKywX-t&tMfdQ<+|E&)*XKKkuJ2L6ar}@Mo?E(Qwj zfYXS+xr#!6gyuHo)NYhumR>Bu9$pUo6V=S1Vo5=TR|F#QmP`!A&=pPBB}=zNBN9<^ z9dBlq9(ndy!-LUSic5|RTAUdlO2mh)q|bkt1jGRGJDq>miNTS9XpFN5<727ugcTA3 zG6|3tr_VQPC5NN&n9rXZ(VH^nXulg5&^+6&Qd~<`5A#+vS+oR2uyxIlBgEEojC@d4 zh@@(QX)7dR8yc@fR;|*BS+*cEb*vbsOYs>@@47Gx9WGpfoNJ)8uLrl~Ke2ypn4@pz zn*V2t%UjBm1T|40rX~apV#+3oh`ADspkk_qq)V!53$kJ8wg%yHER^HWVaoU85cJjK znKF2|183IJx)>^@q!l&6WE;Nbgm+!IwHj6ucsGKcBrZzRv&(oVz4HmT!OUlTbsL?n zW_Clnhk4+EQo`)7g~eW`v6{Y5GhSM^FQ>K|sw*cM2R)Kz+_d)ua|kY-WGatPYmRve z#q*5dqT$u_&3E7iDEY!n6~Mh8%=K-+)j00=!05Q+F@nu$M~wknJ~$TLkp1RJmBVxq hd!iB+>eyN*+!onHA#gibwF+DZ*#kpx`~`ci>NmT72(|zK