Skip to content

Commit a8471aa

Browse files
committed
Set up prettier in workspace dir
1 parent 41c899c commit a8471aa

File tree

5 files changed

+161
-44
lines changed

5 files changed

+161
-44
lines changed

.eslintrc

+8-17
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{
22
"plugins": [
3-
"node"
3+
"prettier"
44
],
55
"extends": [
6-
"standard",
7-
"eslint:recommended",
8-
"plugin:node/recommended"
6+
"plugin:prettier/recommended"
97
],
108
"ignorePatterns": [
11-
"**/*.ts"
9+
"**/*.ts",
10+
"node_modules",
11+
"packages/pg",
12+
"packages/pg-protocol",
13+
"packages/pg-pool",
14+
"packages/pg-query-stream"
1215
],
1316
"parserOptions": {
1417
"ecmaVersion": 2017,
@@ -18,17 +21,5 @@
1821
"node": true,
1922
"es6": true,
2023
"mocha": true
21-
},
22-
"rules": {
23-
"space-before-function-paren": "off",
24-
"node/no-unsupported-features/es-syntax": "off",
25-
"node/no-unpublished-require": [
26-
"error",
27-
{
28-
"allowModules": [
29-
"pg"
30-
]
31-
}
32-
]
3324
}
3425
}

.prettierrc.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"semi": true,
3+
"printWidth": 120,
4+
"trailingComma": "es5",
5+
"singleQuote": true
6+
}

package.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@
1616
"lint": "yarn lerna exec --parallel yarn lint"
1717
},
1818
"devDependencies": {
19-
"lerna": "^3.19.0"
20-
},
21-
"dependencies": {}
19+
"@typescript-eslint/eslint-plugin": "^2.27.0",
20+
"eslint": "^6.8.0",
21+
"eslint-config-prettier": "^6.10.1",
22+
"eslint-plugin-node": "^11.1.0",
23+
"eslint-plugin-prettier": "^3.1.2",
24+
"lerna": "^3.19.0",
25+
"prettier": "^2.0.4"
26+
}
2227
}

packages/pg-cursor/package.json

+1-11
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,7 @@
1717
"author": "Brian M. Carlson",
1818
"license": "MIT",
1919
"devDependencies": {
20-
"eslint": "^6.5.1",
21-
"eslint-config-prettier": "^6.4.0",
22-
"eslint-plugin-prettier": "^3.1.1",
2320
"mocha": "^6.2.2",
24-
"pg": "^8.0.2",
25-
"prettier": "^1.18.2"
26-
},
27-
"prettier": {
28-
"semi": false,
29-
"printWidth": 120,
30-
"trailingComma": "none",
31-
"singleQuote": true
21+
"pg": "^8.0.2"
3222
}
3323
}

yarn.lock

+138-13
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,11 @@
850850
"@types/minimatch" "*"
851851
"@types/node" "*"
852852

853+
"@types/json-schema@^7.0.3":
854+
version "7.0.4"
855+
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
856+
integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
857+
853858
"@types/minimatch@*":
854859
version "3.0.3"
855860
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -865,6 +870,39 @@
865870
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.21.tgz#aa44a6363291c7037111c47e4661ad210aded23f"
866871
integrity sha512-8sRGhbpU+ck1n0PGAUgVrWrWdjSW2aqNeyC15W88GRsMpSwzv6RJGlLhE7s2RhVSOdyDmxbqlWSeThq4/7xqlA==
867872

873+
"@typescript-eslint/eslint-plugin@^2.27.0":
874+
version "2.27.0"
875+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.27.0.tgz#e479cdc4c9cf46f96b4c287755733311b0d0ba4b"
876+
integrity sha512-/my+vVHRN7zYgcp0n4z5A6HAK7bvKGBiswaM5zIlOQczsxj/aiD7RcgD+dvVFuwFaGh5+kM7XA6Q6PN0bvb1tw==
877+
dependencies:
878+
"@typescript-eslint/experimental-utils" "2.27.0"
879+
functional-red-black-tree "^1.0.1"
880+
regexpp "^3.0.0"
881+
tsutils "^3.17.1"
882+
883+
"@typescript-eslint/experimental-utils@2.27.0":
884+
version "2.27.0"
885+
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.27.0.tgz#801a952c10b58e486c9a0b36cf21e2aab1e9e01a"
886+
integrity sha512-vOsYzjwJlY6E0NJRXPTeCGqjv5OHgRU1kzxHKWJVPjDYGbPgLudBXjIlc+OD1hDBZ4l1DLbOc5VjofKahsu9Jw==
887+
dependencies:
888+
"@types/json-schema" "^7.0.3"
889+
"@typescript-eslint/typescript-estree" "2.27.0"
890+
eslint-scope "^5.0.0"
891+
eslint-utils "^2.0.0"
892+
893+
"@typescript-eslint/typescript-estree@2.27.0":
894+
version "2.27.0"
895+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.27.0.tgz#a288e54605412da8b81f1660b56c8b2e42966ce8"
896+
integrity sha512-t2miCCJIb/FU8yArjAvxllxbTiyNqaXJag7UOpB5DVoM3+xnjeOngtqlJkLRnMtzaRcJhe3CIR9RmL40omubhg==
897+
dependencies:
898+
debug "^4.1.1"
899+
eslint-visitor-keys "^1.1.0"
900+
glob "^7.1.6"
901+
is-glob "^4.0.1"
902+
lodash "^4.17.15"
903+
semver "^6.3.0"
904+
tsutils "^3.17.1"
905+
868906
"@zkochan/cmd-shim@^3.1.0":
869907
version "3.1.0"
870908
resolved "https://registry.yarnpkg.com/@zkochan/cmd-shim/-/cmd-shim-3.1.0.tgz#2ab8ed81f5bb5452a85f25758eb9b8681982fd2e"
@@ -1772,7 +1810,7 @@ debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
17721810
dependencies:
17731811
ms "2.0.0"
17741812

