Skip to content

Commit 1ecba83

Browse files
committed
chore: upgrade devDependencies; simplify config; lint
1 parent 110f7bf commit 1ecba83

File tree

5 files changed

+321
-342
lines changed

5 files changed

+321
-342
lines changed

.eslintrc.js

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,9 @@
11
module.exports = {
2-
parserOptions: {
3-
sourceType: "module",
4-
ecmaVersion: 2017,
5-
ecmaFeatures: {
6-
experimentalObjectRestSpread: true
7-
},
8-
},
9-
extends: ["eslint:recommended", "prettier"],
10-
plugins: ["prettier"],
112
env: {
123
node: true,
13-
es6: true,
144
},
15-
rules: {
16-
"prettier/prettier": [
17-
"error",
18-
{
19-
trailingComma: "es5",
20-
},
21-
],
22-
"comma-dangle": [
23-
2,
24-
{
25-
arrays: "always-multiline",
26-
objects: "always-multiline",
27-
imports: "always-multiline",
28-
exports: "always-multiline",
29-
functions: "never",
30-
},
31-
],
32-
"no-confusing-arrow": 0,
33-
"no-else-return": 0,
34-
"no-underscore-dangle": 0,
35-
"no-unused-vars": [
36-
2,
37-
{
38-
argsIgnorePattern: "^_",
39-
},
40-
],
41-
"no-restricted-syntax": 0,
42-
"no-await-in-loop": 0,
43-
camelcase: 0,
5+
parserOptions: {
6+
ecmaVersion: 9,
447
},
8+
extends: ["plugin:prettier/recommended"],
459
};

.prettierrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"trailingComma": "es5"
3+
}

package.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,23 @@
1717
"url": "https://github.com/graphile-contrib/postgraphile-plugin-connection-filter/issues"
1818
},
1919
"devDependencies": {
20-
"eslint": "^4.0.0",
21-
"eslint-config-prettier": "2.3.0",
20+
"eslint": "^5.12.0",
21+
"eslint-config-prettier": "^3.3.0",
2222
"eslint-plugin-jest": "^20.0.3",
23-
"eslint-plugin-prettier": "^2.1.2",
23+
"eslint-plugin-prettier": "^3.0.1",
2424
"graphql": ">=0.9 <0.14",
2525
"jest": "23.5.0",
2626
"pg": ">=6.1.0 <8",
2727
"postgraphile-core": "^4.0.0",
28-
"prettier": "1.14.2"
28+
"prettier": "1.15.3"
2929
},
3030
"jest": {
3131
"testRegex": "__tests__/.*\\.test\\.js$"
3232
},
3333
"files": [
3434
"src"
35-
]
35+
],
36+
"engines": {
37+
"node": ">=8.6"
38+
}
3639
}

src/PgConnectionArgFilterPlugin.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -304,17 +304,17 @@ module.exports = function PgConnectionArgFilterPlugin(
304304
const sqlValue = operator.options.resolveWithRawInput
305305
? input
306306
: Array.isArray(input)
307-
? pgType.isPgArray
308-
? sqlValueFromInput(input, pgType, pgTypeModifier)
309-
: input.length === 0
310-
? sql.query`(select ${sqlIdentifier} limit 0)`
311-
: sql.query`(${sql.join(
312-
input.map(i => sqlValueFromInput(i, pgType, pgTypeModifier)),
313-
","
314-
)})`
315-
: pgType.isPgArray
316-
? sqlValueFromInput(input, pgType.arrayItemType, pgTypeModifier)
317-
: sqlValueFromInput(input, pgType, pgTypeModifier);
307+
? pgType.isPgArray
308+
? sqlValueFromInput(input, pgType, pgTypeModifier)
309+
: input.length === 0
310+
? sql.query`(select ${sqlIdentifier} limit 0)`
311+
: sql.query`(${sql.join(
312+
input.map(i => sqlValueFromInput(i, pgType, pgTypeModifier)),
313+
","
314+
)})`
315+
: pgType.isPgArray
316+
? sqlValueFromInput(input, pgType.arrayItemType, pgTypeModifier)
317+
: sqlValueFromInput(input, pgType, pgTypeModifier);
318318

319319
return operator.resolveWhereClause(
320320
sqlIdentifier,

0 commit comments

Comments
 (0)