Skip to content

Commit 2181590

Browse files
committed
chore(eslint): upgrade to eslint@4
1 parent 3c46d30 commit 2181590

File tree

7 files changed

+16
-10
lines changed

7 files changed

+16
-10
lines changed

Diff for: .travis.yml

+6
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,15 @@ os:
77
- linux
88
- osx
99

10+
env:
11+
- ESLINT_VERSION=2
12+
- ESLINT_VERSION=3
13+
- ESLINT_VERSION=4
14+
1015
install:
1116
- npm -g install npm@3
1217
- npm install
18+
- npm install eslint@$ESLINT_VERSION
1319
# install all resolver deps
1420
- "for resolver in ./resolvers/*; do cd $resolver && npm install && cd ../..; done"
1521

Diff for: package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"chai": "^3.4.0",
5757
"coveralls": "^2.11.4",
5858
"cross-env": "^4.0.0",
59-
"eslint": "3.x",
59+
"eslint": "^4.0.0",
6060
"eslint-import-resolver-node": "file:./resolvers/node",
6161
"eslint-import-resolver-webpack": "file:./resolvers/webpack",
6262
"eslint-module-utils": "file:./utils",
@@ -70,17 +70,19 @@
7070
"redux": "^3.0.4",
7171
"rimraf": "2.5.2",
7272
"sinon": "^2.3.2",
73-
"typescript": "^2.0.3",
74-
"typescript-eslint-parser": "^2.1.0"
73+
"typescript": "^2.3.4",
74+
"typescript-eslint-parser": "^2.1.0",
75+
"webpack": "^2.6.1"
7576
},
7677
"peerDependencies": {
77-
"eslint": "2.x - 3.x"
78+
"eslint": "2.x - 4.x"
7879
},
7980
"dependencies": {
8081
"builtin-modules": "^1.1.1",
8182
"contains-path": "^0.1.0",
8283
"debug": "^2.2.0",
8384
"doctrine": "1.5.0",
85+
"escope": "^3.6.0",
8486
"eslint-import-resolver-node": "^0.2.0",
8587
"eslint-module-utils": "^2.0.0",
8688
"has": "^1.0.1",

Diff for: src/rules/no-amd.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = {
1717
return {
1818

1919
'CallExpression': function (node) {
20-
if (context.getScope().type !== 'module') return
20+
if (context.getScope().type !== 'module' && context.getScope().type !== 'global') return
2121

2222
if (node.callee.type !== 'Identifier') return
2323
if (node.callee.name !== 'require' &&

Diff for: src/rules/no-commonjs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ module.exports = {
4141

4242
},
4343
'CallExpression': function (call) {
44-
if (context.getScope().type !== 'module') return
44+
if (context.getScope().type !== 'module' && context.getScope().type !== 'global') return
4545

4646
if (call.callee.type !== 'Identifier') return
4747
if (call.callee.name !== 'require') return

Diff for: src/rules/no-named-default.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = {
1010
if (im.type === 'ImportSpecifier' && im.imported.name === 'default') {
1111
context.report({
1212
node: im.local,
13-
message: `Use default import syntax to import \'${im.local.name}\'.` })
13+
message: `Use default import syntax to import '${im.local.name}'.` })
1414
}
1515
})
1616
},

Diff for: tests/src/rules/default.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ ruleTester.run('default', rule, {
5858

5959
// #94: redux export of execution result,
6060
test({ code: 'import connectedApp from "./redux"' }),
61-
test({ code: 'import App from "./jsx/App"'
62-
, ecmaFeatures: { jsx: true, modules: true } }),
61+
test({ code: 'import App from "./jsx/App"'}),
6362

6463
// from no-errors
6564
test({

Diff for: tests/src/rules/named.js

-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ ruleTester.run('named', rule, {
135135

136136
test({
137137
code: 'import { a } from "./re-export-names"',
138-
args: [2, 'es6-only'],
139138
errors: [error('a', './re-export-names')],
140139
}),
141140

0 commit comments

Comments
 (0)