Skip to content

Commit c3481bb

Browse files
authored
Merge pull request #693 from outoftime/eslint-loader
eslint-loader
2 parents feca26b + 27a183f commit c3481bb

4 files changed

Lines changed: 27 additions & 6 deletions

File tree

.eslintrc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -635,10 +635,6 @@
635635
"shorthandFirst": true
636636
}
637637
],
638-
"react/jsx-space-before-closing": [
639-
2,
640-
"always"
641-
],
642638
"react/jsx-tag-spacing": [
643639
2,
644640
{

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@
161161
"doctoc": "^1.2.0",
162162
"eslint": "^3.3.0",
163163
"eslint-import-resolver-webpack": "^0.8.1",
164+
"eslint-loader": "^1.8.0",
164165
"eslint-plugin-import": "^2.2.0",
165166
"eslint-plugin-promise": "^3.4.2",
166167
"eslint-plugin-react": "^7.0.1",

webpack.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,10 @@ module.exports = {
7676
path.resolve(__dirname, 'src'),
7777
path.resolve(__dirname, 'test'),
7878
],
79-
use: {loader: 'babel-loader', options: babelrc},
79+
use: [
80+
{loader: 'babel-loader', options: babelrc},
81+
{loader: 'eslint-loader'},
82+
],
8083
},
8184
{
8285
test: /\.js$/,

yarn.lock

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2775,6 +2775,16 @@ eslint-import-resolver-webpack@^0.8.1:
27752775
resolve "^1.2.0"
27762776
semver "^5.3.0"
27772777

2778+
eslint-loader@^1.8.0:
2779+
version "1.8.0"
2780+
resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-1.8.0.tgz#8261f08cca4bd2ea263b77733e93cf0f21e20aa9"
2781+
dependencies:
2782+
loader-fs-cache "^1.0.0"
2783+
loader-utils "^1.0.2"
2784+
object-assign "^4.0.1"
2785+
object-hash "^1.1.4"
2786+
rimraf "^2.6.1"
2787+
27782788
eslint-module-utils@^2.0.0:
27792789
version "2.0.0"
27802790
resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz#a6f8c21d901358759cdc35dbac1982ae1ee58bce"
@@ -4689,6 +4699,13 @@ load-json-file@^2.0.0:
46894699
pify "^2.0.0"
46904700
strip-bom "^3.0.0"
46914701

4702+
loader-fs-cache@^1.0.0:
4703+
version "1.0.1"
4704+
resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.1.tgz#56e0bf08bd9708b26a765b68509840c8dec9fdbc"
4705+
dependencies:
4706+
find-cache-dir "^0.1.1"
4707+
mkdirp "0.5.1"
4708+
46924709
loader-runner@^2.3.0:
46934710
version "2.3.0"
46944711
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
@@ -5161,7 +5178,7 @@ mkdirp@0.3.0:
51615178
version "0.3.0"
51625179
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
51635180

5164-
mkdirp@0.5, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
5181+
mkdirp@0.5, mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
51655182
version "0.5.1"
51665183
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
51675184
dependencies:
@@ -5461,6 +5478,10 @@ object-component@0.0.3:
54615478
version "0.0.3"
54625479
resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
54635480

5481+
object-hash@^1.1.4:
5482+
version "1.1.8"
5483+
resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.1.8.tgz#28a659cf987d96a4dabe7860289f3b5326c4a03c"
5484+
54645485
object-inspect@~0.4.0:
54655486
version "0.4.0"
54665487
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-0.4.0.tgz#f5157c116c1455b243b06ee97703392c5ad89fec"

0 commit comments

Comments
 (0)