Skip to content

Commit de081eb

Browse files
committed
1 parent 06d1175 commit de081eb

File tree

9 files changed

+24
-9
lines changed

9 files changed

+24
-9
lines changed

.eslintrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ root: true
33
rules:
44
eol-last: error
55
eqeqeq: [error, allow-null]
6-
indent: [error, 2, { SwitchCase: 1 }]
6+
indent: [error, 2, { MemberExpression: "off", SwitchCase: 1 }]
77
no-trailing-spaces: error
88
no-unused-vars: [error, { vars: all, args: none, ignoreRestSiblings: true }]

.github/workflows/ci.yml

+13
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,18 @@ jobs:
101101
- name: Remove non-test dependencies
102102
run: npm rm --silent --save-dev connect-redis
103103

104+
- name: Setup Node.js version-specific dependencies
105+
shell: bash
106+
run: |
107+
# eslint for linting
108+
# - remove on Node.js < 4
109+
if [[ "$(cut -d. -f1 <<< "${{ matrix.node-version }}")" -lt 4 ]]; then
110+
node -pe 'Object.keys(require("./package").devDependencies).join("\n")' | \
111+
grep -E '^eslint(-|$)' | \
112+
sort -r | \
113+
xargs -n1 npm rm --silent --save-dev
114+
fi
115+
104116
- name: Install Node.js dependencies
105117
run: npm install
106118

@@ -117,6 +129,7 @@ jobs:
117129
run: npm run test-ci
118130

119131
- name: Lint code
132+
if: steps.list_env.outputs.eslint != ''
120133
run: npm run lint
121134

122135
- name: Collect code coverage

appveyor.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ install:
2929
- ps: |
3030
# Remove example dependencies
3131
npm rm --silent --save-dev connect-redis
32+
# Remove lint dependencies
33+
cmd.exe /c "node -pe `"Object.keys(require('./package').devDependencies).join('\n')`"" | `
34+
sls "^eslint(-|$)" | `
35+
%{ npm rm --silent --save-dev $_ }
3236
# Setup Node.js version-specific dependencies
3337
- ps: |
3438
# mocha for testing
@@ -71,6 +75,4 @@ test_script:
7175
npm --version
7276
# Run test script
7377
- npm run test-ci
74-
# Run linting
75-
- npm run lint
7678
version: "{build}"

examples/params/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var app = module.exports = express();
88
// Faux database
99

1010
var users = [
11-
{ name: 'tj' }
11+
{ name: 'tj' }
1212
, { name: 'tobi' }
1313
, { name: 'loki' }
1414
, { name: 'jane' }

examples/resource/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ app.resource = function(path, obj) {
2626
// Fake records
2727

2828
var users = [
29-
{ name: 'tj' }
29+
{ name: 'tj' }
3030
, { name: 'ciaran' }
3131
, { name: 'aaron' }
3232
, { name: 'guillermo' }

examples/route-middleware/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var app = express();
1515

1616
// Dummy users
1717
var users = [
18-
{ id: 0, name: 'tj', email: '[email protected]', role: 'member' }
18+
{ id: 0, name: 'tj', email: '[email protected]', role: 'member' }
1919
, { id: 1, name: 'ciaran', email: '[email protected]', role: 'member' }
2020
, { id: 2, name: 'aaron', email: '[email protected]', role: 'admin' }
2121
];

examples/web-service/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var repos = [
5555
];
5656

5757
var users = [
58-
{ name: 'tobi' }
58+
{ name: 'tobi' }
5959
, { name: 'loki' }
6060
, { name: 'jane' }
6161
];

lib/response.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ res.append = function append(field, val) {
726726
// concat the new and prev vals
727727
value = Array.isArray(prev) ? prev.concat(val)
728728
: Array.isArray(val) ? [prev].concat(val)
729-
: [prev, val];
729+
: [prev, val]
730730
}
731731

732732
return this.set(field, value);

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"cookie-parser": "~1.4.4",
6666
"cookie-session": "1.3.3",
6767
"ejs": "3.1.6",
68-
"eslint": "2.13.1",
68+
"eslint": "4.19.1",
6969
"express-session": "1.17.0",
7070
"hbs": "4.1.2",
7171
"istanbul": "0.4.5",

0 commit comments

Comments
 (0)