From b8e3e11e65d00435a2255ea5fa80528d8cfd95e8 Mon Sep 17 00:00:00 2001 From: Brian Muenzenmeyer Date: Wed, 17 Jan 2018 08:00:31 -0600 Subject: [PATCH] feat(package): Add prettier --- .eslintrc | 36 +++++++--------------- .prettierrc | 4 +++ package-lock.json | 77 ++++++++++++++++++++++++++++++++++++----------- package.json | 5 ++- 4 files changed, 79 insertions(+), 43 deletions(-) create mode 100644 .prettierrc diff --git a/.eslintrc b/.eslintrc index c445390a4..d5dd0f115 100644 --- a/.eslintrc +++ b/.eslintrc @@ -9,26 +9,19 @@ "sourceType": "module" }, "globals": {}, + "extends": ["prettier"], + "plugins": ["prettier"], "rules": { + "prettier/prettier": "error", "block-scoped-var": 0, "camelcase": 0, - "comma-spacing": [1, {"before": false, "after": true}], "consistent-return": 2, "curly": [2, "all"], "dot-notation": [1, { "allowKeywords": true }], "eqeqeq": [2, "allow-null"], "global-strict": [0, "never"], "guard-for-in": 2, - "indent": [1, 2, {"SwitchCase": 1, "VariableDeclarator": 1}], - "lines-around-comment": [1, { - "beforeBlockComment": true, - "beforeLineComment": true, - "allowBlockStart": true, - "allowObjectStart": true, - "allowArrayStart": true - }], "key-spacing": 0, - "keyword-spacing": 1, "new-cap": 0, "no-alert": 2, "no-bitwise": 2, @@ -42,7 +35,6 @@ "no-extend-native": 2, "no-extra-bind": 2, "no-extra-parens": 0, - "no-extra-semi": 2, "no-func-assign": 2, "no-implied-eval": 2, "no-invalid-regexp": 2, @@ -51,7 +43,6 @@ "no-loop-func": 2, "no-mixed-requires": 0, "no-multi-str": 2, - "no-multi-spaces": 1, "no-native-reassign": 2, "no-new": 2, "no-param-reassign": 1, @@ -69,24 +60,19 @@ "no-use-before-define": 1, "no-useless-call": 2, "no-useless-concat": 2, + "no-var": 2, "no-with": 2, "quotes": [0, "single"], "radix": 2, - "semi": [1, "always"], "strict": 0, - "space-before-blocks": 1, - "space-before-function-paren": [1, { - "anonymous": "always", - "named": "never" - }], - "space-in-parens": [1, "never"], - "space-infix-ops": 1, "valid-typeof": 2, "vars-on-top": 0, - "wrap-iife": [2, "inside"], - "prefer-const": ["error", { - "destructuring": "any", - "ignoreReadBeforeAssign": false - }] + "prefer-const": [ + "error", + { + "destructuring": "any", + "ignoreReadBeforeAssign": false + } + ] } } diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 000000000..c1a6f6671 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,4 @@ +{ + "singleQuote": true, + "trailingComma": "es5" +} diff --git a/package-lock.json b/package-lock.json index 538fc4dd2..d88114648 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,7 +53,7 @@ "@pattern-lab/patternengine-node-underscore": { "version": "2.0.0-alpha.1", "resolved": "https://registry.npmjs.org/@pattern-lab/patternengine-node-underscore/-/patternengine-node-underscore-2.0.0-alpha.1.tgz", - "integrity": "sha512-puHWr6BktxFFHnAKMn+7AyUnBpjpK8i4FadFzGWb6DCEEoPYZydDuKx20/EXImuuRI7F1At4+itYnDqCg0hKXQ==", + "integrity": "sha1-ZdHe64Urn78g6GG0Oy6SiCaCrCQ=", "dev": true, "requires": { "underscore": "1.8.3" @@ -256,7 +256,7 @@ "bluebird": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", + "integrity": "sha1-2VUfnemPH82h5oPRfukaBgLuLrk=", "dev": true }, "boom": { @@ -406,7 +406,7 @@ "color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "integrity": "sha1-k4NDeaHMmgxh+C9S8NBDIiUb1aI=", "dev": true }, "colors": { @@ -469,7 +469,7 @@ "coveralls": { "version": "2.13.3", "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-2.13.3.tgz", - "integrity": "sha512-iiAmn+l1XqRwNLXhW8Rs5qHZRFMYp9ZIPjEOVRpC/c4so6Y/f4/lFi0FfR5B9cCqgyhkJ5cZmbvcVRfP8MHchw==", + "integrity": "sha1-mtfCrlJ0F/Nh6LYmSD9I7pLdK8c=", "dev": true, "requires": { "js-yaml": "3.6.1", @@ -510,7 +510,7 @@ "lru-cache": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=", "dev": true, "requires": { "pseudomap": "1.0.2", @@ -1654,6 +1654,25 @@ } } }, + "eslint-config-prettier": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz", + "integrity": "sha512-ag8YEyBXsm3nmOv1Hz991VtNNDMRa+MNy8cY47Pl4bw6iuzqKbJajXdqUpiw13STdLLrznxgm1hj9NhxeOYq0A==", + "dev": true, + "requires": { + "get-stdin": "5.0.1" + } + }, + "eslint-plugin-prettier": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.5.0.tgz", + "integrity": "sha512-L06bewYpt2Wb8Uk7os8f/0cL5DjddL38t1M/nOpjw5MqVFBn1RIIBBE6tfr37lHUH7AvAubZsvu/bDmNl4RBKQ==", + "dev": true, + "requires": { + "fast-diff": "1.1.2", + "jest-docblock": "21.2.0" + } + }, "esprima": { "version": "2.7.3", "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", @@ -1721,6 +1740,12 @@ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "dev": true }, + "fast-diff": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", + "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", + "dev": true + }, "faye-websocket": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", @@ -1885,6 +1910,12 @@ "is-property": "1.0.2" } }, + "get-stdin": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz", + "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=", + "dev": true + }, "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", @@ -2254,6 +2285,12 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", "dev": true }, + "jest-docblock": { + "version": "21.2.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-21.2.0.tgz", + "integrity": "sha512-5IZ7sY9dBAYSV+YjQ0Ovb540Ku7AO9Z5o2Cg789xj167iQuZ2cG+z0f3Uct6WeYLbU6aQiM2pCs7sZ+4dotydw==", + "dev": true + }, "js-beautify": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.3.tgz", @@ -2564,7 +2601,7 @@ "minipass": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.1.tgz", - "integrity": "sha512-u1aUllxPJUI07cOqzR7reGmQxmCqlH88uIIsf6XZFEWgw7gXKpJdR+5R9Y3KEDmWYkdIz9wXZs3C0jOPxejk/Q==", + "integrity": "sha1-WtqXU4sQJ7TPchNDJChXjLVkAR8=", "dev": true, "requires": { "yallist": "3.0.2" @@ -2653,7 +2690,7 @@ "nyc": { "version": "11.4.1", "resolved": "https://registry.npmjs.org/nyc/-/nyc-11.4.1.tgz", - "integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==", + "integrity": "sha1-E/335+8i0CfGHRdHWPaXimj09eU=", "dev": true, "requires": { "archy": "1.0.0", @@ -4371,6 +4408,12 @@ "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" }, + "prettier": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.10.2.tgz", + "integrity": "sha512-TcdNoQIWFoHblurqqU6d1ysopjq7UX0oRcT/hJ8qvBAELiYWn+Ugf0AXdnzISEJ7vuhNnQ98N8jR8Sh53x4IZg==", + "dev": true + }, "process-nextick-args": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", @@ -4671,7 +4714,7 @@ "source-map-support": { "version": "0.4.18", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", + "integrity": "sha1-Aoam3ovkJkEzhZTpfM6nXwosWF8=", "dev": true, "requires": { "source-map": "0.5.7" @@ -4768,7 +4811,7 @@ "tap": { "version": "11.0.1", "resolved": "https://registry.npmjs.org/tap/-/tap-11.0.1.tgz", - "integrity": "sha512-YfrPp7FFxASC4tK4DEAKnnTxyg+J7T8kh8NiOmICNhiGvSojPAV34Ir4DDElFvnIiDEMzDP7233lw3WacFvIFQ==", + "integrity": "sha1-tzkL5kwiuxWppJRLPkaR1ghi5/M=", "dev": true, "requires": { "bind-obj-methods": "1.0.0", @@ -4805,7 +4848,7 @@ "tap-mocha-reporter": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/tap-mocha-reporter/-/tap-mocha-reporter-3.0.6.tgz", - "integrity": "sha512-UImgw3etckDQCoqZIAIKcQDt0w1JLVs3v0yxLlmwvGLZl6MGFxF7JME5PElXjAoDklVDU42P3vVu5jgr37P4Yg==", + "integrity": "sha1-Eqvpf/QJpabsw9cLbbo02CGEp3A=", "dev": true, "requires": { "color-support": "1.1.3", @@ -4822,7 +4865,7 @@ "tap-parser": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/tap-parser/-/tap-parser-5.4.0.tgz", - "integrity": "sha512-BIsIaGqv7uTQgTW1KLTMNPSEQf4zDDPgYOBRdgOfuB+JFOLRBfEu6cLa/KvMvmqggu1FKXDfitjLwsq4827RvA==", + "integrity": "sha1-aQfolyXXt/pq5B7ixGTD20MYiuw=", "dev": true, "requires": { "events-to-array": "1.1.2", @@ -4835,7 +4878,7 @@ "tap-parser": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/tap-parser/-/tap-parser-7.0.0.tgz", - "integrity": "sha512-05G8/LrzqOOFvZhhAk32wsGiPZ1lfUrl+iV7+OkKgfofZxiceZWMHkKmow71YsyVQ8IvGBP2EjcIjE5gL4l5lA==", + "integrity": "sha1-VNs1MC/aLCzMIZVK074issukJyE=", "dev": true, "requires": { "events-to-array": "1.1.2", @@ -4851,7 +4894,7 @@ "tmatch": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/tmatch/-/tmatch-3.1.0.tgz", - "integrity": "sha512-W3MSATOCN4pVu2qFxmJLIArSifeSOFqnfx9hiUaVgOmeRoI2NbU7RNga+6G+L8ojlFeQge+ZPCclWyUpQ8UeNQ==", + "integrity": "sha1-cBJk/XWC0BRKgMha8zWMyiacceM=", "dev": true }, "tough-cookie": { @@ -4872,7 +4915,7 @@ "tsame": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/tsame/-/tsame-1.1.2.tgz", - "integrity": "sha512-ovCs24PGjmByVPr9tSIOs/yjUX9sJl0grEmOsj9dZA/UknQkgPOKcUqM84aSCvt9awHuhc/boMzTg3BHFalxWw==", + "integrity": "sha1-XOAAKs9oWUJ4nGMBh5eiql5rA8U=", "dev": true }, "tunnel-agent": { @@ -4973,7 +5016,7 @@ "ansi-styles": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=", "requires": { "color-convert": "1.9.0" } @@ -5537,7 +5580,7 @@ "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", "dev": true, "requires": { "isexe": "2.0.0" @@ -5559,7 +5602,7 @@ "write-file-atomic": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", - "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", + "integrity": "sha1-H/YVdcLipOjlENb6TiQ8zhg5mas=", "dev": true, "requires": { "graceful-fs": "4.1.11", diff --git a/package.json b/package.json index 7b3e867d3..cfada636a 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,9 @@ "@pattern-lab/patternengine-node-handlebars": "^2.0.0-alpha.2", "@pattern-lab/patternengine-node-underscore": "^2.0.0-alpha.1", "eslint": "3.5.0", + "eslint-config-prettier": "^2.9.0", + "eslint-plugin-prettier": "^2.5.0", + "prettier": "1.10.2", "rewire": "2.5.2", "tap": "11.0.1" }, @@ -57,7 +60,7 @@ "license": "MIT", "scripts": { "lint": "eslint core/**/*.js", - "pretest": "npm run lint", + "prettier": "prettier --config .prettierrc --write ./core/**/*.js", "test": "tap test/*_tests.js --reporter spec --coverage" }, "engines": {