Skip to content
Snippets Groups Projects
Commit b4e2341d authored by Rhys Arkins's avatar Rhys Arkins Committed by GitHub
Browse files

refactor: use prettier instead of eslint-plugin-prettier (#864)

Having eslint flag prettier "errors" in editors can be rather painful. Also chose against linting staged files for prettier because I like to stage partials. Instead:
- Recommended to use plugins for editors to format on save, e.g. `prettier-atom`
- Prettier will be run as part of `npm test`
parent 1c421404
No related branches found
No related tags found
No related merge requests found
module.exports = { module.exports = {
'env': { env: {
'node': true, node: true,
}, },
'extends': [ extends: ['airbnb-base', 'prettier'],
'airbnb-base', plugins: ['import', 'promise'],
'prettier', rules: {
],
'plugins': [
'import',
'promise',
'prettier',
],
'rules': {
'no-use-before-define': 0, 'no-use-before-define': 0,
'no-restricted-syntax': 0, 'no-restricted-syntax': 0,
'no-await-in-loop': 0, 'no-await-in-loop': 0,
'prettier/prettier': ['error', { 'trailingComma': 'es5', 'singleQuote': true }],
'promise/always-return': 'error', 'promise/always-return': 'error',
'promise/no-return-wrap': 'error', 'promise/no-return-wrap': 'error',
'promise/param-names': 'error', 'promise/param-names': 'error',
...@@ -24,6 +16,6 @@ module.exports = { ...@@ -24,6 +16,6 @@ module.exports = {
'promise/no-nesting': 'warn', 'promise/no-nesting': 'warn',
'promise/no-promise-in-callback': 'warn', 'promise/no-promise-in-callback': 'warn',
'promise/no-callback-in-promise': 'warn', 'promise/no-callback-in-promise': 'warn',
'promise/avoid-new': 'warn' 'promise/avoid-new': 'warn',
} },
}; };
# It would be nice to remove this file and use .gitignore instead however we need to add package.json and _fixtures
/node_modules
/config.js
/coverage
/dist
/tmp
.DS_Store
.cache
/*.log
package.json
test/_fixtures/
...@@ -11,11 +11,12 @@ ...@@ -11,11 +11,12 @@
"lint-fix": "eslint --fix lib test", "lint-fix": "eslint --fix lib test",
"lint": "eslint lib test", "lint": "eslint lib test",
"prepublishOnly": "npm run build", "prepublishOnly": "npm run build",
"prettier": "prettier '**/*.{js,json}' --write",
"start": "node dist/renovate", "start": "node dist/renovate",
"start-babel": "babel-node lib/renovate", "start-babel": "babel-node lib/renovate",
"start-raw": "node lib/renovate", "start-raw": "node lib/renovate",
"test-dirty": "git diff --exit-code", "test-dirty": "git diff --exit-code",
"test": "npm run lint && npm run jest", "test": "npm run prettier -- --list-different && npm run lint && npm run jest",
"transpile": "rimraf dist && mkdirp dist && babel lib --out-dir dist", "transpile": "rimraf dist && mkdirp dist && babel lib --out-dir dist",
"update-docs": "npm run build && bash bin/update-docs.sh", "update-docs": "npm run build && bash bin/update-docs.sh",
"semantic-release": "semantic-release pre && npm publish && semantic-release post" "semantic-release": "semantic-release pre && npm publish && semantic-release post"
...@@ -85,7 +86,6 @@ ...@@ -85,7 +86,6 @@
"eslint-config-airbnb-base": "12.0.1", "eslint-config-airbnb-base": "12.0.1",
"eslint-config-prettier": "2.6.0", "eslint-config-prettier": "2.6.0",
"eslint-plugin-import": "2.7.0", "eslint-plugin-import": "2.7.0",
"eslint-plugin-prettier": "2.3.1",
"eslint-plugin-promise": "3.5.0", "eslint-plugin-promise": "3.5.0",
"jest": "20.0.4", "jest": "20.0.4",
"mkdirp": "0.5.1", "mkdirp": "0.5.1",
...@@ -114,6 +114,10 @@ ...@@ -114,6 +114,10 @@
], ],
"setupTestFrameworkScriptFile": "./test/chai.js" "setupTestFrameworkScriptFile": "./test/chai.js"
}, },
"prettier": {
"singleQuote": true,
"trailingComma": "es5"
},
"renovate": { "renovate": {
"extends": [ "extends": [
":app", ":app",
......
module.exports = { module.exports = {
env: { env: {
jest: true jest: true,
}, },
rules: { rules: {
"prefer-promise-reject-errors": 0, 'prefer-promise-reject-errors': 0,
"import/no-extraneous-dependencies": 0, 'import/no-extraneous-dependencies': 0,
"global-require": 0 'global-require': 0,
} },
}; };
...@@ -1216,7 +1216,7 @@ debug@^3.0.1: ...@@ -1216,7 +1216,7 @@ debug@^3.0.1:
dependencies: dependencies:
ms "2.0.0" ms "2.0.0"
debuglog@*, debuglog@^1.0.1: debuglog@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
...@@ -1461,13 +1461,6 @@ eslint-plugin-import@2.7.0: ...@@ -1461,13 +1461,6 @@ eslint-plugin-import@2.7.0:
minimatch "^3.0.3" minimatch "^3.0.3"
read-pkg-up "^2.0.0" read-pkg-up "^2.0.0"
eslint-plugin-prettier@2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.3.1.tgz#e7a746c67e716f335274b88295a9ead9f544e44d"
dependencies:
fast-diff "^1.1.1"
jest-docblock "^21.0.0"
eslint-plugin-promise@3.5.0: eslint-plugin-promise@3.5.0:
version "3.5.0" version "3.5.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca" resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca"
...@@ -1639,10 +1632,6 @@ fast-deep-equal@^1.0.0: ...@@ -1639,10 +1632,6 @@ fast-deep-equal@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
fast-diff@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
fast-levenshtein@~2.0.4: fast-levenshtein@~2.0.4:
version "2.0.6" version "2.0.6"
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
...@@ -2334,7 +2323,7 @@ import-lazy@^2.1.0: ...@@ -2334,7 +2323,7 @@ import-lazy@^2.1.0:
version "2.1.0" version "2.1.0"
resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
imurmurhash@*, imurmurhash@^0.1.4: imurmurhash@^0.1.4:
version "0.1.4" version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
...@@ -2739,10 +2728,6 @@ jest-docblock@^20.0.3: ...@@ -2739,10 +2728,6 @@ jest-docblock@^20.0.3:
version "20.0.3" version "20.0.3"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712"
jest-docblock@^21.0.0:
version "21.2.0"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
jest-environment-jsdom@^20.0.3: jest-environment-jsdom@^20.0.3:
version "20.0.3" version "20.0.3"
resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-20.0.3.tgz#048a8ac12ee225f7190417713834bb999787de99" resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-20.0.3.tgz#048a8ac12ee225f7190417713834bb999787de99"
...@@ -3130,10 +3115,6 @@ lodash._basecopy@^3.0.0: ...@@ -3130,10 +3115,6 @@ lodash._basecopy@^3.0.0:
version "3.0.1" version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
lodash._baseindexof@*:
version "3.1.0"
resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
lodash._basetostring@^3.0.0: lodash._basetostring@^3.0.0:
version "3.0.1" version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5" resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
...@@ -3149,14 +3130,10 @@ lodash._basevalues@^3.0.0: ...@@ -3149,14 +3130,10 @@ lodash._basevalues@^3.0.0:
version "3.0.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7" resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
lodash._bindcallback@*, lodash._bindcallback@^3.0.0: lodash._bindcallback@^3.0.0:
version "3.0.1" version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
lodash._cacheindexof@*:
version "3.0.2"
resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
lodash._createassigner@^3.0.0: lodash._createassigner@^3.0.0:
version "3.1.1" version "3.1.1"
resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
...@@ -3165,17 +3142,11 @@ lodash._createassigner@^3.0.0: ...@@ -3165,17 +3142,11 @@ lodash._createassigner@^3.0.0:
lodash._isiterateecall "^3.0.0" lodash._isiterateecall "^3.0.0"
lodash.restparam "^3.0.0" lodash.restparam "^3.0.0"
lodash._createcache@*:
version "3.1.2"
resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
dependencies:
lodash._getnative "^3.0.0"
lodash._createset@~4.0.0: lodash._createset@~4.0.0:
version "4.0.3" version "4.0.3"
resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
lodash._getnative@*, lodash._getnative@^3.0.0: lodash._getnative@^3.0.0:
version "3.9.1" version "3.9.1"
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
...@@ -3269,7 +3240,7 @@ lodash.padstart@^4.1.0: ...@@ -3269,7 +3240,7 @@ lodash.padstart@^4.1.0:
version "4.6.1" version "4.6.1"
resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"
lodash.restparam@*, lodash.restparam@^3.0.0: lodash.restparam@^3.0.0:
version "3.6.1" version "3.6.1"
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
...@@ -4443,7 +4414,7 @@ readable-stream@~2.0.5: ...@@ -4443,7 +4414,7 @@ readable-stream@~2.0.5:
string_decoder "~0.10.x" string_decoder "~0.10.x"
util-deprecate "~1.0.1" util-deprecate "~1.0.1"
readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0: readdir-scoped-modules@^1.0.0:
version "1.0.2" version "1.0.2"
resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747" resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
dependencies: dependencies:
...@@ -5406,7 +5377,7 @@ v8flags@^2.1.1: ...@@ -5406,7 +5377,7 @@ v8flags@^2.1.1:
dependencies: dependencies:
user-home "^1.1.1" user-home "^1.1.1"
validate-npm-package-license@*, validate-npm-package-license@^3.0.1: validate-npm-package-license@^3.0.1:
version "3.0.1" version "3.0.1"
resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
dependencies: dependencies:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment