Skip to content

Commit 74da469

Browse files
authored
Merge pull request #58 from keyanzhang/better-linter
Upgrade eslint and jest
2 parents 0e92240 + 1f76550 commit 74da469

File tree

8 files changed

+27
-13
lines changed

8 files changed

+27
-13
lines changed

.eslintrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

.eslintrc.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
module.exports = {
2+
parser: 'babel-eslint',
3+
4+
extends: './node_modules/fbjs-scripts/eslint/.eslintrc.js',
5+
6+
plugins: [
7+
'react',
8+
],
9+
10+
ecmaFeatures: {
11+
modules: false
12+
},
13+
};

package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,26 @@
99
"lint": "eslint ."
1010
},
1111
"dependencies": {
12-
"jscodeshift": "^0.3.20",
13-
"babel-eslint": "^5.0.0",
12+
"jscodeshift": "^0.3.23",
13+
"babel-eslint": "^6.0.5",
1414
"babel-plugin-transform-object-rest-spread": "^6.6.5",
1515
"babel-preset-es2015": "^6.6.0",
16-
"babel-jest": "^9.0.2",
17-
"eslint": "^1.7.3",
18-
"fbjs-scripts": "^0.5.0",
19-
"jest-cli": "^0.9.1"
16+
"babel-jest": "^12.1.0",
17+
"eslint": "^2.13.1",
18+
"fbjs-scripts": "^0.7.1",
19+
"jest-cli": "^12.1.0"
2020
},
2121
"jest": {
2222
"automock": false,
2323
"globals": {
2424
"baseDir": "../"
2525
},
26+
"testEnvironment": "node",
2627
"testPathDirs": [
27-
"transforms/__tests__"
28+
"transforms"
2829
]
2930
},
3031
"devDependencies": {
31-
"eslint-plugin-react": "^5.1.1"
32+
"eslint-plugin-react": "^5.2.2"
3233
}
3334
}

transforms/__testfixtures__/.eslintrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
rules:
33
no-undef: 0
44
no-unused-vars: 0
5+
no-redeclare: 0

transforms/__testfixtures__/class.input.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ var MyComponent3 = React.createClass({
7676
/>
7777
);
7878
}
79+
return null;
7980
},
8081

8182
autobindMe: function() {},

transforms/__testfixtures__/class.output.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ class MyComponent3 extends React.Component {
6666
/>
6767
);
6868
}
69+
return null;
6970
}
7071

7172
autobindMe() {}

transforms/create-element-to-jsx.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ module.exports = function(file, api, options) {
7272
value
7373
);
7474
}
75+
return null;
7576
});
7677

7778
return attributes;

transforms/utils/ReactUtils.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ module.exports = function(j) {
169169
return spec;
170170
}
171171
}
172+
return null;
172173
};
173174

174175
const getClassExtendReactSpec = classPath => classPath.value.body;

0 commit comments

Comments
 (0)