1775-
debug@^4.0.1:
1813+
debug@^4.0.1, debug@^4.1.1:
17761814
version "4.1.1"
17771815
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
17781816
integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -2036,10 +2074,10 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.5:
20362074
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
20372075
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
20382076

2039-
eslint-config-prettier@^6.4.0:
2040-
version "6.7.0"
2041-
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.7.0.tgz#9a876952e12df2b284adbd3440994bf1f39dfbb9"
2042-
integrity sha512-FamQVKM3jjUVwhG4hEMnbtsq7xOIDm+SY5iBPfR8gKsJoAB2IQnNF+bk1+8Fy44Nq7PPJaLvkRxILYdJWoguKQ==
2077+
eslint-config-prettier@^6.10.1:
2078+
version "6.10.1"
2079+
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.1.tgz#129ef9ec575d5ddc0e269667bf09defcd898642a"
2080+
integrity sha512-svTy6zh1ecQojvpbJSgH3aei/Rt7C6i090l5f2WQ4aB05lYHeZIR1qL4wZyyILTbtmnbHP5Yn8MrsOJMGa8RkQ==
20432081
dependencies:
20442082
get-stdin "^6.0.0"
20452083

@@ -2072,6 +2110,14 @@ eslint-plugin-es@^1.4.1:
20722110
eslint-utils "^1.4.2"
20732111
regexpp "^2.0.1"
20742112

2113+
eslint-plugin-es@^3.0.0:
2114+
version "3.0.0"
2115+
resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.0.tgz#98cb1bc8ab0aa807977855e11ad9d1c9422d014b"
2116+
integrity sha512-6/Jb/J/ZvSebydwbBJO1R9E5ky7YeElfK56Veh7e4QGFHCXoIXGH9HhVz+ibJLM3XJ1XjP+T7rKBLUa/Y7eIng==
2117+
dependencies:
2118+
eslint-utils "^2.0.0"
2119+
regexpp "^3.0.0"
2120+
20752121
eslint-plugin-import@^2.18.1:
20762122
version "2.19.1"
20772123
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.19.1.tgz#5654e10b7839d064dd0d46cd1b88ec2133a11448"
@@ -2090,6 +2136,18 @@ eslint-plugin-import@^2.18.1:
20902136
read-pkg-up "^2.0.0"
20912137
resolve "^1.12.0"
20922138

2139+
eslint-plugin-node@^11.1.0:
2140+
version "11.1.0"
2141+
resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d"
2142+
integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==
2143+
dependencies:
2144+
eslint-plugin-es "^3.0.0"
2145+
eslint-utils "^2.0.0"
2146+
ignore "^5.1.1"
2147+
minimatch "^3.0.4"
2148+
resolve "^1.10.1"
2149+
semver "^6.1.0"
2150+
20932151
eslint-plugin-node@^9.1.0:
20942152
version "9.2.0"
20952153
resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-9.2.0.tgz#b1911f111002d366c5954a6d96d3cd5bf2a3036a"
@@ -2102,7 +2160,7 @@ eslint-plugin-node@^9.1.0:
21022160
resolve "^1.10.1"
21032161
semver "^6.1.0"
21042162

2105-
eslint-plugin-prettier@^3.1.1:
2163+
eslint-plugin-prettier@^3.1.2:
21062164
version "3.1.2"
21072165
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz#432e5a667666ab84ce72f945c72f77d996a5c9ba"
21082166
integrity sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA==
@@ -2139,12 +2197,19 @@ eslint-utils@^1.4.2, eslint-utils@^1.4.3:
21392197
dependencies:
21402198
eslint-visitor-keys "^1.1.0"
21412199

2200+
eslint-utils@^2.0.0:
2201+
version "2.0.0"
2202+
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd"
2203+
integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==
2204+
dependencies:
2205+
eslint-visitor-keys "^1.1.0"
2206+
21422207
eslint-visitor-keys@^1.1.0:
21432208
version "1.1.0"
21442209
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
21452210
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
21462211

