diff --git a/package.json b/package.json index 47d22894..8aa32e8b 100644 --- a/package.json +++ b/package.json @@ -52,13 +52,12 @@ "cross-env": "^5.0.1", "dotenv": "^4.0.0", "eslint": "^3.19.0", - "eslint-config-prettier": "^2.1.1", + "eslint-config-prettier": "^2.2.0", "eslint-config-react-app": "^1.0.4", "eslint-config-xo-space": "^0.16.0", "eslint-plugin-flowtype": "^2.34.0", "eslint-plugin-import": "^2.3.0", "eslint-plugin-jsx-a11y": "^5.0.3", - "eslint-plugin-prettier": "^2.1.2", "eslint-plugin-react": "^7.1.0", "eslint-tap": "^2.0.1", "execa": "^0.7.0", diff --git a/packages/babel-preset/package.json b/packages/babel-preset/package.json index b007861c..cb843d2c 100644 --- a/packages/babel-preset/package.json +++ b/packages/babel-preset/package.json @@ -15,6 +15,6 @@ }, "devDependencies": { "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3" + "eslint-config-joyent-portal": "2.0.0" } } diff --git a/packages/cloudapi-gql/package.json b/packages/cloudapi-gql/package.json index fbfeb244..73d0229e 100644 --- a/packages/cloudapi-gql/package.json +++ b/packages/cloudapi-gql/package.json @@ -24,6 +24,6 @@ }, "devDependencies": { "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3" + "eslint-config-joyent-portal": "2.0.0" } } diff --git a/packages/cp-frontend/package.json b/packages/cp-frontend/package.json index 739a173a..c5a20aea 100644 --- a/packages/cp-frontend/package.json +++ b/packages/cp-frontend/package.json @@ -60,7 +60,7 @@ "babel-preset-joyent-portal": "^1.0.3", "cross-env": "^5.0.1", "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3", + "eslint-config-joyent-portal": "2.0.0", "jest": "^20.0.4", "jest-alias-preprocessor": "^1.1.1", "jest-cli": "^20.0.4", diff --git a/packages/cp-gql-mock-server/package.json b/packages/cp-gql-mock-server/package.json index e26f2e1a..8462f95c 100644 --- a/packages/cp-gql-mock-server/package.json +++ b/packages/cp-gql-mock-server/package.json @@ -28,7 +28,7 @@ }, "devDependencies": { "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3", + "eslint-config-joyent-portal": "2.0.0", "nodemon": "^1.11.0" } } diff --git a/packages/cp-gql-schema/package.json b/packages/cp-gql-schema/package.json index b9e9c235..7969d10f 100644 --- a/packages/cp-gql-schema/package.json +++ b/packages/cp-gql-schema/package.json @@ -14,6 +14,6 @@ "dependencies": {}, "devDependencies": { "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3" + "eslint-config-joyent-portal": "2.0.0" } } diff --git a/packages/cp-rdb-bootstrap/package.json b/packages/cp-rdb-bootstrap/package.json index 5d9e5572..a66082bd 100644 --- a/packages/cp-rdb-bootstrap/package.json +++ b/packages/cp-rdb-bootstrap/package.json @@ -12,6 +12,6 @@ }, "devDependencies": { "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3" + "eslint-config-joyent-portal": "2.0.0" } } diff --git a/packages/docker-compose-client/package.json b/packages/docker-compose-client/package.json index cdc2170b..7e3afeda 100644 --- a/packages/docker-compose-client/package.json +++ b/packages/docker-compose-client/package.json @@ -16,7 +16,7 @@ "devDependencies": { "code": "^4.1.0", "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3", + "eslint-config-joyent-portal": "2.0.0", "js-yaml": "^3.8.4", "lab": "^14.0.1" } diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js index f9a48b7b..d7fe165d 100644 --- a/packages/eslint-config/index.js +++ b/packages/eslint-config/index.js @@ -2,22 +2,8 @@ // TODO wait for eslint/eslint#3458 module.exports = { - extends: ['eslint:recommended', 'xo-space/esnext', 'react-app', 'prettier'], - plugins: ['prettier'], + extends: ['eslint:recommended', 'xo-space/esnext', 'react-app', 'prettier', 'prettier/react'], rules: { - 'capitalized-comments': 0, - 'prettier/prettier': [ - 'error', - { - useTabs: false, - printWidth: 80, - tabWidth: 2, - singleQuote: true, - trailingComma: 'none', - bracketSpacing: true, - jsxBracketSameLine: false, - semi: true - } - ] + 'capitalized-comments': 0 } }; diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index a155cc99..d1e336ad 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -1,6 +1,6 @@ { "name": "eslint-config-joyent-portal", - "version": "1.0.3", + "version": "2.0.0", "license": "MPL-2.0", "repository": "github:yldio/joyent-portal", "main": "index.js", @@ -13,25 +13,23 @@ "devDependencies": { "babel-eslint": "^7.2.3", "eslint": "^3.19.0", - "eslint-config-prettier": "^2.1.1", + "eslint-config-prettier": "^2.2.0", "eslint-config-react-app": "^1.0.4", "eslint-config-xo-space": "^0.16.0", "eslint-plugin-flowtype": "^2.34.0", "eslint-plugin-import": "^2.3.0", "eslint-plugin-jsx-a11y": "^5.0.3", - "eslint-plugin-prettier": "^2.1.2", "eslint-plugin-react": "^7.1.0" }, "peerDependencies": { "babel-eslint": "^7.2.3", "eslint": "^3.19.0", - "eslint-config-prettier": "^2.1.1", + "eslint-config-prettier": "^2.2.0", "eslint-config-react-app": "^1.0.4", "eslint-config-xo-space": "^0.16.0", "eslint-plugin-flowtype": "^2.34.0", "eslint-plugin-import": "^2.3.0", "eslint-plugin-jsx-a11y": "^5.0.3", - "eslint-plugin-prettier": "^2.1.2", "eslint-plugin-react": "^7.1.0" } } diff --git a/packages/manifest-editor/package.json b/packages/manifest-editor/package.json index 2a35d702..0e2c638c 100644 --- a/packages/manifest-editor/package.json +++ b/packages/manifest-editor/package.json @@ -30,7 +30,7 @@ "babel-preset-react-app": "^3.0.0", "bup": "^1.0.9", "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3", + "eslint-config-joyent-portal": "2.0.0", "jest": "^20.0.4", "react": "^15.6.1", "react-test-renderer": "^15.6.1", diff --git a/packages/normalized-styled-components/package.json b/packages/normalized-styled-components/package.json index 852a2f1f..4f8f7262 100644 --- a/packages/normalized-styled-components/package.json +++ b/packages/normalized-styled-components/package.json @@ -38,7 +38,7 @@ "bup": "^1.0.9", "chalk": "^1.1.3", "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3", + "eslint-config-joyent-portal": "2.0.0", "jest": "^20.0.4", "jest-diff": "^20.0.3", "jest-junit": "^1.5.1", diff --git a/packages/pseudo-json-ast/package.json b/packages/pseudo-json-ast/package.json index 59197bba..2e92e194 100644 --- a/packages/pseudo-json-ast/package.json +++ b/packages/pseudo-json-ast/package.json @@ -45,7 +45,7 @@ "bup": "^1.0.9", "cross-env": "^5.0.1", "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3", + "eslint-config-joyent-portal": "2.0.0", "nyc": "^11.0.2", "redrun": "^5.9.15", "tap-xunit": "^1.7.0" diff --git a/packages/pseudo-yaml-ast/package.json b/packages/pseudo-yaml-ast/package.json index 4737fef5..34f12e4e 100644 --- a/packages/pseudo-yaml-ast/package.json +++ b/packages/pseudo-yaml-ast/package.json @@ -47,7 +47,7 @@ "bup": "^1.0.9", "cross-env": "^5.0.1", "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3", + "eslint-config-joyent-portal": "2.0.0", "nyc": "^11.0.2", "redrun": "^5.9.15", "tap-xunit": "^1.7.0" diff --git a/packages/remcalc/package.json b/packages/remcalc/package.json index daf84d8e..6e6911d2 100644 --- a/packages/remcalc/package.json +++ b/packages/remcalc/package.json @@ -38,7 +38,7 @@ "bup": "^1.0.9", "cross-env": "^5.0.1", "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3", + "eslint-config-joyent-portal": "2.0.0", "nyc": "^11.0.2", "tap-xunit": "^1.7.0" }, diff --git a/packages/rnd-id/package.json b/packages/rnd-id/package.json index d5e9eff8..ea2a437d 100644 --- a/packages/rnd-id/package.json +++ b/packages/rnd-id/package.json @@ -32,7 +32,7 @@ "bup": "^1.0.9", "cross-env": "^5.0.1", "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3", + "eslint-config-joyent-portal": "2.0.0", "lodash.uniq": "^4.5.0", "nyc": "^11.0.2", "tap-xunit": "^1.7.0" diff --git a/packages/styled-is/package.json b/packages/styled-is/package.json index 4c1bfebc..17ab0f5b 100644 --- a/packages/styled-is/package.json +++ b/packages/styled-is/package.json @@ -37,7 +37,7 @@ "bup": "^1.0.9", "cross-env": "^5.0.1", "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3", + "eslint-config-joyent-portal": "2.0.0", "nyc": "^11.0.2", "react": "^15.6.1", "redrun": "^5.9.15", diff --git a/packages/ui-toolkit/package.json b/packages/ui-toolkit/package.json index badfcd8c..63327684 100644 --- a/packages/ui-toolkit/package.json +++ b/packages/ui-toolkit/package.json @@ -51,7 +51,7 @@ "babel-preset-joyent-portal": "^1.0.3", "cross-env": "^5.0.1", "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3", + "eslint-config-joyent-portal": "2.0.0", "jest": "^20.0.4", "jest-diff": "^20.0.3", "jest-matcher-utils": "^20.0.3", diff --git a/packages/unitcalc/package.json b/packages/unitcalc/package.json index 0bc860b6..4408a652 100644 --- a/packages/unitcalc/package.json +++ b/packages/unitcalc/package.json @@ -40,7 +40,7 @@ "bup": "^1.0.9", "cross-env": "^5.0.1", "eslint": "^3.19.0", - "eslint-config-joyent-portal": "1.0.3", + "eslint-config-joyent-portal": "2.0.0", "nyc": "^11.0.2", "tap-xunit": "^1.7.0" }, diff --git a/yarn.lock b/yarn.lock index 819dde1f..49e31cac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3305,7 +3305,7 @@ eslint-config-hapi@10.x.x: version "10.0.0" resolved "https://registry.yarnpkg.com/eslint-config-hapi/-/eslint-config-hapi-10.0.0.tgz#9980affd76103ebc1fec92b45638345db19348f5" -eslint-config-prettier@^2.1.1: +eslint-config-prettier@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-2.2.0.tgz#ca47663852789a75c10feba673e802cc1eff085f" dependencies: @@ -3382,13 +3382,6 @@ eslint-plugin-jsx-a11y@^5.0.3: emoji-regex "^6.1.0" jsx-ast-utils "^1.4.0" -eslint-plugin-prettier@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.1.2.tgz#4b90f4ee7f92bfbe2e926017e1ca40eb628965ea" - dependencies: - fast-diff "^1.1.1" - jest-docblock "^20.0.1" - eslint-plugin-react@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.1.0.tgz#27770acf39f5fd49cd0af4083ce58104eb390d4c" @@ -3740,10 +3733,6 @@ falafel@^1.2.0: isarray "0.0.1" object-keys "^1.0.6" -fast-diff@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.1.tgz#0aea0e4e605b6a2189f0e936d4b7fbaf1b7cfd9b" - fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -5113,10 +5102,6 @@ jest-diff@^20.0.3: jest-matcher-utils "^20.0.3" pretty-format "^20.0.3" -jest-docblock@^20.0.1: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712" - jest-file-exists@^17.0.0: version "17.0.0" resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-17.0.0.tgz#7f63eb73a1c43a13f461be261768b45af2cdd169"