Skip to content

Commit 3ead900

Browse files
sehropebrianc
authored andcommitted
Fix eslint and add back standard (brianc#1928)
* lint: Enable standard rules again * lint: Replace hasOwnProperty(...) call * lint: Remove trailing spaces * lint: Remove spaces within array brackets * lint: Disable quote-props to silence linter * lint: Skip linting on older node versions
1 parent 0894a3c commit 3ead900

File tree

7 files changed

+15
-7
lines changed

7 files changed

+15
-7
lines changed

.eslintrc

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"node"
44
],
55
"extends": [
6+
"standard",
67
"eslint:recommended",
78
"plugin:node/recommended"
89
],

Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,6 @@ test-pool:
6262

6363
lint:
6464
@echo "***Starting lint***"
65-
node_modules/.bin/eslint lib
65+
node -e "process.exit(Number(process.versions.node.split('.')[0]) < 8 ? 0 : 1)" \
66+
&& echo "***Skipping lint (node version too old)***" \
67+
|| node_modules/.bin/eslint lib

lib/connection-parameters.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ var parse = require('pg-connection-string').parse // parses a connection string
1515

1616
var val = function (key, config, envVar) {
1717
if (envVar === undefined) {
18-
envVar = process.env[ 'PG' + key.toUpperCase() ]
18+
envVar = process.env['PG' + key.toUpperCase()]
1919
} else if (envVar === false) {
2020
// do nothing ... use false
2121
} else {
22-
envVar = process.env[ envVar ]
22+
envVar = process.env[envVar]
2323
}
2424

2525
return config[key] ||

lib/connection.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ Connection.prototype.parseE = function (buffer, length) {
604604
msg = new Error(fields.M)
605605
for (item in input) {
606606
// copy input properties to the error
607-
if (input.hasOwnProperty(item)) {
607+
if (Object.prototype.hasOwnProperty.call(input, item)) {
608608
msg[item] = input[item]
609609
}
610610
}

lib/defaults.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ module.exports = {
5050
ssl: false,
5151

5252
application_name: undefined,
53-
53+
5454
fallback_application_name: undefined,
5555

5656
parseInputDatesAsUTC: false,

lib/native/query.js

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ var NativeQuery = module.exports = function (config, values, callback) {
3535
util.inherits(NativeQuery, EventEmitter)
3636

3737
var errorFieldMap = {
38+
/* eslint-disable quote-props */
3839
'sqlState': 'code',
3940
'statementPosition': 'position',
4041
'messagePrimary': 'message',

package.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,12 @@
3131
"async": "0.9.0",
3232
"bluebird": "3.5.2",
3333
"co": "4.6.0",
34-
"eslint": "^4.19.1",
35-
"eslint-plugin-node": "^6.0.1",
34+
"eslint": "^6.0.1",
35+
"eslint-config-standard": "^13.0.1",
36+
"eslint-plugin-import": "^2.18.1",
37+
"eslint-plugin-node": "^9.1.0",
38+
"eslint-plugin-promise": "^4.2.1",
39+
"eslint-plugin-standard": "^4.0.0",
3640
"pg-copy-streams": "0.3.0"
3741
},
3842
"minNativeVersion": "2.0.0",

0 commit comments

Comments
 (0)