2147-
eslint@^6.0.1, eslint@^6.5.1:
2212+
eslint@^6.0.1:
21482213
version "6.7.2"
21492214
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.2.tgz#c17707ca4ad7b2d8af986a33feba71e18a9fecd1"
21502215
integrity sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==
@@ -2187,6 +2252,49 @@ eslint@^6.0.1, eslint@^6.5.1:
21872252
text-table "^0.2.0"
21882253
v8-compile-cache "^2.0.3"
21892254

2255+
eslint@^6.8.0:
2256+
version "6.8.0"
2257+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
2258+
integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
2259+
dependencies:
2260+
"@babel/code-frame" "^7.0.0"
2261+
ajv "^6.10.0"
2262+
chalk "^2.1.0"
2263+
cross-spawn "^6.0.5"
2264+
debug "^4.0.1"
2265+
doctrine "^3.0.0"
2266+
eslint-scope "^5.0.0"
2267+
eslint-utils "^1.4.3"
2268+
eslint-visitor-keys "^1.1.0"
2269+
espree "^6.1.2"
2270+
esquery "^1.0.1"
2271+
esutils "^2.0.2"
2272+
file-entry-cache "^5.0.1"
2273+
functional-red-black-tree "^1.0.1"
2274+
glob-parent "^5.0.0"
2275+
globals "^12.1.0"
2276+
ignore "^4.0.6"
2277+
import-fresh "^3.0.0"
2278+
imurmurhash "^0.1.4"
2279+
inquirer "^7.0.0"
2280+
is-glob "^4.0.0"
2281+
js-yaml "^3.13.1"
2282+
json-stable-stringify-without-jsonify "^1.0.1"
2283+
levn "^0.3.0"
2284+
lodash "^4.17.14"
2285+
minimatch "^3.0.4"
2286+
mkdirp "^0.5.1"
2287+
natural-compare "^1.4.0"
2288+
optionator "^0.8.3"
2289+
progress "^2.0.0"
2290+
regexpp "^2.0.1"
2291+
semver "^6.1.2"
2292+
strip-ansi "^5.2.0"
2293+
strip-json-comments "^3.0.1"
2294+
table "^5.2.3"
2295+
text-table "^0.2.0"
2296+
v8-compile-cache "^2.0.3"
2297+
21902298
espree@^6.1.2:
21912299
version "6.1.2"
21922300
resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d"
@@ -2684,7 +2792,7 @@ glob@7.1.3:
26842792
once "^1.3.0"
26852793
path-is-absolute "^1.0.0"
26862794

2687-
glob@^7.1.1, glob@^7.1.3, glob@^7.1.4:
2795+
glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
26882796
version "7.1.6"
26892797
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
26902798
integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -4509,10 +4617,10 @@ prettier-linter-helpers@^1.0.0:
45094617
dependencies:
45104618
fast-diff "^1.1.2"
45114619

4512-
prettier@^1.18.2:
4513-
version "1.19.1"
4514-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
4515-
integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
4620+
prettier@^2.0.4:
4621+
version "2.0.4"
4622+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.4.tgz#2d1bae173e355996ee355ec9830a7a1ee05457ef"
4623+
integrity sha512-SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w==
45164624

45174625
process-nextick-args@~2.0.0:
45184626
version "2.0.1"
@@ -4763,6 +4871,11 @@ regexpp@^2.0.1:
47634871
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
47644872
integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
47654873

4874+
regexpp@^3.0.0:
4875+
version "3.1.0"
4876+
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
4877+
integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
4878+
47664879
render@0.1:
47674880
version "0.1.4"
47684881
resolved "https://registry.yarnpkg.com/render/-/render-0.1.4.tgz#cfb33a34e26068591d418469e23d8cc5ce1ceff5"
@@ -4945,7 +5058,7 @@ semver@4.3.2:
49455058
resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7"
49465059
integrity sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c=
49475060

4948-
semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0:
5061+
semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
49495062
version "6.3.0"
49505063
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
49515064
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -5554,11 +5667,23 @@ ts-node@^8.5.4:
55545667
source-map-support "^0.5.6"
55555668
yn "^3.0.0"
55565669

5670+
tslib@^1.8.1:
5671+
version "1.11.1"
5672+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
5673+
integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
5674+
55575675
tslib@^1.9.0:
55585676
version "1.10.0"
55595677
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
55605678
integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
55615679

5680+
tsutils@^3.17.1:
5681+
version "3.17.1"
5682+
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
5683+
integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==
5684+
dependencies:
5685+
tslib "^1.8.1"
5686+
55625687
tunnel-agent@^0.6.0:
55635688
version "0.6.0"
55645689
resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"

0 commit comments

Comments
 (0)