Skip to content

Commit 0ef275a

Browse files
committed
Merge pull request #114 from weblogixx/feat-eslint
*ADD* Base: Added esLint as new linter
2 parents 6dff0a0 + 182c92a commit 0ef275a

File tree

5 files changed

+28
-10
lines changed

5 files changed

+28
-10
lines changed

templates/common/_package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
},
2222
"devDependencies": {
2323
"grunt": "~0.4.5",
24+
"eslint": "^0.21.2",
25+
"eslint-loader": "^0.11.2",
26+
"eslint-plugin-react": "^2.4.0",
2427
"load-grunt-tasks": "~0.6.0",
2528
"grunt-contrib-connect": "~0.8.0",
2629
"webpack": "~1.4.3",
@@ -38,8 +41,6 @@
3841
"karma-webpack": "~1.2.2",
3942
"webpack-dev-server": "~1.6.5",
4043
"grunt-open": "~0.2.3",
41-
"jshint-loader": "~0.8.0",
42-
"jsxhint-loader": "~0.2.0",
4344
"grunt-contrib-copy": "~0.5.0",
4445
"babel": "^4.0.0",
4546
"babel-loader": "^4.0.0",

templates/common/_webpack.config.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ module.exports = {
4141
preLoaders: [{
4242
test: /\.(js|jsx)$/,
4343
exclude: /node_modules/,
44-
loader: 'jsxhint'
44+
loader: 'eslint-loader'
4545
}],
4646
loaders: [{
4747
test: /\.(js|jsx)$/,
@@ -69,8 +69,7 @@ module.exports = {
6969
},
7070

7171
plugins: [
72-
new webpack.HotModuleReplacementPlugin(),
73-
new webpack.NoErrorsPlugin()
72+
new webpack.HotModuleReplacementPlugin()
7473
]
7574

7675
};

templates/common/_webpack.dist.config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ module.exports = {
2929
new webpack.optimize.DedupePlugin(),
3030
new webpack.optimize.UglifyJsPlugin(),
3131
new webpack.optimize.OccurenceOrderPlugin(),
32-
new webpack.optimize.AggressiveMergingPlugin()
32+
new webpack.optimize.AggressiveMergingPlugin(),
33+
new webpack.NoErrorsPlugin()
3334
],
3435

3536
resolve: {
@@ -45,11 +46,10 @@ module.exports = {
4546

4647
module: {
4748
preLoaders: [{
48-
test: /\.js$/,
49+
test: /\.(js|jsx)$/,
4950
exclude: /node_modules/,
50-
loader: 'jsxhint'
51+
loader: 'eslint-loader'
5152
}],
52-
5353
loaders: [{
5454
test: /\.js$/,
5555
exclude: /node_modules/,

templates/common/root/.eslintrc

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"plugins": [
3+
"react"
4+
],
5+
"ecmaFeatures": {
6+
"jsx": true
7+
},
8+
"env": {
9+
"browser": true,
10+
"amd": true,
11+
"es6": true
12+
},
13+
"rules": {
14+
"quotes": [ 1, "single" ],
15+
"no-undef": false,
16+
"global-strict": false,
17+
"no-extra-semi": 1
18+
}
19+
}

test/test-creation.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ describe('react-webpack generator', function() {
101101
['Gruntfile.js', /hot:\s*true/],
102102
['webpack.config.js', /react-hot/],
103103
['webpack.config.js', /webpack\.HotModuleReplacementPlugin/],
104-
['webpack.config.js', /webpack\.NoErrorsPlugin/],
105104
['webpack.config.js', /webpack\/hot\/only-dev-server/]
106105
]);
107106
done();

0 commit comments

Comments
 (0)