From 97c57e1b65f29bd0a9eda74833d419dbab42bbee Mon Sep 17 00:00:00 2001 From: Marc Garreau Date: Mon, 19 Mar 2018 15:38:03 -0600 Subject: [PATCH] Adds deps for prettier --- .editorconfig | 8 -------- .prettierignore | 3 +++ .prettierrc | 1 + package.json | 1 + yarn.lock | 28 ++++++++++++++++------------ 5 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 .prettierignore create mode 100644 .prettierrc diff --git a/.editorconfig b/.editorconfig index 4710f7e5f..c6c8b3621 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,14 +2,6 @@ root = true [*] indent_style = space -indent_size = 4 -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.{yml}] -indent_style = space indent_size = 2 end_of_line = lf charset = utf-8 diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..55ede743a --- /dev/null +++ b/.prettierignore @@ -0,0 +1,3 @@ +interface/.meteor +tests/mocha-in-browser/lib +dist_mist diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 000000000..017696922 --- /dev/null +++ b/.prettierrc @@ -0,0 +1 @@ +singleQuote: true diff --git a/package.json b/package.json index 00b5201a9..39c0e6eeb 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "json-structure-diff": "^0.0.2", "minimist": "^1.2.0", "mocha": "^3.2.0", + "prettier": "1.11.1", "redux-mock-store": "^1.3.0", "require-dir": "^0.3.2", "run-sequence": "^1.2.1", diff --git a/yarn.lock b/yarn.lock index 57d2ff2a3..0cc2c75ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2382,8 +2382,8 @@ ethereum-client-binaries@ethereum/ethereum-client-binaries: lodash.isempty "^4.4.0" lodash.values "^4.3.0" mkdirp "^0.5.1" - node-unzip-2 "github:glebdmitriew/node-unzip-2" tmp "0.0.29" + unzip "github:glebdmitriew/node-unzip-2" ethereum-common@^0.0.18: version "0.0.18" @@ -4743,17 +4743,6 @@ node-pre-gyp@^0.6.39: tar "^2.2.1" tar-pack "^3.4.0" -"node-unzip-2@github:glebdmitriew/node-unzip-2": - version "0.2.7" - resolved "https://codeload.github.com/glebdmitriew/node-unzip-2/tar.gz/3702bce9596496bf45442e156541c68eb965b9f9" - dependencies: - binary "~0.3.0" - fstream "~1.0.10" - match-stream "~0.0.2" - pullstream "~0.4.0" - readable-stream "~1.0.0" - setimmediate "~1.0.1" - node-uuid@~1.4.7: version "1.4.8" resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" @@ -5322,6 +5311,10 @@ prepend-http@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" +prettier@1.11.1: + version "1.11.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75" + pretty-bytes@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-1.0.4.tgz#0a22e8210609ad35542f8c8d5d2159aff0751c84" @@ -7068,6 +7061,17 @@ unzip-response@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" +"unzip@github:glebdmitriew/node-unzip-2": + version "0.2.7" + resolved "https://codeload.github.com/glebdmitriew/node-unzip-2/tar.gz/3702bce9596496bf45442e156541c68eb965b9f9" + dependencies: + binary "~0.3.0" + fstream "~1.0.10" + match-stream "~0.0.2" + pullstream "~0.4.0" + readable-stream "~1.0.0" + setimmediate "~1.0.1" + upath@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d"